From 051cdd45600398399cc5d1f300112f24bc37ced7 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 2 Jul 2026 21:57:27 +0800 Subject: [PATCH 01/52] init --- filament_id_plan.html | 1029 +++++++++++++++++++++++++++++++++++++++++ filament_id_plan.md | 397 ++++++++++++++++ task.md | 13 + 3 files changed, 1439 insertions(+) create mode 100644 filament_id_plan.html create mode 100644 filament_id_plan.md create mode 100644 task.md diff --git a/filament_id_plan.html b/filament_id_plan.html new file mode 100644 index 0000000000..08f4a06b74 --- /dev/null +++ b/filament_id_plan.html @@ -0,0 +1,1029 @@ + + + + + +filament_id — design & migration plan · OrcaSlicer + + + + + + +
+ + +
+
DESIGN REVIEW resources/profiles · filament_id
+

One id, one material — on every printer, exactly once.

+

A filament_id names a material family: one commercial product line, shared by all of its + per-printer variants. Devices match spools by filament_id + printer compatibility. + That only works if, for any one printer, at most one compatible preset carries a given id. Bambu keeps this + invariant; the other 64 vendor bundles broke it 1,256 times.

+ +
+ id anatomy — Bambu's grammar + + + + GF + A + 00 + + + + + + + + + + + + prefix — Bambu's namespace + frozen: AMS RFID tags carry these bytes + family letter — A: Bambu PLA + B ABS/ASA · C PC · G PETG · L generic/3rd-party PLA + N PA · P PP/PE · S support · T PET/PPS · U TPU + tier number + 00–49 branded · 50–59 fiber-filled + 60–70 partners · 95–99 generic, desc. + + + + shared by every variant: + + + Bambu PLA Basic @BBL X1C + + Bambu PLA Basic @BBL P1P + + Bambu PLA Basic @BBL X1C 0.2 nozzle + + + +
+ +
+
1,256
printer-level ambiguity errors (validator -f, tree-wide)
+
356
logical collision groups after de-duplication
+
30 / 65
vendor bundles affected / total
+
0
violations in BBL — cleaned in PR #14459, CI-gated
+
+

Every number in this document is reproducible: an independent loader-faithful audit re-derives the + validator's output exactly (1256 = 1256), and every code claim carries a file:line reference.

+
+ + +
+
§0 overview
+

The plan in one screen

+

Two deliverables: a generation rule so ids can never become ambiguous again (goal 1), and a + migration that fixes the 356 existing collisions without breaking users (goal 2).

+ +
+ the whole plan + + + + + + + + + TODAY + 7+ ad-hoc id schemes + 356 collision groups + zero written rules + CI covers BBL only + + + RULE + TOOLING §3 §6 + deterministic OF* mint + id lives on @base only + CI ratchets + snapshot + no profile changes yet + + + MIGRATION §5 + fresh ids only, ever + OFL first, then per vendor + names never change + one reviewable PR each + + + DONE + invariant holds + tree-wide, + by construction + + + + + + + BBL profiles are never touched · Qidi QD_* device ids are never touched · no preset is renamed or deleted + +
+ +
+ Why migration is safe — verified in code: user presets re-derive filament_id from their parent on + every load Preset.cpp:1658-1682; 3mf projects resolve presets by name + config, not id + Preset.cpp:2490-2576; Klipper, Creality and Snapmaker derive tray ids at runtime from the + installed bundle. Fresh, never-reused ids on non-BBL system presets break nothing. +
+
+ + +
+
§1 how matching works
+

Every ecosystem funnels through this one id

+

Not just Bambu. Five device ecosystems put a filament_id into the same pipeline; the slicer then + picks the single preset that matches the id and is compatible with the active printer.

+ +
+ runtime — device → preset + + + + + + + + + + BBL AMS + from device RFID — frozen + + Qidi box + QD_<series>_<v>_<t> — frozen + + Creality CFS + scored at runtime — safe + + Klipper AFC/HH + by filament type — safe + + Snapmaker + color/type match — safe + + + + + + + + + + + + tray_info_idx (MQTT / agent) + + filament_ams_list["filament_id"] + + find_if( f.is_compatible && base(f)==f && f.filament_id == id ) + + + + + + + + Plater.cpp:3440 + PresetBundle.cpp:3132/3233 + + + → the ONE matching preset + two matches? find_if silently returns whichever sorts first — no log, no warning; the AMS edit dialog even hides the second preset + +
+ +

The invariant, drawn

+
+ per printer × per id +
+
+

✓ Correct — Bambu PLA Basic, id GFA00

+ + + + + +
printer presetcompatible presets with GFA00
X1C…@BBL X1C 1
X1C 0.2 nozzle…@BBL X1C 0.2 nozzle 1
P1P…@BBL P1P 1
+

Variants share the id; their compatible_printers are disjoint. Each printer sees the id exactly once.

+
+
+

✗ Broken — Qidi, id GFB99 (real case)

+ + + +
printer presetcompatible presets with GFB99
X-Max 3 0.4 nozzleBambu ABS · HATCHBOX ABS · Overture ABS · PolyLite ABS · QIDI ABS Rapido · QIDI ABS-GF · QIDI ASA · ASA-Aero · PC-ABS-FR · Generic ABS … 16
+

Sixteen different materials answer to one id on one printer. A spool tagged “generic ABS” matches + whichever preset sorts first — and GFB99 was stamped into 317 Qidi files.

+
+
+
+ +

Two consumers you can't see from the profiles

+

Most matching is printer-scoped, but several code paths match globally, by id alone — tray display name, + temperature_vitrification warnings, calibration history, and the multi-nozzle grouping key + FilamentGroup.cpp:513. So two different materials must never share an id even across + vendors: the first preset in the whole installed collection supplies the name, type and temperature data.

+
Two identity systems. The library (OFL) hides its global presets per printer by + alias (name before  @) — Preset.cpp:3684 — while devices match by + filament_id. When a vendor tunes Generic PLA but renames it + Flashforge PLA Basic, the alias no longer matches, shadowing fails, and both presets are + visible with the same id. The rule in §3 aligns the two systems: one family = one alias = one id.
+
+ + +
+
§2 the landscape today
+

Seven schemes, zero rules, one epidemic

+

The only guidance that ever existed was “≤ 8 characters”, checked for BBL only. Every other + convention was one contributor's invention, merged without comment, then imitated.

+ +
+ who uses which id shape — 5,866 instantiated presets + + + GF<letter><NN> (Bambu classic, mass-copied) + 2,921 + free-form ("GFPLA Silk", "LHF_pla", 36-char names…) + 2,241 + GF<BRAND><NNN> (Bambu partner ids) + 395 + O-prefixed (OGF* — OrcaFilamentLibrary mirrors) + 211 + GF<x>##_## (Afinia/Tiertime suffix) + other GF-shaped + 43 + 55 + + +
+ Bambu's space, used outside Bambu + invented, unowned + deliberate Orca convention +
+
+ +

How it got here

+
+ convention timeline + + + + + + + + + + 2025-01 + OrcaFilamentLibrary + created + + 2025-03 + OGF* prefix born + direct commit, no rationale + + 2025-05 + “≤ 8 chars” check + BBL-only · PR #9574 + + 2025-06 + _## suffix invented + PR #9739, imitated since + + 2025-11 + profile wiki removed + its example taught copy-paste + + 2026-06 + validator -f · BBL → 0 + PR #14459 + + now + this plan + + +
+ +

Beyond the validator's reach

+

The -f check compares a printer only against its own vendor's filaments. Three further ledgers exist:

+
+
16
OFL-internal ids covering several materials — visible on every printer (e.g. OEPLAB00 = 14 Elegoo PLA products)
+
42
OFL×vendor same-id pairs — 32 already neutralized by alias shadowing, 10 live
+
67
ids meaning different materials in different vendors (GFU99 also covers a PEBA; Anycubic's GFL95 “Matte” ≠ Bambu's GFL95 “High Speed”)
+
+
+ + +
+
§3 the rule
+

Nobody invents ids. Structure carries the rest.

+

Chosen by a 3-design → 2-judge → 3-attacker adversarial process. Deterministic minting won on + ambiguity-prevention, contributor simplicity and enforceability; every “breaks” finding from the attack pass is + folded in below.

+ +

The one-question test

+
+ decision — same id or new id? + + + + + + + + Would a user call this a different spool product + than anything already in the tree? + + + + + + + YES — polymer, sub-brand, + fiber-filled, 2nd diameter + NO — same spool, tuned for + another printer / nozzle + it's a GENERIC + material + + + NEW FAMILY + create «Family @base», not instantiated + write NO filament_id anywhere + run the mint script — or paste the id + that CI prints for you + + JOIN THE FAMILY + inherit the existing @base + never write the filament_id key + keep compatible_printers disjoint + from the other variants + + JOIN THE OFL FAMILY + inherit «Generic X @System» + KEEP the «Generic X» name/alias + (alias shadowing then hides the OFL + preset on your printers) · no id key + color → never a new id · “high-speed” for a different printer → same family + “high-speed” selectable alongside the normal preset on one printer → new family + second selectable diameter on the same printer → sibling family with its own id + +
+ +

Minted ids — the setting_id precedent, applied to families

+
+ id anatomy — the new namespace + + + OF + q3xT9k + + + + + + + + + OF — Orca Family namespace + disjoint from GF · QD_ · P· at two chars + base62_6( uuid5( NS, "filament_family/<Vendor>/<Family>" ) ) + e.g. filament_family/Elegoo/Elegoo PLA Matte → OFq3xT9k + same derivation as setting_id · 8 chars total (AMS limit) + + + same input → same id: + no “next number” races · a fork mints the id upstream expects · CI recomputes and verifies + renamed family? + the id does not change — immutable once shipped; renamed_from covers the name + + +
+

Author workflow is two lines: commit the family with no id anywhere; run + python scripts/assign_filament_ids.py (or read the id CI prints in its failure message and paste it). + A --mint "<Vendor>/<Family>" one-shot prints an id without touching the tree.

+ +

Structure: the id lives in exactly one place

+
+ family shape + + + Elegoo PLA Matte @base + instantiation:false · filament_id: "OFq3xT9k" ← only here + + + + + + …@Centauri Carbon + inherits @base · no id key + compat: {CC 0.4} + + …@CC 0.2 nozzle + inherits @base · no id key + compat: {CC 0.2} + + …@Neptune 4 + inherits @base · no id key + compat: {N4, N4 Pro} + + disjoint compatible_printers = the PR #14459 invariant, by construction + family identity is DECLARED — an optional "filament_family" key on the root overrides name derivation + multi-root families are legal (Qidi's per-series bases) — every root must declare the identical id + +
+ +

Reserved namespaces — never mint or hand-write into

+
+ the id space, partitioned + + + + + + + + + GF* + Bambu AMS / RFID — frozen + + QD_* + Qidi device — frozen + + P[0-9A-Fa-f]{7} · "null" + user-custom presets + + OGF* + legacy shapes + grandfathered, closed + + OF[0-9A-Za-z]{6} + open — minted only + + Byte-copies of authentic Bambu ids stay legal where the checked-in shared_catalog sanctions the family (BBL, OFL, Fiberon). + Everything already shipped and unambiguous is snapshot-frozen exactly as-is — the migration touches only colliding families. + +
+
Accepted trade-off: minted ids are opaque — OFq3xT9k doesn't say “PLA”. + The family name sits in the same file; in exchange there is no registry, no “next free number” ceremony, no PR races, + and forks mint the same id upstream expects. The mnemonic registry-grammar runner-up is preserved in §8 if you prefer it — + everything else in this plan works under either format.
+
+ + +
+
§4 error taxonomy — goal 2
+

Eleven patterns explain all 356 groups

+

Classified group-by-group against the actual profile files, then independently spot-checked + (1 substantive disagreement in 14 samples, corrected). The task's two known patterns cover about half; the rest + are new findings.

+ +
+ what's actually wrong — classified groups + + + P1 copy_paste_id — different materials share an id verbatim + 167 + P2 wrong_inherits / id-less product line + ~87 + P3 generic_family_overlap — branded preset rides a generic id + 68 + P4 overclaim_compat — broader variant claims a dedicated printer + 24 + other — deliberate coexistence, hygiene, one true duplicate + 21 + + +

Fixes across all groups: 319 × mint a fresh id · 21 × trim compatible_printers · + 21 × split compat-or-id · 5 × re-point inherits · 1 × merge. Which preset keeps a contested id follows a + mechanical precedence: Bambu-catalog material → OFL generic family → historical first owner.

+
+ +
+
P1copy_paste_id~167
+

The id came along when a profile was copied. Qidi stamped GFB99 into 317 files; + Peopoly put PLA-Silk's id on ABS.

+
fix — impostor families get minted ids on their roots; the owner keeps the id.
+
P2wrong_inherits / no root~87
+

A product line never got its own @base — every variant inherits another family's id. + Flashforge's umbrella collapses ~140 presets into one id.

+
fix — create per-family roots with minted ids; re-point inherits. Never delete the old + shadow files — convert them (they carry real config).
+
P3generic_family_overlap~68
+

A vendor-branded filament rides a generic family id via inheritance, colliding with the true generic + on the same printer.

+
fix — branded → minted id. True generic tunings instead join the OFL family with matching alias. + Sovol is the elegant case: just delete its wrong id lines and inherit OFL's.
+
P4overclaim_compat~24
+

Same material; the broad variant claims a printer that a dedicated variant covers — the BBL H2DP pattern + from PR #14459.

+
fix — trim the broader preset's compatible_printers. Ids untouched.
+
P5template-carried idin P1/P2
+

The id sits on a shared settings template (fdm_filament_*), so every family that inherits + the template collapses onto it (Prusa, Ginger Additive).

+
fix — move ids off templates onto family roots.
+
P6OFL-internal collision16 ids
+

One OFL id spans several materials — and OFL presets are visible on every printer. + OGFL06 = eSUN PLA-Marble and Fiberon PETG-ESD.

+
fix — fix OFL first: it's the base bundle every vendor resolves against.
+
P7alias-mismatch re-exposure10 live
+

A vendor tunes a generic but renames it; alias shadowing fails and the OFL preset resurfaces beside it + (Snapmaker PolyTerra J1 PLA).

+
fix — rename-to-alias where it's genuinely the same family, else mint.
+
P8per-variant ids~210 presets
+

The opposite failure: every nozzle variant has its own id (Prusa, SeeMeCNC, Afinia _##). + No ambiguity — but devices can't recognize the material across nozzles.

+
fix — grandfather (they're unambiguous); converge opportunistically; document as anti-pattern.
+
P9format violationshygiene
+

Ids with spaces ("GFPLA Silk"), 11-char ids, invented GF-shaped ids colliding with + Bambu's real allocations.

+
fix — disappears as a byproduct of re-minting; the unambiguous rest is snapshot-frozen.
+
P10cross-vendor semantic67 ids
+

Same id, different material, different vendors — feeds wrong name/type/temperature data to the globally-matching + consumers (§1).

+
fix — mostly eliminated by P1–P3 re-minting; benign same-material generic sharing is legalized + by the snapshot.
+
P11deliberate coexistence4
+

Snapmaker “Benchy” demo presets coexist on purpose (gated by compatible_prints, which the id check + can't see); one preset lists the same printer three times.

+
fix — mint ids for demo presets; de-duplicate list entries; add a lint.
+
+
+ + +
+
§5 migration plan
+

Fresh ids only, family-atomic, names never change

+

The persistence analysis makes one strategy provably safe — and everything else forbidden.

+ +

What survives an id change

+ + + + + + + + + + +
surfacebehavior across releasesverdict
User presets that inherit a system presetfilament_id re-derived from the parent on every load Preset.cpp:1658-1682safe
Saved 3mf projectspresets resolve by name + config equality, never by id Preset.cpp:2490-2576safe
Klipper / Creality / Snapmaker synctray ids derived at runtime from the installed bundlesafe
User root custom presetscopied a system id at creation and persist it forever — AMS auto-match falls back to generic-by-typelow residue
Qidi QD_* idsencode the device protocol QidiPrinterAgent.cpp:146 — an exact-match contractfrozen
BBL GF* idslive on RFID tags and printer-side records; hardcoded k-values in C++frozen
Recycling an old id for a different materialstale ids in user roots / old 3mfs would silently match the wrong materialforbidden, forever
Renaming / deleting preset namesuser presets whose inherits no longer resolves are dropped at load Preset.cpp:1687-1691forbidden (use renamed_from if unavoidable)
+ +

Phases

+
+
0
+

Tooling + snapshot — no profile changes

+

Land scripts/assign_filament_ids.py, the extended CI checks in ratchet mode, the validator OFL + cross-check and the runtime warning. Generate filament_id_snapshot.json (id→families multimap over main) + and an empty retired_ids.json; both are checked in and append-only.

+
+
1
+

OrcaFilamentLibrary first

+

OFL is the base bundle every vendor resolves against. Fix its 16 internal collisions and give + Generic PETG HF/PETG-CF/PP-CF/… @System their own family roots instead of collapsing into their + parent generic. Unambiguous ids stay byte-identical.

+
+
2
+

Per-vendor PRs, worst first — each widens the CI ratchet

+

Qidi → Flashforge → Elegoo → Prusa → Cubicon → Anycubic → InfiMech → Snapmaker → long tail (22 vendors, + mostly 1–8 one-line fixes). Each merged PR appends its vendor to the workflow's -f -v scope + (today: -v BBL -f); when all are in, drop -v and run tree-wide.

+
+
3
+

Delete the allowlists

+

Once tree-wide zero holds, the ratchet allowlists disappear and every check becomes a hard rule for anything + born after the snapshot.

+
+
+ +
+ where the work is — collision groups per vendor + + + Qidi97 + Flashforge69 + Elegoo37 + Prusa31 + Cubicon17 + Anycubic14 + InfiMech14 + Snapmaker11 + Artillery8 + Creality8 + FlyingBear8 + Sovol6 + 18 more40 total (Volumic 6 · Ratrig 5 · Chuanying 4 · Dremel 3 · 4×2 · 10×1) + + +

Vendor observations show these are systematic mistakes, not hundreds of independent bugs: Qidi is one + blanket-stamp in three profile generations; Elegoo is a single inherit-the-class-base habit; Sovol is fixed by deleting + six wrong lines.

+
+ +

The migration script's contract (hardened by the adversarial pass)

+ + + + + + + +
rulewhy
Re-mint everything — id literals in analysis notes are ignored; only group membership, fix category and keep-id precedence are consumed. Assert no emitted id matches ^(GF|QD_|P[0-9A-Fa-f]{7}$).~40% of classification notes suggested ids in the old invented-GF culture; CI would reject them.
Family-atomic — re-idding any preset re-ids every same-family sibling in the same commit, even outside the collision group.Otherwise a family splits across two ids (FlyingBear GFB99 @S1 vs @Ghost7) — worse than the bug being fixed.
Bounded diff — a vendor PR may only touch collision-group files + same-family siblings; every id that is unambiguous today stays byte-identical.Makes each PR mechanically auditable.
Config-equivalence gate — flattened effective config of every preset must be identical before/after, except the prescribed id/inherits/compat edits.Makes structural conversions provably behavior-neutral (Flashforge's id-less shadow files become named family roots carrying their config byte-for-byte).
No deletions, no renames — redundant twins are re-minted, not dropped; consolidation via renamed_from is a separate human-reviewed cleanup.Deleting a name silently drops users' derived presets at load.
+
+ + +
+
§6 enforcement
+

Ratchets, not absolutes

+

The grandfathered landscape keeps today's benign sharing legal; the checks forbid anything new. + All checks import the same mint function — the setting_id precedent.

+ + + + + + + + + + + +
#checkwhere
1Format — valid iff OF[0-9A-Za-z]{6} or in the snapshot or vendor==BBL or QD_* in Qidi. The legacy set is closed.orca_extra_profile_check.py
drop BBL-only gate :292, OFL skip :601
2Uniqueness ratchet — tree-wide id→families multimap; no id may gain a family claim not recorded in the snapshot (shared_catalog is the sanctioned exception).
3Structure ratchet — id key only on roots; every instantiated preset resolves an effective id (simulated loader walk); all family members resolve identically; no preset may override its inherited id (the Generic SBS drift class).
4Mint conformance — a new id must equal the mint (or a salt iteration); the failure message prints the expected value so hand-editors can paste it.
5Stability — an (id, family) pair on main may not change or vanish, following renamed_from chains, unless listed in a maintainer-gated migrations file. Retired ids go to an append-only ledger and are never redefined.
6Alias hygiene — a preset inheriting an OFL Generic * @System (no own id in its chain) must keep the OFL base name and non-empty compatible_printers; the error names the rename as the cause.
7OFL cross-check — extend check_duplicate_filament_subtypes to include OFL presets in every vendor's per-printer check, minus alias-excluded ones. m_excluded_from is already populated in validator context, so the 32 shadowed pairs won't false-positive and the 10 live ones are caught. Widen CI's -f per vendor.C++ validator
PresetBundle.cpp:5654 · :2302
8Runtime backstop — log a warning when the AMS-sync find_if sees 2+ compatible presets for one id. The only layer that can see side-loaded and forked bundles. One line.runtime
PresetBundle.cpp:3132/3233
+ +

Plus: the rule document ships in-repo (doc/developer-reference/filament_id.md) so CI messages + have a stable link, and the profile-PR template gets one checkbox: “new materials: no filament_id key anywhere — + CI prints the minted id.”

+
+ + +
+
§7 evidence
+

How this was verified

+

The analysis was run as a 52-agent pipeline over the real tree and real git history, with an + adversarial design phase — findings were attacked before being adopted.

+ +
+ methodology + + + + + + + + + 5 code analysts + runtime · persistence · loader + Bambu grammar · git history + + 38 classifiers + every collision group, read + from the actual profile files + + ground truth + audit script = validator + 1256 = 1256 · exact + + + 3 designs + deterministic mint + registry grammar + structure-only + + + 2 judges + both chose the mint + 58 / 50 / 56 + 60 / 54 / 56 + + + 3 attackers + 35 scenarios + authors · runtime · + migration mechanics + every “breaks” → + an amendment §3–§5 + spot-check: 1/14 + + + + + + + + + +

Amendments that came out of the attack pass: family identity declared on roots (not name-derived — + Afinia PLA@HS has no space before @); multi-root families legalized; checks 2–3 as + ratchets, not absolutes; the no-deletion rule; shadow-file conversion instead of deletion; classification id + literals quarantined; diameter siblings; case-insensitive reservation of the user id space.

+
+ +
+ Key discoveries that reshaped the design (with sources) +
+

· The “26 Flashforge presets with no id” were a false alarm — the loader resolves them through the OFL base-bundle + fallback to OGFL99/OGFG99 PresetBundle.cpp:4904-4909. The real bug is + ~10 different Flashforge PLA products sharing one id.

+

· A missing id can never ship: it's a hard load error that discards the whole vendor bundle + PresetBundle.cpp:5072, :5141.

+

· Qidi's QD_* ids are a device-protocol contract, discovered in + QidiPrinterAgent.cpp:146-152 — a second frozen namespace nobody had documented.

+

· User-custom ids occupy P + 7 hex CreatePresetsDialog.cpp:533, and + "null" is a sentinel — both reserved.

+

· OFL shadowing is keyed by alias, not id Preset.cpp:3684-3714, and is already active in + validator context PresetBundle.cpp:2302 — which is what makes check #7 precise.

+
+
+
+ + +
+
§8 open decisions
+

Five calls that are yours to make

+

Everything else in the plan holds under any of these answers. → marks the recommendation.

+ +
+
D1id format
+
Opaque deterministic mint OFq3xT9k — no registry, no races, fork-friendly; judges 2/2.
+
Mnemonic registry grammar <NS><FAM><SEQ> — readable ids, but someone allocates numbers forever.
+
D2multi-vendor brands
+
shared_catalog list — sanction authentic Bambu ids for byte-matching families (Snapmaker's Fiberon), low churn.
+
Hoist those families into OFL — cleaner long-term, more restructuring now.
+
D3demo presets
+
Mint ids for Benchy-style presets — simple, keeps the validator strict.
+
Teach the validator compatible_prints gating — more machinery for 3 presets.
+
D4the 10 live OFL duplicates
+
Rename-to-alias where it's truly the same family (with renamed_from) — restores shadowing.
+
Mint vendor ids everywhere — safer mechanically, more ids in the world.
+
D5where the rule doc lives
+
In-repo doc/developer-reference/filament_id.md — CI messages need a stable link.
+
Wiki-only — discoverable, but drifts from the checks that enforce it.
+
+ +
+ Suggested first step: land phase 0 (tooling + snapshot, zero profile changes). It is entirely additive, + makes every later PR mechanically checkable, and turns the 356-group backlog into a shrinking allowlist that CI + reports on every profile PR. +
+
+ +
+ + + + diff --git a/filament_id_plan.md b/filament_id_plan.md new file mode 100644 index 0000000000..7dc4b43d04 --- /dev/null +++ b/filament_id_plan.md @@ -0,0 +1,397 @@ +# filament_id: generation rule + system-profile fix plan + +Follow-up to PR #14459 (commit `c2e91cb8`, validator `-f` / `check_duplicate_filament_subtypes`). +Goal 1: a filament_id generation rule for all vendors. Goal 2: an error-pattern taxonomy and a +migration plan that removes every ambiguous filament_id, without touching Bambu (BBL) profiles. + +All numbers below are reproducible: a loader-faithful audit script re-derives the validator's +output **exactly** (1256/1256 printer-level errors, 356 logical collision groups, 30 vendors). +Every code claim was verified against source with `file:line` references. + +--- + +## 0. Executive summary + +- `filament_id` is a **material-family id**: one id per commercial product line, shared by all + of that material's per-printer/per-nozzle variants. Matching is always `(filament_id + + printer compatibility)`; the invariant from PR #14459 is *per printer preset, at most one + compatible instantiated filament preset per id*. +- Every modern device ecosystem funnels through this id — not just Bambu AMS: Qidi box, + Creality CFS, Klipper AFC/Happy Hare, Snapmaker all emit/consume `tray_info_idx` + (see §1). Several consumers match **globally, without printer scoping**, so two *different + materials* sharing one id is unsafe even across vendors. +- **Proposed rule (§3):** deterministic, script-minted ids — `OF` + 6 base62 chars from + `uuid5(vendor + family)`, declared **only on family-root (`@base`) presets**; variants inherit. + Nobody ever invents an id by hand; CI prints the expected id when one is missing. Existing + unambiguous ids are grandfathered and frozen; `GF*` (Bambu), `QD_*` (Qidi device protocol), + and `P<7-hex>` (user custom presets) are reserved namespaces that must never be minted into. + This was selected by an adversarial design/judge process over a registry-grammar alternative + and a structure-only alternative, then stress-tested; amendments from that stress test are + folded in below. +- **Migration (§5):** fresh-never-reused ids only, family-atomic, names never changed. This is + provably safe: user presets re-derive `filament_id` from their parent on every load + (`Preset.cpp:1658-1682`), 3mf resolves presets by name+config (`Preset.cpp:2490-2576`), and + Klipper/Creality/Snapmaker derive tray ids at runtime. One PR per vendor; CI's `-f` scope + ratchets per vendor until tree-wide. + +--- + +## 1. How filament_id actually works (verified) + +### Consumers and scoping + +All device integrations converge on one pipeline: device/agent sets `tray_info_idx` → +`DevAmsTray.setting_id` → `Sidebar::build_filament_ams_list` (`Plater.cpp:3423-3493`) → +`PresetBundle::sync_ams_list` / `get_ams_cobox_infos` (`PresetBundle.cpp:3112-3308`) match it +against filament presets. + +| Ecosystem | Where the id comes from | Effect of changing a system id | +|---|---|---| +| BBL AMS | device-side (RFID / user tray setting), `DeviceManager.cpp:3823+` | breaks matching — **frozen by mandate** | +| Qidi box | built from device enums: `"QD_" + series + "_" + vendor + "_" + type_idx`, `QidiPrinterAgent.cpp:146-152`; needs an exactly-matching visible preset | breaks matching — **`QD_*` ids are a frozen device contract** | +| Creality CFS | runtime brand/type scoring returns current preset's id (`CrealityPrintAgent.cpp:46-118`) | invisible | +| Klipper (AFC / Happy Hare) | runtime `filament_id_by_type` (`MoonrakerPrinterAgent.cpp:808,936`) | invisible | +| Snapmaker | runtime color/vendor/type match (`SnapmakerPrinterAgent.cpp:22-64`) | invisible | + +Matching is printer-scoped (`is_compatible`) in the AMS sync paths and all printer agents — this +is what makes the per-printer invariant sufficient there. But several consumers match +**globally by id alone**, first match wins: + +- `get_filament_by_filament_id("")` — tray display name, `filament_is_support`, + `temperature_vitrification` warnings (`PresetBundle.cpp:690-733`; callers + `DevFilaBlackList.cpp:70`, `Plater.cpp:3453`, `SelectMachine.cpp:3560,4623`). The code + comment at `:695` states the assumption outright: an id maps to ONE material globally. +- `MachineObject::setting_id_to_type` (`DeviceManager.cpp:2538`), calibration-history name + lookup (`CaliHistoryDialog.cpp:62`), custom-filament cloud grouping (`Preset.cpp:2839`). +- The slicing pipeline itself: multi-nozzle filament grouping merges project filaments whose + `(filament_id, color)` match (`FilamentGroup.cpp:513-528` via `ToolOrdering.cpp:1164`). + +**Consequence:** within one printer, duplicate ids break AMS matching (silent first-wins, +`find_if` at `PresetBundle.cpp:3132/3233`; the AMS tray-edit dialog even *hides* the second +preset, `AMSMaterialsSetting.cpp:894-897`). Across vendors, the same id on *different +materials* feeds wrong name/type/vitrification data to the global consumers and can merge +different materials into one nozzle group. Same id on the *same* material (e.g. `GFL99` = +Generic PLA in 29 vendors) is comparatively benign — those attributes agree. + +### Identity machinery + +- **Effective id resolution** (`PresetBundle.cpp:4842-5080`): own `filament_id` key → vendor + `filament_id_maps[inherits]` (file order in the vendor index is load-bearing) → + OrcaFilamentLibrary base-bundle map. An instantiated system filament that resolves *no* id is + a hard load error that discards the whole vendor bundle (`:5072`, throw at `:5141-5147`) — + so "missing id" cannot ship; what looked like 26 id-less Flashforge presets actually resolve + to OFL's `OGFL99`/`OGFG99` through the base-bundle fallback. +- **Two family-identity systems exist**: `filament_id` (device matching) and `alias` (name + before `" @"`). OFL shadowing is keyed on **alias**: `update_library_profile_excluded_from` + (`Preset.cpp:3684-3714`) hides an OFL preset (empty `compatible_printers` = compatible with + everything, `Preset.cpp:837`) on printers claimed by a same-alias vendor preset. There is + **no id-based shadowing**. A vendor preset that tunes an OFL generic but renames it + re-exposes the OFL preset and creates a live duplicate. The rule below aligns the two + systems: one family = one alias = one id. +- **User-custom id space**: user-created filaments get `"P" + md5(name)[0:7]` (8 chars, + `CreatePresetsDialog.cpp:533`), or *reuse a system id* when the base name matches an existing + preset (`:510-528`). `"null"` is used as a sentinel. Root user presets persist their id + forever; inheriting user presets re-derive it on every load. + +## 2. The id landscape today + +**Bambu's grammar** (derived from all 1970 BBL instantiated presets; BBL is internally clean — +181 id definitions, 0 duplicates): + +- Classic `GF`: letter = family (A Bambu-PLA, B ABS/ASA, C PC, G PETG/PCTG, + L third-party+generic PLA, N PA/PPA, P PP/PE, R misc, S support, T PET/PPS, U TPU). + Numbers: 00-49 branded ascending, 50-59 fiber-filled, 60-70 partner block, **95-99 generic + tier descending** (99 = the family's plain generic). +- Brand partners `GF`: GFPM Polymaker, GFOT Overture, GFSNL SUNLU, GFNMK + Numakers. One id per product line; never per color, never per printer/nozzle/diameter. +- Structural rule: the id lives on the material's `@base`; every variant inherits it. +- Hardcoded in C++: `GFS00/GFS01` support check (`DeviceManager.cpp:4739`), per-family PA + defaults `GFU01/03/04` (`CalibUtils.cpp:54-75`) — `GF*` is Bambu's space, byte-frozen. + +**Everything else is ad-hoc, invented by individual contributors and imitated** (full history +in §7): OFL's `O`-prefix mirrors (`OGFA00`; introduced 2025-03-31, commit `8c4a65e3e1`), +Tiertime/Afinia `GFx##_##` per-printer-line suffixes, SeeMeCNC per-nozzle ids, LH `LHF_pla`, +LONGER 11-char pseudo-GF ids, Anycubic ids **with spaces** (`"GFPLA Silk"`), Prusa ids that are +entire preset names (36 chars), and mass copy-paste of `GFL99/GFB99/GFG99` onto everything +(Qidi alone stamped `GFB99` into **317 files** across all materials). The only guidance that +ever existed was "≤ 8 chars" — enforced for BBL only (`orca_extra_profile_check.py:292,320`), +and the (now removed) profile wiki's own examples *taught* id copy-pasting. + +**The damage, quantified** (audit reproduces validator 1256/1256): + +| Ledger | Count | +|---|---| +| Within-vendor logical collision groups (validator `-f`) | **356** across 30 vendors (1256 printer-level errors) | +| OFL×vendor same-id groups (validator blind spot) | 42 — of which **10 are live** (alias mismatch defeats shadowing); 32 already neutralized by alias shadowing | +| OFL-internal: one id, several materials, visible on every printer | **16 ids** (e.g. `OEPLAB00` = 14 distinct Elegoo PLA products; `OGFL06` = eSUN PLA-Marble *and* Fiberon PETG-ESD) | +| Cross-vendor semantic collisions (same id, different materials) | **67 ids** (e.g. `GFU99` also covers a PEBA; Anycubic minted `GFL95` "Matte" ≠ Bambu `GFL95` "High Speed") | + +Worst vendors by groups: Qidi 97, Flashforge 69, Elegoo 37, Prusa 31, Cubicon 17, +Anycubic 14, InfiMech 14, Snapmaker 11, Artillery 8, Creality 8, FlyingBear 8. + +--- + +## 3. The rule (proposal) + +Selected by a 3-design / 2-judge adversarial process (deterministic-mint won over +registry-grammar and structure-only on ambiguity-prevention, contributor simplicity, and +enforceability), then hardened by three adversarial review passes. This section is written as +the future authoring doc. + +### 3.1 The one-question test + +> **Would a user consider this a different spool product than anything already in the tree?** +> Different polymer, different sub-brand (Basic / Matte / Silk / HF), fiber-filled sibling, or +> a second selectable diameter → **new family, new id**. The same spool tuned for another +> printer or nozzle → **join the existing family** (inherit its `@base`, no id key). Tuning a +> generic material → **join the OFL family** (inherit the `Generic X @System` preset, keep the +> `Generic X` base name, add no id). + +Same id / new id at a glance: + +| Situation | id | +|---|---| +| Per-printer / per-nozzle variant of an existing material | same id (inherit, never write the key) | +| Sub-brand or product line (PLA vs PLA Matte vs PLA Silk vs PLA HF) | new id each | +| Color | never a new id | +| Second diameter selectable on the same printer (1.75 + 2.85) | sibling family, new id | +| "High-speed" tuned for a *different printer model* | same id (it's a printer variant) | +| "High-speed" selectable *alongside* the normal preset on one printer | new id (it's a product line) | + +### 3.2 Structure + +1. **One family = one root.** Each material family has root preset(s) (`instantiation:false`, + typically ` @base`) and only roots carry the `filament_id` key. Instantiated + variants inherit a root and never write `filament_id`. (A family MAY have several roots — + e.g. Qidi's per-series bases — but they must all declare the *identical* id.) +2. **Family identity is declared, not name-derived.** Default: the family name is the + instantiated presets' base name (name with `/\s?@.*$/` stripped — note *optional* space, + because `Afinia PLA@HS`-style names exist). When vendor naming makes that ambiguous, the + root declares an explicit `"filament_family"` key that overrides derivation; tooling errors + loudly when a root's derived family differs from its children's. +3. **Within a family, variants' `compatible_printers` are pairwise disjoint** — that *is* the + PR #14459 invariant, enforced by the validator. +4. **Generics belong to OFL.** A vendor tuning `Generic PLA` inherits + `Generic PLA @System`, keeps the `Generic PLA` base name/alias (so alias shadowing excludes + the OFL preset on those printers, `Preset.cpp:3684`), sets non-empty `compatible_printers`, + and writes no id. A vendor-*branded* filament never rides a generic family id. +5. **Ids are immutable once shipped.** Renaming a family does not change its id (use + `renamed_from`). No id is ever recycled for a different material — stale ids live on in + user root presets and old 3mfs, and a recycled id would silently match the wrong material. + +### 3.3 Minting — nobody invents ids + +New family ids are computed, exactly like the `setting_id` precedent +(`scripts/assign_vendor_setting_ids.py` / `Slic3r::generate_preset_setting_id`): + +``` +filament_id = "OF" + base62_6( uuid5( NAMESPACE, "filament_family//" ) ) +``` + +8 chars total (satisfies the AMS length limit), same base62 derivation and a dedicated +namespace constant. On the astronomically rare collision with an existing id, the minter salts +the input (`.../1`, `/2`, …) until free; the result is simply frozen in the file. + +- **Script path:** author commits the family with *no id anywhere*; + `python scripts/assign_filament_ids.py` inserts the minted id into the root(s). Idempotent; + never rewrites a valid existing id. A `--mint "/"` one-shot prints the id + without touching the tree. +- **No-script path:** CI fails with the exact line to paste: + `family "MyBrand PLA" (vendor X) needs filament_id "OFq3xT9k" in "MyBrand PLA @base.json"`. + +**Reserved namespaces — never mint or hand-write into:** + +| Space | Owner | Status | +|---|---|---| +| `GF*` | Bambu AMS/RFID catalog | byte-copies of authentic Bambu ids only, and only where a checked-in `shared_catalog` list sanctions the family (BBL bundle; OFL mirrors; byte-matching families in other vendors, e.g. Snapmaker's Fiberon) | +| `QD_*` | Qidi device protocol | frozen; Qidi-only; exempt from family-shape checks | +| `P[0-9A-Fa-f]{7}`, `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp:533`) | never emitted for system presets (reserve case-insensitively) | +| everything already shipped | grandfather snapshot | frozen as-is (§5) | + +Trade-off accepted: minted ids are opaque (`OFq3xT9k` carries no "PLA" mnemonic — the family +name in the same file provides that). The judges preferred this over a Bambu-style extended +grammar because it removes the "who allocates the next number" ceremony, cannot race between +concurrent PRs, and needs no registry maintenance. If mnemonic ids are strongly preferred, the +runner-up design (`` + registry file) is documented in the workflow +records; everything else in this plan is unchanged under either format. + +### 3.4 What CI enforces (all vendors, ratcheted) + +Extend `scripts/orca_extra_profile_check.py` (it imports the same mint function; setting_id +precedent) and the C++ validator: + +1. **Format**: an id is valid iff `OF[0-9A-Za-z]{6}` **or** in the grandfather snapshot **or** + vendor==BBL **or** `QD_*` in Qidi. No whitespace/ASCII/length checks needed outside the + grandfather set — new ids are minted, and the grandfather set is closed. +2. **Uniqueness ratchet**: id→families multimap computed tree-wide; no id may acquire a family + claim not recorded in the snapshot (snapshot legalizes today's benign `GFL99`-style sharing; + new multi-claims are errors; `shared_catalog` entries are the sanctioned exception). +3. **Structure ratchet**: `filament_id` key only on roots; every instantiated filament must + resolve an effective id via the simulated loader walk; all members of one family resolve the + same id; **a preset may not declare an id different from its inherited effective id** (the + `Generic SBS` drift bug class). Pre-existing violations are snapshot-frozen; new ones error. +4. **Mint conformance**: an id new relative to the snapshot must equal the mint (or a salt + iteration); the error message prints the expected value. +5. **Stability**: an `(id, family)` pair on main may not change or vanish, *following + `renamed_from` chains* (so an honest rename passes), unless listed in a maintainer-gated + migrations file. Retired ids go to an append-only `retired_ids` ledger; a retired id may + never be defined again for any family. +6. **Alias hygiene for tuned generics**: a preset inheriting an OFL `Generic * @System` (with + no own id anywhere in its vendor chain) must keep the OFL base name and have non-empty + `compatible_printers` — error message names the rename as the cause. +7. **C++ validator**: extend `check_duplicate_filament_subtypes` (`PresetBundle.cpp:5654`) to + include OFL presets in every vendor's per-printer check, *minus* alias-excluded ones — + `m_excluded_from` is already populated in the validator context (`update_system_maps` at + `PresetBundle.cpp:2302`), so the 32 shadowed pairs won't false-positive and the 10 live ones + will be caught. Run `-f` per vendor in CI, widening as vendors are cleaned (§5). +8. **Runtime backstop** (one-line change): log a warning when the AMS-sync `find_if` + (`PresetBundle.cpp:3132/3233`) finds 2+ compatible presets for one id — the only layer that + can see side-loaded/forked bundles. + +--- + +## 4. Error-pattern taxonomy (goal 2) — with counts and fixes + +356 groups were classified by 37 agents reading the actual profiles, spot-checked +independently (1 substantive disagreement in 14 samples). Counts below fold the spot-check +corrections in. **Fix rule for all patterns: replacement id values are always freshly minted +`OF*`; the "which preset keeps the id" decision uses the precedence _Bambu-catalog material > +OFL generic family > family that historically introduced the id_.** + +| # | Pattern | Groups | Fix | +|---|---|---|---| +| P1 | `copy_paste_id` — different materials share an id verbatim (task's error 1). Qidi's `GFB99`×317-files epidemic; Anycubic's three id "eras"; Peopoly `GFSL99` on ABS | ~167 | impostor families get minted ids on their roots; owner keeps the id | +| P2 | `wrong_inherits` / id-less product lines — a variant inherits another family's root (PR #14459's Panchroma case) or a product line never got its own root (Prusa HF; Flashforge's ~140-preset `FFG01` umbrella) | ~87 | create per-family roots with minted ids; re-point `inherits`; **never** delete the id-less shadow/base files — convert them (they carry real config: Flashforge `fdm_filament_pla` differs materially from OFL's) | +| P3 | `generic_family_overlap` — vendor-*branded* preset rides a generic family id via inheritance (task's error 2, generalized). Includes the 10 live OFL duplicates | ~68 | branded presets get minted family ids; true generic tunings instead adopt the OFL family *with matching alias* (rule 3.2.4); Sovol is the elegant case — just **delete** its wrong own-id lines and let OFL ids flow through inheritance | +| P4 | `overclaim_compat` — same material, broader variant claims a printer that a dedicated variant covers (the BBL H2DP pattern fixed in #14459) | ~24 | trim `compatible_printers` of the broader preset (Dremel, Cubicon `@base`s that are also instantiated, Wanhao France Bowden/Direct) | +| P5 | template-carried id — id declared on a shared settings template (`fdm_filament_*`, `fdm_filament_common`) so every family inheriting it collapses (Prusa, Ginger Additive, Snapmaker TPU base) | inside P1/P2 counts | move ids off templates onto family roots | +| P6 | OFL-internal collisions — 16 ids spanning several materials, visible on every printer (Elegoo blocks, Elas `OGFA00`×3, `OGFL06` polymer mismatch, `Generic PETG HF/PETG-CF @System` missing own ids) | 16 ids | fix inside OFL first (it's the base bundle every vendor resolves against) | +| P7 | alias-mismatch re-exposure — vendor tunes a generic under a different name, OFL preset resurfaces (Snapmaker `PolyTerra J1 PLA` vs OFL `PolyTerra PLA`) | 10 live | rename-to-alias where it's genuinely the same family, else mint | +| P8 | per-variant ids — no ambiguity, but family semantics broken: every variant has its own id (Prusa name-ids, SeeMeCNC nozzle suffixes, Afinia/Tiertime `_##`, iQ) so device matching can't identify the material across nozzles | ~210 presets | grandfather (they're unambiguous); converge opportunistically; document as anti-pattern | +| P9 | format violations — spaces (`"GFPLA Silk"`), >8 chars (LONGER, SeeMeCNC, LH), GF-shaped inventions (Anycubic `GFL93-97`, CoLiDo `GFA99`) | in the above | fixed as a byproduct of re-minting; snapshot freezes the unambiguous rest | +| P10 | cross-vendor semantic collisions — 67 ids meaning different materials in different vendors (dangerous via the global unscoped consumers, §1) | 67 ids | mostly eliminated by P1-P3 re-minting; the remaining same-material generic sharing is legalized by the snapshot | +| P11 | deliberate coexistence & data hygiene — Snapmaker "Benchy" demo presets (gated by `compatible_prints`, which the id check can't see) and a self-collision from duplicate `compatible_printers` entries | 4 | give demo presets own minted ids; dedupe list entries; add a lint for duplicate array entries | + +New patterns beyond the two in the task (goal 2.3): P5-P11. + +--- + +## 5. Migration plan + +### Safety foundation (verified, §1/§7) + +Safe: fresh never-used ids, family-consistent; trims of `compatible_printers`; inherits +re-pointing; OFL id changes (children re-derive). Unsafe: touching `BBL`/`QD_*`; recycling or +swapping ids; splitting a family's id; **deleting or renaming preset names** (user presets +whose `inherits` no longer resolves are dropped at load, `Preset.cpp:1687-1691`) — if a name +must go, `renamed_from` coverage is mandatory. + +### Phases + +0. **Land the rule + tooling first** (no profile changes): `scripts/assign_filament_ids.py` + (mint + insert + `--mint`), the extended `orca_extra_profile_check.py` checks in + snapshot-ratchet mode, the C++ validator OFL cross-check, the runtime warning, the rule doc. + Generate `filament_id_snapshot.json` (id→families multimap over main) and empty + `retired_ids.json` — both checked in. +1. **OFL first** (it's the base bundle every vendor resolves against): fix the 16 internal + collisions (Elas/eSUN/DREMC copy-pastes get mints; `Generic PETG HF/PETG-CF/PP-CF/PP-GF/ + PE-CF/PLA Matte @System` get their own family roots+ids instead of collapsing into their + parent generic), keeping every current effective id that is unambiguous. +2. **Per-vendor PRs, worst-first**: Qidi → Flashforge → Elegoo → Prusa → Cubicon → Anycubic → + InfiMech → Snapmaker → the long tail (22 vendors, mostly 1-8 one-line fixes). Each PR flips + that vendor into CI's `-f` scope (`check_profiles.yml` currently `-v BBL -f`; append + vendors as they reach zero; when all are in, drop `-v` and run tree-wide). +3. **Delete the ratchet allowlists** once tree-wide zero holds; checks become hard rules for + everything born after the snapshot. + +### Migration-script contract (from the adversarial pass — important) + +- Consumes from the classification only: group membership, fix category, keep-id precedence, + inherits-repoint targets. **All replacement id values are recomputed via the mint** — id + literals in analysis notes (e.g. `GFA00_02`, `GFS98`, `GFG96`) are legacy-culture artifacts + and are ignored with a warning; assert no emitted id matches `^(GF|QD_|P[0-9A-Fa-f]{7}$)`. +- **Family-atomic**: re-idding any preset re-ids every same-family sibling in the same commit, + even siblings outside the collision group (FlyingBear `GFB99 @S1` vs `@Ghost7`); Prusa is + family-atomic per material (its HF/CF families span frozen `_N`-suffix ids — freeze what's + unambiguous, mint once per family for the colliding members). +- **Diff bound**: a vendor migration PR may only touch collision-group files + same-family + siblings of re-idded presets; every id that is per-printer-unambiguous today stays + byte-identical. +- **Config-equivalence gate**: dump every instantiated preset's flattened effective config on + main and on the PR head; the diff must be empty except `filament_id`/`inherits`/ + `compatible_printers` edits the plan prescribes (this is what makes the Flashforge + shadow-file conversions safe: each id-less `fdm_filament_*` shadow becomes a named vendor + family root carrying its config byte-for-byte, children re-pointed, then the shadow name + retired). +- **No deletions**: redundant presets (Flashforge's byte-identical `Generic X`/`Flashforge X` + twins) are re-minted, not dropped; consolidation with `renamed_from` is a separate, + human-reviewed cleanup. +- Expected user impact: none for inheriting user presets, 3mfs, Klipper/Creality/Snapmaker + sync. Residue: user *root* presets that copied an old system id keep it forever + (AMS auto-match falls back to generic-by-type — low severity, unavoidable from the repo). + +### Vendor-specific notes (from classification) + +- **Qidi (97)**: three profile generations. `QD_*` generics are correct and frozen; the fix is + the brand families (Bambu/HATCHBOX/Overture/PolyLite/Tinmorry/QIDI-brand) that all carry + `GFB99/GFG99/GFL99`. Multi-root families are the norm (`...@Q2-Series` / `@Q2C-Series` / + `@X-Max 4-Series` bases) — same mint lands in every series root of one family. +- **Flashforge (69)**: two umbrellas (`FFG01` ~140 presets; `GFB99/GFG99/GFL99` G3U-era) + + OFL-riding branded presets + shadow-file conversion (above). +- **Elegoo (37)**: single mistake — every commercial variant inherits the material-class + `@base` (`EB00`); mint one id per product line (Silk/Matte/PRO/Rapid/…), roots exist. +- **Prusa (31)**: HF product lines need their own roots; ids move off `fdm_filament_*` + templates; frozen name-shaped and `_N` ids stay. +- **Sovol (6)**: delete the wrong own-id lines; correct ids flow from OFL by inheritance. +- **Cubicon (17)**: `@base` presets are themselves instantiated + over-claiming; 9 file edits. + +--- + +## 6. Concrete work items (PR-sized) + +1. `scripts/assign_filament_ids.py` + mint function + tests (incl. the 14-group regression set + from the adversarial pass). *(new)* +2. `orca_extra_profile_check.py`: checks §3.4-1..6 in ratchet mode + snapshot/ledger files; + drop the BBL/OFL-only gate at `:292` and the OFL skip at `:601`. *(extend)* +3. C++ validator: OFL-aware `check_duplicate_filament_subtypes`; runtime ambiguity warning at + the two `find_if` sites. *(small)* +4. Rule documentation: `doc/developer-reference/filament_id.md` (recreate the path; wiki + cross-link) + profile-PR template checkbox ("new materials: no filament_id key anywhere; CI + prints the minted id"). *(new)* +5. OFL migration PR (phase 1). +6. Per-vendor migration PRs (phase 2), each widening CI `-f` scope. + +The audit tooling from this analysis (loader-faithful resolver; reproduces the validator +1256/1256) is in this session's scratchpad (`audit_filament_ids.py`) and is the natural seed +for items 1-2. + +## 7. Evidence & methodology + +- Validator ground truth: `OrcaSlicer_profile_validator -f` tree-wide → 1256 errors; audit + script reproduces exactly (356 logical groups after dedup by (vendor, id, preset-set)). +- Code analysis: 5 parallel agents over runtime consumers, persistence/migration surface, + loader semantics, Bambu grammar, and convention history — all claims carry `file:line`. +- Classification: 37 agents (one per vendor chunk) reading actual profile JSONs; 14-sample + independent re-derivation found 1 substantive error (a Flashforge group mislabeled + `missing_id`; corrected — the loader resolves those ids from OFL). +- Design: 3 independent designs → 2 judges (both chose the deterministic mint; scores 58/50/56 + and 60/54/56) → 3 adversarial attackers (35 scenarios; every `breaks` finding is folded into + §3.2-3.4/§5 as an amendment: declared families, multi-root support, ratchet-not-absolute + checks, no-deletion rule, shadow-file conversion, classification-id-literal quarantine, + diameter siblings, case-insensitive P-hex reservation, fork guidance). +- Key history: `OGF*` born 2025-03-31 (`8c4a65e3e1`, no PR); `_##` suffix born PR #9739; + 8-char check born PR #9574; wiki (with the id-copy-paste example) removed 2025-11-24 + (`f0d79b99eb`). + +## 8. Open decisions for maintainers + +1. **Id format**: opaque deterministic `OF*` mint (recommended, judges 2/2) vs mnemonic + registry grammar (runner-up). Everything else in the plan is format-agnostic. +2. **Multi-vendor brands** (Snapmaker ships Fiberon with authentic `GF*` ids): sanction via + `shared_catalog` (recommended, low churn) vs hoisting those families into OFL. +3. **Benchy-style demo presets**: mint ids per demo preset (recommended) vs teaching the + validator `compatible_prints` gating. +4. **Alias alignment**: fix the 10 live alias-mismatch OFL duplicates by rename-to-alias + (better long-term, needs `renamed_from`) vs minting vendor ids (safer, more ids). +5. **Where the rule doc lives**: in-repo `doc/` (recommended — CI messages need a stable link) + vs wiki-only. diff --git a/task.md b/task.md new file mode 100644 index 0000000000..b563759767 --- /dev/null +++ b/task.md @@ -0,0 +1,13 @@ +check commit c2e91cb86ce013dc0486419f21620975c220c3be and it's related PR. +currently most of the system profiles didn't follow the Bambu's profiles rule of filemant id. +we want to come up a rule for filament id generation for all vendors and a fixing plan for existing system profiles so that there is no ambiguous filament ids for any given printer. + +We have two major goals: +### goal 1 +figure out a strategy or filament id generation rule. we want to follow bambu's rule but they only care about their own profiles while we need to consider generic. and the filament id generation rule should be easy to understand and maintain for not just us but other profiles creators too. either a determistic rule by using script like setting_id rule. or a documented rule so developers can refer when manually creating profiles. and figure out a way to fix migrate/fix existing filament ids in current profiles. note: bambu profiles shouldn't be touch to maintain interoperbitly with their AMS. + +### goal 2 +in existing system profiles, the ambiguous can caused by different error patterns: +1. legit sub type don't have unique filament id due to copy-paste when creating profiles. in this case, we should assign filament unique filament id to it. +2. generic and specific filament with legit same filament id adds same printer into it's compatible_printers. in this case we should remove the printer from the generic filament's compatible_printers. +3. we need to figure out more error patterns and figure out the fix strategy From 1482fb81fdf7d22495767e16ce44f1501b4a29c3 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 2 Jul 2026 23:17:15 +0800 Subject: [PATCH 02/52] filament_id: deterministic mint rule, sanctioned-state ledger, validator hardening Phase 0 of the filament_id cleanup (filament_id_plan.md): - scripts/assign_filament_ids.py: mint OF-prefixed 8-char ids as uuid5(FILAMENT_ID_NAMESPACE, filament_family//) in the base62 derivation of the setting_id precedent; loader-faithful effective-id resolver (vendor inherits chain + OrcaFilamentLibrary fallback); CLI: default assign run (idempotent no-op on a fully-idded tree), --mint Vendor/Family, --update-snapshot, --check. - scripts/filament_id_snapshot.json: the sanctioned-state ledger (1092 ids, 1965 family claims over the current tree). The tree must equal it exactly, both directions, so every id/claim change lands as a reviewable diff; a PR snapshot diff is the maintainer gate. scripts/retired_filament_ids.json is the append-only retirement ledger; --update-snapshot refuses to resurrect retired ids and to sanction new reserved-namespace claims (GF*/QD_*/P-hex/ null) for non-owner vendors without --allow-shared-catalog. - orca_extra_profile_check.py: runs check_filament_ids() tree-wide (format, snapshot equality, mint conformance, retired reuse, alias hygiene for tuned OFL generics, reserved namespaces, structure ratchet). The pre-existing check_filament_id() 8-char rule stays BBL/OFL-scoped: grandfathered longer ids exist elsewhere (e.g. Prusa's 36-char name ids) and are frozen via the snapshot instead. - PresetBundle::check_duplicate_filament_subtypes now includes OrcaFilamentLibrary presets in every vendor's per-printer duplicate check; alias-shadowed library presets are excluded via the existing m_excluded_from population (verified live in the validator load path), so only genuinely visible duplicates are flagged. AMS tray-id resolution logs a warning when a filament_id matches 2+ compatible presets (pick unchanged). - doc/developer-reference/filament_id.md: the authoring rule; PR template gains a no-hand-written-ids checkbox. - scripts/tests/test_filament_id.py: 46 stdlib-unittest tests (mint vectors, resolver semantics, every check firing/silent, ledger round-trips, byte preservation, real-tree smoke). Verified: python -m unittest discover -s scripts/tests (46 OK); python scripts/orca_extra_profile_check.py exit 0 on the unmigrated tree; assign run is a no-op; rebuilt OrcaSlicer_profile_validator -l 2 exit 0; extended -f is strictly additive vs baseline (every baseline group preserved, all new groups involve library presets, alias exclusion proven by BBL-mirror absence on BBL printers). --- .github/pull_request_template.md | 2 + doc/developer-reference/filament_id.md | 169 + scripts/assign_filament_ids.py | 851 +++ scripts/filament_id_snapshot.json | 7811 ++++++++++++++++++++++++ scripts/orca_extra_profile_check.py | 12 + scripts/retired_filament_ids.json | 3 + scripts/tests/__init__.py | 0 scripts/tests/test_filament_id.py | 669 ++ src/libslic3r/PresetBundle.cpp | 49 +- 9 files changed, 9561 insertions(+), 5 deletions(-) create mode 100644 doc/developer-reference/filament_id.md create mode 100644 scripts/assign_filament_ids.py create mode 100644 scripts/filament_id_snapshot.json create mode 100644 scripts/retired_filament_ids.json create mode 100644 scripts/tests/__init__.py create mode 100644 scripts/tests/test_filament_id.py diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 575b8f17fe..8b82f51730 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -20,6 +20,8 @@ > Please describe the tests that you have conducted to verify the changes made in this PR. --> +- [ ] New filament/material profiles: I wrote **no** `filament_id` key by hand — I ran `python scripts/assign_filament_ids.py` and `--update-snapshot` and committed both diffs (see `doc/developer-reference/filament_id.md`) + diff --git a/doc/developer-reference/filament_id.md b/doc/developer-reference/filament_id.md new file mode 100644 index 0000000000..a45268b6aa --- /dev/null +++ b/doc/developer-reference/filament_id.md @@ -0,0 +1,169 @@ +# Filament IDs (`filament_id`) + +`filament_id` identifies a **material family**: one commercial product line = one id, shared by +all of that material's per-printer / per-nozzle variants. Devices use it to match a physical +spool or tray to a filament preset. It is never per-color, per-printer, per-nozzle, or +per-preset (per-preset identity is `setting_id`). + +This page is the rule for authoring `filament_id` in system profiles +(`resources/profiles/**`). CI enforces everything below; the short version is: + +> [!IMPORTANT] +> **Never write a `filament_id` value by hand.** New families get their id from +> `python scripts/assign_filament_ids.py`; existing families already have one — inherit it. + +## Who consumes the id + +Every device integration funnels a tray material id (`tray_info_idx`) through the same +matching pipeline (`PresetBundle::sync_ams_list` and friends): + +| Ecosystem | Where the id comes from | +| --- | --- | +| Bambu AMS | device side (RFID / user tray setting) — the `GF*` catalog | +| Qidi box | built from device enums (`QD_*`); needs an exactly matching visible preset | +| Creality CFS | runtime brand/type scoring returns the current preset's id | +| Klipper (AFC / Happy Hare) | runtime lookup by filament type | +| Snapmaker | runtime color/vendor/type match | + +Tray-to-preset matching is printer-scoped, but **several consumers match globally by id alone, +first hit wins**: tray display names, `filament_is_support`, vitrification warnings, and +multi-nozzle filament grouping in the slicing pipeline. Two *different* materials sharing one +id feed wrong data to those consumers even when the presets live in different vendors — so +cross-material id sharing is never safe. Within one printer, duplicate ids silently break AMS +matching (first match wins, the tray-edit dialog hides the second preset); the profile +validator's `-f` check rejects this. + +## Do I need a new id? The one-question test + +> **Would a user consider this a different spool product than anything already in the tree?** + +Different polymer, different sub-brand (Basic / Matte / Silk / HF), fiber-filled sibling, or a +second selectable diameter → **new family, new id**. The same spool tuned for another printer +or nozzle → **join the existing family** (inherit its `@base`, write no id key). Tuning a +generic material → **join the OrcaFilamentLibrary family** (inherit `Generic X @System`, keep +the `Generic X` base name, write no id key). + +| Situation | id | +| --- | --- | +| Per-printer / per-nozzle variant of an existing material | same id (inherit, never write the key) | +| Sub-brand or product line (PLA vs PLA Matte vs PLA Silk vs PLA HF) | new id each | +| Color | never a new id | +| Second diameter selectable on the same printer (1.75 + 2.85) | sibling family, new id | +| "High-speed" tuned for a *different printer model* | same id (it is a printer variant) | +| "High-speed" selectable *alongside* the normal preset on one printer | new id (it is a product line) | + +## Structure rules + +1. **Only family roots carry the key.** Root presets (any preset *not* marked + `"instantiation": "true"`, typically ` @base` with `"instantiation": "false"`) + declare `filament_id`; instantiated variants inherit a root and never + write the key. A family may have several roots (e.g. per-series bases) — all of them must + declare the *identical* id. +2. **The family name is the base name**: the preset name with everything from the first + (optionally space-preceded) `@` stripped. `MyBrand PLA @Orca 3D Fuse1` and `MyBrand PLA@HS` + both belong to family `MyBrand PLA`. +3. **Within a family, variants' `compatible_printers` are pairwise disjoint** — per printer + preset, at most one compatible instantiated preset per id. The C++ validator (`-f`) + enforces this. +4. **Generics belong to OrcaFilamentLibrary.** A vendor tuning a generic material inherits + `Generic X @System`, keeps the `Generic X` base name (that alias is what hides the library + preset on your printers), sets a non-empty `compatible_printers`, and writes no id key. + A vendor-*branded* filament never rides a generic family id. +5. **Ids are immutable once shipped.** Renaming a family does not change its id — use + `renamed_from`. A shipped id is never recycled for a different material: old ids live on in + user presets and 3mf files and a recycled id would silently match the wrong material. + +## Minting — nobody invents ids + +New ids are deterministic, computed exactly like the `setting_id` precedent +(`scripts/assign_vendor_setting_ids.py`): + +```text +FILAMENT_ID_NAMESPACE = uuid5(setting-id NAMESPACE, "filament_id") + = c4d3ff49-4c32-5534-a3e3-00894157ab97 +filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, "filament_family//") ) +``` + +`base62_6` is the low 6 base62 digits (alphabet `0-9A-Za-z`) of the UUID taken as a big-endian +integer, most-significant digit first — 8 chars total, within the AMS length limit. `` +is the vendor bundle name (the stem of the vendor index json, e.g. `Qidi`, +`OrcaFilamentLibrary`); `` is the family base name. On the rare collision with any +existing or retired id, the minter salts the input (`…/1`, `…/2`, …) until free and the result +is frozen in the file. Example: family `MyBrand PLA` in vendor `Orca 3D` mints `OFvCEY5V`. + +Workflow for a new family: + +```bash +# 1. Author the family with NO filament_id key anywhere. +python scripts/assign_filament_ids.py # 2. mint + insert ids into the family root(s) +python scripts/assign_filament_ids.py --update-snapshot # 3. record the new claims in the ledger +python scripts/assign_filament_ids.py --check # 4. verify — the same checks CI runs +# 5. Commit the profile edits together with scripts/filament_id_snapshot.json. +``` + +`--mint "Vendor/Family"` prints the id for one family without touching anything. The default +run is idempotent and never rewrites a valid existing id. + +If you skip the tooling, CI fails and prints the remedy: the expected id for your family, and +the instruction to run `python scripts/assign_filament_ids.py --update-snapshot` and commit +the resulting diff. + +## Reserved namespaces — never mint or hand-write into + +| Space | Owner | Rule | +| --- | --- | --- | +| `GF*` | Bambu AMS/RFID catalog | BBL vendor only; byte-copies elsewhere only where the snapshot already sanctions them | +| `QD_*` | Qidi device protocol | frozen device contract; Qidi vendor only | +| `P` + 7 hex chars (case-insensitive), `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp`) | never appears in system profiles | +| every already-shipped id | grandfather snapshot | frozen as-is; new claims need maintainer sign-off | +| every retired id | `scripts/retired_filament_ids.json` | never used again, for anything | + +## How CI enforces this + +Profile CI (`check_profiles.yml` → `scripts/orca_extra_profile_check.py`) runs +`check_filament_ids()` tree-wide. Its ground truth is +**`scripts/filament_id_snapshot.json` — the sanctioned state**: the id state derived from the +tree must equal the snapshot exactly, in both directions. Any change to the id landscape +therefore surfaces as a diff to that file, and **that snapshot diff is what maintainers review +and gate in a PR**. Never edit the snapshot by hand — `--update-snapshot` regenerates it +deterministically (running it twice changes nothing). + +The checks, in brief: + +- **Format** — every id is either in the snapshot, `OF` + 6 base62 chars, BBL's, or Qidi `QD_*`. +- **Snapshot equality** — tree claims == snapshot claims, both directions. +- **Mint conformance** — a non-grandfathered `OF*` claim must equal the mint (or a salt + iteration) of its `(vendor, family)`; the error prints the expected id. +- **Retired reuse** — any tree id present in `scripts/retired_filament_ids.json` is an error. + Ids that fully vanish from the tree are appended there by `--update-snapshot`; the file is + **append-only**. +- **Alias hygiene** — a tuned generic must keep the library preset's base name and a non-empty + `compatible_printers` (structure rule 4); the error names the rename as the cause. +- **Reserved namespaces** — `GF*` outside BBL, `QD_*` outside Qidi, `P<7-hex>` or `null` + anywhere, unless that exact claim is grandfathered in the snapshot. +- **Structure** — no `filament_id` key on instantiated presets; no declared-vs-inherited id + drift; every instantiated system filament must resolve an effective id through its + `inherits` chain (an id-less one is a hard load error in C++ that discards the whole vendor + bundle). + +Sharing a **reserved-catalog** id with a new family or vendor (e.g. shipping a Bambu-cataloged +product under another vendor with its authentic `GF*` id) is refused by `--update-snapshot` +unless you pass `--allow-shared-catalog` — and it still lands in the snapshot diff for +maintainer review. Any other new sharing of an existing id is caught by the mint-conformance +check instead. + +## FAQ + +- **A new color of an existing product?** Never a new id — colors are not families. +- **A second diameter (1.75 mm and 2.85 mm) of the same product?** A sibling family with its + own id: two diameters are separately selectable spool products. +- **A high-speed tune of an existing material for another printer model?** Same family: + inherit the family's root, write no id key. +- **A tuned generic ("our profile for Generic PLA")?** Inherit `Generic PLA @System`, keep the + `Generic PLA` base name, set `compatible_printers`, write no id key. +- **I need to rename a family.** Keep the id, add `renamed_from`. Ids never change. +- **CI says my family needs an id.** Run `python scripts/assign_filament_ids.py`, then + `--update-snapshot`, and commit both diffs. Do not type an id by hand. + +For general profile authoring, see the profile development guide on the +[OrcaSlicer wiki](https://www.orcaslicer.com/wiki). diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py new file mode 100644 index 0000000000..8100ecb880 --- /dev/null +++ b/scripts/assign_filament_ids.py @@ -0,0 +1,851 @@ +#!/usr/bin/env python3 +""" +Mint deterministic filament_id values for OrcaSlicer system filament families and +validate the tree against the sanctioned-state ledger. + +Policy (companion to assign_vendor_setting_ids.py; see filament_id_plan.md): + * filament_id is a MATERIAL-FAMILY id: one commercial product line = one id, + shared by all of that material's per-printer/per-nozzle variants. The key is + declared only on family ROOT presets (instantiation != "true"); instantiated + variants inherit it through `inherits` and never write the key themselves. + * New ids are a pure function of the family's identity: + filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, + "filament_family//") ) + where is the vendor bundle name (stem of the vendor index json) and + is the family name = preset base name (name with /\\s?@.*$/ stripped). + 8 chars total, which satisfies the AMS length limit. Nobody invents ids by + hand; on the astronomically rare collision with any existing or retired id the + input is salted ("/1", "/2", ...) until free and the result is frozen in file. + * Reserved id spaces that are never minted into or altered: + - GF* Bambu AMS/RFID catalog (vendor BBL untouchable) + - QD_* Qidi device protocol + - P + 7 hex chars (case-insensitive) and the literal "null" + user-custom presets (CreatePresetsDialog.cpp) + - every already-shipped id, grandfathered via scripts/filament_id_snapshot.json + * scripts/filament_id_snapshot.json is the sanctioned-state ledger: it must + exactly equal the tree-derived state at all times, so any id/claim change shows + up as a reviewable diff to that file (the maintainer gate). Ids that fully + vanish from the tree are appended to scripts/retired_filament_ids.json; a + retired id may never be used again for anything. + +The effective-id resolution below is loader-faithful (PresetBundle.cpp +load_vendor_configs_from_json): own filament_id key, else walk `inherits` within +the vendor map, with OrcaFilamentLibrary base-bundle fallback; once a chain enters +OFL it stays in OFL; a vendor chain that dead-ends id-less retries its direct +parent in the OFL map. + +Run from anywhere: python3 scripts/assign_filament_ids.py + (default) mint + insert ids for id-less families; idempotent, never + rewrites a valid existing id; a no-op on a fully-idded tree + --mint "V/Family" print the id that would be minted; touches nothing + --update-snapshot regenerate the snapshot from the tree; retire vanished ids + --check run the validation checks (also run by CI through + orca_extra_profile_check.py); exit nonzero on errors +""" + +import argparse +import json +import os +import re +import sys +import uuid + +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) +from assign_vendor_setting_ids import ALPHABET, NAMESPACE # noqa: E402 + +# Dedicated namespace for filament_id, derived from the setting_id namespace baked +# into both Python and C++ (assign_vendor_setting_ids.NAMESPACE). Never change it. +# FILAMENT_ID_NAMESPACE == UUID("c4d3ff49-4c32-5534-a3e3-00894157ab97") +FILAMENT_ID_NAMESPACE = uuid.uuid5(NAMESPACE, "filament_id") +FILAMENT_ID_LENGTH = 6 # base62 digits after the "OF" prefix -> 8 chars total + +SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) +PROFILES_DIR = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "resources", "profiles")) +SNAPSHOT_PATH = os.path.join(SCRIPTS_DIR, "filament_id_snapshot.json") +RETIRED_PATH = os.path.join(SCRIPTS_DIR, "retired_filament_ids.json") + +OFL = "OrcaFilamentLibrary" + +OF_ID_RE = re.compile(r"^OF[0-9A-Za-z]{6}$") +# User-custom id space minted by CreatePresetsDialog.cpp ("P" + md5(name)[0:7]); +# reserved case-insensitively, together with its "null" sentinel. +USER_CUSTOM_ID_RE = re.compile(r"^P[0-9A-Fa-f]{7}$", re.IGNORECASE) +# Family name = preset base name: strip the first "@..." suffix. The space before +# "@" is optional because names like "Afinia PLA@HS" exist. +BASE_NAME_RE = re.compile(r"\s?@.*$") +# OFL generic presets relevant for alias hygiene (check 5). +OFL_GENERIC_RE = re.compile(r"^Generic .* @System$") +# Salt iterations accepted by the mint-conformance check (check 3). +MAX_CHECK_SALT = 8 + +UPDATE_HINT = 'run "python scripts/assign_filament_ids.py --update-snapshot" and commit the diff for maintainer review' + + +# Same output helpers/format as orca_extra_profile_check.py (not imported from +# there to avoid a circular import: that script imports check_filament_ids). +def print_error(msg): + print(f"\033[91m[ERROR]\033[0m {msg}") # Red + +def print_warning(msg): + print(f"\033[93m[WARNING]\033[0m {msg}") # Yellow + +def print_info(msg): + print(f"\033[94m[INFO]\033[0m {msg}") # Blue + +def print_success(msg): + print(f"\033[92m[SUCCESS]\033[0m {msg}") # Green + + +def _utf8_console(): + """Make stdout/stderr survive non-ASCII profile names on cp1252 consoles.""" + for stream in (sys.stdout, sys.stderr): + if hasattr(stream, "reconfigure"): + try: + stream.reconfigure(encoding="utf-8", errors="replace") + except (ValueError, OSError): + pass + + +# --------------------------------------------------------------------------- +# Minting +# --------------------------------------------------------------------------- + +def base_name(name): + """Family name of a preset: name with the first "@..." suffix stripped.""" + return BASE_NAME_RE.sub("", name, count=1) + + +def generate_filament_id(vendor, family, salt=0): + """Deterministic "OF" + 6-char base62 filament_id for a material family. + + input = "filament_family//" (+ "/" when salted); + u = uuid5(FILAMENT_ID_NAMESPACE, input); the id tail is the low + FILAMENT_ID_LENGTH base62 digits of int(u.bytes, "big"), most-significant + first — the same derivation as generate_preset_setting_id. + """ + key = f"filament_family/{vendor}/{family}" + if salt: + key = f"{key}/{salt}" + u = uuid.uuid5(FILAMENT_ID_NAMESPACE, key) + n = int.from_bytes(u.bytes, "big") + digits = [] + for _ in range(FILAMENT_ID_LENGTH): + digits.append(ALPHABET[n % 62]) + n //= 62 + return "OF" + "".join(reversed(digits)) + + +def mint_filament_id(vendor, family, taken): + """Mint the family's id, salting past any id in `taken` (existing + retired).""" + for salt in range(10000): + candidate = generate_filament_id(vendor, family, salt) + if candidate not in taken: + return candidate + raise RuntimeError(f"could not mint a free filament_id for {vendor}/{family}") + + +# --------------------------------------------------------------------------- +# Tree loading + loader-faithful effective-id resolution +# --------------------------------------------------------------------------- + +def load_json(path): + with open(path, "r", encoding="utf-8-sig") as f: + return json.load(f) + + +def list_vendor_names(profiles_dir): + """Vendor bundles = subdirectories with a matching .json index file. + + (Ignores stray non-bundle entries such as the tracked "user" directory, + which has no user.json index.) + """ + profiles_dir = str(profiles_dir) + return sorted( + os.path.splitext(f)[0] for f in os.listdir(profiles_dir) + if f.endswith(".json") + and os.path.isdir(os.path.join(profiles_dir, os.path.splitext(f)[0])) + ) + + +def load_vendor_filaments(profiles_dir, vendor): + """Load a vendor's filament presets from its index's filament_list. + + Returns (presets dict name -> record, list of unreadable-file messages). + """ + profiles_dir = str(profiles_dir) + presets = {} + errors = [] + try: + idx = load_json(os.path.join(profiles_dir, vendor + ".json")) + except (OSError, ValueError) as e: + return presets, [f"unreadable vendor index {vendor}.json: {e}"] + for entry in idx.get("filament_list", []): + rel = f"{vendor}/{entry.get('sub_path', '')}" + path = os.path.join(profiles_dir, vendor, entry.get("sub_path", "")) + try: + data = load_json(path) + except (OSError, ValueError) as e: + errors.append(f"unreadable filament profile {rel}: {e}") + continue + name = data.get("name", entry.get("name")) + presets[name] = { + "name": name, + "file": rel, + "path": path, + "filament_id": data.get("filament_id"), + "inherits": data.get("inherits"), + "instantiation": str(data.get("instantiation", "")).lower() == "true", + "compatible_printers": data.get("compatible_printers") or [], + } + return presets, errors + + +def resolve_filament_id(name, filaments, ofl_filaments, seen=None, in_ofl=False, skip_own=False): + """Walk the inherits chain for the effective filament_id, loader-faithfully. + + Mirrors PresetBundle.cpp load_vendor_configs_from_json: a hop resolves in the + vendor's own map first, then falls back to the OFL base-bundle map. OFL's map + was memoized entirely within OFL, so once a chain enters OFL it stays in OFL + (a vendor file sharing an OFL preset's name must not shadow OFL-internal + hops). Additionally, a vendor preset that never resolves an id inside the + vendor is re-tried against the OFL map keyed by its direct parent name. + + skip_own ignores the first preset's own filament_id key (used to compute the + id its inherits chain would resolve WITHOUT the declaration — check 7b drift). + + Returns (filament_id or None, source, ofl_entry) where source is one of + "own"/"inherited"/"missing"/"dangling"/"cycle" and ofl_entry is the name of + the OFL preset through which a vendor chain entered OFL (None when the id was + declared vendor-side or resolution started inside OFL). + """ + if seen is None: + seen = set() + if name in seen: + return None, "cycle", None + seen.add(name) + entry = None + if in_ofl: + rec = ofl_filaments.get(name) + else: + rec = filaments.get(name) + if rec is None and name in ofl_filaments: + rec, in_ofl, entry = ofl_filaments[name], True, name + if rec is None: + return None, "dangling", None + if rec.get("filament_id") and not skip_own: + return rec["filament_id"], "own" if len(seen) == 1 else "inherited", entry + parent = rec.get("inherits") + if parent: + fid, src, sub_entry = resolve_filament_id(parent, filaments, ofl_filaments, seen, in_ofl) + if fid or in_ofl: + return fid, src, entry if entry is not None else sub_entry + # Vendor chain dead-ended id-less: the loader would have consulted the + # OFL map at each vendor hop's inherits; retry this hop's parent in OFL. + if parent in ofl_filaments: + fid, src, _ = resolve_filament_id(parent, filaments, ofl_filaments, set(), True) + return fid, src, parent + return fid, src, sub_entry + return None, "missing", entry + + +def analyze_tree(profiles_dir): + """Load every vendor bundle and derive the full filament_id state. + + Returns a dict with the tree-derived snapshot sections plus the working data + the checks and the assign pass need. All claims are "Vendor/Family" strings + over INSTANTIATED system filaments, tree-wide including OFL and BBL. + """ + profiles_dir = str(profiles_dir) + vendor_names = list_vendor_names(profiles_dir) + ofl_filaments, ofl_errors = ( + load_vendor_filaments(profiles_dir, OFL) if OFL in vendor_names else ({}, []) + ) + + vendors = {} + read_errors = list(ofl_errors) + for vendor in vendor_names: + if vendor == OFL: + filaments = ofl_filaments + else: + filaments, errs = load_vendor_filaments(profiles_dir, vendor) + read_errors.extend(errs) + for rec in filaments.values(): + eff, src, ofl_entry = resolve_filament_id(rec["name"], filaments, ofl_filaments) + rec["eff_filament_id"] = eff + rec["id_source"] = src + rec["ofl_entry"] = ofl_entry + vendors[vendor] = filaments + + # id -> set of "Vendor/Family" claims over instantiated presets. Every id + # occurring in the tree is a key; ids only ever DECLARED (e.g. on a root + # whose children all override them) keep an empty claim list, so that the + # snapshot exactly equals the tree-derived state and the format/retirement + # checks can grandfather them. + ids = {} + vendor_ids = {} # vendor -> set of ids occurring there (declared or effective) + declared_ids = {} # vendor -> set of ids DECLARED in that vendor's own files + instantiated_with_id = [] # "Vendor/PresetName" (own filament_id key on an instantiated preset) + overrides = [] # (vendor, name, declared, inherited, file) + missing_effective = [] # (vendor, name, file) instantiated presets resolving no id + alias_candidates = [] # (vendor, rec, ofl_entry) presets id-resolved through an OFL generic + + for vendor, filaments in vendors.items(): + occurring = vendor_ids.setdefault(vendor, set()) + for rec in filaments.values(): + if rec.get("filament_id"): + occurring.add(rec["filament_id"]) + declared_ids.setdefault(vendor, set()).add(rec["filament_id"]) + ids.setdefault(rec["filament_id"], set()) + if rec.get("inherits"): + inherited, _src, _e = resolve_filament_id( + rec["name"], filaments, ofl_filaments, skip_own=True) + if inherited and inherited != rec["filament_id"]: + overrides.append( + (vendor, rec["name"], rec["filament_id"], inherited, rec["file"])) + if not rec["instantiation"]: + continue + eff = rec.get("eff_filament_id") + if not eff: + missing_effective.append((vendor, rec["name"], rec["file"])) + continue + occurring.add(eff) + ids.setdefault(eff, set()).add(f"{vendor}/{base_name(rec['name'])}") + if rec.get("filament_id"): + instantiated_with_id.append(f"{vendor}/{rec['name']}") + if vendor != OFL and rec["ofl_entry"] and OFL_GENERIC_RE.match(rec["ofl_entry"]): + alias_candidates.append((vendor, rec, rec["ofl_entry"])) + + # Alias hygiene (check 5): a vendor preset that tunes an OFL generic (no id + # anywhere in its vendor-side chain) is matched to the OFL preset by ALIAS + # (base name); renaming it re-exposes the OFL generic and creates a live + # duplicate, and empty compatible_printers cannot claim any printer. + alias_violations = [] # (vendor, name, ofl_entry, reason, file) + for vendor, rec, entry in alias_candidates: + expected = base_name(entry) + own_base = base_name(rec["name"]) + if own_base != expected: + alias_violations.append(( + vendor, rec["name"], entry, + f'base name "{own_base}" != "{expected}" — the rename re-exposes the ' + f"OFL preset on its printers (alias shadowing is name-based)", + rec["file"])) + elif not rec["compatible_printers"]: + alias_violations.append(( + vendor, rec["name"], entry, + "empty compatible_printers cannot shadow the OFL preset anywhere", + rec["file"])) + + return { + "vendors": vendors, + "read_errors": read_errors, + "ids": {fid: sorted(claims) for fid, claims in ids.items()}, + "vendor_ids": vendor_ids, + "declared_ids": declared_ids, + "instantiated_with_id": sorted(instantiated_with_id), + "overrides": overrides, + "id_overrides": sorted(f"{v}/{n}" for v, n, _d, _i, _f in overrides), + "missing_effective": sorted(missing_effective), + "alias_violations": alias_violations, + "alias_exceptions": sorted(f"{v}/{n}" for v, n, _e, _r, _f in alias_violations), + } + + +# --------------------------------------------------------------------------- +# Snapshot / retired-ledger IO +# --------------------------------------------------------------------------- + +def snapshot_from_analysis(analysis): + return { + "ids": {fid: sorted(claims) for fid, claims in analysis["ids"].items()}, + "instantiated_with_id": analysis["instantiated_with_id"], + "id_overrides": analysis["id_overrides"], + "alias_exceptions": analysis["alias_exceptions"], + } + + +def load_snapshot(path): + """Return the snapshot dict, or None when the file does not exist.""" + if not os.path.exists(path): + return None + data = load_json(path) + for key in ("ids", "instantiated_with_id", "id_overrides", "alias_exceptions"): + data.setdefault(key, {} if key == "ids" else []) + return data + + +def load_retired(path): + """Return the retired-ids map {id: ["Vendor/Family", ...]} ({} if absent).""" + if not os.path.exists(path): + return {} + return load_json(path).get("retired", {}) + + +def write_ledger(path, obj): + """Deterministic serialization: sorted keys, indent 1, LF, trailing newline.""" + with open(path, "w", encoding="utf-8", newline="\n") as f: + json.dump(obj, f, indent=1, ensure_ascii=False, sort_keys=True) + f.write("\n") + + +# --------------------------------------------------------------------------- +# Reserved namespaces +# --------------------------------------------------------------------------- + +def reserved_space_owner(fid): + """(is_reserved, owner_vendor or None) for the frozen id spaces.""" + if fid.startswith("GF"): + return True, "BBL" + if fid.startswith("QD_"): + return True, "Qidi" + if USER_CUSTOM_ID_RE.match(fid) or fid == "null": + return True, None # user-custom space: no system vendor may own it + return False, None + + +# --------------------------------------------------------------------------- +# Checks (imported and called tree-wide by orca_extra_profile_check.py) +# --------------------------------------------------------------------------- + +def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, + retired_path=RETIRED_PATH): + """Validate filament_id state across every vendor. Returns the error count. + + 1. Format: every id occurring in the tree (declared or effective) must be in + the snapshot, or match ^OF[0-9A-Za-z]{6}$, or belong to vendor BBL, or be + a QD_* id within vendor Qidi. + 2. Snapshot equality, both directions: the tree-derived id->families multimap + must equal the snapshot exactly (the snapshot diff is the maintainer gate). + 3. Mint conformance: an OF-format id's claim that is not grandfathered must + equal the mint of (vendor, family) or a salted iteration. + 4. Retired ids may never occur again. + 5. Alias hygiene: a tuned OFL generic must keep the generic's base name and + claim printers via non-empty compatible_printers. + 6. Reserved namespaces (GF*/QD_*/P-hex/"null") only for their owner vendors, + except claims grandfathered in the snapshot. + 7. Structure ratchet: (a) no NEW instantiated preset carries its own + filament_id key; (b) no NEW declared-vs-inherited id drift; (c) every + instantiated filament resolves an effective id (a hard load error in C++). + """ + _utf8_console() + errors = 0 + analysis = analyze_tree(profiles_dir) + snapshot = load_snapshot(snapshot_path) + if snapshot is None: + print_error(f"filament_id snapshot not found at {snapshot_path}; {UPDATE_HINT}") + return 1 + retired = load_retired(retired_path) + + for msg in analysis["read_errors"]: + print_error(msg) + errors += 1 + + snap_ids = snapshot["ids"] + tree_ids = analysis["ids"] + + # -- 1. format ---------------------------------------------------------- + for vendor in sorted(analysis["vendor_ids"]): + for fid in sorted(analysis["vendor_ids"][vendor]): + if fid in snap_ids or OF_ID_RE.match(fid): + continue + if vendor == "BBL": + continue + if vendor == "Qidi" and fid.startswith("QD_"): + continue + print_error( + f'filament_id "{fid}" ({vendor}) is neither grandfathered in the ' + f'snapshot nor a minted "OF" id; new family ids must come from ' + f'"python scripts/assign_filament_ids.py" (see --mint)') + errors += 1 + + # -- 2. snapshot equality (both directions) ----------------------------- + for fid in sorted(tree_ids): + if fid not in snap_ids: + print_error( + f'filament_id "{fid}" is not sanctioned by ' + f"scripts/filament_id_snapshot.json; {UPDATE_HINT}") + errors += 1 + continue + for claim in tree_ids[fid]: + if claim not in snap_ids[fid]: + print_error( + f'filament_id "{fid}" claim "{claim}" is not sanctioned by ' + f"scripts/filament_id_snapshot.json; {UPDATE_HINT}") + errors += 1 + for fid in sorted(snap_ids): + if fid not in tree_ids: + print_error( + f'filament_id stability: snapshot id "{fid}" vanished from the tree ' + f"(ids are immutable once shipped); {UPDATE_HINT}") + errors += 1 + continue + for claim in snap_ids[fid]: + if claim not in tree_ids[fid]: + print_error( + f'filament_id stability: snapshot claim "{claim}" of id "{fid}" ' + f"vanished from the tree (ids are immutable once shipped); {UPDATE_HINT}") + errors += 1 + + # -- 3. mint conformance for OF-format ids ------------------------------ + for fid in sorted(tree_ids): + if not OF_ID_RE.match(fid): + continue + for claim in tree_ids[fid]: + if claim in snap_ids.get(fid, []): + continue # grandfathered + vendor, family = claim.split("/", 1) + if fid not in analysis["declared_ids"].get(vendor, set()): + # The claiming vendor never declares this id — it is inherited + # from another vendor's root (an OFL generic family): correctly + # tuned generics ride the OFL family id by design, so only the + # snapshot gate (check 2) applies to this claim. + continue + minted = [generate_filament_id(vendor, family, s) for s in range(MAX_CHECK_SALT + 1)] + if fid not in minted: + print_error( + f'filament_id "{fid}" of family "{claim}" does not match its mint: ' + f'expected "{minted[0]}" (or a salted iteration); paste the expected ' + f"id into the family root (or, for an intentionally shared id, " + f"{UPDATE_HINT})") + errors += 1 + + # -- 4. retired ids may never come back --------------------------------- + for vendor in sorted(analysis["vendor_ids"]): + for fid in sorted(analysis["vendor_ids"][vendor]): + if fid in retired: + print_error( + f'filament_id "{fid}" ({vendor}) is retired ' + f"(scripts/retired_filament_ids.json) and may never be reused") + errors += 1 + + # -- 5. alias hygiene for tuned OFL generics ----------------------------- + exceptions = set(snapshot["alias_exceptions"]) + for vendor, name, entry, reason, file in analysis["alias_violations"]: + if f"{vendor}/{name}" in exceptions: + continue + print_error( + f'preset "{name}" ({file}) tunes the OFL generic "{entry}" but {reason}; ' + f'keep the OFL base name and non-empty compatible_printers, or give the ' + f"family its own minted id") + errors += 1 + + # -- 6. reserved namespaces ---------------------------------------------- + for fid in sorted(tree_ids): + is_reserved, owner = reserved_space_owner(fid) + if not is_reserved: + continue + for claim in tree_ids[fid]: + vendor = claim.split("/", 1)[0] + if vendor == owner: + continue + if claim in snap_ids.get(fid, []): + continue # grandfathered + space = f"owned by {owner}" if owner else "reserved for user-custom presets" + print_error( + f'filament_id "{fid}" of "{claim}" is in a reserved id space ' + f"({space}) and must not be claimed by system presets of other vendors") + errors += 1 + + # -- 7. structure ratchet ------------------------------------------------- + grandfathered = set(snapshot["instantiated_with_id"]) + for key in analysis["instantiated_with_id"]: + if key not in grandfathered: + print_error( + f'instantiated preset "{key}" declares its own filament_id key; the key ' + f"belongs on the family root preset only (variants inherit it)") + errors += 1 + grandfathered = set(snapshot["id_overrides"]) + for vendor, name, declared, inherited, file in analysis["overrides"]: + if f"{vendor}/{name}" in grandfathered: + continue + print_error( + f'preset "{name}" ({file}) declares filament_id "{declared}" but its ' + f'inherits chain resolves "{inherited}"; a preset must not override its ' + f"family's id") + errors += 1 + for vendor, name, file in analysis["missing_effective"]: + expected = generate_filament_id(vendor, base_name(name)) + print_error( + f'instantiated filament "{name}" ({file}) resolves no filament_id anywhere ' + f"in its inherits chain — this is a hard load error in the C++ loader; " + f'run "python scripts/assign_filament_ids.py" (expected id for family ' + f'"{vendor}/{base_name(name)}": "{expected}", salted if taken)') + errors += 1 + + return errors + + +# --------------------------------------------------------------------------- +# --update-snapshot +# --------------------------------------------------------------------------- + +def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, + retired_path=RETIRED_PATH, allow_shared_catalog=False): + """Regenerate the snapshot from the tree; retire ids that fully vanished. + + Refuses to sanction NEW reserved-namespace ids (or new claims on them) for + non-owner vendors unless --allow-shared-catalog is passed. Idempotent: a + second run over an unchanged tree changes nothing. Returns 0 on success. + """ + analysis = analyze_tree(profiles_dir) + for msg in analysis["read_errors"]: + print_error(msg) + new_snap = snapshot_from_analysis(analysis) + old_snap = load_snapshot(snapshot_path) + old_ids = old_snap["ids"] if old_snap else {} + + # Gate: new reserved-namespace ids / claims for non-owner vendors. + refusals = [] + for fid, claims in sorted(new_snap["ids"].items()): + is_reserved, owner = reserved_space_owner(fid) + if not is_reserved: + continue + for claim in claims: + if claim in old_ids.get(fid, []): + continue + vendor = claim.split("/", 1)[0] + if vendor == owner: + continue + refusals.append((fid, claim, owner)) + if not claims and fid not in old_ids: + # Declared-only new id: attribute it to its declaring vendor(s). + for vendor in sorted(analysis["vendor_ids"]): + if fid in analysis["vendor_ids"][vendor] and vendor != owner: + refusals.append((fid, f"{vendor}/(declared only)", owner)) + if refusals and not allow_shared_catalog: + for fid, claim, owner in refusals: + space = f"owned by {owner}" if owner else "reserved for user-custom presets" + print_error( + f'refusing to sanction new claim "{claim}" on reserved-namespace id ' + f'"{fid}" ({space}); pass --allow-shared-catalog only for ' + f"maintainer-approved shared-catalog families") + return 1 + + # Retirement is permanent: refuse to sanction a tree that resurrects a + # retired id (check 4 would reject the resulting snapshot forever anyway). + retired = load_retired(retired_path) + reused = sorted(set(new_snap["ids"]) & set(retired)) + if reused: + for fid in reused: + print_error( + f'refusing to sanction retired filament_id "{fid}" ' + f"(scripts/retired_filament_ids.json is append-only; retired ids may " + f"never be reused — mint a fresh id for the family instead)") + return 1 + + # Retire ids that fully vanished from the tree (append-only ledger). + newly_retired = [] + for fid in sorted(old_ids): + if fid not in new_snap["ids"]: + retired[fid] = sorted(set(retired.get(fid, [])) | set(old_ids[fid])) + newly_retired.append(fid) + + # Diff summary. + added_ids = sorted(set(new_snap["ids"]) - set(old_ids)) + removed_ids = sorted(set(old_ids) - set(new_snap["ids"])) + added_claims = sum( + len(set(claims) - set(old_ids.get(fid, []))) + for fid, claims in new_snap["ids"].items()) + removed_claims = sum( + len(set(claims) - set(new_snap["ids"].get(fid, []))) + for fid, claims in old_ids.items()) + old_snap = old_snap or {"ids": {}, "instantiated_with_id": [], "id_overrides": [], + "alias_exceptions": []} + changed = new_snap != old_snap + + if changed: + write_ledger(snapshot_path, new_snap) + if newly_retired or not os.path.exists(retired_path): + write_ledger(retired_path, {"retired": retired}) + + print_info(f"snapshot ids : {len(new_snap['ids'])} (+{len(added_ids)} / -{len(removed_ids)})") + print_info(f"claims added : {added_claims}") + print_info(f"claims removed : {removed_claims}") + print_info(f"ids retired now : {len(newly_retired)}" + + (f" ({', '.join(newly_retired)})" if newly_retired else "")) + for section in ("instantiated_with_id", "id_overrides", "alias_exceptions"): + before, after = len(old_snap.get(section, [])), len(new_snap[section]) + print_info(f"{section:<18}: {after} ({after - before:+d})") + if changed: + print_success(f"snapshot written to {snapshot_path}") + else: + print_success("snapshot already up to date; nothing changed") + return 0 + + +# --------------------------------------------------------------------------- +# Default run: mint + insert ids for id-less families +# --------------------------------------------------------------------------- + +def insert_filament_id(text, new_id): + """Insert a `"filament_id"` line into a preset that lacks one. + + Placed just before `instantiation` (or, failing that, after the `name` line) + so it matches the canonical key order, reusing that anchor line's indentation + and line ending. Same byte-preserving approach as assign_vendor_setting_ids. + """ + m = re.search(r'^([ \t]*)"instantiation"[ \t]*:.*?(\r?\n)', text, re.MULTILINE) + if m: + line = f'{m.group(1)}"filament_id": {json.dumps(new_id, ensure_ascii=False)},{m.group(2)}' + return text[:m.start()] + line + text[m.start():], 1 + m = re.search(r'^([ \t]*)"name"[ \t]*:.*?(\r?\n)', text, re.MULTILINE) + if m: + line = f'{m.group(1)}"filament_id": {json.dumps(new_id, ensure_ascii=False)},{m.group(2)}' + return text[:m.end()] + line + text[m.end():], 1 + return text, 0 + + +def write_filament_id(path, new_id): + """Insert new_id into the profile at path, byte-preserving everything else. + + Binary IO keeps the file's original line endings (LF or CRLF) and exact + formatting apart from the inserted line; the result is re-parsed to + guarantee it is still valid JSON. + """ + with open(path, "rb") as f: + raw = f.read() + bom = raw.startswith(b"\xef\xbb\xbf") + text = raw.decode("utf-8-sig") + text, n = insert_filament_id(text, new_id) + if n == 0: + raise RuntimeError(f"Could not insert filament_id into {path}") + json.loads(text) # fail loudly if the edit broke the JSON + with open(path, "wb") as f: + f.write((b"\xef\xbb\xbf" if bom else b"") + text.encode("utf-8")) + + +def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, + retired_path=RETIRED_PATH): + """Mint + insert ids for id-less families. Never rewrites a valid existing id. + + A family = (vendor, base name) group over instantiated filaments with no + effective id. The minted id is inserted into the family's root(s): the + presets its members inherit that carry no id, or the member itself when it + has no vendor-side parent. Returns (files_changed, errors). + """ + analysis = analyze_tree(profiles_dir) + errors = 0 + for msg in analysis["read_errors"]: + print_error(msg) + errors += 1 + + # Group id-less instantiated presets into families. + families = {} # (vendor, family) -> [rec] + for vendor, name, _file in analysis["missing_effective"]: + rec = analysis["vendors"][vendor][name] + if rec["id_source"] in ("cycle", "dangling"): + print_error(f'cannot mint for "{vendor}/{name}": broken inherits chain ' + f'({rec["id_source"]})') + errors += 1 + continue + families.setdefault((vendor, base_name(name)), []).append(rec) + + if not families: + print_success("every instantiated filament already resolves a filament_id; " + "nothing to do (0 files changed)") + return 0, errors + + # Ids already spoken for: whole tree (declared or effective) + ledgers. + snapshot = load_snapshot(snapshot_path) or {"ids": {}} + taken = set(snapshot["ids"]) | set(load_retired(retired_path)) + for occurring in analysis["vendor_ids"].values(): + taken |= occurring + + # Family root(s): the direct vendor-side parents of the members (id-less by + # construction), or the member itself when it has none. + roots = {} # (vendor, family) -> {preset name: rec} + root_claims = {} # (vendor, root name) -> set of families wanting to write it + for key, members in sorted(families.items()): + vendor = key[0] + vendor_map = analysis["vendors"][vendor] + family_roots = {} + for rec in members: + parent = rec.get("inherits") + root = vendor_map.get(parent) if parent else None + if root is None or root.get("filament_id"): + root = rec # root-less member carries the id itself + family_roots[root["name"]] = root + root_claims.setdefault((vendor, root["name"]), set()).add(key) + roots[key] = family_roots + + files_changed = 0 + families_minted = 0 + for key, family_roots in sorted(roots.items()): + vendor, family = key + shared = [n for n in family_roots + if len(root_claims[(vendor, n)]) > 1] + if shared: + others = sorted({f"{v}/{f}" for n in shared + for (v, f) in root_claims[(vendor, n)] if (v, f) != key}) + print_error( + f'cannot mint for family "{vendor}/{family}": root(s) ' + f"{sorted(shared)} are shared with famil(ies) {others}; split the " + f"roots so each family has its own") + errors += 1 + continue + new_id = mint_filament_id(vendor, family, taken) + taken.add(new_id) + families_minted += 1 + for name in sorted(family_roots): + root = family_roots[name] + write_filament_id(root["path"], new_id) + files_changed += 1 + print_info(f'family "{vendor}/{family}": filament_id "{new_id}" -> {root["file"]}') + + print_info(f"families minted : {families_minted}") + print_info(f"files changed : {files_changed}") + if files_changed: + print_warning(f"now {UPDATE_HINT}") + return files_changed, errors + + +# --------------------------------------------------------------------------- +# CLI +# --------------------------------------------------------------------------- + +def main(argv=None): + _utf8_console() + parser = argparse.ArgumentParser( + description="Mint deterministic filament_id values for id-less filament " + "families and validate the tree against the sanctioned snapshot.") + parser.add_argument("--mint", metavar='"Vendor/Family"', + help="print the id that would be minted for a family; " + "touches nothing") + parser.add_argument("--update-snapshot", action="store_true", + help="regenerate scripts/filament_id_snapshot.json from the " + "tree; ids that fully vanished are retired") + parser.add_argument("--check", action="store_true", + help="run the filament_id checks; exit nonzero on errors") + parser.add_argument("--allow-shared-catalog", action="store_true", + help="with --update-snapshot: allow sanctioning new claims " + "on reserved-namespace ids for non-owner vendors") + parser.add_argument("--profiles", default=PROFILES_DIR, + help="profiles directory (default: resources/profiles)") + args = parser.parse_args(argv) + + if args.mint: + if "/" not in args.mint: + parser.error('--mint expects "Vendor/Family"') + vendor, family = args.mint.split("/", 1) + snapshot = load_snapshot(SNAPSHOT_PATH) or {"ids": {}} + taken = set(snapshot["ids"]) | set(load_retired(RETIRED_PATH)) + print(mint_filament_id(vendor, family, taken)) + return 0 + + if args.update_snapshot: + return update_snapshot(args.profiles, SNAPSHOT_PATH, RETIRED_PATH, + allow_shared_catalog=args.allow_shared_catalog) + + if args.check: + errors = check_filament_ids(args.profiles, SNAPSHOT_PATH, RETIRED_PATH) + if errors: + print_error(f"filament_id check: {errors} error(s)") + return 1 + print_success("filament_id check: no errors") + return 0 + + _changed, errors = assign_missing_ids(args.profiles, SNAPSHOT_PATH, RETIRED_PATH) + return 1 if errors else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json new file mode 100644 index 0000000000..462098d581 --- /dev/null +++ b/scripts/filament_id_snapshot.json @@ -0,0 +1,7811 @@ +{ + "alias_exceptions": [ + "Flashforge/Flashforge ABS Basic @FF C5", + "Flashforge/Flashforge ABS Basic @FF C5P", + "Flashforge/Flashforge ABS-GF @FF C5", + "Flashforge/Flashforge ABS-GF @FF C5P", + "Flashforge/Flashforge ASA Basic @FF C5", + "Flashforge/Flashforge ASA Basic @FF C5P", + "Flashforge/Flashforge ASA-CF @FF C5", + "Flashforge/Flashforge ASA-CF @FF C5P", + "Flashforge/Flashforge ASA-GF @FF C5", + "Flashforge/Flashforge ASA-GF @FF C5P", + "Flashforge/Flashforge HIPS @FF C5", + "Flashforge/Flashforge HIPS @FF C5P", + "Flashforge/Flashforge HS PETG @FF C5", + "Flashforge/Flashforge HS PETG @FF C5P", + "Flashforge/Flashforge HS PLA @FF C5", + "Flashforge/Flashforge HS PLA @FF C5P", + "Flashforge/Flashforge PA-CF @FF C5", + "Flashforge/Flashforge PA-CF @FF C5P", + "Flashforge/Flashforge PAHT-CF @FF C5", + "Flashforge/Flashforge PAHT-CF @FF C5P", + "Flashforge/Flashforge PET-CF @FF C5", + "Flashforge/Flashforge PET-CF @FF C5P", + "Flashforge/Flashforge PETG Pro @FF C5", + "Flashforge/Flashforge PETG Pro @FF C5P", + "Flashforge/Flashforge PETG Transparent @FF C5", + "Flashforge/Flashforge PETG Transparent @FF C5P", + "Flashforge/Flashforge PETG-CF @FF C5", + "Flashforge/Flashforge PETG-CF @FF C5P", + "Flashforge/Flashforge PLA Matte @FF C5", + "Flashforge/Flashforge PLA Matte @FF C5P", + "Flashforge/Flashforge PLA Metal @FF C5", + "Flashforge/Flashforge PLA Metal @FF C5P", + "Flashforge/Flashforge PLA Pro @FF C5", + "Flashforge/Flashforge PLA Pro @FF C5P", + "Flashforge/Flashforge PLA Basic @FF C5", + "Flashforge/Flashforge PLA Basic @FF C5P", + "Flashforge/Flashforge PLA Color Change @FF C5", + "Flashforge/Flashforge PLA Color Change @FF C5P", + "Flashforge/Flashforge PLA Galaxy @FF C5", + "Flashforge/Flashforge PLA Galaxy @FF C5P", + "Flashforge/Flashforge PLA Luminous @FF C5", + "Flashforge/Flashforge PLA Luminous @FF C5P", + "Flashforge/Flashforge PLA Silk @FF C5", + "Flashforge/Flashforge PLA Silk @FF C5P", + "Flashforge/Flashforge PLA-CF @FF C5", + "Flashforge/Flashforge PLA-CF @FF C5P", + "Flashforge/Flashforge PPA-CF @FF C5", + "Flashforge/Flashforge PPA-CF @FF C5P", + "Flashforge/Flashforge PPS-CF @FF C5", + "Flashforge/Flashforge PPS-CF @FF C5P", + "Flashforge/Flashforge PVA @FF C5", + "Flashforge/Flashforge PVA @FF C5P", + "Flashforge/Flashforge TPU-64D @FF C5", + "Flashforge/Flashforge TPU-64D @FF C5P", + "Flashforge/Flashforge TPU-90A @FF C5", + "Flashforge/Flashforge TPU-90A @FF C5P", + "Flashforge/Flashforge TPU-95A @FF C5", + "Flashforge/Flashforge TPU-95A @FF C5P", + "Flashforge/FusRock PAHT-CF @FF C5", + "Flashforge/FusRock PAHT-CF @FF C5P", + "Flashforge/FusRock S-Multi @FF C5", + "Flashforge/FusRock S-Multi @FF C5P", + "Flashforge/FusRock S-PAHT @FF C5", + "Flashforge/FusRock S-PAHT @FF C5P", + "Flashforge/Generic TPU-64D @FF C5", + "Flashforge/Generic TPU-64D @FF C5P", + "Flashforge/Generic TPU-90A @FF C5", + "Flashforge/Generic TPU-90A @FF C5P", + "Flashforge/Generic TPU-95A @FF C5", + "Flashforge/Generic TPU-95A @FF C5P" + ], + "id_overrides": [ + "Afinia/Afinia PLA", + "Afinia/Afinia PLA@HS", + "Afinia/Afinia Value PLA", + "Afinia/Afinia Value PLA@HS", + "Anker/Anker Generic PA @base", + "Anker/Anker Generic PA-CF @base", + "Anker/Anker Generic PC @base", + "Anker/Anker Generic PETG @base", + "Anker/Anker Generic PETG-CF @base", + "Anker/Anker Generic PLA @base", + "Anker/Anker Generic PLA Silk @base", + "Anker/Anker Generic PLA+ @base", + "Anker/Anker Generic PLA-CF @base", + "Anycubic/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic Generic PA", + "Anycubic/Anycubic Generic PA-CF", + "Anycubic/Anycubic Generic PC", + "Anycubic/Anycubic Generic PETG", + "Anycubic/Anycubic Generic PLA", + "Anycubic/Anycubic Generic PLA-CF", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", + "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Panchroma PLA @Anycubic Kobra S1", + "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", + "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", + "Artillery/Artillery Generic PETG", + "Artillery/Artillery Generic PLA", + "Artillery/Artillery Generic PLA-CF", + "BBL/BETA HIPS @base", + "BBL/BETA PAHT-CF @base", + "BBL/BETA PETG @base", + "BBL/BETA PETG Fluorescence @base", + "BBL/BETA PETG Glitter @base", + "BBL/BETA PETG Glow @base", + "BBL/BETA PETG Gradient @base", + "BBL/BETA PETG HF @base", + "BBL/BETA PETG Heat Color Change @base", + "BBL/BETA PETG Marble @base", + "BBL/BETA PETG Matte @base", + "BBL/BETA PETG Metallic @base", + "BBL/BETA PETG Transparent @base", + "BBL/BETA PETG UV Color Change @base", + "BBL/BETA PETG-CF @base", + "BBL/BETA PETG-GF @base", + "BBL/BETA PLA Basic @base", + "BBL/BETA PLA Chameleon @base", + "BBL/BETA PLA Fluorescence @base", + "BBL/BETA PLA Glitter @base", + "BBL/BETA PLA Glow @base", + "BBL/BETA PLA Gradient @base", + "BBL/BETA PLA Heat Color Change @base", + "BBL/BETA PLA High Speed @base", + "BBL/BETA PLA High Temp @base", + "BBL/BETA PLA Marble @base", + "BBL/BETA PLA Matte @base", + "BBL/BETA PLA Metal @base", + "BBL/BETA PLA Metallic @base", + "BBL/BETA PLA PRO @base", + "BBL/BETA PLA Silk @base", + "BBL/BETA PLA Silk+ @base", + "BBL/BETA PLA Transparent @base", + "BBL/BETA PLA UV Color Change @base", + "BBL/BETA PLA Wood @base", + "BBL/BETA PLA Youth @base", + "BBL/BETA PLA-CF @base", + "BBL/Bambu PA-CF @base", + "BBL/Bambu PA6-CF @base", + "BBL/Bambu PA6-GF @base", + "BBL/Bambu PAHT-CF @base", + "BBL/Bambu PC @base", + "BBL/Bambu PC FR @base", + "BBL/Bambu PET-CF @base", + "BBL/Bambu PETG Basic @base", + "BBL/Bambu PETG HF @base", + "BBL/Bambu PETG Translucent @base", + "BBL/Bambu PETG-CF @base", + "BBL/Bambu PLA Aero @base", + "BBL/Bambu PLA Basic @base", + "BBL/Bambu PLA Dynamic @base", + "BBL/Bambu PLA Galaxy @base", + "BBL/Bambu PLA Glow @base", + "BBL/Bambu PLA Lite @base", + "BBL/Bambu PLA Marble @base", + "BBL/Bambu PLA Matte @base", + "BBL/Bambu PLA Metal @base", + "BBL/Bambu PLA Silk @base", + "BBL/Bambu PLA Silk+ @base", + "BBL/Bambu PLA Sparkle @base", + "BBL/Bambu PLA Tough @base", + "BBL/Bambu PLA Tough+ @base", + "BBL/Bambu PLA Translucent @base", + "BBL/Bambu PLA Wood @base", + "BBL/Bambu PLA-CF @base", + "BBL/Bambu PPA-CF @base", + "BBL/Bambu Support For PA/PET @base", + "BBL/Bambu Support For PLA @base", + "BBL/Bambu Support For PLA/PETG @base", + "BBL/Bambu Support G @base", + "BBL/Bambu Support W @base", + "BBL/Fiberon PA12-CF @base", + "BBL/Fiberon PA12-CF10 @base", + "BBL/Fiberon PA6-CF @base", + "BBL/Fiberon PA6-CF20 @base", + "BBL/Fiberon PA6-GF @base", + "BBL/Fiberon PA6-GF25 @base", + "BBL/Fiberon PA612-CF @base", + "BBL/Fiberon PA612-CF15 @base", + "BBL/Fiberon PET-CF @base", + "BBL/Fiberon PET-CF17 @base", + "BBL/Fiberon PETG-ESD @base", + "BBL/Fiberon PETG-rCF @base", + "BBL/Fiberon PETG-rCF08 @base", + "BBL/Generic BVOH @base", + "BBL/Generic EVA @base", + "BBL/Generic HIPS @base", + "BBL/Generic PA @base", + "BBL/Generic PA-CF @base", + "BBL/Generic PC @base", + "BBL/Generic PCTG @base", + "BBL/Generic PE @base", + "BBL/Generic PE-CF @base", + "BBL/Generic PETG @base", + "BBL/Generic PETG HF @base", + "BBL/Generic PETG-CF @base", + "BBL/Generic PHA @base", + "BBL/Generic PLA @base", + "BBL/Generic PLA High Speed @base", + "BBL/Generic PLA Silk @base", + "BBL/Generic PLA-CF @base", + "BBL/Generic PP @base", + "BBL/Generic PP-CF @base", + "BBL/Generic PP-GF @base", + "BBL/Generic PPA-CF @base", + "BBL/Generic PPA-GF @base", + "BBL/Generic SBS", + "BBL/Generic SBS @base", + "BBL/Numakers PLA+ @base", + "BBL/Overture Matte PLA @base", + "BBL/Overture PLA @base", + "BBL/Overture PLA Pro @base", + "BBL/Panchroma CoPE @base", + "BBL/Panchroma PLA @base", + "BBL/Panchroma PLA Celestial @base", + "BBL/Panchroma PLA Galaxy @base", + "BBL/Panchroma PLA Glow @base", + "BBL/Panchroma PLA Luminous @base", + "BBL/Panchroma PLA Marble @base", + "BBL/Panchroma PLA Matte @base", + "BBL/Panchroma PLA Metallic @base", + "BBL/Panchroma PLA Neon @base", + "BBL/Panchroma PLA Satin @base", + "BBL/Panchroma PLA Silk @base", + "BBL/Panchroma PLA Starlight @base", + "BBL/Panchroma PLA Temp Shift @base", + "BBL/Panchroma PLA Translucent @base", + "BBL/Panchroma PLA UV Shift @base", + "BBL/PolyLite CosPLA @base", + "BBL/PolyLite PETG @base", + "BBL/PolyLite PLA @base", + "BBL/PolyLite PLA Galaxy @base", + "BBL/PolyLite PLA Glow @base", + "BBL/PolyLite PLA Luminous @base", + "BBL/PolyLite PLA Neon @base", + "BBL/PolyLite PLA Pro @base", + "BBL/PolyLite PLA Starlight @base", + "BBL/PolyLite PLA Translucent @base", + "BBL/PolyTerra PLA @base", + "BBL/PolyTerra PLA Marble @base", + "BBL/PolyTerra PLA+ @base", + "BBL/Polymaker HT-PLA @base", + "BBL/Polymaker HT-PLA-GF @base", + "BBL/SUNLU PETG @base", + "BBL/SUNLU PLA Marble @base", + "BBL/SUNLU PLA Matte @base", + "BBL/SUNLU PLA+ 2.0 @base", + "BBL/SUNLU PLA+ @base", + "BBL/SUNLU Silk PLA+ @base", + "BBL/SUNLU Wood PLA @base", + "BBL/eSUN PLA+ @base", + "Blocks/Blocks Generic PA", + "Blocks/Blocks Generic PA-CF", + "Blocks/Blocks Generic PC", + "Blocks/Blocks Generic PLA", + "Blocks/Blocks Generic PLA-CF", + "CONSTRUCT3D/C1 Generic High Flow PETG", + "CONSTRUCT3D/C1 Generic PETG", + "CONSTRUCT3D/C1 Generic PLA", + "Chuanying/Chuanying Generic HS PLA", + "Chuanying/Chuanying Generic PETG", + "Chuanying/Chuanying Generic PETG-CF10", + "Chuanying/Chuanying Generic PLA", + "Chuanying/Chuanying Generic PLA-CF10", + "Chuanying/Chuanying Generic PLA-Silk", + "Chuanying/Chuanying Generic PVA", + "Co Print/CoPrint Generic PLA", + "CoLiDo/CoLiDo Generic PETG @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic PETG @CoLiDo X16", + "CoLiDo/CoLiDo Generic PLA @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic PLA @CoLiDo X16", + "CoLiDo/CoLiDo PETG @CoLiDo SR1", + "CoLiDo/CoLiDo PLA @CoLiDo SR1", + "CoLiDo/CoLiDo PLA Silk @CoLiDo SR1", + "CoLiDo/CoLiDo PLA+ @CoLiDo DIY 4.0 V2", + "Comgrow/Comgrow Generic PETG", + "Comgrow/Comgrow Generic PLA", + "Creality/CR-Nylon @K1 Max_CFS-C-all", + "Creality/CR-Nylon @K1C-all", + "Creality/CR-Nylon @K1C_CFS-C-all", + "Creality/CR-Nylon @K1_CFS-C-all", + "Creality/CR-Nylon @K2 Plus-all", + "Creality/CR-PLA @Ender-3 V4-all", + "Creality/CR-PLA @Hi-all", + "Creality/CR-PLA @K1 Max_CFS-C-all", + "Creality/CR-PLA @K1 SE-all", + "Creality/CR-PLA @K1 SE_CFS-C-all", + "Creality/CR-PLA @K1C-all", + "Creality/CR-PLA @K1C_CFS-C-all", + "Creality/CR-PLA @K1_CFS-C-all", + "Creality/CR-PLA @K2 Plus-all", + "Creality/CR-PLA @K2 Pro-all", + "Creality/CR-PLA @K2 SE-all", + "Creality/CR-PLA @K2-all", + "Creality/CR-PLA @SPARKX i7-all", + "Creality/CR-PLA Carbon @K1 Max_CFS-C-all", + "Creality/CR-PLA Carbon @K1C-all", + "Creality/CR-PLA Carbon @K1C_CFS-C-all", + "Creality/CR-PLA Carbon @K1_CFS-C-all", + "Creality/CR-PLA Carbon @K2 Plus-all", + "Creality/CR-PLA Fluo @K1 Max_CFS-C-all", + "Creality/CR-PLA Fluo @K1C-all", + "Creality/CR-PLA Fluo @K1C_CFS-C-all", + "Creality/CR-PLA Fluo @K1_CFS-C-all", + "Creality/CR-PLA Fluo @K2 Plus-all", + "Creality/CR-PLA Fluo @K2 Pro-all", + "Creality/CR-PLA Fluo @K2-all", + "Creality/CR-PLA Fluo @SPARKX i7-all", + "Creality/CR-PLA Matte @Ender-3 V4-all", + "Creality/CR-PLA Matte @K1 Max_CFS-C-all", + "Creality/CR-PLA Matte @K1C-all", + "Creality/CR-PLA Matte @K1C_CFS-C-all", + "Creality/CR-PLA Matte @K1_CFS-C-all", + "Creality/CR-PLA Matte @K2 Plus-all", + "Creality/CR-PLA Matte @K2 Pro-all", + "Creality/CR-PLA Matte @K2-all", + "Creality/CR-PLA Matte @SPARKX i7-all", + "Creality/CR-Silk @Ender-3 V4-all", + "Creality/CR-Silk @Hi-all", + "Creality/CR-Silk @K1 Max_CFS-C-all", + "Creality/CR-Silk @K1 SE-all", + "Creality/CR-Silk @K1 SE_CFS-C-all", + "Creality/CR-Silk @K1C-all", + "Creality/CR-Silk @K1C_CFS-C-all", + "Creality/CR-Silk @K1_CFS-C-all", + "Creality/CR-Silk @K2 Plus-all", + "Creality/CR-Silk @K2 Pro-all", + "Creality/CR-Silk @K2 SE-all", + "Creality/CR-Silk @K2-all", + "Creality/CR-Silk @SPARKX i7-all", + "Creality/CR-Wood @K1 Max_CFS-C-all", + "Creality/CR-Wood @K1C-all", + "Creality/CR-Wood @K1C_CFS-C-all", + "Creality/CR-Wood @K1_CFS-C-all", + "Creality/CR-Wood @K2 Plus-all", + "Creality/Creality Generic PA-CF", + "Creality/Creality Generic PC", + "Creality/Creality Generic PETG", + "Creality/Creality Generic PLA", + "Creality/Creality Generic PLA-CF", + "Creality/Creality HF Generic PLA", + "Creality/Creality HF Generic Speed PLA", + "Creality/EN-PLA+ @K1 Max_CFS-C-all", + "Creality/EN-PLA+ @K1C-all", + "Creality/EN-PLA+ @K1C_CFS-C-all", + "Creality/EN-PLA+ @K1_CFS-C-all", + "Creality/EN-PLA+ @K2 Plus-all", + "Creality/EN-PLA+ @K2 Pro-all", + "Creality/EN-PLA+ @K2-all", + "Creality/EN-PLA+ @SPARKX i7-all", + "Creality/ENDER FAST PLA @Hi-all", + "Creality/ENDER FAST PLA @K2 Plus-all", + "Creality/ENDER FAST PLA @K2 Pro-all", + "Creality/ENDER FAST PLA @K2-all", + "Creality/ENDER FAST PLA @SPARKX i7-all", + "Creality/Ender-PLA @Ender-3 V4-all", + "Creality/Ender-PLA @Hi-all", + "Creality/Ender-PLA @K1 Max_CFS-C-all", + "Creality/Ender-PLA @K1C-all", + "Creality/Ender-PLA @K1C_CFS-C-all", + "Creality/Ender-PLA @K1_CFS-C-all", + "Creality/Ender-PLA @K2 Plus-all", + "Creality/Ender-PLA @K2 Pro-all", + "Creality/Ender-PLA @K2-all", + "Creality/Ender-PLA @SPARKX i7-all", + "Creality/Generic HIPS @K1 Max_CFS-C-all", + "Creality/Generic HIPS @K1C-all", + "Creality/Generic HIPS @K1C_CFS-C-all", + "Creality/Generic HIPS @K1_CFS-C-all", + "Creality/Generic HIPS @K2 Plus-all", + "Creality/Generic PA @K1 Max_CFS-C-all", + "Creality/Generic PA @K1C-all", + "Creality/Generic PA @K1C_CFS-C-all", + "Creality/Generic PA @K1_CFS-C-all", + "Creality/Generic PA @K2 Plus-all", + "Creality/Generic PA @K2 Pro-all", + "Creality/Generic PA @K2-all", + "Creality/Generic PA-CF @K1 Max_CFS-C-all", + "Creality/Generic PA-CF @K1C-all", + "Creality/Generic PA-CF @K1C_CFS-C-all", + "Creality/Generic PA-CF @K1_CFS-C-all", + "Creality/Generic PA-CF @K2 Plus-all", + "Creality/Generic PA12-CF @K2 Plus-all", + "Creality/Generic PA6-CF @K1 Max_CFS-C-all", + "Creality/Generic PA6-CF @K1C-all", + "Creality/Generic PA6-CF @K1C_CFS-C-all", + "Creality/Generic PA6-CF @K1_CFS-C-all", + "Creality/Generic PA6-CF @K2 Plus-all", + "Creality/Generic PA6-CF @K2 Pro-all", + "Creality/Generic PA612-CF @K2 Plus-all", + "Creality/Generic PA612-CF @K2 Pro-all", + "Creality/Generic PAHT-CF @K1 Max_CFS-C-all", + "Creality/Generic PAHT-CF @K1C-all", + "Creality/Generic PAHT-CF @K1C_CFS-C-all", + "Creality/Generic PAHT-CF @K1_CFS-C-all", + "Creality/Generic PAHT-CF @K2 Plus-all", + "Creality/Generic PAHT-CF @K2 Pro-all", + "Creality/Generic PAHT-CF @K2-all", + "Creality/Generic PC @K1 Max_CFS-C-all", + "Creality/Generic PC @K1C-all", + "Creality/Generic PC @K1C_CFS-C-all", + "Creality/Generic PC @K1_CFS-C-all", + "Creality/Generic PC @K2 Plus-all", + "Creality/Generic PC @K2 Pro-all", + "Creality/Generic PET @K1 Max_CFS-C-all", + "Creality/Generic PET @K1C-all", + "Creality/Generic PET @K1C_CFS-C-all", + "Creality/Generic PET @K1_CFS-C-all", + "Creality/Generic PET @K2 Plus-all", + "Creality/Generic PET @K2 Pro-all", + "Creality/Generic PET @K2-all", + "Creality/Generic PET-CF @K1 Max_CFS-C-all", + "Creality/Generic PET-CF @K1C-all", + "Creality/Generic PET-CF @K1C_CFS-C-all", + "Creality/Generic PET-CF @K1_CFS-C-all", + "Creality/Generic PET-CF @K2 Plus-all", + "Creality/Generic PET-CF @K2 Pro-all", + "Creality/Generic PLA @Ender-3 V4-all", + "Creality/Generic PLA @Hi-all", + "Creality/Generic PLA @K1 Max_CFS-C-all", + "Creality/Generic PLA @K1 SE-all", + "Creality/Generic PLA @K1 SE_CFS-C-all", + "Creality/Generic PLA @K1C-all", + "Creality/Generic PLA @K1C_CFS-C-all", + "Creality/Generic PLA @K1_CFS-C-all", + "Creality/Generic PLA @K2 Plus-all", + "Creality/Generic PLA @K2 Pro-all", + "Creality/Generic PLA @K2 SE-all", + "Creality/Generic PLA @K2-all", + "Creality/Generic PLA @SPARKX i7-all", + "Creality/Generic PLA-CF @Ender-3 V4-all", + "Creality/Generic PLA-CF @K1 Max_CFS-C-all", + "Creality/Generic PLA-CF @K1 SE-all", + "Creality/Generic PLA-CF @K1 SE_CFS-C-all", + "Creality/Generic PLA-CF @K1C-all", + "Creality/Generic PLA-CF @K1C_CFS-C-all", + "Creality/Generic PLA-CF @K1_CFS-C-all", + "Creality/Generic PLA-CF @K2 Plus-all", + "Creality/Generic PLA-CF @K2 Pro-all", + "Creality/Generic PLA-CF @K2 SE-all", + "Creality/Generic PLA-CF @K2-all", + "Creality/Generic PLA-CF @SPARKX i7-all", + "Creality/Generic PLA-Silk @Ender-3 V4-all", + "Creality/Generic PLA-Silk @Hi-all", + "Creality/Generic PLA-Silk @K1 Max_CFS-C-all", + "Creality/Generic PLA-Silk @K1 SE-all", + "Creality/Generic PLA-Silk @K1 SE_CFS-C-all", + "Creality/Generic PLA-Silk @K1C-all", + "Creality/Generic PLA-Silk @K1C_CFS-C-all", + "Creality/Generic PLA-Silk @K1_CFS-C-all", + "Creality/Generic PLA-Silk @K2 Plus-all", + "Creality/Generic PLA-Silk @K2 Pro-all", + "Creality/Generic PLA-Silk @K2 SE-all", + "Creality/Generic PLA-Silk @K2-all", + "Creality/Generic PLA-Silk @SPARKX i7-all", + "Creality/Generic PP @K1 Max_CFS-C-all", + "Creality/Generic PP @K1C-all", + "Creality/Generic PP @K1C_CFS-C-all", + "Creality/Generic PP @K1_CFS-C-all", + "Creality/Generic PP @K2 Plus-all", + "Creality/Generic PP @K2 Pro-all", + "Creality/Generic PP @K2-all", + "Creality/Generic Support for PA @K2 Plus-all", + "Creality/Generic Support for PLA @K2 Plus-all", + "Creality/HP Ultra PLA @K1 Max_CFS-C-all", + "Creality/HP Ultra PLA @K1C-all", + "Creality/HP Ultra PLA @K1C_CFS-C-all", + "Creality/HP Ultra PLA @K1_CFS-C-all", + "Creality/HP Ultra PLA @K2 Plus-all", + "Creality/Hyper L-W PLA @Hi-all", + "Creality/Hyper L-W PLA @K1 Max_CFS-C-all", + "Creality/Hyper L-W PLA @K1 SE-all", + "Creality/Hyper L-W PLA @K1 SE_CFS-C-all", + "Creality/Hyper L-W PLA @K1C-all", + "Creality/Hyper L-W PLA @K1C_CFS-C-all", + "Creality/Hyper L-W PLA @K1_CFS-C-all", + "Creality/Hyper L-W PLA @K2 Plus-all", + "Creality/Hyper L-W PLA @K2 Pro-all", + "Creality/Hyper L-W PLA @K2-all", + "Creality/Hyper Luminous @Hi-all", + "Creality/Hyper Luminous @K1C-all", + "Creality/Hyper Luminous @K2 Plus-all", + "Creality/Hyper Luminous @K2 Pro-all", + "Creality/Hyper Luminous @K2-all", + "Creality/Hyper Luminous @SPARKX i7-all", + "Creality/Hyper Marble @Hi-all", + "Creality/Hyper Marble @K1 Max_CFS-C-all", + "Creality/Hyper Marble @K1C-all", + "Creality/Hyper Marble @K1C_CFS-C-all", + "Creality/Hyper Marble @K1_CFS-C-all", + "Creality/Hyper Marble @K2 Plus-all", + "Creality/Hyper Marble @K2 Pro-all", + "Creality/Hyper Marble @K2 SE-all", + "Creality/Hyper Marble @K2-all", + "Creality/Hyper Marble @SPARKX i7-all", + "Creality/Hyper PA6-CF @K2 Plus-all", + "Creality/Hyper PA6-CF @K2 Pro-all", + "Creality/Hyper PA612-CF @K2 Plus-all", + "Creality/Hyper PA612-CF @K2 Pro-all", + "Creality/Hyper PAHT-CF @K1 Max_CFS-C-all", + "Creality/Hyper PAHT-CF @K1C-all", + "Creality/Hyper PAHT-CF @K1C_CFS-C-all", + "Creality/Hyper PAHT-CF @K1_CFS-C-all", + "Creality/Hyper PAHT-CF @K2 Plus-all", + "Creality/Hyper PAHT-CF @K2 Pro-all", + "Creality/Hyper PAHT-CF @K2-all", + "Creality/Hyper PC @K2 Plus-all", + "Creality/Hyper PC @K2 Pro-all", + "Creality/Hyper PLA @Ender-3 V4-all", + "Creality/Hyper PLA @Hi-all", + "Creality/Hyper PLA @K1 Max_CFS-C-all", + "Creality/Hyper PLA @K1 SE-all", + "Creality/Hyper PLA @K1 SE_CFS-C-all", + "Creality/Hyper PLA @K1C-all", + "Creality/Hyper PLA @K1C_CFS-C-all", + "Creality/Hyper PLA @K1_CFS-C-all", + "Creality/Hyper PLA @K2 Plus-all", + "Creality/Hyper PLA @K2 Pro-all", + "Creality/Hyper PLA @K2 SE-all", + "Creality/Hyper PLA @K2-all", + "Creality/Hyper PLA @SPARKX i7-all", + "Creality/Hyper PLA-CF @Ender-3 V4-all", + "Creality/Hyper PLA-CF @Hi-all", + "Creality/Hyper PLA-CF @K1 Max_CFS-C-all", + "Creality/Hyper PLA-CF @K1 SE-all", + "Creality/Hyper PLA-CF @K1 SE_CFS-C-all", + "Creality/Hyper PLA-CF @K1C-all", + "Creality/Hyper PLA-CF @K1C_CFS-C-all", + "Creality/Hyper PLA-CF @K1_CFS-C-all", + "Creality/Hyper PLA-CF @K2 Plus-all", + "Creality/Hyper PLA-CF @K2 Pro-all", + "Creality/Hyper PLA-CF @K2 SE-all", + "Creality/Hyper PLA-CF @K2-all", + "Creality/Hyper PLA-CF @SPARKX i7-all", + "Creality/Hyper PPA-CF @K2 Plus-all", + "Creality/Hyper PPA-CF @K2 Pro-all", + "Creality/Hyper Stardust @Hi-all", + "Creality/Hyper Stardust @K1 Max_CFS-C-all", + "Creality/Hyper Stardust @K1C-all", + "Creality/Hyper Stardust @K1C_CFS-C-all", + "Creality/Hyper Stardust @K1_CFS-C-all", + "Creality/Hyper Stardust @K2 Plus-all", + "Creality/Hyper Stardust @K2 Pro-all", + "Creality/Hyper Stardust @K2 SE-all", + "Creality/Hyper Stardust @K2-all", + "Creality/Hyper Stardust @SPARKX i7-all", + "Creality/Panchroma PLA Matte @K2 Plus-all", + "Creality/Panchroma PLA Satin @K2 Plus-all", + "Creality/PolySonic PLA @K2 Plus-all", + "Creality/PolySonic PLA Pro @K2 Plus-all", + "Creality/Soleyin Ultra PLA @Ender-3 V4-all", + "Creality/Soleyin Ultra PLA @Hi-all", + "Creality/Soleyin Ultra PLA @K1 Max_CFS-C-all", + "Creality/Soleyin Ultra PLA @K1C-all", + "Creality/Soleyin Ultra PLA @K1C_CFS-C-all", + "Creality/Soleyin Ultra PLA @K1_CFS-C-all", + "Creality/Soleyin Ultra PLA @K2 Plus-all", + "Creality/Soleyin Ultra PLA @K2 Pro-all", + "Creality/Soleyin Ultra PLA @K2 SE-all", + "Creality/Soleyin Ultra PLA @K2-all", + "Creality/Soleyin Ultra PLA @SPARKX i7-all", + "Creality/eSUN PET-Basic @K2 Plus-all", + "Creality/eSUN PLA+ @K2 Plus-all", + "Creality/eSUN PLA-CF @K2 Plus-all", + "Creality/eSUN PLA-HS @K2 Plus-all", + "Creality/eSUN PLA-LW @K2 Plus-all", + "Creality/eSUN PLA-Lite @K2 Plus-all", + "Creality/eSUN PLA-Matte @K2 Plus-all", + "Creality/eSUN PLA-Silk @K2 Plus-all", + "Cubicon/Cubicon ABS-A100 @base", + "Cubicon/Cubicon ABSk @base", + "Cubicon/Cubicon PA-CF @base", + "Cubicon/Cubicon PC @base", + "Cubicon/Cubicon PETG @base", + "Cubicon/Cubicon PLA @base", + "Cubicon/Cubicon PLA+ @base", + "Cubicon/Cubicon PLAi21 @base", + "Custom/Generic PC @MyToolChanger", + "Custom/Generic PETG @MyToolChanger", + "Custom/Generic PLA @MyToolChanger", + "Custom/Generic PLA-CF @MyToolChanger", + "Custom/Generic PVA @MyToolChanger", + "Custom/Generic TPU @MyToolChanger", + "DeltaMaker/DeltaMaker Brand PLA", + "DeltaMaker/DeltaMaker Generic PETG", + "DeltaMaker/DeltaMaker Generic PLA", + "Dremel/Dremel Generic PLA", + "Elegoo/Elegoo PAHT @base", + "Elegoo/Elegoo PC @base", + "Elegoo/Elegoo PETG @base", + "Elegoo/Elegoo PLA @base", + "Elegoo/Generic PA @base", + "Elegoo/Generic PC @base", + "Elegoo/Generic PET @base", + "Elegoo/Generic PETG @base", + "Elegoo/Generic PLA @base", + "FLSun/FLSun Generic PA", + "FLSun/FLSun Generic PA-CF", + "FLSun/FLSun Generic PC", + "FLSun/FLSun Generic PETG", + "FLSun/FLSun Generic PLA", + "FLSun/FLSun Generic PLA-CF", + "Flashforge/Flashforge Generic ASA @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic HS PLA", + "Flashforge/Flashforge Generic PETG", + "Flashforge/Flashforge Generic PETG @G3U", + "Flashforge/Flashforge Generic PETG @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic PETG @G3U 0.8 Nozzle", + "Flashforge/Flashforge Generic PETG-CF @G3U", + "Flashforge/Flashforge Generic PETG-CF @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic PETG-CF @G3U 0.8 Nozzle", + "Flashforge/Flashforge Generic PETG-CF10", + "Flashforge/Flashforge Generic PLA", + "Flashforge/Flashforge Generic PLA-CF @G3U", + "Flashforge/Flashforge Generic PLA-CF @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic PLA-CF @G3U 0.8 Nozzle", + "Flashforge/Flashforge Generic PLA-CF10", + "Flashforge/Flashforge Generic PLA-Silk", + "Flashforge/Flashforge Generic PVA", + "Flashforge/Flashforge PETG", + "Flashforge/Flashforge PLA", + "Flashforge/FusRock Generic NexPA-CF25", + "Flashforge/FusRock Generic PAHT-CF", + "Flashforge/FusRock Generic PAHT-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic PET-CF", + "Flashforge/FusRock Generic PET-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic S-Multi", + "Flashforge/FusRock Generic S-Multi @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic S-PAHT", + "Flashforge/FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "Flashforge/Generic PETG @Flashforge Artemis", + "Flashforge/Generic PLA @Flashforge AD4", + "Flashforge/Polymaker Generic CoPA", + "Flashforge/Polymaker Generic S1", + "Flashforge/SUNLU PETG @base", + "Flashforge/SUNLU PLA Marble @base", + "Flashforge/SUNLU PLA Matte @base", + "Flashforge/SUNLU PLA+ 2.0 @base", + "Flashforge/SUNLU PLA+ @base", + "Flashforge/SUNLU Silk PLA+ @base", + "Flashforge/SUNLU Wood PLA @base", + "FlyingBear/FlyingBear Generic PA-CF", + "FlyingBear/FlyingBear Generic PC", + "FlyingBear/FlyingBear Generic PETG", + "FlyingBear/FlyingBear Generic PLA", + "InfiMech/InfiMech Generic PA-CF", + "InfiMech/InfiMech Generic PC", + "InfiMech/InfiMech Generic PETG", + "InfiMech/InfiMech Generic PLA", + "LH/LHS PC CF", + "LH/LHS PCTG", + "LH/LHS PETG", + "LH/LHS PLA", + "LONGER/Generic PETG @LONGER LK10", + "LONGER/Generic PETG @LONGER LK10 Plus", + "LONGER/Generic PLA @LONGER LK10", + "LONGER/Generic PLA @LONGER LK10 Plus", + "Lulzbot/Lulzbot 2.85mm ABS", + "Lulzbot/Lulzbot 2.85mm PETG", + "Lulzbot/Lulzbot 2.85mm PLA", + "OrcaArena/Arena PA-CF @base", + "OrcaArena/Arena PAHT-CF @base", + "OrcaArena/Arena PC @base", + "OrcaArena/Arena PET-CF @base", + "OrcaArena/Arena PETG Basic @base", + "OrcaArena/Arena PETG-CF @base", + "OrcaArena/Arena PLA Basic @base", + "OrcaArena/Arena PLA Impact @base", + "OrcaArena/Arena PLA Marble @base", + "OrcaArena/Arena PLA Matte @base", + "OrcaArena/Arena PLA Metal @base", + "OrcaArena/Arena PLA Silk @base", + "OrcaArena/Arena PLA Sparkle @base", + "OrcaArena/Arena PLA Tough @base", + "OrcaArena/Arena PLA-CF @base", + "OrcaArena/Arena Support G @base", + "OrcaArena/Arena Support W @base", + "OrcaArena/OrcaArena Generic PA", + "OrcaArena/OrcaArena Generic PA-CF", + "OrcaArena/OrcaArena Generic PC @base", + "OrcaArena/OrcaArena Generic PETG @base", + "OrcaArena/OrcaArena Generic PETG-CF @base", + "OrcaArena/OrcaArena Generic PLA @base", + "OrcaArena/OrcaArena Generic PLA Silk @base", + "OrcaArena/OrcaArena Generic PLA-CF @base", + "OrcaArena/PolyLite PLA @base", + "OrcaArena/PolyTerra PLA @base", + "OrcaFilamentLibrary/AliZ PA-CF @base", + "OrcaFilamentLibrary/AliZ PETG @base", + "OrcaFilamentLibrary/AliZ PETG-CF @base", + "OrcaFilamentLibrary/AliZ PETG-Metal @base", + "OrcaFilamentLibrary/AliZ PLA @base", + "OrcaFilamentLibrary/Bambu PA-CF @base", + "OrcaFilamentLibrary/Bambu PA6-CF @base", + "OrcaFilamentLibrary/Bambu PA6-GF @base", + "OrcaFilamentLibrary/Bambu PAHT-CF @base", + "OrcaFilamentLibrary/Bambu PC @base", + "OrcaFilamentLibrary/Bambu PC FR @base", + "OrcaFilamentLibrary/Bambu PET-CF @base", + "OrcaFilamentLibrary/Bambu PETG Basic @base", + "OrcaFilamentLibrary/Bambu PETG HF @base", + "OrcaFilamentLibrary/Bambu PETG Translucent @base", + "OrcaFilamentLibrary/Bambu PETG-CF @base", + "OrcaFilamentLibrary/Bambu PLA Aero @base", + "OrcaFilamentLibrary/Bambu PLA Basic @base", + "OrcaFilamentLibrary/Bambu PLA Dynamic @base", + "OrcaFilamentLibrary/Bambu PLA Galaxy @base", + "OrcaFilamentLibrary/Bambu PLA Glow @base", + "OrcaFilamentLibrary/Bambu PLA Impact @base", + "OrcaFilamentLibrary/Bambu PLA Marble @base", + "OrcaFilamentLibrary/Bambu PLA Matte @base", + "OrcaFilamentLibrary/Bambu PLA Metal @base", + "OrcaFilamentLibrary/Bambu PLA Silk @base", + "OrcaFilamentLibrary/Bambu PLA Silk+ @base", + "OrcaFilamentLibrary/Bambu PLA Sparkle @base", + "OrcaFilamentLibrary/Bambu PLA Tough @base", + "OrcaFilamentLibrary/Bambu PLA Wood @base", + "OrcaFilamentLibrary/Bambu PLA-CF @base", + "OrcaFilamentLibrary/Bambu PPA-CF @base", + "OrcaFilamentLibrary/Bambu Support For PA/PET @base", + "OrcaFilamentLibrary/Bambu Support For PLA @base", + "OrcaFilamentLibrary/Bambu Support For PLA/PETG @base", + "OrcaFilamentLibrary/Bambu Support G @base", + "OrcaFilamentLibrary/Bambu Support W @base", + "OrcaFilamentLibrary/COEX NYLEX PA6-CF @base", + "OrcaFilamentLibrary/COEX NYLEX UNFILLED @base", + "OrcaFilamentLibrary/COEX PCTG PRIME @base", + "OrcaFilamentLibrary/COEX PETG @base", + "OrcaFilamentLibrary/COEX PLA @base", + "OrcaFilamentLibrary/COEX PLA PRIME @base", + "OrcaFilamentLibrary/COEX PLA+Silk @base", + "OrcaFilamentLibrary/DREMC PA12-CF @base", + "OrcaFilamentLibrary/DREMC PA6-CF @base", + "OrcaFilamentLibrary/DREMC PET-CF @base", + "OrcaFilamentLibrary/DREMC PETG @base", + "OrcaFilamentLibrary/DREMC PLA+ @base", + "OrcaFilamentLibrary/DREMC PLA+ HS @base", + "OrcaFilamentLibrary/DREMC PPA-CF @base", + "OrcaFilamentLibrary/Elas PETG Basic @base", + "OrcaFilamentLibrary/Elas PLA Basic @base", + "OrcaFilamentLibrary/Elas PLA Pro @base", + "OrcaFilamentLibrary/Elegoo PAHT @base", + "OrcaFilamentLibrary/Elegoo PC @base", + "OrcaFilamentLibrary/Elegoo PETG @base", + "OrcaFilamentLibrary/Elegoo PLA @base", + "OrcaFilamentLibrary/Eolas Prints PETG @System", + "OrcaFilamentLibrary/Eolas Prints PETG Transition @System", + "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant @System", + "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial @System", + "OrcaFilamentLibrary/Eolas Prints PLA High Speed @System", + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850 @System", + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870 @System", + "OrcaFilamentLibrary/Eolas Prints PLA Matte @System", + "OrcaFilamentLibrary/Eolas Prints PLA Neon @System", + "OrcaFilamentLibrary/Eolas Prints PLA Premium @System", + "OrcaFilamentLibrary/Eolas Prints PLA Silk @System", + "OrcaFilamentLibrary/Eolas Prints PLA Transition @System", + "OrcaFilamentLibrary/FDplast HIPS @base", + "OrcaFilamentLibrary/FDplast PETG @base", + "OrcaFilamentLibrary/FDplast PLA @base", + "OrcaFilamentLibrary/FDplast SBS @base", + "OrcaFilamentLibrary/FILL3D PA @base", + "OrcaFilamentLibrary/FILL3D PETG @base", + "OrcaFilamentLibrary/FILL3D PETG CF @base", + "OrcaFilamentLibrary/FILL3D PLA Basic @base", + "OrcaFilamentLibrary/FILL3D PLA Turbo @base", + "OrcaFilamentLibrary/FILL3D PP @base", + "OrcaFilamentLibrary/FILL3D PPCF @base", + "OrcaFilamentLibrary/Fiberon PA12-CF @base", + "OrcaFilamentLibrary/Fiberon PA6-CF @base", + "OrcaFilamentLibrary/Fiberon PA6-GF @base", + "OrcaFilamentLibrary/Fiberon PA612-CF @base", + "OrcaFilamentLibrary/Fiberon PET-CF @base", + "OrcaFilamentLibrary/Fiberon PETG-ESD @base", + "OrcaFilamentLibrary/Fiberon PETG-rCF @base", + "OrcaFilamentLibrary/FilAr PETG @base", + "OrcaFilamentLibrary/FilAr PETG Amarillo Lima", + "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante", + "OrcaFilamentLibrary/FilAr PETG Azul Boreal", + "OrcaFilamentLibrary/FilAr PETG Azul Francia", + "OrcaFilamentLibrary/FilAr PETG Azul Imperial", + "OrcaFilamentLibrary/FilAr PETG Blanco Antartida", + "OrcaFilamentLibrary/FilAr PETG Cian", + "OrcaFilamentLibrary/FilAr PETG Coral", + "OrcaFilamentLibrary/FilAr PETG Cristal", + "OrcaFilamentLibrary/FilAr PETG Gris Ceniza", + "OrcaFilamentLibrary/FilAr PETG Gris Plata", + "OrcaFilamentLibrary/FilAr PETG Magenta", + "OrcaFilamentLibrary/FilAr PETG Negro Azabache", + "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi", + "OrcaFilamentLibrary/FilAr PLA @base", + "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio", + "OrcaFilamentLibrary/FilAr PLA Azul Francia", + "OrcaFilamentLibrary/FilAr PLA Blanco Antartida", + "OrcaFilamentLibrary/FilAr PLA Blanco Calido", + "OrcaFilamentLibrary/FilAr PLA Bronce", + "OrcaFilamentLibrary/FilAr PLA Cafe con Leche", + "OrcaFilamentLibrary/FilAr PLA Carpincho", + "OrcaFilamentLibrary/FilAr PLA Celeste Cielo", + "OrcaFilamentLibrary/FilAr PLA Cobre", + "OrcaFilamentLibrary/FilAr PLA Dorado", + "OrcaFilamentLibrary/FilAr PLA Gris Ceniza", + "OrcaFilamentLibrary/FilAr PLA Gris Pizarra", + "OrcaFilamentLibrary/FilAr PLA Gris Plata", + "OrcaFilamentLibrary/FilAr PLA Manteca", + "OrcaFilamentLibrary/FilAr PLA Marron Oxido", + "OrcaFilamentLibrary/FilAr PLA Naranja Tigre", + "OrcaFilamentLibrary/FilAr PLA Negro Azabache", + "OrcaFilamentLibrary/FilAr PLA Oro", + "OrcaFilamentLibrary/FilAr PLA Piel", + "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras", + "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto", + "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco", + "OrcaFilamentLibrary/FilAr PLA Tabaco", + "OrcaFilamentLibrary/FilAr PLA Titanio", + "OrcaFilamentLibrary/FilAr PLA Verde FilAr", + "OrcaFilamentLibrary/FilAr PLA Verde Manzana", + "OrcaFilamentLibrary/FilAr PLA Verde Oliva", + "OrcaFilamentLibrary/FilAr PLA Verde Pixel", + "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda", + "OrcaFilamentLibrary/FilAr PLA-mate @base", + "OrcaFilamentLibrary/FilAr PLA-mate Amarillo", + "OrcaFilamentLibrary/FilAr PLA-mate Azul", + "OrcaFilamentLibrary/FilAr PLA-mate Beige", + "OrcaFilamentLibrary/FilAr PLA-mate Blanco", + "OrcaFilamentLibrary/FilAr PLA-mate Bordo", + "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo", + "OrcaFilamentLibrary/FilAr PLA-mate Chocolate", + "OrcaFilamentLibrary/FilAr PLA-mate Gris", + "OrcaFilamentLibrary/FilAr PLA-mate Marron", + "OrcaFilamentLibrary/FilAr PLA-mate Naranja", + "OrcaFilamentLibrary/FilAr PLA-mate Negro", + "OrcaFilamentLibrary/FilAr PLA-mate Piel", + "OrcaFilamentLibrary/FilAr PLA-mate Rojo", + "OrcaFilamentLibrary/FilAr PLA-mate Rosa", + "OrcaFilamentLibrary/FilAr PLA-mate Uva", + "OrcaFilamentLibrary/FilAr PLA-mate Verde", + "OrcaFilamentLibrary/FilAr PLA-mate Violeta", + "OrcaFilamentLibrary/Generic PA-CF @System", + "OrcaFilamentLibrary/Generic PLA High Speed @System", + "OrcaFilamentLibrary/Generic PLA-CF @System", + "OrcaFilamentLibrary/Generic PPA-GF @System", + "OrcaFilamentLibrary/GreenGate3D PETG @base", + "OrcaFilamentLibrary/NIT PETG @base", + "OrcaFilamentLibrary/NIT PLA @base", + "OrcaFilamentLibrary/Numakers PLA+ @base", + "OrcaFilamentLibrary/Overture Air PLA @base", + "OrcaFilamentLibrary/Overture Easy PLA @base", + "OrcaFilamentLibrary/Overture Matte PLA @base", + "OrcaFilamentLibrary/Overture PLA @base", + "OrcaFilamentLibrary/Overture PLA Pro @base", + "OrcaFilamentLibrary/Overture Rock PLA @base", + "OrcaFilamentLibrary/Overture Silk PLA @base", + "OrcaFilamentLibrary/Overture Super PLA+ @base", + "OrcaFilamentLibrary/Panchroma CoPE @base", + "OrcaFilamentLibrary/Panchroma PLA @base", + "OrcaFilamentLibrary/Panchroma PLA Celestial @base", + "OrcaFilamentLibrary/Panchroma PLA Galaxy @base", + "OrcaFilamentLibrary/Panchroma PLA Glow @base", + "OrcaFilamentLibrary/Panchroma PLA Luminous @base", + "OrcaFilamentLibrary/Panchroma PLA Marble @base", + "OrcaFilamentLibrary/Panchroma PLA Matte @base", + "OrcaFilamentLibrary/Panchroma PLA Metallic @base", + "OrcaFilamentLibrary/Panchroma PLA Neon @base", + "OrcaFilamentLibrary/Panchroma PLA Satin @base", + "OrcaFilamentLibrary/Panchroma PLA Silk @base", + "OrcaFilamentLibrary/Panchroma PLA Starlight @base", + "OrcaFilamentLibrary/Panchroma PLA Temp Shift @base", + "OrcaFilamentLibrary/Panchroma PLA Translucent @base", + "OrcaFilamentLibrary/Panchroma PLA UV Shift @base", + "OrcaFilamentLibrary/PolyLite PETG @base", + "OrcaFilamentLibrary/PolyLite PLA @base", + "OrcaFilamentLibrary/PolyLite PLA Pro @base", + "OrcaFilamentLibrary/PolyTerra Dual PLA @System", + "OrcaFilamentLibrary/PolyTerra PLA @base", + "OrcaFilamentLibrary/Polymaker HT-PLA @base", + "OrcaFilamentLibrary/Polymaker HT-PLA-GF @base", + "OrcaFilamentLibrary/SUNLU PETG @base", + "OrcaFilamentLibrary/SUNLU PLA Marble @base", + "OrcaFilamentLibrary/SUNLU PLA Matte @base", + "OrcaFilamentLibrary/SUNLU PLA+ 2.0 @base", + "OrcaFilamentLibrary/SUNLU PLA+ @base", + "OrcaFilamentLibrary/SUNLU Silk PLA+ @base", + "OrcaFilamentLibrary/SUNLU Wood PLA @base", + "OrcaFilamentLibrary/Valment PLA @base", + "OrcaFilamentLibrary/Valment PLA Galaxy @base", + "OrcaFilamentLibrary/Valment PLA Silk @base", + "OrcaFilamentLibrary/Valment PLA-CF @base", + "OrcaFilamentLibrary/eSUN PETG @base", + "OrcaFilamentLibrary/eSUN PLA+ @base", + "OrcaFilamentLibrary/eSUN PLA-Basic @base", + "OrcaFilamentLibrary/eSUN PLA-Marble @base", + "OrcaFilamentLibrary/eSUN PLA-Matte @base", + "OrcaFilamentLibrary/eSUN ePLA-LW @System", + "OrcaFilamentLibrary/fdm_filament_pla_silk", + "Peopoly/Peopoly Generic PLA", + "Peopoly/Peopoly Lancer PLA-C", + "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", + "Prusa/Prusa Generic ABS @CORE One", + "Prusa/Prusa Generic ABS @CORE One 0.6", + "Prusa/Prusa Generic ABS @CORE One 0.8", + "Prusa/Prusa Generic ABS @CORE One HF 0.4", + "Prusa/Prusa Generic ABS @CORE One HF 0.5", + "Prusa/Prusa Generic ABS @CORE One HF 0.6", + "Prusa/Prusa Generic ABS @CORE One HF 0.8", + "Prusa/Prusa Generic ABS @MK3.5", + "Prusa/Prusa Generic ABS @MK3.5 0.25", + "Prusa/Prusa Generic ABS @MK3.5 0.6", + "Prusa/Prusa Generic ABS @MK3.5 0.8", + "Prusa/Prusa Generic ABS @MK4S", + "Prusa/Prusa Generic ABS @MK4S 0.6", + "Prusa/Prusa Generic ABS @MK4S 0.8", + "Prusa/Prusa Generic ABS @MK4S HF0.4", + "Prusa/Prusa Generic ABS @MK4S HF0.5", + "Prusa/Prusa Generic ABS @MK4S HF0.6", + "Prusa/Prusa Generic ABS @MK4S HF0.8", + "Prusa/Prusa Generic ABS HF @MK3.5", + "Prusa/Prusa Generic ABS HF @MK3.5 0.6", + "Prusa/Prusa Generic ABS HF @MK3.5 0.8", + "Prusa/Prusa Generic ASA @CORE One", + "Prusa/Prusa Generic ASA @CORE One 0.6", + "Prusa/Prusa Generic ASA @CORE One 0.8", + "Prusa/Prusa Generic ASA @CORE One HF 0.4", + "Prusa/Prusa Generic ASA @CORE One HF 0.5", + "Prusa/Prusa Generic ASA @CORE One HF 0.6", + "Prusa/Prusa Generic ASA @CORE One HF 0.8", + "Prusa/Prusa Generic ASA @MK3.5", + "Prusa/Prusa Generic ASA @MK3.5 0.25", + "Prusa/Prusa Generic ASA @MK3.5 0.6", + "Prusa/Prusa Generic ASA @MK3.5 0.8", + "Prusa/Prusa Generic ASA @MK4S", + "Prusa/Prusa Generic ASA @MK4S 0.6", + "Prusa/Prusa Generic ASA @MK4S 0.8", + "Prusa/Prusa Generic ASA @MK4S HF0.4", + "Prusa/Prusa Generic ASA @MK4S HF0.5", + "Prusa/Prusa Generic ASA @MK4S HF0.6", + "Prusa/Prusa Generic ASA @MK4S HF0.8", + "Prusa/Prusa Generic ASA HF @MK3.5", + "Prusa/Prusa Generic ASA HF @MK3.5 0.6", + "Prusa/Prusa Generic ASA HF @MK3.5 0.8", + "Prusa/Prusa Generic PA @MK3.5", + "Prusa/Prusa Generic PA @MK3.5 0.25", + "Prusa/Prusa Generic PA @MK3.5 0.6", + "Prusa/Prusa Generic PA @MK3.5 0.8", + "Prusa/Prusa Generic PA-CF @MK3.5", + "Prusa/Prusa Generic PA-CF @MK3.5 0.25", + "Prusa/Prusa Generic PA-CF @MK3.5 0.6", + "Prusa/Prusa Generic PA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PC @MK3.5", + "Prusa/Prusa Generic PC @MK3.5 0.25", + "Prusa/Prusa Generic PC @MK3.5 0.6", + "Prusa/Prusa Generic PC @MK3.5 0.8", + "Prusa/Prusa Generic PC HF @MK3.5", + "Prusa/Prusa Generic PC HF @MK3.5 0.6", + "Prusa/Prusa Generic PC HF @MK3.5 0.8", + "Prusa/Prusa Generic PETG @CORE One", + "Prusa/Prusa Generic PETG @CORE One 0.6", + "Prusa/Prusa Generic PETG @CORE One 0.8", + "Prusa/Prusa Generic PETG @CORE One HF 0.4", + "Prusa/Prusa Generic PETG @CORE One HF 0.5", + "Prusa/Prusa Generic PETG @CORE One HF 0.6", + "Prusa/Prusa Generic PETG @CORE One HF 0.8", + "Prusa/Prusa Generic PETG @MK3.5", + "Prusa/Prusa Generic PETG @MK3.5 0.25", + "Prusa/Prusa Generic PETG @MK3.5 0.6", + "Prusa/Prusa Generic PETG @MK3.5 0.8", + "Prusa/Prusa Generic PETG @MK4S", + "Prusa/Prusa Generic PETG @MK4S 0.6", + "Prusa/Prusa Generic PETG @MK4S 0.8", + "Prusa/Prusa Generic PETG @MK4S HF0.4", + "Prusa/Prusa Generic PETG @MK4S HF0.5", + "Prusa/Prusa Generic PETG @MK4S HF0.6", + "Prusa/Prusa Generic PETG @MK4S HF0.8", + "Prusa/Prusa Generic PETG HF @MK3.5", + "Prusa/Prusa Generic PETG HF @MK3.5 0.6", + "Prusa/Prusa Generic PETG HF @MK3.5 0.8", + "Prusa/Prusa Generic PLA @CORE One", + "Prusa/Prusa Generic PLA @CORE One 0.6", + "Prusa/Prusa Generic PLA @CORE One 0.8", + "Prusa/Prusa Generic PLA @CORE One HF 0.4", + "Prusa/Prusa Generic PLA @CORE One HF 0.5", + "Prusa/Prusa Generic PLA @CORE One HF 0.6", + "Prusa/Prusa Generic PLA @CORE One HF 0.8", + "Prusa/Prusa Generic PLA @MK3.5", + "Prusa/Prusa Generic PLA @MK3.5 0.25", + "Prusa/Prusa Generic PLA @MK3.5 0.6", + "Prusa/Prusa Generic PLA @MK3.5 0.8", + "Prusa/Prusa Generic PLA @MK4S", + "Prusa/Prusa Generic PLA @MK4S 0.6", + "Prusa/Prusa Generic PLA @MK4S 0.8", + "Prusa/Prusa Generic PLA @MK4S HF0.4", + "Prusa/Prusa Generic PLA @MK4S HF0.5", + "Prusa/Prusa Generic PLA @MK4S HF0.6", + "Prusa/Prusa Generic PLA @MK4S HF0.8", + "Prusa/Prusa Generic PLA HF @MK3.5", + "Prusa/Prusa Generic PLA HF @MK3.5 0.6", + "Prusa/Prusa Generic PLA HF @MK3.5 0.8", + "Prusa/Prusa Generic PLA Silk @CORE One", + "Prusa/Prusa Generic PLA Silk @CORE One 0.6", + "Prusa/Prusa Generic PLA Silk @CORE One 0.8", + "Prusa/Prusa Generic PLA Silk @MK4S", + "Prusa/Prusa Generic PLA Silk @MK4S 0.6", + "Prusa/Prusa Generic PLA Silk @MK4S 0.8", + "Prusa/Prusa Generic PLA-CF @MK3.5", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.25", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.6", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PVA @MK3.5", + "Prusa/Prusa Generic PVA @MK3.5 0.25", + "Prusa/Prusa Generic PVA @MK3.5 0.6", + "Prusa/Prusa Generic PVA @MK3.5 0.8", + "Prusa/Prusa Generic PVA HF @MK3.5", + "Prusa/Prusa Generic PVA HF @MK3.5 0.6", + "Prusa/Prusa Generic PVA HF @MK3.5 0.8", + "Prusa/Prusa Generic TPU @CORE One", + "Prusa/Prusa Generic TPU @CORE One 0.6", + "Prusa/Prusa Generic TPU @CORE One 0.8", + "Prusa/Prusa Generic TPU @MK3.5", + "Prusa/Prusa Generic TPU @MK4S", + "Prusa/Prusa Generic TPU @MK4S 0.6", + "Prusa/Prusa Generic TPU @MK4S 0.8", + "Prusa/Prusa Generic TPU HF @MK3.5", + "Prusa/Prusament ASA @CORE One", + "Prusa/Prusament ASA @CORE One 0.6", + "Prusa/Prusament ASA @CORE One 0.8", + "Prusa/Prusament ASA @CORE One HF 0.4", + "Prusa/Prusament ASA @CORE One HF 0.5", + "Prusa/Prusament ASA @CORE One HF 0.6", + "Prusa/Prusament ASA @CORE One HF 0.8", + "Prusa/Prusament PA-CF @CORE One", + "Prusa/Prusament PA-CF @CORE One 0.6", + "Prusa/Prusament PA-CF @CORE One 0.8", + "Prusa/Prusament PC Blend @CORE One", + "Prusa/Prusament PC Blend @CORE One 0.6", + "Prusa/Prusament PC Blend @CORE One 0.8", + "Prusa/Prusament PC Blend @CORE One HF 0.4", + "Prusa/Prusament PC Blend @CORE One HF 0.5", + "Prusa/Prusament PC Blend @CORE One HF 0.6", + "Prusa/Prusament PC Blend @CORE One HF 0.8", + "Prusa/Prusament PC-CF @CORE One", + "Prusa/Prusament PC-CF @CORE One 0.6", + "Prusa/Prusament PC-CF @CORE One 0.8", + "Prusa/Prusament PETG @CORE One", + "Prusa/Prusament PETG @CORE One 0.6", + "Prusa/Prusament PETG @CORE One 0.8", + "Prusa/Prusament PETG @CORE One HF 0.4", + "Prusa/Prusament PETG @CORE One HF 0.5", + "Prusa/Prusament PETG @CORE One HF 0.6", + "Prusa/Prusament PETG @CORE One HF 0.8", + "Prusa/Prusament PLA @CORE One", + "Prusa/Prusament PLA @CORE One 0.6", + "Prusa/Prusament PLA @CORE One 0.8", + "Prusa/Prusament PLA @CORE One HF 0.4", + "Prusa/Prusament PLA @CORE One HF 0.5", + "Prusa/Prusament PLA @CORE One HF 0.6", + "Prusa/Prusament PLA @CORE One HF 0.8", + "Prusa/Prusament PVB @CORE One", + "Prusa/Prusament PVB @CORE One 0.6", + "Prusa/Prusament PVB @CORE One 0.8", + "Prusa/Prusament rPLA @CORE One", + "Prusa/Prusament rPLA @CORE One 0.6", + "Prusa/Prusament rPLA @CORE One 0.8", + "Qidi/Bambu PETG", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Bambu PLA", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/HATCHBOX PETG @Qidi", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle", + "Qidi/HATCHBOX PLA @Qidi", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Overture PLA @Qidi", + "Qidi/Overture PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Overture PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Overture PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Overture PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/PolyLite PLA @Qidi", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle", + "Qidi/QIDI PA-Ultra", + "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PA12-CF", + "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PAHT-CF", + "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PAHT-GF", + "Qidi/QIDI PAHT-GF @0.6 nozzle", + "Qidi/QIDI PAHT-GF @0.8 nozzle", + "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PET-CF", + "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PET-GF", + "Qidi/QIDI PET-GF @0.6 nozzle", + "Qidi/QIDI PET-GF @0.8 nozzle", + "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Basic", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Rapido", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Tough", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Translucent", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG-CF", + "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG-GF", + "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Basic", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Matte Basic", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido Matte", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido Metal", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido Silk", + "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PPS-CF", + "Qidi/QIDI PPS-CF @0.6 nozzle", + "Qidi/QIDI PPS-CF @0.8 nozzle", + "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PPS-GF", + "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI Support For PAHT", + "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI Support For PET/PA", + "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI UltraPA-CF25", + "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI WOOD Rapido", + "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic PA", + "Qidi/Qidi Generic PA-CF", + "Qidi/Qidi Generic PC", + "Qidi/Qidi Generic PETG", + "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PETG-CF", + "Qidi/Qidi Generic PLA", + "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA Silk", + "Qidi/Qidi Generic PLA+", + "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA-CF", + "Qidi/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi PLA-CF", + "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Tinmorry PETG-ECO", + "RH3D/Generic ABS @E3NG v1.2S", + "RH3D/Generic ASA @E3NG v1.2S", + "RH3D/Generic PCCF @E3NG v1.2S", + "RH3D/Generic PETG @E3NG v1.2S", + "RH3D/Generic PLA @E3NG v1.2S", + "RH3D/Generic TPU @E3NG v1.2S", + "Ratrig/RatRig BigNozzle PCTG", + "Ratrig/RatRig BigNozzle PETG", + "Ratrig/RatRig BigNozzle PLA", + "Ratrig/RatRig Generic PA", + "Ratrig/RatRig Generic PA-CF", + "Ratrig/RatRig Generic PC", + "Ratrig/RatRig Generic PCTG", + "Ratrig/RatRig Generic PETG", + "Ratrig/RatRig Generic PLA", + "Ratrig/RatRig Generic PLA-CF", + "Ratrig/RatRig PunkFil PETG", + "Ratrig/RatRig PunkFil PETG CF", + "SecKit/SecKit Generic PA", + "SecKit/SecKit Generic PA-CF", + "SecKit/SecKit Generic PC", + "SecKit/SecKit Generic PETG", + "SecKit/SecKit Generic PLA", + "SecKit/SecKit Generic PLA-CF", + "Snapmaker/Fiberon PA12-CF10 @Snapmaker U1 base", + "Snapmaker/Fiberon PA6-CF20 @Snapmaker U1 base", + "Snapmaker/Fiberon PA612-ESD @Snapmaker U1 base", + "Snapmaker/Panchroma CoPE @Snapmaker U1 base", + "Snapmaker/Panchroma PLA @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Celestial @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Galaxy @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Glow @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Luminous @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Marble @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Matte @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Metallic @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Neon @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Satin @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Silk @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Starlight @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Temp Shift @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Translucent @Snapmaker U1 base", + "Snapmaker/Panchroma PLA UV Shift @Snapmaker U1 base", + "Snapmaker/PolyLite CosPLA @Snapmaker U1 base", + "Snapmaker/PolyLite PLA @Snapmaker U1 base", + "Snapmaker/PolyLite PLA @base", + "Snapmaker/PolyLite PLA Galaxy @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Glow @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Luminous @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Neon @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Pro @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Pro Metallic @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Starlight @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Translucent @Snapmaker U1 base", + "Snapmaker/PolyTerra PLA @Snapmaker U1 base", + "Snapmaker/PolyTerra PLA Marble @Snapmaker U1 base", + "Snapmaker/PolyTerra PLA+ @Snapmaker U1 base", + "Snapmaker/Polymaker HT-PLA @Snapmaker U1 base", + "Snapmaker/Polymaker HT-PLA-GF @Snapmaker U1 base", + "Snapmaker/Polymaker PLA @Snapmaker U1 base", + "Snapmaker/Polymaker PLA Pro @Snapmaker U1 base", + "Snapmaker/Polymaker PLA Pro Metallic @Snapmaker U1 base", + "Snapmaker/Snapmaker Dual PA-CF @base", + "Snapmaker/Snapmaker Dual PET @base", + "Snapmaker/Snapmaker Dual PLA @base", + "Snapmaker/Snapmaker Dual PLA Eco @base", + "Snapmaker/Snapmaker Dual PLA Matte @base", + "Snapmaker/Snapmaker Dual PLA Metal @base", + "Snapmaker/Snapmaker Dual PLA Silk @base", + "Snapmaker/Snapmaker Dual PLA-CF @base", + "Snapmaker/Snapmaker J1 PA-CF @base", + "Snapmaker/Snapmaker J1 PET @base", + "Snapmaker/Snapmaker J1 PLA @base", + "Snapmaker/Snapmaker J1 PLA Eco @base", + "Snapmaker/Snapmaker J1 PLA Matte @base", + "Snapmaker/Snapmaker J1 PLA Metal @base", + "Snapmaker/Snapmaker J1 PLA Silk @base", + "Snapmaker/Snapmaker J1 PLA-CF @base", + "Snapmaker/Snapmaker PA-CF @U1 base", + "Snapmaker/Snapmaker PA-CF @base", + "Snapmaker/Snapmaker PET @U1 base", + "Snapmaker/Snapmaker PET @base", + "Snapmaker/Snapmaker PLA @U1 base", + "Snapmaker/Snapmaker PLA @base", + "Snapmaker/Snapmaker PLA Eco @U1 base", + "Snapmaker/Snapmaker PLA Eco @base", + "Snapmaker/Snapmaker PLA Metal @U1 base", + "Snapmaker/Snapmaker PLA Silk @U1 base", + "Snapmaker/Snapmaker PLA Silk @base", + "Snapmaker/Snapmaker PLA-CF @U1 base", + "Snapmaker/Snapmaker PLA-CF @base", + "Sovol/Generic ABS @Sovol SV08 MAX", + "Sovol/Generic PC @Sovol SV08 MAX", + "Sovol/Generic PETG @Sovol SV08 MAX", + "Sovol/Generic PLA @Sovol SV08 MAX", + "Sovol/Generic PLA Silk @Sovol SV08 MAX", + "Sovol/Generic TPU @Sovol SV08 MAX", + "Sovol/Polymaker PETG @Sovol SV08 MAX", + "Sovol/SUNLU PETG @Sovol SV08 MAX", + "Sovol/Sovol SV06 ACE ABS", + "Sovol/Sovol SV06 ACE PETG", + "Sovol/Sovol SV06 ACE PLA", + "Sovol/Sovol SV06 ACE TPU", + "Sovol/Sovol SV06 Plus ACE ABS", + "Sovol/Sovol SV06 Plus ACE PETG", + "Sovol/Sovol SV06 Plus ACE PLA", + "Sovol/Sovol SV06 Plus ACE TPU", + "Sovol/Sovol SV07 PLA", + "Sovol/Sovol SV08 ABS", + "Sovol/Sovol SV08 PETG", + "Sovol/Sovol SV08 PLA", + "Sovol/Sovol SV08 PLA @SV08 0.2 nozzle", + "Sovol/Sovol SV08 TPU", + "Sovol/Sovol Zero ABS", + "Sovol/Sovol Zero PC", + "Sovol/Sovol Zero PETG", + "Sovol/Sovol Zero PETG HS Nozzle", + "Sovol/Sovol Zero PLA Basic", + "Sovol/Sovol Zero PLA Basic HS Nozzle", + "Sovol/Sovol Zero PLA Silk", + "Sovol/Sovol Zero PLA Silk HS Nozzle", + "Sovol/Sovol Zero TPU", + "Tiertime/Tiertime Generic BVOH", + "Tiertime/Tiertime Generic BVOH@300HS", + "Tiertime/Tiertime Generic EVA", + "Tiertime/Tiertime Generic EVA@300HS", + "Tiertime/Tiertime Generic HIPS", + "Tiertime/Tiertime Generic HIPS@300HS", + "Tiertime/Tiertime Generic PA", + "Tiertime/Tiertime Generic PA-CF", + "Tiertime/Tiertime Generic PA-CF@300HS", + "Tiertime/Tiertime Generic PA@300HS", + "Tiertime/Tiertime Generic PC", + "Tiertime/Tiertime Generic PC@300HS", + "Tiertime/Tiertime Generic PCTG", + "Tiertime/Tiertime Generic PCTG@300HS", + "Tiertime/Tiertime Generic PE", + "Tiertime/Tiertime Generic PE-CF", + "Tiertime/Tiertime Generic PE-CF@300HS", + "Tiertime/Tiertime Generic PE@300HS", + "Tiertime/Tiertime Generic PETG", + "Tiertime/Tiertime Generic PETG-CF", + "Tiertime/Tiertime Generic PETG-CF@300HS", + "Tiertime/Tiertime Generic PETG@300HS", + "Tiertime/Tiertime Generic PHA", + "Tiertime/Tiertime Generic PHA@300HS", + "Tiertime/Tiertime Generic PLA", + "Tiertime/Tiertime Generic PLA High Speed", + "Tiertime/Tiertime Generic PLA High Speed@300HS", + "Tiertime/Tiertime Generic PLA Silk", + "Tiertime/Tiertime Generic PLA Silk@300HS", + "Tiertime/Tiertime Generic PLA-CF", + "Tiertime/Tiertime Generic PLA-CF@300HS", + "Tiertime/Tiertime Generic PLA@300HS", + "Tiertime/Tiertime Generic PP", + "Tiertime/Tiertime Generic PP-CF", + "Tiertime/Tiertime Generic PP-CF@300HS", + "Tiertime/Tiertime Generic PP-GF", + "Tiertime/Tiertime Generic PP-GF@300HS", + "Tiertime/Tiertime Generic PP@300HS", + "Tiertime/Tiertime Generic PPA-CF", + "Tiertime/Tiertime Generic PPA-CF@300HS", + "Tiertime/Tiertime Generic PPA-GF", + "Tiertime/Tiertime Generic PPA-GF@300HS", + "Tiertime/Tiertime Generic SBS", + "Tiertime/Tiertime Generic SBS@300HS", + "Tiertime/Tiertime PA6-CF", + "Tiertime/Tiertime PA6-CF@300HS", + "Tiertime/Tiertime PC", + "Tiertime/Tiertime PC@300HS", + "Tiertime/Tiertime PET-CF", + "Tiertime/Tiertime PET-CF@300HS", + "Tiertime/Tiertime PETG", + "Tiertime/Tiertime PETG@300HS", + "Tiertime/Tiertime PLA", + "Tiertime/Tiertime PLA-CF", + "Tiertime/Tiertime PLA-CF@300HS", + "Tiertime/Tiertime PLA@300HS", + "TwoTrees/TwoTrees Generic HS PLA @SK1", + "Volumic/Désactivé", + "Volumic/PA6 CF20 (Performance)", + "Volumic/PETG ESD (Performance)", + "Volumic/PPS Carbone (Performance)", + "Volumic/Volumic NYLON Ultra", + "Volumic/Volumic NYLON Ultra (Performance)", + "Volumic/Volumic PC", + "Volumic/Volumic PC (Performance)", + "Volumic/Volumic PCTG Ultra (Performance)", + "Volumic/Volumic PETG Ultra", + "Volumic/Volumic PETG Ultra (Performance)", + "Volumic/Volumic PETG Ultra carbone", + "Volumic/Volumic PETG Ultra carbone (Performance)", + "Volumic/Volumic PLA Ultra", + "Volumic/Volumic PLA Ultra (Performance)", + "Volumic/Volumic PP Ultra", + "Volumic/Volumic PP Ultra (Performance)", + "Volumic/Volumic UNIVERSAL Ultra", + "Volumic/Volumic UNIVERSAL Ultra (Performance)", + "Vzbot/Vzbot Generic PA", + "Vzbot/Vzbot Generic PA-CF", + "Vzbot/Vzbot Generic PC", + "Vzbot/Vzbot Generic PETG", + "Vzbot/Vzbot Generic PLA", + "Vzbot/Vzbot Generic PLA-CF", + "Wanhao France/YUMI PLA Bowden", + "Wanhao France/YUMI PLA Direct Drive", + "Wanhao France/Yumi Generic PETG", + "Wanhao France/Yumi Generic PLA", + "WonderMaker/WonderMaker PET-CF", + "WonderMaker/WonderMaker PETG Basic", + "WonderMaker/WonderMaker PLA Basic", + "WonderMaker/WonderMaker PLA Marble", + "WonderMaker/WonderMaker PLA Matte", + "WonderMaker/WonderMaker PLA Metal", + "WonderMaker/WonderMaker PLA Silk", + "WonderMaker/WonderMaker PLA Wood", + "Z-Bolt/Generic ABS @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic ABS @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic ABS @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic ABS HT @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic ABS HT @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic ABS HT @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic ABS HT @Z-Bolt Base", + "Z-Bolt/Generic PA @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic PA @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic PA @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic PA @Z-Bolt Base", + "Z-Bolt/Generic PETG @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic PETG @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic PETG @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic PETG @Z-Bolt Base", + "Z-Bolt/Generic PLA @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic PLA @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic PLA @Z-Bolt Base", + "re3D/re3D Greengate rPETG", + "re3D/re3D Greengate rPETG @0.8 nozzle", + "re3D/re3D Greengate rPETG @1.75 nozzle", + "re3D/re3D PC", + "re3D/re3D PC @0.4 nozzle", + "re3D/re3D PC @0.8 nozzle", + "re3D/re3D PETG", + "re3D/re3D PETG @0.4 nozzle", + "re3D/re3D PETG @0.8 nozzle", + "re3D/re3D PLA", + "re3D/re3D PLA @0.4 nozzle", + "re3D/re3D PLA @0.8 nozzle", + "re3D/re3D rPP", + "re3D/re3D rPP @0.8 nozzle", + "re3D/re3D rPP @1.75 nozzle" + ], + "ids": { + "00001": [ + "Creality/Generic PLA" + ], + "00002": [ + "Creality/Generic PLA-Silk" + ], + "00003": [ + "Creality/Generic PETG" + ], + "00004": [ + "Creality/Generic ABS" + ], + "00005": [ + "Creality/Generic TPU" + ], + "00006": [ + "Creality/Generic PLA-CF" + ], + "00007": [ + "Creality/Generic ASA" + ], + "00008": [ + "Creality/Generic PA" + ], + "00009": [ + "Creality/Generic PA-CF" + ], + "00010": [ + "Creality/Generic BVOH" + ], + "00011": [ + "Creality/Generic PVA" + ], + "00012": [ + "Creality/Generic HIPS" + ], + "00013": [ + "Creality/Generic PET-CF" + ], + "00014": [ + "Creality/Generic PETG-CF" + ], + "00015": [ + "Creality/Generic PA6-CF" + ], + "00016": [ + "Creality/Generic PAHT-CF" + ], + "00017": [ + "Creality/Generic PPS" + ], + "00018": [ + "Creality/Generic PPS-CF" + ], + "00019": [ + "Creality/Generic PP" + ], + "00020": [ + "Creality/Generic PET" + ], + "00021": [ + "Creality/Generic PC" + ], + "00022": [ + "Creality/Generic PA612-CF" + ], + "00023": [ + "Creality/Generic Support for PA" + ], + "00024": [ + "Creality/Generic Support for PLA" + ], + "00025": [ + "Creality/Generic PA12-CF" + ], + "00026": [ + "Creality/Generic TPU 64D" + ], + "00027": [ + "Creality/Generic PETG-GF" + ], + "00031": [ + "Creality/Generic PP-CF" + ], + "00032": [ + "Creality/Generic PCTG" + ], + "00033": [ + "Creality/Generic ASA-CF" + ], + "00034": [ + "Creality/Generic PA6-GF" + ], + "00035": [ + "Creality/eSUN PLA-LW" + ], + "01001": [ + "Creality/Creality Hyper PLA", + "Creality/Hyper PLA" + ], + "01002": [ + "Creality/Hyper L-W PLA" + ], + "01003": [ + "Creality/Hyper Luminous" + ], + "01004": [ + "Creality/Hyper Stardust" + ], + "01601": [ + "Creality/Soleyin Ultra PLA" + ], + "02001": [ + "Creality/Creality Hyper PLA-CF", + "Creality/Hyper PLA-CF" + ], + "03001": [ + "Creality/Creality Hyper ABS", + "Creality/Hyper ABS" + ], + "04001": [ + "Creality/CR-PLA", + "Creality/Creality Generic PLA" + ], + "05001": [ + "Creality/CR-Silk", + "Creality/Creality Silk PLA" + ], + "06001": [ + "Creality/CR-PETG", + "Creality/Creality Generic PETG" + ], + "06002": [ + "Creality/Hyper PETG" + ], + "06003": [ + "Creality/Hyper PETG-CF" + ], + "06004": [ + "Creality/Hyper PETG-GF" + ], + "06005": [ + "Creality/Soleyin Basic PETG" + ], + "07001": [ + "Creality/CR-ABS", + "Creality/Creality Generic ABS" + ], + "07002": [ + "Creality/Hyper PC" + ], + "08001": [ + "Creality/Ender-PLA" + ], + "09001": [ + "Creality/EN-PLA+" + ], + "09002": [ + "Creality/ENDER FAST PLA" + ], + "10001": [ + "Creality/Creality Generic TPU", + "Creality/HP-TPU" + ], + "1009481135": [ + "Snapmaker/Snapmaker J1 PET" + ], + "1042511226": [ + "Snapmaker/Snapmaker Dual PETG-CF" + ], + "10425112260": [ + "Snapmaker/Snapmaker PETG-CF" + ], + "11001": [ + "Creality/CR-Nylon", + "Creality/Creality Generic PA" + ], + "1172603684": [ + "Snapmaker/Snapmaker J1 PETG" + ], + "1181363872": [ + "Snapmaker/Snapmaker Dual PLA Silk" + ], + "11813638720": [ + "Snapmaker/Snapmaker PLA Silk" + ], + "1192769348": [ + "Snapmaker/Snapmaker J1 PLA Matte" + ], + "12002": [ + "Creality/Hyper PPA-CF" + ], + "12003": [ + "Creality/Hyper PAHT-CF" + ], + "12004": [ + "Creality/Hyper PA612-CF" + ], + "12005": [ + "Creality/Hyper PA6-CF" + ], + "1207881278": [ + "Snapmaker/Snapmaker Dual Breakaway" + ], + "1210173120": [ + "Snapmaker/Snapmaker J1 PA-CF" + ], + "1223824394": [ + "Snapmaker/Snapmaker J1 ABS", + "Snapmaker/Snapmaker J1 ABS Benchy" + ], + "1247172706": [ + "Snapmaker/Snapmaker Dual ASA" + ], + "12471727060": [ + "Snapmaker/Snapmaker ASA" + ], + "13001": [ + "Creality/CR-PLA Carbon" + ], + "1344609062": [ + "Snapmaker/Snapmaker PVA" + ], + "1355502217": [ + "Snapmaker/Snapmaker PETG-CF" + ], + "1393866034": [ + "Snapmaker/PolyLite Dual PLA", + "Snapmaker/PolyLite J1 PLA", + "Snapmaker/PolyLite PLA" + ], + "14001": [ + "Creality/CR-PLA Matte" + ], + "1417031127": [ + "Snapmaker/Snapmaker Dual PLA" + ], + "14170311270": [ + "Snapmaker/Snapmaker PLA", + "Snapmaker/Snapmaker PLA Matte" + ], + "141703112701": [ + "Snapmaker/Snapmaker PLA SnapSpeed" + ], + "1417031127011": [ + "Snapmaker/Snapmaker PLA Lite" + ], + "144877656": [ + "Snapmaker/Snapmaker J1 ASA" + ], + "1480063856": [ + "Snapmaker/Snapmaker TPE", + "Snapmaker/Snapmaker TPU" + ], + "15001": [ + "Creality/CR-PLA Fluo" + ], + "1528786603": [ + "Snapmaker/Snapmaker J1 PLA Silk" + ], + "16001": [ + "Creality/CR-TPU" + ], + "1655727393": [ + "Snapmaker/Snapmaker PLA Silk" + ], + "168223792": [ + "Snapmaker/Snapmaker Dual ABS", + "Snapmaker/Snapmaker Dual ABS Benchy" + ], + "1682237920": [ + "Snapmaker/Snapmaker ABS", + "Snapmaker/Snapmaker ABS Benchy" + ], + "1695556157": [ + "Snapmaker/Snapmaker PLA Eco" + ], + "17001": [ + "Creality/CR-Wood" + ], + "1702147325": [ + "Snapmaker/Snapmaker Dual PLA-CF" + ], + "17021473250": [ + "Snapmaker/Snapmaker PLA-CF" + ], + "18001": [ + "Creality/HP Ultra PLA" + ], + "1895495477": [ + "Snapmaker/Snapmaker PETG" + ], + "19001": [ + "Creality/Creality Generic ASA", + "Creality/HP-ASA" + ], + "200803790": [ + "Snapmaker/Snapmaker Dual PLA Eco" + ], + "2008037900": [ + "Snapmaker/Snapmaker PLA Eco" + ], + "2029994346": [ + "Snapmaker/Snapmaker Dual PLA Metal" + ], + "20299943460": [ + "Snapmaker/Snapmaker PLA Metal" + ], + "2128577941": [ + "Snapmaker/Snapmaker Dual PET", + "Snapmaker/Snapmaker PET" + ], + "21285779410": [ + "Snapmaker/Snapmaker PET" + ], + "2209001062": [ + "Snapmaker/Snapmaker Dual PETG" + ], + "22090010620": [ + "Snapmaker/Snapmaker PETG" + ], + "2549587591": [ + "Snapmaker/Snapmaker PET" + ], + "2742961008": [ + "Snapmaker/Snapmaker ASA" + ], + "29001": [ + "Creality/Hyper Marble" + ], + "2971656290": [ + "Snapmaker/Snapmaker Dual TPE", + "Snapmaker/Snapmaker Dual TPU", + "Snapmaker/Snapmaker Dual TPU High-Flow" + ], + "29716562900": [ + "Snapmaker/Snapmaker TPE", + "Snapmaker/Snapmaker TPU", + "Snapmaker/Snapmaker TPU High-Flow" + ], + "297165629001": [ + "Snapmaker/Snapmaker TPU 95A" + ], + "3104636980": [ + "Snapmaker/Snapmaker Dual PVA" + ], + "31046369800": [ + "Snapmaker/Snapmaker PVA" + ], + "3177068229": [ + "Snapmaker/Snapmaker PLA" + ], + "3383257822": [ + "Snapmaker/Snapmaker J1 PLA Eco" + ], + "3492897526": [ + "Snapmaker/Snapmaker J1 Breakaway" + ], + "3493177425": [ + "Snapmaker/Snapmaker Dual PA-CF" + ], + "34931774250": [ + "Snapmaker/Snapmaker PA-CF" + ], + "3503790988": [ + "Snapmaker/Snapmaker Dual PLA Matte" + ], + "377675245": [ + "Snapmaker/Snapmaker J1 PLA" + ], + "3806593857": [ + "Snapmaker/Snapmaker J1 PLA-CF" + ], + "3811508002": [ + "Snapmaker/Snapmaker ABS" + ], + "3864371306": [ + "Snapmaker/Snapmaker PLA-CF" + ], + "4012961186": [ + "Snapmaker/Snapmaker J1 PLA Metal" + ], + "4092268632": [ + "Snapmaker/Snapmaker J1 TPE", + "Snapmaker/Snapmaker J1 TPU", + "Snapmaker/Snapmaker J1 TPU High-Flow" + ], + "4227461134": [ + "Snapmaker/Snapmaker Breakaway Support For PLA", + "Snapmaker/Snapmaker J1 PVA" + ], + "4235401834": [ + "Snapmaker/Snapmaker J1 PETG-CF" + ], + "581236806": [ + "Snapmaker/Snapmaker PA-CF" + ], + "AZ01-1": [ + "BBL/AliZ PETG-CF", + "OrcaFilamentLibrary/AliZ PETG-CF" + ], + "AZ01-2": [ + "BBL/AliZ PETG-Metal", + "OrcaFilamentLibrary/AliZ PETG-Metal" + ], + "AliZ001": [ + "BBL/AliZ PETG", + "OrcaFilamentLibrary/AliZ PETG" + ], + "AliZ002": [ + "BBL/AliZ PLA", + "OrcaFilamentLibrary/AliZ PLA" + ], + "AliZ003": [ + "BBL/AliZ PA-CF", + "OrcaFilamentLibrary/AliZ PA-CF" + ], + "BABB00": [ + "BBL/BETA ABS" + ], + "BASB00": [ + "BBL/BETA ASA" + ], + "BFLSBS99": [ + "BBL/Generic SBS" + ], + "BHIB00": [ + "BBL/BETA HIPS" + ], + "BPAB00": [ + "BBL/BETA PAHT-CF" + ], + "BPBB00": [ + "BBL/BETA PEBA 90A" + ], + "BPGB00": [ + "BBL/BETA PETG" + ], + "BPGB01": [ + "BBL/BETA PETG Heat Color Change" + ], + "BPGB02": [ + "BBL/BETA PETG Fluorescence" + ], + "BPGB03": [ + "BBL/BETA PETG Glitter" + ], + "BPGB04": [ + "BBL/BETA PETG Glow" + ], + "BPGB05": [ + "BBL/BETA PETG Gradient" + ], + "BPGB06": [ + "BBL/BETA PETG HF" + ], + "BPGB07": [ + "BBL/BETA PETG Marble" + ], + "BPGB08": [ + "BBL/BETA PETG Matte" + ], + "BPGB09": [ + "BBL/BETA PETG Metallic" + ], + "BPGB10": [ + "BBL/BETA PETG Transparent" + ], + "BPGB11": [ + "BBL/BETA PETG UV Color Change" + ], + "BPGB12": [ + "BBL/BETA PETG-CF" + ], + "BPGB13": [ + "BBL/BETA PETG-GF" + ], + "BPLB00": [ + "BBL/BETA PLA Basic" + ], + "BPLB01": [ + "BBL/BETA PLA Silk+" + ], + "BPLB02": [ + "BBL/BETA PLA Chameleon" + ], + "BPLB03": [ + "BBL/BETA PLA Heat Color Change" + ], + "BPLB04": [ + "BBL/BETA PLA Fluorescence" + ], + "BPLB05": [ + "BBL/BETA PLA Glitter" + ], + "BPLB06": [ + "BBL/BETA PLA Glow" + ], + "BPLB07": [ + "BBL/BETA PLA Gradient" + ], + "BPLB08": [ + "BBL/BETA PLA Marble" + ], + "BPLB09": [ + "BBL/BETA PLA Matte" + ], + "BPLB10": [ + "BBL/BETA PLA Metal" + ], + "BPLB11": [ + "BBL/BETA PLA Metallic" + ], + "BPLB12": [ + "BBL/BETA PLA PRO" + ], + "BPLB13": [ + "BBL/BETA PLA Silk" + ], + "BPLB14": [ + "BBL/BETA PLA Transparent" + ], + "BPLB15": [ + "BBL/BETA PLA UV Color Change" + ], + "BPLB16": [ + "BBL/BETA PLA Youth" + ], + "BPLB17": [ + "BBL/BETA PLA-CF" + ], + "BPLB18": [ + "BBL/BETA PLA High Temp" + ], + "BPLB19": [ + "BBL/BETA PLA Wood" + ], + "BPLB20": [ + "BBL/BETA PLA High Speed" + ], + "BSFI001": [ + "Blocks/Blocks Generic PLA" + ], + "BSFI002": [ + "Blocks/Blocks Generic PETG" + ], + "BSFI003": [ + "Blocks/Blocks Generic TPU" + ], + "BSFI004": [ + "Blocks/Blocks Generic ABS" + ], + "BSFI005": [ + "Blocks/Blocks Generic ASA" + ], + "BSFI006": [ + "Blocks/Blocks Generic PA" + ], + "BSFI007": [ + "Blocks/Blocks Generic PA-CF" + ], + "BSFI008": [ + "Blocks/Blocks Generic PC" + ], + "BSFI009": [ + "Blocks/Blocks Generic PVA" + ], + "BSFI010": [ + "Blocks/Blocks Generic ASA-CF", + "Blocks/Blocks Generic PLA-CF" + ], + "BTUB00": [ + "BBL/BETA TPU 90A" + ], + "BTUB01": [ + "BBL/BETA TPU Matte" + ], + "BTUB02": [ + "BBL/BETA TPU 95A" + ], + "BTUB03": [ + "BBL/BETA TPU 98A" + ], + "CX30DB20": [ + "BBL/COEX TPE 30D", + "OrcaFilamentLibrary/COEX TPE 30D" + ], + "CX40DB20": [ + "BBL/COEX TPE 40D", + "OrcaFilamentLibrary/COEX TPE 40D" + ], + "CX60AB17": [ + "BBL/COEX TPU 60A", + "OrcaFilamentLibrary/COEX TPU 60A" + ], + "CX60DB19": [ + "BBL/COEX TPE 60D", + "OrcaFilamentLibrary/COEX TPE 60D" + ], + "CXABPB09": [ + "BBL/COEX ABS PRIME", + "OrcaFilamentLibrary/COEX ABS PRIME" + ], + "CXABSB01": [ + "BBL/COEX ABS", + "OrcaFilamentLibrary/COEX ABS" + ], + "CXASAB04": [ + "BBL/COEX ASA PRIME", + "OrcaFilamentLibrary/COEX ASA PRIME" + ], + "CXPACB23": [ + "BBL/COEX NYLEX PA6-CF", + "OrcaFilamentLibrary/COEX NYLEX PA6-CF" + ], + "CXPAUB21": [ + "BBL/COEX NYLEX UNFILLED " + ], + "CXPCTB15": [ + "BBL/COEX PCTG PRIME", + "OrcaFilamentLibrary/COEX PCTG PRIME" + ], + "CXPETB13": [ + "BBL/COEX PETG", + "OrcaFilamentLibrary/COEX PETG" + ], + "CXPLAB02": [ + "BBL/COEX PLA", + "OrcaFilamentLibrary/COEX PLA" + ], + "CXPLAB08": [ + "BBL/COEX PLA PRIME", + "OrcaFilamentLibrary/COEX PLA PRIME" + ], + "CXPLSB03": [ + "BBL/COEX PLA+Silk", + "OrcaFilamentLibrary/COEX PLA+Silk" + ], + "DFL99": [ + "Volumic/Désactivé" + ], + "DREMC001": [], + "DREMC002": [], + "DREMC003": [], + "DREMC004": [], + "DREMC005": [], + "DREMC006": [ + "OrcaFilamentLibrary/DREMC PA6-CF" + ], + "DREMC007": [], + "DREMC008": [], + "DREMC009": [ + "OrcaFilamentLibrary/DREMC ABS-GF" + ], + "DREMC010": [ + "OrcaFilamentLibrary/DREMC PPA-CF" + ], + "DREMC011": [], + "DREMC012": [], + "DREMC013": [], + "E1001": [ + "Creality/eSUN PLA+" + ], + "E1002": [ + "Creality/eSUN PLA-Silk" + ], + "E1003": [ + "Creality/eSUN PLA-Matte" + ], + "E1004": [ + "Creality/eSUN PLA-Lite" + ], + "E1005": [ + "Creality/eSUN PLA-CF" + ], + "E1006": [ + "Creality/eSUN PLA-HS" + ], + "E2001": [ + "Creality/eSUN PETG" + ], + "E2002": [ + "Creality/eSUN PETG+HS" + ], + "E2003": [ + "Creality/eSUN PETG-Basic" + ], + "E3001": [ + "Creality/eSUN ABS+" + ], + "E4001": [ + "Creality/eSUN ASA+" + ], + "E8001": [ + "Creality/eSUN PET-Basic" + ], + "EABSB00": [ + "Elegoo/Elegoo ABS" + ], + "EASAB00": [ + "Elegoo/Elegoo ASA", + "Elegoo/Elegoo ASA-CF" + ], + "EFL33": [ + "Eryone/Eryone PP-CF" + ], + "EFL40": [ + "Eryone/Eryone PLA-CF" + ], + "EFL43": [ + "Eryone/Eryone PETG-CF", + "Eryone/Eryone PP" + ], + "EFL71": [ + "Eryone/Eryone PA" + ], + "EFL72": [ + "Eryone/Eryone PA-CF" + ], + "EFL73": [ + "Eryone/Eryone PA-GF" + ], + "EFL81": [ + "Eryone/Eryone ABS-CF" + ], + "EFL82": [ + "Eryone/Eryone ASA-CF" + ], + "EFL90": [ + "Eryone/Eryone PLA" + ], + "EFL91": [ + "Eryone/Eryone ABS" + ], + "EFL92": [ + "Eryone/Eryone ASA" + ], + "EFL93": [ + "Eryone/Eryone PETG" + ], + "EFL941": [ + "Eryone/Eryone Silk PLA" + ], + "EFL95": [ + "Eryone/Eryone TPU" + ], + "EPAHTB00": [ + "Elegoo/Elegoo PAHT-CF" + ], + "EPCB00": [ + "Elegoo/Elegoo PC", + "Elegoo/Elegoo PC-FR" + ], + "EPETGB00": [ + "Elegoo/Elegoo PET-CF", + "Elegoo/Elegoo PETG", + "Elegoo/Elegoo PETG HF", + "Elegoo/Elegoo PETG PRO", + "Elegoo/Elegoo PETG Translucent", + "Elegoo/Elegoo PETG-CF", + "Elegoo/Elegoo PETG-GF", + "Elegoo/Elegoo Rapid PETG" + ], + "EPLAB00": [ + "Elegoo/Elegoo PLA", + "Elegoo/Elegoo PLA Basic", + "Elegoo/Elegoo PLA Galaxy", + "Elegoo/Elegoo PLA Glow", + "Elegoo/Elegoo PLA Marble", + "Elegoo/Elegoo PLA Matte", + "Elegoo/Elegoo PLA PRO", + "Elegoo/Elegoo PLA Silk", + "Elegoo/Elegoo PLA Sparkle", + "Elegoo/Elegoo PLA Translucent2", + "Elegoo/Elegoo PLA Wood", + "Elegoo/Elegoo PLA+", + "Elegoo/Elegoo PLA-CF", + "Elegoo/Elegoo Rapid PLA+" + ], + "ESN02": [ + "OrcaFilamentLibrary/eSUN ePLA-LW" + ], + "ESN03": [ + "OrcaFilamentLibrary/eSUN PETG" + ], + "ETPUB00": [ + "Elegoo/Elegoo Rapid TPU 95A", + "Elegoo/Elegoo TPU 95A" + ], + "FDPLAST01": [ + "OrcaFilamentLibrary/FDplast ABS" + ], + "FDPLAST02": [ + "OrcaFilamentLibrary/FDplast HIPS" + ], + "FDPLAST03": [ + "OrcaFilamentLibrary/FDplast PETG" + ], + "FDPLAST04": [ + "OrcaFilamentLibrary/FDplast PLA" + ], + "FDPLAST05": [ + "OrcaFilamentLibrary/FDplast SBS" + ], + "FDPLAST06": [ + "OrcaFilamentLibrary/FDplast TPU" + ], + "FFF01": [ + "Flashforge/Flashforge PLA" + ], + "FFF02": [ + "Flashforge/Flashforge ABS" + ], + "FFF03": [ + "Flashforge/Flashforge PETG", + "Flashforge/Generic PETG" + ], + "FFG01": [ + "Flashforge/Flashforge Generic PLA", + "Flashforge/Flashforge HS PLA", + "Flashforge/Flashforge HS PLA Burnt Ti", + "Flashforge/Flashforge PA", + "Flashforge/Flashforge PLA Basic", + "Flashforge/Flashforge PLA Buint Ti", + "Flashforge/Flashforge PLA Color Change", + "Flashforge/Flashforge PLA Galaxy", + "Flashforge/Flashforge PLA Luminous", + "Flashforge/Flashforge PLA Matte", + "Flashforge/Flashforge PLA Metal", + "Flashforge/Flashforge PLA Pro", + "Flashforge/Flashforge PLA Silk", + "Flashforge/Flashforge PLA Sparkle", + "Flashforge/Flashforge TPU 65D", + "Flashforge/Flashforge TPU 95A" + ], + "FILAR0001": [ + "OrcaFilamentLibrary/FilAr PLA Bronce" + ], + "FILAR0002": [ + "OrcaFilamentLibrary/FilAr PLA Gris Plata" + ], + "FILAR0003": [ + "OrcaFilamentLibrary/FilAr PLA Cobre" + ], + "FILAR0004": [ + "OrcaFilamentLibrary/FilAr PLA Titanio" + ], + "FILAR0005": [ + "OrcaFilamentLibrary/FilAr PLA Tabaco" + ], + "FILAR0006": [ + "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" + ], + "FILAR0007": [ + "OrcaFilamentLibrary/FilAr PLA Manteca" + ], + "FILAR0008": [ + "OrcaFilamentLibrary/FilAr PLA Marron Oxido" + ], + "FILAR0009": [ + "OrcaFilamentLibrary/FilAr PLA Carpincho" + ], + "FILAR0010": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" + ], + "FILAR0011": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" + ], + "FILAR0012": [ + "OrcaFilamentLibrary/FilAr PLA Piel" + ], + "FILAR0013": [ + "OrcaFilamentLibrary/FilAr PLA Verde FilAr" + ], + "FILAR0014": [ + "OrcaFilamentLibrary/FilAr PLA Verde Manzana" + ], + "FILAR0015": [ + "OrcaFilamentLibrary/FilAr PLA Verde Pixel" + ], + "FILAR0016": [ + "OrcaFilamentLibrary/FilAr PLA Verde Oliva" + ], + "FILAR0017": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" + ], + "FILAR0018": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Calido" + ], + "FILAR0019": [ + "OrcaFilamentLibrary/FilAr PLA Negro Azabache" + ], + "FILAR0020": [ + "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" + ], + "FILAR0021": [ + "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" + ], + "FILAR0022": [ + "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" + ], + "FILAR0023": [ + "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" + ], + "FILAR0024": [ + "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" + ], + "FILAR0025": [ + "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" + ], + "FILAR0026": [ + "OrcaFilamentLibrary/FilAr PLA Azul Francia" + ], + "FILAR0027": [ + "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" + ], + "FILAR0028": [ + "OrcaFilamentLibrary/FilAr PLA Oro" + ], + "FILAR0029": [ + "OrcaFilamentLibrary/FilAr PLA Dorado" + ], + "FILAR0030": [ + "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" + ], + "FILAR0031": [ + "OrcaFilamentLibrary/FilAr PLA-mate Azul" + ], + "FILAR0032": [ + "OrcaFilamentLibrary/FilAr PLA-mate Beige" + ], + "FILAR0033": [ + "OrcaFilamentLibrary/FilAr PLA-mate Blanco" + ], + "FILAR0034": [ + "OrcaFilamentLibrary/FilAr PLA-mate Bordo" + ], + "FILAR0035": [ + "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" + ], + "FILAR0036": [ + "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" + ], + "FILAR0037": [ + "OrcaFilamentLibrary/FilAr PLA-mate Gris" + ], + "FILAR0038": [ + "OrcaFilamentLibrary/FilAr PLA-mate Marron" + ], + "FILAR0039": [ + "OrcaFilamentLibrary/FilAr PLA-mate Naranja" + ], + "FILAR0040": [ + "OrcaFilamentLibrary/FilAr PLA-mate Negro" + ], + "FILAR0041": [ + "OrcaFilamentLibrary/FilAr PLA-mate Piel" + ], + "FILAR0042": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rojo" + ], + "FILAR0043": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rosa" + ], + "FILAR0044": [ + "OrcaFilamentLibrary/FilAr PLA-mate Uva" + ], + "FILAR0045": [ + "OrcaFilamentLibrary/FilAr PLA-mate Verde" + ], + "FILAR0046": [ + "OrcaFilamentLibrary/FilAr PLA-mate Violeta" + ], + "FILAR0047": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" + ], + "FILAR0048": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" + ], + "FILAR0049": [ + "OrcaFilamentLibrary/FilAr PETG Azul Boreal" + ], + "FILAR0050": [ + "OrcaFilamentLibrary/FilAr PETG Azul Francia" + ], + "FILAR0051": [ + "OrcaFilamentLibrary/FilAr PETG Azul Imperial" + ], + "FILAR0052": [ + "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" + ], + "FILAR0053": [ + "OrcaFilamentLibrary/FilAr PETG Cian" + ], + "FILAR0054": [ + "OrcaFilamentLibrary/FilAr PETG Coral" + ], + "FILAR0055": [ + "OrcaFilamentLibrary/FilAr PETG Cristal" + ], + "FILAR0056": [ + "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" + ], + "FILAR0057": [ + "OrcaFilamentLibrary/FilAr PETG Gris Plata" + ], + "FILAR0058": [ + "OrcaFilamentLibrary/FilAr PETG Magenta" + ], + "FILAR0059": [ + "OrcaFilamentLibrary/FilAr PETG Negro Azabache" + ], + "FILAR0060": [ + "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" + ], + "FILARB01": [], + "FILARB02": [], + "FILARB03": [], + "FILL3D001": [ + "OrcaFilamentLibrary/FILL3D PLA Turbo" + ], + "FILL3D002": [ + "OrcaFilamentLibrary/FILL3D PLA Basic" + ], + "FILL3D003": [ + "OrcaFilamentLibrary/FILL3D PETG" + ], + "FILL3D004": [ + "OrcaFilamentLibrary/FILL3D PP" + ], + "FILL3D005": [ + "OrcaFilamentLibrary/FILL3D PPCF" + ], + "FILL3D006": [ + "OrcaFilamentLibrary/FILL3D PA" + ], + "FILL3D007": [ + "OrcaFilamentLibrary/FILL3D PETG CF" + ], + "GABSB00": [ + "Elegoo/Generic ABS", + "Elegoo/Generic ABS-CF" + ], + "GASAB00": [ + "Elegoo/Generic ASA", + "Elegoo/Generic ASA-CF" + ], + "GFA00": [ + "Afinia/Afinia PLA", + "Afinia/Afinia Value PLA", + "BBL/Bambu PLA Basic", + "OrcaArena/Arena PLA Basic", + "Tiertime/Tiertime PLA", + "WonderMaker/WonderMaker PLA Basic" + ], + "GFA00_01": [ + "Afinia/Afinia PLA", + "Afinia/Afinia Value PLA", + "Tiertime/Tiertime PLA" + ], + "GFA01": [ + "BBL/Bambu PLA Matte", + "OrcaArena/Arena PLA Matte", + "WonderMaker/WonderMaker PLA Matte" + ], + "GFA02": [ + "BBL/Bambu PLA Metal", + "OrcaArena/Arena PLA Metal", + "WonderMaker/WonderMaker PLA Metal" + ], + "GFA03": [ + "OrcaArena/Arena PLA Impact" + ], + "GFA05": [ + "BBL/Bambu PLA Silk", + "OrcaArena/Arena PLA Silk", + "OrcaArena/OrcaArena Generic PLA Silk", + "Qidi/Qidi Generic PLA Silk", + "WonderMaker/WonderMaker PLA Silk" + ], + "GFA06": [ + "BBL/Bambu PLA Silk+" + ], + "GFA07": [ + "BBL/Bambu PLA Marble", + "OrcaArena/Arena PLA Marble", + "WonderMaker/WonderMaker PLA Marble" + ], + "GFA08": [ + "BBL/Bambu PLA Sparkle", + "OrcaArena/Arena PLA Sparkle" + ], + "GFA09": [ + "BBL/Bambu PLA Tough", + "OrcaArena/Arena PLA Tough" + ], + "GFA10": [ + "BBL/Bambu PLA Tough+" + ], + "GFA11": [ + "BBL/Bambu PLA Aero" + ], + "GFA12": [ + "BBL/Bambu PLA Glow" + ], + "GFA13": [ + "BBL/Bambu PLA Dynamic" + ], + "GFA15": [ + "BBL/Bambu PLA Galaxy" + ], + "GFA16": [ + "BBL/Bambu PLA Wood", + "WonderMaker/WonderMaker PLA Wood" + ], + "GFA17": [ + "BBL/Bambu PLA Translucent" + ], + "GFA18": [ + "BBL/Bambu PLA Lite" + ], + "GFA50": [ + "BBL/Bambu PLA-CF", + "OrcaArena/Arena PLA-CF", + "Tiertime/Tiertime PLA-CF" + ], + "GFA50_01": [ + "Tiertime/Tiertime PLA-CF" + ], + "GFA99": [ + "Anycubic/Anycubic ASA", + "CoLiDo/CoLiDo Generic PLA", + "CoLiDo/CoLiDo PLA", + "CoLiDo/CoLiDo PLA Silk", + "CoLiDo/CoLiDo PLA+" + ], + "GFABS": [ + "Anycubic/Anycubic ABS" + ], + "GFASA": [ + "Anycubic/Anycubic ASA" + ], + "GFB00": [ + "Afinia/Afinia ABS", + "Afinia/Afinia ABS+", + "Afinia/Afinia Value ABS", + "BBL/Bambu ABS", + "OrcaArena/Arena ABS", + "Tiertime/Tiertime ABS", + "WonderMaker/WonderMaker ABS" + ], + "GFB00_01": [ + "Afinia/Afinia ABS", + "Afinia/Afinia ABS+", + "Afinia/Afinia Value ABS", + "Tiertime/Tiertime ABS" + ], + "GFB01": [ + "BBL/Bambu ASA", + "Tiertime/Tiertime ASA", + "WonderMaker/WonderMaker ASA" + ], + "GFB01_01": [ + "Tiertime/Tiertime ASA" + ], + "GFB02": [ + "BBL/Bambu ASA-Aero" + ], + "GFB50": [ + "BBL/Bambu ABS-GF" + ], + "GFB51": [ + "BBL/Bambu ASA-CF" + ], + "GFB60": [ + "BBL/PolyLite ABS" + ], + "GFB61": [ + "BBL/PolyLite ASA" + ], + "GFB98": [ + "Anker/Anker Generic ASA", + "Anker/Anker Generic ASA 0.2 nozzle", + "Anker/Anker Generic ASA 0.25 nozzle", + "Anycubic/Anycubic Generic ASA", + "Artillery/Artillery Generic ASA", + "BBL/Generic ASA", + "Creality/Creality Generic ASA", + "Creality/Creality Generic ASA-CF", + "FLSun/FLSun Generic ASA", + "FLSun/FLSun S1 ASA", + "FLSun/FLSun T1 ASA", + "OrcaArena/OrcaArena Generic ASA", + "Prusa/Prusa Generic ASA", + "Prusa/Prusa Generic ASA HF", + "Prusa/Prusament ASA", + "Ratrig/RatRig BigNozzle ASA", + "Ratrig/RatRig Generic ASA", + "SecKit/SecKit Generic ASA", + "Tiertime/Tiertime Generic ASA", + "Vzbot/Vzbot Generic ASA" + ], + "GFB98_01": [ + "Tiertime/Tiertime Generic ASA" + ], + "GFB98_2": [ + "Prusa/Prusa Generic ASA" + ], + "GFB98_3": [ + "Prusa/Prusa Generic ASA" + ], + "GFB98_4": [ + "Prusa/Prusa Generic ASA" + ], + "GFB98_5": [ + "Prusa/Prusa Generic ASA", + "Prusa/Prusa Generic ASA HF" + ], + "GFB98_6": [ + "Prusa/Prusa Generic ASA HF" + ], + "GFB98_7": [ + "Prusa/Prusa Generic ASA HF" + ], + "GFB99": [ + "Anker/Anker Generic ABS", + "Anker/Anker Generic ABS 0.2 nozzle", + "Anker/Anker Generic ABS 0.25 nozzle", + "Anycubic/Anycubic ABS", + "Anycubic/Anycubic Generic ABS", + "Anycubic/Generic ABS", + "Artillery/Artillery Generic ABS", + "BBL/Generic ABS", + "Chuanying/Chuanying ABS", + "Chuanying/Chuanying Generic ABS", + "Chuanying/Chuanying Generic HIPS", + "Chuanying/Chuanying Generic PVA", + "CoLiDo/CoLiDo ABS", + "CoLiDo/CoLiDo Generic ABS", + "Comgrow/Comgrow Generic ABS", + "Creality/Creality Generic ABS", + "DeltaMaker/DeltaMaker Generic TPU", + "FLSun/FLSun Generic ABS", + "FLSun/FLSun S1 ABS", + "FLSun/FLSun T1 ABS", + "Flashforge/FlashForge PC", + "Flashforge/FlashForge PPS", + "Flashforge/FlashForge PPS-CF", + "Flashforge/Flashforge ABS Basic", + "Flashforge/Flashforge ABS-CF", + "Flashforge/Flashforge ASA Basic", + "Flashforge/Flashforge ASA-CF", + "Flashforge/Flashforge Generic ABS", + "Flashforge/Flashforge Generic ASA", + "Flashforge/Flashforge Generic HIPS", + "Flashforge/Flashforge Generic PETG", + "Flashforge/Flashforge Generic PETG-CF", + "Flashforge/Flashforge Generic PLA-CF", + "Flashforge/Flashforge Generic PVA", + "Flashforge/Flashforge HIPS", + "Flashforge/Flashforge HS PETG", + "Flashforge/Flashforge HS PLA", + "Flashforge/Flashforge HS PLA Burnt Ti", + "Flashforge/Flashforge PA", + "Flashforge/Flashforge PA12-CF", + "Flashforge/Flashforge PA6-CF", + "Flashforge/Flashforge PA66-CF", + "Flashforge/Flashforge PET-CF", + "Flashforge/Flashforge PETG Pro", + "Flashforge/Flashforge PETG Transparent", + "Flashforge/Flashforge PETG-CF", + "Flashforge/Flashforge PLA Basic", + "Flashforge/Flashforge PLA Color Change", + "Flashforge/Flashforge PLA Galaxy", + "Flashforge/Flashforge PLA Luminous", + "Flashforge/Flashforge PLA Matte", + "Flashforge/Flashforge PLA Metal", + "Flashforge/Flashforge PLA Pro", + "Flashforge/Flashforge PLA Silk", + "Flashforge/Flashforge PLA Sparkle", + "Flashforge/Flashforge PLA-CF", + "Flashforge/Flashforge PPA-CF", + "Flashforge/Flashforge PPA-GF", + "Flashforge/Flashforge PPS-CF", + "Flashforge/Flashforge TPU 65D", + "Flashforge/Flashforge TPU 95A", + "Flashforge/FusRock Generic NexPA-CF25", + "Flashforge/FusRock Generic PAHT-CF", + "Flashforge/FusRock Generic PAHT-GF", + "Flashforge/FusRock Generic PET-CF", + "Flashforge/FusRock Generic PET-GF", + "Flashforge/FusRock Generic S-Multi", + "Flashforge/FusRock Generic S-PAHT", + "Flashforge/FusRock PAHT", + "Flashforge/FusRock PAHT-CF", + "Flashforge/FusRock PET", + "Flashforge/FusRock PET-CF", + "Flashforge/Generic ABS", + "Flashforge/Generic PET", + "Flashforge/Polymaker CoPA", + "Flashforge/Polymaker Generic CoPA", + "Flashforge/Polymaker Generic S1", + "FlyingBear/FlyingBear ABS", + "FlyingBear/FlyingBear Generic ABS", + "FlyingBear/Other ABS", + "InfiMech/InfiMech ABS", + "InfiMech/InfiMech Generic ABS", + "InfiMech/Other ABS", + "Lulzbot/Lulzbot 2.85mm ABS", + "OrcaArena/OrcaArena Generic ABS", + "Prusa/Prusa Generic ABS", + "Prusa/Prusa Generic ABS HF", + "Qidi/Bambu ABS", + "Qidi/Bambu PETG", + "Qidi/Bambu PLA", + "Qidi/HATCHBOX ABS", + "Qidi/HATCHBOX PETG", + "Qidi/HATCHBOX PLA", + "Qidi/Overture ABS", + "Qidi/Overture PLA", + "Qidi/PolyLite ABS", + "Qidi/PolyLite PLA", + "Qidi/QIDI ABS Odorless", + "Qidi/QIDI ABS Rapido", + "Qidi/QIDI ABS Rapido 0.2 nozzle", + "Qidi/QIDI ABS Rapido 0.6 nozzle", + "Qidi/QIDI ABS Rapido 0.8 nozzle", + "Qidi/QIDI ABS Rapido Metal", + "Qidi/QIDI ABS-GF", + "Qidi/QIDI ABS-GF10", + "Qidi/QIDI ABS-GF25", + "Qidi/QIDI ASA", + "Qidi/QIDI ASA-CF", + "Qidi/QIDI PA-Ultra", + "Qidi/QIDI PA12-CF", + "Qidi/QIDI PAHT-CF", + "Qidi/QIDI PAHT-GF", + "Qidi/QIDI PEBA 95A", + "Qidi/QIDI PET-CF", + "Qidi/QIDI PET-GF", + "Qidi/QIDI PETG Basic", + "Qidi/QIDI PETG Rapido", + "Qidi/QIDI PETG Tough", + "Qidi/QIDI PETG Translucent", + "Qidi/QIDI PETG-CF", + "Qidi/QIDI PETG-GF", + "Qidi/QIDI PLA Basic", + "Qidi/QIDI PLA Matte Basic", + "Qidi/QIDI PLA Rapido", + "Qidi/QIDI PLA Rapido Matte", + "Qidi/QIDI PLA Rapido Metal", + "Qidi/QIDI PLA Rapido Silk", + "Qidi/QIDI PPS-CF", + "Qidi/QIDI PPS-GF", + "Qidi/QIDI TPU-Aero", + "Qidi/QIDI TPU-GF", + "Qidi/QIDI UltraPA-CF25", + "Qidi/QIDI WOOD Rapido", + "Qidi/Qidi ASA-Aero", + "Qidi/Qidi Generic ABS", + "Qidi/Qidi Generic ASA", + "Qidi/Qidi Generic PETG", + "Qidi/Qidi Generic PLA", + "Qidi/Qidi Generic PLA+", + "Qidi/Qidi Generic TPU", + "Qidi/Qidi Generic TPU 95A", + "Qidi/Qidi PC-ABS-FR", + "Qidi/Qidi TPU 95A-HF", + "Ratrig/RatRig BigNozzle ABS", + "Ratrig/RatRig Generic ABS", + "Ratrig/RatRig PunkFil ABS", + "Ratrig/RatRig PunkFil PETG", + "Ratrig/RatRig PunkFil PETG CF", + "SecKit/SecKit Generic ABS", + "Tiertime/Tiertime Generic ABS", + "Volumic/Volumic ABS Ultra", + "Volumic/Volumic ABS Ultra (Performance)", + "Volumic/Volumic ASA Ultra", + "Volumic/Volumic ASA Ultra (Performance)", + "Volumic/Volumic PP Ultra", + "Volumic/Volumic PP Ultra (Performance)", + "Vzbot/Vzbot Generic ABS" + ], + "GFB99_01": [ + "Tiertime/Tiertime Generic ABS" + ], + "GFB99_2": [ + "Prusa/Prusa Generic ABS" + ], + "GFB99_3": [ + "Prusa/Prusa Generic ABS" + ], + "GFB99_4": [ + "Prusa/Prusa Generic ABS" + ], + "GFB99_5": [ + "Prusa/Prusa Generic ABS", + "Prusa/Prusa Generic ABS HF" + ], + "GFB99_6": [ + "Prusa/Prusa Generic ABS HF" + ], + "GFB99_7": [ + "Prusa/Prusa Generic ABS HF" + ], + "GFC00": [ + "BBL/Bambu PC", + "OrcaArena/Arena PC", + "Tiertime/Tiertime PC" + ], + "GFC00_01": [ + "Tiertime/Tiertime PC" + ], + "GFC01": [ + "BBL/Bambu PC FR" + ], + "GFC98": [ + "Prusa/Prusament PC-CF" + ], + "GFC99": [ + "Anker/Anker Generic PC", + "Anker/Anker Generic PC 0.2 nozzle", + "Anker/Anker Generic PC 0.25 nozzle", + "Anycubic/Anycubic Generic PC", + "BBL/Generic PC", + "Creality/Creality Generic PC", + "Custom/Generic PC", + "FLSun/FLSun Generic PC", + "FlyingBear/FlyingBear Generic PC", + "FlyingBear/FlyingBear PC", + "FlyingBear/Other PC", + "InfiMech/InfiMech Generic PC", + "InfiMech/InfiMech PC", + "InfiMech/Other PC", + "OrcaArena/OrcaArena Generic PC", + "Prusa/Prusa Generic PC", + "Prusa/Prusa Generic PC HF", + "Prusa/Prusament PC Blend", + "Qidi/Qidi Generic PC", + "Ratrig/RatRig BigNozzle PCTG", + "Ratrig/RatRig Generic PC", + "Ratrig/RatRig Generic PCTG", + "SecKit/SecKit Generic PC", + "Tiertime/Tiertime Generic PC", + "Volumic/Volumic PC", + "Volumic/Volumic PC (Performance)", + "Vzbot/Vzbot Generic PC" + ], + "GFC99_01": [ + "Tiertime/Tiertime Generic PC" + ], + "GFC99_1": [ + "Prusa/Prusa Generic PC" + ], + "GFC99_2": [ + "Prusa/Prusa Generic PC" + ], + "GFC99_3": [ + "Prusa/Prusa Generic PC" + ], + "GFC99_4": [ + "Prusa/Prusa Generic PC", + "Prusa/Prusa Generic PC HF" + ], + "GFC99_5": [ + "Prusa/Prusa Generic PC HF" + ], + "GFC99_6": [ + "Prusa/Prusa Generic PC HF" + ], + "GFG00": [ + "BBL/Bambu PETG Basic", + "OrcaArena/Arena PETG Basic", + "Tiertime/Tiertime PETG", + "WonderMaker/WonderMaker PETG Basic" + ], + "GFG00_01": [ + "Tiertime/Tiertime PETG" + ], + "GFG01": [ + "BBL/Bambu PETG Translucent", + "re3D/re3D Greengate rPETG" + ], + "GFG02": [ + "BBL/Bambu PETG HF", + "re3D/re3D rPP" + ], + "GFG03": [ + "re3D/re3D PETG" + ], + "GFG50": [ + "BBL/Bambu PETG-CF", + "OrcaArena/Arena PETG-CF" + ], + "GFG60": [ + "BBL/PolyLite PETG", + "Snapmaker/PolyLite PETG" + ], + "GFG96": [ + "BBL/Generic PETG HF" + ], + "GFG97": [ + "BBL/Generic PCTG", + "Tiertime/Tiertime Generic PCTG" + ], + "GFG97-01": [ + "Tiertime/Tiertime Generic PCTG" + ], + "GFG98": [ + "Anker/Anker Generic PETG-CF", + "BBL/Generic PETG-CF", + "OrcaArena/OrcaArena Generic PETG-CF", + "Qidi/Qidi Generic PETG-CF", + "Tiertime/Tiertime Generic PETG-CF", + "Volumic/Volumic PETG Ultra carbone", + "Volumic/Volumic PETG Ultra carbone (Performance)" + ], + "GFG98_01": [ + "Tiertime/Tiertime Generic PETG-CF" + ], + "GFG99": [ + "Anker/Anker Generic PETG", + "Anker/Anker Generic PETG 0.2 nozzle", + "Anker/Anker Generic PETG 0.25 nozzle", + "Anycubic/Anycubic Generic PETG", + "Anycubic/Anycubic PETG", + "Anycubic/Generic PETG Basic", + "Artillery/Artillery Generic PETG", + "BBL/Generic PETG", + "CONSTRUCT3D/C1 Generic High Flow PETG", + "CONSTRUCT3D/C1 Generic PETG", + "Chuanying/Chuanying Generic PETG", + "Chuanying/Chuanying Generic PETG-CF10", + "Chuanying/Chuanying Generic TPU", + "Chuanying/Chuanying PETG", + "CoLiDo/CoLiDo Generic PETG", + "CoLiDo/CoLiDo PETG", + "Comgrow/Comgrow Generic PETG", + "Creality/Creality Generic PETG", + "Creality/Creality Generic PETG-CF", + "Custom/Generic PETG", + "DeltaMaker/DeltaMaker Generic PETG", + "FLSun/FLSun Generic PETG", + "FLSun/FLSun S1 PETG", + "FLSun/FLSun T1 PETG", + "Flashforge/Flashforge Generic PETG", + "Flashforge/Flashforge Generic PETG-CF10", + "Flashforge/Flashforge Generic TPU", + "Flashforge/Flashforge HS PETG", + "Flashforge/Flashforge PA", + "Flashforge/Flashforge PETG Basic", + "Flashforge/Flashforge PETG Pro", + "Flashforge/Flashforge PETG Transparent", + "Flashforge/Flashforge PETG-CF", + "Flashforge/Flashforge TPU 95A", + "Flashforge/FusRock PET-CF", + "Flashforge/Generic PET", + "Flashforge/Generic PETG", + "Flashforge/Generic PETG-CF10", + "Flashforge/Generic TPU", + "Flashforge/Generic TPU 85A", + "FlyingBear/FlyingBear Generic PETG", + "FlyingBear/FlyingBear PETG", + "FlyingBear/FlyingBear PETG Basic", + "FlyingBear/Other PETG", + "InfiMech/InfiMech Generic PETG", + "InfiMech/InfiMech PETG", + "InfiMech/Other PETG", + "Lulzbot/Lulzbot 2.85mm PETG", + "MagicMaker/MM Generic PEEK", + "OrcaArena/OrcaArena Generic PETG", + "Qidi/Bambu PETG", + "Qidi/HATCHBOX PETG", + "Qidi/QIDI PETG Basic", + "Qidi/QIDI PETG Rapido", + "Qidi/QIDI PETG Tough", + "Qidi/QIDI PETG Tough 0.2 nozzle", + "Qidi/QIDI PETG Tough 0.6 nozzle", + "Qidi/QIDI PETG Tough 0.8 nozzle", + "Qidi/QIDI PETG Translucent", + "Qidi/Qidi Generic PETG", + "Qidi/Tinmorry PETG-ECO", + "Ratrig/RatRig BigNozzle PETG", + "Ratrig/RatRig Generic PETG", + "SecKit/SecKit Generic PETG", + "Tiertime/Tiertime Generic PETG", + "Volumic/PETG ESD (Performance)", + "Volumic/Volumic PCTG Ultra (Performance)", + "Volumic/Volumic PETG Ultra", + "Volumic/Volumic PETG Ultra (Performance)", + "Vzbot/Vzbot Generic PETG", + "Wanhao France/YUMI PETG", + "re3D/re3D PC" + ], + "GFG99_01": [ + "Tiertime/Tiertime Generic PETG" + ], + "GFG99_2": [ + "Prusa/Prusa Generic PETG" + ], + "GFG99_3": [ + "Prusa/Prusa Generic PETG" + ], + "GFG99_4": [ + "Prusa/Prusa Generic PETG" + ], + "GFG99_5": [ + "Prusa/Prusa Generic PETG", + "Prusa/Prusa Generic PETG HF" + ], + "GFG99_6": [ + "Prusa/Prusa Generic PETG HF" + ], + "GFG99_7": [ + "Prusa/Prusa Generic PETG HF" + ], + "GFL00": [ + "BBL/PolyLite PLA", + "OrcaArena/PolyLite PLA", + "Snapmaker/PolyLite PLA" + ], + "GFL01": [ + "BBL/PolyTerra PLA", + "OrcaArena/PolyTerra PLA", + "Snapmaker/PolyTerra PLA" + ], + "GFL03": [ + "BBL/eSUN PLA+" + ], + "GFL04": [ + "BBL/Overture PLA" + ], + "GFL05": [ + "BBL/Overture Matte PLA" + ], + "GFL06": [ + "BBL/Fiberon PETG-ESD", + "Snapmaker/Fiberon PETG-ESD" + ], + "GFL100": [ + "TwoTrees/TwoTrees Generic HS PLA", + "Z-Bolt/Generic PLA" + ], + "GFL106": [ + "Z-Bolt/Generic PLA" + ], + "GFL108": [ + "Z-Bolt/Generic PLA" + ], + "GFL200": [], + "GFL204": [ + "Z-Bolt/Generic ABS" + ], + "GFL206": [ + "Z-Bolt/Generic ABS" + ], + "GFL208": [ + "Z-Bolt/Generic ABS" + ], + "GFL300": [], + "GFL304": [ + "Z-Bolt/Generic PETG" + ], + "GFL306": [ + "Z-Bolt/Generic PETG" + ], + "GFL308": [ + "Z-Bolt/Generic PETG" + ], + "GFL400": [], + "GFL404": [ + "Z-Bolt/Generic PA" + ], + "GFL406": [ + "Z-Bolt/Generic PA" + ], + "GFL408": [ + "Z-Bolt/Generic PA" + ], + "GFL50": [ + "BBL/Fiberon PA6-CF" + ], + "GFL500": [], + "GFL504": [ + "Z-Bolt/Generic ABS HT" + ], + "GFL506": [ + "Z-Bolt/Generic ABS HT" + ], + "GFL508": [ + "Z-Bolt/Generic ABS HT" + ], + "GFL51": [ + "BBL/Fiberon PA6-GF" + ], + "GFL52": [ + "BBL/Fiberon PA12-CF" + ], + "GFL53": [ + "BBL/Fiberon PA612-CF" + ], + "GFL54": [ + "BBL/Fiberon PET-CF" + ], + "GFL55": [ + "BBL/Fiberon PETG-rCF" + ], + "GFL56": [ + "BBL/Fiberon PA12-CF10", + "Snapmaker/Fiberon PA12-CF10" + ], + "GFL57": [ + "Anycubic/Fiberon PA6-CF20", + "BBL/Fiberon PA6-CF20", + "Snapmaker/Fiberon PA6-CF20" + ], + "GFL58": [ + "BBL/Fiberon PA6-GF25" + ], + "GFL59": [ + "BBL/Fiberon PA612-CF15" + ], + "GFL60": [ + "BBL/Fiberon PET-CF17" + ], + "GFL61": [ + "BBL/Fiberon PETG-rCF08" + ], + "GFL62": [ + "BBL/PolyLite CosPLA", + "Snapmaker/PolyLite CosPLA" + ], + "GFL63": [ + "BBL/PolyLite PLA Galaxy", + "Snapmaker/PolyLite PLA Galaxy" + ], + "GFL64": [ + "BBL/PolyLite PLA Glow", + "Snapmaker/PolyLite PLA Glow" + ], + "GFL65": [ + "BBL/PolyLite PLA Luminous", + "Snapmaker/PolyLite PLA Luminous" + ], + "GFL66": [ + "BBL/PolyLite PLA Neon", + "Snapmaker/PolyLite PLA Neon" + ], + "GFL67": [ + "BBL/PolyLite PLA Starlight", + "Snapmaker/PolyLite PLA Starlight" + ], + "GFL68": [ + "BBL/PolyLite PLA Translucent", + "Snapmaker/PolyLite PLA Translucent" + ], + "GFL69": [ + "BBL/PolyTerra PLA Marble", + "Snapmaker/PolyTerra PLA Marble" + ], + "GFL70": [ + "BBL/PolyTerra PLA+", + "Snapmaker/PolyTerra PLA+" + ], + "GFL71": [ + "Snapmaker/Fiberon ASA-CF08" + ], + "GFL72": [ + "Snapmaker/Fiberon PA612-ESD" + ], + "GFL73": [ + "Snapmaker/Fiberon PPS-GF20" + ], + "GFL74": [ + "Snapmaker/PolyLite PETG Translucent" + ], + "GFL75": [ + "Snapmaker/PolyLite PLA Pro Metallic" + ], + "GFL76": [ + "Snapmaker/Polymaker PETG" + ], + "GFL77": [ + "Snapmaker/Polymaker PETG Galaxy" + ], + "GFL78": [ + "Snapmaker/Polymaker PLA" + ], + "GFL79": [ + "Anycubic/Polymaker PLA Pro", + "Snapmaker/Polymaker PLA Pro" + ], + "GFL80": [ + "Anycubic/Polymaker PLA Pro Metallic", + "Snapmaker/Polymaker PLA Pro Metallic" + ], + "GFL92": [ + "Anycubic/Anycubic PLA" + ], + "GFL93": [ + "Anycubic/Anycubic PLA+" + ], + "GFL94": [ + "Anycubic/Anycubic PLA Slik" + ], + "GFL95": [ + "Anker/Anker Generic PLA+", + "Anker/Anker Generic PLA+ 0.2 nozzle", + "Anker/Anker Generic PLA+ 0.25 nozzle", + "Anycubic/Anycubic PLA Matte", + "BBL/Generic PLA High Speed", + "Tiertime/Tiertime Generic PLA High Speed" + ], + "GFL95_01": [ + "Tiertime/Tiertime Generic PLA High Speed" + ], + "GFL96": [ + "Anker/Anker Generic PLA Silk", + "Anker/Anker Generic PLA Silk 0.2 nozzle", + "Anker/Anker Generic PLA Silk 0.25 nozzle", + "Anycubic/Anycubic PLA High Speed", + "BBL/Generic PLA Silk", + "Tiertime/Tiertime Generic PLA Silk" + ], + "GFL96_01": [ + "Tiertime/Tiertime Generic PLA Silk" + ], + "GFL97": [ + "Anycubic/Anycubic PLA SE" + ], + "GFL98": [ + "Anker/Anker Generic PLA-CF", + "Anycubic/Anycubic Generic PLA-CF", + "Anycubic/Anycubic PLA Glow", + "Artillery/Artillery Generic PLA-CF", + "BBL/Generic PLA-CF", + "Creality/Creality Generic PLA-CF", + "Custom/Generic PLA-CF", + "FLSun/FLSun Generic PLA-CF", + "OrcaArena/OrcaArena Generic PLA-CF", + "Qidi/QIDI PAHT-GF", + "Qidi/QIDI PLA-CF", + "Qidi/Qidi Generic PLA-CF", + "Qidi/Qidi PLA-CF", + "Ratrig/RatRig Generic PLA-CF", + "SecKit/SecKit Generic PLA-CF", + "Tiertime/Tiertime Generic PLA-CF", + "Vzbot/Vzbot Generic PLA-CF" + ], + "GFL98_01": [ + "Tiertime/Tiertime Generic PLA-CF" + ], + "GFL98_1": [ + "Prusa/Prusa Generic PLA-CF" + ], + "GFL98_3": [ + "Prusa/Prusa Generic PLA-CF" + ], + "GFL98_4": [ + "Prusa/Prusa Generic PLA-CF" + ], + "GFL98_5": [ + "Prusa/Prusa Generic PLA-CF" + ], + "GFL99": [ + "Anker/Anker Generic PLA", + "Anker/Anker Generic PLA 0.2 nozzle", + "Anker/Anker Generic PLA 0.25 nozzle", + "Anycubic/Anycubic Generic PLA", + "Anycubic/Anycubic PLA", + "Anycubic/Anycubic PLA High Speed", + "Anycubic/Anycubic PLA Luminous", + "Anycubic/Anycubic PLA Matte", + "Anycubic/Anycubic PLA Silk", + "Anycubic/Anycubic PLA+", + "Artillery/Artillery ABS", + "Artillery/Artillery ASA", + "Artillery/Artillery Generic PLA", + "Artillery/Artillery PA", + "Artillery/Artillery PA-CF", + "Artillery/Artillery PC", + "Artillery/Artillery PET", + "Artillery/Artillery PETG", + "Artillery/Artillery PETG Basic", + "Artillery/Artillery PETG-CF", + "Artillery/Artillery PLA Basic", + "Artillery/Artillery PLA Basic+", + "Artillery/Artillery PLA Matte", + "Artillery/Artillery PLA Silk", + "Artillery/Artillery PLA Tough", + "Artillery/Artillery PLA-CF", + "Artillery/Artillery PVA", + "Artillery/Artillery TPU", + "BBL/Generic PLA", + "CONSTRUCT3D/C1 Generic PLA", + "Chuanying/Chuanying ASA", + "Chuanying/Chuanying Generic ASA", + "Chuanying/Chuanying Generic HS PLA", + "Chuanying/Chuanying Generic PLA", + "Chuanying/Chuanying Generic PLA-CF10", + "Chuanying/Chuanying Generic PLA-Silk", + "Chuanying/Chuanying HS PLA", + "Chuanying/Chuanying PLA", + "Chuanying/Chuanying PLA-SILK", + "Co Print/CoPrint Generic ABS", + "Co Print/CoPrint Generic PETG", + "Co Print/CoPrint Generic PLA", + "Co Print/CoPrint Generic TPU", + "Comgrow/Comgrow Generic PLA", + "Comgrow/Comgrow T300 PLA", + "Creality/Creality Generic PLA", + "Creality/Creality Generic PLA High Speed", + "Creality/Creality Generic PLA Matte", + "Creality/Creality Generic PLA Silk", + "Creality/Creality Generic PLA Wood", + "Creality/Creality HF Generic PLA", + "Creality/Creality HF Generic Speed PLA", + "Custom/Generic PLA", + "DeltaMaker/DeltaMaker Brand PLA", + "DeltaMaker/DeltaMaker Generic PLA", + "Dremel/Dremel Generic PLA", + "FLSun/FLSun Generic PLA", + "FLSun/FLSun S1 PLA Generic", + "FLSun/FLSun S1 PLA High Speed", + "FLSun/FLSun S1 PLA Silk", + "FLSun/FLSun T1 PLA Generic", + "FLSun/FLSun T1 PLA High Speed", + "FLSun/FLSun T1 PLA Silk", + "Flashforge/Flashforge ASA Basic", + "Flashforge/Flashforge Generic ASA", + "Flashforge/Flashforge Generic HS PLA", + "Flashforge/Flashforge Generic PLA-CF10", + "Flashforge/Flashforge Generic PLA-SILK", + "Flashforge/Flashforge Generic PLA-Silk", + "Flashforge/Flashforge HIPS", + "Flashforge/Flashforge HS PLA", + "Flashforge/Flashforge PA-CF", + "Flashforge/Flashforge PAHT-CF", + "Flashforge/Flashforge PLA Basic", + "Flashforge/Flashforge PLA Color Change", + "Flashforge/Flashforge PLA Galaxy", + "Flashforge/Flashforge PLA Luminous", + "Flashforge/Flashforge PLA Matte", + "Flashforge/Flashforge PLA Metal", + "Flashforge/Flashforge PLA Pro", + "Flashforge/Flashforge PLA Silk", + "Flashforge/Flashforge PLA Sparkle", + "Flashforge/Flashforge PLA-CF", + "Flashforge/Flashforge PPS", + "Flashforge/Flashforge PPS-CF", + "Flashforge/FusRock PAHT-CF", + "Flashforge/Generic ASA", + "Flashforge/Generic PLA", + "Flashforge/Generic PLA High Speed", + "Flashforge/Generic PLA Silk", + "Flashforge/Generic PLA-CF10", + "FlyingBear/FlyingBear Generic PLA", + "FlyingBear/FlyingBear PLA", + "FlyingBear/FlyingBear PLA Basic", + "FlyingBear/FlyingBear PLA Hyper", + "FlyingBear/Other PLA", + "FlyingBear/Other PLA Hyper", + "InfiMech/InfiMech Generic PLA", + "InfiMech/InfiMech PLA", + "InfiMech/InfiMech PLA Basic", + "InfiMech/InfiMech PLA Hyper", + "InfiMech/Other PLA", + "InfiMech/Other PLA Hyper", + "Lulzbot/Lulzbot 2.85mm PLA", + "OrcaArena/OrcaArena Generic PLA", + "Peopoly/Peopoly Generic PLA", + "Peopoly/Peopoly Lancer ABS-GF", + "Peopoly/Peopoly Lancer PET-CF", + "Peopoly/Peopoly Lancer PETG-C", + "Peopoly/Peopoly Lancer PLA-C", + "Phrozen/Phrozen PLA", + "Prusa/Prusa Generic PLA", + "Prusa/Prusa Generic PLA HF", + "Prusa/Prusa Generic PLA-CF", + "Prusa/Prusament PLA", + "Prusa/Prusament rPLA", + "Qidi/Bambu PLA", + "Qidi/Generic PLA+", + "Qidi/HATCHBOX PLA", + "Qidi/Overture PLA", + "Qidi/PolyLite PLA", + "Qidi/QIDI PLA Basic", + "Qidi/QIDI PLA Matte Basic", + "Qidi/QIDI PLA Rapido", + "Qidi/QIDI PLA Rapido 0.2 nozzle", + "Qidi/QIDI PLA Rapido 0.8 nozzle", + "Qidi/QIDI PLA Rapido Matte", + "Qidi/QIDI PLA Rapido Metal", + "Qidi/QIDI PLA Rapido Silk", + "Qidi/QIDI WOOD Rapido", + "Qidi/Qidi Generic PLA", + "Qidi/Qidi Generic PLA High Speed", + "Qidi/Qidi Generic PLA+", + "Ratrig/RatRig BigNozzle PLA", + "Ratrig/RatRig BigNozzle TPU", + "Ratrig/RatRig Generic PLA", + "SecKit/SecKit Generic PLA", + "Sovol/Generic ABS", + "Sovol/Generic PC", + "Sovol/Generic PETG", + "Sovol/Generic PLA", + "Sovol/Generic PLA Silk", + "Sovol/Generic TPU", + "Sovol/Polymaker PETG", + "Sovol/SUNLU PETG", + "Sovol/Sovol SV06 ACE ABS", + "Sovol/Sovol SV06 ACE PETG", + "Sovol/Sovol SV06 ACE PLA", + "Sovol/Sovol SV06 ACE TPU", + "Sovol/Sovol SV06 Plus ACE ABS", + "Sovol/Sovol SV06 Plus ACE PETG", + "Sovol/Sovol SV06 Plus ACE PLA", + "Sovol/Sovol SV06 Plus ACE TPU", + "Sovol/Sovol SV07 PLA", + "Sovol/Sovol SV08 ABS", + "Sovol/Sovol SV08 PETG", + "Sovol/Sovol SV08 PLA", + "Sovol/Sovol SV08 TPU", + "Sovol/Sovol Zero ABS", + "Sovol/Sovol Zero PC", + "Sovol/Sovol Zero PETG", + "Sovol/Sovol Zero PETG HS Nozzle", + "Sovol/Sovol Zero PLA Basic", + "Sovol/Sovol Zero PLA Basic HS Nozzle", + "Sovol/Sovol Zero PLA Silk", + "Sovol/Sovol Zero PLA Silk HS Nozzle", + "Sovol/Sovol Zero TPU", + "Tiertime/Tiertime Generic PLA", + "Tiertime/Tiertime Generic SBS", + "Volumic/Volumic PLA Ultra", + "Volumic/Volumic PLA Ultra (Performance)", + "Volumic/Volumic UNIVERSAL Ultra", + "Volumic/Volumic UNIVERSAL Ultra (Performance)", + "Vzbot/Vzbot Generic PLA", + "re3D/re3D PLA" + ], + "GFL99_01": [ + "Tiertime/Tiertime Generic PLA", + "Tiertime/Tiertime Generic SBS" + ], + "GFL99_2": [ + "Prusa/Prusa Generic PLA" + ], + "GFL99_3": [ + "Prusa/Prusa Generic PLA" + ], + "GFL99_4": [ + "Prusa/Prusa Generic PLA" + ], + "GFL99_5": [ + "Prusa/Prusa Generic PLA", + "Prusa/Prusa Generic PLA HF" + ], + "GFL99_6": [ + "Prusa/Prusa Generic PLA HF" + ], + "GFL99_7": [ + "Prusa/Prusa Generic PLA HF" + ], + "GFLLK10PETG": [ + "LONGER/Generic PETG" + ], + "GFLLK10PLA": [ + "LONGER/Generic PLA" + ], + "GFLLK10PPETG": [ + "LONGER/Generic PETG" + ], + "GFLLK10PPLA": [ + "LONGER/Generic PLA" + ], + "GFLSBS99": [], + "GFN03": [ + "BBL/Bambu PA-CF", + "OrcaArena/Arena PA-CF" + ], + "GFN04": [ + "BBL/Bambu PAHT-CF", + "OrcaArena/Arena PAHT-CF" + ], + "GFN05": [ + "BBL/Bambu PA6-CF", + "Tiertime/Tiertime PA6-CF" + ], + "GFN05_01": [ + "Tiertime/Tiertime PA6-CF" + ], + "GFN06": [ + "BBL/Bambu PPA-CF" + ], + "GFN08": [ + "BBL/Bambu PA6-GF" + ], + "GFN96": [ + "BBL/Generic PPA-GF", + "Tiertime/Tiertime Generic PPA-GF" + ], + "GFN96_01": [ + "Tiertime/Tiertime Generic PPA-GF" + ], + "GFN97": [ + "BBL/Generic PPA-CF", + "Tiertime/Tiertime Generic PPA-CF" + ], + "GFN97_01": [ + "Tiertime/Tiertime Generic PPA-CF" + ], + "GFN98": [ + "Anker/Anker Generic PA-CF", + "Anycubic/Anycubic Generic PA-CF", + "BBL/Generic PA-CF", + "Creality/Creality Generic PA-CF", + "FLSun/FLSun Generic PA-CF", + "FlyingBear/FlyingBear Generic PA-CF", + "FlyingBear/FlyingBear PA-CF", + "FlyingBear/Other PA-CF", + "InfiMech/InfiMech Generic PA-CF", + "InfiMech/InfiMech PA-CF", + "InfiMech/Other PA-CF", + "OrcaArena/OrcaArena Generic PA-CF", + "Prusa/Prusament PA-CF", + "Qidi/QIDI PA12-CF", + "Qidi/QIDI PAHT-CF", + "Qidi/QIDI PAHT-GF", + "Qidi/QIDI PET-CF", + "Qidi/QIDI PET-GF", + "Qidi/QIDI PETG-CF", + "Qidi/QIDI PETG-GF", + "Qidi/QIDI PPS-CF", + "Qidi/QIDI Support For PAHT", + "Qidi/QIDI Support For PET/PA", + "Qidi/QIDI UltraPA-CF25", + "Qidi/Qidi Generic PA-CF", + "Ratrig/RatRig Generic PA-CF", + "SecKit/SecKit Generic PA-CF", + "Tiertime/Tiertime Generic PA-CF", + "Vzbot/Vzbot Generic PA-CF" + ], + "GFN98_02": [ + "Tiertime/Tiertime Generic PA-CF" + ], + "GFN98_1": [ + "Prusa/Prusa Generic PA-CF" + ], + "GFN98_2": [ + "Prusa/Prusa Generic PA-CF" + ], + "GFN98_3": [ + "Prusa/Prusa Generic PA-CF" + ], + "GFN98_4": [ + "Prusa/Prusa Generic PA-CF" + ], + "GFN99": [ + "Anker/Anker Generic PA", + "Anker/Anker Generic PA 0.2 nozzle", + "Anker/Anker Generic PA 0.25 nozzle", + "Anycubic/Anycubic Generic PA", + "BBL/Generic PA", + "FLSun/FLSun Generic PA", + "OrcaArena/OrcaArena Generic PA", + "Prusa/Prusa Generic PA", + "Prusa/Prusa Generic PA-CF", + "Qidi/QIDI PA-Ultra", + "Qidi/Qidi Generic PA", + "Ratrig/RatRig Generic PA", + "SecKit/SecKit Generic PA", + "Tiertime/Tiertime Generic PA", + "Volumic/PA6 CF20 (Performance)", + "Volumic/PPS Carbone (Performance)", + "Volumic/Volumic NYLON Ultra", + "Volumic/Volumic NYLON Ultra (Performance)", + "Vzbot/Vzbot Generic PA" + ], + "GFN99_01": [ + "Tiertime/Tiertime Generic PA" + ], + "GFN99_1": [ + "Prusa/Prusa Generic PA" + ], + "GFN99_2": [ + "Prusa/Prusa Generic PA" + ], + "GFN99_3": [ + "Prusa/Prusa Generic PA" + ], + "GFN99_4": [ + "Prusa/Prusa Generic PA" + ], + "GFNMK00": [ + "BBL/Numakers PLA+" + ], + "GFOT001": [ + "BBL/Overture PLA Pro", + "OrcaFilamentLibrary/Overture PLA Pro" + ], + "GFOT002": [ + "BBL/Overture Silk PLA", + "OrcaFilamentLibrary/Overture Silk PLA" + ], + "GFOT003": [ + "BBL/Overture Easy PLA", + "OrcaFilamentLibrary/Overture Easy PLA" + ], + "GFOT004": [ + "BBL/Overture Rock PLA", + "OrcaFilamentLibrary/Overture Rock PLA" + ], + "GFOT005": [ + "BBL/Overture Super PLA+", + "OrcaFilamentLibrary/Overture Super PLA+" + ], + "GFOT006": [ + "BBL/Overture Air PLA", + "OrcaFilamentLibrary/Overture Air PLA" + ], + "GFOT008": [ + "BBL/Overture TPU", + "OrcaFilamentLibrary/Overture TPU" + ], + "GFOT009": [ + "BBL/Overture ASA", + "OrcaFilamentLibrary/Overture ASA" + ], + "GFP95": [ + "BBL/Generic PP-GF", + "Tiertime/Tiertime Generic PP-GF" + ], + "GFP95_01": [ + "Tiertime/Tiertime Generic PP-GF" + ], + "GFP96": [ + "BBL/Generic PP-CF", + "Tiertime/Tiertime Generic PP-CF" + ], + "GFP96_01": [ + "Tiertime/Tiertime Generic PP-CF" + ], + "GFP97": [ + "BBL/Generic PP", + "Tiertime/Tiertime Generic PP" + ], + "GFP97_01": [ + "Tiertime/Tiertime Generic PP" + ], + "GFP98": [ + "BBL/Generic PE-CF", + "Tiertime/Tiertime Generic PE-CF" + ], + "GFP98_01": [ + "Tiertime/Tiertime Generic PE-CF" + ], + "GFP99": [ + "BBL/Generic PE", + "Tiertime/Tiertime Generic PE" + ], + "GFP99_01": [ + "Tiertime/Tiertime Generic PE" + ], + "GFPA": [ + "Anycubic/Anycubic PA" + ], + "GFPA6-CF": [ + "Anycubic/Anycubic PA6-CF" + ], + "GFPAHT-CF": [ + "Anycubic/Anycubic PAHT-CF" + ], + "GFPC": [ + "Anycubic/Anycubic PC" + ], + "GFPC-CF": [ + "Anycubic/Anycubic PC-CF" + ], + "GFPC-GF": [ + "Anycubic/Anycubic PC-GF" + ], + "GFPEBA": [ + "Anycubic/Anycubic PEBA" + ], + "GFPET-CF": [ + "Anycubic/Anycubic PET-CF" + ], + "GFPETG": [ + "Anycubic/Anycubic PETG", + "Anycubic/Generic PETG" + ], + "GFPETG-1": [ + "Peopoly/Peopoly Generic PETG" + ], + "GFPETG-CF": [ + "Anycubic/Anycubic PETG-CF" + ], + "GFPLA": [ + "Anycubic/Anycubic PLA" + ], + "GFPLA Glow": [ + "Anycubic/Anycubic PLA Glow" + ], + "GFPLA High Speed": [ + "Anycubic/Anycubic PLA High Speed" + ], + "GFPLA Matte": [ + "Anycubic/Anycubic PLA Matte" + ], + "GFPLA Silk": [ + "Anycubic/Anycubic PLA Silk" + ], + "GFPLA Translucent": [ + "Anycubic/Anycubic PLA Translucent" + ], + "GFPLA+": [ + "Anycubic/Anycubic PLA+" + ], + "GFPLA-CF": [ + "Anycubic/Anycubic PLA-CF" + ], + "GFPM001": [ + "Anycubic/Panchroma PLA", + "BBL/Panchroma PLA", + "Snapmaker/Panchroma PLA" + ], + "GFPM002": [ + "BBL/Panchroma PLA Matte", + "Snapmaker/Panchroma PLA Matte" + ], + "GFPM003": [ + "BBL/Panchroma PLA Marble", + "Snapmaker/Panchroma PLA Marble" + ], + "GFPM004": [ + "BBL/Panchroma PLA Silk", + "Snapmaker/Panchroma PLA Silk" + ], + "GFPM005": [ + "BBL/Panchroma PLA Satin", + "Snapmaker/Panchroma PLA Satin" + ], + "GFPM006": [ + "BBL/Panchroma PLA Translucent", + "Snapmaker/Panchroma PLA Translucent" + ], + "GFPM007": [ + "BBL/Panchroma PLA Galaxy", + "Snapmaker/Panchroma PLA Galaxy" + ], + "GFPM008": [ + "BBL/Panchroma PLA Celestial", + "Snapmaker/Panchroma PLA Celestial" + ], + "GFPM009": [ + "BBL/Panchroma PLA Starlight", + "Snapmaker/Panchroma PLA Starlight" + ], + "GFPM010": [ + "BBL/Panchroma PLA Glow", + "Snapmaker/Panchroma PLA Glow" + ], + "GFPM011": [ + "BBL/Panchroma PLA Luminous", + "Snapmaker/Panchroma PLA Luminous" + ], + "GFPM012": [ + "BBL/Panchroma PLA Metallic", + "Snapmaker/Panchroma PLA Metallic" + ], + "GFPM013": [ + "BBL/Panchroma PLA Neon", + "Snapmaker/Panchroma PLA Neon" + ], + "GFPM014": [ + "BBL/Panchroma PLA UV Shift", + "Snapmaker/Panchroma PLA UV Shift" + ], + "GFPM015": [ + "BBL/Panchroma PLA Temp Shift", + "Snapmaker/Panchroma PLA Temp Shift" + ], + "GFPM016": [ + "BBL/Panchroma CoPE", + "Snapmaker/Panchroma CoPE" + ], + "GFPM017": [ + "BBL/Polymaker HT-PLA", + "Snapmaker/Polymaker HT-PLA" + ], + "GFPM018": [ + "BBL/Polymaker HT-PLA-GF", + "Snapmaker/Polymaker HT-PLA-GF" + ], + "GFPM019": [ + "BBL/PolyLite PLA Pro", + "Snapmaker/PolyLite PLA Pro" + ], + "GFPVA": [ + "Anycubic/Anycubic PVA" + ], + "GFR00": [ + "BBL/FusRock ABS-GF" + ], + "GFR98": [ + "BBL/Generic PHA", + "Tiertime/Tiertime Generic PHA" + ], + "GFR98_01": [ + "Tiertime/Tiertime Generic PHA" + ], + "GFR99": [ + "BBL/Generic EVA", + "Tiertime/Tiertime Generic EVA" + ], + "GFR99_01": [ + "Tiertime/Tiertime Generic EVA" + ], + "GFRH01": [], + "GFRH02": [], + "GFRH03": [], + "GFRH04": [], + "GFRH05": [], + "GFRH06": [], + "GFS00": [ + "BBL/Bambu Support W", + "OrcaArena/Arena Support W" + ], + "GFS01": [ + "BBL/Bambu Support G", + "OrcaArena/Arena Support G" + ], + "GFS02": [ + "BBL/Bambu Support For PLA" + ], + "GFS03": [ + "BBL/Bambu Support For PA/PET" + ], + "GFS04": [ + "BBL/Bambu PVA", + "Tiertime/Tiertime PVA", + "WonderMaker/WonderMaker PVA" + ], + "GFS04_01": [ + "Tiertime/Tiertime PVA" + ], + "GFS05": [ + "BBL/Bambu Support For PLA/PETG" + ], + "GFS06": [ + "BBL/Bambu Support for ABS" + ], + "GFS97": [ + "BBL/Generic BVOH", + "Tiertime/Tiertime Generic BVOH" + ], + "GFS97_01": [ + "Tiertime/Tiertime Generic BVOH" + ], + "GFS98": [ + "BBL/Generic HIPS", + "Prusa/Prusament PVB", + "Tiertime/Tiertime Generic HIPS" + ], + "GFS98_01": [ + "Tiertime/Tiertime Generic HIPS" + ], + "GFS99": [ + "Anker/Anker Generic PVA", + "Anycubic/Anycubic Generic PVA", + "BBL/Generic PVA", + "Custom/Generic PVA", + "FLSun/FLSun Generic PVA", + "OrcaArena/OrcaArena Generic PVA", + "Prusa/Prusa Generic PVA", + "Prusa/Prusa Generic PVA HF", + "Qidi/Qidi Generic PVA", + "Ratrig/RatRig Generic PVA", + "SecKit/SecKit Generic PVA", + "Tiertime/Tiertime Generic PVA", + "Volumic/Volumic PVA", + "Volumic/Volumic PVA-BVOH (Performance)", + "Vzbot/Vzbot Generic PVA" + ], + "GFS99_01": [ + "Tiertime/Tiertime Generic PVA" + ], + "GFS99_1": [ + "Prusa/Prusa Generic PVA" + ], + "GFS99_2": [ + "Prusa/Prusa Generic PVA" + ], + "GFS99_3": [ + "Prusa/Prusa Generic PVA" + ], + "GFS99_4": [ + "Prusa/Prusa Generic PVA", + "Prusa/Prusa Generic PVA HF" + ], + "GFS99_5": [ + "Prusa/Prusa Generic PVA HF" + ], + "GFS99_6": [ + "Prusa/Prusa Generic PVA HF" + ], + "GFSEP001": [ + "OrcaFilamentLibrary/Eolas Prints PLA Premium" + ], + "GFSEP002": [ + "OrcaFilamentLibrary/Eolas Prints PLA Matte" + ], + "GFSEP003": [ + "OrcaFilamentLibrary/Eolas Prints PLA Silk" + ], + "GFSEP004": [ + "OrcaFilamentLibrary/Eolas Prints PLA Neon" + ], + "GFSEP005": [ + "OrcaFilamentLibrary/Eolas Prints PLA High Speed" + ], + "GFSEP006": [ + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" + ], + "GFSEP007": [ + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" + ], + "GFSEP008": [ + "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" + ], + "GFSEP009": [ + "OrcaFilamentLibrary/Eolas Prints PLA Transition" + ], + "GFSEP010": [ + "OrcaFilamentLibrary/Eolas Prints PETG" + ], + "GFSEP011": [ + "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" + ], + "GFSEP012": [ + "OrcaFilamentLibrary/Eolas Prints PETG Transition" + ], + "GFSEP013": [ + "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A" + ], + "GFSEP014": [ + "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" + ], + "GFSEP015": [ + "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant" + ], + "GFSEP016": [ + "OrcaFilamentLibrary/Eolas Prints TPU Transition" + ], + "GFSEP017": [ + "OrcaFilamentLibrary/Eolas Prints ABS" + ], + "GFSEP018": [ + "OrcaFilamentLibrary/Eolas Prints ASA" + ], + "GFSL99": [ + "Peopoly/Peopoly Generic ABS" + ], + "GFSNL02": [ + "BBL/SUNLU PLA Matte", + "Flashforge/SUNLU PLA Matte" + ], + "GFSNL03": [ + "BBL/SUNLU PLA+", + "Flashforge/SUNLU PLA+" + ], + "GFSNL04": [ + "BBL/SUNLU PLA+ 2.0", + "Flashforge/SUNLU PLA+ 2.0" + ], + "GFSNL05": [ + "BBL/SUNLU Silk PLA+", + "Flashforge/SUNLU Silk PLA+" + ], + "GFSNL06": [ + "BBL/SUNLU PLA Marble", + "Flashforge/SUNLU PLA Marble" + ], + "GFSNL07": [ + "BBL/SUNLU Wood PLA", + "Flashforge/SUNLU Wood PLA" + ], + "GFSNL08": [ + "BBL/SUNLU PETG", + "Flashforge/SUNLU PETG" + ], + "GFT01": [ + "BBL/Bambu PET-CF", + "OrcaArena/Arena PET-CF", + "Tiertime/Tiertime PET-CF", + "WonderMaker/WonderMaker PET-CF" + ], + "GFT01_01": [ + "Tiertime/Tiertime PET-CF" + ], + "GFT02": [ + "BBL/Bambu PPS-CF", + "Prusa/Prusa Generic PETG", + "Prusa/Prusa Generic PETG HF", + "Prusa/Prusament PETG" + ], + "GFT97": [ + "BBL/Generic PPS", + "Tiertime/Tiertime Generic PPS" + ], + "GFT97_01": [ + "Tiertime/Tiertime Generic PPS" + ], + "GFT98": [ + "BBL/Generic PPS-CF", + "Tiertime/Tiertime Generic PPS-CF" + ], + "GFT98_01": [ + "Tiertime/Tiertime Generic PPS-CF" + ], + "GFTPU 95A": [ + "Anycubic/Anycubic TPU 95A" + ], + "GFTPU for ACE": [ + "Anycubic/Anycubic TPU for ACE" + ], + "GFU00": [ + "BBL/Bambu TPU 95A HF" + ], + "GFU01": [ + "Afinia/Afinia TPU", + "BBL/Bambu TPU 95A", + "OrcaArena/Arena TPU 95A", + "Tiertime/Tiertime TPU 95A", + "WonderMaker/WonderMaker TPU 95A" + ], + "GFU01_01": [ + "Afinia/Afinia TPU", + "Tiertime/Tiertime TPU 95A" + ], + "GFU02": [ + "BBL/Bambu TPU for AMS" + ], + "GFU03": [ + "BBL/Bambu TPU 90A" + ], + "GFU04": [ + "BBL/Bambu TPU 85A" + ], + "GFU98": [ + "BBL/Generic TPU for AMS" + ], + "GFU99": [ + "Anker/Anker Generic TPU", + "Anycubic/Anycubic Generic TPU", + "Anycubic/Anycubic PEBA 95A", + "Anycubic/Anycubic TPU", + "Anycubic/Generic TPU", + "Artillery/Artillery Generic TPU", + "BBL/Generic TPU", + "CoLiDo/CoLiDo Generic TPU", + "Creality/Creality Generic TPU", + "Custom/Generic TPU", + "FLSun/FLSun Generic TPU", + "FLSun/FLSun S1 TPU", + "FLSun/FLSun T1 TPU", + "FlyingBear/FlyingBear Generic TPU", + "FlyingBear/FlyingBear TPU", + "FlyingBear/FlyingBear TPU Basic", + "FlyingBear/Other TPU", + "InfiMech/InfiMech Generic TPU", + "InfiMech/InfiMech TPU", + "InfiMech/InfiMech TPU Basic", + "InfiMech/Other TPU", + "OrcaArena/OrcaArena Generic TPU", + "Prusa/Prusa Generic FLEX", + "Prusa/Prusa Generic TPU", + "Prusa/Prusa Generic TPU HF", + "Qidi/QIDI TPU-Aero", + "Qidi/Qidi Generic TPU", + "Qidi/Qidi Generic TPU 95A", + "Qidi/Qidi TPU 95A-HF", + "Ratrig/RatRig Generic TPU", + "SecKit/SecKit Generic TPU", + "Tiertime/Tiertime Generic TPU", + "TwoTrees/TwoTrees Generic 95A TPU", + "Volumic/Volumic FLEX93 Ultra", + "Volumic/Volumic FLEX93 Ultra (Performance)", + "Vzbot/Vzbot Generic TPU", + "Wanhao France/YUMI PLA Bowden", + "Wanhao France/YUMI PLA Direct Drive" + ], + "GFU99_01": [ + "Tiertime/Tiertime Generic TPU" + ], + "GFU99_2": [ + "Prusa/Prusa Generic TPU" + ], + "GFU99_3": [ + "Prusa/Prusa Generic TPU HF" + ], + "GPAB00": [ + "Elegoo/Generic PA", + "Elegoo/Generic PA6-CF" + ], + "GPCB00": [ + "Elegoo/Generic PC", + "Elegoo/Generic PC-CF" + ], + "GPETB00": [ + "Elegoo/Generic PET", + "Elegoo/Generic PET-CF" + ], + "GPETGB00": [ + "Elegoo/Generic PETG", + "Elegoo/Generic PETG PRO", + "Elegoo/Generic PETG-CF" + ], + "GPLAB00": [ + "Elegoo/Generic PLA", + "Elegoo/Generic PLA Matte" + ], + "Generic ABS @E3NG v1.2S": [ + "RH3D/Generic ABS" + ], + "Generic ABS @MK4S": [ + "Prusa/Prusa Generic ABS" + ], + "Generic ABS @MK4S 0.6": [ + "Prusa/Prusa Generic ABS" + ], + "Generic ABS @MK4S 0.8": [ + "Prusa/Prusa Generic ABS" + ], + "Generic ABS @MK4S HF0.4": [ + "Prusa/Prusa Generic ABS" + ], + "Generic ABS @MK4S HF0.5": [ + "Prusa/Prusa Generic ABS" + ], + "Generic ABS @MK4S HF0.6": [ + "Prusa/Prusa Generic ABS" + ], + "Generic ABS @MK4S HF0.8": [ + "Prusa/Prusa Generic ABS" + ], + "Generic ASA @E3NG v1.2S": [ + "RH3D/Generic ASA" + ], + "Generic FLEX @MK4S": [ + "Prusa/Prusa Generic TPU" + ], + "Generic FLEX @MK4S 0.6": [ + "Prusa/Prusa Generic TPU" + ], + "Generic FLEX @MK4S 0.8": [ + "Prusa/Prusa Generic TPU" + ], + "Generic PCCF @E3NG v1.2S": [ + "RH3D/Generic PCCF" + ], + "Generic PETG @E3NG v1.2S": [ + "RH3D/Generic PETG" + ], + "Generic PETG @MK4S": [ + "Prusa/Prusa Generic PETG" + ], + "Generic PETG @MK4S 0.6": [ + "Prusa/Prusa Generic PETG" + ], + "Generic PETG @MK4S 0.8": [ + "Prusa/Prusa Generic PETG" + ], + "Generic PETG @MK4S HF0.4": [ + "Prusa/Prusa Generic PETG" + ], + "Generic PETG @MK4S HF0.5": [ + "Prusa/Prusa Generic PETG" + ], + "Generic PETG @MK4S HF0.6": [ + "Prusa/Prusa Generic PETG" + ], + "Generic PETG @MK4S HF0.8": [ + "Prusa/Prusa Generic PETG" + ], + "Generic PLA @E3NG v1.2S": [ + "RH3D/Generic PLA" + ], + "Generic PLA @MK4S": [ + "Prusa/Prusa Generic PLA" + ], + "Generic PLA @MK4S 0.6": [ + "Prusa/Prusa Generic PLA" + ], + "Generic PLA @MK4S 0.8": [ + "Prusa/Prusa Generic PLA" + ], + "Generic PLA @MK4S HF0.4": [ + "Prusa/Prusa Generic PLA" + ], + "Generic PLA @MK4S HF0.5": [ + "Prusa/Prusa Generic PLA" + ], + "Generic PLA @MK4S HF0.6": [ + "Prusa/Prusa Generic PLA" + ], + "Generic PLA @MK4S HF0.8": [ + "Prusa/Prusa Generic PLA" + ], + "Generic PLA Silk @MK4S": [ + "Prusa/Prusa Generic PLA Silk" + ], + "Generic PLA Silk @MK4S 0.6": [ + "Prusa/Prusa Generic PLA Silk" + ], + "Generic PLA Silk @MK4S 0.8": [ + "Prusa/Prusa Generic PLA Silk" + ], + "Generic TPU @E3NG v1.2S": [ + "RH3D/Generic TPU" + ], + "IQM1": [ + "iQ/Fiberthree PACF Pro P1", + "iQ/Grauts HPP4GF25 P1" + ], + "IQM1011": [ + "iQ/VXL90 TiQ2 P2" + ], + "IQM2": [ + "iQ/Material4Print ABS Natur P1" + ], + "IQM3": [ + "iQ/Polymaker PETG Polymax black P1" + ], + "IQM7": [ + "iQ/Fiberthree PACF Pro P2" + ], + "LHF_abs": [ + "LH/LHS ABS" + ], + "LHF_asa": [ + "LH/LHS ASA" + ], + "LHF_ftpuf": [ + "LH/LHS TPU Foamy 78A" + ], + "LHF_pccf": [ + "LH/LHS PC CF" + ], + "LHF_pctg": [ + "LH/LHS PCTG" + ], + "LHF_petg": [ + "LH/LHS PETG" + ], + "LHF_pla": [ + "LH/LHS PLA" + ], + "LHF_ptpu_pl": [ + "LH/LHS TPU" + ], + "NIT01": [ + "OrcaFilamentLibrary/NIT ABS" + ], + "NIT02": [ + "OrcaFilamentLibrary/NIT PLA" + ], + "NIT03": [ + "OrcaFilamentLibrary/NIT PETG" + ], + "OEABSB00": [ + "OrcaFilamentLibrary/Elegoo ABS" + ], + "OEASAB00": [ + "OrcaFilamentLibrary/Elegoo ASA", + "OrcaFilamentLibrary/Elegoo ASA-CF" + ], + "OEPAHTB0": [ + "OrcaFilamentLibrary/Elegoo PAHT-CF" + ], + "OEPCB00": [ + "OrcaFilamentLibrary/Elegoo PC", + "OrcaFilamentLibrary/Elegoo PC-FR" + ], + "OEPETGB0": [ + "OrcaFilamentLibrary/Elegoo PET-CF", + "OrcaFilamentLibrary/Elegoo PETG", + "OrcaFilamentLibrary/Elegoo PETG HF", + "OrcaFilamentLibrary/Elegoo PETG PRO", + "OrcaFilamentLibrary/Elegoo PETG Translucent", + "OrcaFilamentLibrary/Elegoo PETG-CF", + "OrcaFilamentLibrary/Elegoo PETG-GF", + "OrcaFilamentLibrary/Elegoo Rapid PETG" + ], + "OEPLAB00": [ + "OrcaFilamentLibrary/Elegoo PLA", + "OrcaFilamentLibrary/Elegoo PLA Basic", + "OrcaFilamentLibrary/Elegoo PLA Galaxy", + "OrcaFilamentLibrary/Elegoo PLA Glow", + "OrcaFilamentLibrary/Elegoo PLA Marble", + "OrcaFilamentLibrary/Elegoo PLA Matte", + "OrcaFilamentLibrary/Elegoo PLA PRO", + "OrcaFilamentLibrary/Elegoo PLA Silk", + "OrcaFilamentLibrary/Elegoo PLA Sparkle", + "OrcaFilamentLibrary/Elegoo PLA Translucent2", + "OrcaFilamentLibrary/Elegoo PLA Wood", + "OrcaFilamentLibrary/Elegoo PLA+", + "OrcaFilamentLibrary/Elegoo PLA-CF", + "OrcaFilamentLibrary/Elegoo Rapid PLA+" + ], + "OETPUB00": [ + "OrcaFilamentLibrary/Elegoo Rapid TPU 95A", + "OrcaFilamentLibrary/Elegoo TPU 95A" + ], + "OFLSBS99": [ + "OrcaFilamentLibrary/Generic SBS" + ], + "OGFA00": [ + "OrcaFilamentLibrary/Bambu PLA Basic", + "OrcaFilamentLibrary/Elas PLA Basic", + "OrcaFilamentLibrary/Elas PLA Pro" + ], + "OGFA01": [ + "OrcaFilamentLibrary/Bambu PLA Matte" + ], + "OGFA02": [ + "OrcaFilamentLibrary/Bambu PLA Metal" + ], + "OGFA03": [ + "OrcaFilamentLibrary/Bambu PLA Impact" + ], + "OGFA05": [ + "OrcaFilamentLibrary/Bambu PLA Silk" + ], + "OGFA06": [ + "OrcaFilamentLibrary/Bambu PLA Silk+" + ], + "OGFA07": [ + "OrcaFilamentLibrary/Bambu PLA Marble" + ], + "OGFA08": [ + "OrcaFilamentLibrary/Bambu PLA Sparkle" + ], + "OGFA09": [ + "OrcaFilamentLibrary/Bambu PLA Tough" + ], + "OGFA11": [ + "OrcaFilamentLibrary/Bambu PLA Aero" + ], + "OGFA12": [ + "OrcaFilamentLibrary/Bambu PLA Glow" + ], + "OGFA13": [ + "OrcaFilamentLibrary/Bambu PLA Dynamic" + ], + "OGFA15": [ + "OrcaFilamentLibrary/Bambu PLA Galaxy" + ], + "OGFA16": [ + "OrcaFilamentLibrary/Bambu PLA Wood" + ], + "OGFA50": [ + "OrcaFilamentLibrary/Bambu PLA-CF" + ], + "OGFB00": [ + "OrcaFilamentLibrary/Bambu ABS" + ], + "OGFB01": [ + "OrcaFilamentLibrary/Bambu ASA", + "OrcaFilamentLibrary/Elas ASA" + ], + "OGFB02": [ + "OrcaFilamentLibrary/Bambu ASA-Aero" + ], + "OGFB50": [ + "OrcaFilamentLibrary/Bambu ABS-GF" + ], + "OGFB51": [ + "OrcaFilamentLibrary/Bambu ASA-CF" + ], + "OGFB60": [ + "OrcaFilamentLibrary/PolyLite ABS" + ], + "OGFB61": [ + "OrcaFilamentLibrary/PolyLite ASA" + ], + "OGFB98": [ + "Custom/Generic ASA", + "OrcaFilamentLibrary/Generic ASA" + ], + "OGFB99": [ + "Custom/Generic ABS", + "Flashforge/Flashforge ABS Basic", + "Flashforge/Flashforge ABS-GF", + "Flashforge/Flashforge ASA Basic", + "Flashforge/Flashforge ASA-CF", + "Flashforge/Flashforge ASA-GF", + "OrcaFilamentLibrary/Generic ABS" + ], + "OGFC00": [ + "OrcaFilamentLibrary/Bambu PC" + ], + "OGFC01": [ + "OrcaFilamentLibrary/Bambu PC FR" + ], + "OGFC99": [ + "OrcaFilamentLibrary/Generic PC" + ], + "OGFG00": [ + "OrcaFilamentLibrary/Bambu PETG Basic", + "OrcaFilamentLibrary/Elas PETG Basic" + ], + "OGFG01": [ + "OrcaFilamentLibrary/Bambu PETG Translucent" + ], + "OGFG02": [ + "OrcaFilamentLibrary/Bambu PETG HF" + ], + "OGFG50": [ + "OrcaFilamentLibrary/Bambu PETG-CF" + ], + "OGFG60": [ + "OrcaFilamentLibrary/PolyLite PETG" + ], + "OGFG97": [ + "OrcaFilamentLibrary/Generic PCTG" + ], + "OGFG99": [ + "Flashforge/Flashforge HS PETG", + "Flashforge/Flashforge PET-CF", + "Flashforge/Flashforge PETG Pro", + "Flashforge/Flashforge PETG Transparent", + "Flashforge/Flashforge PETG-CF", + "Flashforge/FusRock S-Multi", + "OrcaFilamentLibrary/Generic PETG", + "OrcaFilamentLibrary/Generic PETG HF", + "OrcaFilamentLibrary/Generic PETG-CF" + ], + "OGFGG300": [ + "OrcaFilamentLibrary/GreenGate3D PETG" + ], + "OGFL00": [ + "OrcaFilamentLibrary/PolyLite Dual PLA", + "OrcaFilamentLibrary/PolyLite PLA" + ], + "OGFL00-1": [ + "OrcaFilamentLibrary/PolyTerra Dual PLA" + ], + "OGFL01": [ + "OrcaFilamentLibrary/PolyTerra PLA", + "Snapmaker/PolyTerra Dual PLA", + "Snapmaker/PolyTerra J1 PLA", + "Snapmaker/PolyTerra PLA" + ], + "OGFL03": [ + "OrcaFilamentLibrary/eSUN PLA+" + ], + "OGFL04": [ + "OrcaFilamentLibrary/Overture PLA", + "OrcaFilamentLibrary/eSUN PLA-Basic" + ], + "OGFL05": [ + "OrcaFilamentLibrary/Overture Matte PLA", + "OrcaFilamentLibrary/eSUN PLA-Matte" + ], + "OGFL06": [ + "OrcaFilamentLibrary/Fiberon PETG-ESD", + "OrcaFilamentLibrary/eSUN PLA-Marble" + ], + "OGFL50": [ + "OrcaFilamentLibrary/Fiberon PA6-CF" + ], + "OGFL51": [ + "OrcaFilamentLibrary/Fiberon PA6-GF" + ], + "OGFL52": [ + "OrcaFilamentLibrary/Fiberon PA12-CF" + ], + "OGFL53": [ + "OrcaFilamentLibrary/Fiberon PA612-CF" + ], + "OGFL54": [ + "OrcaFilamentLibrary/Fiberon PET-CF" + ], + "OGFL55": [ + "OrcaFilamentLibrary/Fiberon PETG-rCF" + ], + "OGFL95": [ + "OrcaFilamentLibrary/Generic PLA High Speed" + ], + "OGFL96": [ + "Flashforge/Flashforge PLA Silk", + "Flashforge/Generic PLA Silk", + "OrcaFilamentLibrary/Generic PLA Silk" + ], + "OGFL98": [ + "Flashforge/Flashforge PLA-CF", + "OrcaFilamentLibrary/Generic PLA-CF" + ], + "OGFL99": [ + "Flashforge/Flashforge HS PLA", + "Flashforge/Flashforge PLA Matte", + "Flashforge/Flashforge PLA Metal", + "Flashforge/Flashforge PLA Pro", + "Flashforge/Flashforge PLA Basic", + "Flashforge/Flashforge PLA Color Change", + "Flashforge/Flashforge PLA Galaxy", + "Flashforge/Flashforge PLA Luminous", + "Flashforge/Generic PLA", + "OrcaFilamentLibrary/Generic PLA", + "OrcaFilamentLibrary/Generic PLA Matte" + ], + "OGFLC99": [ + "OrcaFilamentLibrary/Generic CoPE" + ], + "OGFN03": [ + "OrcaFilamentLibrary/Bambu PA-CF" + ], + "OGFN04": [ + "OrcaFilamentLibrary/Bambu PAHT-CF" + ], + "OGFN05": [ + "OrcaFilamentLibrary/Bambu PA6-CF" + ], + "OGFN06": [ + "OrcaFilamentLibrary/Bambu PPA-CF" + ], + "OGFN08": [ + "OrcaFilamentLibrary/Bambu PA6-GF" + ], + "OGFN96": [ + "Flashforge/Flashforge PPA-CF", + "Flashforge/Flashforge PPS-CF", + "OrcaFilamentLibrary/Generic PPA-GF" + ], + "OGFN97": [ + "OrcaFilamentLibrary/Generic PPA-CF" + ], + "OGFN98": [ + "Custom/Generic PA-CF", + "Flashforge/Flashforge PA-CF", + "Flashforge/Flashforge PAHT-CF", + "Flashforge/FusRock PAHT-CF", + "Flashforge/FusRock S-PAHT", + "OrcaFilamentLibrary/Generic PA-CF" + ], + "OGFN99": [ + "Custom/Generic PA", + "OrcaFilamentLibrary/Generic PA" + ], + "OGFNMK00": [ + "OrcaFilamentLibrary/Numakers PLA+" + ], + "OGFP97": [ + "OrcaFilamentLibrary/Generic PP", + "OrcaFilamentLibrary/Generic PP-CF", + "OrcaFilamentLibrary/Generic PP-GF" + ], + "OGFP99": [ + "OrcaFilamentLibrary/Generic PE", + "OrcaFilamentLibrary/Generic PE-CF" + ], + "OGFPM001": [ + "OrcaFilamentLibrary/Panchroma PLA" + ], + "OGFPM002": [ + "OrcaFilamentLibrary/Panchroma PLA Matte" + ], + "OGFPM003": [ + "OrcaFilamentLibrary/Panchroma PLA Marble" + ], + "OGFPM004": [ + "OrcaFilamentLibrary/Panchroma PLA Silk" + ], + "OGFPM005": [ + "OrcaFilamentLibrary/Panchroma PLA Satin" + ], + "OGFPM006": [ + "OrcaFilamentLibrary/Panchroma PLA Translucent" + ], + "OGFPM007": [ + "OrcaFilamentLibrary/Panchroma PLA Galaxy" + ], + "OGFPM008": [ + "OrcaFilamentLibrary/Panchroma PLA Celestial" + ], + "OGFPM009": [ + "OrcaFilamentLibrary/Panchroma PLA Starlight" + ], + "OGFPM010": [ + "OrcaFilamentLibrary/Panchroma PLA Glow" + ], + "OGFPM011": [ + "OrcaFilamentLibrary/Panchroma PLA Luminous" + ], + "OGFPM012": [ + "OrcaFilamentLibrary/Panchroma PLA Metallic" + ], + "OGFPM013": [ + "OrcaFilamentLibrary/Panchroma PLA Neon" + ], + "OGFPM014": [ + "OrcaFilamentLibrary/Panchroma PLA UV Shift" + ], + "OGFPM015": [ + "OrcaFilamentLibrary/Panchroma PLA Temp Shift" + ], + "OGFPM016": [ + "OrcaFilamentLibrary/Panchroma CoPE" + ], + "OGFPM017": [ + "OrcaFilamentLibrary/Polymaker HT-PLA" + ], + "OGFPM018": [ + "OrcaFilamentLibrary/Polymaker HT-PLA-GF" + ], + "OGFPM019": [ + "OrcaFilamentLibrary/PolyLite PLA Pro" + ], + "OGFR00": [ + "OrcaFilamentLibrary/FusRock ABS-GF" + ], + "OGFR98": [ + "OrcaFilamentLibrary/Generic PHA" + ], + "OGFR99": [ + "OrcaFilamentLibrary/Generic EVA" + ], + "OGFS00": [ + "OrcaFilamentLibrary/Bambu Support W" + ], + "OGFS01": [ + "OrcaFilamentLibrary/Bambu Support G" + ], + "OGFS02": [ + "OrcaFilamentLibrary/Bambu Support For PLA" + ], + "OGFS03": [ + "OrcaFilamentLibrary/Bambu Support For PA/PET" + ], + "OGFS04": [ + "OrcaFilamentLibrary/Bambu PVA" + ], + "OGFS05": [ + "OrcaFilamentLibrary/Bambu Support For PLA/PETG" + ], + "OGFS06": [ + "OrcaFilamentLibrary/Bambu Support for ABS" + ], + "OGFS97": [ + "Flashforge/Generic BVOH", + "OrcaFilamentLibrary/Generic BVOH" + ], + "OGFS98": [ + "Flashforge/Flashforge HIPS", + "OrcaFilamentLibrary/Generic HIPS" + ], + "OGFS99": [ + "Flashforge/Flashforge PVA", + "OrcaFilamentLibrary/Generic PVA" + ], + "OGFSNL02": [ + "OrcaFilamentLibrary/SUNLU PLA Matte" + ], + "OGFSNL03": [ + "OrcaFilamentLibrary/SUNLU PLA+" + ], + "OGFSNL04": [ + "OrcaFilamentLibrary/SUNLU PLA+ 2.0" + ], + "OGFSNL05": [ + "OrcaFilamentLibrary/SUNLU Silk PLA+" + ], + "OGFSNL06": [ + "OrcaFilamentLibrary/SUNLU PLA Marble" + ], + "OGFSNL07": [ + "OrcaFilamentLibrary/SUNLU Wood PLA" + ], + "OGFSNL08": [ + "OrcaFilamentLibrary/SUNLU PETG" + ], + "OGFT01": [ + "OrcaFilamentLibrary/Bambu PET-CF" + ], + "OGFT02": [], + "OGFU00": [ + "OrcaFilamentLibrary/Bambu TPU 95A HF" + ], + "OGFU01": [ + "OrcaFilamentLibrary/Bambu TPU 95A" + ], + "OGFU99": [ + "Flashforge/Flashforge TPU-64D", + "Flashforge/Flashforge TPU-90A", + "Flashforge/Flashforge TPU-95A", + "Flashforge/Generic TPU-64D", + "Flashforge/Generic TPU-90A", + "Flashforge/Generic TPU-95A", + "OrcaFilamentLibrary/Generic TPU" + ], + "OVTABS08": [ + "OrcaFilamentLibrary/Overture ABS Basic" + ], + "P1001": [ + "Creality/Panchroma PLA Satin" + ], + "P1002": [ + "Creality/PolySonic PLA Pro" + ], + "P1003": [ + "Creality/Panchroma PLA Matte" + ], + "P1004": [ + "Creality/PolySonic PLA" + ], + "P11851ba": [ + "Artillery/Artillery PET" + ], + "P284941e": [ + "Artillery/Artillery PETG", + "Artillery/Artillery PETG Basic" + ], + "P2fbf0c0": [ + "Artillery/Artillery TPU" + ], + "P39db358": [ + "Artillery/Artillery ABS" + ], + "P510cfa0": [ + "Cubicon/Cubicon PLA" + ], + "P510cfa1": [ + "Cubicon/Cubicon PLA+" + ], + "P510cfa2": [ + "Cubicon/Cubicon PLAi21" + ], + "P510cfb0": [ + "Cubicon/Cubicon ABS" + ], + "P510cfb1": [ + "Cubicon/Cubicon ABS-A100" + ], + "P510cfb2": [ + "Cubicon/Cubicon ABSk" + ], + "P510cfc0": [ + "Cubicon/Cubicon PETG" + ], + "P510cfd0": [ + "Cubicon/Cubicon PA-CF", + "Cubicon/Cubicon PC" + ], + "P510eff9": [ + "Ginger Additive/Ginger Generic PETG", + "Ginger Additive/Ginger Generic PLA" + ], + "P8163162": [ + "Artillery/Artillery PVA" + ], + "P87436f6": [ + "Artillery/Artillery ASA" + ], + "Pfcf9c4c": [ + "Artillery/Artillery PLA", + "Artillery/Artillery PLA Basic", + "Artillery/Artillery PLA Matte", + "Artillery/Artillery PLA Silk" + ], + "Prusa Generic ABS @CORE One": [ + "Prusa/Prusa Generic ABS" + ], + "Prusa Generic ABS @CORE One 0.6": [ + "Prusa/Prusa Generic ABS" + ], + "Prusa Generic ABS @CORE One 0.8": [ + "Prusa/Prusa Generic ABS" + ], + "Prusa Generic ABS @CORE One HF 0.4": [ + "Prusa/Prusa Generic ABS" + ], + "Prusa Generic ABS @CORE One HF 0.5": [ + "Prusa/Prusa Generic ABS" + ], + "Prusa Generic ABS @CORE One HF 0.6": [ + "Prusa/Prusa Generic ABS" + ], + "Prusa Generic ABS @CORE One HF 0.8": [ + "Prusa/Prusa Generic ABS" + ], + "Prusa Generic ASA @CORE One": [ + "Prusa/Prusa Generic ASA" + ], + "Prusa Generic ASA @CORE One 0.6": [ + "Prusa/Prusa Generic ASA" + ], + "Prusa Generic ASA @CORE One 0.8": [ + "Prusa/Prusa Generic ASA" + ], + "Prusa Generic ASA @CORE One HF 0.4": [ + "Prusa/Prusa Generic ASA" + ], + "Prusa Generic ASA @CORE One HF 0.5": [ + "Prusa/Prusa Generic ASA" + ], + "Prusa Generic ASA @CORE One HF 0.6": [ + "Prusa/Prusa Generic ASA" + ], + "Prusa Generic ASA @CORE One HF 0.8": [ + "Prusa/Prusa Generic ASA" + ], + "Prusa Generic PETG @CORE One": [ + "Prusa/Prusa Generic PETG" + ], + "Prusa Generic PETG @CORE One 0.6": [ + "Prusa/Prusa Generic PETG" + ], + "Prusa Generic PETG @CORE One 0.8": [ + "Prusa/Prusa Generic PETG" + ], + "Prusa Generic PETG @CORE One HF 0.4": [ + "Prusa/Prusa Generic PETG" + ], + "Prusa Generic PETG @CORE One HF 0.5": [ + "Prusa/Prusa Generic PETG" + ], + "Prusa Generic PETG @CORE One HF 0.6": [ + "Prusa/Prusa Generic PETG" + ], + "Prusa Generic PETG @CORE One HF 0.8": [ + "Prusa/Prusa Generic PETG" + ], + "Prusa Generic PLA @CORE One": [ + "Prusa/Prusa Generic PLA" + ], + "Prusa Generic PLA @CORE One 0.6": [ + "Prusa/Prusa Generic PLA" + ], + "Prusa Generic PLA @CORE One 0.8": [ + "Prusa/Prusa Generic PLA" + ], + "Prusa Generic PLA @CORE One HF 0.4": [ + "Prusa/Prusa Generic PLA" + ], + "Prusa Generic PLA @CORE One HF 0.5": [ + "Prusa/Prusa Generic PLA" + ], + "Prusa Generic PLA @CORE One HF 0.6": [ + "Prusa/Prusa Generic PLA" + ], + "Prusa Generic PLA @CORE One HF 0.8": [ + "Prusa/Prusa Generic PLA" + ], + "Prusa Generic PLA Silk @CORE One": [ + "Prusa/Prusa Generic PLA Silk" + ], + "Prusa Generic PLA Silk @CORE One 0.6": [ + "Prusa/Prusa Generic PLA Silk" + ], + "Prusa Generic PLA Silk @CORE One 0.8": [ + "Prusa/Prusa Generic PLA Silk" + ], + "Prusa Generic TPU @CORE One": [ + "Prusa/Prusa Generic TPU" + ], + "Prusa Generic TPU @CORE One 0.6": [ + "Prusa/Prusa Generic TPU" + ], + "Prusa Generic TPU @CORE One 0.8": [ + "Prusa/Prusa Generic TPU" + ], + "Prusament ASA @CORE One": [ + "Prusa/Prusament ASA" + ], + "Prusament ASA @CORE One 0.6": [ + "Prusa/Prusament ASA" + ], + "Prusament ASA @CORE One 0.8": [ + "Prusa/Prusament ASA" + ], + "Prusament ASA @CORE One HF 0.4": [ + "Prusa/Prusament ASA" + ], + "Prusament ASA @CORE One HF 0.5": [ + "Prusa/Prusament ASA" + ], + "Prusament ASA @CORE One HF 0.6": [ + "Prusa/Prusament ASA" + ], + "Prusament ASA @CORE One HF 0.8": [ + "Prusa/Prusament ASA" + ], + "Prusament ASA @MK4S": [ + "Prusa/Prusa Generic ASA" + ], + "Prusament ASA @MK4S 0.6": [ + "Prusa/Prusa Generic ASA" + ], + "Prusament ASA @MK4S 0.8": [ + "Prusa/Prusa Generic ASA" + ], + "Prusament ASA @MK4S HF0.4": [ + "Prusa/Prusa Generic ASA" + ], + "Prusament ASA @MK4S HF0.5": [ + "Prusa/Prusa Generic ASA" + ], + "Prusament ASA @MK4S HF0.6": [ + "Prusa/Prusa Generic ASA" + ], + "Prusament ASA @MK4S HF0.8": [ + "Prusa/Prusa Generic ASA" + ], + "Prusament PA-CF @CORE One": [ + "Prusa/Prusament PA-CF" + ], + "Prusament PA-CF @CORE One 0.6": [ + "Prusa/Prusament PA-CF" + ], + "Prusament PA-CF @CORE One 0.8": [ + "Prusa/Prusament PA-CF" + ], + "Prusament PC Blend @CORE One": [ + "Prusa/Prusament PC Blend" + ], + "Prusament PC Blend @CORE One 0.6": [ + "Prusa/Prusament PC Blend" + ], + "Prusament PC Blend @CORE One 0.8": [ + "Prusa/Prusament PC Blend" + ], + "Prusament PC Blend @CORE One HF 0.4": [ + "Prusa/Prusament PC Blend" + ], + "Prusament PC Blend @CORE One HF 0.5": [ + "Prusa/Prusament PC Blend" + ], + "Prusament PC Blend @CORE One HF 0.6": [ + "Prusa/Prusament PC Blend" + ], + "Prusament PC Blend @CORE One HF 0.8": [ + "Prusa/Prusament PC Blend" + ], + "Prusament PC-CF @CORE One": [ + "Prusa/Prusament PC-CF" + ], + "Prusament PC-CF @CORE One 0.6": [ + "Prusa/Prusament PC-CF" + ], + "Prusament PC-CF @CORE One 0.8": [ + "Prusa/Prusament PC-CF" + ], + "Prusament PETG @CORE One": [ + "Prusa/Prusament PETG" + ], + "Prusament PETG @CORE One 0.6": [ + "Prusa/Prusament PETG" + ], + "Prusament PETG @CORE One 0.8": [ + "Prusa/Prusament PETG" + ], + "Prusament PETG @CORE One HF 0.4": [ + "Prusa/Prusament PETG" + ], + "Prusament PETG @CORE One HF 0.5": [ + "Prusa/Prusament PETG" + ], + "Prusament PETG @CORE One HF 0.6": [ + "Prusa/Prusament PETG" + ], + "Prusament PETG @CORE One HF 0.8": [ + "Prusa/Prusament PETG" + ], + "Prusament PLA @CORE One": [ + "Prusa/Prusament PLA" + ], + "Prusament PLA @CORE One 0.6": [ + "Prusa/Prusament PLA" + ], + "Prusament PLA @CORE One 0.8": [ + "Prusa/Prusament PLA" + ], + "Prusament PLA @CORE One HF 0.4": [ + "Prusa/Prusament PLA" + ], + "Prusament PLA @CORE One HF 0.5": [ + "Prusa/Prusament PLA" + ], + "Prusament PLA @CORE One HF 0.6": [ + "Prusa/Prusament PLA" + ], + "Prusament PLA @CORE One HF 0.8": [ + "Prusa/Prusament PLA" + ], + "Prusament PVB @CORE One": [ + "Prusa/Prusament PVB" + ], + "Prusament PVB @CORE One 0.6": [ + "Prusa/Prusament PVB" + ], + "Prusament PVB @CORE One 0.8": [ + "Prusa/Prusament PVB" + ], + "Prusament rPLA @CORE One": [ + "Prusa/Prusament rPLA" + ], + "Prusament rPLA @CORE One 0.6": [ + "Prusa/Prusament rPLA" + ], + "Prusament rPLA @CORE One 0.8": [ + "Prusa/Prusament rPLA" + ], + "QD_0_1_1": [ + "Qidi/QIDI PLA Rapido" + ], + "QD_0_1_15": [ + "Qidi/QIDI TPU-GF" + ], + "QD_0_1_2": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "QD_0_1_20": [ + "Qidi/QIDI ASA-CF" + ], + "QD_0_1_24": [ + "Qidi/QIDI PA-Ultra" + ], + "QD_0_1_26": [ + "Qidi/QIDI UltraPA-CF25" + ], + "QD_0_1_27": [ + "Qidi/QIDI PA12-CF" + ], + "QD_0_1_3": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "QD_0_1_30": [ + "Qidi/QIDI PAHT-CF" + ], + "QD_0_1_31": [ + "Qidi/QIDI PAHT-GF" + ], + "QD_0_1_32": [ + "Qidi/QIDI Support For PAHT" + ], + "QD_0_1_33": [ + "Qidi/QIDI Support For PET/PA" + ], + "QD_0_1_34": [ + "Qidi/Qidi PC-ABS-FR" + ], + "QD_0_1_36": [ + "Qidi/QIDI PEBA 95A" + ], + "QD_0_1_37": [ + "Qidi/QIDI PET-CF" + ], + "QD_0_1_38": [ + "Qidi/QIDI PET-GF" + ], + "QD_0_1_39": [ + "Qidi/QIDI PETG Basic" + ], + "QD_0_1_4": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "QD_0_1_40": [ + "Qidi/QIDI PETG Tough" + ], + "QD_0_1_41": [ + "Qidi/QIDI PETG Rapido" + ], + "QD_0_1_42": [ + "Qidi/QIDI PETG-CF" + ], + "QD_0_1_43": [ + "Qidi/QIDI PETG-GF" + ], + "QD_0_1_44": [ + "Qidi/QIDI PPS-CF" + ], + "QD_0_1_45": [ + "Qidi/QIDI PETG Translucent" + ], + "QD_0_1_46": [ + "Qidi/QIDI PPS-GF" + ], + "QD_0_1_49": [ + "Qidi/QIDI TPU-Aero" + ], + "QD_0_1_5": [ + "Qidi/QIDI PLA-CF" + ], + "QD_0_1_50": [ + "Qidi/Qidi TPU 95A-HF" + ], + "QD_0_1_6": [ + "Qidi/QIDI WOOD Rapido" + ], + "QD_0_1_7": [ + "Qidi/QIDI PLA Basic" + ], + "QD_0_1_8": [ + "Qidi/QIDI PLA Matte Basic" + ], + "QD_1_0_1": [ + "Qidi/Generic PLA" + ], + "QD_1_0_11": [ + "Qidi/Generic ABS" + ], + "QD_1_0_23": [ + "Qidi/Generic PC" + ], + "QD_1_0_4": [ + "Qidi/Generic PLA Silk" + ], + "QD_1_0_41": [ + "Qidi/Generic PETG" + ], + "QD_1_0_50": [ + "Qidi/Generic TPU 95A" + ], + "QD_1_1_1": [ + "Qidi/QIDI PLA Rapido" + ], + "QD_1_1_11": [ + "Qidi/QIDI ABS Rapido" + ], + "QD_1_1_12": [ + "Qidi/QIDI ABS-GF" + ], + "QD_1_1_13": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "QD_1_1_14": [ + "Qidi/QIDI ABS Odorless" + ], + "QD_1_1_15": [ + "Qidi/QIDI TPU-GF" + ], + "QD_1_1_18": [ + "Qidi/QIDI ASA" + ], + "QD_1_1_19": [ + "Qidi/QIDI ASA-Aero" + ], + "QD_1_1_2": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "QD_1_1_20": [ + "Qidi/QIDI ASA-CF" + ], + "QD_1_1_24": [ + "Qidi/QIDI UltraPA" + ], + "QD_1_1_26": [ + "Qidi/QIDI UltraPA-CF25" + ], + "QD_1_1_27": [ + "Qidi/QIDI PA12-CF" + ], + "QD_1_1_3": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "QD_1_1_30": [ + "Qidi/QIDI PAHT-CF" + ], + "QD_1_1_31": [ + "Qidi/QIDI PAHT-GF" + ], + "QD_1_1_32": [ + "Qidi/QIDI Support For PAHT" + ], + "QD_1_1_33": [ + "Qidi/QIDI Support For PET/PA" + ], + "QD_1_1_34": [ + "Qidi/QIDI PC-ABS-FR" + ], + "QD_1_1_36": [ + "Qidi/QIDI PEBA 95A" + ], + "QD_1_1_37": [ + "Qidi/QIDI PET-CF" + ], + "QD_1_1_38": [ + "Qidi/QIDI PET-GF" + ], + "QD_1_1_39": [ + "Qidi/QIDI PETG Basic" + ], + "QD_1_1_4": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "QD_1_1_40": [ + "Qidi/QIDI PETG Tough" + ], + "QD_1_1_41": [ + "Qidi/QIDI PETG Rapido" + ], + "QD_1_1_42": [ + "Qidi/QIDI PETG-CF" + ], + "QD_1_1_43": [ + "Qidi/QIDI PETG-GF" + ], + "QD_1_1_44": [ + "Qidi/QIDI PPS-CF" + ], + "QD_1_1_45": [ + "Qidi/QIDI PETG Translucent" + ], + "QD_1_1_46": [ + "Qidi/QIDI PPS-GF" + ], + "QD_1_1_49": [ + "Qidi/QIDI TPU-Aero" + ], + "QD_1_1_5": [ + "Qidi/QIDI PLA-CF" + ], + "QD_1_1_50": [ + "Qidi/QIDI TPU 95A-HF" + ], + "QD_1_1_6": [ + "Qidi/QIDI WOOD Rapido" + ], + "QD_1_1_7": [ + "Qidi/QIDI PLA Basic" + ], + "QD_1_1_8": [ + "Qidi/QIDI PLA Matte Basic" + ], + "QD_2_0_1": [ + "Qidi/Generic PLA" + ], + "QD_2_0_11": [ + "Qidi/Generic ABS" + ], + "QD_2_0_23": [ + "Qidi/Generic PC" + ], + "QD_2_0_4": [ + "Qidi/Generic PLA Silk" + ], + "QD_2_0_41": [ + "Qidi/Generic PETG" + ], + "QD_2_0_50": [ + "Qidi/Generic TPU 95A" + ], + "QD_2_1_1": [ + "Qidi/QIDI PLA Rapido" + ], + "QD_2_1_11": [ + "Qidi/QIDI ABS Rapido" + ], + "QD_2_1_12": [ + "Qidi/QIDI ABS-GF" + ], + "QD_2_1_13": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "QD_2_1_14": [ + "Qidi/QIDI ABS Odorless" + ], + "QD_2_1_15": [ + "Qidi/QIDI TPU-GF" + ], + "QD_2_1_18": [ + "Qidi/QIDI ASA" + ], + "QD_2_1_19": [ + "Qidi/QIDI ASA-Aero" + ], + "QD_2_1_2": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "QD_2_1_20": [ + "Qidi/QIDI ASA-CF" + ], + "QD_2_1_24": [ + "Qidi/QIDI UltraPA" + ], + "QD_2_1_26": [ + "Qidi/QIDI UltraPA-CF25" + ], + "QD_2_1_27": [ + "Qidi/QIDI PA12-CF" + ], + "QD_2_1_3": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "QD_2_1_30": [ + "Qidi/QIDI PAHT-CF" + ], + "QD_2_1_31": [ + "Qidi/QIDI PAHT-GF" + ], + "QD_2_1_32": [ + "Qidi/QIDI Support For PAHT" + ], + "QD_2_1_33": [ + "Qidi/QIDI Support For PET/PA" + ], + "QD_2_1_34": [ + "Qidi/QIDI PC-ABS-FR" + ], + "QD_2_1_36": [ + "Qidi/QIDI PEBA 95A" + ], + "QD_2_1_37": [ + "Qidi/QIDI PET-CF" + ], + "QD_2_1_38": [ + "Qidi/QIDI PET-GF" + ], + "QD_2_1_39": [ + "Qidi/QIDI PETG Basic" + ], + "QD_2_1_4": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "QD_2_1_40": [ + "Qidi/QIDI PETG Tough" + ], + "QD_2_1_41": [ + "Qidi/QIDI PETG Rapido" + ], + "QD_2_1_42": [ + "Qidi/QIDI PETG-CF" + ], + "QD_2_1_43": [ + "Qidi/QIDI PETG-GF" + ], + "QD_2_1_44": [ + "Qidi/QIDI PPS-CF" + ], + "QD_2_1_45": [ + "Qidi/QIDI PETG Translucent" + ], + "QD_2_1_46": [ + "Qidi/QIDI PPS-GF" + ], + "QD_2_1_49": [ + "Qidi/QIDI TPU-Aero" + ], + "QD_2_1_5": [ + "Qidi/QIDI PLA-CF" + ], + "QD_2_1_50": [ + "Qidi/QIDI TPU 95A-HF" + ], + "QD_2_1_6": [ + "Qidi/QIDI WOOD Rapido" + ], + "QD_2_1_7": [ + "Qidi/QIDI PLA Basic" + ], + "QD_2_1_8": [ + "Qidi/QIDI PLA Matte Basic" + ], + "QD_3_0_1": [ + "Qidi/Generic PLA" + ], + "QD_3_0_11": [ + "Qidi/Generic ABS" + ], + "QD_3_0_23": [ + "Qidi/Generic PC" + ], + "QD_3_0_4": [ + "Qidi/Generic PLA Silk" + ], + "QD_3_0_41": [ + "Qidi/Generic PETG" + ], + "QD_3_0_50": [ + "Qidi/Generic TPU 95A" + ], + "QD_3_1_1": [ + "Qidi/QIDI PLA Rapido" + ], + "QD_3_1_11": [ + "Qidi/QIDI ABS Rapido" + ], + "QD_3_1_12": [ + "Qidi/QIDI ABS-GF" + ], + "QD_3_1_13": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "QD_3_1_14": [ + "Qidi/QIDI ABS Odorless" + ], + "QD_3_1_15": [ + "Qidi/QIDI TPU-GF" + ], + "QD_3_1_18": [ + "Qidi/QIDI ASA" + ], + "QD_3_1_19": [ + "Qidi/QIDI ASA-Aero" + ], + "QD_3_1_2": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "QD_3_1_20": [ + "Qidi/QIDI ASA-CF" + ], + "QD_3_1_24": [ + "Qidi/QIDI UltraPA" + ], + "QD_3_1_26": [ + "Qidi/QIDI UltraPA-CF25" + ], + "QD_3_1_27": [ + "Qidi/QIDI PA12-CF" + ], + "QD_3_1_3": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "QD_3_1_30": [ + "Qidi/QIDI PAHT-CF" + ], + "QD_3_1_31": [ + "Qidi/QIDI PAHT-GF" + ], + "QD_3_1_32": [ + "Qidi/QIDI Support For PAHT" + ], + "QD_3_1_33": [ + "Qidi/QIDI Support For PET/PA" + ], + "QD_3_1_34": [ + "Qidi/QIDI PC/ABS-FR" + ], + "QD_3_1_36": [ + "Qidi/QIDI PEBA 95A" + ], + "QD_3_1_37": [ + "Qidi/QIDI PET-CF" + ], + "QD_3_1_38": [ + "Qidi/QIDI PET-GF" + ], + "QD_3_1_39": [ + "Qidi/QIDI PETG Basic" + ], + "QD_3_1_4": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "QD_3_1_40": [ + "Qidi/QIDI PETG Tough" + ], + "QD_3_1_41": [ + "Qidi/QIDI PETG Rapido" + ], + "QD_3_1_42": [ + "Qidi/QIDI PETG-CF" + ], + "QD_3_1_43": [ + "Qidi/QIDI PETG-GF" + ], + "QD_3_1_44": [ + "Qidi/QIDI PPS-CF" + ], + "QD_3_1_45": [ + "Qidi/QIDI PETG Translucent" + ], + "QD_3_1_46": [ + "Qidi/QIDI PPS-GF" + ], + "QD_3_1_49": [ + "Qidi/QIDI TPU-Aero" + ], + "QD_3_1_5": [ + "Qidi/QIDI PLA-CF" + ], + "QD_3_1_50": [ + "Qidi/QIDI TPU 95A-HF" + ], + "QD_3_1_6": [ + "Qidi/QIDI WOOD Rapido" + ], + "QD_3_1_7": [ + "Qidi/QIDI PLA Basic" + ], + "QD_3_1_8": [ + "Qidi/QIDI PLA Matte Basic" + ], + "SMCFB001": [ + "SeeMeCNC/SeeMeCNC ABS" + ], + "SMCFG001": [ + "SeeMeCNC/SeeMeCNC PETG" + ], + "SMCFG002": [ + "SeeMeCNC/SeeMeCNC PETG-CF" + ], + "SMCFL001": [ + "SeeMeCNC/SeeMeCNC PLA" + ], + "SMCFN001": [ + "SeeMeCNC/SeeMeCNC PA-CF" + ], + "SMCFU001": [ + "SeeMeCNC/SeeMeCNC TPU" + ], + "VLMNT01": [ + "OrcaFilamentLibrary/Valment PLA" + ], + "VLMNT02": [ + "OrcaFilamentLibrary/Valment PLA Silk" + ], + "VLMNT03": [ + "OrcaFilamentLibrary/Valment PLA-CF" + ], + "VLMNT04": [ + "OrcaFilamentLibrary/Valment PLA Galaxy" + ] + }, + "instantiated_with_id": [ + "Afinia/Afinia ABS", + "Afinia/Afinia ABS+", + "Afinia/Afinia ABS+@HS", + "Afinia/Afinia ABS@HS", + "Afinia/Afinia PLA", + "Afinia/Afinia PLA@HS", + "Afinia/Afinia TPU", + "Afinia/Afinia TPU@HS", + "Afinia/Afinia Value ABS", + "Afinia/Afinia Value ABS@HS", + "Afinia/Afinia Value PLA", + "Afinia/Afinia Value PLA@HS", + "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic ABS @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic ASA @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic Generic ABS", + "Anycubic/Anycubic Generic ASA", + "Anycubic/Anycubic Generic PA", + "Anycubic/Anycubic Generic PA-CF", + "Anycubic/Anycubic Generic PC", + "Anycubic/Anycubic Generic PETG", + "Anycubic/Anycubic Generic PLA", + "Anycubic/Anycubic Generic PLA-CF", + "Anycubic/Anycubic Generic PVA", + "Anycubic/Anycubic Generic TPU", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PVA @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", + "Anycubic/Generic ABS @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Generic TPU @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Panchroma PLA @Anycubic Kobra S1", + "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", + "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", + "Artillery/Artillery ABS @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery ABS @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery ABS @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery ASA @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery ASA @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery ASA @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery Generic ABS", + "Artillery/Artillery Generic ASA", + "Artillery/Artillery Generic PETG", + "Artillery/Artillery Generic PLA", + "Artillery/Artillery Generic PLA-CF", + "Artillery/Artillery Generic TPU", + "Artillery/Artillery PET @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PET @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PET @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PETG @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PETG @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PETG @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PLA @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PLA @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PVA @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PVA @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PVA @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery TPU @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery TPU @Artillery M1 Pro 0.8 nozzle", + "BBL/Generic SBS", + "Blocks/Blocks Generic ABS", + "Blocks/Blocks Generic ASA", + "Blocks/Blocks Generic ASA-CF", + "Blocks/Blocks Generic PA", + "Blocks/Blocks Generic PA-CF", + "Blocks/Blocks Generic PC", + "Blocks/Blocks Generic PETG", + "Blocks/Blocks Generic PLA", + "Blocks/Blocks Generic PLA-CF", + "Blocks/Blocks Generic PVA", + "Blocks/Blocks Generic TPU", + "CONSTRUCT3D/C1 Generic High Flow PETG", + "CONSTRUCT3D/C1 Generic PETG", + "CONSTRUCT3D/C1 Generic PLA", + "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", + "Chuanying/Chuanying ASA @Chuanying X1 0.25 Nozzle", + "Chuanying/Chuanying Generic ABS", + "Chuanying/Chuanying Generic ASA", + "Chuanying/Chuanying Generic HIPS", + "Chuanying/Chuanying Generic HS PLA", + "Chuanying/Chuanying Generic PETG", + "Chuanying/Chuanying Generic PETG-CF10", + "Chuanying/Chuanying Generic PLA", + "Chuanying/Chuanying Generic PLA-CF10", + "Chuanying/Chuanying Generic PLA-Silk", + "Chuanying/Chuanying Generic PVA", + "Chuanying/Chuanying Generic TPU", + "Chuanying/Chuanying HS PLA @Chuanying X1 0.25 Nozzle", + "Chuanying/Chuanying PETG @Chuanying X1 0.25 Nozzle", + "Chuanying/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle", + "Co Print/CoPrint Generic ABS", + "Co Print/CoPrint Generic PETG", + "Co Print/CoPrint Generic PLA", + "Co Print/CoPrint Generic TPU", + "CoLiDo/CoLiDo ABS @CoLiDo SR1", + "CoLiDo/CoLiDo Generic ABS @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic ABS @CoLiDo X16", + "CoLiDo/CoLiDo Generic PETG @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic PETG @CoLiDo X16", + "CoLiDo/CoLiDo Generic PLA @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic PLA @CoLiDo X16", + "CoLiDo/CoLiDo Generic TPU @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic TPU @CoLiDo X16", + "CoLiDo/CoLiDo PETG @CoLiDo SR1", + "CoLiDo/CoLiDo PLA @CoLiDo SR1", + "CoLiDo/CoLiDo PLA Silk @CoLiDo SR1", + "CoLiDo/CoLiDo PLA+ @CoLiDo DIY 4.0 V2", + "Comgrow/Comgrow Generic ABS", + "Comgrow/Comgrow Generic PETG", + "Comgrow/Comgrow Generic PLA", + "Comgrow/Comgrow T300 PLA", + "Creality/CR-ABS @Ender-3 V4-all", + "Creality/CR-ABS @Hi-all", + "Creality/CR-ABS @K1 Max_CFS-C-all", + "Creality/CR-ABS @K1 SE-all", + "Creality/CR-ABS @K1 SE_CFS-C-all", + "Creality/CR-ABS @K1C-all", + "Creality/CR-ABS @K1C_CFS-C-all", + "Creality/CR-ABS @K1_CFS-C-all", + "Creality/CR-ABS @K2 Plus-all", + "Creality/CR-ABS @K2 Pro-all", + "Creality/CR-ABS @K2 SE-all", + "Creality/CR-ABS @K2-all", + "Creality/CR-Nylon @K1 Max_CFS-C-all", + "Creality/CR-Nylon @K1C-all", + "Creality/CR-Nylon @K1C_CFS-C-all", + "Creality/CR-Nylon @K1_CFS-C-all", + "Creality/CR-Nylon @K2 Plus-all", + "Creality/CR-PETG @Ender-3 V4-all", + "Creality/CR-PETG @Hi-all", + "Creality/CR-PETG @K1 Max_CFS-C-all", + "Creality/CR-PETG @K1 SE-all", + "Creality/CR-PETG @K1 SE_CFS-C-all", + "Creality/CR-PETG @K1C-all", + "Creality/CR-PETG @K1C_CFS-C-all", + "Creality/CR-PETG @K1_CFS-C-all", + "Creality/CR-PETG @K2 Plus-all", + "Creality/CR-PETG @K2 Pro-all", + "Creality/CR-PETG @K2 SE-all", + "Creality/CR-PETG @K2-all", + "Creality/CR-PETG @SPARKX i7-all", + "Creality/CR-PLA @Ender-3 V4-all", + "Creality/CR-PLA @Hi-all", + "Creality/CR-PLA @K1 Max_CFS-C-all", + "Creality/CR-PLA @K1 SE-all", + "Creality/CR-PLA @K1 SE_CFS-C-all", + "Creality/CR-PLA @K1C-all", + "Creality/CR-PLA @K1C_CFS-C-all", + "Creality/CR-PLA @K1_CFS-C-all", + "Creality/CR-PLA @K2 Plus-all", + "Creality/CR-PLA @K2 Pro-all", + "Creality/CR-PLA @K2 SE-all", + "Creality/CR-PLA @K2-all", + "Creality/CR-PLA @SPARKX i7-all", + "Creality/CR-PLA Carbon @K1 Max_CFS-C-all", + "Creality/CR-PLA Carbon @K1C-all", + "Creality/CR-PLA Carbon @K1C_CFS-C-all", + "Creality/CR-PLA Carbon @K1_CFS-C-all", + "Creality/CR-PLA Carbon @K2 Plus-all", + "Creality/CR-PLA Fluo @K1 Max_CFS-C-all", + "Creality/CR-PLA Fluo @K1C-all", + "Creality/CR-PLA Fluo @K1C_CFS-C-all", + "Creality/CR-PLA Fluo @K1_CFS-C-all", + "Creality/CR-PLA Fluo @K2 Plus-all", + "Creality/CR-PLA Fluo @K2 Pro-all", + "Creality/CR-PLA Fluo @K2-all", + "Creality/CR-PLA Fluo @SPARKX i7-all", + "Creality/CR-PLA Matte @Ender-3 V4-all", + "Creality/CR-PLA Matte @K1 Max_CFS-C-all", + "Creality/CR-PLA Matte @K1C-all", + "Creality/CR-PLA Matte @K1C_CFS-C-all", + "Creality/CR-PLA Matte @K1_CFS-C-all", + "Creality/CR-PLA Matte @K2 Plus-all", + "Creality/CR-PLA Matte @K2 Pro-all", + "Creality/CR-PLA Matte @K2-all", + "Creality/CR-PLA Matte @SPARKX i7-all", + "Creality/CR-Silk @Ender-3 V4-all", + "Creality/CR-Silk @Hi-all", + "Creality/CR-Silk @K1 Max_CFS-C-all", + "Creality/CR-Silk @K1 SE-all", + "Creality/CR-Silk @K1 SE_CFS-C-all", + "Creality/CR-Silk @K1C-all", + "Creality/CR-Silk @K1C_CFS-C-all", + "Creality/CR-Silk @K1_CFS-C-all", + "Creality/CR-Silk @K2 Plus-all", + "Creality/CR-Silk @K2 Pro-all", + "Creality/CR-Silk @K2 SE-all", + "Creality/CR-Silk @K2-all", + "Creality/CR-Silk @SPARKX i7-all", + "Creality/CR-TPU @K1 Max_CFS-C-all", + "Creality/CR-TPU @K1C-all", + "Creality/CR-TPU @K1C_CFS-C-all", + "Creality/CR-TPU @K1_CFS-C-all", + "Creality/CR-TPU @K2 Plus-all", + "Creality/CR-TPU @K2 Pro-all", + "Creality/CR-TPU @K2-all", + "Creality/CR-TPU @SPARKX i7-all", + "Creality/CR-Wood @K1 Max_CFS-C-all", + "Creality/CR-Wood @K1C-all", + "Creality/CR-Wood @K1C_CFS-C-all", + "Creality/CR-Wood @K1_CFS-C-all", + "Creality/CR-Wood @K2 Plus-all", + "Creality/Creality Generic ABS", + "Creality/Creality Generic ABS @Ender-5Max-all", + "Creality/Creality Generic ASA", + "Creality/Creality Generic ASA @Ender-5Max-all", + "Creality/Creality Generic PA @Ender-5Max-all", + "Creality/Creality Generic PA-CF", + "Creality/Creality Generic PETG", + "Creality/Creality Generic PETG @Ender-5Max-all", + "Creality/Creality Generic PLA", + "Creality/Creality Generic PLA @Ender-5Max-all", + "Creality/Creality Generic PLA-CF", + "Creality/Creality Generic TPU", + "Creality/Creality Generic TPU @Ender-5Max-all", + "Creality/Creality HF Generic PLA", + "Creality/Creality HF Generic Speed PLA", + "Creality/Creality Hyper ABS @Ender-5Max-all", + "Creality/Creality Hyper PLA @Ender-5Max-all", + "Creality/Creality Hyper PLA-CF @Ender-5Max-all", + "Creality/Creality Silk PLA @Ender-5Max-all", + "Creality/EN-PLA+ @K1 Max_CFS-C-all", + "Creality/EN-PLA+ @K1C-all", + "Creality/EN-PLA+ @K1C_CFS-C-all", + "Creality/EN-PLA+ @K1_CFS-C-all", + "Creality/EN-PLA+ @K2 Plus-all", + "Creality/EN-PLA+ @K2 Pro-all", + "Creality/EN-PLA+ @K2-all", + "Creality/EN-PLA+ @SPARKX i7-all", + "Creality/ENDER FAST PLA @Hi-all", + "Creality/ENDER FAST PLA @K2 Plus-all", + "Creality/ENDER FAST PLA @K2 Pro-all", + "Creality/ENDER FAST PLA @K2-all", + "Creality/ENDER FAST PLA @SPARKX i7-all", + "Creality/Ender-PLA @Ender-3 V4-all", + "Creality/Ender-PLA @Hi-all", + "Creality/Ender-PLA @K1 Max_CFS-C-all", + "Creality/Ender-PLA @K1C-all", + "Creality/Ender-PLA @K1C_CFS-C-all", + "Creality/Ender-PLA @K1_CFS-C-all", + "Creality/Ender-PLA @K2 Plus-all", + "Creality/Ender-PLA @K2 Pro-all", + "Creality/Ender-PLA @K2-all", + "Creality/Ender-PLA @SPARKX i7-all", + "Creality/Generic ABS @Ender-3 V4-all", + "Creality/Generic ABS @Hi-all", + "Creality/Generic ABS @K1 Max_CFS-C-all", + "Creality/Generic ABS @K1 SE-all", + "Creality/Generic ABS @K1 SE_CFS-C-all", + "Creality/Generic ABS @K1C-all", + "Creality/Generic ABS @K1C_CFS-C-all", + "Creality/Generic ABS @K1_CFS-C-all", + "Creality/Generic ABS @K2 Plus-all", + "Creality/Generic ABS @K2 Pro-all", + "Creality/Generic ABS @K2 SE-all", + "Creality/Generic ABS @K2-all", + "Creality/Generic ASA @K1 Max_CFS-C-all", + "Creality/Generic ASA @K1 SE-all", + "Creality/Generic ASA @K1 SE_CFS-C-all", + "Creality/Generic ASA @K1C-all", + "Creality/Generic ASA @K1C_CFS-C-all", + "Creality/Generic ASA @K1_CFS-C-all", + "Creality/Generic ASA @K2 Plus-all", + "Creality/Generic ASA @K2 Pro-all", + "Creality/Generic ASA @K2 SE-all", + "Creality/Generic ASA @K2-all", + "Creality/Generic ASA-CF @K2 Plus-all", + "Creality/Generic BVOH @Hi-all", + "Creality/Generic BVOH @K1 Max_CFS-C-all", + "Creality/Generic BVOH @K1C-all", + "Creality/Generic BVOH @K1C_CFS-C-all", + "Creality/Generic BVOH @K1_CFS-C-all", + "Creality/Generic BVOH @K2 Plus-all", + "Creality/Generic BVOH @K2 Pro-all", + "Creality/Generic BVOH @K2-all", + "Creality/Generic HIPS @K1 Max_CFS-C-all", + "Creality/Generic HIPS @K1C-all", + "Creality/Generic HIPS @K1C_CFS-C-all", + "Creality/Generic HIPS @K1_CFS-C-all", + "Creality/Generic HIPS @K2 Plus-all", + "Creality/Generic PA @K1 Max_CFS-C-all", + "Creality/Generic PA @K1C-all", + "Creality/Generic PA @K1C_CFS-C-all", + "Creality/Generic PA @K1_CFS-C-all", + "Creality/Generic PA @K2 Plus-all", + "Creality/Generic PA @K2 Pro-all", + "Creality/Generic PA @K2-all", + "Creality/Generic PA-CF @K1 Max_CFS-C-all", + "Creality/Generic PA-CF @K1C-all", + "Creality/Generic PA-CF @K1C_CFS-C-all", + "Creality/Generic PA-CF @K1_CFS-C-all", + "Creality/Generic PA-CF @K2 Plus-all", + "Creality/Generic PA12-CF @K2 Plus-all", + "Creality/Generic PA6-CF @K1 Max_CFS-C-all", + "Creality/Generic PA6-CF @K1C-all", + "Creality/Generic PA6-CF @K1C_CFS-C-all", + "Creality/Generic PA6-CF @K1_CFS-C-all", + "Creality/Generic PA6-CF @K2 Plus-all", + "Creality/Generic PA6-CF @K2 Pro-all", + "Creality/Generic PA6-GF @K2 Plus-all", + "Creality/Generic PA612-CF @K2 Plus-all", + "Creality/Generic PA612-CF @K2 Pro-all", + "Creality/Generic PAHT-CF @K1 Max_CFS-C-all", + "Creality/Generic PAHT-CF @K1C-all", + "Creality/Generic PAHT-CF @K1C_CFS-C-all", + "Creality/Generic PAHT-CF @K1_CFS-C-all", + "Creality/Generic PAHT-CF @K2 Plus-all", + "Creality/Generic PAHT-CF @K2 Pro-all", + "Creality/Generic PAHT-CF @K2-all", + "Creality/Generic PC @K1 Max_CFS-C-all", + "Creality/Generic PC @K1C-all", + "Creality/Generic PC @K1C_CFS-C-all", + "Creality/Generic PC @K1_CFS-C-all", + "Creality/Generic PC @K2 Plus-all", + "Creality/Generic PC @K2 Pro-all", + "Creality/Generic PCTG @K2 Plus-all", + "Creality/Generic PET @K1 Max_CFS-C-all", + "Creality/Generic PET @K1C-all", + "Creality/Generic PET @K1C_CFS-C-all", + "Creality/Generic PET @K1_CFS-C-all", + "Creality/Generic PET @K2 Plus-all", + "Creality/Generic PET @K2 Pro-all", + "Creality/Generic PET @K2-all", + "Creality/Generic PET-CF @K1 Max_CFS-C-all", + "Creality/Generic PET-CF @K1C-all", + "Creality/Generic PET-CF @K1C_CFS-C-all", + "Creality/Generic PET-CF @K1_CFS-C-all", + "Creality/Generic PET-CF @K2 Plus-all", + "Creality/Generic PET-CF @K2 Pro-all", + "Creality/Generic PETG @Ender-3 V4-all", + "Creality/Generic PETG @Hi-all", + "Creality/Generic PETG @K1 Max_CFS-C-all", + "Creality/Generic PETG @K1 SE-all", + "Creality/Generic PETG @K1 SE_CFS-C-all", + "Creality/Generic PETG @K1C-all", + "Creality/Generic PETG @K1C_CFS-C-all", + "Creality/Generic PETG @K1_CFS-C-all", + "Creality/Generic PETG @K2 Plus-all", + "Creality/Generic PETG @K2 Pro-all", + "Creality/Generic PETG @K2 SE-all", + "Creality/Generic PETG @K2-all", + "Creality/Generic PETG @SPARKX i7-all", + "Creality/Generic PETG-CF @K1 Max_CFS-C-all", + "Creality/Generic PETG-CF @K1C-all", + "Creality/Generic PETG-CF @K1C_CFS-C-all", + "Creality/Generic PETG-CF @K1_CFS-C-all", + "Creality/Generic PETG-CF @K2 Plus-all", + "Creality/Generic PETG-CF @K2 Pro-all", + "Creality/Generic PETG-CF @K2-all", + "Creality/Generic PETG-CF @SPARKX i7-all", + "Creality/Generic PETG-GF @K2 Plus-all", + "Creality/Generic PETG-GF @K2 Pro-all", + "Creality/Generic PETG-GF @K2-all", + "Creality/Generic PLA @Ender-3 V4-all", + "Creality/Generic PLA @Hi-all", + "Creality/Generic PLA @K1 Max_CFS-C-all", + "Creality/Generic PLA @K1 SE-all", + "Creality/Generic PLA @K1 SE_CFS-C-all", + "Creality/Generic PLA @K1C-all", + "Creality/Generic PLA @K1C_CFS-C-all", + "Creality/Generic PLA @K1_CFS-C-all", + "Creality/Generic PLA @K2 Plus-all", + "Creality/Generic PLA @K2 Pro-all", + "Creality/Generic PLA @K2 SE-all", + "Creality/Generic PLA @K2-all", + "Creality/Generic PLA @SPARKX i7-all", + "Creality/Generic PLA-CF @Ender-3 V4-all", + "Creality/Generic PLA-CF @K1 Max_CFS-C-all", + "Creality/Generic PLA-CF @K1 SE-all", + "Creality/Generic PLA-CF @K1 SE_CFS-C-all", + "Creality/Generic PLA-CF @K1C-all", + "Creality/Generic PLA-CF @K1C_CFS-C-all", + "Creality/Generic PLA-CF @K1_CFS-C-all", + "Creality/Generic PLA-CF @K2 Plus-all", + "Creality/Generic PLA-CF @K2 Pro-all", + "Creality/Generic PLA-CF @K2 SE-all", + "Creality/Generic PLA-CF @K2-all", + "Creality/Generic PLA-CF @SPARKX i7-all", + "Creality/Generic PLA-Silk @Ender-3 V4-all", + "Creality/Generic PLA-Silk @Hi-all", + "Creality/Generic PLA-Silk @K1 Max_CFS-C-all", + "Creality/Generic PLA-Silk @K1 SE-all", + "Creality/Generic PLA-Silk @K1 SE_CFS-C-all", + "Creality/Generic PLA-Silk @K1C-all", + "Creality/Generic PLA-Silk @K1C_CFS-C-all", + "Creality/Generic PLA-Silk @K1_CFS-C-all", + "Creality/Generic PLA-Silk @K2 Plus-all", + "Creality/Generic PLA-Silk @K2 Pro-all", + "Creality/Generic PLA-Silk @K2 SE-all", + "Creality/Generic PLA-Silk @K2-all", + "Creality/Generic PLA-Silk @SPARKX i7-all", + "Creality/Generic PP @K1 Max_CFS-C-all", + "Creality/Generic PP @K1C-all", + "Creality/Generic PP @K1C_CFS-C-all", + "Creality/Generic PP @K1_CFS-C-all", + "Creality/Generic PP @K2 Plus-all", + "Creality/Generic PP @K2 Pro-all", + "Creality/Generic PP @K2-all", + "Creality/Generic PP-CF @K2 Plus-all", + "Creality/Generic PPS @K1 Max_CFS-C-all", + "Creality/Generic PPS @K1C-all", + "Creality/Generic PPS @K1C_CFS-C-all", + "Creality/Generic PPS @K1_CFS-C-all", + "Creality/Generic PPS @K2 Plus-all", + "Creality/Generic PPS-CF @K1 Max_CFS-C-all", + "Creality/Generic PPS-CF @K1C-all", + "Creality/Generic PPS-CF @K1C_CFS-C-all", + "Creality/Generic PPS-CF @K1_CFS-C-all", + "Creality/Generic PPS-CF @K2 Plus-all", + "Creality/Generic PVA @Hi-all", + "Creality/Generic PVA @K1 Max_CFS-C-all", + "Creality/Generic PVA @K1C-all", + "Creality/Generic PVA @K1C_CFS-C-all", + "Creality/Generic PVA @K1_CFS-C-all", + "Creality/Generic PVA @K2 Plus-all", + "Creality/Generic PVA @K2 Pro-all", + "Creality/Generic PVA @K2-all", + "Creality/Generic Support for PA @K2 Plus-all", + "Creality/Generic Support for PLA @K2 Plus-all", + "Creality/Generic TPU 64D @K2 Plus-all", + "Creality/Generic TPU 64D @SPARKX i7-all", + "Creality/Generic TPU @Ender-3 V4-all", + "Creality/Generic TPU @K1 Max_CFS-C-all", + "Creality/Generic TPU @K1 SE-all", + "Creality/Generic TPU @K1 SE_CFS-C-all", + "Creality/Generic TPU @K1C-all", + "Creality/Generic TPU @K1C_CFS-C-all", + "Creality/Generic TPU @K1_CFS-C-all", + "Creality/Generic TPU @K2 Plus-all", + "Creality/Generic TPU @K2 Pro-all", + "Creality/Generic TPU @K2 SE-all", + "Creality/Generic TPU @K2-all", + "Creality/Generic TPU @SPARKX i7-all", + "Creality/HP Ultra PLA @K1 Max_CFS-C-all", + "Creality/HP Ultra PLA @K1C-all", + "Creality/HP Ultra PLA @K1C_CFS-C-all", + "Creality/HP Ultra PLA @K1_CFS-C-all", + "Creality/HP Ultra PLA @K2 Plus-all", + "Creality/HP-ASA @K1 Max_CFS-C-all", + "Creality/HP-ASA @K1C-all", + "Creality/HP-ASA @K1C_CFS-C-all", + "Creality/HP-ASA @K1_CFS-C-all", + "Creality/HP-ASA @K2 Plus-all", + "Creality/HP-ASA @K2 Pro-all", + "Creality/HP-ASA @K2 SE-all", + "Creality/HP-ASA @K2-all", + "Creality/HP-TPU @Ender-3 V4-all", + "Creality/HP-TPU @Hi-all", + "Creality/HP-TPU @K1 Max_CFS-C-all", + "Creality/HP-TPU @K1 SE-all", + "Creality/HP-TPU @K1 SE_CFS-C-all", + "Creality/HP-TPU @K1C-all", + "Creality/HP-TPU @K1C_CFS-C-all", + "Creality/HP-TPU @K1_CFS-C-all", + "Creality/HP-TPU @K2 Plus-all", + "Creality/HP-TPU @K2 Pro-all", + "Creality/HP-TPU @K2 SE-all", + "Creality/HP-TPU @K2-all", + "Creality/HP-TPU @SPARKX i7-all", + "Creality/Hyper ABS @Ender-3 V4-all", + "Creality/Hyper ABS @Hi-all", + "Creality/Hyper ABS @K1 Max_CFS-C-all", + "Creality/Hyper ABS @K1 SE-all", + "Creality/Hyper ABS @K1 SE_CFS-C-all", + "Creality/Hyper ABS @K1C-all", + "Creality/Hyper ABS @K1C_CFS-C-all", + "Creality/Hyper ABS @K1_CFS-C-all", + "Creality/Hyper ABS @K2 Plus-all", + "Creality/Hyper ABS @K2 Pro-all", + "Creality/Hyper ABS @K2 SE-all", + "Creality/Hyper ABS @K2-all", + "Creality/Hyper L-W PLA @Hi-all", + "Creality/Hyper L-W PLA @K1 Max_CFS-C-all", + "Creality/Hyper L-W PLA @K1 SE-all", + "Creality/Hyper L-W PLA @K1 SE_CFS-C-all", + "Creality/Hyper L-W PLA @K1C-all", + "Creality/Hyper L-W PLA @K1C_CFS-C-all", + "Creality/Hyper L-W PLA @K1_CFS-C-all", + "Creality/Hyper L-W PLA @K2 Plus-all", + "Creality/Hyper L-W PLA @K2 Pro-all", + "Creality/Hyper L-W PLA @K2-all", + "Creality/Hyper Luminous @Hi-all", + "Creality/Hyper Luminous @K1C-all", + "Creality/Hyper Luminous @K2 Plus-all", + "Creality/Hyper Luminous @K2 Pro-all", + "Creality/Hyper Luminous @K2-all", + "Creality/Hyper Luminous @SPARKX i7-all", + "Creality/Hyper Marble @Hi-all", + "Creality/Hyper Marble @K1 Max_CFS-C-all", + "Creality/Hyper Marble @K1C-all", + "Creality/Hyper Marble @K1C_CFS-C-all", + "Creality/Hyper Marble @K1_CFS-C-all", + "Creality/Hyper Marble @K2 Plus-all", + "Creality/Hyper Marble @K2 Pro-all", + "Creality/Hyper Marble @K2 SE-all", + "Creality/Hyper Marble @K2-all", + "Creality/Hyper Marble @SPARKX i7-all", + "Creality/Hyper PA6-CF @K2 Plus-all", + "Creality/Hyper PA6-CF @K2 Pro-all", + "Creality/Hyper PA612-CF @K2 Plus-all", + "Creality/Hyper PA612-CF @K2 Pro-all", + "Creality/Hyper PAHT-CF @K1 Max_CFS-C-all", + "Creality/Hyper PAHT-CF @K1C-all", + "Creality/Hyper PAHT-CF @K1C_CFS-C-all", + "Creality/Hyper PAHT-CF @K1_CFS-C-all", + "Creality/Hyper PAHT-CF @K2 Plus-all", + "Creality/Hyper PAHT-CF @K2 Pro-all", + "Creality/Hyper PAHT-CF @K2-all", + "Creality/Hyper PC @K2 Plus-all", + "Creality/Hyper PC @K2 Pro-all", + "Creality/Hyper PETG @Ender-3 V4-all", + "Creality/Hyper PETG @Hi-all", + "Creality/Hyper PETG @K1 Max_CFS-C-all", + "Creality/Hyper PETG @K1 SE-all", + "Creality/Hyper PETG @K1 SE_CFS-C-all", + "Creality/Hyper PETG @K1C-all", + "Creality/Hyper PETG @K1C_CFS-C-all", + "Creality/Hyper PETG @K1_CFS-C-all", + "Creality/Hyper PETG @K2 Plus-all", + "Creality/Hyper PETG @K2 Pro-all", + "Creality/Hyper PETG @K2 SE-all", + "Creality/Hyper PETG @K2-all", + "Creality/Hyper PETG @SPARKX i7-all", + "Creality/Hyper PETG-CF @K1 Max_CFS-C-all", + "Creality/Hyper PETG-CF @K1C-all", + "Creality/Hyper PETG-CF @K1C_CFS-C-all", + "Creality/Hyper PETG-CF @K1_CFS-C-all", + "Creality/Hyper PETG-CF @K2 Plus-all", + "Creality/Hyper PETG-CF @K2 Pro-all", + "Creality/Hyper PETG-CF @K2-all", + "Creality/Hyper PETG-CF @SPARKX i7-all", + "Creality/Hyper PETG-GF @K1C-all", + "Creality/Hyper PETG-GF @K2 Plus-all", + "Creality/Hyper PETG-GF @K2 Pro-all", + "Creality/Hyper PETG-GF @K2-all", + "Creality/Hyper PLA @Ender-3 V4-all", + "Creality/Hyper PLA @Hi-all", + "Creality/Hyper PLA @K1 Max_CFS-C-all", + "Creality/Hyper PLA @K1 SE-all", + "Creality/Hyper PLA @K1 SE_CFS-C-all", + "Creality/Hyper PLA @K1C-all", + "Creality/Hyper PLA @K1C_CFS-C-all", + "Creality/Hyper PLA @K1_CFS-C-all", + "Creality/Hyper PLA @K2 Plus-all", + "Creality/Hyper PLA @K2 Pro-all", + "Creality/Hyper PLA @K2 SE-all", + "Creality/Hyper PLA @K2-all", + "Creality/Hyper PLA @SPARKX i7-all", + "Creality/Hyper PLA-CF @Ender-3 V4-all", + "Creality/Hyper PLA-CF @Hi-all", + "Creality/Hyper PLA-CF @K1 Max_CFS-C-all", + "Creality/Hyper PLA-CF @K1 SE-all", + "Creality/Hyper PLA-CF @K1 SE_CFS-C-all", + "Creality/Hyper PLA-CF @K1C-all", + "Creality/Hyper PLA-CF @K1C_CFS-C-all", + "Creality/Hyper PLA-CF @K1_CFS-C-all", + "Creality/Hyper PLA-CF @K2 Plus-all", + "Creality/Hyper PLA-CF @K2 Pro-all", + "Creality/Hyper PLA-CF @K2 SE-all", + "Creality/Hyper PLA-CF @K2-all", + "Creality/Hyper PLA-CF @SPARKX i7-all", + "Creality/Hyper PPA-CF @K2 Plus-all", + "Creality/Hyper PPA-CF @K2 Pro-all", + "Creality/Hyper Stardust @Hi-all", + "Creality/Hyper Stardust @K1 Max_CFS-C-all", + "Creality/Hyper Stardust @K1C-all", + "Creality/Hyper Stardust @K1C_CFS-C-all", + "Creality/Hyper Stardust @K1_CFS-C-all", + "Creality/Hyper Stardust @K2 Plus-all", + "Creality/Hyper Stardust @K2 Pro-all", + "Creality/Hyper Stardust @K2 SE-all", + "Creality/Hyper Stardust @K2-all", + "Creality/Hyper Stardust @SPARKX i7-all", + "Creality/Panchroma PLA Matte @K2 Plus-all", + "Creality/Panchroma PLA Satin @K2 Plus-all", + "Creality/PolySonic PLA @K2 Plus-all", + "Creality/PolySonic PLA Pro @K2 Plus-all", + "Creality/Soleyin Basic PETG @Hi-all", + "Creality/Soleyin Basic PETG @K1C-all", + "Creality/Soleyin Basic PETG @K2 Plus-all", + "Creality/Soleyin Basic PETG @K2 Pro-all", + "Creality/Soleyin Basic PETG @K2-all", + "Creality/Soleyin Basic PETG @SPARKX i7-all", + "Creality/Soleyin Ultra PLA @Ender-3 V4-all", + "Creality/Soleyin Ultra PLA @Hi-all", + "Creality/Soleyin Ultra PLA @K1 Max_CFS-C-all", + "Creality/Soleyin Ultra PLA @K1C-all", + "Creality/Soleyin Ultra PLA @K1C_CFS-C-all", + "Creality/Soleyin Ultra PLA @K1_CFS-C-all", + "Creality/Soleyin Ultra PLA @K2 Plus-all", + "Creality/Soleyin Ultra PLA @K2 Pro-all", + "Creality/Soleyin Ultra PLA @K2 SE-all", + "Creality/Soleyin Ultra PLA @K2-all", + "Creality/Soleyin Ultra PLA @SPARKX i7-all", + "Creality/eSUN ABS+ @K2 Plus-all", + "Creality/eSUN ASA+ @K2 Plus-all", + "Creality/eSUN PET-Basic @K2 Plus-all", + "Creality/eSUN PETG @K2 Plus-all", + "Creality/eSUN PETG+HS @K2 Plus-all", + "Creality/eSUN PETG-Basic @K2 Plus-all", + "Creality/eSUN PLA+ @K2 Plus-all", + "Creality/eSUN PLA-CF @K2 Plus-all", + "Creality/eSUN PLA-HS @K2 Plus-all", + "Creality/eSUN PLA-LW @K2 Plus-all", + "Creality/eSUN PLA-Lite @K2 Plus-all", + "Creality/eSUN PLA-Matte @K2 Plus-all", + "Creality/eSUN PLA-Silk @K2 Plus-all", + "Cubicon/Cubicon ABS @base", + "Cubicon/Cubicon ABS-A100 @base", + "Cubicon/Cubicon ABSk @base", + "Cubicon/Cubicon PA-CF @base", + "Cubicon/Cubicon PC @base", + "Cubicon/Cubicon PETG @base", + "Cubicon/Cubicon PLA @base", + "Cubicon/Cubicon PLA+ @base", + "Cubicon/Cubicon PLAi21 @base", + "Custom/Generic PC @MyToolChanger", + "Custom/Generic PETG @MyToolChanger", + "Custom/Generic PLA @MyToolChanger", + "Custom/Generic PLA-CF @MyToolChanger", + "Custom/Generic PVA @MyToolChanger", + "Custom/Generic TPU @MyToolChanger", + "DeltaMaker/DeltaMaker Brand PLA", + "DeltaMaker/DeltaMaker Generic PETG", + "DeltaMaker/DeltaMaker Generic PLA", + "DeltaMaker/DeltaMaker Generic TPU", + "Dremel/Dremel Generic PLA", + "Eryone/Eryone ABS", + "Eryone/Eryone ABS-CF", + "Eryone/Eryone ASA", + "Eryone/Eryone ASA-CF", + "Eryone/Eryone PA", + "Eryone/Eryone PA-CF", + "Eryone/Eryone PA-GF", + "Eryone/Eryone PETG", + "Eryone/Eryone PETG-CF", + "Eryone/Eryone PLA", + "Eryone/Eryone PLA-CF", + "Eryone/Eryone PP", + "Eryone/Eryone PP-CF", + "Eryone/Eryone Silk PLA", + "Eryone/Eryone TPU", + "FLSun/FLSun Generic ABS", + "FLSun/FLSun Generic ASA", + "FLSun/FLSun Generic PA", + "FLSun/FLSun Generic PA-CF", + "FLSun/FLSun Generic PC", + "FLSun/FLSun Generic PETG", + "FLSun/FLSun Generic PLA", + "FLSun/FLSun Generic PLA-CF", + "FLSun/FLSun Generic PVA", + "FLSun/FLSun Generic TPU", + "FLSun/FLSun S1 ABS", + "FLSun/FLSun S1 ASA", + "FLSun/FLSun S1 PETG", + "FLSun/FLSun S1 PLA Generic", + "FLSun/FLSun S1 PLA High Speed", + "FLSun/FLSun S1 PLA Silk", + "FLSun/FLSun S1 TPU", + "FLSun/FLSun T1 ABS", + "FLSun/FLSun T1 ASA", + "FLSun/FLSun T1 PETG", + "FLSun/FLSun T1 PLA Generic", + "FLSun/FLSun T1 PLA High Speed", + "FLSun/FLSun T1 PLA Silk", + "FLSun/FLSun T1 TPU", + "Flashforge/Flashforge ABS", + "Flashforge/Flashforge Generic ABS", + "Flashforge/Flashforge Generic ABS @FF AD5M 0.25 Nozzle", + "Flashforge/Flashforge Generic ABS @G3U", + "Flashforge/Flashforge Generic ABS @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic ASA", + "Flashforge/Flashforge Generic ASA @FF AD5M 0.25 Nozzle", + "Flashforge/Flashforge Generic ASA @G3U", + "Flashforge/Flashforge Generic ASA @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic HIPS", + "Flashforge/Flashforge Generic HIPS @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic HS PLA", + "Flashforge/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle", + "Flashforge/Flashforge Generic PETG", + "Flashforge/Flashforge Generic PETG @FF AD5M 0.25 Nozzle", + "Flashforge/Flashforge Generic PETG @G3U", + "Flashforge/Flashforge Generic PETG @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic PETG @G3U 0.8 Nozzle", + "Flashforge/Flashforge Generic PETG-CF @G3U", + "Flashforge/Flashforge Generic PETG-CF @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic PETG-CF @G3U 0.8 Nozzle", + "Flashforge/Flashforge Generic PETG-CF10", + "Flashforge/Flashforge Generic PLA", + "Flashforge/Flashforge Generic PLA @G3U", + "Flashforge/Flashforge Generic PLA-CF @G3U", + "Flashforge/Flashforge Generic PLA-CF @G3U 0.6 Nozzle", + "Flashforge/Flashforge Generic PLA-CF @G3U 0.8 Nozzle", + "Flashforge/Flashforge Generic PLA-CF10", + "Flashforge/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", + "Flashforge/Flashforge Generic PLA-Silk", + "Flashforge/Flashforge Generic PVA", + "Flashforge/Flashforge Generic TPU", + "Flashforge/Flashforge HS PLA @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PETG", + "Flashforge/Flashforge PLA", + "Flashforge/FusRock Generic NexPA-CF25", + "Flashforge/FusRock Generic PAHT-CF", + "Flashforge/FusRock Generic PAHT-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic PAHT-GF", + "Flashforge/FusRock Generic PET-CF", + "Flashforge/FusRock Generic PET-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic PET-GF", + "Flashforge/FusRock Generic S-Multi", + "Flashforge/FusRock Generic S-Multi @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic S-PAHT", + "Flashforge/FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "Flashforge/Generic ABS @Flashforge AD4", + "Flashforge/Generic ASA @Flashforge AD4", + "Flashforge/Generic PETG @Flashforge AD4", + "Flashforge/Generic PETG @Flashforge Artemis", + "Flashforge/Generic PETG-CF10 @Flashforge AD4", + "Flashforge/Generic PLA @Flashforge AD4", + "Flashforge/Generic PLA High Speed @Flashforge AD4", + "Flashforge/Generic PLA Silk @Flashforge AD4", + "Flashforge/Generic PLA-CF10 @Flashforge AD4", + "Flashforge/Generic TPU @Flashforge AD4", + "Flashforge/Polymaker Generic CoPA", + "Flashforge/Polymaker Generic S1", + "FlyingBear/FlyingBear ABS @Ghost7", + "FlyingBear/FlyingBear ABS @S1", + "FlyingBear/FlyingBear Generic ABS", + "FlyingBear/FlyingBear Generic PA-CF", + "FlyingBear/FlyingBear Generic PC", + "FlyingBear/FlyingBear Generic PETG", + "FlyingBear/FlyingBear Generic PLA", + "FlyingBear/FlyingBear Generic TPU", + "FlyingBear/FlyingBear PA-CF @Ghost7", + "FlyingBear/FlyingBear PA-CF @S1", + "FlyingBear/FlyingBear PC @Ghost7", + "FlyingBear/FlyingBear PC @S1", + "FlyingBear/FlyingBear PETG @S1", + "FlyingBear/FlyingBear PETG Basic @Ghost7", + "FlyingBear/FlyingBear PLA @S1", + "FlyingBear/FlyingBear PLA Basic @Ghost7", + "FlyingBear/FlyingBear PLA Hyper", + "FlyingBear/FlyingBear PLA Hyper @Ghost7", + "FlyingBear/FlyingBear PLA Hyper @S1", + "FlyingBear/FlyingBear TPU @S1", + "FlyingBear/FlyingBear TPU Basic @Ghost7", + "FlyingBear/Other ABS @S1", + "FlyingBear/Other PA-CF @S1", + "FlyingBear/Other PC @S1", + "FlyingBear/Other PETG @S1", + "FlyingBear/Other PLA @S1", + "FlyingBear/Other PLA Hyper @S1", + "FlyingBear/Other TPU @S1", + "InfiMech/InfiMech ABS @EX", + "InfiMech/InfiMech ABS @EX+APS", + "InfiMech/InfiMech ABS @HSN", + "InfiMech/InfiMech Generic ABS", + "InfiMech/InfiMech Generic PA-CF", + "InfiMech/InfiMech Generic PC", + "InfiMech/InfiMech Generic PETG", + "InfiMech/InfiMech Generic PLA", + "InfiMech/InfiMech Generic TPU", + "InfiMech/InfiMech PA-CF @EX", + "InfiMech/InfiMech PA-CF @EX+APS", + "InfiMech/InfiMech PA-CF @HSN", + "InfiMech/InfiMech PC @EX", + "InfiMech/InfiMech PC @EX+APS", + "InfiMech/InfiMech PC @HSN", + "InfiMech/InfiMech PETG @EX", + "InfiMech/InfiMech PETG @EX+APS", + "InfiMech/InfiMech PETG @HSN", + "InfiMech/InfiMech PLA @HSN", + "InfiMech/InfiMech PLA Basic @EX", + "InfiMech/InfiMech PLA Basic @EX+APS", + "InfiMech/InfiMech PLA Hyper", + "InfiMech/InfiMech PLA Hyper @EX", + "InfiMech/InfiMech PLA Hyper @EX+APS", + "InfiMech/InfiMech PLA Hyper @HSN", + "InfiMech/InfiMech TPU @HSN", + "InfiMech/InfiMech TPU Basic @EX", + "InfiMech/InfiMech TPU Basic @EX+APS", + "InfiMech/Other ABS", + "InfiMech/Other ABS @HSN", + "InfiMech/Other PA-CF", + "InfiMech/Other PA-CF @HSN", + "InfiMech/Other PC", + "InfiMech/Other PC @HSN", + "InfiMech/Other PETG", + "InfiMech/Other PETG @HSN", + "InfiMech/Other PLA", + "InfiMech/Other PLA @HSN", + "InfiMech/Other PLA Hyper", + "InfiMech/Other PLA Hyper @HSN", + "InfiMech/Other TPU", + "InfiMech/Other TPU @HSN", + "LH/LHS ABS", + "LH/LHS ASA", + "LH/LHS PC CF", + "LH/LHS PCTG", + "LH/LHS PETG", + "LH/LHS PLA", + "LH/LHS TPU", + "LH/LHS TPU Foamy 78A", + "LONGER/Generic PETG @LONGER LK10", + "LONGER/Generic PETG @LONGER LK10 Plus", + "LONGER/Generic PLA @LONGER LK10", + "LONGER/Generic PLA @LONGER LK10 Plus", + "Lulzbot/Lulzbot 2.85mm ABS", + "Lulzbot/Lulzbot 2.85mm PETG", + "Lulzbot/Lulzbot 2.85mm PLA", + "MagicMaker/MM Generic PEEK", + "OrcaArena/OrcaArena Generic PA", + "OrcaArena/OrcaArena Generic PA-CF", + "OrcaArena/OrcaArena Generic TPU", + "OrcaFilamentLibrary/Eolas Prints ABS @System", + "OrcaFilamentLibrary/Eolas Prints ASA @System", + "OrcaFilamentLibrary/Eolas Prints PETG @System", + "OrcaFilamentLibrary/Eolas Prints PETG Transition @System", + "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant @System", + "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial @System", + "OrcaFilamentLibrary/Eolas Prints PLA High Speed @System", + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850 @System", + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870 @System", + "OrcaFilamentLibrary/Eolas Prints PLA Matte @System", + "OrcaFilamentLibrary/Eolas Prints PLA Neon @System", + "OrcaFilamentLibrary/Eolas Prints PLA Premium @System", + "OrcaFilamentLibrary/Eolas Prints PLA Silk @System", + "OrcaFilamentLibrary/Eolas Prints PLA Transition @System", + "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant @System", + "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A @System", + "OrcaFilamentLibrary/Eolas Prints TPU Flex D53 @System", + "OrcaFilamentLibrary/Eolas Prints TPU Transition @System", + "OrcaFilamentLibrary/FilAr PETG Amarillo Lima", + "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante", + "OrcaFilamentLibrary/FilAr PETG Azul Boreal", + "OrcaFilamentLibrary/FilAr PETG Azul Francia", + "OrcaFilamentLibrary/FilAr PETG Azul Imperial", + "OrcaFilamentLibrary/FilAr PETG Blanco Antartida", + "OrcaFilamentLibrary/FilAr PETG Cian", + "OrcaFilamentLibrary/FilAr PETG Coral", + "OrcaFilamentLibrary/FilAr PETG Cristal", + "OrcaFilamentLibrary/FilAr PETG Gris Ceniza", + "OrcaFilamentLibrary/FilAr PETG Gris Plata", + "OrcaFilamentLibrary/FilAr PETG Magenta", + "OrcaFilamentLibrary/FilAr PETG Negro Azabache", + "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi", + "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio", + "OrcaFilamentLibrary/FilAr PLA Azul Francia", + "OrcaFilamentLibrary/FilAr PLA Blanco Antartida", + "OrcaFilamentLibrary/FilAr PLA Blanco Calido", + "OrcaFilamentLibrary/FilAr PLA Bronce", + "OrcaFilamentLibrary/FilAr PLA Cafe con Leche", + "OrcaFilamentLibrary/FilAr PLA Carpincho", + "OrcaFilamentLibrary/FilAr PLA Celeste Cielo", + "OrcaFilamentLibrary/FilAr PLA Cobre", + "OrcaFilamentLibrary/FilAr PLA Dorado", + "OrcaFilamentLibrary/FilAr PLA Gris Ceniza", + "OrcaFilamentLibrary/FilAr PLA Gris Pizarra", + "OrcaFilamentLibrary/FilAr PLA Gris Plata", + "OrcaFilamentLibrary/FilAr PLA Manteca", + "OrcaFilamentLibrary/FilAr PLA Marron Oxido", + "OrcaFilamentLibrary/FilAr PLA Naranja Tigre", + "OrcaFilamentLibrary/FilAr PLA Negro Azabache", + "OrcaFilamentLibrary/FilAr PLA Oro", + "OrcaFilamentLibrary/FilAr PLA Piel", + "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras", + "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto", + "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco", + "OrcaFilamentLibrary/FilAr PLA Tabaco", + "OrcaFilamentLibrary/FilAr PLA Titanio", + "OrcaFilamentLibrary/FilAr PLA Verde FilAr", + "OrcaFilamentLibrary/FilAr PLA Verde Manzana", + "OrcaFilamentLibrary/FilAr PLA Verde Oliva", + "OrcaFilamentLibrary/FilAr PLA Verde Pixel", + "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda", + "OrcaFilamentLibrary/FilAr PLA-mate Amarillo", + "OrcaFilamentLibrary/FilAr PLA-mate Azul", + "OrcaFilamentLibrary/FilAr PLA-mate Beige", + "OrcaFilamentLibrary/FilAr PLA-mate Blanco", + "OrcaFilamentLibrary/FilAr PLA-mate Bordo", + "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo", + "OrcaFilamentLibrary/FilAr PLA-mate Chocolate", + "OrcaFilamentLibrary/FilAr PLA-mate Gris", + "OrcaFilamentLibrary/FilAr PLA-mate Marron", + "OrcaFilamentLibrary/FilAr PLA-mate Naranja", + "OrcaFilamentLibrary/FilAr PLA-mate Negro", + "OrcaFilamentLibrary/FilAr PLA-mate Piel", + "OrcaFilamentLibrary/FilAr PLA-mate Rojo", + "OrcaFilamentLibrary/FilAr PLA-mate Rosa", + "OrcaFilamentLibrary/FilAr PLA-mate Uva", + "OrcaFilamentLibrary/FilAr PLA-mate Verde", + "OrcaFilamentLibrary/FilAr PLA-mate Violeta", + "OrcaFilamentLibrary/Generic ABS @System", + "OrcaFilamentLibrary/Generic ASA @System", + "OrcaFilamentLibrary/Generic PA @System", + "OrcaFilamentLibrary/Generic PA-CF @System", + "OrcaFilamentLibrary/Generic PC @System", + "OrcaFilamentLibrary/Generic PETG @System", + "OrcaFilamentLibrary/Generic PLA High Speed @System", + "OrcaFilamentLibrary/Generic PLA-CF @System", + "OrcaFilamentLibrary/Generic PPA-GF @System", + "OrcaFilamentLibrary/Generic PVA @System", + "OrcaFilamentLibrary/Generic TPU @System", + "OrcaFilamentLibrary/PolyLite PLA @System", + "OrcaFilamentLibrary/PolyTerra Dual PLA @System", + "OrcaFilamentLibrary/eSUN ePLA-LW @System", + "Peopoly/Peopoly Generic ABS", + "Peopoly/Peopoly Generic PETG", + "Peopoly/Peopoly Generic PLA", + "Peopoly/Peopoly Lancer ABS-GF", + "Peopoly/Peopoly Lancer PET-CF", + "Peopoly/Peopoly Lancer PETG-C", + "Peopoly/Peopoly Lancer PLA-C", + "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", + "Prusa/Prusa Generic ABS @CORE One", + "Prusa/Prusa Generic ABS @CORE One 0.6", + "Prusa/Prusa Generic ABS @CORE One 0.8", + "Prusa/Prusa Generic ABS @CORE One HF 0.4", + "Prusa/Prusa Generic ABS @CORE One HF 0.5", + "Prusa/Prusa Generic ABS @CORE One HF 0.6", + "Prusa/Prusa Generic ABS @CORE One HF 0.8", + "Prusa/Prusa Generic ABS @MK3.5", + "Prusa/Prusa Generic ABS @MK3.5 0.25", + "Prusa/Prusa Generic ABS @MK3.5 0.6", + "Prusa/Prusa Generic ABS @MK3.5 0.8", + "Prusa/Prusa Generic ABS @MK4S", + "Prusa/Prusa Generic ABS @MK4S 0.6", + "Prusa/Prusa Generic ABS @MK4S 0.8", + "Prusa/Prusa Generic ABS @MK4S HF0.4", + "Prusa/Prusa Generic ABS @MK4S HF0.5", + "Prusa/Prusa Generic ABS @MK4S HF0.6", + "Prusa/Prusa Generic ABS @MK4S HF0.8", + "Prusa/Prusa Generic ABS HF @MK3.5", + "Prusa/Prusa Generic ABS HF @MK3.5 0.6", + "Prusa/Prusa Generic ABS HF @MK3.5 0.8", + "Prusa/Prusa Generic ASA @CORE One", + "Prusa/Prusa Generic ASA @CORE One 0.6", + "Prusa/Prusa Generic ASA @CORE One 0.8", + "Prusa/Prusa Generic ASA @CORE One HF 0.4", + "Prusa/Prusa Generic ASA @CORE One HF 0.5", + "Prusa/Prusa Generic ASA @CORE One HF 0.6", + "Prusa/Prusa Generic ASA @CORE One HF 0.8", + "Prusa/Prusa Generic ASA @MK3.5", + "Prusa/Prusa Generic ASA @MK3.5 0.25", + "Prusa/Prusa Generic ASA @MK3.5 0.6", + "Prusa/Prusa Generic ASA @MK3.5 0.8", + "Prusa/Prusa Generic ASA @MK4S", + "Prusa/Prusa Generic ASA @MK4S 0.6", + "Prusa/Prusa Generic ASA @MK4S 0.8", + "Prusa/Prusa Generic ASA @MK4S HF0.4", + "Prusa/Prusa Generic ASA @MK4S HF0.5", + "Prusa/Prusa Generic ASA @MK4S HF0.6", + "Prusa/Prusa Generic ASA @MK4S HF0.8", + "Prusa/Prusa Generic ASA HF @MK3.5", + "Prusa/Prusa Generic ASA HF @MK3.5 0.6", + "Prusa/Prusa Generic ASA HF @MK3.5 0.8", + "Prusa/Prusa Generic PA @MK3.5", + "Prusa/Prusa Generic PA @MK3.5 0.25", + "Prusa/Prusa Generic PA @MK3.5 0.6", + "Prusa/Prusa Generic PA @MK3.5 0.8", + "Prusa/Prusa Generic PA-CF @MK3.5", + "Prusa/Prusa Generic PA-CF @MK3.5 0.25", + "Prusa/Prusa Generic PA-CF @MK3.5 0.6", + "Prusa/Prusa Generic PA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PC @MK3.5", + "Prusa/Prusa Generic PC @MK3.5 0.25", + "Prusa/Prusa Generic PC @MK3.5 0.6", + "Prusa/Prusa Generic PC @MK3.5 0.8", + "Prusa/Prusa Generic PC HF @MK3.5", + "Prusa/Prusa Generic PC HF @MK3.5 0.6", + "Prusa/Prusa Generic PC HF @MK3.5 0.8", + "Prusa/Prusa Generic PETG @CORE One", + "Prusa/Prusa Generic PETG @CORE One 0.6", + "Prusa/Prusa Generic PETG @CORE One 0.8", + "Prusa/Prusa Generic PETG @CORE One HF 0.4", + "Prusa/Prusa Generic PETG @CORE One HF 0.5", + "Prusa/Prusa Generic PETG @CORE One HF 0.6", + "Prusa/Prusa Generic PETG @CORE One HF 0.8", + "Prusa/Prusa Generic PETG @MK3.5", + "Prusa/Prusa Generic PETG @MK3.5 0.25", + "Prusa/Prusa Generic PETG @MK3.5 0.6", + "Prusa/Prusa Generic PETG @MK3.5 0.8", + "Prusa/Prusa Generic PETG @MK4S", + "Prusa/Prusa Generic PETG @MK4S 0.6", + "Prusa/Prusa Generic PETG @MK4S 0.8", + "Prusa/Prusa Generic PETG @MK4S HF0.4", + "Prusa/Prusa Generic PETG @MK4S HF0.5", + "Prusa/Prusa Generic PETG @MK4S HF0.6", + "Prusa/Prusa Generic PETG @MK4S HF0.8", + "Prusa/Prusa Generic PETG HF @MK3.5", + "Prusa/Prusa Generic PETG HF @MK3.5 0.6", + "Prusa/Prusa Generic PETG HF @MK3.5 0.8", + "Prusa/Prusa Generic PLA @CORE One", + "Prusa/Prusa Generic PLA @CORE One 0.6", + "Prusa/Prusa Generic PLA @CORE One 0.8", + "Prusa/Prusa Generic PLA @CORE One HF 0.4", + "Prusa/Prusa Generic PLA @CORE One HF 0.5", + "Prusa/Prusa Generic PLA @CORE One HF 0.6", + "Prusa/Prusa Generic PLA @CORE One HF 0.8", + "Prusa/Prusa Generic PLA @MK3.5", + "Prusa/Prusa Generic PLA @MK3.5 0.25", + "Prusa/Prusa Generic PLA @MK3.5 0.6", + "Prusa/Prusa Generic PLA @MK3.5 0.8", + "Prusa/Prusa Generic PLA @MK4S", + "Prusa/Prusa Generic PLA @MK4S 0.6", + "Prusa/Prusa Generic PLA @MK4S 0.8", + "Prusa/Prusa Generic PLA @MK4S HF0.4", + "Prusa/Prusa Generic PLA @MK4S HF0.5", + "Prusa/Prusa Generic PLA @MK4S HF0.6", + "Prusa/Prusa Generic PLA @MK4S HF0.8", + "Prusa/Prusa Generic PLA HF @MK3.5", + "Prusa/Prusa Generic PLA HF @MK3.5 0.6", + "Prusa/Prusa Generic PLA HF @MK3.5 0.8", + "Prusa/Prusa Generic PLA Silk @CORE One", + "Prusa/Prusa Generic PLA Silk @CORE One 0.6", + "Prusa/Prusa Generic PLA Silk @CORE One 0.8", + "Prusa/Prusa Generic PLA Silk @MK4S", + "Prusa/Prusa Generic PLA Silk @MK4S 0.6", + "Prusa/Prusa Generic PLA Silk @MK4S 0.8", + "Prusa/Prusa Generic PLA-CF @MK3.5", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.25", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.6", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PVA @MK3.5", + "Prusa/Prusa Generic PVA @MK3.5 0.25", + "Prusa/Prusa Generic PVA @MK3.5 0.6", + "Prusa/Prusa Generic PVA @MK3.5 0.8", + "Prusa/Prusa Generic PVA HF @MK3.5", + "Prusa/Prusa Generic PVA HF @MK3.5 0.6", + "Prusa/Prusa Generic PVA HF @MK3.5 0.8", + "Prusa/Prusa Generic TPU @CORE One", + "Prusa/Prusa Generic TPU @CORE One 0.6", + "Prusa/Prusa Generic TPU @CORE One 0.8", + "Prusa/Prusa Generic TPU @MK3.5", + "Prusa/Prusa Generic TPU @MK4S", + "Prusa/Prusa Generic TPU @MK4S 0.6", + "Prusa/Prusa Generic TPU @MK4S 0.8", + "Prusa/Prusa Generic TPU HF @MK3.5", + "Prusa/Prusament ASA @CORE One", + "Prusa/Prusament ASA @CORE One 0.6", + "Prusa/Prusament ASA @CORE One 0.8", + "Prusa/Prusament ASA @CORE One HF 0.4", + "Prusa/Prusament ASA @CORE One HF 0.5", + "Prusa/Prusament ASA @CORE One HF 0.6", + "Prusa/Prusament ASA @CORE One HF 0.8", + "Prusa/Prusament PA-CF @CORE One", + "Prusa/Prusament PA-CF @CORE One 0.6", + "Prusa/Prusament PA-CF @CORE One 0.8", + "Prusa/Prusament PC Blend @CORE One", + "Prusa/Prusament PC Blend @CORE One 0.6", + "Prusa/Prusament PC Blend @CORE One 0.8", + "Prusa/Prusament PC Blend @CORE One HF 0.4", + "Prusa/Prusament PC Blend @CORE One HF 0.5", + "Prusa/Prusament PC Blend @CORE One HF 0.6", + "Prusa/Prusament PC Blend @CORE One HF 0.8", + "Prusa/Prusament PC-CF @CORE One", + "Prusa/Prusament PC-CF @CORE One 0.6", + "Prusa/Prusament PC-CF @CORE One 0.8", + "Prusa/Prusament PETG @CORE One", + "Prusa/Prusament PETG @CORE One 0.6", + "Prusa/Prusament PETG @CORE One 0.8", + "Prusa/Prusament PETG @CORE One HF 0.4", + "Prusa/Prusament PETG @CORE One HF 0.5", + "Prusa/Prusament PETG @CORE One HF 0.6", + "Prusa/Prusament PETG @CORE One HF 0.8", + "Prusa/Prusament PLA @CORE One", + "Prusa/Prusament PLA @CORE One 0.6", + "Prusa/Prusament PLA @CORE One 0.8", + "Prusa/Prusament PLA @CORE One HF 0.4", + "Prusa/Prusament PLA @CORE One HF 0.5", + "Prusa/Prusament PLA @CORE One HF 0.6", + "Prusa/Prusament PLA @CORE One HF 0.8", + "Prusa/Prusament PVB @CORE One", + "Prusa/Prusament PVB @CORE One 0.6", + "Prusa/Prusament PVB @CORE One 0.8", + "Prusa/Prusament rPLA @CORE One", + "Prusa/Prusament rPLA @CORE One 0.6", + "Prusa/Prusament rPLA @CORE One 0.8", + "Qidi/Bambu ABS", + "Qidi/Bambu ABS @0.2 nozzle", + "Qidi/Bambu ABS @0.6 nozzle", + "Qidi/Bambu ABS @0.8 nozzle", + "Qidi/Bambu ABS @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Bambu ABS @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Bambu ABS @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Bambu ABS @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Bambu ABS @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Bambu ABS @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Bambu ABS @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Bambu ABS @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Bambu PETG", + "Qidi/Bambu PETG @0.2 nozzle", + "Qidi/Bambu PETG @0.6 nozzle", + "Qidi/Bambu PETG @0.8 nozzle", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Bambu PETG @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Bambu PETG @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Bambu PLA", + "Qidi/Bambu PLA @0.2 nozzle", + "Qidi/Bambu PLA @0.6 nozzle", + "Qidi/Bambu PLA @0.8 nozzle", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Bambu PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Bambu PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/HATCHBOX ABS @Qidi", + "Qidi/HATCHBOX ABS @Qidi 0.2 nozzle", + "Qidi/HATCHBOX ABS @Qidi 0.6 nozzle", + "Qidi/HATCHBOX ABS @Qidi 0.8 nozzle", + "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle", + "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle", + "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle", + "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle", + "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle", + "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle", + "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle", + "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle", + "Qidi/HATCHBOX PETG @0.2 nozzle", + "Qidi/HATCHBOX PETG @0.6 nozzle", + "Qidi/HATCHBOX PETG @0.8 nozzle", + "Qidi/HATCHBOX PETG @Qidi", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle", + "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle", + "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle", + "Qidi/HATCHBOX PLA @0.2 nozzle", + "Qidi/HATCHBOX PLA @0.6 nozzle", + "Qidi/HATCHBOX PLA @0.8 nozzle", + "Qidi/HATCHBOX PLA @Qidi", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Overture ABS @Qidi", + "Qidi/Overture ABS @Qidi 0.2 nozzle", + "Qidi/Overture ABS @Qidi 0.6 nozzle", + "Qidi/Overture ABS @Qidi 0.8 nozzle", + "Qidi/Overture ABS @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Overture ABS @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Overture ABS @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Overture ABS @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Overture ABS @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Overture ABS @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Overture ABS @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Overture ABS @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Overture PLA @Qidi", + "Qidi/Overture PLA @Qidi 0.2 nozzle", + "Qidi/Overture PLA @Qidi 0.6 nozzle", + "Qidi/Overture PLA @Qidi 0.8 nozzle", + "Qidi/Overture PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Overture PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Overture PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Overture PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Overture PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/PolyLite ABS @Qidi", + "Qidi/PolyLite ABS @Qidi 0.2 nozzle", + "Qidi/PolyLite ABS @Qidi 0.6 nozzle", + "Qidi/PolyLite ABS @Qidi 0.8 nozzle", + "Qidi/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle", + "Qidi/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle", + "Qidi/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle", + "Qidi/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle", + "Qidi/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle", + "Qidi/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle", + "Qidi/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle", + "Qidi/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle", + "Qidi/PolyLite PLA @Qidi", + "Qidi/PolyLite PLA @Qidi 0.2 nozzle", + "Qidi/PolyLite PLA @Qidi 0.6 nozzle", + "Qidi/PolyLite PLA @Qidi 0.8 nozzle", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ABS Odorless", + "Qidi/QIDI ABS Odorless @0.2 nozzle", + "Qidi/QIDI ABS Odorless @0.6 nozzle", + "Qidi/QIDI ABS Odorless @0.8 nozzle", + "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ABS Rapido", + "Qidi/QIDI ABS Rapido 0.2 nozzle", + "Qidi/QIDI ABS Rapido 0.6 nozzle", + "Qidi/QIDI ABS Rapido 0.8 nozzle", + "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ABS Rapido Metal", + "Qidi/QIDI ABS Rapido Metal @0.2 nozzle", + "Qidi/QIDI ABS Rapido Metal @0.6 nozzle", + "Qidi/QIDI ABS Rapido Metal @0.8 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ABS-GF", + "Qidi/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ABS-GF10", + "Qidi/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ABS-GF25", + "Qidi/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ASA", + "Qidi/QIDI ASA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI ASA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ASA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ASA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ASA @Qidi X-Max 3 0.2 nozzle", + "Qidi/QIDI ASA @Qidi X-Plus 3 0.2 nozzle", + "Qidi/QIDI ASA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI ASA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI ASA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI ASA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ASA @Qidi X-Smart 3 0.2 nozzle", + "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle", + "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle", + "Qidi/QIDI PA-Ultra", + "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PA12-CF", + "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PAHT-CF", + "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PAHT-GF", + "Qidi/QIDI PAHT-GF @0.6 nozzle", + "Qidi/QIDI PAHT-GF @0.8 nozzle", + "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PEBA 95A", + "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PET-CF", + "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PET-GF", + "Qidi/QIDI PET-GF @0.6 nozzle", + "Qidi/QIDI PET-GF @0.8 nozzle", + "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Basic", + "Qidi/QIDI PETG Basic @0.2 nozzle", + "Qidi/QIDI PETG Basic @0.6 nozzle", + "Qidi/QIDI PETG Basic @0.8 nozzle", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Rapido", + "Qidi/QIDI PETG Rapido @0.2 nozzle", + "Qidi/QIDI PETG Rapido @0.6 nozzle", + "Qidi/QIDI PETG Rapido @0.8 nozzle", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Tough", + "Qidi/QIDI PETG Tough 0.2 nozzle", + "Qidi/QIDI PETG Tough 0.6 nozzle", + "Qidi/QIDI PETG Tough 0.8 nozzle", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG Translucent", + "Qidi/QIDI PETG Translucent @0.2 nozzle", + "Qidi/QIDI PETG Translucent @0.6 nozzle", + "Qidi/QIDI PETG Translucent @0.8 nozzle", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG-CF", + "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PETG-GF", + "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Basic", + "Qidi/QIDI PLA Basic @0.2 nozzle", + "Qidi/QIDI PLA Basic @0.6 nozzle", + "Qidi/QIDI PLA Basic @0.8 nozzle", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Matte Basic", + "Qidi/QIDI PLA Matte Basic @0.2 nozzle", + "Qidi/QIDI PLA Matte Basic @0.6 nozzle", + "Qidi/QIDI PLA Matte Basic @0.8 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido", + "Qidi/QIDI PLA Rapido 0.2 nozzle", + "Qidi/QIDI PLA Rapido 0.8 nozzle", + "Qidi/QIDI PLA Rapido @0.6 nozzle", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido Matte", + "Qidi/QIDI PLA Rapido Matte @0.2 nozzle", + "Qidi/QIDI PLA Rapido Matte @0.6 nozzle", + "Qidi/QIDI PLA Rapido Matte @0.8 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido Metal", + "Qidi/QIDI PLA Rapido Metal @0.2 nozzle", + "Qidi/QIDI PLA Rapido Metal @0.6 nozzle", + "Qidi/QIDI PLA Rapido Metal @0.8 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PLA Rapido Silk", + "Qidi/QIDI PLA Rapido Silk @0.6 nozzle", + "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA-CF @0.6 nozzle", + "Qidi/QIDI PLA-CF @0.8 nozzle", + "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PPS-CF", + "Qidi/QIDI PPS-CF @0.6 nozzle", + "Qidi/QIDI PPS-CF @0.8 nozzle", + "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI PPS-GF", + "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI Support For PAHT", + "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI Support For PET/PA", + "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI TPU-Aero", + "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI TPU-GF", + "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI UltraPA-CF25", + "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI WOOD Rapido", + "Qidi/QIDI WOOD Rapido @0.6 nozzle", + "Qidi/QIDI WOOD Rapido @0.8 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi ASA-Aero", + "Qidi/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic ABS", + "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle", + "Qidi/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Qidi Generic ASA", + "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle", + "Qidi/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Qidi Generic PA", + "Qidi/Qidi Generic PA-CF", + "Qidi/Qidi Generic PC", + "Qidi/Qidi Generic PC @0.2 nozzle", + "Qidi/Qidi Generic PC @0.8 nozzle", + "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic PETG", + "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Qidi Generic PETG-CF", + "Qidi/Qidi Generic PLA", + "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle", + "Qidi/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic PLA Silk", + "Qidi/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA+", + "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", + "Qidi/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", + "Qidi/Qidi Generic PLA-CF", + "Qidi/Qidi Generic PVA", + "Qidi/Qidi Generic TPU", + "Qidi/Qidi Generic TPU 95A", + "Qidi/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi PC-ABS-FR", + "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Qidi PLA-CF", + "Qidi/Qidi TPU 95A-HF", + "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Tinmorry PETG-ECO", + "RH3D/Generic ABS @E3NG v1.2S", + "RH3D/Generic ASA @E3NG v1.2S", + "RH3D/Generic PCCF @E3NG v1.2S", + "RH3D/Generic PETG @E3NG v1.2S", + "RH3D/Generic PLA @E3NG v1.2S", + "RH3D/Generic TPU @E3NG v1.2S", + "Ratrig/RatRig BigNozzle ABS", + "Ratrig/RatRig BigNozzle ASA", + "Ratrig/RatRig BigNozzle PCTG", + "Ratrig/RatRig BigNozzle PETG", + "Ratrig/RatRig BigNozzle PLA", + "Ratrig/RatRig BigNozzle TPU", + "Ratrig/RatRig Generic ABS", + "Ratrig/RatRig Generic ASA", + "Ratrig/RatRig Generic PA", + "Ratrig/RatRig Generic PA-CF", + "Ratrig/RatRig Generic PC", + "Ratrig/RatRig Generic PCTG", + "Ratrig/RatRig Generic PETG", + "Ratrig/RatRig Generic PLA", + "Ratrig/RatRig Generic PLA-CF", + "Ratrig/RatRig Generic PVA", + "Ratrig/RatRig Generic TPU", + "Ratrig/RatRig PunkFil ABS", + "Ratrig/RatRig PunkFil PETG", + "Ratrig/RatRig PunkFil PETG CF", + "SecKit/SecKit Generic ABS", + "SecKit/SecKit Generic ASA", + "SecKit/SecKit Generic PA", + "SecKit/SecKit Generic PA-CF", + "SecKit/SecKit Generic PC", + "SecKit/SecKit Generic PETG", + "SecKit/SecKit Generic PLA", + "SecKit/SecKit Generic PLA-CF", + "SecKit/SecKit Generic PVA", + "SecKit/SecKit Generic TPU", + "SeeMeCNC/SeeMeCNC ABS", + "SeeMeCNC/SeeMeCNC PA-CF", + "SeeMeCNC/SeeMeCNC PETG", + "SeeMeCNC/SeeMeCNC PETG-CF", + "SeeMeCNC/SeeMeCNC PLA", + "SeeMeCNC/SeeMeCNC TPU", + "Sovol/Generic ABS @Sovol SV08 MAX", + "Sovol/Generic PC @Sovol SV08 MAX", + "Sovol/Generic PETG @Sovol SV08 MAX", + "Sovol/Generic PLA @Sovol SV08 MAX", + "Sovol/Generic PLA Silk @Sovol SV08 MAX", + "Sovol/Generic TPU @Sovol SV08 MAX", + "Sovol/Polymaker PETG @Sovol SV08 MAX", + "Sovol/SUNLU PETG @Sovol SV08 MAX", + "Sovol/Sovol SV06 ACE ABS", + "Sovol/Sovol SV06 ACE PETG", + "Sovol/Sovol SV06 ACE PLA", + "Sovol/Sovol SV06 ACE TPU", + "Sovol/Sovol SV06 Plus ACE ABS", + "Sovol/Sovol SV06 Plus ACE PETG", + "Sovol/Sovol SV06 Plus ACE PLA", + "Sovol/Sovol SV06 Plus ACE TPU", + "Sovol/Sovol SV07 PLA", + "Sovol/Sovol SV08 ABS", + "Sovol/Sovol SV08 PETG", + "Sovol/Sovol SV08 PLA", + "Sovol/Sovol SV08 PLA @SV08 0.2 nozzle", + "Sovol/Sovol SV08 TPU", + "Sovol/Sovol Zero ABS", + "Sovol/Sovol Zero PC", + "Sovol/Sovol Zero PETG", + "Sovol/Sovol Zero PETG HS Nozzle", + "Sovol/Sovol Zero PLA Basic", + "Sovol/Sovol Zero PLA Basic HS Nozzle", + "Sovol/Sovol Zero PLA Silk", + "Sovol/Sovol Zero PLA Silk HS Nozzle", + "Sovol/Sovol Zero TPU", + "Tiertime/Tiertime ABS", + "Tiertime/Tiertime ABS@300HS", + "Tiertime/Tiertime ASA", + "Tiertime/Tiertime ASA@300HS", + "Tiertime/Tiertime Generic ABS", + "Tiertime/Tiertime Generic ABS@300HS", + "Tiertime/Tiertime Generic ASA", + "Tiertime/Tiertime Generic ASA@300HS", + "Tiertime/Tiertime Generic BVOH", + "Tiertime/Tiertime Generic BVOH@300HS", + "Tiertime/Tiertime Generic EVA", + "Tiertime/Tiertime Generic EVA@300HS", + "Tiertime/Tiertime Generic HIPS", + "Tiertime/Tiertime Generic HIPS@300HS", + "Tiertime/Tiertime Generic PA", + "Tiertime/Tiertime Generic PA-CF", + "Tiertime/Tiertime Generic PA-CF@300HS", + "Tiertime/Tiertime Generic PA@300HS", + "Tiertime/Tiertime Generic PC", + "Tiertime/Tiertime Generic PC@300HS", + "Tiertime/Tiertime Generic PCTG", + "Tiertime/Tiertime Generic PCTG@300HS", + "Tiertime/Tiertime Generic PE", + "Tiertime/Tiertime Generic PE-CF", + "Tiertime/Tiertime Generic PE-CF@300HS", + "Tiertime/Tiertime Generic PE@300HS", + "Tiertime/Tiertime Generic PETG", + "Tiertime/Tiertime Generic PETG-CF", + "Tiertime/Tiertime Generic PETG-CF@300HS", + "Tiertime/Tiertime Generic PETG@300HS", + "Tiertime/Tiertime Generic PHA", + "Tiertime/Tiertime Generic PHA@300HS", + "Tiertime/Tiertime Generic PLA", + "Tiertime/Tiertime Generic PLA High Speed", + "Tiertime/Tiertime Generic PLA High Speed@300HS", + "Tiertime/Tiertime Generic PLA Silk", + "Tiertime/Tiertime Generic PLA Silk@300HS", + "Tiertime/Tiertime Generic PLA-CF", + "Tiertime/Tiertime Generic PLA-CF@300HS", + "Tiertime/Tiertime Generic PLA@300HS", + "Tiertime/Tiertime Generic PP", + "Tiertime/Tiertime Generic PP-CF", + "Tiertime/Tiertime Generic PP-CF@300HS", + "Tiertime/Tiertime Generic PP-GF", + "Tiertime/Tiertime Generic PP-GF@300HS", + "Tiertime/Tiertime Generic PP@300HS", + "Tiertime/Tiertime Generic PPA-CF", + "Tiertime/Tiertime Generic PPA-CF@300HS", + "Tiertime/Tiertime Generic PPA-GF", + "Tiertime/Tiertime Generic PPA-GF@300HS", + "Tiertime/Tiertime Generic PPS", + "Tiertime/Tiertime Generic PPS-CF", + "Tiertime/Tiertime Generic PPS-CF@300HS", + "Tiertime/Tiertime Generic PPS@300HS", + "Tiertime/Tiertime Generic PVA", + "Tiertime/Tiertime Generic PVA@300HS", + "Tiertime/Tiertime Generic SBS", + "Tiertime/Tiertime Generic SBS@300HS", + "Tiertime/Tiertime Generic TPU", + "Tiertime/Tiertime Generic TPU@300HS", + "Tiertime/Tiertime PA6-CF", + "Tiertime/Tiertime PA6-CF@300HS", + "Tiertime/Tiertime PC", + "Tiertime/Tiertime PC@300HS", + "Tiertime/Tiertime PET-CF", + "Tiertime/Tiertime PET-CF@300HS", + "Tiertime/Tiertime PETG", + "Tiertime/Tiertime PETG@300HS", + "Tiertime/Tiertime PLA", + "Tiertime/Tiertime PLA-CF", + "Tiertime/Tiertime PLA-CF@300HS", + "Tiertime/Tiertime PLA@300HS", + "Tiertime/Tiertime PVA", + "Tiertime/Tiertime PVA@300HS", + "Tiertime/Tiertime TPU 95A", + "Tiertime/Tiertime TPU 95A@300HS", + "TwoTrees/TwoTrees Generic 95A TPU @SK1", + "TwoTrees/TwoTrees Generic HS PLA @SK1", + "Volumic/Désactivé", + "Volumic/PA6 CF20 (Performance)", + "Volumic/PETG ESD (Performance)", + "Volumic/PPS Carbone (Performance)", + "Volumic/Volumic ABS Ultra", + "Volumic/Volumic ABS Ultra (Performance)", + "Volumic/Volumic ASA Ultra", + "Volumic/Volumic ASA Ultra (Performance)", + "Volumic/Volumic FLEX93 Ultra", + "Volumic/Volumic FLEX93 Ultra (Performance)", + "Volumic/Volumic NYLON Ultra", + "Volumic/Volumic NYLON Ultra (Performance)", + "Volumic/Volumic PC", + "Volumic/Volumic PC (Performance)", + "Volumic/Volumic PCTG Ultra (Performance)", + "Volumic/Volumic PETG Ultra", + "Volumic/Volumic PETG Ultra (Performance)", + "Volumic/Volumic PETG Ultra carbone", + "Volumic/Volumic PETG Ultra carbone (Performance)", + "Volumic/Volumic PLA Ultra", + "Volumic/Volumic PLA Ultra (Performance)", + "Volumic/Volumic PP Ultra", + "Volumic/Volumic PP Ultra (Performance)", + "Volumic/Volumic PVA", + "Volumic/Volumic PVA-BVOH (Performance)", + "Volumic/Volumic UNIVERSAL Ultra", + "Volumic/Volumic UNIVERSAL Ultra (Performance)", + "Vzbot/Vzbot Generic ABS", + "Vzbot/Vzbot Generic ASA", + "Vzbot/Vzbot Generic PA", + "Vzbot/Vzbot Generic PA-CF", + "Vzbot/Vzbot Generic PC", + "Vzbot/Vzbot Generic PETG", + "Vzbot/Vzbot Generic PLA", + "Vzbot/Vzbot Generic PLA-CF", + "Vzbot/Vzbot Generic PVA", + "Vzbot/Vzbot Generic TPU", + "Wanhao France/YUMI PETG", + "Wanhao France/YUMI PLA Bowden", + "Wanhao France/YUMI PLA Direct Drive", + "WonderMaker/WonderMaker ABS", + "WonderMaker/WonderMaker ASA", + "WonderMaker/WonderMaker PET-CF", + "WonderMaker/WonderMaker PETG Basic", + "WonderMaker/WonderMaker PLA Basic", + "WonderMaker/WonderMaker PLA Marble", + "WonderMaker/WonderMaker PLA Matte", + "WonderMaker/WonderMaker PLA Metal", + "WonderMaker/WonderMaker PLA Silk", + "WonderMaker/WonderMaker PLA Wood", + "WonderMaker/WonderMaker PVA", + "WonderMaker/WonderMaker TPU 95A", + "Z-Bolt/Generic ABS @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic ABS @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic ABS @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic ABS HT @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic ABS HT @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic ABS HT @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic PA @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic PA @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic PA @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic PETG @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic PETG @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic PETG @Z-Bolt 0.8 nozzle", + "Z-Bolt/Generic PLA @Z-Bolt 0.4 nozzle", + "Z-Bolt/Generic PLA @Z-Bolt 0.6 nozzle", + "Z-Bolt/Generic PLA @Z-Bolt 0.8 nozzle", + "iQ/Fiberthree PACF Pro P1 @iQ TiQ2 0.4 Nozzle", + "iQ/Fiberthree PACF Pro P2 @iQ TiQ2 0.4 Nozzle", + "iQ/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle", + "iQ/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle", + "iQ/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle", + "iQ/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle", + "re3D/re3D Greengate rPETG", + "re3D/re3D Greengate rPETG @0.8 nozzle", + "re3D/re3D Greengate rPETG @1.75 nozzle", + "re3D/re3D PC", + "re3D/re3D PC @0.4 nozzle", + "re3D/re3D PC @0.8 nozzle", + "re3D/re3D PETG", + "re3D/re3D PETG @0.4 nozzle", + "re3D/re3D PETG @0.8 nozzle", + "re3D/re3D PLA", + "re3D/re3D PLA @0.4 nozzle", + "re3D/re3D PLA @0.8 nozzle", + "re3D/re3D rPP", + "re3D/re3D rPP @0.8 nozzle", + "re3D/re3D rPP @1.75 nozzle" + ] +} diff --git a/scripts/orca_extra_profile_check.py b/scripts/orca_extra_profile_check.py index cdfc8544a4..746dbf25ec 100644 --- a/scripts/orca_extra_profile_check.py +++ b/scripts/orca_extra_profile_check.py @@ -4,6 +4,7 @@ import argparse from pathlib import Path from assign_vendor_setting_ids import generate_preset_setting_id +from assign_filament_ids import check_filament_ids OBSOLETE_KEYS = { "acceleration", "scale", "rotate", "duplicate", "duplicate_grid", @@ -288,6 +289,12 @@ def check_name_consistency(profiles_dir, vendor_name): def check_filament_id(vendor, vendor_folder): """ Make sure filament_id is not longer than 8 characters, otherwise AMS won't work properly + + NOTE: superseded by check_filament_ids (assign_filament_ids.py) for non-BBL/OFL + vendors, which validates format/uniqueness/structure tree-wide against the + grandfather snapshot. This length check stays scoped to BBL/OFL because other + vendors ship grandfathered >8-char ids (e.g. Prusa's 36-char name-ids), so it + cannot simply go tree-wide. """ if vendor not in ('BBL', 'OrcaFilamentLibrary'): return 0 @@ -606,6 +613,11 @@ def main(): # Runs once over the whole tree regardless of the --vendor filter. errors_found += check_setting_id_uniqueness(profiles_dir) + # Global filament_id check (see scripts/assign_filament_ids.py): effective ids + # are resolved loader-faithfully and validated against the sanctioned snapshot + # (scripts/filament_id_snapshot.json). Runs once over the whole tree. + errors_found += check_filament_ids(profiles_dir) + # ✨ Output finale in stile "compilatore" print("\n==================== SUMMARY ====================") print_info(f"Checked vendors : {checked_vendor_count}") diff --git a/scripts/retired_filament_ids.json b/scripts/retired_filament_ids.json new file mode 100644 index 0000000000..d4c5f3faf5 --- /dev/null +++ b/scripts/retired_filament_ids.json @@ -0,0 +1,3 @@ +{ + "retired": {} +} diff --git a/scripts/tests/__init__.py b/scripts/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py new file mode 100644 index 0000000000..14d7d439b7 --- /dev/null +++ b/scripts/tests/test_filament_id.py @@ -0,0 +1,669 @@ +#!/usr/bin/env python3 +"""Tests for scripts/assign_filament_ids.py (stdlib unittest, no external deps). + +Run from the repo root: python -m unittest discover -s scripts/tests -v +""" + +import contextlib +import io +import json +import os +import shutil +import sys +import tempfile +import unittest +import uuid + +sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) + +import assign_filament_ids as afi # noqa: E402 + +REPO_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")) +REAL_PROFILES = os.path.join(REPO_ROOT, "resources", "profiles") + +OFL = "OrcaFilamentLibrary" + + +def load_json_file(path): + with open(path, encoding="utf-8") as f: + return json.load(f) + + +# --------------------------------------------------------------------------- +# helpers: synthetic profile trees +# --------------------------------------------------------------------------- + +def preset(name, filament_id=None, inherits=None, instantiation=True, + compatible_printers=None): + data = {"type": "filament", "name": name} + if inherits is not None: + data["inherits"] = inherits + if filament_id is not None: + data["filament_id"] = filament_id + data["instantiation"] = "true" if instantiation else "false" + if compatible_printers is not None: + data["compatible_printers"] = compatible_printers + return data + + +class SyntheticTree: + """A throwaway resources/profiles-shaped directory plus ledger paths.""" + + def __init__(self): + self.dir = tempfile.mkdtemp(prefix="filament_id_test_") + self.profiles = os.path.join(self.dir, "profiles") + os.makedirs(self.profiles) + self.snapshot = os.path.join(self.dir, "filament_id_snapshot.json") + self.retired = os.path.join(self.dir, "retired_filament_ids.json") + + def cleanup(self): + shutil.rmtree(self.dir, ignore_errors=True) + + def preset_path(self, vendor, name): + return os.path.join(self.profiles, vendor, "filament", name + ".json") + + def add_vendor(self, vendor, presets): + vendor_dir = os.path.join(self.profiles, vendor, "filament") + os.makedirs(vendor_dir, exist_ok=True) + index = {"name": vendor, "version": "01.00.00.00", "filament_list": []} + for data in presets: + fname = data["name"] + ".json" + with open(os.path.join(vendor_dir, fname), "w", encoding="utf-8") as f: + json.dump(data, f, indent=4, ensure_ascii=False) + index["filament_list"].append( + {"name": data["name"], "sub_path": f"filament/{fname}"}) + with open(os.path.join(self.profiles, vendor + ".json"), "w", + encoding="utf-8") as f: + json.dump(index, f, indent=4, ensure_ascii=False) + + def add_to_index(self, vendor, name): + idx_path = os.path.join(self.profiles, vendor + ".json") + with open(idx_path, encoding="utf-8") as f: + index = json.load(f) + index["filament_list"].append( + {"name": name, "sub_path": f"filament/{name}.json"}) + with open(idx_path, "w", encoding="utf-8") as f: + json.dump(index, f, indent=4, ensure_ascii=False) + + def write_preset(self, vendor, data, register=True): + path = self.preset_path(vendor, data["name"]) + with open(path, "w", encoding="utf-8") as f: + json.dump(data, f, indent=4, ensure_ascii=False) + if register: + self.add_to_index(vendor, data["name"]) + + def remove_preset(self, vendor, name): + os.remove(self.preset_path(vendor, name)) + idx_path = os.path.join(self.profiles, vendor + ".json") + with open(idx_path, encoding="utf-8") as f: + index = json.load(f) + index["filament_list"] = [ + e for e in index["filament_list"] if e["name"] != name] + with open(idx_path, "w", encoding="utf-8") as f: + json.dump(index, f, indent=4, ensure_ascii=False) + + # -- pipeline wrappers --------------------------------------------------- + + def update_snapshot(self, allow_shared_catalog=False): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + rc = afi.update_snapshot(self.profiles, self.snapshot, self.retired, + allow_shared_catalog=allow_shared_catalog) + return rc, buf.getvalue() + + def check(self): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + errors = afi.check_filament_ids(self.profiles, self.snapshot, self.retired) + return errors, buf.getvalue() + + def assign(self): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + changed, errors = afi.assign_missing_ids(self.profiles, self.snapshot, + self.retired) + return changed, errors, buf.getvalue() + + +def make_clean_tree(): + """Baseline tree: OFL base+generic, a vendor family, a clean tuned generic.""" + t = SyntheticTree() + t.add_vendor(OFL, [ + preset("fdm_pla", filament_id="OGFL99", instantiation=False), + preset("Generic PLA @System", inherits="fdm_pla", + compatible_printers=[]), + ]) + t.add_vendor("VendorA", [ + preset("APLA @base", filament_id="AX01", instantiation=False), + preset("APLA @P1", inherits="APLA @base", + compatible_printers=["P1 0.4 nozzle"]), + # Correctly tuned OFL generic: keeps the OFL base name, claims a printer. + preset("Generic PLA @P1", inherits="Generic PLA @System", + compatible_printers=["P1 0.4 nozzle"]), + ]) + rc, _out = t.update_snapshot() + assert rc == 0 + return t + + +class SyntheticTreeCase(unittest.TestCase): + def setUp(self): + self.t = make_clean_tree() + self.addCleanup(self.t.cleanup) + + +# --------------------------------------------------------------------------- +# mint +# --------------------------------------------------------------------------- + +class TestMint(unittest.TestCase): + def test_namespace_literal(self): + # Frozen: derived from the setting_id namespace; baked into the ledger. + self.assertEqual(afi.FILAMENT_ID_NAMESPACE, + uuid.UUID("c4d3ff49-4c32-5534-a3e3-00894157ab97")) + + def test_known_vector(self): + # Hardcoded, independently computed vector: freezes prefix, input string + # layout ("filament_family//") and base62 derivation. + self.assertEqual(afi.generate_filament_id("Qidi", "HATCHBOX PLA"), "OFiJYDPC") + + def test_determinism_and_format(self): + for vendor, family in [("Qidi", "HATCHBOX PLA"), ("Creality", "CR PLA"), + ("OrcaFilamentLibrary", "Generic ABS"), + ("BBL", "拓竹 PLA")]: # unicode family + a = afi.generate_filament_id(vendor, family) + b = afi.generate_filament_id(vendor, family) + self.assertEqual(a, b) + self.assertRegex(a, r"^OF[0-9A-Za-z]{6}$") + self.assertEqual(len(a), 8) + + def test_salt_changes_id(self): + base = afi.generate_filament_id("Qidi", "HATCHBOX PLA") + salted = afi.generate_filament_id("Qidi", "HATCHBOX PLA", salt=1) + self.assertNotEqual(base, salted) + self.assertRegex(salted, r"^OF[0-9A-Za-z]{6}$") + + def test_mint_salt_iteration(self): + v, fam = "Qidi", "HATCHBOX PLA" + taken = {afi.generate_filament_id(v, fam, s) for s in range(2)} + self.assertEqual(afi.mint_filament_id(v, fam, taken), + afi.generate_filament_id(v, fam, salt=2)) + self.assertEqual(afi.mint_filament_id(v, fam, set()), + afi.generate_filament_id(v, fam)) + + +class TestBaseName(unittest.TestCase): + def test_family_derivation(self): + cases = [ + ("X @base", "X"), + ("Afinia PLA@HS", "Afinia PLA"), + ("PolyTerra PLA", "PolyTerra PLA"), + ("HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle", "HATCHBOX PLA"), + ("A @B @C", "A"), # first @ wins + ("Filár PLA 拓竹 @0.4 nozzle", "Filár PLA 拓竹"), + ] + for name, family in cases: + self.assertEqual(afi.base_name(name), family, msg=name) + + +# --------------------------------------------------------------------------- +# resolver (loader-faithful semantics) +# --------------------------------------------------------------------------- + +class TestResolver(unittest.TestCase): + @staticmethod + def rec(name, filament_id=None, inherits=None): + return {"name": name, "filament_id": filament_id, "inherits": inherits} + + def resolve(self, name, vendor_recs, ofl_recs, **kw): + fmap = {r["name"]: r for r in vendor_recs} + omap = {r["name"]: r for r in ofl_recs} + return afi.resolve_filament_id(name, fmap, omap, **kw) + + def test_own_id(self): + fid, src, entry = self.resolve("A", [self.rec("A", "ID1")], []) + self.assertEqual((fid, src, entry), ("ID1", "own", None)) + + def test_inherited_within_vendor(self): + fid, src, entry = self.resolve( + "A", [self.rec("A", inherits="B"), self.rec("B", inherits="C"), + self.rec("C", "ID3")], []) + self.assertEqual((fid, src, entry), ("ID3", "inherited", None)) + + def test_ofl_fallback(self): + # Vendor preset inherits a name that only exists in the OFL map. + fid, src, entry = self.resolve( + "A", [self.rec("A", inherits="Generic PLA @System")], + [self.rec("Generic PLA @System", inherits="fdm_pla"), + self.rec("fdm_pla", "OGFL99")]) + self.assertEqual(fid, "OGFL99") + self.assertEqual(entry, "Generic PLA @System") + + def test_ofl_stays_in_ofl(self): + # Once a chain enters OFL it stays there: a vendor file sharing an + # OFL-internal hop's name must not shadow it. + fid, _src, entry = self.resolve( + "A", + [self.rec("A", inherits="ofl_entry"), self.rec("fdm_pla", "WRONG")], + [self.rec("ofl_entry", inherits="fdm_pla"), self.rec("fdm_pla", "RIGHT")]) + self.assertEqual(fid, "RIGHT") + self.assertEqual(entry, "ofl_entry") + + def test_dead_end_retries_parent_in_ofl(self): + # The vendor chain dead-ends id-less on a parent that also exists in + # OFL: the loader re-consults the OFL map for that direct parent. + fid, _src, entry = self.resolve( + "A", [self.rec("A", inherits="shared"), self.rec("shared")], + [self.rec("shared", "OFLID1")]) + self.assertEqual(fid, "OFLID1") + self.assertEqual(entry, "shared") + + def test_cycle(self): + fid, src, _e = self.resolve( + "A", [self.rec("A", inherits="B"), self.rec("B", inherits="A")], []) + self.assertEqual((fid, src), (None, "cycle")) + + def test_dangling_parent(self): + fid, src, _e = self.resolve("A", [self.rec("A", inherits="nope")], []) + self.assertEqual((fid, src), (None, "dangling")) + + def test_missing_id(self): + fid, src, _e = self.resolve("A", [self.rec("A")], []) + self.assertEqual((fid, src), (None, "missing")) + + def test_skip_own_resolves_inherited(self): + fid, _src, _e = self.resolve( + "A", [self.rec("A", "OWN", inherits="B"), self.rec("B", "PARENT")], [], + skip_own=True) + self.assertEqual(fid, "PARENT") + + +# --------------------------------------------------------------------------- +# reserved namespaces +# --------------------------------------------------------------------------- + +class TestReservedSpaces(unittest.TestCase): + def test_owners(self): + self.assertEqual(afi.reserved_space_owner("GFL99"), (True, "BBL")) + self.assertEqual(afi.reserved_space_owner("QD_X4_PLA"), (True, "Qidi")) + self.assertEqual(afi.reserved_space_owner("P1234abc"), (True, None)) + self.assertEqual(afi.reserved_space_owner("pAbCdEf1"), (True, None)) # case-insensitive + self.assertEqual(afi.reserved_space_owner("null"), (True, None)) + self.assertEqual(afi.reserved_space_owner("OFiJYDPC"), (False, None)) + self.assertEqual(afi.reserved_space_owner("P1234abcd"), (False, None)) # 8 hex chars: not the user space + + +# --------------------------------------------------------------------------- +# checks on synthetic trees +# --------------------------------------------------------------------------- + +class TestChecks(SyntheticTreeCase): + def test_clean_tree_is_silent(self): + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + self.assertNotIn("[ERROR]", out) + + def test_check1_unknown_non_of_id(self): + self.t.write_preset("VendorA", preset("BPLA @base", filament_id="BOGUS_9", + instantiation=False)) + self.t.write_preset("VendorA", preset("BPLA @P1", inherits="BPLA @base", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("neither grandfathered in the snapshot", out) + self.assertIn("BOGUS_9", out) + + def test_check2_new_claim_needs_snapshot_update(self): + self.t.write_preset("VendorA", preset("ANEW @P2", inherits="APLA @base", + compatible_printers=["P2"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn('claim "VendorA/ANEW" is not sanctioned', out) + self.assertIn("--update-snapshot", out) + + def test_check2_vanished_claim_is_stability_error(self): + self.t.remove_preset("VendorA", "APLA @P1") + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("stability", out) + self.assertIn('"VendorA/APLA"', out) + + def test_check3_of_id_must_match_mint(self): + self.t.write_preset("VendorA", preset("BNEW @base", filament_id="OFZZZZZZ", + instantiation=False)) + self.t.write_preset("VendorA", preset("BNEW @P1", inherits="BNEW @base", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("does not match its mint", out) + self.assertIn(afi.generate_filament_id("VendorA", "BNEW"), out) + + def test_check3_salted_mint_is_accepted(self): + salted = afi.generate_filament_id("VendorA", "BNEW", salt=3) + self.t.write_preset("VendorA", preset("BNEW @base", filament_id=salted, + instantiation=False)) + self.t.write_preset("VendorA", preset("BNEW @P1", inherits="BNEW @base", + compatible_printers=["P1"])) + _errors, out = self.t.check() # check 2 still wants a snapshot update + self.assertNotIn("does not match its mint", out) + + def test_check4_retired_id_reuse(self): + afi.write_ledger(self.t.retired, {"retired": {"AX01": ["VendorA/APLA"]}}) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("retired", out) + self.assertIn("AX01", out) + + def test_check5_renamed_tuned_generic(self): + self.t.write_preset("VendorA", preset("Tuned PLA @P1", + inherits="Generic PLA @System", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("rename re-exposes the OFL preset", out) + self.assertIn("Tuned PLA @P1", out) + + def test_check5_empty_compatible_printers(self): + self.t.write_preset("VendorA", preset("Generic PLA @P2", + inherits="Generic PLA @System", + compatible_printers=[])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("cannot shadow the OFL preset", out) + + def test_check5_exception_is_grandfathered(self): + self.t.write_preset("VendorA", preset("Tuned PLA @P1", + inherits="Generic PLA @System", + compatible_printers=["P1"])) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_check6_reserved_namespace_claims(self): + for fid, marker in [("GFX99", "owned by BBL"), + ("QD_X_PLA", "owned by Qidi"), + ("P1a2b3c4", "user-custom"), + ("null", "user-custom")]: + with self.subTest(fid=fid): + name = f"R{fid} @base" + self.t.write_preset("VendorA", preset(name, filament_id=fid, + instantiation=False)) + self.t.write_preset("VendorA", preset(f"R{fid} @P1", inherits=name, + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("reserved id space", out) + self.assertIn(marker, out) + + def test_check7a_instantiated_preset_with_own_key(self): + self.t.write_preset("VendorA", preset("APLA @P1", filament_id="AX01", + inherits="APLA @base", + compatible_printers=["P1 0.4 nozzle"]), + register=False) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("declares its own filament_id key", out) + + def test_check7b_declared_vs_inherited_drift(self): + self.t.write_preset("VendorA", preset("APLA @P1", filament_id="AX02", + inherits="APLA @base", + compatible_printers=["P1 0.4 nozzle"]), + register=False) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn('declares filament_id "AX02" but its inherits chain resolves "AX01"', out) + + def test_check7c_unresolvable_instantiated_filament(self): + self.t.write_preset("VendorA", preset("DNEW @P1", compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("resolves no filament_id", out) + self.assertIn("hard load error", out) + + def test_missing_snapshot_is_an_error(self): + os.remove(self.t.snapshot) + errors, out = self.t.check() + self.assertEqual(errors, 1) + self.assertIn("snapshot not found", out) + + +# --------------------------------------------------------------------------- +# --update-snapshot +# --------------------------------------------------------------------------- + +class TestUpdateSnapshot(SyntheticTreeCase): + def test_idempotent_and_deterministic(self): + with open(self.t.snapshot, "rb") as f: + first = f.read() + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.assertIn("nothing changed", out) + with open(self.t.snapshot, "rb") as f: + self.assertEqual(f.read(), first) + self.assertTrue(first.endswith(b"\n")) + self.assertNotIn(b"\r", first) + snap = json.loads(first.decode("utf-8")) + self.assertEqual(list(snap["ids"]), sorted(snap["ids"])) + self.assertEqual(snap["ids"]["AX01"], ["VendorA/APLA"]) + self.assertEqual(snap["ids"]["OGFL99"], + ["OrcaFilamentLibrary/Generic PLA", "VendorA/Generic PLA"]) + + def test_vanished_id_is_retired(self): + self.t.remove_preset("VendorA", "APLA @base") + self.t.remove_preset("VendorA", "APLA @P1") + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.assertIn("AX01", out) + retired = load_json_file(self.t.retired) + self.assertEqual(retired["retired"], {"AX01": ["VendorA/APLA"]}) + snap = load_json_file(self.t.snapshot) + self.assertNotIn("AX01", snap["ids"]) + # append-only + idempotent: a second run keeps the ledger intact + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.assertIn("nothing changed", out) + retired2 = load_json_file(self.t.retired) + self.assertEqual(retired, retired2) + # ... and a retired id may never be minted again + self.assertNotIn(afi.mint_filament_id("VendorA", "APLA", + set(retired["retired"])), retired["retired"]) + + def test_refuses_new_reserved_namespace_claims(self): + self.t.write_preset("VendorA", preset("CNEW @base", filament_id="GFX99", + instantiation=False)) + self.t.write_preset("VendorA", preset("CNEW @P1", inherits="CNEW @base", + compatible_printers=["P1"])) + with open(self.t.snapshot, "rb") as f: + before = f.read() + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 1) + self.assertIn("refusing to sanction", out) + with open(self.t.snapshot, "rb") as f: + self.assertEqual(f.read(), before) # nothing written on refusal + rc, _out = self.t.update_snapshot(allow_shared_catalog=True) + self.assertEqual(rc, 0) + snap = load_json_file(self.t.snapshot) + self.assertEqual(snap["ids"]["GFX99"], ["VendorA/CNEW"]) + + +# --------------------------------------------------------------------------- +# default run: mint + insert +# --------------------------------------------------------------------------- + +class TestAssign(SyntheticTreeCase): + def test_noop_on_fully_idded_tree(self): + changed, errors, out = self.t.assign() + self.assertEqual((changed, errors), (0, 0)) + self.assertIn("nothing to do (0 files changed)", out) + + def test_mints_into_family_root_and_rootless_member(self): + self.t.write_preset("VendorA", preset("FNEW @base", instantiation=False)) + self.t.write_preset("VendorA", preset("FNEW @P1", inherits="FNEW @base", + compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("FNEW @P2", inherits="FNEW @base", + compatible_printers=["P2"])) + self.t.write_preset("VendorA", preset("GNEW @P1", compatible_printers=["P1"])) + changed, errors, _out = self.t.assign() + self.assertEqual(errors, 0) + self.assertEqual(changed, 2) # one root + one root-less member + root = load_json_file(self.t.preset_path("VendorA", "FNEW @base")) + self.assertEqual(root["filament_id"], + afi.generate_filament_id("VendorA", "FNEW")) + member = load_json_file(self.t.preset_path("VendorA", "GNEW @P1")) + self.assertEqual(member["filament_id"], + afi.generate_filament_id("VendorA", "GNEW")) + # variants themselves never get the key + child = load_json_file(self.t.preset_path("VendorA", "FNEW @P1")) + self.assertNotIn("filament_id", child) + # idempotent: second run is a no-op + changed, errors, out = self.t.assign() + self.assertEqual((changed, errors), (0, 0)) + self.assertIn("nothing to do", out) + + def test_shared_root_between_families_is_refused(self): + self.t.write_preset("VendorA", preset("shared_base", instantiation=False)) + self.t.write_preset("VendorA", preset("HNEW @P1", inherits="shared_base", + compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("INEW @P1", inherits="shared_base", + compatible_printers=["P1"])) + changed, errors, out = self.t.assign() + self.assertEqual(changed, 0) + self.assertGreater(errors, 0) + self.assertIn("shared with famil", out) + + +class TestInsertEditing(unittest.TestCase): + CRLF_TEXT = ( + '{\r\n' + '\t"type": "filament",\r\n' + '\t"name": "JNEW @base",\r\n' + '\t"inherits": "fdm_pla",\r\n' + '\t"from": "system",\r\n' + '\t"instantiation": "false",\r\n' + '\t"filament_type": [\r\n' + '\t\t"PLA"\r\n' + '\t]\r\n' + '}\r\n' + ) + + def test_insert_before_instantiation_preserves_bytes(self): + text, n = afi.insert_filament_id(self.CRLF_TEXT, "OFabc123") + self.assertEqual(n, 1) + json.loads(text) + inserted = '\t"filament_id": "OFabc123",\r\n' + self.assertIn(inserted + '\t"instantiation"', text) + # every original byte is preserved: removing the inserted line restores + # the input exactly (CRLF stays CRLF, tabs stay tabs) + self.assertEqual(text.replace(inserted, "", 1), self.CRLF_TEXT) + + def test_insert_after_name_when_no_instantiation_line(self): + lf_text = '{\n "type": "filament",\n "name": "K",\n "from": "system"\n}\n' + text, n = afi.insert_filament_id(lf_text, "OFabc123") + self.assertEqual(n, 1) + json.loads(text) + self.assertIn('"name": "K",\n "filament_id": "OFabc123",\n', text) + self.assertNotIn("\r", text) + + def test_insert_no_anchor_fails(self): + _text, n = afi.insert_filament_id('{"type": "filament"}', "OFabc123") + self.assertEqual(n, 0) + + def test_write_filament_id_keeps_crlf_on_disk(self): + t = SyntheticTree() + self.addCleanup(t.cleanup) + t.add_vendor("VendorA", []) + path = t.preset_path("VendorA", "JNEW @base") + with open(path, "wb") as f: + f.write(self.CRLF_TEXT.encode("utf-8")) + t.add_to_index("VendorA", "JNEW @base") + afi.write_filament_id(path, "OFabc123") + with open(path, "rb") as f: + raw = f.read() + self.assertEqual(raw.count(b"\n"), raw.count(b"\r\n")) # still CRLF-only + self.assertEqual( + raw.replace(b'\t"filament_id": "OFabc123",\r\n', b"", 1), + self.CRLF_TEXT.encode("utf-8")) + + +# --------------------------------------------------------------------------- +# the real tree +# --------------------------------------------------------------------------- + +@unittest.skipUnless(os.path.isdir(REAL_PROFILES), "resources/profiles not present") +class TestRealTree(unittest.TestCase): + def test_shipped_snapshot_matches_tree(self): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + errors = afi.check_filament_ids(REAL_PROFILES) + self.assertEqual(errors, 0, buf.getvalue()) + + def test_every_instantiated_filament_resolves_an_id(self): + analysis = afi.analyze_tree(REAL_PROFILES) + self.assertEqual(analysis["missing_effective"], []) + self.assertEqual(analysis["read_errors"], []) + + +# --------------------------------------------------------------------------- +# review-fix regressions +# --------------------------------------------------------------------------- + +class TestReviewFixes(SyntheticTreeCase): + def test_update_snapshot_refuses_retired_id_reuse(self): + fid = afi.generate_filament_id("VendorA", "LONER") + self.t.write_preset("VendorA", preset("LONER @base", filament_id=fid, + instantiation=False)) + self.t.write_preset("VendorA", preset("LONER @P1", inherits="LONER @base", + compatible_printers=["P1 0.4 nozzle"])) + rc, _ = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.t.remove_preset("VendorA", "LONER @base") + self.t.remove_preset("VendorA", "LONER @P1") + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 0, out) + self.assertIn(fid, afi.load_retired(self.t.retired)) + # Resurrect the same id: --update-snapshot must refuse, not sanction. + self.t.write_preset("VendorA", preset("LONER @base", filament_id=fid, + instantiation=False)) + self.t.write_preset("VendorA", preset("LONER @P1", inherits="LONER @base", + compatible_printers=["P1 0.4 nozzle"])) + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 1) + self.assertIn("retired", out) + self.assertNotIn(fid, load_json_file(self.t.snapshot)["ids"]) + + def test_check3_skips_of_id_inherited_from_other_vendor(self): + # Post-Phase-1 world: an OFL generic carries its own minted OF id and a + # vendor tunes it correctly (same base name, non-empty printers). The + # new claim must trip only the snapshot gate, never mint conformance. + fid = afi.generate_filament_id(OFL, "Generic PLA Matte") + self.t.write_preset(OFL, preset("Generic PLA Matte @base", filament_id=fid, + instantiation=False)) + self.t.write_preset(OFL, preset("Generic PLA Matte @System", + inherits="Generic PLA Matte @base", + compatible_printers=[])) + rc, _ = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.t.write_preset("VendorA", preset("Generic PLA Matte @P1", + inherits="Generic PLA Matte @System", + compatible_printers=["P1 0.4 nozzle"])) + errors, out = self.t.check() + self.assertNotIn("does not match its mint", out) + self.assertIn("not sanctioned", out) + self.assertEqual(errors, 1, out) + # After sanctioning the claim the tree is fully green again. + rc, _ = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_check7c_prints_expected_mint(self): + self.t.write_preset("VendorA", preset("Orphan PLA @P1", + compatible_printers=["P1 0.4 nozzle"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn(afi.generate_filament_id("VendorA", "Orphan PLA"), out) + + +if __name__ == "__main__": + unittest.main() diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index ee32e8d036..399443a706 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -3109,6 +3109,24 @@ void PresetBundle::update_num_filaments(unsigned int to_del_flament_id) } +// Orca: the AMS lookups below resolve a tray's filament_id to the FIRST compatible base +// preset. When several presets match the same id for the selected printer the pick is +// arbitrary (a profile bug - see the validator's check_duplicate_filament_subtypes), so +// scan past a successful match and warn about the runners-up. Behavior is unchanged. +static void warn_ambiguous_filament_id_match(const PresetCollection &filaments, PresetCollection::ConstIterator match, const std::string &filament_id) +{ + if (match == filaments.end()) + return; + std::string others; + for (auto it = std::next(match); it != filaments.end(); ++it) + if (it->is_compatible && filaments.get_preset_base(*it) == &*it && it->filament_id == filament_id) + others += (others.empty() ? "\"" : ", \"") + it->name + "\""; + if (!others.empty()) + BOOST_LOG_TRIVIAL(warning) << "Ambiguous AMS filament match: filament_id \"" << filament_id + << "\" matches multiple presets compatible with the selected printer; picked \"" << match->name + << "\", also matches " << others; +} + void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info) { combox_info.clear(); @@ -3131,6 +3149,7 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info) } auto iter = std::find_if(filaments.begin(), filaments.end(), [this, &filament_id](auto &f) { return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; }); + warn_ambiguous_filament_id_match(filaments, iter, filament_id); if (iter == filaments.end()) { BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": filament_id %1% not found or system or compatible") % filament_id; auto filament_type = ams.opt_string("filament_type", 0u); @@ -3233,6 +3252,7 @@ unsigned int PresetBundle::sync_ams_list(std::vector> filaments_by_vendor; for (const auto &preset : filaments) { if (!preset.is_system || preset.filament_id.empty() || preset.vendor == nullptr) @@ -5665,20 +5689,29 @@ bool PresetBundle::check_duplicate_filament_subtypes() const filaments_by_vendor[preset.vendor->name].push_back(&preset); } + const std::vector no_filaments; + const auto library_it = filaments_by_vendor.find(ORCA_FILAMENT_LIBRARY); + const std::vector &library_filaments = library_it == filaments_by_vendor.end() ? no_filaments : library_it->second; + bool found_duplicates = false; for (const auto &printer : printers) { if (!printer.is_system || printer.vendor == nullptr) continue; auto vendor_it = filaments_by_vendor.find(printer.vendor->name); - if (vendor_it == filaments_by_vendor.end()) + const std::vector &vendor_filaments = vendor_it == filaments_by_vendor.end() ? no_filaments : vendor_it->second; + if (vendor_filaments.empty() && library_filaments.empty()) continue; const PresetWithVendorProfile active_printer = printers.get_preset_with_vendor_profile(printer); // std::map keeps the reported errors in a deterministic (sorted) order. std::map> by_filament_id; - for (const Preset *fil : vendor_it->second) + for (const Preset *fil : vendor_filaments) if (is_compatible_with_printer(filaments.get_preset_with_vendor_profile(*fil), active_printer)) by_filament_id[fil->filament_id].push_back(fil); + if (&vendor_filaments != &library_filaments) + for (const Preset *fil : library_filaments) + if (is_compatible_with_printer(filaments.get_preset_with_vendor_profile(*fil), active_printer)) + by_filament_id[fil->filament_id].push_back(fil); for (const auto &entry : by_filament_id) { if (entry.second.size() < 2) @@ -5686,9 +5719,15 @@ bool PresetBundle::check_duplicate_filament_subtypes() const found_duplicates = true; // List each conflicting preset with a clickable file:// URI on its own // line, so the profile author can jump straight to the files to fix. + // A preset from another bundle (the Orca Filament Library) is tagged with + // its vendor so the source bundle is obvious. std::string presets; - for (const Preset *p : entry.second) - presets += "\n - " + p->name + "\n " + preset_file_uri(p->file); + for (const Preset *p : entry.second) { + presets += "\n - " + p->name; + if (p->vendor != nullptr && p->vendor->name != printer.vendor->name) + presets += " [" + p->vendor->name + "]"; + presets += "\n " + preset_file_uri(p->file); + } BOOST_LOG_TRIVIAL(error) << "Ambiguous AMS filament match: " << entry.second.size() << " filament presets share filament_id \"" << entry.first From ab60229311b825b67676bd71a5ec50a61f649693 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:05:37 +0800 Subject: [PATCH 03/52] OrcaFilamentLibrary: give every material family its own filament_id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase 1 of the filament_id cleanup (filament_id_plan.md section 5): resolve the 16 library-internal ids that covered several different materials at once and were visible on every printer of every vendor (empty compatible_printers = compatible with all). - 7 existing @base roots get their copy-pasted id replaced with a fresh deterministic mint (Elas PLA/ASA copy-pastes of Bambu-mirror ids, eSUN copy-pastes incl. the OGFL06 eSUN PLA-Marble / Fiberon PETG-ESD polymer mismatch). - 30 rootless families (23 Elegoo product lines riding the material-class E*B00 ids, Generic PETG HF / PETG-CF / PP-CF / PP-GF / PE-CF / PLA Matte riding their parent generic's template id, PolyLite Dual PLA) each get a new config-equivalent @base root carrying the minted id, inheriting the family's previous parent; members re-pointed; index entries inserted before the @System entries (loader's filament_id map is built in file order). - Keepers by precedence stay byte-identical: Bambu-catalog mirrors (OGFA00/OGFB01/OGFG00, PolyLite/Overture/Fiberon lines), the OFL generics (OGFG99/OGFL99/OGFP97/OGFP99), and the Elegoo root-owning families. Verified: config-equivalence gate — flattened effective configs of all 5892 instantiated presets are byte-identical to pre-migration except the prescribed filament_id changes; orca_extra_profile_check.py exit 0; assign_filament_ids.py --check exit 0; validator -l 2 exit 0 (66 vendors); extended validator -f -v OrcaFilamentLibrary exit 0 (16 collision ids resolved) and -f -v BBL exit 0 (all 26 BBL-shared ids are same-material mirrors, alias-shadowed on every overlapping BBL printer — no BBL file touched). Snapshot: +37 minted ids, id_overrides +30 (new roots override their template parents by design). --- resources/profiles/OrcaFilamentLibrary.json | 120 ++++++++++ .../filament/Elas/Elas ASA @base.json | 2 +- .../filament/Elas/Elas PETG Basic @base.json | 2 +- .../filament/Elas/Elas PLA Basic @base.json | 2 +- .../filament/Elas/Elas PLA Pro @base.json | 2 +- .../Elegoo/Elegoo ASA-CF @System.json | 2 +- .../filament/Elegoo/Elegoo ASA-CF @base.json | 8 + .../filament/Elegoo/Elegoo PC-FR @System.json | 2 +- .../filament/Elegoo/Elegoo PC-FR @base.json | 8 + .../Elegoo/Elegoo PET-CF @System.json | 2 +- .../filament/Elegoo/Elegoo PET-CF @base.json | 8 + .../Elegoo/Elegoo PETG HF @System.json | 2 +- .../filament/Elegoo/Elegoo PETG HF @base.json | 8 + .../Elegoo/Elegoo PETG PRO @System.json | 2 +- .../Elegoo/Elegoo PETG PRO @base.json | 8 + .../Elegoo PETG Translucent @System.json | 2 +- .../Elegoo/Elegoo PETG Translucent @base.json | 8 + .../Elegoo/Elegoo PETG-CF @System.json | 2 +- .../filament/Elegoo/Elegoo PETG-CF @base.json | 8 + .../Elegoo/Elegoo PETG-GF @System.json | 2 +- .../filament/Elegoo/Elegoo PETG-GF @base.json | 8 + .../Elegoo/Elegoo PLA Basic @System.json | 2 +- .../Elegoo/Elegoo PLA Basic @base.json | 8 + .../Elegoo/Elegoo PLA Galaxy @System.json | 2 +- .../Elegoo/Elegoo PLA Galaxy @base.json | 8 + .../Elegoo/Elegoo PLA Glow @System.json | 2 +- .../Elegoo/Elegoo PLA Glow @base.json | 8 + .../Elegoo/Elegoo PLA Marble @System.json | 2 +- .../Elegoo/Elegoo PLA Marble @base.json | 8 + .../Elegoo/Elegoo PLA Matte @System.json | 2 +- .../Elegoo/Elegoo PLA Matte @base.json | 8 + .../Elegoo/Elegoo PLA PRO @System.json | 2 +- .../filament/Elegoo/Elegoo PLA PRO @base.json | 8 + .../Elegoo/Elegoo PLA Silk @System.json | 2 +- .../Elegoo/Elegoo PLA Silk @base.json | 8 + .../Elegoo/Elegoo PLA Sparkle @System.json | 2 +- .../Elegoo/Elegoo PLA Sparkle @base.json | 8 + .../Elegoo PLA Translucent2 @System.json | 2 +- .../Elegoo/Elegoo PLA Translucent2 @base.json | 8 + .../Elegoo/Elegoo PLA Wood @System.json | 2 +- .../Elegoo/Elegoo PLA Wood @base.json | 8 + .../filament/Elegoo/Elegoo PLA+ @System.json | 2 +- .../filament/Elegoo/Elegoo PLA+ @base.json | 8 + .../Elegoo/Elegoo PLA-CF @System.json | 2 +- .../filament/Elegoo/Elegoo PLA-CF @base.json | 8 + .../Elegoo/Elegoo Rapid PETG @System.json | 2 +- .../Elegoo/Elegoo Rapid PETG @base.json | 8 + .../Elegoo/Elegoo Rapid PLA+ @System.json | 2 +- .../Elegoo/Elegoo Rapid PLA+ @base.json | 8 + .../Elegoo/Elegoo Rapid TPU 95A @System.json | 2 +- .../Elegoo/Elegoo Rapid TPU 95A @base.json | 8 + .../filament/Generic PE-CF @System.json | 2 +- .../filament/Generic PE-CF @base.json | 8 + .../filament/Generic PETG HF @System.json | 2 +- .../filament/Generic PETG HF @base.json | 8 + .../filament/Generic PETG-CF @System.json | 2 +- .../filament/Generic PETG-CF @base.json | 8 + .../filament/Generic PLA Matte @System.json | 2 +- .../filament/Generic PLA Matte @base.json | 8 + .../filament/Generic PP-CF @System.json | 2 +- .../filament/Generic PP-CF @base.json | 8 + .../filament/Generic PP-GF @System.json | 2 +- .../filament/Generic PP-GF @base.json | 8 + .../Polymaker/PolyLite Dual PLA @System.json | 2 +- .../Polymaker/PolyLite Dual PLA @base.json | 8 + .../filament/eSUN/eSUN PLA-Basic @base.json | 2 +- .../filament/eSUN/eSUN PLA-Marble @base.json | 2 +- .../filament/eSUN/eSUN PLA-Matte @base.json | 2 +- scripts/filament_id_snapshot.json | 214 +++++++++++++----- 69 files changed, 556 insertions(+), 92 deletions(-) create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json create mode 100644 resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index cd9abd8b0d..33c7ade795 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -584,6 +584,10 @@ "name": "Generic PE @System", "sub_path": "filament/Generic PE @System.json" }, + { + "name": "Generic PE-CF @base", + "sub_path": "filament/Generic PE-CF @base.json" + }, { "name": "Generic PE-CF @System", "sub_path": "filament/Generic PE-CF @System.json" @@ -672,10 +676,18 @@ "name": "Generic PETG @System", "sub_path": "filament/Generic PETG @System.json" }, + { + "name": "Generic PETG HF @base", + "sub_path": "filament/Generic PETG HF @base.json" + }, { "name": "Generic PETG HF @System", "sub_path": "filament/Generic PETG HF @System.json" }, + { + "name": "Generic PETG-CF @base", + "sub_path": "filament/Generic PETG-CF @base.json" + }, { "name": "Generic PETG-CF @System", "sub_path": "filament/Generic PETG-CF @System.json" @@ -864,6 +876,10 @@ "name": "Generic PLA High Speed @System", "sub_path": "filament/Generic PLA High Speed @System.json" }, + { + "name": "Generic PLA Matte @base", + "sub_path": "filament/Generic PLA Matte @base.json" + }, { "name": "Generic PLA Matte @System", "sub_path": "filament/Generic PLA Matte @System.json" @@ -1072,10 +1088,18 @@ "name": "Generic PP @System", "sub_path": "filament/Generic PP @System.json" }, + { + "name": "Generic PP-CF @base", + "sub_path": "filament/Generic PP-CF @base.json" + }, { "name": "Generic PP-CF @System", "sub_path": "filament/Generic PP-CF @System.json" }, + { + "name": "Generic PP-GF @base", + "sub_path": "filament/Generic PP-GF @base.json" + }, { "name": "Generic PP-GF @System", "sub_path": "filament/Generic PP-GF @System.json" @@ -1264,6 +1288,10 @@ "name": "Elegoo ASA @System", "sub_path": "filament/Elegoo/Elegoo ASA @System.json" }, + { + "name": "Elegoo ASA-CF @base", + "sub_path": "filament/Elegoo/Elegoo ASA-CF @base.json" + }, { "name": "Elegoo ASA-CF @System", "sub_path": "filament/Elegoo/Elegoo ASA-CF @System.json" @@ -1356,6 +1384,10 @@ "name": "Elegoo PC @System", "sub_path": "filament/Elegoo/Elegoo PC @System.json" }, + { + "name": "Elegoo PC-FR @base", + "sub_path": "filament/Elegoo/Elegoo PC-FR @base.json" + }, { "name": "Elegoo PC-FR @System", "sub_path": "filament/Elegoo/Elegoo PC-FR @System.json" @@ -1412,6 +1444,10 @@ "name": "Elas PETG Basic @System", "sub_path": "filament/Elas/Elas PETG Basic @System.json" }, + { + "name": "Elegoo PET-CF @base", + "sub_path": "filament/Elegoo/Elegoo PET-CF @base.json" + }, { "name": "Elegoo PET-CF @System", "sub_path": "filament/Elegoo/Elegoo PET-CF @System.json" @@ -1420,26 +1456,50 @@ "name": "Elegoo PETG @System", "sub_path": "filament/Elegoo/Elegoo PETG @System.json" }, + { + "name": "Elegoo PETG HF @base", + "sub_path": "filament/Elegoo/Elegoo PETG HF @base.json" + }, { "name": "Elegoo PETG HF @System", "sub_path": "filament/Elegoo/Elegoo PETG HF @System.json" }, + { + "name": "Elegoo PETG PRO @base", + "sub_path": "filament/Elegoo/Elegoo PETG PRO @base.json" + }, { "name": "Elegoo PETG PRO @System", "sub_path": "filament/Elegoo/Elegoo PETG PRO @System.json" }, + { + "name": "Elegoo PETG Translucent @base", + "sub_path": "filament/Elegoo/Elegoo PETG Translucent @base.json" + }, { "name": "Elegoo PETG Translucent @System", "sub_path": "filament/Elegoo/Elegoo PETG Translucent @System.json" }, + { + "name": "Elegoo PETG-CF @base", + "sub_path": "filament/Elegoo/Elegoo PETG-CF @base.json" + }, { "name": "Elegoo PETG-CF @System", "sub_path": "filament/Elegoo/Elegoo PETG-CF @System.json" }, + { + "name": "Elegoo PETG-GF @base", + "sub_path": "filament/Elegoo/Elegoo PETG-GF @base.json" + }, { "name": "Elegoo PETG-GF @System", "sub_path": "filament/Elegoo/Elegoo PETG-GF @System.json" }, + { + "name": "Elegoo Rapid PETG @base", + "sub_path": "filament/Elegoo/Elegoo Rapid PETG @base.json" + }, { "name": "Elegoo Rapid PETG @System", "sub_path": "filament/Elegoo/Elegoo Rapid PETG @System.json" @@ -1592,54 +1652,106 @@ "name": "Elegoo PLA @System", "sub_path": "filament/Elegoo/Elegoo PLA @System.json" }, + { + "name": "Elegoo PLA Basic @base", + "sub_path": "filament/Elegoo/Elegoo PLA Basic @base.json" + }, { "name": "Elegoo PLA Basic @System", "sub_path": "filament/Elegoo/Elegoo PLA Basic @System.json" }, + { + "name": "Elegoo PLA Galaxy @base", + "sub_path": "filament/Elegoo/Elegoo PLA Galaxy @base.json" + }, { "name": "Elegoo PLA Galaxy @System", "sub_path": "filament/Elegoo/Elegoo PLA Galaxy @System.json" }, + { + "name": "Elegoo PLA Glow @base", + "sub_path": "filament/Elegoo/Elegoo PLA Glow @base.json" + }, { "name": "Elegoo PLA Glow @System", "sub_path": "filament/Elegoo/Elegoo PLA Glow @System.json" }, + { + "name": "Elegoo PLA Marble @base", + "sub_path": "filament/Elegoo/Elegoo PLA Marble @base.json" + }, { "name": "Elegoo PLA Marble @System", "sub_path": "filament/Elegoo/Elegoo PLA Marble @System.json" }, + { + "name": "Elegoo PLA Matte @base", + "sub_path": "filament/Elegoo/Elegoo PLA Matte @base.json" + }, { "name": "Elegoo PLA Matte @System", "sub_path": "filament/Elegoo/Elegoo PLA Matte @System.json" }, + { + "name": "Elegoo PLA PRO @base", + "sub_path": "filament/Elegoo/Elegoo PLA PRO @base.json" + }, { "name": "Elegoo PLA PRO @System", "sub_path": "filament/Elegoo/Elegoo PLA PRO @System.json" }, + { + "name": "Elegoo PLA Silk @base", + "sub_path": "filament/Elegoo/Elegoo PLA Silk @base.json" + }, { "name": "Elegoo PLA Silk @System", "sub_path": "filament/Elegoo/Elegoo PLA Silk @System.json" }, + { + "name": "Elegoo PLA Sparkle @base", + "sub_path": "filament/Elegoo/Elegoo PLA Sparkle @base.json" + }, { "name": "Elegoo PLA Sparkle @System", "sub_path": "filament/Elegoo/Elegoo PLA Sparkle @System.json" }, + { + "name": "Elegoo PLA Translucent2 @base", + "sub_path": "filament/Elegoo/Elegoo PLA Translucent2 @base.json" + }, { "name": "Elegoo PLA Translucent2 @System", "sub_path": "filament/Elegoo/Elegoo PLA Translucent2 @System.json" }, + { + "name": "Elegoo PLA Wood @base", + "sub_path": "filament/Elegoo/Elegoo PLA Wood @base.json" + }, { "name": "Elegoo PLA Wood @System", "sub_path": "filament/Elegoo/Elegoo PLA Wood @System.json" }, + { + "name": "Elegoo PLA+ @base", + "sub_path": "filament/Elegoo/Elegoo PLA+ @base.json" + }, { "name": "Elegoo PLA+ @System", "sub_path": "filament/Elegoo/Elegoo PLA+ @System.json" }, + { + "name": "Elegoo PLA-CF @base", + "sub_path": "filament/Elegoo/Elegoo PLA-CF @base.json" + }, { "name": "Elegoo PLA-CF @System", "sub_path": "filament/Elegoo/Elegoo PLA-CF @System.json" }, + { + "name": "Elegoo Rapid PLA+ @base", + "sub_path": "filament/Elegoo/Elegoo Rapid PLA+ @base.json" + }, { "name": "Elegoo Rapid PLA+ @System", "sub_path": "filament/Elegoo/Elegoo Rapid PLA+ @System.json" @@ -1760,6 +1872,10 @@ "name": "Panchroma PLA UV Shift @System", "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @System.json" }, + { + "name": "PolyLite Dual PLA @base", + "sub_path": "filament/Polymaker/PolyLite Dual PLA @base.json" + }, { "name": "PolyLite Dual PLA @System", "sub_path": "filament/Polymaker/PolyLite Dual PLA @System.json" @@ -1904,6 +2020,10 @@ "name": "DREMC TPU 95A @System", "sub_path": "filament/DREMC/DREMC TPU 95A @System.json" }, + { + "name": "Elegoo Rapid TPU 95A @base", + "sub_path": "filament/Elegoo/Elegoo Rapid TPU 95A @base.json" + }, { "name": "Elegoo Rapid TPU 95A @System", "sub_path": "filament/Elegoo/Elegoo Rapid TPU 95A @System.json" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json index d6ca0d695b..961b8aa903 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json @@ -3,7 +3,7 @@ "name": "Elas ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OGFB01", + "filament_id": "OFT3TqB6", "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.", "activate_air_filtration": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json index 478210bb7d..145e0472ae 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json @@ -3,7 +3,7 @@ "name": "Elas PETG Basic @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFG00", + "filament_id": "OFw4OHWE", "instantiation": "false", "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", "complete_print_exhaust_fan_speed": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json index abfa611aa3..64e0f025b8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json @@ -3,7 +3,7 @@ "name": "Elas PLA Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA00", + "filament_id": "OFbgt3u3", "instantiation": "false", "activate_air_filtration": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json index 38313d1d55..faba40142f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json @@ -3,7 +3,7 @@ "name": "Elas PLA Pro @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA00", + "filament_id": "OFrgQ1Ns", "instantiation": "false", "activate_air_filtration": [ "0" 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 13266c87b5..13ef86c2d9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo ASA-CF @System", - "inherits": "Elegoo ASA @base", + "inherits": "Elegoo ASA-CF @base", "from": "system", "setting_id": "XT1aUl4pe9t0Ijwg", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json new file mode 100644 index 0000000000..ff15b78c5d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo ASA-CF @base", + "inherits": "Elegoo ASA @base", + "from": "system", + "filament_id": "OFpwg2Qh", + "instantiation": "false" +} 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 1fecee514c..7d2ab85058 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PC-FR @System", - "inherits": "Elegoo PC @base", + "inherits": "Elegoo PC-FR @base", "from": "system", "setting_id": "JcopkaXZ7YyLjIcw", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json new file mode 100644 index 0000000000..1f6564cbf1 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PC-FR @base", + "inherits": "Elegoo PC @base", + "from": "system", + "filament_id": "OF79FFkO", + "instantiation": "false" +} 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 0c1c4265b7..b7191e482b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PET-CF @System", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PET-CF @base", "from": "system", "setting_id": "oloKoC4Bs8dXatMU", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json new file mode 100644 index 0000000000..9e669f1e14 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PET-CF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFJIImD5", + "instantiation": "false" +} 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 35b941684a..d912550c88 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG HF @System", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG HF @base", "from": "system", "setting_id": "d6gNuzrG00SXvMth", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json new file mode 100644 index 0000000000..2e3e74ef22 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG HF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFzrWlH5", + "instantiation": "false" +} 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 c16448b1e4..aa30920b7c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @System", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "fdfCAYQEoYa9DN6I", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json new file mode 100644 index 0000000000..4b63edb4ed --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG PRO @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OF102WKM", + "instantiation": "false" +} 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 0346a8eef0..edb04a6dce 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @System", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "80Auuv3K7l8IptF3", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json new file mode 100644 index 0000000000..10b46e8f76 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG Translucent @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFenGPBR", + "instantiation": "false" +} 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 81e5b99afc..03de8dad0f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @System", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "bXRJMaXxB3V49x7R", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json new file mode 100644 index 0000000000..20897108cd --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG-CF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFIGHU7W", + "instantiation": "false" +} 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 48cd287ba6..f315756987 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @System", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "9NXaejLGh1VFX8bg", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json new file mode 100644 index 0000000000..1b62b3aeaa --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG-GF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFMQJToc", + "instantiation": "false" +} 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 cdff566915..15d6f46a3f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "qHDFHECwAInvpuk2", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json new file mode 100644 index 0000000000..d361721096 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Basic @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFICPchn", + "instantiation": "false" +} 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 6874695462..6fd7f8f606 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "WXEEksjWsTbRyCPh", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json new file mode 100644 index 0000000000..a36b51384a --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Galaxy @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OF0M6QAQ", + "instantiation": "false" +} 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 1cd70e904b..9c4c2075b8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Glow @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Glow @base", "from": "system", "setting_id": "yFdF2YmEMeCHiPxl", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json new file mode 100644 index 0000000000..b839aca5dc --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Glow @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFutwD6f", + "instantiation": "false" +} 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 825a6c0dd9..755e42e758 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "kq7NS8IhIV4cBI1C", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json new file mode 100644 index 0000000000..7fc24ca532 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Marble @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OF4fgpse", + "instantiation": "false" +} 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 e1361a4b5b..a05c57216e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "UykE255l5V0oS0Ca", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json new file mode 100644 index 0000000000..07c0dcf1ef --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Matte @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFQkWxJy", + "instantiation": "false" +} 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 3526f87a69..fbc18fac42 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "62GiUVVZd8kx21vw", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json new file mode 100644 index 0000000000..368f6b89d9 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA PRO @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFsKqcQW", + "instantiation": "false" +} 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 475354ca02..79ae01da5b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "VkXguNj79KADxuYn", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json new file mode 100644 index 0000000000..a19d767778 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Silk @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFs6lLH7", + "instantiation": "false" +} 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 fc4070bbe7..c7c030ff5a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "VwZIFCojZLQLPrI1", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json new file mode 100644 index 0000000000..cdf18ad328 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Sparkle @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OF8HQmJD", + "instantiation": "false" +} 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 178976527f..28993f13b4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Translucent2 @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Translucent2 @base", "from": "system", "setting_id": "q0koYRlO9X8xLXPM", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json new file mode 100644 index 0000000000..00d0e20932 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Translucent2 @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OF9qvJxV", + "instantiation": "false" +} 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 abae441db5..a428f5605e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "pMgazYJG8tyTpAVE", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json new file mode 100644 index 0000000000..934992440e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Wood @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFQhLoxN", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json index b2bd83416d..2315cd2ac4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "q7NpDtaD9dTq1HIZ", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json new file mode 100644 index 0000000000..23ae2c1ddb --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA+ @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFDNiRTx", + "instantiation": "false" +} 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 4ec26c71ba..9b79f54799 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "cYxM93L2KZBnAuWu", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json new file mode 100644 index 0000000000..3115358207 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA-CF @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFqh1Ngp", + "instantiation": "false" +} 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 92b7cb43ef..7fd3f8d160 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo Rapid PETG @System", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "uUQSVOvP8tAaDqvB", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json new file mode 100644 index 0000000000..afdb0eda7a --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo Rapid PETG @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFVLuVmD", + "instantiation": "false" +} 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 f19e51bcf3..4f3ee82ced 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo Rapid PLA+ @System", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "HZ4nP67iAG7a243e", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json new file mode 100644 index 0000000000..21c1b99c63 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo Rapid PLA+ @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFD5e0sH", + "instantiation": "false" +} 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 2006a6494b..3d15ba541c 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo Rapid TPU 95A @System", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "WXLuO112bsdM37MI", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json new file mode 100644 index 0000000000..299f0cee8d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo Rapid TPU 95A @base", + "inherits": "Elegoo TPU @base", + "from": "system", + "filament_id": "OFmeQjRP", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json index 27ee56eb4b..8013a04973 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PE-CF @System", - "inherits": "fdm_filament_pe", + "inherits": "Generic PE-CF @base", "from": "system", "setting_id": "prroSXONXxaahNkq", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json new file mode 100644 index 0000000000..74aea8b342 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Generic PE-CF @base", + "inherits": "fdm_filament_pe", + "from": "system", + "filament_id": "OFJfx0Cl", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json index e402cdf775..d755bf0aab 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PETG HF @System", - "inherits": "fdm_filament_pet", + "inherits": "Generic PETG HF @base", "from": "system", "setting_id": "wNH8CohYIh9y6ayx", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json new file mode 100644 index 0000000000..f8de64e2a8 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Generic PETG HF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFfB1QKi", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json index 5ee99ffed9..1f4578ee06 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PETG-CF @System", - "inherits": "fdm_filament_pet", + "inherits": "Generic PETG-CF @base", "from": "system", "setting_id": "aRVqy4a3X1UTIKem", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json new file mode 100644 index 0000000000..21b93a089d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFDCk0cz", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json index d3a6d4813c..253a41f2ae 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PLA Matte @System", - "inherits": "fdm_filament_pla", + "inherits": "Generic PLA Matte @base", "from": "system", "setting_id": "RFs9eCKYOMUSmvZf", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json new file mode 100644 index 0000000000..931ec3ea7e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Generic PLA Matte @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFJsqMzx", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json index 65420e9dae..af36744f57 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PP-CF @System", - "inherits": "fdm_filament_pp", + "inherits": "Generic PP-CF @base", "from": "system", "setting_id": "TDHYN3fs5wwakgsM", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json new file mode 100644 index 0000000000..f1898eb1f6 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Generic PP-CF @base", + "inherits": "fdm_filament_pp", + "from": "system", + "filament_id": "OFRS2Ggt", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json index 931ee4b7b3..b4a4a94c9e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PP-GF @System", - "inherits": "fdm_filament_pp", + "inherits": "Generic PP-GF @base", "from": "system", "setting_id": "xfVrCZ7ySzkpdzX0", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json new file mode 100644 index 0000000000..2544bac78a --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Generic PP-GF @base", + "inherits": "fdm_filament_pp", + "from": "system", + "filament_id": "OFMCMXSG", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json index 4d17382a38..ab02a798fc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @System.json @@ -2,7 +2,7 @@ "type": "filament", "name": "PolyLite Dual PLA @System", "renamed_from": "PolyLite Dual PLA", - "inherits": "PolyLite PLA @base", + "inherits": "PolyLite Dual PLA @base", "from": "system", "setting_id": "ShKfsLXZ1EJ4HgKf", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json new file mode 100644 index 0000000000..fc31b9bc35 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "PolyLite Dual PLA @base", + "inherits": "PolyLite PLA @base", + "from": "system", + "filament_id": "OFsNZcid", + "instantiation": "false" +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json index a627a10a4d..cef96aa7fc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA-Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL04", + "filament_id": "OFZhdVnP", "instantiation": "false", "filament_cost": [ "11.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json index 40c314585c..1b6302372c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA-Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL06", + "filament_id": "OFXmQgno", "instantiation": "false", "filament_cost": [ "28.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json index 85c6049935..e4c42a3a5b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA-Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL05", + "filament_id": "OF3GKs2i", "instantiation": "false", "filament_cost": [ "14.99" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 462098d581..9ebc007f87 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -826,10 +826,33 @@ "OrcaFilamentLibrary/Elas PETG Basic @base", "OrcaFilamentLibrary/Elas PLA Basic @base", "OrcaFilamentLibrary/Elas PLA Pro @base", + "OrcaFilamentLibrary/Elegoo ASA-CF @base", "OrcaFilamentLibrary/Elegoo PAHT @base", "OrcaFilamentLibrary/Elegoo PC @base", + "OrcaFilamentLibrary/Elegoo PC-FR @base", + "OrcaFilamentLibrary/Elegoo PET-CF @base", "OrcaFilamentLibrary/Elegoo PETG @base", + "OrcaFilamentLibrary/Elegoo PETG HF @base", + "OrcaFilamentLibrary/Elegoo PETG PRO @base", + "OrcaFilamentLibrary/Elegoo PETG Translucent @base", + "OrcaFilamentLibrary/Elegoo PETG-CF @base", + "OrcaFilamentLibrary/Elegoo PETG-GF @base", "OrcaFilamentLibrary/Elegoo PLA @base", + "OrcaFilamentLibrary/Elegoo PLA Basic @base", + "OrcaFilamentLibrary/Elegoo PLA Galaxy @base", + "OrcaFilamentLibrary/Elegoo PLA Glow @base", + "OrcaFilamentLibrary/Elegoo PLA Marble @base", + "OrcaFilamentLibrary/Elegoo PLA Matte @base", + "OrcaFilamentLibrary/Elegoo PLA PRO @base", + "OrcaFilamentLibrary/Elegoo PLA Silk @base", + "OrcaFilamentLibrary/Elegoo PLA Sparkle @base", + "OrcaFilamentLibrary/Elegoo PLA Translucent2 @base", + "OrcaFilamentLibrary/Elegoo PLA Wood @base", + "OrcaFilamentLibrary/Elegoo PLA+ @base", + "OrcaFilamentLibrary/Elegoo PLA-CF @base", + "OrcaFilamentLibrary/Elegoo Rapid PETG @base", + "OrcaFilamentLibrary/Elegoo Rapid PLA+ @base", + "OrcaFilamentLibrary/Elegoo Rapid TPU 95A @base", "OrcaFilamentLibrary/Eolas Prints PETG @System", "OrcaFilamentLibrary/Eolas Prints PETG Transition @System", "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant @System", @@ -924,8 +947,14 @@ "OrcaFilamentLibrary/FilAr PLA-mate Verde", "OrcaFilamentLibrary/FilAr PLA-mate Violeta", "OrcaFilamentLibrary/Generic PA-CF @System", + "OrcaFilamentLibrary/Generic PE-CF @base", + "OrcaFilamentLibrary/Generic PETG HF @base", + "OrcaFilamentLibrary/Generic PETG-CF @base", "OrcaFilamentLibrary/Generic PLA High Speed @System", + "OrcaFilamentLibrary/Generic PLA Matte @base", "OrcaFilamentLibrary/Generic PLA-CF @System", + "OrcaFilamentLibrary/Generic PP-CF @base", + "OrcaFilamentLibrary/Generic PP-GF @base", "OrcaFilamentLibrary/Generic PPA-GF @System", "OrcaFilamentLibrary/GreenGate3D PETG @base", "OrcaFilamentLibrary/NIT PETG @base", @@ -955,6 +984,7 @@ "OrcaFilamentLibrary/Panchroma PLA Temp Shift @base", "OrcaFilamentLibrary/Panchroma PLA Translucent @base", "OrcaFilamentLibrary/Panchroma PLA UV Shift @base", + "OrcaFilamentLibrary/PolyLite Dual PLA @base", "OrcaFilamentLibrary/PolyLite PETG @base", "OrcaFilamentLibrary/PolyLite PLA @base", "OrcaFilamentLibrary/PolyLite PLA Pro @base", @@ -4561,54 +4591,144 @@ "OrcaFilamentLibrary/Elegoo ABS" ], "OEASAB00": [ - "OrcaFilamentLibrary/Elegoo ASA", - "OrcaFilamentLibrary/Elegoo ASA-CF" + "OrcaFilamentLibrary/Elegoo ASA" ], "OEPAHTB0": [ "OrcaFilamentLibrary/Elegoo PAHT-CF" ], "OEPCB00": [ - "OrcaFilamentLibrary/Elegoo PC", - "OrcaFilamentLibrary/Elegoo PC-FR" + "OrcaFilamentLibrary/Elegoo PC" ], "OEPETGB0": [ - "OrcaFilamentLibrary/Elegoo PET-CF", - "OrcaFilamentLibrary/Elegoo PETG", - "OrcaFilamentLibrary/Elegoo PETG HF", - "OrcaFilamentLibrary/Elegoo PETG PRO", - "OrcaFilamentLibrary/Elegoo PETG Translucent", - "OrcaFilamentLibrary/Elegoo PETG-CF", - "OrcaFilamentLibrary/Elegoo PETG-GF", - "OrcaFilamentLibrary/Elegoo Rapid PETG" + "OrcaFilamentLibrary/Elegoo PETG" ], "OEPLAB00": [ - "OrcaFilamentLibrary/Elegoo PLA", - "OrcaFilamentLibrary/Elegoo PLA Basic", - "OrcaFilamentLibrary/Elegoo PLA Galaxy", - "OrcaFilamentLibrary/Elegoo PLA Glow", - "OrcaFilamentLibrary/Elegoo PLA Marble", - "OrcaFilamentLibrary/Elegoo PLA Matte", - "OrcaFilamentLibrary/Elegoo PLA PRO", - "OrcaFilamentLibrary/Elegoo PLA Silk", - "OrcaFilamentLibrary/Elegoo PLA Sparkle", - "OrcaFilamentLibrary/Elegoo PLA Translucent2", - "OrcaFilamentLibrary/Elegoo PLA Wood", - "OrcaFilamentLibrary/Elegoo PLA+", - "OrcaFilamentLibrary/Elegoo PLA-CF", - "OrcaFilamentLibrary/Elegoo Rapid PLA+" + "OrcaFilamentLibrary/Elegoo PLA" ], "OETPUB00": [ - "OrcaFilamentLibrary/Elegoo Rapid TPU 95A", "OrcaFilamentLibrary/Elegoo TPU 95A" ], + "OF0M6QAQ": [ + "OrcaFilamentLibrary/Elegoo PLA Galaxy" + ], + "OF102WKM": [ + "OrcaFilamentLibrary/Elegoo PETG PRO" + ], + "OF3GKs2i": [ + "OrcaFilamentLibrary/eSUN PLA-Matte" + ], + "OF4fgpse": [ + "OrcaFilamentLibrary/Elegoo PLA Marble" + ], + "OF79FFkO": [ + "OrcaFilamentLibrary/Elegoo PC-FR" + ], + "OF8HQmJD": [ + "OrcaFilamentLibrary/Elegoo PLA Sparkle" + ], + "OF9qvJxV": [ + "OrcaFilamentLibrary/Elegoo PLA Translucent2" + ], + "OFD5e0sH": [ + "OrcaFilamentLibrary/Elegoo Rapid PLA+" + ], + "OFDCk0cz": [ + "Flashforge/Flashforge PET-CF", + "Flashforge/Flashforge PETG-CF", + "Flashforge/FusRock S-Multi", + "OrcaFilamentLibrary/Generic PETG-CF" + ], + "OFDNiRTx": [ + "OrcaFilamentLibrary/Elegoo PLA+" + ], + "OFICPchn": [ + "OrcaFilamentLibrary/Elegoo PLA Basic" + ], + "OFIGHU7W": [ + "OrcaFilamentLibrary/Elegoo PETG-CF" + ], + "OFJIImD5": [ + "OrcaFilamentLibrary/Elegoo PET-CF" + ], + "OFJfx0Cl": [ + "OrcaFilamentLibrary/Generic PE-CF" + ], + "OFJsqMzx": [ + "OrcaFilamentLibrary/Generic PLA Matte" + ], "OFLSBS99": [ "OrcaFilamentLibrary/Generic SBS" ], - "OGFA00": [ - "OrcaFilamentLibrary/Bambu PLA Basic", - "OrcaFilamentLibrary/Elas PLA Basic", + "OFMCMXSG": [ + "OrcaFilamentLibrary/Generic PP-GF" + ], + "OFMQJToc": [ + "OrcaFilamentLibrary/Elegoo PETG-GF" + ], + "OFQhLoxN": [ + "OrcaFilamentLibrary/Elegoo PLA Wood" + ], + "OFQkWxJy": [ + "OrcaFilamentLibrary/Elegoo PLA Matte" + ], + "OFRS2Ggt": [ + "OrcaFilamentLibrary/Generic PP-CF" + ], + "OFT3TqB6": [ + "OrcaFilamentLibrary/Elas ASA" + ], + "OFVLuVmD": [ + "OrcaFilamentLibrary/Elegoo Rapid PETG" + ], + "OFXmQgno": [ + "OrcaFilamentLibrary/eSUN PLA-Marble" + ], + "OFZhdVnP": [ + "OrcaFilamentLibrary/eSUN PLA-Basic" + ], + "OFbgt3u3": [ + "OrcaFilamentLibrary/Elas PLA Basic" + ], + "OFenGPBR": [ + "OrcaFilamentLibrary/Elegoo PETG Translucent" + ], + "OFfB1QKi": [ + "Flashforge/Flashforge HS PETG", + "OrcaFilamentLibrary/Generic PETG HF" + ], + "OFmeQjRP": [ + "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" + ], + "OFpwg2Qh": [ + "OrcaFilamentLibrary/Elegoo ASA-CF" + ], + "OFqh1Ngp": [ + "OrcaFilamentLibrary/Elegoo PLA-CF" + ], + "OFrgQ1Ns": [ "OrcaFilamentLibrary/Elas PLA Pro" ], + "OFs6lLH7": [ + "OrcaFilamentLibrary/Elegoo PLA Silk" + ], + "OFsKqcQW": [ + "OrcaFilamentLibrary/Elegoo PLA PRO" + ], + "OFsNZcid": [ + "OrcaFilamentLibrary/PolyLite Dual PLA" + ], + "OFutwD6f": [ + "OrcaFilamentLibrary/Elegoo PLA Glow" + ], + "OFw4OHWE": [ + "OrcaFilamentLibrary/Elas PETG Basic" + ], + "OFzrWlH5": [ + "OrcaFilamentLibrary/Elegoo PETG HF" + ], + "OGFA00": [ + "OrcaFilamentLibrary/Bambu PLA Basic" + ], "OGFA01": [ "OrcaFilamentLibrary/Bambu PLA Matte" ], @@ -4655,8 +4775,7 @@ "OrcaFilamentLibrary/Bambu ABS" ], "OGFB01": [ - "OrcaFilamentLibrary/Bambu ASA", - "OrcaFilamentLibrary/Elas ASA" + "OrcaFilamentLibrary/Bambu ASA" ], "OGFB02": [ "OrcaFilamentLibrary/Bambu ASA-Aero" @@ -4696,8 +4815,7 @@ "OrcaFilamentLibrary/Generic PC" ], "OGFG00": [ - "OrcaFilamentLibrary/Bambu PETG Basic", - "OrcaFilamentLibrary/Elas PETG Basic" + "OrcaFilamentLibrary/Bambu PETG Basic" ], "OGFG01": [ "OrcaFilamentLibrary/Bambu PETG Translucent" @@ -4715,21 +4833,14 @@ "OrcaFilamentLibrary/Generic PCTG" ], "OGFG99": [ - "Flashforge/Flashforge HS PETG", - "Flashforge/Flashforge PET-CF", "Flashforge/Flashforge PETG Pro", "Flashforge/Flashforge PETG Transparent", - "Flashforge/Flashforge PETG-CF", - "Flashforge/FusRock S-Multi", - "OrcaFilamentLibrary/Generic PETG", - "OrcaFilamentLibrary/Generic PETG HF", - "OrcaFilamentLibrary/Generic PETG-CF" + "OrcaFilamentLibrary/Generic PETG" ], "OGFGG300": [ "OrcaFilamentLibrary/GreenGate3D PETG" ], "OGFL00": [ - "OrcaFilamentLibrary/PolyLite Dual PLA", "OrcaFilamentLibrary/PolyLite PLA" ], "OGFL00-1": [ @@ -4745,16 +4856,13 @@ "OrcaFilamentLibrary/eSUN PLA+" ], "OGFL04": [ - "OrcaFilamentLibrary/Overture PLA", - "OrcaFilamentLibrary/eSUN PLA-Basic" + "OrcaFilamentLibrary/Overture PLA" ], "OGFL05": [ - "OrcaFilamentLibrary/Overture Matte PLA", - "OrcaFilamentLibrary/eSUN PLA-Matte" + "OrcaFilamentLibrary/Overture Matte PLA" ], "OGFL06": [ - "OrcaFilamentLibrary/Fiberon PETG-ESD", - "OrcaFilamentLibrary/eSUN PLA-Marble" + "OrcaFilamentLibrary/Fiberon PETG-ESD" ], "OGFL50": [ "OrcaFilamentLibrary/Fiberon PA6-CF" @@ -4796,8 +4904,7 @@ "Flashforge/Flashforge PLA Galaxy", "Flashforge/Flashforge PLA Luminous", "Flashforge/Generic PLA", - "OrcaFilamentLibrary/Generic PLA", - "OrcaFilamentLibrary/Generic PLA Matte" + "OrcaFilamentLibrary/Generic PLA" ], "OGFLC99": [ "OrcaFilamentLibrary/Generic CoPE" @@ -4841,13 +4948,10 @@ "OrcaFilamentLibrary/Numakers PLA+" ], "OGFP97": [ - "OrcaFilamentLibrary/Generic PP", - "OrcaFilamentLibrary/Generic PP-CF", - "OrcaFilamentLibrary/Generic PP-GF" + "OrcaFilamentLibrary/Generic PP" ], "OGFP99": [ - "OrcaFilamentLibrary/Generic PE", - "OrcaFilamentLibrary/Generic PE-CF" + "OrcaFilamentLibrary/Generic PE" ], "OGFPM001": [ "OrcaFilamentLibrary/Panchroma PLA" From 516267d869e968744d4a52986ebdf25ccd24d557 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:06:38 +0800 Subject: [PATCH 04/52] Qidi: re-mint copy-pasted filament_ids per material family Phase 2 of the filament_id cleanup, worst vendor first (97 collision groups, the GFB99/GFG99/GFL99 copy-paste epidemic). 435 in-place filament_id edits + 5 compatible_printers trims (broader 0.2-nozzle PETG presets over-claiming Qidi Q1 Pro 0.2 nozzle, covered by dedicated variants): - The Bambu-catalog generic owners keep their ids byte-identical (Qidi Generic ABS/PETG/PLA/TPU/PA/PA-CF/PLA-CF); 6 stray members inside owner families are aligned to their family id. - 64 brand/product-line families (Bambu/HATCHBOX/Overture/PolyLite/Tinmorry, QIDI-brand lines, PLA+/High Speed/TPU-95A) get fresh deterministic mints, the same id landing in every per-series root of a family (@Q2-Series/@Q2C-Series/@X-Max 4-Series bases are multi-root families). - QD_* device-protocol ids untouched (frozen contract with QidiPrinterAgent). Verified: config-equivalence gate zero unexpected diffs (5892 presets); orca_extra_profile_check.py exit 0; assign_filament_ids.py --check exit 0; validator -l 2 exit 0; extended -f -v Qidi exit 0 (was 97 groups); -r -v Qidi exit 0 (all references still resolve). --- .../Qidi/filament/Bambu ABS @0.2 nozzle.json | 2 +- .../Qidi/filament/Bambu ABS @0.6 nozzle.json | 2 +- .../Qidi/filament/Bambu ABS @0.8 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/Bambu ABS.json | 2 +- .../Qidi/filament/Bambu PETG @0.2 nozzle.json | 5 +- .../Qidi/filament/Bambu PETG @0.6 nozzle.json | 2 +- .../Qidi/filament/Bambu PETG @0.8 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/Bambu PETG.json | 2 +- .../Qidi/filament/Bambu PLA @0.2 nozzle.json | 2 +- .../Qidi/filament/Bambu PLA @0.6 nozzle.json | 2 +- .../Qidi/filament/Bambu PLA @0.8 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/Bambu PLA.json | 2 +- .../HATCHBOX ABS @Qidi 0.2 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi 0.6 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi 0.8 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/HATCHBOX ABS @Qidi.json | 2 +- .../HATCHBOX PETG @Qidi 0.2 nozzle.json | 5 +- .../HATCHBOX PETG @Qidi 0.6 nozzle.json | 2 +- .../HATCHBOX PETG @Qidi 0.8 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/HATCHBOX PETG @Qidi.json | 2 +- .../HATCHBOX PLA @Qidi 0.2 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi 0.6 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi 0.8 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/HATCHBOX PLA @Qidi.json | 2 +- .../Overture ABS @Qidi 0.2 nozzle.json | 2 +- .../Overture ABS @Qidi 0.6 nozzle.json | 2 +- .../Overture ABS @Qidi 0.8 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/Overture ABS @Qidi.json | 2 +- .../Overture PLA @Qidi 0.2 nozzle.json | 2 +- .../Overture PLA @Qidi 0.6 nozzle.json | 2 +- .../Overture PLA @Qidi 0.8 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/Overture PLA @Qidi.json | 2 +- .../PolyLite ABS @Qidi 0.2 nozzle.json | 2 +- .../PolyLite ABS @Qidi 0.6 nozzle.json | 2 +- .../PolyLite ABS @Qidi 0.8 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/PolyLite ABS @Qidi.json | 2 +- .../PolyLite PLA @Qidi 0.2 nozzle.json | 2 +- .../PolyLite PLA @Qidi 0.6 nozzle.json | 2 +- .../PolyLite PLA @Qidi 0.8 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/PolyLite PLA @Qidi.json | 2 +- .../Qidi/filament/Q2/Bambu ABS @Q2.json | 2 +- .../Qidi/filament/Q2/Bambu ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/Bambu PETG @Q2.json | 2 +- .../Qidi/filament/Q2/Bambu PETG @Q2C.json | 2 +- .../Qidi/filament/Q2/Bambu PLA @Q2.json | 2 +- .../Qidi/filament/Q2/Bambu PLA @Q2C.json | 2 +- .../Qidi/filament/Q2/Generic PLA+ @Q2.json | 2 +- .../Qidi/filament/Q2/Generic PLA+ @Q2C.json | 2 +- .../Qidi/filament/Q2/HATCHBOX ABS @Q2.json | 2 +- .../Qidi/filament/Q2/HATCHBOX ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PETG @Q2.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PETG @Q2C.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PLA @Q2.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PLA @Q2C.json | 2 +- .../Qidi/filament/Q2/Overture ABS @Q2.json | 2 +- .../Qidi/filament/Q2/Overture ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/Overture PLA @Q2.json | 2 +- .../Qidi/filament/Q2/Overture PLA @Q2C.json | 2 +- .../Qidi/filament/Q2/PolyLite ABS @Q2.json | 2 +- .../Qidi/filament/Q2/PolyLite ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/PolyLite PLA @Q2.json | 2 +- .../Qidi/filament/Q2/PolyLite PLA @Q2C.json | 2 +- .../QIDI ABS Odorless @0.2 nozzle.json | 2 +- .../QIDI ABS Odorless @0.6 nozzle.json | 2 +- .../QIDI ABS Odorless @0.8 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI ABS Odorless.json | 2 +- .../filament/QIDI ABS Rapido 0.2 nozzle.json | 2 +- .../filament/QIDI ABS Rapido 0.6 nozzle.json | 2 +- .../filament/QIDI ABS Rapido 0.8 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../QIDI ABS Rapido Metal @0.2 nozzle.json | 2 +- .../QIDI ABS Rapido Metal @0.6 nozzle.json | 2 +- .../QIDI ABS Rapido Metal @0.8 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI ABS Rapido Metal.json | 2 +- .../Qidi/filament/QIDI ABS Rapido.json | 2 +- .../QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ABS-GF.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...DI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...DI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...DI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ABS-GF10.json | 2 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...DI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...DI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...DI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ABS-GF25.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Max 3 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json | 2 +- ...QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json | 2 +- ...QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json | 2 +- ...QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json | 2 +- ...IDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json | 2 +- ...IDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json | 2 +- ...IDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ASA.json | 2 +- ...QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PA-Ultra.json | 2 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PA12-CF.json | 2 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PAHT-CF.json | 2 +- .../filament/QIDI PAHT-GF @0.6 nozzle.json | 2 +- .../filament/QIDI PAHT-GF @0.8 nozzle.json | 2 +- .../QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PAHT-GF.json | 2 +- ...QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PET-CF.json | 2 +- .../filament/QIDI PET-GF @0.6 nozzle.json | 2 +- .../filament/QIDI PET-GF @0.8 nozzle.json | 2 +- .../QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PET-GF.json | 2 +- .../filament/QIDI PETG Basic @0.2 nozzle.json | 5 +- .../filament/QIDI PETG Basic @0.6 nozzle.json | 2 +- .../filament/QIDI PETG Basic @0.8 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Basic.json | 2 +- .../QIDI PETG Rapido @0.2 nozzle.json | 5 +- .../QIDI PETG Rapido @0.6 nozzle.json | 2 +- .../QIDI PETG Rapido @0.8 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Rapido.json | 2 +- .../filament/QIDI PETG Tough 0.2 nozzle.json | 2 +- .../filament/QIDI PETG Tough 0.6 nozzle.json | 2 +- .../filament/QIDI PETG Tough 0.8 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Tough.json | 2 +- .../QIDI PETG Translucent @0.2 nozzle.json | 5 +- .../QIDI PETG Translucent @0.6 nozzle.json | 2 +- .../QIDI PETG Translucent @0.8 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Translucent.json | 2 +- .../QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PETG-CF.json | 2 +- .../QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PETG-GF.json | 2 +- .../filament/QIDI PLA Basic @0.2 nozzle.json | 2 +- .../filament/QIDI PLA Basic @0.6 nozzle.json | 2 +- .../filament/QIDI PLA Basic @0.8 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Basic.json | 2 +- .../QIDI PLA Matte Basic @0.2 nozzle.json | 2 +- .../QIDI PLA Matte Basic @0.6 nozzle.json | 2 +- .../QIDI PLA Matte Basic @0.8 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Matte Basic.json | 2 +- .../filament/QIDI PLA Rapido 0.2 nozzle.json | 2 +- .../filament/QIDI PLA Rapido 0.8 nozzle.json | 2 +- .../filament/QIDI PLA Rapido @0.6 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../QIDI PLA Rapido Matte @0.2 nozzle.json | 2 +- .../QIDI PLA Rapido Matte @0.6 nozzle.json | 2 +- .../QIDI PLA Rapido Matte @0.8 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Rapido Matte.json | 2 +- .../QIDI PLA Rapido Metal @0.2 nozzle.json | 2 +- .../QIDI PLA Rapido Metal @0.6 nozzle.json | 2 +- .../QIDI PLA Rapido Metal @0.8 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Rapido Metal.json | 2 +- .../QIDI PLA Rapido Silk @0.6 nozzle.json | 2 +- ...A Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...A Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Rapido Silk.json | 2 +- .../Qidi/filament/QIDI PLA Rapido.json | 2 +- .../filament/QIDI PLA-CF @0.6 nozzle.json | 2 +- .../filament/QIDI PLA-CF @0.8 nozzle.json | 2 +- .../QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../filament/QIDI PPS-CF @0.6 nozzle.json | 2 +- .../filament/QIDI PPS-CF @0.8 nozzle.json | 2 +- .../QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PPS-CF.json | 2 +- .../QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI Support For PAHT.json | 2 +- .../filament/QIDI Support For PET-PA.json | 2 +- ...QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI TPU-Aero.json | 2 +- .../QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI UltraPA-CF25.json | 2 +- .../QIDI WOOD Rapido @0.6 nozzle.json | 2 +- .../QIDI WOOD Rapido @0.8 nozzle.json | 2 +- ...I WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...I WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...I WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI WOOD Rapido.json | 2 +- ...Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...di ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../profiles/Qidi/filament/Qidi ASA-Aero.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... Generic ASA @Qidi X-Max 3 0.2 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 3 0.2 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...eneric ASA @Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic ASA.json | 2 +- ... Generic PETG @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...eneric PETG @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...i Generic PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json | 2 +- ...Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json | 2 +- ...Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 3 0.2 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 3 0.6 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 3 0.8 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...neric PLA+ @Qidi X-Smart 3 0.2 nozzle.json | 2 +- ...neric PLA+ @Qidi X-Smart 3 0.6 nozzle.json | 2 +- ...neric PLA+ @Qidi X-Smart 3 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic PLA+.json | 2 +- ...neric TPU 95A @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...ric TPU 95A @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic TPU 95A.json | 2 +- ...i Generic TPU @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...Generic TPU @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi PC-ABS-FR.json | 2 +- .../profiles/Qidi/filament/Qidi PLA-CF.json | 2 +- ...di TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...di TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi TPU 95A-HF.json | 2 +- .../Qidi/filament/Tinmorry PETG-ECO.json | 2 +- .../Qidi/filament/X4/Bambu ABS @X-Max 4.json | 2 +- .../Qidi/filament/X4/Bambu PETG @X-Max 4.json | 2 +- .../Qidi/filament/X4/Bambu PLA @X-Max 4.json | 2 +- .../filament/X4/Generic PLA+ @X-Max 4.json | 2 +- .../filament/X4/HATCHBOX ABS @X-Max 4.json | 2 +- .../filament/X4/HATCHBOX PETG @X-Max 4.json | 2 +- .../filament/X4/HATCHBOX PLA @X-Max 4.json | 2 +- .../filament/X4/Overture ABS @X-Max 4.json | 2 +- .../filament/X4/Overture PLA @X-Max 4.json | 2 +- .../filament/X4/PolyLite ABS @X-Max 4.json | 2 +- .../filament/X4/PolyLite PLA @X-Max 4.json | 2 +- scripts/filament_id_snapshot.json | 446 ++++++++---------- 436 files changed, 648 insertions(+), 683 deletions(-) diff --git a/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json index 5a6b2f07b2..0571a6c393 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "UWRDko6WCvXczl33", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json index 1a6930ff43..ff958e904c 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "LUEO7LVrgko3oXzg", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json index 9ceb5904ff..afba292989 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "NKhfqNQIcfKQBYAK", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json index c773f1f723..e082ba832a 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "sZn12as9SQDNFDO3", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json index 1930af3ebd..4eae1e7274 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "coopc46hemdV9QIv", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json index 2560aa37f1..c918896762 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "qvYl7pfvtgF2y25O", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json index a27d0bbfb2..8679f08572 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "AzHGQIE0dGXjOhqG", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json index bddac012dc..e22ad74af9 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "CoYm8sbAVmpmJNIV", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json index f6f867f6b6..6c26b42f6e 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "FnQb4cNqORpQ3Wkq", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json index 35ed106798..0fe76e86e7 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "94qvrRFOKOACTK2g", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json index 9fd1b1d878..3383f16f49 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "ehJ163zLubzIrWzf", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS.json b/resources/profiles/Qidi/filament/Bambu ABS.json index bc8e84d0d0..8a3f3c544c 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS.json +++ b/resources/profiles/Qidi/filament/Bambu ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "aZylcH8GeCJOqtTy", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json index c1b4ec3fc1..72ca8b3942 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "cZhyWv8zbkM3fgAS", - "filament_id": "GFG99", + "filament_id": "OF6EOy1A", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" @@ -48,7 +48,6 @@ "compatible_printers": [ "Qidi X-Smart 3 0.2 nozzle", "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle", - "Qidi Q1 Pro 0.2 nozzle" + "Qidi X-Max 3 0.2 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json index e97ce167f1..2baf999d10 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "PfIdpsKf0Xw5admE", - "filament_id": "GFG99", + "filament_id": "OF6EOy1A", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json index ca2475da91..bdb1fc0cf5 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "czi4981YiirKP6Yy", - "filament_id": "GFG99", + "filament_id": "OF6EOy1A", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json index 123128a303..457e514214 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "1BV8aedNHRa3h7rp", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json index 2b3f40032f..8c175a472d 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "eNHYNrSKn90P4GdZ", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json index 5c2b0ccecb..51609fb0a1 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "VU3PW2x6pfQ9Ayqo", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json index b3b16a0ef2..975dc9f5e7 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "2ezevTOIexxkTBJ2", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json index 549a7c4055..8353f29d0d 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "2vTNJwgFvUFq7oS9", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json index 63080da56e..f777567d23 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "Q5ToVl9Yb4GGoNXC", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json index 0ce417dc1d..abb934e808 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "XpLJtB1WhRyb1C75", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json index 89e531f65e..517ea571a2 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "PiYLOckPVRFKFTS6", - "filament_id": "GFB99", + "filament_id": "OF6EOy1A", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG.json b/resources/profiles/Qidi/filament/Bambu PETG.json index 70d61730fa..f3c852e3da 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG.json +++ b/resources/profiles/Qidi/filament/Bambu PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "5ZkReXpCOi19xuJg", - "filament_id": "GFG99", + "filament_id": "OF6EOy1A", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json index 95434aff3a..1aa1a5791f 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "xY62JrDaYjjSb3lh", - "filament_id": "GFL99", + "filament_id": "OF2UFmOo", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json index ea5ef9b75d..4ed7e3fde8 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "HjjvZoWwpjZ2gwDO", - "filament_id": "GFL99", + "filament_id": "OF2UFmOo", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json index 3d978affa5..20a1f209d5 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "5dZqeodmshu33k4e", - "filament_id": "GFL99", + "filament_id": "OF2UFmOo", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json index 5d51f1eafc..9eb008e6e3 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "6kHEv9BjLlJi4E9T", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json index 9451f422a2..670a0dd494 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "G28Bah0iOaahWlPE", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json index 3e93b99515..c480153803 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "ioH4lDHLbCw65TIg", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json index 02f5bab7f6..a3364d6f1e 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "oAUHAhSZkmCjhJEP", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json index 9677e7fa31..1a5492b842 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "mT6I8HUJsMgYCjb4", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json index d9a8aa89ab..38bee01574 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "5sr5ABQQzrYFUxtk", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json index c2611c3679..46f76ed5ee 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "CNzhUsHWT2FOW2Qe", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json index dc770d61eb..97c9d86fa6 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "8Mosuf8MExl0g3Tz", - "filament_id": "GFB99", + "filament_id": "OF2UFmOo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA.json b/resources/profiles/Qidi/filament/Bambu PLA.json index ebdf2423d6..f4df7bb875 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA.json +++ b/resources/profiles/Qidi/filament/Bambu PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "lweaPojzNVU2FJnO", - "filament_id": "GFL99", + "filament_id": "OF2UFmOo", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json index 37749f7ca1..a91921bf7d 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "QASmOwd2vpLRwI9I", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json index 7aea599422..d222581868 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "FETCvNKTRyxJujEs", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json index 2a465f6e24..25a52df29a 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "ywzSdHmCxIwmIFVS", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json index b5c25a1bce..3d1b1b018d 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "EwhasEiqLRcN5gBN", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json index 4a0b67f0a0..0548ad7b80 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "0NVX3dTScYTIebm3", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json index 2c8d4bc22d..efbc5367cf 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "HCU0TmDPYF39Gc3X", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json index 62bb876608..07e2b9020a 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "Pf6oZn5QrYSbJhdm", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json index b6f03502b3..be04669935 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "6LSdExBaTT0Mc3rY", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json index a4ebcb6a7b..338327a6f4 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "vc2R90RYyDuY8vQn", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json index 1d4d13d416..0e0929a26e 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "1HVRVgHeXWVj3T0v", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json index b16ce365f8..9a77e829eb 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "aJxjGxHK8UJOqYPV", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json index 5e4fd7cf10..a10c29a679 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0fchNQsqRqwI6whN", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json index ffb2cc0e34..0fd49f7b99 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "Cw3CaLrsjVfJKoWI", - "filament_id": "GFG99", + "filament_id": "OFAnyzjN", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" @@ -48,7 +48,6 @@ "compatible_printers": [ "Qidi X-Smart 3 0.2 nozzle", "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle", - "Qidi Q1 Pro 0.2 nozzle" + "Qidi X-Max 3 0.2 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json index e6b90b25f2..d907869893 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "eLmXN4kJvaoq5Ude", - "filament_id": "GFG99", + "filament_id": "OFAnyzjN", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json index 6a763393a7..30c74b3628 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "mndT3gxOniftGEEZ", - "filament_id": "GFG99", + "filament_id": "OFAnyzjN", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json index 8e0f9576fb..dc93652d10 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "L8aHH2WqnlOYuyfd", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json index cf9da5b3c1..6d403ed166 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "LMva5CR9m19UAhcI", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json index 400f38d7fa..1e60285f5c 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "5EfWTFx0dXRTREkj", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json index 44b77623c6..9463655aed 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "xeu1S6h53DRVM9Pw", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json index 0b09a46b90..90fdab75cf 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "UrZzA62PJDuvo9EC", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json index 696fddb2d8..c9f19b8bbe 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "jAykaomjQ4BS9Cg0", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json index c0203d9268..74c9c5645e 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "2QrBYfeT0mp048aY", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json index aee2e475e2..a404adcc52 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "9otX3aWO4xQA72DT", - "filament_id": "GFB99", + "filament_id": "OFAnyzjN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json index 240181288d..2d9a104b6a 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "dqHKVy4ahTjpQFOJ", - "filament_id": "GFG99", + "filament_id": "OFAnyzjN", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json index 679eb2b2f1..94399a5e99 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "GrYmKcX6ghgUO8z0", - "filament_id": "GFL99", + "filament_id": "OFiJYDPC", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json index b891604161..a3f934d4a3 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "Fwd0BaBVmg2w9oBo", - "filament_id": "GFL99", + "filament_id": "OFiJYDPC", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json index af0f830e19..c7c48eafaf 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "OjSAPfXD7c9LpDZI", - "filament_id": "GFL99", + "filament_id": "OFiJYDPC", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json index 8c0315ecd1..3e4260f01e 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "tNk1yBoRzuKtWamt", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json index 865f120bcb..2ba5095a7f 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "oULA9qVGUD5izX9o", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json index 956fa88d62..baacdde075 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "RK1LyCal04XMqidp", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json index 535b07b9b0..444d1e7ec5 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "6ehhHeFIMe3KxHA1", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json index c6a9a6564a..781709ec0e 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "i3bQYXjlGipOAop7", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json index 60b9f5318c..0b7c393c5e 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "vknSksUeSeKFl8vB", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json index 89ffc6501a..bbfc813ac4 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "I5NFFjIYcoo3SkmC", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json index 6e28cd923e..0a698394bc 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "gzDFMFaDnAVuDy3B", - "filament_id": "GFB99", + "filament_id": "OFiJYDPC", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json index ee79175e43..54077f69b3 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "jWtANauqr4Azj7fo", - "filament_id": "GFL99", + "filament_id": "OFiJYDPC", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json index 3fb6ca6406..616249f7fb 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "PVJaNrzYRoafHb3k", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json index 403311644b..c442a6b9b4 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "6dP4f482dvR9Ihhu", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json index 5d43601751..438527e84e 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "ol1pj7wlmGJlZHbA", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json index aa2cc8787c..dcc67c9e49 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "d9bOxYmwJJ928QUm", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json index 451a97354e..aa27b3bf99 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "3vOLIQxScIoHCUDQ", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json index 161cee6e4c..693927e275 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "ninsIRmjQReutXjA", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json index e5e9652619..2c50318e80 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "m4sql22MWPed4UK9", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json index c6d97b1e42..e2e657e67d 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "SbIhXnMLo7UWLdmF", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json index ca632cb252..310f56f725 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "Hh22vTpUyqF09bma", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json index 4419ba6577..0b41ec4fcf 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "10PSPCpiTcS92auy", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json index f203d3f536..ac1a6dd3f6 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "Xevn2nrx7W5VQX6z", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi.json index 0ae10f9086..9f8543d169 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "rRuO94f0PYlPR3yu", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json index 028e0adeb3..801448598f 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "YnRI4rYCHDIi7Q0w", - "filament_id": "GFL99", + "filament_id": "OFC2FSsV", "instantiation": "true", "pressure_advance": [ "0.057" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json index f6989b46b5..4875cb845d 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "Jizherw9T9l0X76l", - "filament_id": "GFL99", + "filament_id": "OFC2FSsV", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json index c15b896bde..4a75b36230 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "dHlHvcm2BjzlfUSk", - "filament_id": "GFL99", + "filament_id": "OFC2FSsV", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json index ad955edaeb..04bc00470b 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "3jqdiWNWro7yFptW", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json index 9e4bad8df8..0921c9b6e8 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "tARHr87BkRknTQJI", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json index ae956faf9b..c888887711 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "EEIdQ4XTkpQyRz3h", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json index c961b4b4d1..53a2a25920 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "NBbNF6S5sQYIiS9T", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json index 299c10c9b0..9dbd2f38a6 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "gk2D7WKoLK1xPqLC", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json index 3beb0aba29..a83fb80140 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "wtl6yNqJQUVhiBnB", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json index dc866429d0..829d5e6e29 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "1fl42MjkwXbpjJ3r", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json index c87feb65e4..68736ba4c9 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "vxGQSWw07PXnllwO", - "filament_id": "GFB99", + "filament_id": "OFC2FSsV", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi.json index f298c1f233..5a67c65ecc 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "XXJ4dSi48JuA54Iv", - "filament_id": "GFL99", + "filament_id": "OFC2FSsV", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json index 24c3e1cf0e..7072ae9048 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "5rbxArwT1VV5BOSq", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json index 13684caa4b..12b6451671 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "EqpfLGTZXcdjm5BM", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json index 8112c07176..631237f251 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "Ao01rvVFfkWlwpER", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json index c4a4120209..2002832792 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "dfni3lzB8GJldfQD", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json index 6abfb386db..e589839cac 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "iWq2EddKO6QAUJuG", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json index ba69bacdab..0add34cd62 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "0EswisPwFjFmk1GT", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json index 1b0506e8dc..2a22e88081 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "t3DcJuJsNgXKW0dP", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json index 51c39b2aba..b1fcc53a1a 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "Ino4r7XLgTCFh4YR", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json index 1f53c30903..5d02632d1f 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "7NXI13ejzocjD7TO", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json index 4bcdb6bcef..62f530081c 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "QEJ9knURmXAGsFib", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json index 8aa1c764f4..2874e9ed51 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "GzEXQzyKqqnCVUBh", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json index ef68eb12e1..749d87e959 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "Q9QYOF2UmsrK7Wof", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json index a52b240410..d1fe71dbea 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "uXrENPoTa7HWapCV", - "filament_id": "GFL99", + "filament_id": "OFceJcLf", "instantiation": "true", "pressure_advance": [ "0.057" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json index f18131f02b..0de4f9ec71 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "XnU3X7A7kdRrfoTX", - "filament_id": "GFL99", + "filament_id": "OFceJcLf", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json index 93bcd56559..12f56a5826 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "Q6H3JzOum8GYVRF9", - "filament_id": "GFL99", + "filament_id": "OFceJcLf", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json index 4ef9af4534..563fdaf639 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "tSR6NKHk3ietpsga", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json index 77d10b9be3..5cab6e5d2d 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "ZF5is6IpP0gGcqRE", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json index 1559c6d369..6f293d396b 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "bAqfoS751xDFHubU", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json index 6837abbfb2..19d9c490cd 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "2rWOMrYc40ZRNLQi", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json index eabb962095..16e34885c6 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "4x8HlY906khbFsG0", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json index b4c8988c1d..95b33c700a 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "87QXnh5kCuQoPwjr", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json index 6a0d9383f8..43d6ebbe3b 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "WsMzyALZrDylCkZ6", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json index 5d5cb7bf93..01f23b61ee 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "sHVHjhH9FzhRjeHT", - "filament_id": "GFB99", + "filament_id": "OFceJcLf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json index b84cf7bfb4..a7c49a98f8 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Kg6WHLbWxKAE8cCr", - "filament_id": "GFL99", + "filament_id": "OFceJcLf", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json index e2d1d05e99..6d1f651941 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json @@ -3,7 +3,7 @@ "name": "Bambu ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json index dfb6609b1c..a66e95159e 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "Bambu ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json index d1898e4363..56c8f26888 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json @@ -3,7 +3,7 @@ "name": "Bambu PETG@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFG99", + "filament_id": "OF6EOy1A", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json index 6a28da194b..61537e05c5 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json @@ -3,7 +3,7 @@ "name": "Bambu PETG@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFG99", + "filament_id": "OF6EOy1A", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json index 1277eab3e3..fbbbe3bcf0 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json @@ -3,7 +3,7 @@ "name": "Bambu PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OF2UFmOo", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json index b1f2cdde9f..6e72108961 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "Bambu PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OF2UFmOo", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json index 47107a8614..f3e45975a9 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json @@ -3,7 +3,7 @@ "name": "Generic PLA+@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFfdxQok", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json index 83d77e0781..48422dbf2c 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic PLA+@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFfdxQok", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json index c55ccaa1a9..99b96f7788 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json @@ -3,7 +3,7 @@ "name": "HATCHBOX ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json index 81736dcccf..df0c4c9006 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "HATCHBOX ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json index 10f557a994..73d7e901ab 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PETG@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFAnyzjN", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json index fd739c1779..013e38199f 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PETG@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFAnyzjN", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json index 880ecddb29..aeba01311c 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFiJYDPC", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json index 4af2d4f816..40ac36e3dd 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFiJYDPC", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json index 5c2067f362..ff0b89b0ec 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json @@ -3,7 +3,7 @@ "name": "Overture ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json index a6639b3999..b271d4f87f 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "Overture ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json index 2dbdffd469..8435661492 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json @@ -3,7 +3,7 @@ "name": "Overture PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFC2FSsV", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json index 986e906c0c..cc358bbb31 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "Overture PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFC2FSsV", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json index b1af2354b5..fe2cf1e7f0 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json index 6d6c27b6b1..69747075c6 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json index be89bf9696..b342506185 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFceJcLf", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json index c42c4aee25..c8cc9c7f1d 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFceJcLf", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json index 9340c8b402..f01f3e4d80 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Z0J9YPS8382vLms4", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json index 651828c165..b6f87914d3 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "SA5qLMqlZg0lBV9u", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json index 951ebcacd6..397e9d9c2d 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "MzM45pddZsnN8jk4", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json index c59b3a85ee..00ffd121ef 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Tq1aLmF5jT1fx5mZ", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json index e68e7cf3fa..d03e15c72b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "1hhkoG2E1z6ya5hY", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "during_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json index 395f1dc934..0661266966 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Vr1wXzAo5OR2PASA", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json index 5416a7b580..36ddd1819a 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "OCg8c9SWQrZP0SrH", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json index ac47e75f00..dffcec3561 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "3fkdGYKFpaJ8yjwg", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json index b0467052ef..eac761c62b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Tkh7jC3ZhD7qchMF", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json index e259f79655..6b0c61276a 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "wOJOXhIjWFMUvDsB", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json index b3b3c6007f..dec090494e 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "WqbBySroQTCBWMoz", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless.json index 9b2cc8c8fd..7803db110f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "5GyjZE2Ukzo3BDdg", - "filament_id": "GFB99", + "filament_id": "OFVhG0yM", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json index eda2713729..f04485915c 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "CeOohxHZCLelVMCk", - "filament_id": "GFB99", + "filament_id": "OFeybQvK", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json index 96ad8b214c..fd6e7b8c76 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "VzAotqGZviabVuS4", - "filament_id": "GFB99", + "filament_id": "OFnj7bPm", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json index 7678378711..2ec48424c2 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "1hpYHzEDBeO8jwDr", - "filament_id": "GFB99", + "filament_id": "OF8WvPVL", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json index 606a4e781d..8beeba8c54 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "2ZB4CZPo7OnsVeFj", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json index 51d96df33d..e09f33c2ec 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "ANlmZnKFevlds1x9", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json index 832ace793f..404c73f209 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "qGAb3jPiiSZqPc0W", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json index 939c2fc5bd..93b6a852f7 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "zPlNGjze5nz0Sqtn", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json index a57fa1b64f..e28f719297 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "L6hmbX1bqdrGd9g2", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json index c05f92c7f4..db9b53d8b5 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "ZKLPQIUecFL5GG2P", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json index a4838feb1d..4b76aea4a6 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "OlI3NRTSS4Vb9ABn", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json index f02644b876..2224bcf267 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "7AXe36Wqh6uupouS", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json index 552acb8b6e..da948783fc 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "CQa9Ke6ku0jK7juR", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json index 695dfa0702..496f544403 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "KBXExHIJGyOE02sr", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json index b3f2dbf64d..a22da32e00 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "QjDN8l4fq8nrEtZS", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json index b7e9c56d7e..6206964150 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "83M8HRLtzoEyAgdd", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json index cd38da2783..3d47382873 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "JWNlbq8qmrVoCjJZ", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "during_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json index 2cfbfdf4de..31ebb14e56 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "igcuTXhdFT9QEkki", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json index ee01bbbb30..fdfe9154a8 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "Rci7D9y258kLZl3F", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json index 98b64f2e92..3106c593b8 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "LClDGDpaf5l4XinA", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json index 71c73d5a26..5a187f9ed2 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "TbTSNtElyeqwuhI2", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json index a3bde06612..df8ac29f1a 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "lRSAQSUdgEOvrWOZ", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json index fa0b2629ec..af46a4fc45 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "sV1XN1EnDMTMC6eZ", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json index b3b7260b51..3cee143732 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "EcvWsnEhikUy64mA", - "filament_id": "GFB99", + "filament_id": "OFToBodi", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido.json index 75518e19d5..08a58dc6dc 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "sru9yX08jyTVNmOz", - "filament_id": "GFB99", + "filament_id": "OFW8UdlP", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json index ddcb0ad389..17ef67f639 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "BG8J7FyU5Sn6pmGk", - "filament_id": "GFB99", + "filament_id": "OFYH00jV", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json index 5a8cd10de2..491e1f4660 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "87bAUrovoG3W1WZK", - "filament_id": "GFB99", + "filament_id": "OFYH00jV", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json index 7714206d33..e5e82a99df 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "v0K7uK7rq54uGbrE", - "filament_id": "GFB99", + "filament_id": "OFYH00jV", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json index 8aba17e819..174bccce8e 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "OD1YZ5gmmk39jI21", - "filament_id": "GFB99", + "filament_id": "OFYH00jV", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json index af4a24396d..b22eb5c8b5 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "QzCAZozPOpv3IOzz", - "filament_id": "GFB99", + "filament_id": "OFYH00jV", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json index ab0972598b..32e6766cda 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "fvB8ilSXksTr2ahl", - "filament_id": "GFB99", + "filament_id": "OFYH00jV", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF.json b/resources/profiles/Qidi/filament/QIDI ABS-GF.json index a6d53698c7..d7f24f36c2 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "FW543AnWfRtseB8W", - "filament_id": "GFB99", + "filament_id": "OFYH00jV", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json index 4e532d3a34..a99a9522de 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "uskWZUmvzYkVgG0l", - "filament_id": "GFB99", + "filament_id": "OFQZINrX", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json index 464b555e28..cfe8ea1bf0 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "9laiuOlfZEWIjQ3u", - "filament_id": "GFB99", + "filament_id": "OFQZINrX", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json index 92b8fbb036..eb4bbfa171 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "Jh3kEQrLdoGw4WLW", - "filament_id": "GFB99", + "filament_id": "OFQZINrX", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json index 863ace51a5..ae910ae9d5 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "3tblNpw8VgOlt8VU", - "filament_id": "GFB99", + "filament_id": "OFQZINrX", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json index e22b325113..3009f9db4d 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "tssoWES4nOoMEh90", - "filament_id": "GFB99", + "filament_id": "OFQZINrX", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json index 64b7fd6f57..b5aad08653 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "cgzmqzFT32UhNW5Q", - "filament_id": "GFB99", + "filament_id": "OFQZINrX", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json index bffe8b53c8..ffac088449 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "hxsu8XybSxfesTJf", - "filament_id": "GFB99", + "filament_id": "OFQZINrX", "instantiation": "true", "filament_type": [ "ABS-GF" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json index 1d88686ecc..8287d0aa7b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "Do5JLiLyzue036L8", - "filament_id": "GFB99", + "filament_id": "OFv2NHLC", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json index df3f122417..ffb51be952 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "hTEx7UgX2wWanON5", - "filament_id": "GFB99", + "filament_id": "OFv2NHLC", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json index 2c99858ffa..6fb67b1002 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "shInwFwd1Yh5wUJB", - "filament_id": "GFB99", + "filament_id": "OFv2NHLC", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json index dcdb75359c..e4980df547 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "LQoXGFsJRpjCTBKm", - "filament_id": "GFB99", + "filament_id": "OFv2NHLC", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json index 43b86fdab1..aab8dc01c3 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "5ONV5cuwTbSMWPMf", - "filament_id": "GFB99", + "filament_id": "OFv2NHLC", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json index 8f090308d5..3b809bdd69 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "nvfnoGOwhELWArss", - "filament_id": "GFB99", + "filament_id": "OFv2NHLC", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25.json index 67eac5a65f..097f336bb3 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "mFWkL9nlS289XAWu", - "filament_id": "GFB99", + "filament_id": "OFv2NHLC", "instantiation": "true", "filament_type": [ "ABS-GF" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json index 1f61623cb0..3bdd268e3c 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "JPrwCFLO4P82f5lz", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json index fed39958bf..074ac486c0 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "zku756j16aST1ugn", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json index 5dd51ba6e3..ee4d8c3eac 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "EcewU7mP5y2vDwRn", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json index 4595c5cb56..7388eaf99b 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "JPCSXfcIngQGTuOz", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json index 53d965df8f..1939e7b3e3 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "hhkWOEdIbQrB4IR0", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json index bf52b6954e..98cbe34d45 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "QiV5OREyiy9cb2yA", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json index 8fa1de7e85..7815a1ae6e 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "yOWilrQPhpvcpWM4", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "chamber_temperature": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json index 3c259e858a..eeceeb147e 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "tohpo42HW9BLvVcH", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json index 33505ecf75..fcf20cb643 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "iDF5lahr0TRvLF8F", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json index ace413d4d2..0aa3d22f7e 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "p371tUSbBj3WOi5M", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json index 8d1bb937b1..78599691d3 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "4NUwEIv3156HKgev", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json index d7fa79e31b..0a7af77d4e 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI ASA-CF", "setting_id": "UZg7s2SVhCGDcdkA", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "filament_settings_id": [ "QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json index 4f166dfd1a..5b956ce37b 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI ASA-CF", "setting_id": "x8avbSHn73PayVfR", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "filament_settings_id": [ "QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json index 7df6c822af..15bc124407 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle", "inherits": "QIDI ASA-CF", "setting_id": "FagCR4bLL1ctSXax", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "filament_settings_id": [ "QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json index 33af36c33b..65d8322f3a 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "T6U1oaEsA0T3ogMM", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json index c549a01bb3..cce1651f85 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "8Xm0AjRaktaNfo4o", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json index c62d7926f9..68c1c975f1 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "4p12RphItNlfwqwT", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json index ef993b3193..be3b32c6ac 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "346HiaeZvs3BoFUb", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json index d768ca7ab5..7ddeb6a70f 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "LROz60JZsh6GN7CK", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json index 8eb7f15885..ef9e6a0fe1 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "5OR8LnFPipv3h4h8", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json index e3d8e010cd..57b4dce412 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "wyns97Rn3EVTl0v5", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "additional_cooling_fan_speed_unseal": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json index 20348ce7cf..4f55fa7c84 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "zituWsHG83yRR1lM", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "additional_cooling_fan_speed_unseal": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json index ea8120a8d6..b18a387305 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "2CgI1u8NrWGqxN1C", - "filament_id": "GFB99", + "filament_id": "OFmF1xL9", "instantiation": "true", "additional_cooling_fan_speed_unseal": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA.json b/resources/profiles/Qidi/filament/QIDI ASA.json index bfd6c00df7..c69ce99c06 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA.json +++ b/resources/profiles/Qidi/filament/QIDI ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "v2LrEujF68PPbrux", - "filament_id": "GFB99", + "filament_id": "OFK820gS", "instantiation": "true", "filament_type": [ "ASA" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json index 04cc184d19..66de4a49b6 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "rDi5X7jq3PrXGeSo", - "filament_id": "GFB99", + "filament_id": "OFXkwkn6", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json index 12696f5c4a..4298dd4ea5 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "tF0ym95Eo2WVjYrv", - "filament_id": "GFB99", + "filament_id": "OFXkwkn6", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json index 3bde720ab2..ebe1f68c1f 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "bWc3l0t1llvWvFei", - "filament_id": "GFB99", + "filament_id": "OFXkwkn6", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra.json index a57e564ca4..7cfd1faafa 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "Rp1vbScHgwAZAwNT", - "filament_id": "GFN99", + "filament_id": "OFXkwkn6", "instantiation": "true", "filament_type": [ "UltraPA" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json index 4c287235ef..087691ba31 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "Q3votaRX4HuxZl1j", - "filament_id": "GFB99", + "filament_id": "OFFIL5pD", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json index 6b57b653e1..382b51b6f3 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "aaAKfscwITCW1cIY", - "filament_id": "GFB99", + "filament_id": "OFFIL5pD", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json index ba8250d7b8..ea996d2a71 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "nsFoTEFnTCbVM5VS", - "filament_id": "GFB99", + "filament_id": "OFFIL5pD", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF.json b/resources/profiles/Qidi/filament/QIDI PA12-CF.json index 7276593388..f559526129 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "tDdg0DlqE4Nle5Xo", - "filament_id": "GFN98", + "filament_id": "OFFIL5pD", "instantiation": "true", "filament_type": [ "PA12-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json index 483308828c..e54c5f53e9 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "wBwy10qTZT9LPkX7", - "filament_id": "GFB99", + "filament_id": "OFUkpobY", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json index 559d626e6a..8e9dfc5b7d 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "a7pcw1dTC3bXjkqQ", - "filament_id": "GFB99", + "filament_id": "OFUkpobY", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json index a70309e85a..c74c3b9054 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "pRBh7YZdJFYv4rED", - "filament_id": "GFB99", + "filament_id": "OFUkpobY", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF.json index 62533cfa49..bb1296382a 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "Hws8EIuQkAfaCJGk", - "filament_id": "GFN98", + "filament_id": "OFUkpobY", "instantiation": "true", "filament_type": [ "PAHT-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json index ea7f2a65c6..3c457fe294 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "jRV6kS5c49Jf0IBJ", - "filament_id": "GFL98", + "filament_id": "OFfJoIgg", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json index 4496ed57ea..bf0a862d3c 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "ic09uwyOjmjgZhCY", - "filament_id": "GFL98", + "filament_id": "OFfJoIgg", "instantiation": "true", "pressure_advance": [ "0.023" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json index 3202c6fce1..6f1402814b 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "BGwcBuMu2dcF1nGB", - "filament_id": "GFB99", + "filament_id": "OFfJoIgg", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json index 35daa7f005..08081a83b8 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "R8msB42rgbyfT0sG", - "filament_id": "GFB99", + "filament_id": "OFfJoIgg", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json index 5c2461e535..ed19eb439b 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "D1nnJWlyUV0wvZnz", - "filament_id": "GFB99", + "filament_id": "OFfJoIgg", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF.json index 1ca4105b5b..676d2575b1 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "A6BaDz936RbO2EW1", - "filament_id": "GFN98", + "filament_id": "OFfJoIgg", "instantiation": "true", "filament_type": [ "PAHT-GF" diff --git a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json index 8ef70475b3..60d2eaf677 100644 --- a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI PEBA 95A", "setting_id": "VNbCsg7HAvK02shi", - "filament_id": "GFB99", + "filament_id": "OFUJw3Lx", "instantiation": "true", "filament_settings_id": [ "QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json index 153b1c8543..e25178269b 100644 --- a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI PEBA 95A", "setting_id": "SBJaM8xcxmruL8Sx", - "filament_id": "GFB99", + "filament_id": "OFUJw3Lx", "instantiation": "true", "filament_settings_id": [ "QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json index fe24beddf7..2dc2cc8a50 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "sPox9vMaLAuoZoP2", - "filament_id": "GFB99", + "filament_id": "OF4gzzE4", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json index beaa69e235..55e899aafb 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "6BLOwVDtDPvTqanQ", - "filament_id": "GFB99", + "filament_id": "OF4gzzE4", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json index 38ba31b9c2..3c9732f139 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "znZt3ns7eHGTA3sX", - "filament_id": "GFB99", + "filament_id": "OF4gzzE4", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF.json b/resources/profiles/Qidi/filament/QIDI PET-CF.json index 561c9f0929..b5a58b236b 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "X4zXjt7t9eLbESzJ", - "filament_id": "GFN98", + "filament_id": "OF4gzzE4", "instantiation": "true", "filament_type": [ "PET-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json index 400337fbd8..a69ba467d9 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "N9zX7M4yR8u5Jqjd", - "filament_id": "GFB99", + "filament_id": "OF3XeEuV", "instantiation": "true", "filament_settings_id": [ "QIDI PET-GF @0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json index f87c252aa5..626098b09e 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "ATyJ8qPoYVqi7J3I", - "filament_id": "GFB99", + "filament_id": "OF3XeEuV", "instantiation": "true", "filament_settings_id": [ "QIDI PET-GF @0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json index d5e51c6102..b212549902 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "I48bgbR8Rq9DDxmR", - "filament_id": "GFB99", + "filament_id": "OF3XeEuV", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json index ac877dc6ca..87e6b3b785 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "hGLyYZ2WBTIFnWnc", - "filament_id": "GFB99", + "filament_id": "OF3XeEuV", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json index 4554a3b574..5b372cda6a 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "XC3F1NLZxw1v5Bh3", - "filament_id": "GFB99", + "filament_id": "OF3XeEuV", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF.json b/resources/profiles/Qidi/filament/QIDI PET-GF.json index 444747342d..78a901cbe1 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "nXZR8ykt6JdxvTCd", - "filament_id": "GFN98", + "filament_id": "OF3XeEuV", "instantiation": "true", "filament_type": [ "PET-GF" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json index 9aa6df6a65..d66f38f8fd 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "U8Tz8l63gQMoW1TR", - "filament_id": "GFG99", + "filament_id": "OFSSuKRr", "instantiation": "true", "pressure_advance": [ "0.04" @@ -15,7 +15,6 @@ "compatible_printers": [ "Qidi X-Smart 3 0.2 nozzle", "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle", - "Qidi Q1 Pro 0.2 nozzle" + "Qidi X-Max 3 0.2 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json index 5cc5b51fd3..56206c0269 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "i5DnDzOFFFsd4ear", - "filament_id": "GFG99", + "filament_id": "OFSSuKRr", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json index a4844774cc..101e2d8d16 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "eqwWKpJur2oPzaig", - "filament_id": "GFG99", + "filament_id": "OFSSuKRr", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json index 1c7fb7e0d3..c6c692eb41 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "ZwdzHcsJbYBI04Yn", - "filament_id": "GFB99", + "filament_id": "OFSSuKRr", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json index dbf88b47cc..99f2f1c94e 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "wYE4aUeszHw1HJrZ", - "filament_id": "GFB99", + "filament_id": "OFSSuKRr", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json index ae41acdb9e..21a359c65a 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "SbHnONYlR2WneAjS", - "filament_id": "GFB99", + "filament_id": "OFSSuKRr", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json index 0880da2bef..b80993fba6 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "EQrNIdbODkHki7pY", - "filament_id": "GFB99", + "filament_id": "OFSSuKRr", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic.json b/resources/profiles/Qidi/filament/QIDI PETG Basic.json index 1899fa6b7c..a855dd785d 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "7uiFWB9SSJvhXKt0", - "filament_id": "GFG99", + "filament_id": "OFSSuKRr", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json index d925f371b2..b44faa2e7f 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "17nQzSvxOhC8RqMv", - "filament_id": "GFG99", + "filament_id": "OFbS9rjH", "instantiation": "true", "pressure_advance": [ "0.04" @@ -15,7 +15,6 @@ "compatible_printers": [ "Qidi X-Smart 3 0.2 nozzle", "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle", - "Qidi Q1 Pro 0.2 nozzle" + "Qidi X-Max 3 0.2 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json index e1636c5d4a..75adc4d4d3 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "TJja29CvUqlXnhWM", - "filament_id": "GFG99", + "filament_id": "OFbS9rjH", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json index ad4044f181..9e965e2753 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "6rVVNiYVHxsxqk0M", - "filament_id": "GFG99", + "filament_id": "OFbS9rjH", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json index 3aff0af94f..503cf229aa 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "MoKlaB96ptTjnoa8", - "filament_id": "GFB99", + "filament_id": "OFbS9rjH", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json index 45ba611152..ae7376700e 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "S2CUnrPuZuvBo19K", - "filament_id": "GFB99", + "filament_id": "OFbS9rjH", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json index 8f72cf31ed..d4b7e161e1 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "kEUCaWmAo3xZC09A", - "filament_id": "GFB99", + "filament_id": "OFbS9rjH", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json index bf500050a6..066270e96a 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "4Tse2Ycxud3qX0aQ", - "filament_id": "GFB99", + "filament_id": "OFbS9rjH", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido.json index 67d19f82a2..7097f784d3 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "YK77S7a06UMEQzum", - "filament_id": "GFG99", + "filament_id": "OFbS9rjH", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json index 0dfd072089..856a8f8b32 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "wl53hiPD7EGYabrt", - "filament_id": "GFG99", + "filament_id": "OFWkCAdc", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json index 2f5838b537..ebd4cb47e9 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "QUkztHAxlI1gg1xe", - "filament_id": "GFG99", + "filament_id": "OFqPp2yL", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json index 68706bbe3c..ebfeb1a3a6 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "vtQb2QBD5ongR7vC", - "filament_id": "GFG99", + "filament_id": "OF48G7He", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json index 26589c581e..31e4a0a837 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "KHeb2TVAxtw6fbRm", - "filament_id": "GFB99", + "filament_id": "OF1Zypyy", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json index 5317b9f51d..54ad4f4fe1 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "22HUqZbuYgOGNRfN", - "filament_id": "GFB99", + "filament_id": "OF1Zypyy", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json index f32ca31314..1563a33564 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "U35fhYtgLMsDXEws", - "filament_id": "GFB99", + "filament_id": "OF1Zypyy", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json index 2a524dda6a..fdf754efcc 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "wqzUWt3IiEURFRYL", - "filament_id": "GFB99", + "filament_id": "OF1Zypyy", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough.json b/resources/profiles/Qidi/filament/QIDI PETG Tough.json index a9193be4b4..81eeb5a641 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "SrZXxBXWXda9boGv", - "filament_id": "GFG99", + "filament_id": "OF1Zypyy", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json index 126d86f7bb..4b0c2a6818 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "I8DmnTJey0BaBBAN", - "filament_id": "GFG99", + "filament_id": "OFjohFkg", "instantiation": "true", "pressure_advance": [ "0.04" @@ -15,7 +15,6 @@ "compatible_printers": [ "Qidi X-Smart 3 0.2 nozzle", "Qidi X-Plus 3 0.2 nozzle", - "Qidi X-Max 3 0.2 nozzle", - "Qidi Q1 Pro 0.2 nozzle" + "Qidi X-Max 3 0.2 nozzle" ] } diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json index 79d558d34f..cee560227e 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "0SbgoW822S43QDoX", - "filament_id": "GFG99", + "filament_id": "OFjohFkg", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json index 02e4793b34..591ef0fedf 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "rOakaeWOHKz9immU", - "filament_id": "GFG99", + "filament_id": "OFjohFkg", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json index 2926cfa7d4..5a4d4bd206 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "RBy7wrl1ZQOdKe8i", - "filament_id": "GFB99", + "filament_id": "OFjohFkg", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json index 23ed635640..6b32f51dfa 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "Y0jCXY0Ihd6eRlm4", - "filament_id": "GFB99", + "filament_id": "OFjohFkg", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json index b2397ddb33..6dccf959e3 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "9yzSrCFgR00Lx8Ab", - "filament_id": "GFB99", + "filament_id": "OFjohFkg", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json index 8c86c18134..86548c4867 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "uMHHs1N1fLMq56FF", - "filament_id": "GFB99", + "filament_id": "OFjohFkg", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent.json index a7e1a3f943..60a750367f 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "5k6FnlL39pSbrei2", - "filament_id": "GFG99", + "filament_id": "OFjohFkg", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json index 15e4f9f4c6..dd8dee64fe 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "6EOvD75tBRyvffZF", - "filament_id": "GFB99", + "filament_id": "OFPokkKe", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json index 06118ac128..83f504fff5 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "ByHCLDgv1HFiA1Bb", - "filament_id": "GFB99", + "filament_id": "OFPokkKe", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json index aff00a2a31..bf3b1e5515 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "NBrZJME5Jt7jwU4W", - "filament_id": "GFB99", + "filament_id": "OFPokkKe", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF.json b/resources/profiles/Qidi/filament/QIDI PETG-CF.json index 734b4722ca..23bafc4875 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "vg3YJMhVaXTMTVLJ", - "filament_id": "GFN98", + "filament_id": "OFPokkKe", "instantiation": "true", "filament_type": [ "PETG-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json index c6635252e2..802656c1e1 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "4kBE3NMTit44g7S1", - "filament_id": "GFB99", + "filament_id": "OF0Y5MLd", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json index 753888565d..582fe9675b 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "SzH90qDpFuNpG7Ud", - "filament_id": "GFB99", + "filament_id": "OF0Y5MLd", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json index ff22c08ab9..4ba14fed71 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "9XoDC8DHvxvgrRor", - "filament_id": "GFB99", + "filament_id": "OF0Y5MLd", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF.json b/resources/profiles/Qidi/filament/QIDI PETG-GF.json index 060219b0b0..1b8ada25c9 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "bex5zSdkQThZQi0s", - "filament_id": "GFN98", + "filament_id": "OF0Y5MLd", "instantiation": "true", "filament_type": [ "PETG-GF" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json index 52c98be3a0..31134c4e2c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "hWJXKDKNjeBqYYFk", - "filament_id": "GFL99", + "filament_id": "OFN0X7oN", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json index ab3cc9c974..d7bd4eaf46 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "LMfV673NzArmzY44", - "filament_id": "GFL99", + "filament_id": "OFN0X7oN", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json index 0dc39007eb..9b578ef512 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "CyXcxvEKE6gnCRm9", - "filament_id": "GFL99", + "filament_id": "OFN0X7oN", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json index 449e7e207a..560db51ea0 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "g7OVjk2xNWWNQo9D", - "filament_id": "GFB99", + "filament_id": "OFN0X7oN", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json index c2f7dab865..0d21566770 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "EdgtTQVIiPatR9Rt", - "filament_id": "GFB99", + "filament_id": "OFN0X7oN", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json index ade21c62a6..2e05ec1a09 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "UTbL94nFN0Cx30p6", - "filament_id": "GFB99", + "filament_id": "OFN0X7oN", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json index 5648eb9fd5..f8f7dc88d9 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "INxFTcta59v2Ukpy", - "filament_id": "GFB99", + "filament_id": "OFN0X7oN", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic.json b/resources/profiles/Qidi/filament/QIDI PLA Basic.json index c5e219dd3f..2c15693ba5 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "UlF92qvJnOYzq0mw", - "filament_id": "GFL99", + "filament_id": "OFN0X7oN", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json index 25eeab9475..763557b382 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "vzT3dsogzkZSegM0", - "filament_id": "GFL99", + "filament_id": "OFvN3117", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json index bbea662f87..d283df5e97 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "rdGuWICdcIZ3fXJb", - "filament_id": "GFL99", + "filament_id": "OFvN3117", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json index 6418a8fa5e..56d1503e8a 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "9z0BoiNtKlwPoCI4", - "filament_id": "GFL99", + "filament_id": "OFvN3117", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json index 86b7154e88..9de765cf78 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "Txg82qpCGVco78Ih", - "filament_id": "GFB99", + "filament_id": "OFvN3117", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json index 9097ca2c19..774922475b 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "smHGcdmpWzQy1vW3", - "filament_id": "GFB99", + "filament_id": "OFvN3117", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json index 69f09b85ca..54753b4f40 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "hGKQJNUIQR0srofE", - "filament_id": "GFB99", + "filament_id": "OFvN3117", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json index f945029342..dd25635276 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "kARyA9JRV7f6Wu3E", - "filament_id": "GFB99", + "filament_id": "OFvN3117", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json index 6204fd0d38..c75d42b5a4 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "53yYF0gK91AQcKAy", - "filament_id": "GFL99", + "filament_id": "OFvN3117", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json index c316f431a1..d02d87ea5d 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "jpTA43XolFvODs9f", - "filament_id": "GFL99", + "filament_id": "OFXNO5Of", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json index 42556d2f6b..45906c1b51 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "MGW0kfdHATaAzL1P", - "filament_id": "GFL99", + "filament_id": "OFs1CbB1", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json index 93f8b8b239..c2216596e8 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "eQOfNVt6OqCFj0bV", - "filament_id": "GFL99", + "filament_id": "OFmKNi3f", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json index f72a01ceda..3bdb9bec64 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "tdL1kK6jLbREgYna", - "filament_id": "GFB99", + "filament_id": "OFmKNi3f", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json index 05e66e91b6..ac6a619cb8 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "zfL5B7iAlx3PbJ1j", - "filament_id": "GFB99", + "filament_id": "OFmKNi3f", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json index 29f2a5e350..48f74dc047 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "oZZn5VxcrwDJX9fE", - "filament_id": "GFB99", + "filament_id": "OFmKNi3f", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json index 9aedb1f214..198ef80000 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "o1lfFStVDZMsdFtr", - "filament_id": "GFB99", + "filament_id": "OFmKNi3f", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json index 0392403caf..c143b656d7 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "HK2fT6TYIIS94MZD", - "filament_id": "GFL99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json index 34bcfbab7b..a1b519af08 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "User", "setting_id": "syivJeR1eO6H8wsK", - "filament_id": "GFL99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json index 8e168e3347..ea13d3583e 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "User", "setting_id": "WC8KpzKwpQcHOStJ", - "filament_id": "GFL99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json index 8cef6a51f9..c546a5d00a 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "RccxOqWrkZljiU5Y", - "filament_id": "GFB99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json index 8a6e89f667..77dd1451c2 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "8KV7AfivVZHM6ReD", - "filament_id": "GFB99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json index 648c46e717..c2cb8532be 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "c5lFoguRq8sBwQ1K", - "filament_id": "GFB99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json index 3cb87903ff..8b96e4a264 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "95NdLwU31HQJthJE", - "filament_id": "GFB99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json index 0794ea2af4..cdd0173131 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "gwmsxvv6cpmVlBDa", - "filament_id": "GFL99", + "filament_id": "OFAUDGEQ", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json index 92d6c1a902..2022fa0518 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "oZC1FZ93158dUC0j", - "filament_id": "GFL99", + "filament_id": "OFV4hD1o", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json index 26f96a21f6..2525fd7186 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "Ix7a15ABLu7ykbMb", - "filament_id": "GFL99", + "filament_id": "OFV4hD1o", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json index 4a4f0ffd10..f03a2919dc 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "NdUtpGmW1Rl2h1Xc", - "filament_id": "GFL99", + "filament_id": "OFV4hD1o", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json index a4d88bd29c..0a90a98c7e 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "6obXUws35j7OkE2v", - "filament_id": "GFB99", + "filament_id": "OFV4hD1o", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json index 571decc29b..f9c18e02f4 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "Z0YSeNJQ3rKDwzsp", - "filament_id": "GFB99", + "filament_id": "OFV4hD1o", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json index 4119d9da15..83daae2d51 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "BoVtyU2REc0Ayzc4", - "filament_id": "GFB99", + "filament_id": "OFV4hD1o", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json index 17f7a4818b..6b18f61607 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "EKWOHWk37Yn1jS5V", - "filament_id": "GFB99", + "filament_id": "OFV4hD1o", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json index b118bcfd02..af8af08270 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "yrS51y3N1ooM5ULv", - "filament_id": "GFL99", + "filament_id": "OFV4hD1o", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json index dbe2d57ace..7704c2b53c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "AaBBTIJSMkxxTPDt", - "filament_id": "GFL99", + "filament_id": "OF0z1XpN", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json index 63cfb9c6b0..fea97d7530 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "hnWx5ZM2ecclYvKA", - "filament_id": "GFB99", + "filament_id": "OF0z1XpN", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json index c81d897d30..7191180725 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "bQTjglDv2qjgrUNl", - "filament_id": "GFB99", + "filament_id": "OF0z1XpN", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json index b877e50774..47a2c6edb1 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "zifqr9yiIZKivCNu", - "filament_id": "GFL99", + "filament_id": "OF0z1XpN", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido.json index 1add171288..d5bb8ebb62 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "JdGWg2Kn3T2L2Ai2", - "filament_id": "GFL99", + "filament_id": "OFmKNi3f", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json index 6d266568a1..a65d1591a8 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "BTqlIKpYFQCC8gJt", - "filament_id": "GFL98", + "filament_id": "OF7cv1Ub", "instantiation": "true", "pressure_advance": [ "0.01" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json index ed91757e71..768b6ebd1d 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "0Wr2y2a7rHYbk5fS", - "filament_id": "GFL98", + "filament_id": "OF7cv1Ub", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json index 3b236b0420..32e8cc97be 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "xGqY059EYGUevj9G", - "filament_id": "GFL98", + "filament_id": "OF7cv1Ub", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json index cf77b2cdf0..1869f432df 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "Fh7yuJKSeYs8doRG", - "filament_id": "GFL98", + "filament_id": "OF7cv1Ub", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json index 49c9d3c0f2..fae018e7bc 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "vs5bFF3r8Kid59u9", - "filament_id": "GFL98", + "filament_id": "OF7cv1Ub", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json index d90bd4e3c8..f02bce47ae 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "E30t78jBGCkTztFC", - "filament_id": "GFB99", + "filament_id": "OFAdAYYk", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json index 20cbb98a2d..1eb21b213d 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "pYmENqkzOsA9LRLW", - "filament_id": "GFB99", + "filament_id": "OFAdAYYk", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json index d135252ac8..91d99f8f42 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "7ozi6TNb3ObLpD2v", - "filament_id": "GFB99", + "filament_id": "OFAdAYYk", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json index eecd12264a..8714923f7d 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "iNx7JrGG0r5s24dV", - "filament_id": "GFB99", + "filament_id": "OFAdAYYk", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json index 50bc577d0e..caaf8696e5 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "tQnGlZa0FL2FpHho", - "filament_id": "GFB99", + "filament_id": "OFAdAYYk", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF.json b/resources/profiles/Qidi/filament/QIDI PPS-CF.json index 13db20b99f..9e56326ec1 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "ODM3oXV1OSv3qTbZ", - "filament_id": "GFN98", + "filament_id": "OFAdAYYk", "instantiation": "true", "filament_type": [ "PPS-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json index 6f520e1d27..64884f4a2c 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI PPS-GF", "setting_id": "VgQiY3csDj6bBWSk", - "filament_id": "GFB99", + "filament_id": "OFZAkPHG", "instantiation": "true", "filament_settings_id": [ "QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json index d7e1fa61d5..b0064ded5a 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI PPS-GF", "setting_id": "8hFaMBYD7pnmsZWd", - "filament_id": "GFB99", + "filament_id": "OFZAkPHG", "instantiation": "true", "filament_settings_id": [ "QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json index d3adec2da2..c41c4fbaae 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle", "inherits": "QIDI PPS-GF", "setting_id": "BcrvpHAPx0FBvOi3", - "filament_id": "GFB99", + "filament_id": "OFZAkPHG", "instantiation": "true", "filament_settings_id": [ "QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PAHT.json b/resources/profiles/Qidi/filament/QIDI Support For PAHT.json index 338628640c..2ab04ac70e 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PAHT.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PAHT.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "7cd7R9xbuNtLfCHa", - "filament_id": "GFN98", + "filament_id": "OFa5cFqE", "instantiation": "true", "filament_type": [ "PAHT-S" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json b/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json index cf18d83f80..e93e7f7945 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "Am158VMH3y6FDxON", - "filament_id": "GFN98", + "filament_id": "OFWyCd0Y", "instantiation": "true", "filament_type": [ "PA-S" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json index a99ea32ca7..210dde4248 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI TPU-Aero", "from": "system", "setting_id": "O7oxTgsH9q8jlqzd", - "filament_id": "GFB99", + "filament_id": "OFNX5uRT", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json index 159561dbbd..cdfe19f343 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI TPU-Aero", "from": "system", "setting_id": "FR1LQ5DM0upGQQfs", - "filament_id": "GFB99", + "filament_id": "OFNX5uRT", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero.json index 70f7e16ecd..fb7f6a16fe 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "BARooxJKaDXbGd9B", - "filament_id": "GFU99", + "filament_id": "OFNX5uRT", "instantiation": "true", "filament_type": [ "TPU-AERO" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json index 897e274d70..fcbec8eaa5 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI TPU-GF", "setting_id": "GufOfCCphUDzeSo1", - "filament_id": "GFB99", + "filament_id": "OFOysPuE", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json index 0bd0d3ce6a..f295b881de 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI TPU-GF", "setting_id": "nY6q9vd6lpaXiQpc", - "filament_id": "GFB99", + "filament_id": "OFOysPuE", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json index 528ae87a68..0a6c26ed10 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", "inherits": "QIDI TPU-GF", "setting_id": "67agKUajM0pFFhia", - "filament_id": "GFB99", + "filament_id": "OFOysPuE", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json index 1921fd982c..7eccf9202f 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "RgmbbSJpyUyTXPO9", - "filament_id": "GFB99", + "filament_id": "OFKjlAbC", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json index d800b11f70..da545ecdb9 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "aiGnr6fBoUCuwPS5", - "filament_id": "GFB99", + "filament_id": "OFKjlAbC", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json index 082b2893a3..ee25c8c7df 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "G0qM351aUv23WFmP", - "filament_id": "GFB99", + "filament_id": "OFKjlAbC", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json index 9ae8202bce..73f3ad14d1 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "2AOnWEOsaS2w9Nmr", - "filament_id": "GFN98", + "filament_id": "OFKjlAbC", "instantiation": "true", "filament_type": [ "UltraPA-CF25" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json index 60731be079..c0a87567b7 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "y4aq26TNkKEafwbN", - "filament_id": "GFL99", + "filament_id": "OFnsWQTp", "instantiation": "true", "slow_down_layer_time": [ "8" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json index a33c51e4b6..4c87714064 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "1y0tvUmMkDHYmvWC", - "filament_id": "GFL99", + "filament_id": "OFnsWQTp", "instantiation": "true", "slow_down_layer_time": [ "8" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json index 6a9b8b61f2..6cbeef948f 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "n4ywS2KDL59hb8nA", - "filament_id": "GFB99", + "filament_id": "OFnsWQTp", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json index 2c556b42d6..df4bc13bfc 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "AZB82l14yp3vT5sz", - "filament_id": "GFB99", + "filament_id": "OFnsWQTp", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json index 825fc4d3bd..f64fa54a11 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "0ZZ9ygXQqnKrrWlL", - "filament_id": "GFB99", + "filament_id": "OFnsWQTp", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json index b80cb7bbe8..9ca1b0488f 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "NANyXYa8NOQ45Gy2", - "filament_id": "GFL99", + "filament_id": "OFnsWQTp", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json index 1002faa656..508cf24436 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi ASA-Aero", "from": "system", "setting_id": "OVQGLLS3QOoDEPNp", - "filament_id": "GFB99", + "filament_id": "OF0TjJ0G", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json index e70b832791..3b68bf48c5 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi ASA-Aero", "from": "system", "setting_id": "FKWhpunDSV0iusbz", - "filament_id": "GFB99", + "filament_id": "OF0TjJ0G", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json index 72e771f083..216db80864 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "xTg8UPJXoXdyGccz", - "filament_id": "GFB99", + "filament_id": "OF0TjJ0G", "instantiation": "true", "filament_type": [ "ASA-AERO" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json index 7e1c6c50f4..a2d9584778 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "OLkg128vxsk27w03", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json index 4e79e3b9d4..961629bae2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "pGOT3C5eREsHRylS", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json index 95c9fa660c..2e5cf7b682 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "QRlzPtO4mqLKcdws", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json index 81a1153f11..e62e501e59 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "vLLCDxhI2GR76M1p", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json index f68bcca3f0..2369d6b6c6 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "6pY4I5kAFdSYPOte", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json index 4b2cbc742d..7106465ea0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "A85OmyjS63OgZa0V", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json index e070398a5e..03f2d457fa 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "1CBWjstSdMJLJWuv", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json index 28a74dadb1..fbeaa4c1c1 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "UIsup1TGWKg0Fq72", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json index 422c63c216..c4ae902f99 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "HQupWXd5yKceVrm4", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json index e24a3519bf..9cd5b1a694 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "R6FcpVRhnSp0i8bK", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json index 2f3fa6a9d8..926830393f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "sE2DGjOmcjRuuh0z", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA.json b/resources/profiles/Qidi/filament/Qidi Generic ASA.json index e7878476b5..d6aee78840 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "WTOEo36YTIFcXDaI", - "filament_id": "GFB99", + "filament_id": "OFG8vHw8", "instantiation": "true", "filament_type": [ "ASA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json index 6d920bb982..b516c65225 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "SzQLWO8poDxEU0ez", - "filament_id": "GFB99", + "filament_id": "GFG99", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json index 3f3fdb2dae..2bce0a96b0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "MMSCic1l0b3e5qe3", - "filament_id": "GFB99", + "filament_id": "GFG99", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json index 4569902a19..63611956e2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "eCR3lbTRdkYcMZgl", - "filament_id": "GFB99", + "filament_id": "GFL99", "instantiation": "true", "filament_max_volumetric_speed": [ "14" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json index 922bef83eb..8b257619c3 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "tRztgu06hBi9IxSE", - "filament_id": "GFB99", + "filament_id": "GFL99", "instantiation": "true", "filament_max_volumetric_speed": [ "14" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json index a27251d78a..a8040f89fd 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle", "from": "system", "setting_id": "HaE0HFgjT8wysrVT", - "filament_id": "GFL99", + "filament_id": "OF5UUaUM", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json index 2f0e4b53b1..13e4cbccbe 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", "from": "system", "setting_id": "vxXEJP3C4k5Zjvsx", - "filament_id": "GFL99", + "filament_id": "OF5UUaUM", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json index 866b9b9707..3e9f248a9d 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle", "from": "system", "setting_id": "VqVyXnU77CZCKsNy", - "filament_id": "GFL99", + "filament_id": "OF5UUaUM", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json index 47ac610743..2866afeee3 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle", "from": "system", "setting_id": "0504CZkoYLx6NMI0", - "filament_id": "GFL99", + "filament_id": "OF5UUaUM", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json index 4ea48e5379..689b9db770 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "dmKDk6Yb4zQFCWIe", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json index d7be267e76..649a08ca6f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "vwFHzxD2MrRieUIw", - "filament_id": "GFB99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_settings_id": [ "Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json index 9884783666..8b663fde80 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "wlXNWvECV8ylNVFF", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json index 751e859201..ad0dd1e2b3 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "gR4NZ8mgTNVxxjhh", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json index 3ceedcf5da..6860035d96 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "wCdBhg6B4tQZw7dp", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json index 865f18fe1d..c34e9563a0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "7Bxn8OUT1MJbNvxC", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json index 320e1a5e37..a29f72ac49 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "miQxMqjI3odS4V1O", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json index 96d49de862..63b6dcfd94 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "WwUGv09h9thWkzMf", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json index 5942ed4406..fe0c370b40 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "oAIJyTMV5EnXTJDF", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json index 62529fb34e..834b6b82cc 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "Ya2viE6yXmdshs75", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json index 88086dd8e5..17212d9d74 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "XUhGdonOGCUI34EH", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json index 7ed74cb2d5..39a7b80db0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "yvokLiCctDUmcDCR", - "filament_id": "GFB99", + "filament_id": "OFwHPTvy", "instantiation": "true", "pressure_advance": [ "0.034" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json index 225c8203c7..4d5746ee75 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "gZxafcPwX1hqI7Dm", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json index 662d6b70e9..eb93efa8f0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "j6fJ7L02mVcZ01fO", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json index 85de90bcfc..38a2600264 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "KTkq14RsduGBSdMZ", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json index 6d7b0c81e9..7593f9724c 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "xiomvJqo2HAwsxT0", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json index d81651533a..dc501ef7e5 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "3SemJWSvKeN7OXVy", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+.json index cf8733d478..7302486ec4 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "LNjBixpjLg5i8P1d", - "filament_id": "GFL99", + "filament_id": "OFwHPTvy", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json index 15423913f8..dff4ce7559 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU 95A", "from": "system", "setting_id": "0gGSrFIulk4gPLSp", - "filament_id": "GFB99", + "filament_id": "OFN0pBpo", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json index f83e24e147..f1add02a4f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU 95A", "from": "system", "setting_id": "5fkE2aGkghsMdZ1W", - "filament_id": "GFB99", + "filament_id": "OFN0pBpo", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json index d83d0599af..2c4e76ead5 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "JWZrlYnOOlGpTEg6", - "filament_id": "GFU99", + "filament_id": "OFN0pBpo", "instantiation": "true", "filament_type": [ "TPU" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json index ff81ed6743..963e845d67 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU", "from": "system", "setting_id": "s0MMbJlTt9Cbh8FQ", - "filament_id": "GFB99", + "filament_id": "GFU99", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json index 4e9f07c0c5..9e4acc8225 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU", "from": "system", "setting_id": "KqdGTkLW1x7oZpvj", - "filament_id": "GFB99", + "filament_id": "GFU99", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json index 072f445d57..f5db4b48f9 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "0J1PKDesfiwmiXT3", - "filament_id": "GFB99", + "filament_id": "OFa6L3Of", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json index 02776d5d00..0870f4d962 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "CYzutFjZzD3tLXwM", - "filament_id": "GFB99", + "filament_id": "OFa6L3Of", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json index 60a8329be2..c036fb4fba 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "YJvwrEo0BwfXMOqo", - "filament_id": "GFB99", + "filament_id": "OFa6L3Of", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json index e6faf129d7..69b6bcd945 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0pBt0usHW6MGQZXl", - "filament_id": "GFB99", + "filament_id": "OFa6L3Of", "instantiation": "true", "filament_type": [ "PC-ABS-FR" diff --git a/resources/profiles/Qidi/filament/Qidi PLA-CF.json b/resources/profiles/Qidi/filament/Qidi PLA-CF.json index 6b8a3e8899..6db1fa32e2 100644 --- a/resources/profiles/Qidi/filament/Qidi PLA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "oqzsRA4OuCqTWPGM", - "filament_id": "GFL98", + "filament_id": "OFqyIUDi", "instantiation": "true", "filament_flow_ratio": [ "0.96" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json index aa18a6f5e7..172ba9b6f0 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi TPU 95A-HF", "from": "system", "setting_id": "zqfVVsyY5ZMsfqjK", - "filament_id": "GFB99", + "filament_id": "OFOW9K96", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json index 7679296a7b..89c1974bb1 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi TPU 95A-HF", "from": "system", "setting_id": "fZISb4jbF8jv60dL", - "filament_id": "GFB99", + "filament_id": "OFOW9K96", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json index ba588dc809..433f754f7a 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "QCS6zw9BRMWWvrCo", - "filament_id": "GFU99", + "filament_id": "OFOW9K96", "instantiation": "true", "filament_type": [ "TPU" diff --git a/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json b/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json index 4e4424936f..a8864cd29b 100644 --- a/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json +++ b/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uVa250OrqClMz41k", - "filament_id": "GFG99", + "filament_id": "OFXcfTEb", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json index 62e6a4204e..96478af664 100644 --- a/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Bambu ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFuidAEg", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json index cdfabbe5a0..8101a994d5 100644 --- a/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Bambu PETG@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFG99", + "filament_id": "OF6EOy1A", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json index 9db6ab9698..08d299380c 100644 --- a/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Bambu PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OF2UFmOo", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json index 924752466e..07f0f3291d 100644 --- a/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic PLA+@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFfdxQok", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json index d7e4f1c7ed..7e70c198c2 100644 --- a/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "HATCHBOX ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFPwi9X0", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json b/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json index 9e9abfbd09..a7cf5ed949 100644 --- a/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PETG@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFAnyzjN", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json index 2cb6be1fc3..3dcf2e340d 100644 --- a/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFiJYDPC", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json index 485db36e9a..49b3c2fe6b 100644 --- a/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Overture ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFuTFxVP", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json index 289af93715..a217128c3d 100644 --- a/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Overture PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFC2FSsV", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json index 215fb00a92..849aebe38d 100644 --- a/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFidJLn8", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json index e8fe4ba7f5..4d6101084d 100644 --- a/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFceJcLf", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 9ebc007f87..ae6dd87645 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1178,59 +1178,14 @@ "Prusa/Prusament rPLA @CORE One 0.6", "Prusa/Prusament rPLA @CORE One 0.8", "Qidi/Bambu PETG", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.8 nozzle", "Qidi/Bambu PLA", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.8 nozzle", "Qidi/HATCHBOX PETG @Qidi", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle", "Qidi/HATCHBOX PLA @Qidi", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle", "Qidi/Overture PLA @Qidi", - "Qidi/Overture PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Overture PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Overture PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Overture PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.8 nozzle", "Qidi/PolyLite PLA @Qidi", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/QIDI ABS Rapido 0.2 nozzle", + "Qidi/QIDI ABS Rapido 0.6 nozzle", + "Qidi/QIDI ABS Rapido 0.8 nozzle", "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle", "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle", "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle", @@ -1244,162 +1199,101 @@ "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle", "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle", "Qidi/QIDI PA-Ultra", - "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PA12-CF", - "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PAHT-CF", - "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PAHT-GF", - "Qidi/QIDI PAHT-GF @0.6 nozzle", - "Qidi/QIDI PAHT-GF @0.8 nozzle", - "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", "Qidi/QIDI PET-CF", - "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PET-GF", - "Qidi/QIDI PET-GF @0.6 nozzle", - "Qidi/QIDI PET-GF @0.8 nozzle", - "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PETG Basic", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PETG Rapido", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PETG Tough", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PETG Tough 0.2 nozzle", + "Qidi/QIDI PETG Tough 0.6 nozzle", + "Qidi/QIDI PETG Tough 0.8 nozzle", "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PETG Translucent", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PETG-CF", - "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PETG-GF", - "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PLA Basic", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PLA Matte Basic", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PLA Rapido", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle", + "Qidi/QIDI PLA Rapido 0.2 nozzle", + "Qidi/QIDI PLA Rapido 0.8 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PLA Rapido Matte", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PLA Rapido Metal", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PLA Rapido Silk", - "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle", "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle", + "Qidi/QIDI PLA-CF @0.6 nozzle", + "Qidi/QIDI PLA-CF @0.8 nozzle", + "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", + "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle", + "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PPS-CF", - "Qidi/QIDI PPS-CF @0.6 nozzle", - "Qidi/QIDI PPS-CF @0.8 nozzle", - "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle", @@ -1415,24 +1309,16 @@ "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle", "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI UltraPA-CF25", - "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI WOOD Rapido", - "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle", @@ -1440,28 +1326,19 @@ "Qidi/Qidi Generic PA-CF", "Qidi/Qidi Generic PC", "Qidi/Qidi Generic PETG", - "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi Generic PETG-CF", "Qidi/Qidi Generic PLA", - "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", "Qidi/Qidi Generic PLA Silk", "Qidi/Qidi Generic PLA+", - "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi Generic PLA-CF", - "Qidi/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle", "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle", "Qidi/Qidi PLA-CF", - "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle", "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle", "Qidi/Tinmorry PETG-ECO", @@ -3028,62 +2905,7 @@ "OrcaArena/OrcaArena Generic ABS", "Prusa/Prusa Generic ABS", "Prusa/Prusa Generic ABS HF", - "Qidi/Bambu ABS", - "Qidi/Bambu PETG", - "Qidi/Bambu PLA", - "Qidi/HATCHBOX ABS", - "Qidi/HATCHBOX PETG", - "Qidi/HATCHBOX PLA", - "Qidi/Overture ABS", - "Qidi/Overture PLA", - "Qidi/PolyLite ABS", - "Qidi/PolyLite PLA", - "Qidi/QIDI ABS Odorless", - "Qidi/QIDI ABS Rapido", - "Qidi/QIDI ABS Rapido 0.2 nozzle", - "Qidi/QIDI ABS Rapido 0.6 nozzle", - "Qidi/QIDI ABS Rapido 0.8 nozzle", - "Qidi/QIDI ABS Rapido Metal", - "Qidi/QIDI ABS-GF", - "Qidi/QIDI ABS-GF10", - "Qidi/QIDI ABS-GF25", - "Qidi/QIDI ASA", - "Qidi/QIDI ASA-CF", - "Qidi/QIDI PA-Ultra", - "Qidi/QIDI PA12-CF", - "Qidi/QIDI PAHT-CF", - "Qidi/QIDI PAHT-GF", - "Qidi/QIDI PEBA 95A", - "Qidi/QIDI PET-CF", - "Qidi/QIDI PET-GF", - "Qidi/QIDI PETG Basic", - "Qidi/QIDI PETG Rapido", - "Qidi/QIDI PETG Tough", - "Qidi/QIDI PETG Translucent", - "Qidi/QIDI PETG-CF", - "Qidi/QIDI PETG-GF", - "Qidi/QIDI PLA Basic", - "Qidi/QIDI PLA Matte Basic", - "Qidi/QIDI PLA Rapido", - "Qidi/QIDI PLA Rapido Matte", - "Qidi/QIDI PLA Rapido Metal", - "Qidi/QIDI PLA Rapido Silk", - "Qidi/QIDI PPS-CF", - "Qidi/QIDI PPS-GF", - "Qidi/QIDI TPU-Aero", - "Qidi/QIDI TPU-GF", - "Qidi/QIDI UltraPA-CF25", - "Qidi/QIDI WOOD Rapido", - "Qidi/Qidi ASA-Aero", "Qidi/Qidi Generic ABS", - "Qidi/Qidi Generic ASA", - "Qidi/Qidi Generic PETG", - "Qidi/Qidi Generic PLA", - "Qidi/Qidi Generic PLA+", - "Qidi/Qidi Generic TPU", - "Qidi/Qidi Generic TPU 95A", - "Qidi/Qidi PC-ABS-FR", - "Qidi/Qidi TPU 95A-HF", "Ratrig/RatRig BigNozzle ABS", "Ratrig/RatRig Generic ABS", "Ratrig/RatRig PunkFil ABS", @@ -3287,17 +3109,7 @@ "Lulzbot/Lulzbot 2.85mm PETG", "MagicMaker/MM Generic PEEK", "OrcaArena/OrcaArena Generic PETG", - "Qidi/Bambu PETG", - "Qidi/HATCHBOX PETG", - "Qidi/QIDI PETG Basic", - "Qidi/QIDI PETG Rapido", - "Qidi/QIDI PETG Tough", - "Qidi/QIDI PETG Tough 0.2 nozzle", - "Qidi/QIDI PETG Tough 0.6 nozzle", - "Qidi/QIDI PETG Tough 0.8 nozzle", - "Qidi/QIDI PETG Translucent", "Qidi/Qidi Generic PETG", - "Qidi/Tinmorry PETG-ECO", "Ratrig/RatRig BigNozzle PETG", "Ratrig/RatRig Generic PETG", "SecKit/SecKit Generic PETG", @@ -3556,10 +3368,7 @@ "Custom/Generic PLA-CF", "FLSun/FLSun Generic PLA-CF", "OrcaArena/OrcaArena Generic PLA-CF", - "Qidi/QIDI PAHT-GF", - "Qidi/QIDI PLA-CF", "Qidi/Qidi Generic PLA-CF", - "Qidi/Qidi PLA-CF", "Ratrig/RatRig Generic PLA-CF", "SecKit/SecKit Generic PLA-CF", "Tiertime/Tiertime Generic PLA-CF", @@ -3697,23 +3506,7 @@ "Prusa/Prusa Generic PLA-CF", "Prusa/Prusament PLA", "Prusa/Prusament rPLA", - "Qidi/Bambu PLA", - "Qidi/Generic PLA+", - "Qidi/HATCHBOX PLA", - "Qidi/Overture PLA", - "Qidi/PolyLite PLA", - "Qidi/QIDI PLA Basic", - "Qidi/QIDI PLA Matte Basic", - "Qidi/QIDI PLA Rapido", - "Qidi/QIDI PLA Rapido 0.2 nozzle", - "Qidi/QIDI PLA Rapido 0.8 nozzle", - "Qidi/QIDI PLA Rapido Matte", - "Qidi/QIDI PLA Rapido Metal", - "Qidi/QIDI PLA Rapido Silk", - "Qidi/QIDI WOOD Rapido", "Qidi/Qidi Generic PLA", - "Qidi/Qidi Generic PLA High Speed", - "Qidi/Qidi Generic PLA+", "Ratrig/RatRig BigNozzle PLA", "Ratrig/RatRig BigNozzle TPU", "Ratrig/RatRig Generic PLA", @@ -3842,17 +3635,6 @@ "InfiMech/Other PA-CF", "OrcaArena/OrcaArena Generic PA-CF", "Prusa/Prusament PA-CF", - "Qidi/QIDI PA12-CF", - "Qidi/QIDI PAHT-CF", - "Qidi/QIDI PAHT-GF", - "Qidi/QIDI PET-CF", - "Qidi/QIDI PET-GF", - "Qidi/QIDI PETG-CF", - "Qidi/QIDI PETG-GF", - "Qidi/QIDI PPS-CF", - "Qidi/QIDI Support For PAHT", - "Qidi/QIDI Support For PET/PA", - "Qidi/QIDI UltraPA-CF25", "Qidi/Qidi Generic PA-CF", "Ratrig/RatRig Generic PA-CF", "SecKit/SecKit Generic PA-CF", @@ -3884,7 +3666,6 @@ "OrcaArena/OrcaArena Generic PA", "Prusa/Prusa Generic PA", "Prusa/Prusa Generic PA-CF", - "Qidi/QIDI PA-Ultra", "Qidi/Qidi Generic PA", "Ratrig/RatRig Generic PA", "SecKit/SecKit Generic PA", @@ -4395,10 +4176,7 @@ "Prusa/Prusa Generic FLEX", "Prusa/Prusa Generic TPU", "Prusa/Prusa Generic TPU HF", - "Qidi/QIDI TPU-Aero", "Qidi/Qidi Generic TPU", - "Qidi/Qidi Generic TPU 95A", - "Qidi/Qidi TPU 95A-HF", "Ratrig/RatRig Generic TPU", "SecKit/SecKit Generic TPU", "Tiertime/Tiertime Generic TPU", @@ -4611,24 +4389,72 @@ "OF0M6QAQ": [ "OrcaFilamentLibrary/Elegoo PLA Galaxy" ], + "OF0TjJ0G": [ + "Qidi/Qidi ASA-Aero" + ], + "OF0Y5MLd": [ + "Qidi/QIDI PETG-GF" + ], + "OF0z1XpN": [ + "Qidi/QIDI PLA Rapido Silk" + ], "OF102WKM": [ "OrcaFilamentLibrary/Elegoo PETG PRO" ], + "OF1Zypyy": [ + "Qidi/QIDI PETG Tough" + ], + "OF2UFmOo": [ + "Qidi/Bambu PLA" + ], "OF3GKs2i": [ "OrcaFilamentLibrary/eSUN PLA-Matte" ], + "OF3XeEuV": [ + "Qidi/QIDI PET-GF" + ], + "OF48G7He": [ + "Qidi/QIDI PETG Tough 0.8 nozzle" + ], "OF4fgpse": [ "OrcaFilamentLibrary/Elegoo PLA Marble" ], + "OF4gzzE4": [ + "Qidi/QIDI PET-CF" + ], + "OF5UUaUM": [ + "Qidi/Qidi Generic PLA High Speed" + ], + "OF6EOy1A": [ + "Qidi/Bambu PETG" + ], "OF79FFkO": [ "OrcaFilamentLibrary/Elegoo PC-FR" ], + "OF7cv1Ub": [ + "Qidi/QIDI PLA-CF" + ], "OF8HQmJD": [ "OrcaFilamentLibrary/Elegoo PLA Sparkle" ], + "OF8WvPVL": [ + "Qidi/QIDI ABS Rapido 0.8 nozzle" + ], "OF9qvJxV": [ "OrcaFilamentLibrary/Elegoo PLA Translucent2" ], + "OFAUDGEQ": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "OFAdAYYk": [ + "Qidi/QIDI PPS-CF" + ], + "OFAnyzjN": [ + "Qidi/HATCHBOX PETG" + ], + "OFC2FSsV": [ + "Qidi/Overture PLA" + ], "OFD5e0sH": [ "OrcaFilamentLibrary/Elegoo Rapid PLA+" ], @@ -4641,6 +4467,12 @@ "OFDNiRTx": [ "OrcaFilamentLibrary/Elegoo PLA+" ], + "OFFIL5pD": [ + "Qidi/QIDI PA12-CF" + ], + "OFG8vHw8": [ + "Qidi/Qidi Generic ASA" + ], "OFICPchn": [ "OrcaFilamentLibrary/Elegoo PLA Basic" ], @@ -4656,6 +4488,12 @@ "OFJsqMzx": [ "OrcaFilamentLibrary/Generic PLA Matte" ], + "OFK820gS": [ + "Qidi/QIDI ASA" + ], + "OFKjlAbC": [ + "Qidi/QIDI UltraPA-CF25" + ], "OFLSBS99": [ "OrcaFilamentLibrary/Generic SBS" ], @@ -4665,6 +4503,30 @@ "OFMQJToc": [ "OrcaFilamentLibrary/Elegoo PETG-GF" ], + "OFN0X7oN": [ + "Qidi/QIDI PLA Basic" + ], + "OFN0pBpo": [ + "Qidi/Qidi Generic TPU 95A" + ], + "OFNX5uRT": [ + "Qidi/QIDI TPU-Aero" + ], + "OFOW9K96": [ + "Qidi/Qidi TPU 95A-HF" + ], + "OFOysPuE": [ + "Qidi/QIDI TPU-GF" + ], + "OFPokkKe": [ + "Qidi/QIDI PETG-CF" + ], + "OFPwi9X0": [ + "Qidi/HATCHBOX ABS" + ], + "OFQZINrX": [ + "Qidi/QIDI ABS-GF10" + ], "OFQhLoxN": [ "OrcaFilamentLibrary/Elegoo PLA Wood" ], @@ -4674,40 +4536,133 @@ "OFRS2Ggt": [ "OrcaFilamentLibrary/Generic PP-CF" ], + "OFSSuKRr": [ + "Qidi/QIDI PETG Basic" + ], "OFT3TqB6": [ "OrcaFilamentLibrary/Elas ASA" ], + "OFToBodi": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "OFUJw3Lx": [ + "Qidi/QIDI PEBA 95A" + ], + "OFUkpobY": [ + "Qidi/QIDI PAHT-CF" + ], + "OFV4hD1o": [ + "Qidi/QIDI PLA Rapido Metal" + ], "OFVLuVmD": [ "OrcaFilamentLibrary/Elegoo Rapid PETG" ], + "OFVhG0yM": [ + "Qidi/QIDI ABS Odorless" + ], + "OFW8UdlP": [ + "Qidi/QIDI ABS Rapido" + ], + "OFWkCAdc": [ + "Qidi/QIDI PETG Tough 0.2 nozzle" + ], + "OFWyCd0Y": [ + "Qidi/QIDI Support For PET/PA" + ], + "OFXNO5Of": [ + "Qidi/QIDI PLA Rapido 0.2 nozzle" + ], + "OFXcfTEb": [ + "Qidi/Tinmorry PETG-ECO" + ], + "OFXkwkn6": [ + "Qidi/QIDI PA-Ultra" + ], "OFXmQgno": [ "OrcaFilamentLibrary/eSUN PLA-Marble" ], + "OFYH00jV": [ + "Qidi/QIDI ABS-GF" + ], + "OFZAkPHG": [ + "Qidi/QIDI PPS-GF" + ], "OFZhdVnP": [ "OrcaFilamentLibrary/eSUN PLA-Basic" ], + "OFa5cFqE": [ + "Qidi/QIDI Support For PAHT" + ], + "OFa6L3Of": [ + "Qidi/Qidi PC-ABS-FR" + ], + "OFbS9rjH": [ + "Qidi/QIDI PETG Rapido" + ], "OFbgt3u3": [ "OrcaFilamentLibrary/Elas PLA Basic" ], + "OFceJcLf": [ + "Qidi/PolyLite PLA" + ], "OFenGPBR": [ "OrcaFilamentLibrary/Elegoo PETG Translucent" ], + "OFeybQvK": [ + "Qidi/QIDI ABS Rapido 0.2 nozzle" + ], "OFfB1QKi": [ "Flashforge/Flashforge HS PETG", "OrcaFilamentLibrary/Generic PETG HF" ], + "OFfJoIgg": [ + "Qidi/QIDI PAHT-GF" + ], + "OFfdxQok": [ + "Qidi/Generic PLA+" + ], + "OFiJYDPC": [ + "Qidi/HATCHBOX PLA" + ], + "OFidJLn8": [ + "Qidi/PolyLite ABS" + ], + "OFjohFkg": [ + "Qidi/QIDI PETG Translucent" + ], + "OFmF1xL9": [ + "Qidi/QIDI ASA-CF" + ], + "OFmKNi3f": [ + "Qidi/QIDI PLA Rapido" + ], "OFmeQjRP": [ "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" ], + "OFnj7bPm": [ + "Qidi/QIDI ABS Rapido 0.6 nozzle" + ], + "OFnsWQTp": [ + "Qidi/QIDI WOOD Rapido" + ], "OFpwg2Qh": [ "OrcaFilamentLibrary/Elegoo ASA-CF" ], + "OFqPp2yL": [ + "Qidi/QIDI PETG Tough 0.6 nozzle" + ], "OFqh1Ngp": [ "OrcaFilamentLibrary/Elegoo PLA-CF" ], + "OFqyIUDi": [ + "Qidi/Qidi PLA-CF" + ], "OFrgQ1Ns": [ "OrcaFilamentLibrary/Elas PLA Pro" ], + "OFs1CbB1": [ + "Qidi/QIDI PLA Rapido 0.8 nozzle" + ], "OFs6lLH7": [ "OrcaFilamentLibrary/Elegoo PLA Silk" ], @@ -4717,12 +4672,27 @@ "OFsNZcid": [ "OrcaFilamentLibrary/PolyLite Dual PLA" ], + "OFuTFxVP": [ + "Qidi/Overture ABS" + ], + "OFuidAEg": [ + "Qidi/Bambu ABS" + ], "OFutwD6f": [ "OrcaFilamentLibrary/Elegoo PLA Glow" ], + "OFv2NHLC": [ + "Qidi/QIDI ABS-GF25" + ], + "OFvN3117": [ + "Qidi/QIDI PLA Matte Basic" + ], "OFw4OHWE": [ "OrcaFilamentLibrary/Elas PETG Basic" ], + "OFwHPTvy": [ + "Qidi/Qidi Generic PLA+" + ], "OFzrWlH5": [ "OrcaFilamentLibrary/Elegoo PETG HF" ], From 4fc964d29343de1651451e406dc0cba4e25b9cbc Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:07:30 +0800 Subject: [PATCH 05/52] Flashforge: re-mint umbrella and OFL-riding filament_ids per family Phase 2 of the filament_id cleanup (69 within-vendor collision groups plus the 9 live library-cross groups on Creator 5/5 Pro). 507 filament_id edits + 12 compatible_printers trims (G3U 0.6/0.8 bases and HS bases over-claiming printers covered by dedicated variants): - The FFG01 umbrella (~140 presets across many families) is broken up: the git-verified introducing family (Flashforge Generic PLA) keeps FFG01, and 83 other families get fresh deterministic mints; the GFB99/GFG99/GFL99 G3U-era block is resolved the same way. - Flashforge-branded presets riding OrcaFilamentLibrary generic ids (OGFB99/OGFG99/OGFL98/OGFL99/OGFN96/OGFN98/OGFS98/OGFS99/OGFU99) get their own family mints; true generic tunings (Generic PLA / PLA Silk / BVOH) keep the library id with the library base name (alias-shadow-consistent). - Layout deviation, signed off: minted ids are declared as own keys on every instantiated member instead of new @base roots, because these families inherit up to six heterogeneous per-era umbrella parents and config-preserving roots would add ~80 artificial files. The snapshot ledger records the resulting instantiated_with_id/id_overrides growth, which is exactly the ratchet mechanism for keeping such shapes visible. Verified: config-equivalence gate zero unexpected diffs; extra check exit 0; --check exit 0; validator -l 2 exit 0; extended -f -v Flashforge exit 0 (was 69 groups + 9 library-cross). --- .../FlashForge PC @FF G4 0.6 HF nozzle.json | 1 + .../FlashForge PC @FF G4 0.6 nozzle.json | 1 + .../FlashForge PC @FF G4 0.8 HF nozzle.json | 1 + .../FlashForge PC @FF G4P 0.6 HF nozzle.json | 1 + .../FlashForge PC @FF G4P 0.6 nozzle.json | 1 + .../FlashForge PC @FF G4P 0.8 HF nozzle.json | 1 + .../FlashForge PPS @FF G4 0.6 HF nozzle.json | 1 + .../FlashForge PPS @FF G4 0.6 nozzle.json | 1 + .../FlashForge PPS @FF G4 0.8 HF nozzle.json | 1 + .../FlashForge PPS @FF G4P 0.6 HF nozzle.json | 1 + .../FlashForge PPS @FF G4P 0.6 nozzle.json | 1 + .../FlashForge PPS @FF G4P 0.8 HF nozzle.json | 1 + .../FlashForge PPS-CF @FF G4 0.6 nozzle.json | 1 + .../FlashForge PPS-CF @FF G4P 0.6 nozzle.json | 1 + ...hforge ABS Basic @FF AD5M 0.25 nozzle.json | 1 + ...hforge ABS Basic @FF AD5X 0.25 nozzle.json | 1 + ...shforge ABS Basic @FF AD5X 0.6 nozzle.json | 1 + ...shforge ABS Basic @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge ABS Basic @FF AD5X.json | 1 + .../filament/Flashforge ABS Basic @FF C5.json | 1 + .../Flashforge ABS Basic @FF C5P.json | 1 + ...ashforge ABS Basic @FF G4 0.25 nozzle.json | 1 + ...hforge ABS Basic @FF G4 0.6 HF nozzle.json | 1 + ...lashforge ABS Basic @FF G4 0.6 nozzle.json | 1 + ...hforge ABS Basic @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge ABS Basic @FF G4 HF.json | 1 + .../filament/Flashforge ABS Basic @FF G4.json | 1 + ...shforge ABS Basic @FF G4P 0.25 nozzle.json | 1 + ...forge ABS Basic @FF G4P 0.6 HF nozzle.json | 1 + ...ashforge ABS Basic @FF G4P 0.6 nozzle.json | 1 + ...forge ABS Basic @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge ABS Basic @FF G4P HF.json | 1 + .../Flashforge ABS Basic @FF G4P.json | 1 + .../filament/Flashforge ABS Basic.json | 1 + .../Flashforge ABS-CF @FF G4 0.6 nozzle.json | 1 + .../filament/Flashforge ABS-CF @FF G4.json | 1 + .../Flashforge ABS-CF @FF G4P 0.6 nozzle.json | 1 + .../filament/Flashforge ABS-CF @FF G4P.json | 1 + .../filament/Flashforge ABS-GF @FF C5.json | 1 + .../filament/Flashforge ABS-GF @FF C5P.json | 1 + ...hforge ASA Basic @FF AD5M 0.25 nozzle.json | 1 + ...hforge ASA Basic @FF AD5X 0.25 nozzle.json | 1 + ...shforge ASA Basic @FF AD5X 0.6 nozzle.json | 1 + ...shforge ASA Basic @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge ASA Basic @FF AD5X.json | 1 + .../filament/Flashforge ASA Basic @FF C5.json | 1 + .../Flashforge ASA Basic @FF C5P.json | 1 + ...ashforge ASA Basic @FF G4 0.25 nozzle.json | 1 + ...hforge ASA Basic @FF G4 0.6 HF nozzle.json | 1 + ...lashforge ASA Basic @FF G4 0.6 nozzle.json | 1 + ...hforge ASA Basic @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge ASA Basic @FF G4 HF.json | 1 + .../filament/Flashforge ASA Basic @FF G4.json | 1 + ...shforge ASA Basic @FF G4P 0.25 nozzle.json | 1 + ...forge ASA Basic @FF G4P 0.6 HF nozzle.json | 1 + ...ashforge ASA Basic @FF G4P 0.6 nozzle.json | 1 + ...forge ASA Basic @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge ASA Basic @FF G4P HF.json | 1 + .../Flashforge ASA Basic @FF G4P.json | 1 + .../filament/Flashforge ASA Basic.json | 1 + .../filament/Flashforge ASA-CF @FF C5.json | 1 + .../filament/Flashforge ASA-CF @FF C5P.json | 1 + .../filament/Flashforge ASA-CF @FF G4.json | 1 + .../filament/Flashforge ASA-CF @FF G4P.json | 1 + .../filament/Flashforge ASA-CF.json | 1 + .../filament/Flashforge ASA-GF @FF C5.json | 1 + .../filament/Flashforge ASA-GF @FF C5P.json | 1 + .../filament/Flashforge Generic ABS @G3U.json | 1 - ...orge Generic ASA @FF AD5M 0.25 Nozzle.json | 2 +- ...lashforge Generic ASA @G3U 0.6 Nozzle.json | 2 +- .../filament/Flashforge Generic ASA @G3U.json | 3 +- .../filament/Flashforge Generic ASA.json | 2 +- ...ashforge Generic HIPS @G3U 0.6 Nozzle.json | 2 +- .../filament/Flashforge Generic HIPS.json | 3 +- ...e Generic HS PLA @FF AD5M 0.25 Nozzle.json | 2 +- .../filament/Flashforge Generic HS PLA.json | 2 +- ...ashforge Generic PETG @G3U 0.6 Nozzle.json | 2 +- ...ashforge Generic PETG @G3U 0.8 Nozzle.json | 2 +- .../Flashforge Generic PETG @G3U.json | 4 +- ...forge Generic PETG-CF @G3U 0.6 Nozzle.json | 2 +- ...forge Generic PETG-CF @G3U 0.8 Nozzle.json | 2 +- .../Flashforge Generic PETG-CF @G3U.json | 4 +- .../Flashforge Generic PETG-CF10.json | 2 +- ...hforge Generic PLA-CF @G3U 0.6 Nozzle.json | 2 +- ...hforge Generic PLA-CF @G3U 0.8 Nozzle.json | 2 +- .../Flashforge Generic PLA-CF @G3U.json | 4 +- .../filament/Flashforge Generic PLA-CF10.json | 2 +- ...Generic PLA-SILK @FF AD5M 0.25 Nozzle.json | 2 +- .../filament/Flashforge Generic PLA-Silk.json | 2 +- .../filament/Flashforge Generic PVA.json | 2 +- .../filament/Flashforge Generic TPU.json | 2 +- .../filament/Flashforge HIPS @FF C5.json | 1 + .../filament/Flashforge HIPS @FF C5P.json | 1 + .../Flashforge HIPS @FF G4 0.6 HF nozzle.json | 1 + .../Flashforge HIPS @FF G4 0.6 nozzle.json | 1 + .../Flashforge HIPS @FF G4 0.8 HF nozzle.json | 1 + .../filament/Flashforge HIPS @FF G4 HF.json | 1 + .../filament/Flashforge HIPS @FF G4.json | 1 + ...Flashforge HIPS @FF G4P 0.6 HF nozzle.json | 1 + .../Flashforge HIPS @FF G4P 0.6 nozzle.json | 1 + ...Flashforge HIPS @FF G4P 0.8 HF nozzle.json | 1 + .../filament/Flashforge HIPS @FF G4P HF.json | 1 + .../filament/Flashforge HIPS @FF G4P.json | 1 + ...ashforge HS PETG @FF AD5M 0.25 nozzle.json | 1 + ...ashforge HS PETG @FF AD5X 0.25 nozzle.json | 1 + ...lashforge HS PETG @FF AD5X 0.6 nozzle.json | 1 + ...lashforge HS PETG @FF AD5X 0.8 nozzle.json | 1 + .../filament/Flashforge HS PETG @FF AD5X.json | 1 + .../filament/Flashforge HS PETG @FF C5.json | 1 + .../filament/Flashforge HS PETG @FF C5P.json | 1 + ...Flashforge HS PETG @FF G4 0.25 nozzle.json | 1 + ...ashforge HS PETG @FF G4 0.6 HF nozzle.json | 1 + .../Flashforge HS PETG @FF G4 0.6 nozzle.json | 1 + ...ashforge HS PETG @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge HS PETG @FF G4 HF.json | 1 + .../filament/Flashforge HS PETG @FF G4.json | 1 + ...lashforge HS PETG @FF G4P 0.25 nozzle.json | 1 + ...shforge HS PETG @FF G4P 0.6 HF nozzle.json | 1 + ...Flashforge HS PETG @FF G4P 0.6 nozzle.json | 1 + ...shforge HS PETG @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge HS PETG @FF G4P HF.json | 1 + .../filament/Flashforge HS PETG @FF G4P.json | 1 + .../filament/Flashforge HS PETG.json | 1 + ...lashforge HS PLA @FF AD5M 0.25 Nozzle.json | 2 +- ...lashforge HS PLA @FF AD5X 0.25 nozzle.json | 1 + ...Flashforge HS PLA @FF AD5X 0.6 nozzle.json | 1 + ...Flashforge HS PLA @FF AD5X 0.8 nozzle.json | 1 + .../filament/Flashforge HS PLA @FF AD5X.json | 1 + .../filament/Flashforge HS PLA @FF C5.json | 1 + .../filament/Flashforge HS PLA @FF C5P.json | 1 + .../Flashforge HS PLA @FF G4 0.25 nozzle.json | 1 + ...lashforge HS PLA @FF G4 0.6 HF nozzle.json | 1 + .../Flashforge HS PLA @FF G4 0.6 nozzle.json | 1 + ...lashforge HS PLA @FF G4 0.8 HF nozzle.json | 1 + .../filament/Flashforge HS PLA @FF G4 HF.json | 1 + .../filament/Flashforge HS PLA @FF G4.json | 1 + ...Flashforge HS PLA @FF G4P 0.25 nozzle.json | 1 + ...ashforge HS PLA @FF G4P 0.6 HF nozzle.json | 1 + .../Flashforge HS PLA @FF G4P 0.6 nozzle.json | 1 + ...ashforge HS PLA @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge HS PLA @FF G4P HF.json | 1 + .../filament/Flashforge HS PLA @FF G4P.json | 1 + ... HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json | 1 + .../Flashforge HS PLA Burnt Ti @FF G4 HF.json | 1 + ...HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json | 1 + ...Flashforge HS PLA Burnt Ti @FF G4P HF.json | 1 + ...orge HS PLA Burnt Ti@FF G4 0.6 nozzle.json | 1 + ...e HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json | 1 + ...rge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json | 1 + ... HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json | 1 + .../filament/Flashforge HS PLA.json | 6 +- .../Flashforge PA @FF G4 0.6 HF nozzle.json | 1 + .../filament/Flashforge PA @FF G4 HF.json | 1 + .../filament/Flashforge PA @FF G4.json | 1 + .../Flashforge PA @FF G4P 0.6 HF nozzle.json | 1 + .../filament/Flashforge PA @FF G4P HF.json | 1 + .../filament/Flashforge PA @FF G4P.json | 1 + .../filament/Flashforge PA-CF @FF C5.json | 1 + .../filament/Flashforge PA-CF @FF C5P.json | 1 + .../filament/Flashforge PA-CF @FF G4.json | 1 + .../filament/Flashforge PA-CF @FF G4P.json | 1 + .../filament/Flashforge PA12-CF.json | 1 + .../filament/Flashforge PA6-CF.json | 1 + .../filament/Flashforge PA66-CF.json | 1 + .../filament/Flashforge PAHT-CF @FF C5.json | 1 + .../filament/Flashforge PAHT-CF @FF C5P.json | 1 + .../filament/Flashforge PAHT-CF @FF G4.json | 1 + .../filament/Flashforge PAHT-CF @FF G4P.json | 1 + .../filament/Flashforge PET-CF @FF C5.json | 1 + .../filament/Flashforge PET-CF @FF C5P.json | 1 + .../filament/Flashforge PET-CF.json | 1 + ...forge PETG Basic @FF AD5M 0.25 nozzle.json | 1 + .../filament/Flashforge PETG Basic.json | 1 + ...shforge PETG Pro @FF AD5M 0.25 nozzle.json | 1 + ...shforge PETG Pro @FF AD5X 0.25 nozzle.json | 1 + ...ashforge PETG Pro @FF AD5X 0.6 nozzle.json | 1 + ...ashforge PETG Pro @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PETG Pro @FF AD5X.json | 1 + .../filament/Flashforge PETG Pro @FF C5.json | 1 + .../filament/Flashforge PETG Pro @FF C5P.json | 1 + ...lashforge PETG Pro @FF G4 0.25 nozzle.json | 1 + ...shforge PETG Pro @FF G4 0.6 HF nozzle.json | 1 + ...Flashforge PETG Pro @FF G4 0.6 nozzle.json | 1 + ...shforge PETG Pro @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PETG Pro @FF G4 HF.json | 1 + .../filament/Flashforge PETG Pro @FF G4.json | 1 + ...ashforge PETG Pro @FF G4P 0.25 nozzle.json | 1 + ...hforge PETG Pro @FF G4P 0.6 HF nozzle.json | 1 + ...lashforge PETG Pro @FF G4P 0.6 nozzle.json | 1 + ...hforge PETG Pro @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PETG Pro @FF G4P HF.json | 1 + .../filament/Flashforge PETG Pro @FF G4P.json | 1 + .../filament/Flashforge PETG Pro.json | 1 + ...PETG Transparent @FF AD5M 0.25 nozzle.json | 1 + ...PETG Transparent @FF AD5X 0.25 nozzle.json | 1 + ... PETG Transparent @FF AD5X 0.6 nozzle.json | 1 + ... PETG Transparent @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PETG Transparent @FF AD5X.json | 1 + .../Flashforge PETG Transparent @FF C5.json | 1 + .../Flashforge PETG Transparent @FF C5P.json | 1 + ...e PETG Transparent @FF G4 0.25 nozzle.json | 1 + ...PETG Transparent @FF G4 0.6 HF nozzle.json | 1 + ...ge PETG Transparent @FF G4 0.6 nozzle.json | 1 + ...PETG Transparent @FF G4 0.8 HF nozzle.json | 1 + ...Flashforge PETG Transparent @FF G4 HF.json | 1 + .../Flashforge PETG Transparent @FF G4.json | 1 + ... PETG Transparent @FF G4P 0.25 nozzle.json | 1 + ...ETG Transparent @FF G4P 0.6 HF nozzle.json | 1 + ...e PETG Transparent @FF G4P 0.6 nozzle.json | 1 + ...ETG Transparent @FF G4P 0.8 HF nozzle.json | 1 + ...lashforge PETG Transparent @FF G4P HF.json | 1 + .../Flashforge PETG Transparent @FF G4P.json | 1 + .../filament/Flashforge PETG Transparent.json | 1 + ...lashforge PETG-CF @FF AD5X 0.6 nozzle.json | 1 + ...lashforge PETG-CF @FF AD5X 0.8 nozzle.json | 1 + .../filament/Flashforge PETG-CF @FF AD5X.json | 1 + .../filament/Flashforge PETG-CF @FF C5.json | 1 + .../filament/Flashforge PETG-CF @FF C5P.json | 1 + .../Flashforge PETG-CF @FF G4 0.6 nozzle.json | 1 + .../filament/Flashforge PETG-CF @FF G4.json | 1 + ...Flashforge PETG-CF @FF G4P 0.6 nozzle.json | 1 + .../filament/Flashforge PETG-CF @FF G4P.json | 1 + .../filament/Flashforge PETG-CF.json | 6 +- .../Flashforge PLA Matte @FF C5.json | 1 + .../Flashforge PLA Matte @FF C5P.json | 1 + .../Flashforge PLA Metal @FF C5.json | 1 + .../Flashforge PLA Metal @FF C5P.json | 1 + .../filament/Flashforge PLA Pro @FF C5.json | 1 + .../filament/Flashforge PLA Pro @FF C5P.json | 1 + ...hforge PLA Basic @FF AD5M 0.25 nozzle.json | 1 + ...hforge PLA Basic @FF AD5X 0.25 nozzle.json | 1 + ...shforge PLA Basic @FF AD5X 0.6 nozzle.json | 1 + ...shforge PLA Basic @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Basic @FF AD5X.json | 1 + .../filament/Flashforge PLA Basic @FF C5.json | 1 + .../Flashforge PLA Basic @FF C5P.json | 1 + ...ashforge PLA Basic @FF G4 0.25 nozzle.json | 1 + ...hforge PLA Basic @FF G4 0.6 HF nozzle.json | 1 + ...lashforge PLA Basic @FF G4 0.6 nozzle.json | 1 + ...hforge PLA Basic @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PLA Basic @FF G4 HF.json | 1 + .../filament/Flashforge PLA Basic @FF G4.json | 1 + ...shforge PLA Basic @FF G4P 0.25 nozzle.json | 1 + ...forge PLA Basic @FF G4P 0.6 HF nozzle.json | 1 + ...ashforge PLA Basic @FF G4P 0.6 nozzle.json | 1 + ...forge PLA Basic @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PLA Basic @FF G4P HF.json | 1 + .../Flashforge PLA Basic @FF G4P.json | 1 + .../filament/Flashforge PLA Basic.json | 1 + ...hforge PLA Buint Ti @FF G4 0.8 nozzle.json | 1 + ...forge PLA Buint Ti @FF G4P 0.8 nozzle.json | 1 + ...PLA Color Change @FF AD5M 0.25 nozzle.json | 1 + ...PLA Color Change @FF AD5X 0.25 nozzle.json | 1 + ... PLA Color Change @FF AD5X 0.6 nozzle.json | 1 + ... PLA Color Change @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Color Change @FF AD5X.json | 1 + .../Flashforge PLA Color Change @FF C5.json | 1 + .../Flashforge PLA Color Change @FF C5P.json | 1 + ...e PLA Color Change @FF G4 0.25 nozzle.json | 1 + ...PLA Color Change @FF G4 0.6 HF nozzle.json | 1 + ...ge PLA Color Change @FF G4 0.6 nozzle.json | 1 + ...PLA Color Change @FF G4 0.8 HF nozzle.json | 1 + ...Flashforge PLA Color Change @FF G4 HF.json | 1 + .../Flashforge PLA Color Change @FF G4.json | 1 + ... PLA Color Change @FF G4P 0.25 nozzle.json | 1 + ...LA Color Change @FF G4P 0.6 HF nozzle.json | 1 + ...e PLA Color Change @FF G4P 0.6 nozzle.json | 1 + ...LA Color Change @FF G4P 0.8 HF nozzle.json | 1 + ...lashforge PLA Color Change @FF G4P HF.json | 1 + .../Flashforge PLA Color Change @FF G4P.json | 1 + .../filament/Flashforge PLA Color Change.json | 1 + ...forge PLA Galaxy @FF AD5M 0.25 nozzle.json | 1 + ...forge PLA Galaxy @FF AD5X 0.25 nozzle.json | 1 + ...hforge PLA Galaxy @FF AD5X 0.6 nozzle.json | 1 + ...hforge PLA Galaxy @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Galaxy @FF AD5X.json | 1 + .../Flashforge PLA Galaxy @FF C5.json | 1 + .../Flashforge PLA Galaxy @FF C5P.json | 1 + ...shforge PLA Galaxy @FF G4 0.25 nozzle.json | 1 + ...forge PLA Galaxy @FF G4 0.6 HF nozzle.json | 1 + ...ashforge PLA Galaxy @FF G4 0.6 nozzle.json | 1 + ...forge PLA Galaxy @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PLA Galaxy @FF G4 HF.json | 1 + .../Flashforge PLA Galaxy @FF G4.json | 1 + ...hforge PLA Galaxy @FF G4P 0.25 nozzle.json | 1 + ...orge PLA Galaxy @FF G4P 0.6 HF nozzle.json | 1 + ...shforge PLA Galaxy @FF G4P 0.6 nozzle.json | 1 + ...orge PLA Galaxy @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PLA Galaxy @FF G4P HF.json | 1 + .../Flashforge PLA Galaxy @FF G4P.json | 1 + .../filament/Flashforge PLA Galaxy.json | 1 + ...rge PLA Luminous @FF AD5M 0.25 nozzle.json | 1 + ...rge PLA Luminous @FF AD5X 0.25 nozzle.json | 1 + ...orge PLA Luminous @FF AD5X 0.6 nozzle.json | 1 + ...orge PLA Luminous @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Luminous @FF AD5X.json | 1 + .../Flashforge PLA Luminous @FF C5.json | 1 + .../Flashforge PLA Luminous @FF C5P.json | 1 + ...forge PLA Luminous @FF G4 0.25 nozzle.json | 1 + ...rge PLA Luminous @FF G4 0.6 HF nozzle.json | 1 + ...rge PLA Luminous @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PLA Luminous @FF G4 HF.json | 1 + .../Flashforge PLA Luminous @FF G4.json | 1 + ...orge PLA Luminous @FF G4P 0.25 nozzle.json | 1 + ...ge PLA Luminous @FF G4P 0.6 HF nozzle.json | 1 + ...ge PLA Luminous @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PLA Luminous @FF G4P HF.json | 1 + .../Flashforge PLA Luminous @FF G4P.json | 1 + .../filament/Flashforge PLA Luminous.json | 1 + ...hforge PLA Matte @FF AD5M 0.25 nozzle.json | 1 + ...hforge PLA Matte @FF AD5X 0.25 nozzle.json | 1 + ...shforge PLA Matte @FF AD5X 0.6 nozzle.json | 1 + ...shforge PLA Matte @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Matte @FF AD5X.json | 1 + ...ashforge PLA Matte @FF G4 0.25 nozzle.json | 1 + ...hforge PLA Matte @FF G4 0.6 HF nozzle.json | 1 + ...lashforge PLA Matte @FF G4 0.6 nozzle.json | 1 + ...hforge PLA Matte @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PLA Matte @FF G4 HF.json | 1 + .../filament/Flashforge PLA Matte @FF G4.json | 1 + ...shforge PLA Matte @FF G4P 0.25 nozzle.json | 1 + ...forge PLA Matte @FF G4P 0.6 HF nozzle.json | 1 + ...ashforge PLA Matte @FF G4P 0.6 nozzle.json | 1 + ...forge PLA Matte @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PLA Matte @FF G4P HF.json | 1 + .../Flashforge PLA Matte @FF G4P.json | 1 + .../filament/Flashforge PLA Matte.json | 1 + ...hforge PLA Metal @FF AD5M 0.25 nozzle.json | 1 + ...hforge PLA Metal @FF AD5X 0.25 nozzle.json | 1 + ...shforge PLA Metal @FF AD5X 0.6 nozzle.json | 1 + ...shforge PLA Metal @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Metal @FF AD5X.json | 1 + ...ashforge PLA Metal @FF G4 0.25 nozzle.json | 1 + ...hforge PLA Metal @FF G4 0.6 HF nozzle.json | 1 + ...lashforge PLA Metal @FF G4 0.6 nozzle.json | 1 + ...hforge PLA Metal @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PLA Metal @FF G4 HF.json | 1 + .../filament/Flashforge PLA Metal @FF G4.json | 1 + ...shforge PLA Metal @FF G4P 0.25 nozzle.json | 1 + ...forge PLA Metal @FF G4P 0.6 HF nozzle.json | 1 + ...ashforge PLA Metal @FF G4P 0.6 nozzle.json | 1 + ...forge PLA Metal @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PLA Metal @FF G4P HF.json | 1 + .../Flashforge PLA Metal @FF G4P.json | 1 + .../filament/Flashforge PLA Metal.json | 1 + ...ashforge PLA Pro @FF AD5M 0.25 nozzle.json | 1 + ...ashforge PLA Pro @FF AD5X 0.25 nozzle.json | 1 + ...lashforge PLA Pro @FF AD5X 0.6 nozzle.json | 1 + ...lashforge PLA Pro @FF AD5X 0.8 nozzle.json | 1 + .../filament/Flashforge PLA Pro @FF AD5X.json | 1 + ...Flashforge PLA Pro @FF G4 0.25 nozzle.json | 1 + ...ashforge PLA Pro @FF G4 0.6 HF nozzle.json | 1 + .../Flashforge PLA Pro @FF G4 0.6 nozzle.json | 1 + ...ashforge PLA Pro @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PLA Pro @FF G4 HF.json | 1 + .../filament/Flashforge PLA Pro @FF G4.json | 1 + ...lashforge PLA Pro @FF G4P 0.25 nozzle.json | 1 + ...shforge PLA Pro @FF G4P 0.6 HF nozzle.json | 1 + ...Flashforge PLA Pro @FF G4P 0.6 nozzle.json | 1 + ...shforge PLA Pro @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PLA Pro @FF G4P HF.json | 1 + .../filament/Flashforge PLA Pro @FF G4P.json | 1 + .../filament/Flashforge PLA Pro.json | 1 + ...shforge PLA Silk @FF AD5M 0.25 nozzle.json | 1 + ...shforge PLA Silk @FF AD5X 0.25 nozzle.json | 1 + ...ashforge PLA Silk @FF AD5X 0.6 nozzle.json | 1 + ...ashforge PLA Silk @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Silk @FF AD5X.json | 1 + .../filament/Flashforge PLA Silk @FF C5.json | 1 + .../filament/Flashforge PLA Silk @FF C5P.json | 1 + ...lashforge PLA Silk @FF G4 0.25 nozzle.json | 1 + ...shforge PLA Silk @FF G4 0.6 HF nozzle.json | 1 + ...Flashforge PLA Silk @FF G4 0.6 nozzle.json | 1 + ...shforge PLA Silk @FF G4 0.8 HF nozzle.json | 1 + .../Flashforge PLA Silk @FF G4 HF.json | 1 + .../filament/Flashforge PLA Silk @FF G4.json | 1 + ...ashforge PLA Silk @FF G4P 0.25 nozzle.json | 1 + ...hforge PLA Silk @FF G4P 0.6 HF nozzle.json | 1 + ...lashforge PLA Silk @FF G4P 0.6 nozzle.json | 1 + ...hforge PLA Silk @FF G4P 0.8 HF nozzle.json | 1 + .../Flashforge PLA Silk @FF G4P HF.json | 1 + .../filament/Flashforge PLA Silk @FF G4P.json | 1 + .../filament/Flashforge PLA Silk.json | 1 + ...orge PLA Sparkle @FF AD5M 0.25 nozzle.json | 1 + ...orge PLA Sparkle @FF AD5X 0.25 nozzle.json | 1 + ...forge PLA Sparkle @FF AD5X 0.6 nozzle.json | 1 + ...forge PLA Sparkle @FF AD5X 0.8 nozzle.json | 1 + .../Flashforge PLA Sparkle @FF AD5X.json | 1 + ...hforge PLA Sparkle @FF G4 0.25 nozzle.json | 1 + ...orge PLA Sparkle @FF G4 0.6 HF nozzle.json | 1 + ...shforge PLA Sparkle @FF G4 0.6 nozzle.json | 1 + .../Flashforge PLA Sparkle @FF G4 HF.json | 1 + .../Flashforge PLA Sparkle @FF G4.json | 1 + ...forge PLA Sparkle @FF G4P 0.25 nozzle.json | 1 + ...rge PLA Sparkle @FF G4P 0.6 HF nozzle.json | 1 + ...hforge PLA Sparkle @FF G4P 0.6 nozzle.json | 1 + .../Flashforge PLA Sparkle @FF G4P HF.json | 1 + .../Flashforge PLA Sparkle @FF G4P.json | 1 + .../filament/Flashforge PLA Sparkle.json | 1 + ...Flashforge PLA-CF @FF AD5X 0.6 nozzle.json | 1 + ...Flashforge PLA-CF @FF AD5X 0.8 nozzle.json | 1 + .../filament/Flashforge PLA-CF @FF AD5X.json | 1 + .../filament/Flashforge PLA-CF @FF C5.json | 1 + .../filament/Flashforge PLA-CF @FF C5P.json | 1 + .../Flashforge PLA-CF @FF G4 0.6 nozzle.json | 1 + .../filament/Flashforge PLA-CF @FF G4.json | 1 + .../Flashforge PLA-CF @FF G4P 0.6 nozzle.json | 1 + .../filament/Flashforge PLA-CF @FF G4P.json | 1 + .../filament/Flashforge PLA-CF.json | 6 +- .../filament/Flashforge PPA-CF @FF C5.json | 1 + .../filament/Flashforge PPA-CF @FF C5P.json | 1 + .../filament/Flashforge PPA-CF.json | 1 + .../filament/Flashforge PPA-GF.json | 1 + .../filament/Flashforge PPS @FF G4.json | 1 + .../filament/Flashforge PPS @FF G4P.json | 1 + .../filament/Flashforge PPS-CF @FF C5.json | 1 + .../filament/Flashforge PPS-CF @FF C5P.json | 1 + .../filament/Flashforge PPS-CF @FF G4.json | 1 + .../filament/Flashforge PPS-CF @FF G4P.json | 1 + .../filament/Flashforge PPS-CF.json | 1 + .../filament/Flashforge PVA @FF C5.json | 1 + .../filament/Flashforge PVA @FF C5P.json | 1 + ...ashforge TPU 65D @FF G4 0.6 HF nozzle.json | 1 + .../Flashforge TPU 65D @FF G4 0.6 nozzle.json | 1 + ...ashforge TPU 65D @FF G4 0.8 HF nozzle.json | 1 + ...shforge TPU 65D @FF G4P 0.6 HF nozzle.json | 1 + ...Flashforge TPU 65D @FF G4P 0.6 nozzle.json | 1 + ...shforge TPU 65D @FF G4P 0.8 HF nozzle.json | 1 + ...lashforge TPU 95A @FF AD5X 0.6 nozzle.json | 1 + ...lashforge TPU 95A @FF AD5X 0.8 nozzle.json | 1 + .../filament/Flashforge TPU 95A @FF AD5X.json | 1 + ...ashforge TPU 95A @FF G4 0.6 HF nozzle.json | 1 + .../Flashforge TPU 95A @FF G4 0.6 nozzle.json | 1 + ...ashforge TPU 95A @FF G4 0.8 HF nozzle.json | 1 + .../filament/Flashforge TPU 95A @FF G4.json | 1 + ...shforge TPU 95A @FF G4P 0.6 HF nozzle.json | 1 + ...Flashforge TPU 95A @FF G4P 0.6 nozzle.json | 1 + ...shforge TPU 95A @FF G4P 0.8 HF nozzle.json | 1 + .../filament/Flashforge TPU 95A @FF G4P.json | 1 + .../filament/Flashforge TPU 95A.json | 6 +- .../filament/Flashforge TPU-64D @FF C5.json | 1 + .../filament/Flashforge TPU-64D @FF C5P.json | 1 + .../filament/Flashforge TPU-90A @FF C5.json | 1 + .../filament/Flashforge TPU-90A @FF C5P.json | 1 + .../filament/Flashforge TPU-95A @FF C5.json | 1 + .../filament/Flashforge TPU-95A @FF C5P.json | 1 + .../FusRock PAHT @FF G4 0.6 HF nozzle.json | 1 + .../FusRock PAHT @FF G4 0.6 nozzle.json | 1 + .../FusRock PAHT @FF G4 0.8 HF nozzle.json | 1 + .../FusRock PAHT @FF G4P 0.6 HF nozzle.json | 1 + .../FusRock PAHT @FF G4P 0.6 nozzle.json | 1 + .../FusRock PAHT @FF G4P 0.8 HF nozzle.json | 1 + .../filament/FusRock PAHT-CF @FF C5.json | 1 + .../filament/FusRock PAHT-CF @FF C5P.json | 1 + .../FusRock PAHT-CF @FF G4 0.6 nozzle.json | 1 + .../filament/FusRock PAHT-CF @FF G4.json | 1 + .../FusRock PAHT-CF @FF G4P 0.6 nozzle.json | 1 + .../filament/FusRock PAHT-CF @FF G4P.json | 1 + .../FusRock PET @FF G4P 0.8 HF nozzle.json | 1 + .../FusRock PET-CF @FF G4 0.6 nozzle.json | 1 + .../filament/FusRock PET-CF @FF G4.json | 1 + .../FusRock PET-CF @FF G4P 0.6 nozzle.json | 1 + .../filament/FusRock PET-CF @FF G4P.json | 1 + .../filament/FusRock S-Multi @FF C5.json | 1 + .../filament/FusRock S-Multi @FF C5P.json | 1 + .../filament/FusRock S-PAHT @FF C5.json | 1 + .../filament/FusRock S-PAHT @FF C5P.json | 1 + .../FusRock/FusRock Generic NexPA-CF25.json | 2 +- ...sRock Generic PAHT-CF @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic PAHT-CF.json | 3 +- .../FusRock/FusRock Generic PAHT-GF.json | 2 +- ...usRock Generic PET-CF @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic PET-CF.json | 3 +- .../FusRock/FusRock Generic PET-GF.json | 2 +- ...sRock Generic S-Multi @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic S-Multi.json | 2 +- ...usRock Generic S-PAHT @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic S-PAHT.json | 2 +- .../filament/Generic ASA @Flashforge AD4.json | 2 +- .../Generic PET @FF G4 0.6 HF nozzle.json | 1 + .../Generic PET @FF G4 0.6 nozzle.json | 1 + .../Generic PET @FF G4 0.8 HF nozzle.json | 1 + .../filament/Generic PET @FF G4.json | 1 + .../Generic PET @FF G4P 0.6 HF nozzle.json | 1 + .../Generic PET @FF G4P 0.6 nozzle.json | 1 + .../Generic PET @FF G4P 0.8 HF nozzle.json | 1 + .../filament/Generic PET @FF G4P.json | 1 + .../Generic PETG-CF10 @Flashforge AD4.json | 2 +- .../Generic PLA Silk @Flashforge AD4.json | 2 +- .../Generic PLA-CF10 @Flashforge AD4.json | 2 +- .../Generic TPU 85A @FF AD5X 0.6 nozzle.json | 1 + .../Generic TPU 85A @FF AD5X 0.8 nozzle.json | 1 + .../filament/Generic TPU 85A @FF AD5X.json | 1 + .../filament/Generic TPU @Flashforge AD4.json | 2 +- .../filament/Generic TPU-64D @FF C5.json | 1 + .../filament/Generic TPU-64D @FF C5P.json | 1 + .../filament/Generic TPU-90A @FF C5.json | 1 + .../filament/Generic TPU-90A @FF C5P.json | 1 + .../filament/Generic TPU-95A @FF C5.json | 1 + .../filament/Generic TPU-95A @FF C5P.json | 1 + .../Polymaker CoPA @FF G4 0.6 HF nozzle.json | 1 + .../Polymaker CoPA @FF G4 0.6 nozzle.json | 1 + .../Polymaker CoPA @FF G4 0.8 HF nozzle.json | 1 + .../Polymaker CoPA @FF G4P 0.6 HF nozzle.json | 1 + .../Polymaker CoPA @FF G4P 0.6 nozzle.json | 1 + .../Polymaker CoPA @FF G4P 0.8 HF nozzle.json | 1 + .../Polymaker/Polymaker Generic CoPA.json | 2 +- .../Polymaker/Polymaker Generic S1.json | 2 +- scripts/filament_id_snapshot.json | 1421 ++++++++++++++--- 509 files changed, 1710 insertions(+), 291 deletions(-) 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 83e1c85730..3971dfdbe0 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "M9HM8tihJzV4crs8", + "filament_id": "OFL7vEML", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 f94eafbe9d..ada99c3b7a 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "08VjBSha6gjhJYgk", + "filament_id": "OFL7vEML", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 d5c6c3c33d..224f0bcecf 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "JqgkmxnjlnQ3uw1u", + "filament_id": "OFL7vEML", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 2bf41bc64b..e712311eb7 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "vvLLPvSeb5PYbT1R", + "filament_id": "OFL7vEML", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 e8806df046..2e574b8dec 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "mPJMPfFCyfWdKzMO", + "filament_id": "OFL7vEML", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 56562e51e7..f3e61a04b2 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "HTgqTUTznOlfCRAd", + "filament_id": "OFL7vEML", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 e5b251acab..cc05448a52 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "3w8fnDjkoFaJ6Nhw", + "filament_id": "OFgJX0Fc", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 7394511a16..0ba30d9ee6 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "owHbDqY55rFtSegz", + "filament_id": "OFgJX0Fc", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 87e74372e5..29ffe9c98e 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "eFK1zzT1JY9ZnEl9", + "filament_id": "OFgJX0Fc", "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 7d6d3c1a95..ae67869d15 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "E8CcstoHzax78ZJY", + "filament_id": "OFgJX0Fc", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 01672b8f65..44ca312535 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "xa22FD8bRVGsLiPJ", + "filament_id": "OFgJX0Fc", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 ff77d7095a..d6fe454c37 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "bZ9dbA8dIu9mjWyN", + "filament_id": "OFgJX0Fc", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 b1cb0787b5..0e1dfd9b33 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "4w0oK3F50O1DUqsu", + "filament_id": "OFmduKVr", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 fc6f6e975a..6133699c0b 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 @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "94vPnztRcpnbfAKx", + "filament_id": "OFmduKVr", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json index dc0989bbc4..97f3d5f8fd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "SuEfcE6AYK8N1FI4", + "filament_id": "OF5T1Y9R", "instantiation": "true", "filament_settings_id": [ "Flashforge ABS Basic @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json index 0deb98db56..e37450d400 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "gmkc6fRLMI73Iut8", + "filament_id": "OF5T1Y9R", "instantiation": "true", "cool_plate_temp": [ "0" 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 7f8ec43e72..bb30b1725b 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "fgEYZ1Mgyp1AvtwU", + "filament_id": "OF5T1Y9R", "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 0f95b37aad..a426566340 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "cIxbQMVdG5K85rJr", + "filament_id": "OF5T1Y9R", "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 4b533b00a7..bbfa73ccd4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "9GXBeuCUrScJfmJB", + "filament_id": "OF5T1Y9R", "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 d53b5cc2c1..b9251a5672 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "ds0GgE1jssl4IbF3", + "filament_id": "OF5T1Y9R", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 eb4ee53f53..0ab31a8276 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UTWbwTYuXYbBx3uw", + "filament_id": "OF5T1Y9R", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json index fe13cbb5cb..09a01dd503 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "CuckX5MsN69806ow", + "filament_id": "OF5T1Y9R", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" 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 4a3bd054b2..f9a0433cae 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "NttDJCrfB01uwMDl", + "filament_id": "OF5T1Y9R", "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 594f291957..171484abbb 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "hJd6dG6OdEffEFC7", + "filament_id": "OF5T1Y9R", "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 34d1f4e94c..7143e0b03a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "8yFCuCnEuI3dUvQy", + "filament_id": "OF5T1Y9R", "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 60847876a0..2734feeb55 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "np4fP5kghRlczOTT", + "filament_id": "OF5T1Y9R", "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 f267e9bc74..a669c267b9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "8o2maTFOXq0XR6Dm", + "filament_id": "OF5T1Y9R", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json index 1ec700928b..0d556da17d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "MBo02hFXn0ebDRdb", + "filament_id": "OF5T1Y9R", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" 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 baa7e84ede..bbf04ce6bd 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "vCsjC0UnKenzIR0O", + "filament_id": "OF5T1Y9R", "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 d4b2a75adb..29fb16653b 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "xhxVdlmh5r7meoHo", + "filament_id": "OF5T1Y9R", "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 ce8cb40ddc..1ef697a83b 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "6dlQN4Xhd6kGZ0Qn", + "filament_id": "OF5T1Y9R", "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 9518e3fb1c..12d1a7c767 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "r8WVFPozL8f5oLVJ", + "filament_id": "OF5T1Y9R", "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 80ad9a2da8..798bc592bb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "xw0pZNmhw1K4tPQ1", + "filament_id": "OF5T1Y9R", "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 3e93a31243..868e133f3e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "m6QLC2UaS3fW298i", + "filament_id": "OF5T1Y9R", "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 3b7c0a2db6..4ea4ae4577 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "Nx3Px0Zu356IKShT", + "filament_id": "OFWs8KIZ", "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 a17e48af0d..b45e46341e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "d4EGsmMeEDCOUBF2", + "filament_id": "OFWs8KIZ", "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 ed4c177d18..b925f68e88 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "9ziPFKsjESbw1pXL", + "filament_id": "OFWs8KIZ", "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 dd952e95a1..16bcc1aeb3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "NzJJs6yrSik5xuyX", + "filament_id": "OFWs8KIZ", "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 3b1b422c33..1074c58061 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UinlbuXNbad2kN0s", + "filament_id": "OFqRWRU6", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 72364ebe47..e4f1909d8a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "ycgiXY41kqNgslE3", + "filament_id": "OFqRWRU6", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 fcdb3faedd..6a0253be4a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "kjS4k8nrIdNNNoWw", + "filament_id": "OFcy60o4", "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 3294344bd4..618cfdea27 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "Y647IFVkk5JIXzte", + "filament_id": "OFcy60o4", "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 9904aea39c..bf4a2d3194 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "vaOyXUcrJ97KE7ZW", + "filament_id": "OFcy60o4", "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 4353992934..f74bcf4ab7 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "iLWq5pJ3ox9EAM1Z", + "filament_id": "OFcy60o4", "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 cb4a543dbd..4c3018a061 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "i7PUPYxy0Z9weyyA", + "filament_id": "OFcy60o4", "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 485f06e046..3aef25a533 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UUSDyOetXSOuBIUd", + "filament_id": "OFcy60o4", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 4af0b8b47c..bcbd9d4721 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "2r0kwhklE24Hp94O", + "filament_id": "OFcy60o4", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json index dae515a9aa..a852169f49 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "XWta5jJFsCxBdEPd", + "filament_id": "OFcy60o4", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" 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 4c35d0a62b..3bff670e7c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "w8O6oenp0NymzCqf", + "filament_id": "OFcy60o4", "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 e4435448ae..8fcf3f85f7 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "thhmWRzNYLYJOeR2", + "filament_id": "OFcy60o4", "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 86d4e12b4c..664728993c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "g5jiz6Q6or23BIo7", + "filament_id": "OFcy60o4", "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 890dd75f0f..fb7e77b65a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "7xmWlHHNMvXBKdYS", + "filament_id": "OFcy60o4", "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 4826e42eba..35e761b241 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "r0B8KfZ1mNWMvGqE", + "filament_id": "OFcy60o4", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json index 76cd89a82a..9d39413ec7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "quOwRRLcNfOy0sYf", + "filament_id": "OFcy60o4", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "50" 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 324c9eec04..616e70bf34 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "CBLZqLhkwf5XKO12", + "filament_id": "OFcy60o4", "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 461aa7bd0a..75777b3205 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "Df3anJxiRXLVO9hw", + "filament_id": "OFcy60o4", "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 0c0cc1aab1..401ffeabaa 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "Nu4WvBWuEhazZfh5", + "filament_id": "OFcy60o4", "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 9a59d625d2..9e6b37e48c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "hF0h4ye3hMDtEba1", + "filament_id": "OFcy60o4", "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 3a10f337b9..761dd56a4c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "3isZCWr4CBjFtGDX", + "filament_id": "OFcy60o4", "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 7ccef601f3..b56e5b0453 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "SU6r879TbQMUFCij", + "filament_id": "OFcy60o4", "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 9956e193ee..575f408c5f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "TqU1elqwuVr9EhTA", + "filament_id": "OFM3PeVe", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 c2a78c9e11..fbad5b186b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "nMczAtoc5W0J2WkS", + "filament_id": "OFM3PeVe", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json index 846cf4c76a..d59ed639a3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "ap7X4nWKfFR53NT0", + "filament_id": "OFM3PeVe", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json index d0ad27e1cd..ed2467c6e7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "kZXg6odPm5iW79Qn", + "filament_id": "OFM3PeVe", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json index 02db6bfea9..30ead39e25 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "CI5dvVrCNk2XTU82", + "filament_id": "OFM3PeVe", "instantiation": "true", "filament_flow_ratio": [ "0.99" 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 3a328388df..b3c448494f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "941E5MaAyFY3iv4V", + "filament_id": "OFdNORGt", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 46857c2b13..e970fdff0a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "RdmsxyUGUX8Ot4oj", + "filament_id": "OFdNORGt", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json index 1f6b35db19..5de9f959cc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json @@ -23,7 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json index d5b0d17c25..510ad8c55d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "spSRbidSN2yeZLhD", - "filament_id": "GFL99", + "filament_id": "OF4RKeng", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json index c0819fa0b1..ccae1871bc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "gVLGkoCoyrWL4DQr", - "filament_id": "GFB99", + "filament_id": "OF4RKeng", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json index fcce2738f5..1c7532543e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "c6IMgUyqOeS2HFWw", - "filament_id": "GFB99", + "filament_id": "OF4RKeng", "instantiation": "true", "activate_air_filtration": [ "0" @@ -23,7 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json index d7b6844c78..9f6e882f68 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "jMCunppmYOH5QIra", - "filament_id": "GFL99", + "filament_id": "OF4RKeng", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json index baf6514cd9..e6d8e037e3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "b3CFhGGnZLzpyAWa", - "filament_id": "GFB99", + "filament_id": "OF4m9A5w", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json index 18f52c4f1f..56ac8dc465 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "n68nw5tzKZ0rq43O", - "filament_id": "GFB99", + "filament_id": "OF4m9A5w", "instantiation": "true", "activate_air_filtration": [ "0" @@ -23,7 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json index 93ee8f80cb..e95a14c2e5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "1cvcaoBFNbg2GucE", - "filament_id": "GFL99", + "filament_id": "OFYZs7dN", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json index c67de4ecd3..2989f84021 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "foG37d7HZKgt6l43", - "filament_id": "GFL99", + "filament_id": "OFYZs7dN", "instantiation": "true", "bed_temperature_difference": [ "10" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json index 2183965821..d9327f20f5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "W7pWKQ2EWAB5viV1", - "filament_id": "GFB99", + "filament_id": "GFG99", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json index 3e61f73029..227d881f06 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "eDQb2WfDsUTvj2Nf", - "filament_id": "GFB99", + "filament_id": "GFG99", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json index 075e2e4923..ecf04bdd2b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "yo4uc7TxQbqnlRUY", - "filament_id": "GFB99", + "filament_id": "GFG99", "instantiation": "true", "activate_air_filtration": [ "0" @@ -23,8 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", - "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json index 385ec94b64..75a1d34349 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "u2OzNKIQIKUrOT9k", - "filament_id": "GFB99", + "filament_id": "OFC5CCeo", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json index 4efa8a0a0f..d87f65a404 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "7Qq8eY1kcFHTgzW3", - "filament_id": "GFB99", + "filament_id": "OFC5CCeo", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json index d3fb0d6590..b1013b2c99 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "gLrecba33jDI9PeI", - "filament_id": "GFB99", + "filament_id": "OFC5CCeo", "instantiation": "true", "activate_air_filtration": [ "0" @@ -23,8 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", - "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json index 934ba831ef..7c5de370cb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "PlC4Ek7d09ytYZqJ", - "filament_id": "GFG99", + "filament_id": "OFK39W9u", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json index 57b925762b..34351c7dac 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "KR0LUSD7wd55oNI6", - "filament_id": "GFB99", + "filament_id": "OFm1VZed", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json index 7300eb4bf4..9b5972f97d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "rQSFNxuuqUVzsSV2", - "filament_id": "GFB99", + "filament_id": "OFm1VZed", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json index f236a9a83b..b6507fda5a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "S1UTm2oMRoQ4yM4R", - "filament_id": "GFB99", + "filament_id": "OFm1VZed", "instantiation": "true", "activate_air_filtration": [ "0" @@ -23,8 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", - "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json index 29b86ed5b1..6ef0248721 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qH3l3p0yvZHqHnwG", - "filament_id": "GFL99", + "filament_id": "OFKWVi10", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json index d04d5eb4cf..61fcd364c3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "WOl0JsKxAQFo2WnW", - "filament_id": "GFL99", + "filament_id": "OFAEqlWa", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json index bb3acc4145..f3b4f693c1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "NryK9oIg8wMDKVHW", - "filament_id": "GFL99", + "filament_id": "OF41QVDH", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json b/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json index 6adaf46d6e..d94e75d3df 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "NA0PhaTNDvEH38lF", - "filament_id": "GFB99", + "filament_id": "OFLeFaUO", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json index 473ba6ac33..57d88732de 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "zQEeIIKWSgsDqlpI", - "filament_id": "GFG99", + "filament_id": "OFviQ9lH", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json index b9a10c1f18..dbcf163dda 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic HIPS @System", "from": "system", "setting_id": "ckwc7U0Q2eKHmCxY", + "filament_id": "OFhzHd2Y", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json index 8a61df2fe2..38411b21ea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic HIPS @System", "from": "system", "setting_id": "AEQYrT7e4Q5J2G6C", + "filament_id": "OFhzHd2Y", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 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 81c501eee9..cd5ca2143f 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "jUNUZhE0BJyB64fC", + "filament_id": "OFhzHd2Y", "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 34dacd8f8d..e4b4e3171d 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "0qMEqo9YMDLSVafs", + "filament_id": "OFhzHd2Y", "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 756f4ddbf2..03cf58e9e0 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "ek749gIdUAPq6WxT", + "filament_id": "OFhzHd2Y", "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 9ca5d033bd..768677d41f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "tEohTtyHofD6l6o3", + "filament_id": "OFhzHd2Y", "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 2e977fd084..f2de81ad74 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "oLeLrIjFJzoZha3E", + "filament_id": "OFhzHd2Y", "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 6ae4e562a2..7ea19866be 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "HXGUlYY4X5IHhL3R", + "filament_id": "OFhzHd2Y", "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 9354f7ede7..3a44280bc2 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "g22Cv3zy3h5BhJYK", + "filament_id": "OFhzHd2Y", "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 980ab69f11..5943947947 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "aDzBXuvN7IuSP5sa", + "filament_id": "OFhzHd2Y", "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 6f7493a72b..a3cc583ed8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "CIj24REX7BA8zPHQ", + "filament_id": "OFhzHd2Y", "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 7d0d9befb3..440cfd4f97 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "yAGyGjF6uDrjfjLn", + "filament_id": "OFhzHd2Y", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json index fbb47b2d7f..b48169a92a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "1NFhtEvvvgZiHcto", + "filament_id": "OFZQFvHQ", "instantiation": "true", "filament_settings_id": [ "Flashforge HS PETG @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json index fc0e4c7cee..62f46f554c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "eNOkWn5PT8rDpA0g", + "filament_id": "OFZQFvHQ", "instantiation": "true", "cool_plate_temp": [ "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 a6a28ae753..72f4577557 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "vOqAGzaYLz0XdRvC", + "filament_id": "OFZQFvHQ", "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 28c7208fad..682416a4eb 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "KSuxZ3fpQz0khDSz", + "filament_id": "OFZQFvHQ", "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 3b495aebe8..7e32268d01 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "o4B1kAToVny7jw0M", + "filament_id": "OFZQFvHQ", "instantiation": "true", "cool_plate_temp": [ "0" 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 5c0421a23e..87b5639be7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG HF @System", "from": "system", "setting_id": "kpRved5M3NktqIYn", + "filament_id": "OFZQFvHQ", "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 ca2dcd370c..1e6c9b04dd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG HF @System", "from": "system", "setting_id": "ypxgjHl9uIMyZIce", + "filament_id": "OFZQFvHQ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json index b8f6997d97..f98635dba8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "uXGuyvVxfdQW22vu", + "filament_id": "OFZQFvHQ", "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 785fd2495b..883143b259 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "q9UbakUmZPzG3xU0", + "filament_id": "OFZQFvHQ", "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 57c2e5ca72..f781edfdca 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "IL18Lu0qHx1RVqKD", + "filament_id": "OFZQFvHQ", "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 f8cfba7acd..3e1a003ac6 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "2FQib7fZjcwfCnm2", + "filament_id": "OFZQFvHQ", "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 16e88eeb42..b800e1566d 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "CtwOm90WWD4S7U6j", + "filament_id": "OFZQFvHQ", "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 bc806c44d8..c3d6594e7c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "kvULpm0WhKiSPj8V", + "filament_id": "OFZQFvHQ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json index b14a0b44ba..5df6b09e97 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "bFVYSPkynBBapFjq", + "filament_id": "OFZQFvHQ", "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 dfb79c840d..ab726c53a1 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "CUU7knzm4cbe1giE", + "filament_id": "OFZQFvHQ", "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 6c36ff1fbb..b5dc6efb69 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "gcYvL572cumWZdnl", + "filament_id": "OFZQFvHQ", "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 a58ddca149..24fbd0279f 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "cx99AH0C575XxAj9", + "filament_id": "OFZQFvHQ", "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 35a01b21ce..fdade2f06c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "RrrKoR7MVD8IFQlq", + "filament_id": "OFZQFvHQ", "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 a30f562b42..07c144a574 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "7VEPGuR16wNukAX2", + "filament_id": "OFZQFvHQ", "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 38054ea5ae..7ade77bb7c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "H9uwlPw6m6Nf7qH5", + "filament_id": "OFZQFvHQ", "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 0ee65ec44f..e209b455e4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "OmDped3weZ4uHAtY", - "filament_id": "GFL99", + "filament_id": "OFoJUGj6", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json index 266200739a..aaac58ce66 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "bfPaqPGaR5zpTsLk", + "filament_id": "OFoJUGj6", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 7169a76fdf..7be6dbc727 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "oD592bif4ra0ADco", + "filament_id": "OFoJUGj6", "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 94da672d0f..c8f5744361 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "ldhMY6F7v6nK8wwf", + "filament_id": "OFoJUGj6", "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 edf25222de..01b6e9deb1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "5vzOmbjHbkJXrgYM", + "filament_id": "OFoJUGj6", "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 310fc73a32..b9e2ebeb4e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xSJk7LFpYKmckPQh", + "filament_id": "OFoJUGj6", "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 87c4ffd656..681d576ed0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xdFZUsj1cNLXdvT6", + "filament_id": "OFoJUGj6", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json index ff783fbf10..89eed340d5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "JCQtuv8Abfz4jVRV", + "filament_id": "OFoJUGj6", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 7f4547dc19..a9e238131c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "hzxRPyH1fqarsMuN", + "filament_id": "OFoJUGj6", "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 ba5f92ca7c..b25007568d 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "oJsLlIIpxwGSoJTv", + "filament_id": "OFoJUGj6", "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 f0fcb415c6..06a4d1a82a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "hJbNZ381ERkZ0KUB", + "filament_id": "OFoJUGj6", "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 eb253a97db..6dcedacb73 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "BqavrNpwhXDXcZ3r", + "filament_id": "OFoJUGj6", "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 a1acf9af42..bf84dbab17 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "cgf4Qk4iHZh7zHN5", + "filament_id": "OFoJUGj6", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json index b399b0cf77..e204e3e522 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "jFUS6233aq4XPgrn", + "filament_id": "OFoJUGj6", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 0c14a75478..eab85e45a4 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "p31K69Srld6o4sQ2", + "filament_id": "OFoJUGj6", "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 5b4e2d04d4..e434c6b72c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "MwbYvnRIzlNmH81h", + "filament_id": "OFoJUGj6", "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 40c2ae337a..0d1632b731 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "rKhHmkqXYD2xN4K9", + "filament_id": "OFoJUGj6", "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 8871c32fc4..d67d10a948 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "Dshsi3O7NvYYjXJt", + "filament_id": "OFoJUGj6", "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 82b514d1af..a3d4f51084 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "mfnL6QEevCmTmOL0", + "filament_id": "OFoJUGj6", "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 a5326ae2b7..0b2c003337 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "AGLHrHKWye0YTtNK", + "filament_id": "OFeWMAGH", "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 e7f97301bd..00f8b13d72 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "px8qzmB2yFLoNl83", + "filament_id": "OFeWMAGH", "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 9d8e653cec..8c10583b55 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "mwuIEsBz5bXEV68w", + "filament_id": "OFeWMAGH", "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 7b61a8668d..c32c16112f 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "TielygFT88owWg4J", + "filament_id": "OFeWMAGH", "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 b15214f50b..154d526928 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "It2NI6OFhNEUvulz", + "filament_id": "OFeWMAGH", "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 4320a3fce3..710cae4899 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Qt3huWxoYpMEqEN6", + "filament_id": "OFeWMAGH", "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 c5a76c1d85..3d753e4106 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Y3XuavnnOMoHLGHA", + "filament_id": "OFeWMAGH", "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 034a1ee969..aae20613af 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "2HUxAWeolJIlxPs1", + "filament_id": "OFeWMAGH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json index 355d9f6d1e..c7e39f8682 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "vdaZBnDsmUC1fhDp", + "filament_id": "OFoJUGj6", "instantiation": "true", "filament_settings_id": [ "Flashforge HS PLA" @@ -14,9 +15,6 @@ "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.8 Nozzle", - "Flashforge AD5X 0.4 nozzle", - "Flashforge AD5X 0.6 nozzle", - "Flashforge AD5X 0.8 nozzle" + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ] } 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 bf571e2ea3..fdeac081b6 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "u7rolQaTQz9U6veH", + "filament_id": "OFi1ocNv", "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 4672cfc77c..cac1c966a2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "qTGTwiliWj3dSo9y", + "filament_id": "OFi1ocNv", "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 5576d9ff98..5b052ff3ef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "wAkuJRTLWxGyBU0b", + "filament_id": "OFi1ocNv", "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 c80656c59f..a469e9cae6 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "dbs29hQSQl9zuWis", + "filament_id": "OFi1ocNv", "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 ad3daa8504..79da7aa9a1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "XGNPvS2ps7Xn2fpx", + "filament_id": "OFi1ocNv", "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 8946fa929c..1339bfd17a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "h33iEGZ7wPeBYKYQ", + "filament_id": "OFi1ocNv", "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 80326684a6..9ca2ac4d29 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "e58C9MdOWikIbbVR", + "filament_id": "OFOSzSuh", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 8134b2b258..4c6085c781 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "RX2Tg8KpwQpCbkLI", + "filament_id": "OFOSzSuh", "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 952162aaa2..370f016030 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "C4DfYuQgDXIgK7mk", + "filament_id": "OFOSzSuh", "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 ae3207a7b1..106dbf9dec 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "Yu7hL4izNsgDVqMT", + "filament_id": "OFOSzSuh", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json index 8fe4514502..78961a532c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "1CevPV960sQWT3NF", + "filament_id": "OFMHTnPP", "instantiation": "true", "filament_density": [ "1.1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json index 8dbd624a6e..9b3764431d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "NGbZ8pQVTRKw28kp", + "filament_id": "OF0SyJhk", "instantiation": "true", "filament_density": [ "1.1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json index bcaea09005..7c2384dad6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "5pVoGBvbiUlrJSwR", + "filament_id": "OFkaDtKx", "instantiation": "true", "filament_density": [ "1.1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json index 7437791891..f4b7cac893 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "8ZR8o3MKYxXLd70k", + "filament_id": "OFsgANe3", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json index e83a93e113..22ae3064bf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "FSfGFl7FCutxXN2l", + "filament_id": "OFsgANe3", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json index 1758aa7657..784d279539 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "ZlpBAM9uaS01sWAJ", + "filament_id": "OFsgANe3", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json index c17b5eeed1..f5b823f2ea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "9DaSYBA2OI7Jj5zS", + "filament_id": "OFsgANe3", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 1036a51c4b..a993eeeae0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "3bguiaEtUsS8ULHW", + "filament_id": "OFPJJxkF", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 9b0c2204a3..af92eaae0a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "W6i9E22BVo11TeCm", + "filament_id": "OFPJJxkF", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json index eac6f732f4..e5e005fd48 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "vflpXTS9GwnODQDH", + "filament_id": "OFPJJxkF", "instantiation": "true", "filament_density": [ "1.1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json index 656e7c3203..339ae66b90 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "xOZQvdZa1YCcnjor", + "filament_id": "OFuyJhLF", "instantiation": "true", "filament_settings_id": [ "Flashforge PETG Basic @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json index 9b1e4c0dff..3517994360 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "YLLJ4xZI704GReej", + "filament_id": "OFuyJhLF", "instantiation": "true", "additional_cooling_fan_speed": [ "60" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json index 712f68eb71..97e6a20e7c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "8EUg1hTLfsyDPbnG", + "filament_id": "OF38Hyk4", "instantiation": "true", "filament_settings_id": [ "Flashforge PETG Pro @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json index 8d400e1b23..2d32a805ff 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "UKhV8A2DBc1xyNWc", + "filament_id": "OF38Hyk4", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 0d98e07a7a..13c8b20ac5 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "dFZ1MmHjj1AAIaMm", + "filament_id": "OF38Hyk4", "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 0d59fd73fe..5484136b0c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "Ro3rt7IAJrA5aZD6", + "filament_id": "OF38Hyk4", "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 e48a6c5082..c25162b722 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "cTxrnqzr2wVt4Nj7", + "filament_id": "OF38Hyk4", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 d2f664b108..fa691e2aee 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "QA1KD03F0zj2zsVi", + "filament_id": "OF38Hyk4", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 3c11370099..bd9d2e2c35 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "EU8Q0XLjED23MNer", + "filament_id": "OF38Hyk4", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json index 77cbe8d5b5..182617e5aa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "XFSgx95whLw5FD08", + "filament_id": "OF38Hyk4", "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 ea6f2e9f9c..661e69ffc5 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "8x6yU2U8d5f67N73", + "filament_id": "OF38Hyk4", "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 78f83738b2..9243316595 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "4W0nfaSSZdg2HQkh", + "filament_id": "OF38Hyk4", "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 e41dd59589..451eb9ca86 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "AJcugKx4qHPJ3JAT", + "filament_id": "OF38Hyk4", "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 915bbb6753..3816155365 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "R0nZuLXEo5qA6Mt8", + "filament_id": "OF38Hyk4", "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 825a5b8fed..5ea3f9aef1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "Ql2BBBymzqEG7GKk", + "filament_id": "OF38Hyk4", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json index 28c0815822..80971691dd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "8Jc4eedkknqNB87s", + "filament_id": "OF38Hyk4", "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 23bdac347c..6761b073c8 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "KU5tDHAKja1sCoHm", + "filament_id": "OF38Hyk4", "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 54ed2d165a..4f893a3514 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "sb6jD3UZmb0DNIsC", + "filament_id": "OF38Hyk4", "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 19f6034de1..9dc63bc699 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "4BB1wJLtsXus5eyY", + "filament_id": "OF38Hyk4", "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 a2848c8bc6..88104a14ab 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "m7oJx47UMlFctMkX", + "filament_id": "OF38Hyk4", "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 0079505531..f254e10c43 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "ozD2wU5UiORTtJsa", + "filament_id": "OF38Hyk4", "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 13da0b478b..13537ce8a5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "IQfUoy7gTmVmBDL5", + "filament_id": "OF38Hyk4", "instantiation": "true", "additional_cooling_fan_speed": [ "60" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json index a199aa5af8..656e6cfa51 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "W59yTyPnVv4LYiah", + "filament_id": "OFRgDMDJ", "instantiation": "true", "filament_settings_id": [ "Flashforge PETG Transparent @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json index a623c9288d..996ed62e1d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "NRY4fsPNtnqs0kyH", + "filament_id": "OFRgDMDJ", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 65ff48dac6..2182a95ed7 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "Ht7wzk8l0b1kv5tZ", + "filament_id": "OFRgDMDJ", "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 f3b8f3859b..ae05326e13 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "NJFHpa5HFHIyHSWu", + "filament_id": "OFRgDMDJ", "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 56c3f5e1e5..df5fbfb1ec 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "UaObrRNSTwitC6jr", + "filament_id": "OFRgDMDJ", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 67a5179794..9071f16ddf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "TtXy042wtT6nF3WB", + "filament_id": "OFRgDMDJ", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 1d26593dc4..f39398a73f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "66OWHhGyuaFISu6v", + "filament_id": "OFRgDMDJ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json index e2c1e5a662..452cabe424 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "p5c6XJ1VD8cn2Meh", + "filament_id": "OFRgDMDJ", "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 827d4fe8af..b9f665f3d0 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "K8WkJmFy2V1zhYQO", + "filament_id": "OFRgDMDJ", "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 a92d725a2b..ac3c87f8b1 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "LLK1hwKZhDU8SaGJ", + "filament_id": "OFRgDMDJ", "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 1020d428d7..32a964d155 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "LaUF2HJtBnpZF7Cd", + "filament_id": "OFRgDMDJ", "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 63ba03680d..2336789ee8 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "OUToXk8ddS1RPPUK", + "filament_id": "OFRgDMDJ", "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 f88a28c989..c0a189a297 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "ywff8rI39XKjcocY", + "filament_id": "OFRgDMDJ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json index 50e0bb7150..a25a050f9f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "C0VV5Uzsl4icRgKa", + "filament_id": "OFRgDMDJ", "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 9d2ad17397..76504bd857 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "kuCvwo6Phr6Ywhm4", + "filament_id": "OFRgDMDJ", "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 1e1717f741..1b447ef7df 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "Z2E69w9AevYg15tl", + "filament_id": "OFRgDMDJ", "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 0e2202e3dd..98ca9782f1 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "RkQaxwTjhJK0A3zr", + "filament_id": "OFRgDMDJ", "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 087167a1a3..f6e5ac3dc7 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "YBQTMes2S9iJjKDf", + "filament_id": "OFRgDMDJ", "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 938ea5875a..adc9b3ef23 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "lCngVWG3q0FWsnrG", + "filament_id": "OFRgDMDJ", "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 f06fa5258b..62e796f2cd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "3Gv6MJ3RRja5pbOM", + "filament_id": "OFRgDMDJ", "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 e335c18107..c59d59c97a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "bcqYod61blJRzhK2", + "filament_id": "OFoimrpo", "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 58c69dbf09..e3dae3bbd7 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "CnFKOi7fFyS8QlKK", + "filament_id": "OFoimrpo", "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 55f8d200b1..46641e0704 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "eKWJW36I5fVHwjWD", + "filament_id": "OFoimrpo", "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 2939916d3c..452f3a0c9a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "RXRERfs2oQKewpPS", + "filament_id": "OFoimrpo", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 cc565d4999..36fefc9926 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "8Ns75F5n2fdQ8sDk", + "filament_id": "OFoimrpo", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 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 514ce0d360..e4dc5d17df 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "4EgMPzlVo1rTeQ1e", + "filament_id": "OFoimrpo", "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 b44d204d6b..d11d07fe15 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "K9ME1F4oJkPi8jRu", + "filament_id": "OFoimrpo", "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 5a6548fd04..fdf37f0ebe 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "9jCp0gTjB3Mt95Mj", + "filament_id": "OFoimrpo", "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 796e883fd8..c109735df5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "d5OleuNNZBJK9vxH", + "filament_id": "OFoimrpo", "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 78eef9b46a..b9af31fcab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "MpG61mwVUtJ7t602", + "filament_id": "OFoimrpo", "instantiation": "true", "filament_settings_id": [ "Flashforge PETG-CF" @@ -14,9 +15,6 @@ "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.8 Nozzle", - "Flashforge AD5X 0.4 nozzle", - "Flashforge AD5X 0.6 nozzle", - "Flashforge AD5X 0.8 nozzle" + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ] } 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 7a0caeba59..48798f6b98 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "UQF0kAaXnZgJGK4o", + "filament_id": "OFftQOek", "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 36782a176c..45c5379b97 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "FpLoe6QrPXnrH019", + "filament_id": "OFftQOek", "instantiation": "true", "activate_air_filtration": [ "1" 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 632ffa476f..839a09c93b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "YFbZ472BRNga6OpQ", + "filament_id": "OFlNKZLP", "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 01c9b77fe3..c0081e14d4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "AtVxriSKOrFZzUun", + "filament_id": "OFlNKZLP", "instantiation": "true", "activate_air_filtration": [ "1" 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 b5fddb2af6..535d2b6b31 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "47Q7YXoJ7rD7Vu21", + "filament_id": "OF0wk0Pk", "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 913081a778..c786b1643e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "v7vYsiPVka4c1CUW", + "filament_id": "OF0wk0Pk", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json index 15aa47eada..8043805bec 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "3fuVuyVcn8U0bRJQ", + "filament_id": "OFHBTqyD", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Basic @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json index 7632049ce6..53165d7174 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "FrRRUl5OT773uCju", + "filament_id": "OFHBTqyD", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 8b80f0ab26..004d9992a1 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "gMmhMDqjmJfAYcbV", + "filament_id": "OFHBTqyD", "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 ce1a822ce3..b738bc9afb 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "0OsrtqfIxrEJMwac", + "filament_id": "OFHBTqyD", "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 70f3451691..9d5819953e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "fuzWVrfZqekMETLK", + "filament_id": "OFHBTqyD", "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 4596bb8286..0228ff0de8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "FmUnckQofjunAtwr", + "filament_id": "OFHBTqyD", "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 b4ee22beee..3fb9fc2585 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "Q0RsVOPLuMByur9c", + "filament_id": "OFHBTqyD", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json index 02897b8eec..cb49ae9309 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "QXJgY8OPyaoYUI1D", + "filament_id": "OFHBTqyD", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 cc6a2a104e..05913a7f19 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "R54l7TcwsjdPHvNB", + "filament_id": "OFHBTqyD", "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 036357790a..16a51fa761 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "MELEwYupDkT2DPxL", + "filament_id": "OFHBTqyD", "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 5612c00943..84dcbd7a1f 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "uGLvOoPAfksLO43M", + "filament_id": "OFHBTqyD", "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 3a96df6696..63f3c30349 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "gGpKvk3rnLuTjOwo", + "filament_id": "OFHBTqyD", "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 690066aefa..27cc6bac6a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "Yopqnj4b5ZVwigGx", + "filament_id": "OFHBTqyD", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json index f1b070e45e..7d438c66c4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "GrwiA2dArUGV9x2g", + "filament_id": "OFHBTqyD", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 094f397950..b9804e95e8 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "QEfQrqMwApuSMqih", + "filament_id": "OFHBTqyD", "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 fdf52ed1e2..9552e043db 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "BAPIn3eJAPGpscRJ", + "filament_id": "OFHBTqyD", "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 e4e1359133..45d44e3491 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "44BmRNRb6vlPq8qe", + "filament_id": "OFHBTqyD", "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 24871a3b60..54b997bfc0 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "ltJbhoAeAec9gxrS", + "filament_id": "OFHBTqyD", "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 3d09c85a7d..3715130d41 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "GxdZiXdqns72ibQl", + "filament_id": "OFHBTqyD", "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 df86f44ed6..85db7c8198 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "5XKGaHUjxHECbnHO", + "filament_id": "OFHBTqyD", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Basic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json index ba9fa780ed..815c949ca6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "H8IStdO8zEfSLYVE", + "filament_id": "OFdhVJql", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json index 281d88bca0..8dca7c3195 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "4wlkoKnU2bA7xhYO", + "filament_id": "OFdhVJql", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json index 82f569aaf8..1b0b0ba477 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "KXy0WyQp06VC2ICh", + "filament_id": "OFyoW5W2", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Color Change @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json index a9b9532a59..26c2f00a33 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "9cGw7tXD8YJHEi1H", + "filament_id": "OFyoW5W2", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 deb0deaa91..7109d34b4e 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "TF6BeOl0patjpPaa", + "filament_id": "OFyoW5W2", "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 a46c00c184..f0d7531966 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "nkYeEBo8NdkJulAP", + "filament_id": "OFyoW5W2", "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 2e019a2a16..ee9c9258e1 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "yEDfsOsogfZbNBVX", + "filament_id": "OFyoW5W2", "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 1c348e66cd..15c7b4c7a2 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 @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xZmQdh487UMtvBRu", + "filament_id": "OFyoW5W2", "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 378c5fce63..b3f5fdc1a3 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 @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "rc00SOyIg30uE3Da", + "filament_id": "OFyoW5W2", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json index 1de1fa9904..974b8eef26 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "k1OiugasUs7baG1f", + "filament_id": "OFyoW5W2", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 c31f2c817e..b5fadd484a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "G2Et7kPHptMESzQ0", + "filament_id": "OFyoW5W2", "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 0b16a42ba2..41ee33d3f9 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "zsOdmFGBSF9UySMN", + "filament_id": "OFyoW5W2", "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 b7801aaf6b..4dd0097616 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "oxRMuvBMu9qdQWUQ", + "filament_id": "OFyoW5W2", "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 45edb3fe4c..2aeddbf43c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "5hwNJvvLtb75XBBg", + "filament_id": "OFyoW5W2", "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 90a0c47630..a621f4ecde 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "mGj8VEyOnnogpkmF", + "filament_id": "OFyoW5W2", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json index 09f4c73aaf..f9e5526878 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "HXVX4mDeUSfW2RgL", + "filament_id": "OFyoW5W2", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 8a51ee4c0f..53d86e2bd0 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "JDcRA6apekWLXPvH", + "filament_id": "OFyoW5W2", "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 6ba6fb73f3..f8a2b45aa3 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "b5GJpvKYktP4vZpj", + "filament_id": "OFyoW5W2", "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 4962ce6694..68e5a905ba 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "RjUpQV6iQxTircwj", + "filament_id": "OFyoW5W2", "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 f48156cb07..bacca455e7 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "9DEZ6SmFdgfluhsR", + "filament_id": "OFyoW5W2", "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 fecaa9f06e..593d88f497 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "girTMkusNTfY04rz", + "filament_id": "OFyoW5W2", "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 552c55d640..b52b8e6cb3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "pCQ2qmeXUyJzP7kS", + "filament_id": "OFyoW5W2", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Color Change" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json index 79ae2f6c94..c052d94ea4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "a1jTbQsflD7SDFih", + "filament_id": "OFXv4FUi", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Galaxy @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json index 95f1514864..c0d94ddeeb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "zyCRsy0mHRgyuQqt", + "filament_id": "OFXv4FUi", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 d6cd08474c..36e4789905 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "y8TNaRebTrmFem10", + "filament_id": "OFXv4FUi", "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 2df9a04c0a..c543dcfb58 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "qju0AMvvq0B5Glny", + "filament_id": "OFXv4FUi", "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 ed84105332..1829618f06 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "o8gGBOEcNvlbZxGW", + "filament_id": "OFXv4FUi", "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 798abe1a32..c6767072c2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "0RkkIcIUFgwOFTBY", + "filament_id": "OFXv4FUi", "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 904ceb7fc0..8cd892194d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "9qVabnSl8xfKSIYX", + "filament_id": "OFXv4FUi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json index e18d7b94f3..abf30fd1f3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DL7lxDI35YErCTWX", + "filament_id": "OFXv4FUi", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 da3b64cd0f..4753dd7e12 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "koEC7DteUoXHUd2z", + "filament_id": "OFXv4FUi", "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 88ccddeb08..1115d57393 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "D69fWcXioFcpoUjC", + "filament_id": "OFXv4FUi", "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 ca7ba95268..6cffd37021 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "rfiQUncdSExEaK0U", + "filament_id": "OFXv4FUi", "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 1783f4d0f8..eac289b203 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "WX8lK8efXIVcpjFf", + "filament_id": "OFXv4FUi", "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 fdf44498b8..8ad84a60f2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "Tzvo3oILQJc4SQko", + "filament_id": "OFXv4FUi", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json index 6115ca4780..7e1caa26a0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ZQYrljZtu3es26hB", + "filament_id": "OFXv4FUi", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 f62409f28a..cf4e376d6e 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Y5gm20O4yCCDIoC0", + "filament_id": "OFXv4FUi", "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 a91a4252cf..8c3d23f226 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "80vSQxnHfd5ZUy5h", + "filament_id": "OFXv4FUi", "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 da7d433275..0bc3cee930 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "UZi7T5VoasmXWyH5", + "filament_id": "OFXv4FUi", "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 b915367cb3..a55bbd16c0 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "6UlSb4fqHIMdMxkO", + "filament_id": "OFXv4FUi", "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 c77a90240b..aee57b55ae 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "H2Cr4B5VUaxyYsN0", + "filament_id": "OFXv4FUi", "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 45ca21acee..0ac191a749 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "NJrc0UZ54Fq8MaqF", + "filament_id": "OFXv4FUi", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Galaxy" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json index 7116bb03b2..3b29dee372 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "k8iibCO2EnlTSRyi", + "filament_id": "OFwf0oWp", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Luminous @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json index acda8964fa..ac148b7b66 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "pACct3L7duMh3hfx", + "filament_id": "OFwf0oWp", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 dcc6311055..266461a8a5 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "GdvXL8SrKrYHxSgZ", + "filament_id": "OFwf0oWp", "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 23d5a93a94..964b280d46 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "SLYD2YcQTQgbSjIF", + "filament_id": "OFwf0oWp", "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 32a027e5f2..e84eaca5e8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "kOobFSlqEG9Qe0d1", + "filament_id": "OFwf0oWp", "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 43a46d9f06..f04ba6e742 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "4sE1LTVVuRglRbpD", + "filament_id": "OFwf0oWp", "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 9fb04c73d9..efc9decd4f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "jEUZyaEIBf2eXXeh", + "filament_id": "OFwf0oWp", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json index fa64b028ed..3b6dbd321e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "qZ6kKjRCMfe4Ql3F", + "filament_id": "OFwf0oWp", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 7b6a3404bc..4efdea0ca0 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "xPPSRmadqfqCtRF2", + "filament_id": "OFwf0oWp", "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 773aa67d02..d710da228d 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "aWVXIk1xVa9URR1D", + "filament_id": "OFwf0oWp", "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 042492ab8f..bf4a43d0b6 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "KhBF7hHHVPzqiAca", + "filament_id": "OFwf0oWp", "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 baeabf324a..a3c7dfd439 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "sTplnj3gMAzwtLWE", + "filament_id": "OFwf0oWp", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json index be4f7f3ed7..bb909dbaaf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "zJFUJKDJRYi1pRL7", + "filament_id": "OFwf0oWp", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 8a7622fb59..972b575cad 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "vXPXOKD8vNJlujM1", + "filament_id": "OFwf0oWp", "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 b544994aeb..582d6e32c9 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "purqxjmWiflDrnik", + "filament_id": "OFwf0oWp", "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 e9a26e8c2a..17e7fe9b09 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "qraQ97uusigB63hv", + "filament_id": "OFwf0oWp", "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 0fae0389cc..bd4e81dbc6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "Z1NCX8XMyIVlOlWn", + "filament_id": "OFwf0oWp", "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 4393acab05..59b52fad8c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "s620OFLTgFT4Ds2A", + "filament_id": "OFwf0oWp", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Luminous" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json index 252743e5f2..8c31d9b88c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DcbISTLvKNMZRzKx", + "filament_id": "OF60Lmeq", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Matte @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json index e302c58bfe..72fa362c28 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "4fwlIrzy6O2EsyBZ", + "filament_id": "OF60Lmeq", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 b461ab7c4d..7037b54f2d 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "BVmVfNCuy8HDhcEI", + "filament_id": "OF60Lmeq", "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 b70192398e..b6772f5d1d 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "WRMePGzDGdEGiqNv", + "filament_id": "OF60Lmeq", "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 0648d80a38..bff289cda9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "thnbuaLDDlGrkrdY", + "filament_id": "OF60Lmeq", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json index 67b9a2c858..921d2dea18 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "cnPwhLyBq6JL8gEA", + "filament_id": "OF60Lmeq", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 6f03f6b8cb..95f712248b 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "8b9q1FfVljPmKoEt", + "filament_id": "OF60Lmeq", "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 fe1ca45413..cf8c573962 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "o9dOrLgL6efF19O1", + "filament_id": "OF60Lmeq", "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 45fe70381f..0c247e1b06 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "QoRmDvhoeGi6Z2xv", + "filament_id": "OF60Lmeq", "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 d1e83cd7b3..9c13d8bf85 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "dHyuoORAUGLtlGkJ", + "filament_id": "OF60Lmeq", "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 9090bf2287..4e945b96df 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "OgqVyIHfy3U8Dc6d", + "filament_id": "OF60Lmeq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json index 682ba2be12..03bcc21993 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "g1gnICJ3u6hpGazQ", + "filament_id": "OF60Lmeq", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 cf6436ad19..b955699bcf 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "feXpVbDM5ON5mwg0", + "filament_id": "OF60Lmeq", "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 ef02344293..4816841106 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "XMnZQ1AxXPJqpqRX", + "filament_id": "OF60Lmeq", "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 d9fcfcc693..787af100e8 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Ke0bRKPNKSsVMO1Y", + "filament_id": "OF60Lmeq", "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 57ac007de8..84d8d2f4d3 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "IRC2n4GaofxvvyTt", + "filament_id": "OF60Lmeq", "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 185d66e796..c753c54bb3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "RN4wdTL0qccM4huZ", + "filament_id": "OF60Lmeq", "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 b6a9949867..03a028841a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "ipMevDMORKqZYdvD", + "filament_id": "OF60Lmeq", "instantiation": "true", "filament_max_volumetric_speed": [ "22" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json index 758de4bbdc..7aff3d8593 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "vwwb5nfO63U1ErCn", + "filament_id": "OFWv6JYn", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Metal @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json index 7685f4ea90..4a0cc3727c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ekq4MRPyzlYxRhbX", + "filament_id": "OFWv6JYn", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 bb880ea106..4d538c35a2 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "uusF7Vz94HOwoQF0", + "filament_id": "OFWv6JYn", "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 e34f8d298e..15a224163f 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "sHZWzrZO8PP0QYZR", + "filament_id": "OFWv6JYn", "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 5d6a2fe948..928b220017 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "bxwjEFI8HmNY8JI6", + "filament_id": "OFWv6JYn", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json index 89436d242d..c1ecd24405 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "VvMaIJwFk4Q6KX4p", + "filament_id": "OFWv6JYn", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 6239ad2bad..0c772343b9 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "5xqdqoj2l50FegPF", + "filament_id": "OFWv6JYn", "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 5f91a2f652..ab8e2a6e13 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "R79SbWA9i2OAu2ee", + "filament_id": "OFWv6JYn", "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 8c25b77b20..8d1a7360f9 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "zjIN4KzIOwI1VwOc", + "filament_id": "OFWv6JYn", "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 add7f82214..a0bdd7313a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "UxMNNil2KnWvAJ4q", + "filament_id": "OFWv6JYn", "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 f972d75cae..878fb7e83e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "57i6iKrVYUS5UiBT", + "filament_id": "OFWv6JYn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json index 9563f42a78..b488812551 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "vVKalJViJuBvlHkK", + "filament_id": "OFWv6JYn", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 ae0bb23e05..cd872ad134 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "IYPw8a9tkpuf95uH", + "filament_id": "OFWv6JYn", "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 d33ab097f3..1652f423b9 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "I0bULoVAbtVfQoCy", + "filament_id": "OFWv6JYn", "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 97b47d1fc6..31fc158a78 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "DbPo3ay2e4a002AB", + "filament_id": "OFWv6JYn", "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 eb7cdfc00b..8c970ff1b5 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "uztv4hhm2O3T93zZ", + "filament_id": "OFWv6JYn", "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 627883c18c..6edb1d2d36 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "UFWWrhfgS7N36Y8W", + "filament_id": "OFWv6JYn", "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 fc1ca9b02d..c9a3884236 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "UD5i0ijsirfieUvb", + "filament_id": "OFWv6JYn", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Metal" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json index 04aeb1f095..0c9008df95 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DIMoIGOGedN17WbO", + "filament_id": "OFTa6gPH", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Pro @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json index 7101090b3f..81bb6aa26f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "SC5LJcecBaEG5by3", + "filament_id": "OFTa6gPH", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 fcbcbdf68b..f51c80d063 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "t9lPSFnwLDk0ARIp", + "filament_id": "OFTa6gPH", "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 890831fd51..76fff17909 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "SBSlOEwZSvZHeX4r", + "filament_id": "OFTa6gPH", "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 425052368c..9dbd0c5df8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "DbWTm2H71izMWmpx", + "filament_id": "OFTa6gPH", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json index 4cd37e4758..15ff802ebb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ZENqqRqvEOeloAgs", + "filament_id": "OFTa6gPH", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 72234ddfd2..7a776d89e3 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "YcXuvz3qYHtVoWxv", + "filament_id": "OFTa6gPH", "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 b8ad354879..32a582ed53 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "prItyXNphhuPCAce", + "filament_id": "OFTa6gPH", "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 6bfe5cb3cd..2aa08cf968 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "83zDmjaAgxxIt7KU", + "filament_id": "OFTa6gPH", "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 5a9918addf..88ee859e78 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "px3O28Olb9LExqfT", + "filament_id": "OFTa6gPH", "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 ed66794aab..bb5eb9a2dd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "QYgsCCHP3Khqrzh3", + "filament_id": "OFTa6gPH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json index cbc1d80955..86ac22cb22 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "wV01bqvZ6MRaEibZ", + "filament_id": "OFTa6gPH", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 549f5a1562..c3a2de4dfc 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "1ro9wHPYhuMHNiYe", + "filament_id": "OFTa6gPH", "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 856389e1e2..d0a52dc129 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "4W4a7c9ugUVwvvmn", + "filament_id": "OFTa6gPH", "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 6da7732f58..f6a0c4911f 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "CloRo3qxvzxHZuIP", + "filament_id": "OFTa6gPH", "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 dd788c5a94..924ed22202 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "QgUbP07tIXmFysEb", + "filament_id": "OFTa6gPH", "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 61522df2c7..d1383d50c1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "6mvGOtkPZT6ROboo", + "filament_id": "OFTa6gPH", "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 2cb335b80e..302bb89cea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "vI875WYbMyQeMwlh", + "filament_id": "OFTa6gPH", "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 b028494888..04b217d0c7 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,6 +4,7 @@ "inherits": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "gxl3i7jTwkzrKxF4", + "filament_id": "OFAGrVjP", "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.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json index a2fae947b8..3074f553f0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "mx6NWRkqyo2U12XQ", + "filament_id": "OFAGrVjP", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 645ecbc0c0..9de378b7cc 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "YH9IHXOFMKwcTLyA", + "filament_id": "OFAGrVjP", "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 4f7e3d3014..c3dbf86193 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "IfAieG0OAG807xlu", + "filament_id": "OFAGrVjP", "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 4e74bdb6cc..5d7ff07d01 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "N6J7QqQ7TIgM3MyW", + "filament_id": "OFAGrVjP", "instantiation": "true", "cool_plate_temp": [ "50" 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 9c0eec6844..069b924da4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "OIsfpi49wEoF0ekO", + "filament_id": "OFAGrVjP", "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 405b1c46c0..4c9b89d97e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "xxeZ6VPjRFevxDnK", + "filament_id": "OFAGrVjP", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json index a8bbced435..ceef2f32d5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "x5m17Z5UpqpTtwgF", + "filament_id": "OFAGrVjP", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 a3475428a1..933275ecf4 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "2GZp8yjrY1OioFDi", + "filament_id": "OFAGrVjP", "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 19a2957ccc..03c51a026b 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "U0XtCVUhIMnidhbR", + "filament_id": "OFAGrVjP", "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 7cb6dc67bd..127a7d57bf 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "8j9kaYy3ghkF81Cu", + "filament_id": "OFAGrVjP", "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 a838f359d4..7a4b09647c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "E0LeJwSxaniDkB0b", + "filament_id": "OFAGrVjP", "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 718ad9c32c..573bf70bf2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "8rggqgJ9kg9yLE28", + "filament_id": "OFAGrVjP", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json index fb38d8488a..1521adad6b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "hnWRLUwnfXiwnqBM", + "filament_id": "OFAGrVjP", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 4bccc9c4ac..9703b974e9 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "uY4OWhIytHMz4rWq", + "filament_id": "OFAGrVjP", "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 4906f57d2c..88c07e6495 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "YSkkXd9EhhEHvGpf", + "filament_id": "OFAGrVjP", "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 135192e979..2d45c140ca 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "XlxXZj9Wi1D6IwCE", + "filament_id": "OFAGrVjP", "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 f05f9f8e57..5e3cdced52 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "IPyXBSnMCAikjI9V", + "filament_id": "OFAGrVjP", "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 240fae4d59..efb07ffb7b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "f3gJsovSmDKoA7BP", + "filament_id": "OFAGrVjP", "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 205dc244a6..ab60566b84 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "vZb7BvbyVWkZv3rR", + "filament_id": "OFAGrVjP", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Silk" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json index 16dfdcf81c..d4227c010a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ojYsAanAPqYhgFoe", + "filament_id": "OF9sr3Vn", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Sparkle @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json index 29b57abe19..027aad1ae3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "xVYaNvQwM2chTkPe", + "filament_id": "OF9sr3Vn", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "80" 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 3cf5581d40..a8af698f32 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "o8lsEnMIiHHorJhb", + "filament_id": "OF9sr3Vn", "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 09bf6a4f97..653b2f3e03 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "oXlxQJY0K6Dnri7e", + "filament_id": "OF9sr3Vn", "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 303ab7f286..11cfe05454 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "XKpFulrvvrfE56va", + "filament_id": "OF9sr3Vn", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json index 3bfa2b7a10..8b79997f28 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "jmVmKMUCcowszvVp", + "filament_id": "OF9sr3Vn", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 c8810e8348..641ab1da9a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "yeh5cd0tAHtHzdoQ", + "filament_id": "OF9sr3Vn", "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 a00dcdc264..e2402d34ed 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "q2Zi0YluaYpG3Ktf", + "filament_id": "OF9sr3Vn", "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 8f226d79ad..e03a5b575e 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "1qXV6AJqPpAwX1YK", + "filament_id": "OF9sr3Vn", "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 43fff03323..b2e0f1590b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "YsyGGOGqUVkEqkIr", + "filament_id": "OF9sr3Vn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json index c53e5bc830..7a88f501a1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "4L3Zm1YIxs8J8dp9", + "filament_id": "OF9sr3Vn", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 7027ffab33..0ecfc51591 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "UVvd018dTbygqTgy", + "filament_id": "OF9sr3Vn", "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 64ffa609af..dec7c8275f 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "F0k8kkgWM5FkLAzo", + "filament_id": "OF9sr3Vn", "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 f61281e75d..c11104155a 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "Oapl8InwbkwNSIDl", + "filament_id": "OF9sr3Vn", "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 b887d42ff2..3513820454 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "NiB6Yb4b0auyn9KQ", + "filament_id": "OF9sr3Vn", "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 c000cb76e4..0ad4ae9863 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "LYtdPgec1hBLhoQA", + "filament_id": "OF9sr3Vn", "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 a9527280aa..c61e191e80 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "QRyISvTy06kCwxKo", + "filament_id": "OFPJrlC3", "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 6e4cbcfdfe..17a29fd4ad 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "rmnF24E3SuwzRscH", + "filament_id": "OFPJrlC3", "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 23b1230036..4fcd8bf26d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "BXPI5Pkp7a6pLrCh", + "filament_id": "OFPJrlC3", "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 de99144bf5..4e5ab53a0a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA-CF @System", "from": "system", "setting_id": "rBm25DRY1PAkEJ4r", + "filament_id": "OFPJrlC3", "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 896f61dd93..a3c206104c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PLA-CF @System", "from": "system", "setting_id": "xReo12oteZ4ECNJN", + "filament_id": "OFPJrlC3", "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 42ddb83ec2..65b19268dd 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "9PgjgxU7pLl2Dfpe", + "filament_id": "OFPJrlC3", "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 74d834e078..6f13da05c7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "RuNKzuIsw7F1ogmG", + "filament_id": "OFPJrlC3", "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 e588dbdf2c..d2facc5b67 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "YPuMCHNGDWh0FpIB", + "filament_id": "OFPJrlC3", "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 9a8e75a439..8a051eae74 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "3uC056Y171ZjnQE6", + "filament_id": "OFPJrlC3", "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 391c0e86ec..f0515b17da 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "JxNlb64lTODaaQhU", + "filament_id": "OFPJrlC3", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA-CF" @@ -14,9 +15,6 @@ "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.8 Nozzle", - "Flashforge AD5X 0.4 nozzle", - "Flashforge AD5X 0.6 nozzle", - "Flashforge AD5X 0.8 nozzle" + "Flashforge Adventurer 5M Pro 0.8 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 2e049a81f2..4cbd30ea72 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "DhC7iFgNKCAq4Zkt", + "filament_id": "OFQCAYAt", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 d55cb8d4b3..de09f3ee20 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "Jws2AaLWaNyZhqX4", + "filament_id": "OFQCAYAt", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json index 1808ab60c8..0b5e6a712c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "MFItX51zZO0KYjdk", + "filament_id": "OFQCAYAt", "instantiation": "true", "filament_flow_ratio": [ "0.99" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json index b7cb615d2a..54cfd76a33 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "KITjZXcyM4N8cVyu", + "filament_id": "OFp8lkYD", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json index 4cc5686f67..bd330537e5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "6NjEQ6RJKUAOrSLw", + "filament_id": "OFCJaXZS", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json index 940f6e85f8..85977c3bb7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "vFMKqNjQjlNxwvDI", + "filament_id": "OFCJaXZS", "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 0492ebe524..5080890de1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "ihXPnFERMjbBgrP5", + "filament_id": "OFZcrV9c", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 e11ff56c17..d28c9de034 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "UWFjBmSpUkZLBvoO", + "filament_id": "OFZcrV9c", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json index 374063554b..67150ba1b4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "oSGlx5mtGh07BnOz", + "filament_id": "OFZcrV9c", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json index fe1b4c1f6b..c9b3f231e5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "i5DllSvYjVPO04Su", + "filament_id": "OFZcrV9c", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json index c46bfe3da4..db7b6c956b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "l3dYtVM52X0UMRix", + "filament_id": "OFZcrV9c", "instantiation": "true", "filament_flow_ratio": [ "0.99" diff --git a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json index a913609484..f92402ffaa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PVA @System", "from": "system", "setting_id": "rSYGG2ni41NDVw6l", + "filament_id": "OFeFRwST", "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 c40ba42a92..f9a335f2e7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PVA @System", "from": "system", "setting_id": "nwgbMjLRJLtJ04ri", + "filament_id": "OFeFRwST", "instantiation": "true", "activate_air_filtration": [ "1" 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 528998a24c..624f2b05e8 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "f75oElm4zB0hukIj", + "filament_id": "OFmgesco", "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 0e23841975..456dea73d2 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "o4KYTpJF6KksX2mg", + "filament_id": "OFmgesco", "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 749a00856c..f4d18ac97c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "HUSkDZL6rCpz0lRk", + "filament_id": "OFmgesco", "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 085cf59c5b..da615cf496 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "8xgu0AnMuKbPWyVd", + "filament_id": "OFmgesco", "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 a5b488fc99..f2d17b5a69 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Rgqt3MjxOye5EaFt", + "filament_id": "OFmgesco", "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 3f901a03a4..3f0aea0926 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "PBFsW5qhVbQteYh5", + "filament_id": "OFmgesco", "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 489c5fb15f..f91c527cac 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "TPbHmcFyPyjvoERv", + "filament_id": "OFRNU58t", "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 a959585cd8..6b331b1a97 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "zLMgsyDmdoXHhqFv", + "filament_id": "OFRNU58t", "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 33834e19e3..6f674a27e8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "ThakVhjfpgnAlEVH", + "filament_id": "OFRNU58t", "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 4aad5af360..5a6b095651 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "M0ozqaD3jSKoD6fm", + "filament_id": "OFRNU58t", "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 0fd54408ca..4d3d501620 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "ob8IkvzNt9CWCzbk", + "filament_id": "OFRNU58t", "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 31b83ce172..c31e020d4d 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "NzxX1lyRJ7wLUihV", + "filament_id": "OFRNU58t", "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 430ac28bd4..306930aabc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "4FIGiheSGvSJPw3s", + "filament_id": "OFRNU58t", "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 f5bff06851..a3ee98d0b8 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "1GNqSBaQitzhYSx7", + "filament_id": "OFRNU58t", "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 cb901a9bcc..eebe8e5b85 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "eOhMygyxaccdov7o", + "filament_id": "OFRNU58t", "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 f5c8f2c553..e9823b8a1c 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 @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "LxooKiOkRncktNLf", + "filament_id": "OFRNU58t", "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 e4f518e648..b3aa3cfc55 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "HdoJfbQr0uwQ6Vwb", + "filament_id": "OFRNU58t", "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 d9f7ec4840..abe58bc211 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "J4EaFhnpkLDcl5wH", + "filament_id": "OFRNU58t", "instantiation": "true", "filament_settings_id": [ "Flashforge TPU 95A" @@ -14,9 +15,6 @@ "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.8 Nozzle", - "Flashforge AD5X 0.4 nozzle", - "Flashforge AD5X 0.6 nozzle", - "Flashforge AD5X 0.8 nozzle" + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ] } 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 b7cd53996e..c5c992698e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "fd5bACFa33J7aTdp", + "filament_id": "OFtJMczs", "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 14bf91e144..94aa1ead1c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "hrcELA2qEMkZ6Wvj", + "filament_id": "OFtJMczs", "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 30a92209c4..a4a27dceef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "Lis7BZ3lMkoX5KQt", + "filament_id": "OFE22Uba", "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 dd8ddf201b..bd69da6ff2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "xY03Hiidu5YNSUyZ", + "filament_id": "OFE22Uba", "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 6d5d7a0455..6066fbe98b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "AHu6wNV3zcPBusOF", + "filament_id": "OFyxAbO4", "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 f52588da65..5fe7151b78 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "8MBRqfLIRdhxk1dF", + "filament_id": "OFyxAbO4", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json index 163a76b62f..06012ecf04 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "2JQjReK012FHpHIt", + "filament_id": "OF6FM5F7", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json index 539b153d74..7bb5e8906a 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "3SCkpXXK8VcQBMQn", + "filament_id": "OF6FM5F7", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json index 70ed04fc55..57380ab9e4 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "dgpcOrf7282LTh1d", + "filament_id": "OF6FM5F7", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json index d5ce57aeee..c6b435b34b 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "e85SCr6SV9kQD2hm", + "filament_id": "OF6FM5F7", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json index 85a4492107..a780bd8dd8 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "eGXsHN5B9BZViVNe", + "filament_id": "OF6FM5F7", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json index c7c38d13bb..e69ba59f78 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "8JSb4JqZ7zLi8uPI", + "filament_id": "OF6FM5F7", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 a81bd9fe8c..c88d025a64 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "gZqAGVOlWR79n7hN", + "filament_id": "OFSdF3B1", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 542cced451..b1f762dd7a 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "nJF1lCOavNNh4yHs", + "filament_id": "OFSdF3B1", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json index 37dcd0816f..dc949095de 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "TZ0nKqxoIYk2mPh8", + "filament_id": "OFSdF3B1", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 75094206d5..ac82265489 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "nH6pwFYsPyBzL1EB", + "filament_id": "OFSdF3B1", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json index 6dee0fbd50..d5cb85c1bc 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "yok12IOGZzGot5Ll", + "filament_id": "OFSdF3B1", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 9beb4e6e38..71b3ae9af1 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "wmWMf3MfmbfZx2o8", + "filament_id": "OFSdF3B1", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json index de609cdc0b..2892bfac6a 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Xqb0GQluin2jUQyL", + "filament_id": "OFLxO2Oc", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json index c20763c836..5f464b11cf 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "A8PDgw1jZE2m3bem", + "filament_id": "OF6SEkeJ", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json index 3c7f3b0e91..e2584bb9ed 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "Iy5lHY4ihEKPgJ5x", + "filament_id": "OF6SEkeJ", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json index a727da25ee..a6fb057638 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Kdeg55RzLMYhqYMC", + "filament_id": "OF6SEkeJ", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json index 62279c4084..a94efd16a0 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "JXf7KCy4KY65xuzO", + "filament_id": "OF6SEkeJ", "instantiation": "true", "additional_cooling_fan_speed": [ "0" 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 4502c8e0d8..e3652a2989 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "O3tz36NNMoagELL0", + "filament_id": "OFAtydxE", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 df0f4c4cc6..b05cdc7517 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "Gg9H6I32fOqoLSqE", + "filament_id": "OFAtydxE", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 9ab78ced38..700ebeea67 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "pV5QERvRuROIZTOa", + "filament_id": "OF0UbONm", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 521a764406..e49b64860a 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "0i7VkquM4n0uFaXH", + "filament_id": "OF0UbONm", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json index 1675096c7e..54bedf7278 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "TZDKsooodaGVkM4m", - "filament_id": "GFB99", + "filament_id": "OF5kwfZu", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json index 37dc9b7723..9201c77b22 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "NdNRNhmsHgHRnz1Z", - "filament_id": "GFB99", + "filament_id": "OFYICbI4", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json index 953b71d9e3..98dcbdde4c 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "fR7maJwWmteJ7bWY", - "filament_id": "GFB99", + "filament_id": "OFYICbI4", "instantiation": "true", "activate_air_filtration": [ "0" @@ -23,7 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json index 7241cf2afd..1af16ac51a 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "gLG1R5gtdliSlnZJ", - "filament_id": "GFB99", + "filament_id": "OFoAaHcF", "instantiation": "true", "filament_max_volumetric_speed": [ "15" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json index d6de1c2af8..b68ea0efb9 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "AaGdNgYaIIZyZBiW", - "filament_id": "GFB99", + "filament_id": "OFKZH00L", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json index 95995868fb..3deed3be44 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "jJVDAlGTt1QJlbn8", - "filament_id": "GFB99", + "filament_id": "OFKZH00L", "instantiation": "true", "activate_air_filtration": [ "0" @@ -23,7 +23,6 @@ ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.4 Nozzle", - "Flashforge Guider 3 Ultra 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.8 Nozzle", "Flashforge Guider 2s 0.4 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json index 8fb6eb9b70..06760b4e08 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "IEpmsltdjoCu2txJ", - "filament_id": "GFB99", + "filament_id": "OFAdZFD1", "instantiation": "true", "filament_max_volumetric_speed": [ "15" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json index d09c7dd01f..d259f1a1ef 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "foH2sa61cDy12TzH", - "filament_id": "GFB99", + "filament_id": "OFGfdP6J", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json index 789b77ea27..d12baa2e6b 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "gQLoSJ7xGEdOd8kr", - "filament_id": "GFB99", + "filament_id": "OFGfdP6J", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json index 3f42fa9f24..6b2ec8baa0 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "6Z5vce5YKlCGox8v", - "filament_id": "GFB99", + "filament_id": "OFjepy6j", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json index 9e2336a574..ca207c1219 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "kMYDFSwivzTjFo2L", - "filament_id": "GFB99", + "filament_id": "OFjepy6j", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json index 12d944617f..fc6281092e 100644 --- a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "tq7YmJohYaNiPplE", - "filament_id": "GFL99", + "filament_id": "OFRR8LUh", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json index ed788fa452..e43dda4e39 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "cvJIaPzb0uJLipX1", + "filament_id": "OFjqPjjl", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json index bd6fbfb0e1..3575a60b49 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "wguPruY9M7GcMt6q", + "filament_id": "OFjqPjjl", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json index 1b8c0864fb..2fc765ea4a 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "EhobwmFIEg5Cs5Ki", + "filament_id": "OFjqPjjl", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4.json index f7bdfc0830..2e17832b77 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "JvdxJyy7xCm3F0xH", + "filament_id": "OFjqPjjl", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json index 7bf0850fe8..ca87808d1f 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "FtwGLcPMQqKw5uKW", + "filament_id": "OFjqPjjl", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json index a95278c719..22ed7da7df 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "lrnsjoh8DtnTcT7g", + "filament_id": "OFjqPjjl", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json index ca22248030..3f30b9a2a5 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Th8rzyWoINHBwgcw", + "filament_id": "OFjqPjjl", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json index 45eb6c20a5..6c797966fe 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "1Lyq9gOfcZ5hPIdW", + "filament_id": "OFjqPjjl", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json index ff84af740f..70b143a5e1 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "fWM9WLGV9mUQOtHh", - "filament_id": "GFG99", + "filament_id": "OFo9EwvK", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json index 199e64cc2b..fc4a67290a 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "9FrKIXABj3yedXri", - "filament_id": "GFL99", + "filament_id": "OGFL96", "instantiation": "true", "filament_flow_ratio": [ "1.07" diff --git a/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json index 39a1a6d188..fe64023c22 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "F8r0b3G228QEK53U", - "filament_id": "GFL99", + "filament_id": "OF6XIeUW", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json index 9d91f3746b..74bee8eab1 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "WQyJHZpkl9Dz6Yo3", + "filament_id": "OFuswXlp", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json index d109f87d0e..fa2c3bb233 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "qRqhbOYn5TMfccem", + "filament_id": "OFuswXlp", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json index 3f79dcf3a5..591a5b2f40 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json @@ -4,6 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "LTZCFxkzkGCnUMAR", + "filament_id": "OFuswXlp", "instantiation": "true", "cool_plate_temp": [ "40" diff --git a/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json index a5bfa9cdd5..a21b8c2c74 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "DW9Ck6xMK00Ry2iE", - "filament_id": "GFG99", + "filament_id": "OF6Mxzsg", "instantiation": "true", "additional_cooling_fan_speed": [ "100" 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 659d896a04..2c196808cc 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "i59KgPtnplOJ8ZBh", + "filament_id": "OFvsS7Fb", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 76399618fc..bee067f8c4 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ERMhwufaef91KJ1d", + "filament_id": "OFvsS7Fb", "instantiation": "true", "activate_air_filtration": [ "1" 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 43b69e32e3..c4d1a43829 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ZGmi7NF6Rn4idKjT", + "filament_id": "OFDkABjZ", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 5b11df4081..fb963cb267 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "3SRFjKR5ezAukLYW", + "filament_id": "OFDkABjZ", "instantiation": "true", "activate_air_filtration": [ "1" 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 ddfcc5c1af..3f08572fcf 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ULqB7JfqebS8d00l", + "filament_id": "OFYRS7GZ", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 1eb7a0bf80..2092ddb4f8 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json @@ -4,6 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "EQzyVOtOJjpKyRMM", + "filament_id": "OFYRS7GZ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json index e0e410486c..7a7abe02eb 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "lALS0WwvUo5AYOq3", + "filament_id": "OFt9AiN5", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json index b005039c27..171353a08d 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "tgRrYwnp5nr1yr9w", + "filament_id": "OFt9AiN5", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json index eb7577cfe5..ff217ef2e3 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "yom6iIUUwU1MsZwF", + "filament_id": "OFt9AiN5", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json index 933d1ff7d3..c687db6030 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "ysj5nD1op08U8rUT", + "filament_id": "OFt9AiN5", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json index 34959d59ec..4fc3dfba55 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "HBtkC3BfEpBGEWc5", + "filament_id": "OFt9AiN5", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json index d4285329e3..ed34f84c3f 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json @@ -4,6 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "zsW4MCpeL5qfzNfg", + "filament_id": "OFt9AiN5", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json index 49196701fa..4e1efc3f9e 100644 --- a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json +++ b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "t6CWYU3ZSddIjwhS", - "filament_id": "GFB99", + "filament_id": "OFtEFtsz", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json index 8a8b8fe94b..fd1ff2433e 100644 --- a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json +++ b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "NXQtHvtO4tyQ1ueu", - "filament_id": "GFB99", + "filament_id": "OF9RZyBz", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index ae6dd87645..f9d84b029c 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1,76 +1,5 @@ { - "alias_exceptions": [ - "Flashforge/Flashforge ABS Basic @FF C5", - "Flashforge/Flashforge ABS Basic @FF C5P", - "Flashforge/Flashforge ABS-GF @FF C5", - "Flashforge/Flashforge ABS-GF @FF C5P", - "Flashforge/Flashforge ASA Basic @FF C5", - "Flashforge/Flashforge ASA Basic @FF C5P", - "Flashforge/Flashforge ASA-CF @FF C5", - "Flashforge/Flashforge ASA-CF @FF C5P", - "Flashforge/Flashforge ASA-GF @FF C5", - "Flashforge/Flashforge ASA-GF @FF C5P", - "Flashforge/Flashforge HIPS @FF C5", - "Flashforge/Flashforge HIPS @FF C5P", - "Flashforge/Flashforge HS PETG @FF C5", - "Flashforge/Flashforge HS PETG @FF C5P", - "Flashforge/Flashforge HS PLA @FF C5", - "Flashforge/Flashforge HS PLA @FF C5P", - "Flashforge/Flashforge PA-CF @FF C5", - "Flashforge/Flashforge PA-CF @FF C5P", - "Flashforge/Flashforge PAHT-CF @FF C5", - "Flashforge/Flashforge PAHT-CF @FF C5P", - "Flashforge/Flashforge PET-CF @FF C5", - "Flashforge/Flashforge PET-CF @FF C5P", - "Flashforge/Flashforge PETG Pro @FF C5", - "Flashforge/Flashforge PETG Pro @FF C5P", - "Flashforge/Flashforge PETG Transparent @FF C5", - "Flashforge/Flashforge PETG Transparent @FF C5P", - "Flashforge/Flashforge PETG-CF @FF C5", - "Flashforge/Flashforge PETG-CF @FF C5P", - "Flashforge/Flashforge PLA Matte @FF C5", - "Flashforge/Flashforge PLA Matte @FF C5P", - "Flashforge/Flashforge PLA Metal @FF C5", - "Flashforge/Flashforge PLA Metal @FF C5P", - "Flashforge/Flashforge PLA Pro @FF C5", - "Flashforge/Flashforge PLA Pro @FF C5P", - "Flashforge/Flashforge PLA Basic @FF C5", - "Flashforge/Flashforge PLA Basic @FF C5P", - "Flashforge/Flashforge PLA Color Change @FF C5", - "Flashforge/Flashforge PLA Color Change @FF C5P", - "Flashforge/Flashforge PLA Galaxy @FF C5", - "Flashforge/Flashforge PLA Galaxy @FF C5P", - "Flashforge/Flashforge PLA Luminous @FF C5", - "Flashforge/Flashforge PLA Luminous @FF C5P", - "Flashforge/Flashforge PLA Silk @FF C5", - "Flashforge/Flashforge PLA Silk @FF C5P", - "Flashforge/Flashforge PLA-CF @FF C5", - "Flashforge/Flashforge PLA-CF @FF C5P", - "Flashforge/Flashforge PPA-CF @FF C5", - "Flashforge/Flashforge PPA-CF @FF C5P", - "Flashforge/Flashforge PPS-CF @FF C5", - "Flashforge/Flashforge PPS-CF @FF C5P", - "Flashforge/Flashforge PVA @FF C5", - "Flashforge/Flashforge PVA @FF C5P", - "Flashforge/Flashforge TPU-64D @FF C5", - "Flashforge/Flashforge TPU-64D @FF C5P", - "Flashforge/Flashforge TPU-90A @FF C5", - "Flashforge/Flashforge TPU-90A @FF C5P", - "Flashforge/Flashforge TPU-95A @FF C5", - "Flashforge/Flashforge TPU-95A @FF C5P", - "Flashforge/FusRock PAHT-CF @FF C5", - "Flashforge/FusRock PAHT-CF @FF C5P", - "Flashforge/FusRock S-Multi @FF C5", - "Flashforge/FusRock S-Multi @FF C5P", - "Flashforge/FusRock S-PAHT @FF C5", - "Flashforge/FusRock S-PAHT @FF C5P", - "Flashforge/Generic TPU-64D @FF C5", - "Flashforge/Generic TPU-64D @FF C5P", - "Flashforge/Generic TPU-90A @FF C5", - "Flashforge/Generic TPU-90A @FF C5P", - "Flashforge/Generic TPU-95A @FF C5", - "Flashforge/Generic TPU-95A @FF C5P" - ], + "alias_exceptions": [], "id_overrides": [ "Afinia/Afinia PLA", "Afinia/Afinia PLA@HS", @@ -687,12 +616,79 @@ "FLSun/FLSun Generic PETG", "FLSun/FLSun Generic PLA", "FLSun/FLSun Generic PLA-CF", - "Flashforge/Flashforge Generic ASA @G3U 0.6 Nozzle", + "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", + "Flashforge/FlashForge PC @FF G4 0.6 nozzle", + "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", + "Flashforge/FlashForge PC @FF G4P 0.6 HF nozzle", + "Flashforge/FlashForge PC @FF G4P 0.6 nozzle", + "Flashforge/FlashForge PC @FF G4P 0.8 HF nozzle", + "Flashforge/FlashForge PPS @FF G4 0.6 HF nozzle", + "Flashforge/FlashForge PPS @FF G4 0.6 nozzle", + "Flashforge/FlashForge PPS @FF G4 0.8 HF nozzle", + "Flashforge/FlashForge PPS @FF G4P 0.6 HF nozzle", + "Flashforge/FlashForge PPS @FF G4P 0.6 nozzle", + "Flashforge/FlashForge PPS @FF G4P 0.8 HF nozzle", + "Flashforge/FlashForge PPS-CF @FF G4 0.6 nozzle", + "Flashforge/FlashForge PPS-CF @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ABS Basic", + "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF AD5X", + "Flashforge/Flashforge ABS Basic @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge ABS Basic @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge ABS Basic @FF C5", + "Flashforge/Flashforge ABS Basic @FF C5P", + "Flashforge/Flashforge ABS Basic @FF G4", + "Flashforge/Flashforge ABS Basic @FF G4 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 0.6 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 HF", + "Flashforge/Flashforge ABS Basic @FF G4P", + "Flashforge/Flashforge ABS Basic @FF G4P 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P HF", + "Flashforge/Flashforge ABS-CF @FF G4", + "Flashforge/Flashforge ABS-CF @FF G4 0.6 nozzle", + "Flashforge/Flashforge ABS-CF @FF G4P", + "Flashforge/Flashforge ABS-CF @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ABS-GF @FF C5", + "Flashforge/Flashforge ABS-GF @FF C5P", + "Flashforge/Flashforge ASA @FF AD5M 0.25 Nozzle", + "Flashforge/Flashforge ASA Basic", + "Flashforge/Flashforge ASA Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF AD5X", + "Flashforge/Flashforge ASA Basic @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge ASA Basic @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge ASA Basic @FF C5", + "Flashforge/Flashforge ASA Basic @FF C5P", + "Flashforge/Flashforge ASA Basic @FF G4", + "Flashforge/Flashforge ASA Basic @FF G4 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 0.6 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 HF", + "Flashforge/Flashforge ASA Basic @FF G4P", + "Flashforge/Flashforge ASA Basic @FF G4P 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P HF", + "Flashforge/Flashforge ASA-CF", + "Flashforge/Flashforge ASA-CF @FF C5", + "Flashforge/Flashforge ASA-CF @FF C5P", + "Flashforge/Flashforge ASA-CF @FF G4", + "Flashforge/Flashforge ASA-CF @FF G4P", + "Flashforge/Flashforge ASA-GF @FF C5", + "Flashforge/Flashforge ASA-GF @FF C5P", + "Flashforge/Flashforge Generic ASA @G3U", + "Flashforge/Flashforge Generic HIPS", + "Flashforge/Flashforge Generic HIPS @G3U 0.6 Nozzle", "Flashforge/Flashforge Generic HS PLA", "Flashforge/Flashforge Generic PETG", - "Flashforge/Flashforge Generic PETG @G3U", - "Flashforge/Flashforge Generic PETG @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic PETG @G3U 0.8 Nozzle", "Flashforge/Flashforge Generic PETG-CF @G3U", "Flashforge/Flashforge Generic PETG-CF @G3U 0.6 Nozzle", "Flashforge/Flashforge Generic PETG-CF @G3U 0.8 Nozzle", @@ -702,21 +698,430 @@ "Flashforge/Flashforge Generic PLA-CF @G3U 0.6 Nozzle", "Flashforge/Flashforge Generic PLA-CF @G3U 0.8 Nozzle", "Flashforge/Flashforge Generic PLA-CF10", + "Flashforge/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", "Flashforge/Flashforge Generic PLA-Silk", "Flashforge/Flashforge Generic PVA", + "Flashforge/Flashforge HIPS @FF C5", + "Flashforge/Flashforge HIPS @FF C5P", + "Flashforge/Flashforge HIPS @FF G4", + "Flashforge/Flashforge HIPS @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4 0.6 nozzle", + "Flashforge/Flashforge HIPS @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4 HF", + "Flashforge/Flashforge HIPS @FF G4P", + "Flashforge/Flashforge HIPS @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4P 0.6 nozzle", + "Flashforge/Flashforge HIPS @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4P HF", + "Flashforge/Flashforge HS PETG", + "Flashforge/Flashforge HS PETG @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF AD5X", + "Flashforge/Flashforge HS PETG @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge HS PETG @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge HS PETG @FF C5", + "Flashforge/Flashforge HS PETG @FF C5P", + "Flashforge/Flashforge HS PETG @FF G4", + "Flashforge/Flashforge HS PETG @FF G4 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4 0.6 nozzle", + "Flashforge/Flashforge HS PETG @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4 HF", + "Flashforge/Flashforge HS PETG @FF G4P", + "Flashforge/Flashforge HS PETG @FF G4P 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4P 0.6 nozzle", + "Flashforge/Flashforge HS PETG @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4P HF", + "Flashforge/Flashforge HS PLA", + "Flashforge/Flashforge HS PLA @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF AD5X", + "Flashforge/Flashforge HS PLA @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge HS PLA @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge HS PLA @FF C5", + "Flashforge/Flashforge HS PLA @FF C5P", + "Flashforge/Flashforge HS PLA @FF G4", + "Flashforge/Flashforge HS PLA @FF G4 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4 0.6 nozzle", + "Flashforge/Flashforge HS PLA @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4 HF", + "Flashforge/Flashforge HS PLA @FF G4P", + "Flashforge/Flashforge HS PLA @FF G4P 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4P 0.6 nozzle", + "Flashforge/Flashforge HS PLA @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4P HF", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 HF", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P HF", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PA @FF G4", + "Flashforge/Flashforge PA @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PA @FF G4 HF", + "Flashforge/Flashforge PA @FF G4P", + "Flashforge/Flashforge PA @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PA @FF G4P HF", + "Flashforge/Flashforge PA-CF @FF C5", + "Flashforge/Flashforge PA-CF @FF C5P", + "Flashforge/Flashforge PA-CF @FF G4", + "Flashforge/Flashforge PA-CF @FF G4P", + "Flashforge/Flashforge PA12-CF", + "Flashforge/Flashforge PA6-CF", + "Flashforge/Flashforge PA66-CF", + "Flashforge/Flashforge PAHT-CF @FF C5", + "Flashforge/Flashforge PAHT-CF @FF C5P", + "Flashforge/Flashforge PAHT-CF @FF G4", + "Flashforge/Flashforge PAHT-CF @FF G4P", + "Flashforge/Flashforge PET-CF", + "Flashforge/Flashforge PET-CF @FF C5", + "Flashforge/Flashforge PET-CF @FF C5P", "Flashforge/Flashforge PETG", + "Flashforge/Flashforge PETG Basic", + "Flashforge/Flashforge PETG Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PETG Pro", + "Flashforge/Flashforge PETG Pro @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF AD5X", + "Flashforge/Flashforge PETG Pro @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PETG Pro @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PETG Pro @FF C5", + "Flashforge/Flashforge PETG Pro @FF C5P", + "Flashforge/Flashforge PETG Pro @FF G4", + "Flashforge/Flashforge PETG Pro @FF G4 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 0.6 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 HF", + "Flashforge/Flashforge PETG Pro @FF G4P", + "Flashforge/Flashforge PETG Pro @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P HF", + "Flashforge/Flashforge PETG Transparent", + "Flashforge/Flashforge PETG Transparent @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF AD5X", + "Flashforge/Flashforge PETG Transparent @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PETG Transparent @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PETG Transparent @FF C5", + "Flashforge/Flashforge PETG Transparent @FF C5P", + "Flashforge/Flashforge PETG Transparent @FF G4", + "Flashforge/Flashforge PETG Transparent @FF G4 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 0.6 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 HF", + "Flashforge/Flashforge PETG Transparent @FF G4P", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P HF", + "Flashforge/Flashforge PETG-CF", + "Flashforge/Flashforge PETG-CF @FF AD5X", + "Flashforge/Flashforge PETG-CF @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PETG-CF @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PETG-CF @FF C5", + "Flashforge/Flashforge PETG-CF @FF C5P", + "Flashforge/Flashforge PETG-CF @FF G4", + "Flashforge/Flashforge PETG-CF @FF G4 0.6 nozzle", + "Flashforge/Flashforge PETG-CF @FF G4P", + "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge PLA", + "Flashforge/Flashforge PLA Matte @FF C5", + "Flashforge/Flashforge PLA Matte @FF C5P", + "Flashforge/Flashforge PLA Metal @FF C5", + "Flashforge/Flashforge PLA Metal @FF C5P", + "Flashforge/Flashforge PLA Pro @FF C5", + "Flashforge/Flashforge PLA Pro @FF C5P", + "Flashforge/Flashforge PLA Basic", + "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF AD5X", + "Flashforge/Flashforge PLA Basic @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Basic @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Basic @FF C5", + "Flashforge/Flashforge PLA Basic @FF C5P", + "Flashforge/Flashforge PLA Basic @FF G4", + "Flashforge/Flashforge PLA Basic @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 HF", + "Flashforge/Flashforge PLA Basic @FF G4P", + "Flashforge/Flashforge PLA Basic @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P HF", + "Flashforge/Flashforge PLA Buint Ti @FF G4 0.8 nozzle", + "Flashforge/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle", + "Flashforge/Flashforge PLA Color Change", + "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF AD5X", + "Flashforge/Flashforge PLA Color Change @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Color Change @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Color Change @FF C5", + "Flashforge/Flashforge PLA Color Change @FF C5P", + "Flashforge/Flashforge PLA Color Change @FF G4", + "Flashforge/Flashforge PLA Color Change @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 HF", + "Flashforge/Flashforge PLA Color Change @FF G4P", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P HF", + "Flashforge/Flashforge PLA Galaxy", + "Flashforge/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF AD5X", + "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF C5", + "Flashforge/Flashforge PLA Galaxy @FF C5P", + "Flashforge/Flashforge PLA Galaxy @FF G4", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 HF", + "Flashforge/Flashforge PLA Galaxy @FF G4P", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P HF", + "Flashforge/Flashforge PLA Luminous", + "Flashforge/Flashforge PLA Luminous @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF AD5X", + "Flashforge/Flashforge PLA Luminous @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Luminous @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Luminous @FF C5", + "Flashforge/Flashforge PLA Luminous @FF C5P", + "Flashforge/Flashforge PLA Luminous @FF G4", + "Flashforge/Flashforge PLA Luminous @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4 HF", + "Flashforge/Flashforge PLA Luminous @FF G4P", + "Flashforge/Flashforge PLA Luminous @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4P HF", + "Flashforge/Flashforge PLA Matte", + "Flashforge/Flashforge PLA Matte @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF AD5X", + "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4", + "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 HF", + "Flashforge/Flashforge PLA Matte @FF G4P", + "Flashforge/Flashforge PLA Matte @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P HF", + "Flashforge/Flashforge PLA Metal", + "Flashforge/Flashforge PLA Metal @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF AD5X", + "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4", + "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 HF", + "Flashforge/Flashforge PLA Metal @FF G4P", + "Flashforge/Flashforge PLA Metal @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P HF", + "Flashforge/Flashforge PLA Pro", + "Flashforge/Flashforge PLA Pro @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF AD5X", + "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4", + "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 HF", + "Flashforge/Flashforge PLA Pro @FF G4P", + "Flashforge/Flashforge PLA Pro @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P HF", + "Flashforge/Flashforge PLA Silk", + "Flashforge/Flashforge PLA Silk @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF AD5X", + "Flashforge/Flashforge PLA Silk @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Silk @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Silk @FF C5", + "Flashforge/Flashforge PLA Silk @FF C5P", + "Flashforge/Flashforge PLA Silk @FF G4", + "Flashforge/Flashforge PLA Silk @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 HF", + "Flashforge/Flashforge PLA Silk @FF G4P", + "Flashforge/Flashforge PLA Silk @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P HF", + "Flashforge/Flashforge PLA Sparkle", + "Flashforge/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF AD5X", + "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4", + "Flashforge/Flashforge PLA Sparkle @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4 HF", + "Flashforge/Flashforge PLA Sparkle @FF G4P", + "Flashforge/Flashforge PLA Sparkle @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4P HF", + "Flashforge/Flashforge PLA-CF", + "Flashforge/Flashforge PLA-CF @FF AD5X", + "Flashforge/Flashforge PLA-CF @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA-CF @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA-CF @FF C5", + "Flashforge/Flashforge PLA-CF @FF C5P", + "Flashforge/Flashforge PLA-CF @FF G4", + "Flashforge/Flashforge PLA-CF @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA-CF @FF G4P", + "Flashforge/Flashforge PLA-CF @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", + "Flashforge/Flashforge PPA-CF", + "Flashforge/Flashforge PPA-CF @FF C5", + "Flashforge/Flashforge PPA-CF @FF C5P", + "Flashforge/Flashforge PPA-GF", + "Flashforge/Flashforge PPS @FF G4", + "Flashforge/Flashforge PPS @FF G4P", + "Flashforge/Flashforge PPS-CF", + "Flashforge/Flashforge PPS-CF @FF C5", + "Flashforge/Flashforge PPS-CF @FF C5P", + "Flashforge/Flashforge PPS-CF @FF G4", + "Flashforge/Flashforge PPS-CF @FF G4P", + "Flashforge/Flashforge PVA @FF C5", + "Flashforge/Flashforge PVA @FF C5P", + "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge TPU 65D @FF G4 0.6 nozzle", + "Flashforge/Flashforge TPU 65D @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge TPU 65D @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge TPU 65D @FF G4P 0.6 nozzle", + "Flashforge/Flashforge TPU 65D @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge TPU 95A", + "Flashforge/Flashforge TPU 95A @FF AD5X", + "Flashforge/Flashforge TPU 95A @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge TPU 95A @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge TPU 95A @FF G4", + "Flashforge/Flashforge TPU 95A @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge TPU 95A @FF G4 0.6 nozzle", + "Flashforge/Flashforge TPU 95A @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge TPU 95A @FF G4P", + "Flashforge/Flashforge TPU 95A @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge TPU 95A @FF G4P 0.6 nozzle", + "Flashforge/Flashforge TPU 95A @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge TPU-64D @FF C5", + "Flashforge/Flashforge TPU-64D @FF C5P", + "Flashforge/Flashforge TPU-90A @FF C5", + "Flashforge/Flashforge TPU-90A @FF C5P", + "Flashforge/Flashforge TPU-95A @FF C5", + "Flashforge/Flashforge TPU-95A @FF C5P", "Flashforge/FusRock Generic NexPA-CF25", "Flashforge/FusRock Generic PAHT-CF", "Flashforge/FusRock Generic PAHT-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic PAHT-GF", "Flashforge/FusRock Generic PET-CF", "Flashforge/FusRock Generic PET-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock Generic PET-GF", "Flashforge/FusRock Generic S-Multi", "Flashforge/FusRock Generic S-Multi @G3U 0.6 Nozzle", "Flashforge/FusRock Generic S-PAHT", "Flashforge/FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "Flashforge/FusRock PAHT @FF G4 0.6 HF nozzle", + "Flashforge/FusRock PAHT @FF G4 0.6 nozzle", + "Flashforge/FusRock PAHT @FF G4 0.8 HF nozzle", + "Flashforge/FusRock PAHT @FF G4P 0.6 HF nozzle", + "Flashforge/FusRock PAHT @FF G4P 0.6 nozzle", + "Flashforge/FusRock PAHT @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PAHT-CF @FF C5", + "Flashforge/FusRock PAHT-CF @FF C5P", + "Flashforge/FusRock PAHT-CF @FF G4", + "Flashforge/FusRock PAHT-CF @FF G4 0.6 nozzle", + "Flashforge/FusRock PAHT-CF @FF G4P", + "Flashforge/FusRock PAHT-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock PET @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PET-CF @FF G4", + "Flashforge/FusRock PET-CF @FF G4 0.6 nozzle", + "Flashforge/FusRock PET-CF @FF G4P", + "Flashforge/FusRock PET-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock S-Multi @FF C5", + "Flashforge/FusRock S-Multi @FF C5P", + "Flashforge/FusRock S-PAHT @FF C5", + "Flashforge/FusRock S-PAHT @FF C5P", + "Flashforge/Generic ASA @Flashforge AD4", + "Flashforge/Generic PET @FF G4", + "Flashforge/Generic PET @FF G4 0.6 HF nozzle", + "Flashforge/Generic PET @FF G4 0.6 nozzle", + "Flashforge/Generic PET @FF G4 0.8 HF nozzle", + "Flashforge/Generic PET @FF G4P", + "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", + "Flashforge/Generic PET @FF G4P 0.6 nozzle", + "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", "Flashforge/Generic PETG @Flashforge Artemis", + "Flashforge/Generic PETG-CF10 @Flashforge AD4", "Flashforge/Generic PLA @Flashforge AD4", + "Flashforge/Generic PLA High Speed @Flashforge AD4", + "Flashforge/Generic PLA Silk @Flashforge AD4", + "Flashforge/Generic PLA-CF10 @Flashforge AD4", + "Flashforge/Generic TPU 85A @FF AD5X", + "Flashforge/Generic TPU 85A @FF AD5X 0.6 nozzle", + "Flashforge/Generic TPU 85A @FF AD5X 0.8 nozzle", + "Flashforge/Generic TPU @Flashforge AD4", + "Flashforge/Generic TPU-64D @FF C5", + "Flashforge/Generic TPU-64D @FF C5P", + "Flashforge/Generic TPU-90A @FF C5", + "Flashforge/Generic TPU-90A @FF C5P", + "Flashforge/Generic TPU-95A @FF C5", + "Flashforge/Generic TPU-95A @FF C5P", + "Flashforge/Polymaker CoPA @FF G4 0.6 HF nozzle", + "Flashforge/Polymaker CoPA @FF G4 0.6 nozzle", + "Flashforge/Polymaker CoPA @FF G4 0.8 HF nozzle", + "Flashforge/Polymaker CoPA @FF G4P 0.6 HF nozzle", + "Flashforge/Polymaker CoPA @FF G4P 0.6 nozzle", + "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", "Flashforge/Polymaker Generic CoPA", "Flashforge/Polymaker Generic S1", "Flashforge/SUNLU PETG @base", @@ -2411,22 +2816,7 @@ "Flashforge/Generic PETG" ], "FFG01": [ - "Flashforge/Flashforge Generic PLA", - "Flashforge/Flashforge HS PLA", - "Flashforge/Flashforge HS PLA Burnt Ti", - "Flashforge/Flashforge PA", - "Flashforge/Flashforge PLA Basic", - "Flashforge/Flashforge PLA Buint Ti", - "Flashforge/Flashforge PLA Color Change", - "Flashforge/Flashforge PLA Galaxy", - "Flashforge/Flashforge PLA Luminous", - "Flashforge/Flashforge PLA Matte", - "Flashforge/Flashforge PLA Metal", - "Flashforge/Flashforge PLA Pro", - "Flashforge/Flashforge PLA Silk", - "Flashforge/Flashforge PLA Sparkle", - "Flashforge/Flashforge TPU 65D", - "Flashforge/Flashforge TPU 95A" + "Flashforge/Flashforge Generic PLA" ], "FILAR0001": [ "OrcaFilamentLibrary/FilAr PLA Bronce" @@ -2838,63 +3228,8 @@ "FLSun/FLSun Generic ABS", "FLSun/FLSun S1 ABS", "FLSun/FLSun T1 ABS", - "Flashforge/FlashForge PC", - "Flashforge/FlashForge PPS", - "Flashforge/FlashForge PPS-CF", - "Flashforge/Flashforge ABS Basic", - "Flashforge/Flashforge ABS-CF", - "Flashforge/Flashforge ASA Basic", - "Flashforge/Flashforge ASA-CF", "Flashforge/Flashforge Generic ABS", - "Flashforge/Flashforge Generic ASA", - "Flashforge/Flashforge Generic HIPS", - "Flashforge/Flashforge Generic PETG", - "Flashforge/Flashforge Generic PETG-CF", - "Flashforge/Flashforge Generic PLA-CF", - "Flashforge/Flashforge Generic PVA", - "Flashforge/Flashforge HIPS", - "Flashforge/Flashforge HS PETG", - "Flashforge/Flashforge HS PLA", - "Flashforge/Flashforge HS PLA Burnt Ti", - "Flashforge/Flashforge PA", - "Flashforge/Flashforge PA12-CF", - "Flashforge/Flashforge PA6-CF", - "Flashforge/Flashforge PA66-CF", - "Flashforge/Flashforge PET-CF", - "Flashforge/Flashforge PETG Pro", - "Flashforge/Flashforge PETG Transparent", - "Flashforge/Flashforge PETG-CF", - "Flashforge/Flashforge PLA Basic", - "Flashforge/Flashforge PLA Color Change", - "Flashforge/Flashforge PLA Galaxy", - "Flashforge/Flashforge PLA Luminous", - "Flashforge/Flashforge PLA Matte", - "Flashforge/Flashforge PLA Metal", - "Flashforge/Flashforge PLA Pro", - "Flashforge/Flashforge PLA Silk", - "Flashforge/Flashforge PLA Sparkle", - "Flashforge/Flashforge PLA-CF", - "Flashforge/Flashforge PPA-CF", - "Flashforge/Flashforge PPA-GF", - "Flashforge/Flashforge PPS-CF", - "Flashforge/Flashforge TPU 65D", - "Flashforge/Flashforge TPU 95A", - "Flashforge/FusRock Generic NexPA-CF25", - "Flashforge/FusRock Generic PAHT-CF", - "Flashforge/FusRock Generic PAHT-GF", - "Flashforge/FusRock Generic PET-CF", - "Flashforge/FusRock Generic PET-GF", - "Flashforge/FusRock Generic S-Multi", - "Flashforge/FusRock Generic S-PAHT", - "Flashforge/FusRock PAHT", - "Flashforge/FusRock PAHT-CF", - "Flashforge/FusRock PET", - "Flashforge/FusRock PET-CF", "Flashforge/Generic ABS", - "Flashforge/Generic PET", - "Flashforge/Polymaker CoPA", - "Flashforge/Polymaker Generic CoPA", - "Flashforge/Polymaker Generic S1", "FlyingBear/FlyingBear ABS", "FlyingBear/FlyingBear Generic ABS", "FlyingBear/Other ABS", @@ -3084,21 +3419,7 @@ "FLSun/FLSun S1 PETG", "FLSun/FLSun T1 PETG", "Flashforge/Flashforge Generic PETG", - "Flashforge/Flashforge Generic PETG-CF10", - "Flashforge/Flashforge Generic TPU", - "Flashforge/Flashforge HS PETG", - "Flashforge/Flashforge PA", - "Flashforge/Flashforge PETG Basic", - "Flashforge/Flashforge PETG Pro", - "Flashforge/Flashforge PETG Transparent", - "Flashforge/Flashforge PETG-CF", - "Flashforge/Flashforge TPU 95A", - "Flashforge/FusRock PET-CF", - "Flashforge/Generic PET", "Flashforge/Generic PETG", - "Flashforge/Generic PETG-CF10", - "Flashforge/Generic TPU", - "Flashforge/Generic TPU 85A", "FlyingBear/FlyingBear Generic PETG", "FlyingBear/FlyingBear PETG", "FlyingBear/FlyingBear PETG Basic", @@ -3453,34 +3774,8 @@ "FLSun/FLSun T1 PLA Generic", "FLSun/FLSun T1 PLA High Speed", "FLSun/FLSun T1 PLA Silk", - "Flashforge/Flashforge ASA Basic", - "Flashforge/Flashforge Generic ASA", - "Flashforge/Flashforge Generic HS PLA", - "Flashforge/Flashforge Generic PLA-CF10", - "Flashforge/Flashforge Generic PLA-SILK", - "Flashforge/Flashforge Generic PLA-Silk", - "Flashforge/Flashforge HIPS", - "Flashforge/Flashforge HS PLA", - "Flashforge/Flashforge PA-CF", - "Flashforge/Flashforge PAHT-CF", - "Flashforge/Flashforge PLA Basic", - "Flashforge/Flashforge PLA Color Change", - "Flashforge/Flashforge PLA Galaxy", - "Flashforge/Flashforge PLA Luminous", - "Flashforge/Flashforge PLA Matte", - "Flashforge/Flashforge PLA Metal", - "Flashforge/Flashforge PLA Pro", - "Flashforge/Flashforge PLA Silk", - "Flashforge/Flashforge PLA Sparkle", - "Flashforge/Flashforge PLA-CF", - "Flashforge/Flashforge PPS", - "Flashforge/Flashforge PPS-CF", - "Flashforge/FusRock PAHT-CF", - "Flashforge/Generic ASA", "Flashforge/Generic PLA", "Flashforge/Generic PLA High Speed", - "Flashforge/Generic PLA Silk", - "Flashforge/Generic PLA-CF10", "FlyingBear/FlyingBear Generic PLA", "FlyingBear/FlyingBear PLA", "FlyingBear/FlyingBear PLA Basic", @@ -4389,12 +4684,21 @@ "OF0M6QAQ": [ "OrcaFilamentLibrary/Elegoo PLA Galaxy" ], + "OF0SyJhk": [ + "Flashforge/Flashforge PA6-CF" + ], "OF0TjJ0G": [ "Qidi/Qidi ASA-Aero" ], + "OF0UbONm": [ + "Flashforge/FusRock S-PAHT" + ], "OF0Y5MLd": [ "Qidi/QIDI PETG-GF" ], + "OF0wk0Pk": [ + "Flashforge/Flashforge PLA Pro" + ], "OF0z1XpN": [ "Qidi/QIDI PLA Rapido Silk" ], @@ -4407,27 +4711,60 @@ "OF2UFmOo": [ "Qidi/Bambu PLA" ], + "OF38Hyk4": [ + "Flashforge/Flashforge PETG Pro" + ], "OF3GKs2i": [ "OrcaFilamentLibrary/eSUN PLA-Matte" ], "OF3XeEuV": [ "Qidi/QIDI PET-GF" ], + "OF41QVDH": [ + "Flashforge/Flashforge Generic PLA-Silk" + ], "OF48G7He": [ "Qidi/QIDI PETG Tough 0.8 nozzle" ], + "OF4RKeng": [ + "Flashforge/Flashforge Generic ASA" + ], "OF4fgpse": [ "OrcaFilamentLibrary/Elegoo PLA Marble" ], "OF4gzzE4": [ "Qidi/QIDI PET-CF" ], + "OF4m9A5w": [ + "Flashforge/Flashforge Generic HIPS" + ], + "OF5T1Y9R": [ + "Flashforge/Flashforge ABS Basic" + ], "OF5UUaUM": [ "Qidi/Qidi Generic PLA High Speed" ], + "OF5kwfZu": [ + "Flashforge/FusRock Generic NexPA-CF25" + ], + "OF60Lmeq": [ + "Flashforge/Flashforge PLA Matte" + ], "OF6EOy1A": [ "Qidi/Bambu PETG" ], + "OF6FM5F7": [ + "Flashforge/FusRock PAHT" + ], + "OF6Mxzsg": [ + "Flashforge/Generic TPU" + ], + "OF6SEkeJ": [ + "Flashforge/FusRock PET-CF" + ], + "OF6XIeUW": [ + "Flashforge/Generic PLA-CF10" + ], "OF79FFkO": [ "OrcaFilamentLibrary/Elegoo PC-FR" ], @@ -4440,39 +4777,72 @@ "OF8WvPVL": [ "Qidi/QIDI ABS Rapido 0.8 nozzle" ], + "OF9RZyBz": [ + "Flashforge/Polymaker Generic S1" + ], "OF9qvJxV": [ "OrcaFilamentLibrary/Elegoo PLA Translucent2" ], + "OF9sr3Vn": [ + "Flashforge/Flashforge PLA Sparkle" + ], + "OFAEqlWa": [ + "Flashforge/Flashforge Generic PLA-SILK" + ], + "OFAGrVjP": [ + "Flashforge/Flashforge PLA Silk" + ], "OFAUDGEQ": [ "Qidi/QIDI PLA Rapido Matte" ], "OFAdAYYk": [ "Qidi/QIDI PPS-CF" ], + "OFAdZFD1": [ + "Flashforge/FusRock Generic PET-GF" + ], "OFAnyzjN": [ "Qidi/HATCHBOX PETG" ], + "OFAtydxE": [ + "Flashforge/FusRock S-Multi" + ], "OFC2FSsV": [ "Qidi/Overture PLA" ], + "OFC5CCeo": [ + "Flashforge/Flashforge Generic PETG-CF" + ], + "OFCJaXZS": [ + "Flashforge/Flashforge PPS" + ], "OFD5e0sH": [ "OrcaFilamentLibrary/Elegoo Rapid PLA+" ], "OFDCk0cz": [ - "Flashforge/Flashforge PET-CF", - "Flashforge/Flashforge PETG-CF", - "Flashforge/FusRock S-Multi", "OrcaFilamentLibrary/Generic PETG-CF" ], "OFDNiRTx": [ "OrcaFilamentLibrary/Elegoo PLA+" ], + "OFDkABjZ": [ + "Flashforge/Generic TPU-90A" + ], + "OFE22Uba": [ + "Flashforge/Flashforge TPU-90A" + ], "OFFIL5pD": [ "Qidi/QIDI PA12-CF" ], "OFG8vHw8": [ "Qidi/Qidi Generic ASA" ], + "OFGfdP6J": [ + "Flashforge/FusRock Generic S-Multi" + ], + "OFHBTqyD": [ + "Flashforge/Flashforge PLA Basic" + ], "OFICPchn": [ "OrcaFilamentLibrary/Elegoo PLA Basic" ], @@ -4488,18 +4858,42 @@ "OFJsqMzx": [ "OrcaFilamentLibrary/Generic PLA Matte" ], + "OFK39W9u": [ + "Flashforge/Flashforge Generic PETG-CF10" + ], "OFK820gS": [ "Qidi/QIDI ASA" ], + "OFKWVi10": [ + "Flashforge/Flashforge Generic PLA-CF10" + ], + "OFKZH00L": [ + "Flashforge/FusRock Generic PET-CF" + ], "OFKjlAbC": [ "Qidi/QIDI UltraPA-CF25" ], + "OFL7vEML": [ + "Flashforge/FlashForge PC" + ], "OFLSBS99": [ "OrcaFilamentLibrary/Generic SBS" ], + "OFLeFaUO": [ + "Flashforge/Flashforge Generic PVA" + ], + "OFLxO2Oc": [ + "Flashforge/FusRock PET" + ], + "OFM3PeVe": [ + "Flashforge/Flashforge ASA-CF" + ], "OFMCMXSG": [ "OrcaFilamentLibrary/Generic PP-GF" ], + "OFMHTnPP": [ + "Flashforge/Flashforge PA12-CF" + ], "OFMQJToc": [ "OrcaFilamentLibrary/Elegoo PETG-GF" ], @@ -4512,18 +4906,30 @@ "OFNX5uRT": [ "Qidi/QIDI TPU-Aero" ], + "OFOSzSuh": [ + "Flashforge/Flashforge PA-CF" + ], "OFOW9K96": [ "Qidi/Qidi TPU 95A-HF" ], "OFOysPuE": [ "Qidi/QIDI TPU-GF" ], + "OFPJJxkF": [ + "Flashforge/Flashforge PET-CF" + ], + "OFPJrlC3": [ + "Flashforge/Flashforge PLA-CF" + ], "OFPokkKe": [ "Qidi/QIDI PETG-CF" ], "OFPwi9X0": [ "Qidi/HATCHBOX ABS" ], + "OFQCAYAt": [ + "Flashforge/Flashforge PPA-CF" + ], "OFQZINrX": [ "Qidi/QIDI ABS-GF10" ], @@ -4533,15 +4939,30 @@ "OFQkWxJy": [ "OrcaFilamentLibrary/Elegoo PLA Matte" ], + "OFRNU58t": [ + "Flashforge/Flashforge TPU 95A" + ], + "OFRR8LUh": [ + "Flashforge/Generic ASA" + ], "OFRS2Ggt": [ "OrcaFilamentLibrary/Generic PP-CF" ], + "OFRgDMDJ": [ + "Flashforge/Flashforge PETG Transparent" + ], "OFSSuKRr": [ "Qidi/QIDI PETG Basic" ], + "OFSdF3B1": [ + "Flashforge/FusRock PAHT-CF" + ], "OFT3TqB6": [ "OrcaFilamentLibrary/Elas ASA" ], + "OFTa6gPH": [ + "Flashforge/Flashforge PLA Pro" + ], "OFToBodi": [ "Qidi/QIDI ABS Rapido Metal" ], @@ -4566,6 +4987,12 @@ "OFWkCAdc": [ "Qidi/QIDI PETG Tough 0.2 nozzle" ], + "OFWs8KIZ": [ + "Flashforge/Flashforge ABS-CF" + ], + "OFWv6JYn": [ + "Flashforge/Flashforge PLA Metal" + ], "OFWyCd0Y": [ "Qidi/QIDI Support For PET/PA" ], @@ -4581,12 +5008,30 @@ "OFXmQgno": [ "OrcaFilamentLibrary/eSUN PLA-Marble" ], + "OFXv4FUi": [ + "Flashforge/Flashforge PLA Galaxy" + ], "OFYH00jV": [ "Qidi/QIDI ABS-GF" ], + "OFYICbI4": [ + "Flashforge/FusRock Generic PAHT-CF" + ], + "OFYRS7GZ": [ + "Flashforge/Generic TPU-95A" + ], + "OFYZs7dN": [ + "Flashforge/Flashforge Generic HS PLA" + ], "OFZAkPHG": [ "Qidi/QIDI PPS-GF" ], + "OFZQFvHQ": [ + "Flashforge/Flashforge HS PETG" + ], + "OFZcrV9c": [ + "Flashforge/Flashforge PPS-CF" + ], "OFZhdVnP": [ "OrcaFilamentLibrary/eSUN PLA-Basic" ], @@ -4605,6 +5050,21 @@ "OFceJcLf": [ "Qidi/PolyLite PLA" ], + "OFcy60o4": [ + "Flashforge/Flashforge ASA Basic" + ], + "OFdNORGt": [ + "Flashforge/Flashforge ASA-GF" + ], + "OFdhVJql": [ + "Flashforge/Flashforge PLA Buint Ti" + ], + "OFeFRwST": [ + "Flashforge/Flashforge PVA" + ], + "OFeWMAGH": [ + "Flashforge/Flashforge HS PLA Burnt Ti" + ], "OFenGPBR": [ "OrcaFilamentLibrary/Elegoo PETG Translucent" ], @@ -4612,7 +5072,6 @@ "Qidi/QIDI ABS Rapido 0.2 nozzle" ], "OFfB1QKi": [ - "Flashforge/Flashforge HS PETG", "OrcaFilamentLibrary/Generic PETG HF" ], "OFfJoIgg": [ @@ -4621,36 +5080,87 @@ "OFfdxQok": [ "Qidi/Generic PLA+" ], + "OFftQOek": [ + "Flashforge/Flashforge PLA Matte" + ], + "OFgJX0Fc": [ + "Flashforge/FlashForge PPS" + ], + "OFhzHd2Y": [ + "Flashforge/Flashforge HIPS" + ], + "OFi1ocNv": [ + "Flashforge/Flashforge PA" + ], "OFiJYDPC": [ "Qidi/HATCHBOX PLA" ], "OFidJLn8": [ "Qidi/PolyLite ABS" ], + "OFjepy6j": [ + "Flashforge/FusRock Generic S-PAHT" + ], "OFjohFkg": [ "Qidi/QIDI PETG Translucent" ], + "OFjqPjjl": [ + "Flashforge/Generic PET" + ], + "OFkaDtKx": [ + "Flashforge/Flashforge PA66-CF" + ], + "OFlNKZLP": [ + "Flashforge/Flashforge PLA Metal" + ], + "OFm1VZed": [ + "Flashforge/Flashforge Generic PLA-CF" + ], "OFmF1xL9": [ "Qidi/QIDI ASA-CF" ], "OFmKNi3f": [ "Qidi/QIDI PLA Rapido" ], + "OFmduKVr": [ + "Flashforge/FlashForge PPS-CF" + ], "OFmeQjRP": [ "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" ], + "OFmgesco": [ + "Flashforge/Flashforge TPU 65D" + ], "OFnj7bPm": [ "Qidi/QIDI ABS Rapido 0.6 nozzle" ], "OFnsWQTp": [ "Qidi/QIDI WOOD Rapido" ], + "OFo9EwvK": [ + "Flashforge/Generic PETG-CF10" + ], + "OFoAaHcF": [ + "Flashforge/FusRock Generic PAHT-GF" + ], + "OFoJUGj6": [ + "Flashforge/Flashforge HS PLA" + ], + "OFoimrpo": [ + "Flashforge/Flashforge PETG-CF" + ], + "OFp8lkYD": [ + "Flashforge/Flashforge PPA-GF" + ], "OFpwg2Qh": [ "OrcaFilamentLibrary/Elegoo ASA-CF" ], "OFqPp2yL": [ "Qidi/QIDI PETG Tough 0.6 nozzle" ], + "OFqRWRU6": [ + "Flashforge/Flashforge ABS-GF" + ], "OFqh1Ngp": [ "OrcaFilamentLibrary/Elegoo PLA-CF" ], @@ -4672,27 +5182,60 @@ "OFsNZcid": [ "OrcaFilamentLibrary/PolyLite Dual PLA" ], + "OFsgANe3": [ + "Flashforge/Flashforge PAHT-CF" + ], + "OFt9AiN5": [ + "Flashforge/Polymaker CoPA" + ], + "OFtEFtsz": [ + "Flashforge/Polymaker Generic CoPA" + ], + "OFtJMczs": [ + "Flashforge/Flashforge TPU-64D" + ], "OFuTFxVP": [ "Qidi/Overture ABS" ], "OFuidAEg": [ "Qidi/Bambu ABS" ], + "OFuswXlp": [ + "Flashforge/Generic TPU 85A" + ], "OFutwD6f": [ "OrcaFilamentLibrary/Elegoo PLA Glow" ], + "OFuyJhLF": [ + "Flashforge/Flashforge PETG Basic" + ], "OFv2NHLC": [ "Qidi/QIDI ABS-GF25" ], "OFvN3117": [ "Qidi/QIDI PLA Matte Basic" ], + "OFviQ9lH": [ + "Flashforge/Flashforge Generic TPU" + ], + "OFvsS7Fb": [ + "Flashforge/Generic TPU-64D" + ], "OFw4OHWE": [ "OrcaFilamentLibrary/Elas PETG Basic" ], "OFwHPTvy": [ "Qidi/Qidi Generic PLA+" ], + "OFwf0oWp": [ + "Flashforge/Flashforge PLA Luminous" + ], + "OFyoW5W2": [ + "Flashforge/Flashforge PLA Color Change" + ], + "OFyxAbO4": [ + "Flashforge/Flashforge TPU-95A" + ], "OFzrWlH5": [ "OrcaFilamentLibrary/Elegoo PETG HF" ], @@ -4768,11 +5311,6 @@ ], "OGFB99": [ "Custom/Generic ABS", - "Flashforge/Flashforge ABS Basic", - "Flashforge/Flashforge ABS-GF", - "Flashforge/Flashforge ASA Basic", - "Flashforge/Flashforge ASA-CF", - "Flashforge/Flashforge ASA-GF", "OrcaFilamentLibrary/Generic ABS" ], "OGFC00": [ @@ -4803,8 +5341,6 @@ "OrcaFilamentLibrary/Generic PCTG" ], "OGFG99": [ - "Flashforge/Flashforge PETG Pro", - "Flashforge/Flashforge PETG Transparent", "OrcaFilamentLibrary/Generic PETG" ], "OGFGG300": [ @@ -4856,23 +5392,13 @@ "OrcaFilamentLibrary/Generic PLA High Speed" ], "OGFL96": [ - "Flashforge/Flashforge PLA Silk", "Flashforge/Generic PLA Silk", "OrcaFilamentLibrary/Generic PLA Silk" ], "OGFL98": [ - "Flashforge/Flashforge PLA-CF", "OrcaFilamentLibrary/Generic PLA-CF" ], "OGFL99": [ - "Flashforge/Flashforge HS PLA", - "Flashforge/Flashforge PLA Matte", - "Flashforge/Flashforge PLA Metal", - "Flashforge/Flashforge PLA Pro", - "Flashforge/Flashforge PLA Basic", - "Flashforge/Flashforge PLA Color Change", - "Flashforge/Flashforge PLA Galaxy", - "Flashforge/Flashforge PLA Luminous", "Flashforge/Generic PLA", "OrcaFilamentLibrary/Generic PLA" ], @@ -4895,8 +5421,6 @@ "OrcaFilamentLibrary/Bambu PA6-GF" ], "OGFN96": [ - "Flashforge/Flashforge PPA-CF", - "Flashforge/Flashforge PPS-CF", "OrcaFilamentLibrary/Generic PPA-GF" ], "OGFN97": [ @@ -4904,10 +5428,6 @@ ], "OGFN98": [ "Custom/Generic PA-CF", - "Flashforge/Flashforge PA-CF", - "Flashforge/Flashforge PAHT-CF", - "Flashforge/FusRock PAHT-CF", - "Flashforge/FusRock S-PAHT", "OrcaFilamentLibrary/Generic PA-CF" ], "OGFN99": [ @@ -5015,11 +5535,9 @@ "OrcaFilamentLibrary/Generic BVOH" ], "OGFS98": [ - "Flashforge/Flashforge HIPS", "OrcaFilamentLibrary/Generic HIPS" ], "OGFS99": [ - "Flashforge/Flashforge PVA", "OrcaFilamentLibrary/Generic PVA" ], "OGFSNL02": [ @@ -5054,12 +5572,6 @@ "OrcaFilamentLibrary/Bambu TPU 95A" ], "OGFU99": [ - "Flashforge/Flashforge TPU-64D", - "Flashforge/Flashforge TPU-90A", - "Flashforge/Flashforge TPU-95A", - "Flashforge/Generic TPU-64D", - "Flashforge/Generic TPU-90A", - "Flashforge/Generic TPU-95A", "OrcaFilamentLibrary/Generic TPU" ], "OVTABS08": [ @@ -6681,7 +7193,74 @@ "FLSun/FLSun T1 PLA High Speed", "FLSun/FLSun T1 PLA Silk", "FLSun/FLSun T1 TPU", + "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", + "Flashforge/FlashForge PC @FF G4 0.6 nozzle", + "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", + "Flashforge/FlashForge PC @FF G4P 0.6 HF nozzle", + "Flashforge/FlashForge PC @FF G4P 0.6 nozzle", + "Flashforge/FlashForge PC @FF G4P 0.8 HF nozzle", + "Flashforge/FlashForge PPS @FF G4 0.6 HF nozzle", + "Flashforge/FlashForge PPS @FF G4 0.6 nozzle", + "Flashforge/FlashForge PPS @FF G4 0.8 HF nozzle", + "Flashforge/FlashForge PPS @FF G4P 0.6 HF nozzle", + "Flashforge/FlashForge PPS @FF G4P 0.6 nozzle", + "Flashforge/FlashForge PPS @FF G4P 0.8 HF nozzle", + "Flashforge/FlashForge PPS-CF @FF G4 0.6 nozzle", + "Flashforge/FlashForge PPS-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge ABS", + "Flashforge/Flashforge ABS Basic", + "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF AD5X", + "Flashforge/Flashforge ABS Basic @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge ABS Basic @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge ABS Basic @FF C5", + "Flashforge/Flashforge ABS Basic @FF C5P", + "Flashforge/Flashforge ABS Basic @FF G4", + "Flashforge/Flashforge ABS Basic @FF G4 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 0.6 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4 HF", + "Flashforge/Flashforge ABS Basic @FF G4P", + "Flashforge/Flashforge ABS Basic @FF G4P 0.25 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge ABS Basic @FF G4P HF", + "Flashforge/Flashforge ABS-CF @FF G4", + "Flashforge/Flashforge ABS-CF @FF G4 0.6 nozzle", + "Flashforge/Flashforge ABS-CF @FF G4P", + "Flashforge/Flashforge ABS-CF @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ABS-GF @FF C5", + "Flashforge/Flashforge ABS-GF @FF C5P", + "Flashforge/Flashforge ASA Basic", + "Flashforge/Flashforge ASA Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF AD5X", + "Flashforge/Flashforge ASA Basic @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge ASA Basic @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge ASA Basic @FF C5", + "Flashforge/Flashforge ASA Basic @FF C5P", + "Flashforge/Flashforge ASA Basic @FF G4", + "Flashforge/Flashforge ASA Basic @FF G4 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 0.6 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4 HF", + "Flashforge/Flashforge ASA Basic @FF G4P", + "Flashforge/Flashforge ASA Basic @FF G4P 0.25 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge ASA Basic @FF G4P HF", + "Flashforge/Flashforge ASA-CF", + "Flashforge/Flashforge ASA-CF @FF C5", + "Flashforge/Flashforge ASA-CF @FF C5P", + "Flashforge/Flashforge ASA-CF @FF G4", + "Flashforge/Flashforge ASA-CF @FF G4P", + "Flashforge/Flashforge ASA-GF @FF C5", + "Flashforge/Flashforge ASA-GF @FF C5P", "Flashforge/Flashforge Generic ABS", "Flashforge/Flashforge Generic ABS @FF AD5M 0.25 Nozzle", "Flashforge/Flashforge Generic ABS @G3U", @@ -6713,9 +7292,363 @@ "Flashforge/Flashforge Generic PLA-Silk", "Flashforge/Flashforge Generic PVA", "Flashforge/Flashforge Generic TPU", + "Flashforge/Flashforge HIPS @FF C5", + "Flashforge/Flashforge HIPS @FF C5P", + "Flashforge/Flashforge HIPS @FF G4", + "Flashforge/Flashforge HIPS @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4 0.6 nozzle", + "Flashforge/Flashforge HIPS @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4 HF", + "Flashforge/Flashforge HIPS @FF G4P", + "Flashforge/Flashforge HIPS @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4P 0.6 nozzle", + "Flashforge/Flashforge HIPS @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge HIPS @FF G4P HF", + "Flashforge/Flashforge HS PETG", + "Flashforge/Flashforge HS PETG @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF AD5X", + "Flashforge/Flashforge HS PETG @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge HS PETG @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge HS PETG @FF C5", + "Flashforge/Flashforge HS PETG @FF C5P", + "Flashforge/Flashforge HS PETG @FF G4", + "Flashforge/Flashforge HS PETG @FF G4 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4 0.6 nozzle", + "Flashforge/Flashforge HS PETG @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4 HF", + "Flashforge/Flashforge HS PETG @FF G4P", + "Flashforge/Flashforge HS PETG @FF G4P 0.25 nozzle", + "Flashforge/Flashforge HS PETG @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4P 0.6 nozzle", + "Flashforge/Flashforge HS PETG @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge HS PETG @FF G4P HF", + "Flashforge/Flashforge HS PLA", "Flashforge/Flashforge HS PLA @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF AD5X", + "Flashforge/Flashforge HS PLA @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge HS PLA @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge HS PLA @FF C5", + "Flashforge/Flashforge HS PLA @FF C5P", + "Flashforge/Flashforge HS PLA @FF G4", + "Flashforge/Flashforge HS PLA @FF G4 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4 0.6 nozzle", + "Flashforge/Flashforge HS PLA @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4 HF", + "Flashforge/Flashforge HS PLA @FF G4P", + "Flashforge/Flashforge HS PLA @FF G4P 0.25 nozzle", + "Flashforge/Flashforge HS PLA @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4P 0.6 nozzle", + "Flashforge/Flashforge HS PLA @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge HS PLA @FF G4P HF", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 HF", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P HF", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle", + "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PA @FF G4", + "Flashforge/Flashforge PA @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PA @FF G4 HF", + "Flashforge/Flashforge PA @FF G4P", + "Flashforge/Flashforge PA @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PA @FF G4P HF", + "Flashforge/Flashforge PA-CF @FF C5", + "Flashforge/Flashforge PA-CF @FF C5P", + "Flashforge/Flashforge PA-CF @FF G4", + "Flashforge/Flashforge PA-CF @FF G4P", + "Flashforge/Flashforge PA12-CF", + "Flashforge/Flashforge PA6-CF", + "Flashforge/Flashforge PA66-CF", + "Flashforge/Flashforge PAHT-CF @FF C5", + "Flashforge/Flashforge PAHT-CF @FF C5P", + "Flashforge/Flashforge PAHT-CF @FF G4", + "Flashforge/Flashforge PAHT-CF @FF G4P", + "Flashforge/Flashforge PET-CF", + "Flashforge/Flashforge PET-CF @FF C5", + "Flashforge/Flashforge PET-CF @FF C5P", "Flashforge/Flashforge PETG", + "Flashforge/Flashforge PETG Basic", + "Flashforge/Flashforge PETG Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PETG Pro", + "Flashforge/Flashforge PETG Pro @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF AD5X", + "Flashforge/Flashforge PETG Pro @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PETG Pro @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PETG Pro @FF C5", + "Flashforge/Flashforge PETG Pro @FF C5P", + "Flashforge/Flashforge PETG Pro @FF G4", + "Flashforge/Flashforge PETG Pro @FF G4 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 0.6 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4 HF", + "Flashforge/Flashforge PETG Pro @FF G4P", + "Flashforge/Flashforge PETG Pro @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PETG Pro @FF G4P HF", + "Flashforge/Flashforge PETG Transparent", + "Flashforge/Flashforge PETG Transparent @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF AD5X", + "Flashforge/Flashforge PETG Transparent @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PETG Transparent @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PETG Transparent @FF C5", + "Flashforge/Flashforge PETG Transparent @FF C5P", + "Flashforge/Flashforge PETG Transparent @FF G4", + "Flashforge/Flashforge PETG Transparent @FF G4 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 0.6 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4 HF", + "Flashforge/Flashforge PETG Transparent @FF G4P", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PETG Transparent @FF G4P HF", + "Flashforge/Flashforge PETG-CF", + "Flashforge/Flashforge PETG-CF @FF AD5X", + "Flashforge/Flashforge PETG-CF @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PETG-CF @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PETG-CF @FF C5", + "Flashforge/Flashforge PETG-CF @FF C5P", + "Flashforge/Flashforge PETG-CF @FF G4", + "Flashforge/Flashforge PETG-CF @FF G4 0.6 nozzle", + "Flashforge/Flashforge PETG-CF @FF G4P", + "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge PLA", + "Flashforge/Flashforge PLA Matte @FF C5", + "Flashforge/Flashforge PLA Matte @FF C5P", + "Flashforge/Flashforge PLA Metal @FF C5", + "Flashforge/Flashforge PLA Metal @FF C5P", + "Flashforge/Flashforge PLA Pro @FF C5", + "Flashforge/Flashforge PLA Pro @FF C5P", + "Flashforge/Flashforge PLA Basic", + "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF AD5X", + "Flashforge/Flashforge PLA Basic @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Basic @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Basic @FF C5", + "Flashforge/Flashforge PLA Basic @FF C5P", + "Flashforge/Flashforge PLA Basic @FF G4", + "Flashforge/Flashforge PLA Basic @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4 HF", + "Flashforge/Flashforge PLA Basic @FF G4P", + "Flashforge/Flashforge PLA Basic @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Basic @FF G4P HF", + "Flashforge/Flashforge PLA Buint Ti @FF G4 0.8 nozzle", + "Flashforge/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle", + "Flashforge/Flashforge PLA Color Change", + "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF AD5X", + "Flashforge/Flashforge PLA Color Change @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Color Change @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Color Change @FF C5", + "Flashforge/Flashforge PLA Color Change @FF C5P", + "Flashforge/Flashforge PLA Color Change @FF G4", + "Flashforge/Flashforge PLA Color Change @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4 HF", + "Flashforge/Flashforge PLA Color Change @FF G4P", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Color Change @FF G4P HF", + "Flashforge/Flashforge PLA Galaxy", + "Flashforge/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF AD5X", + "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF C5", + "Flashforge/Flashforge PLA Galaxy @FF C5P", + "Flashforge/Flashforge PLA Galaxy @FF G4", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4 HF", + "Flashforge/Flashforge PLA Galaxy @FF G4P", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Galaxy @FF G4P HF", + "Flashforge/Flashforge PLA Luminous", + "Flashforge/Flashforge PLA Luminous @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF AD5X", + "Flashforge/Flashforge PLA Luminous @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Luminous @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Luminous @FF C5", + "Flashforge/Flashforge PLA Luminous @FF C5P", + "Flashforge/Flashforge PLA Luminous @FF G4", + "Flashforge/Flashforge PLA Luminous @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4 HF", + "Flashforge/Flashforge PLA Luminous @FF G4P", + "Flashforge/Flashforge PLA Luminous @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Luminous @FF G4P HF", + "Flashforge/Flashforge PLA Matte", + "Flashforge/Flashforge PLA Matte @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF AD5X", + "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4", + "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4 HF", + "Flashforge/Flashforge PLA Matte @FF G4P", + "Flashforge/Flashforge PLA Matte @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Matte @FF G4P HF", + "Flashforge/Flashforge PLA Metal", + "Flashforge/Flashforge PLA Metal @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF AD5X", + "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4", + "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4 HF", + "Flashforge/Flashforge PLA Metal @FF G4P", + "Flashforge/Flashforge PLA Metal @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Metal @FF G4P HF", + "Flashforge/Flashforge PLA Pro", + "Flashforge/Flashforge PLA Pro @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF AD5X", + "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4", + "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4 HF", + "Flashforge/Flashforge PLA Pro @FF G4P", + "Flashforge/Flashforge PLA Pro @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Pro @FF G4P HF", + "Flashforge/Flashforge PLA Silk", + "Flashforge/Flashforge PLA Silk @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF AD5X", + "Flashforge/Flashforge PLA Silk @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Silk @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Silk @FF C5", + "Flashforge/Flashforge PLA Silk @FF C5P", + "Flashforge/Flashforge PLA Silk @FF G4", + "Flashforge/Flashforge PLA Silk @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4 HF", + "Flashforge/Flashforge PLA Silk @FF G4P", + "Flashforge/Flashforge PLA Silk @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge PLA Silk @FF G4P HF", + "Flashforge/Flashforge PLA Sparkle", + "Flashforge/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF AD5X", + "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4", + "Flashforge/Flashforge PLA Sparkle @FF G4 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4 HF", + "Flashforge/Flashforge PLA Sparkle @FF G4P", + "Flashforge/Flashforge PLA Sparkle @FF G4P 0.25 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PLA Sparkle @FF G4P HF", + "Flashforge/Flashforge PLA-CF", + "Flashforge/Flashforge PLA-CF @FF AD5X", + "Flashforge/Flashforge PLA-CF @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge PLA-CF @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA-CF @FF C5", + "Flashforge/Flashforge PLA-CF @FF C5P", + "Flashforge/Flashforge PLA-CF @FF G4", + "Flashforge/Flashforge PLA-CF @FF G4 0.6 nozzle", + "Flashforge/Flashforge PLA-CF @FF G4P", + "Flashforge/Flashforge PLA-CF @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PPA-CF", + "Flashforge/Flashforge PPA-CF @FF C5", + "Flashforge/Flashforge PPA-CF @FF C5P", + "Flashforge/Flashforge PPA-GF", + "Flashforge/Flashforge PPS @FF G4", + "Flashforge/Flashforge PPS @FF G4P", + "Flashforge/Flashforge PPS-CF", + "Flashforge/Flashforge PPS-CF @FF C5", + "Flashforge/Flashforge PPS-CF @FF C5P", + "Flashforge/Flashforge PPS-CF @FF G4", + "Flashforge/Flashforge PPS-CF @FF G4P", + "Flashforge/Flashforge PVA @FF C5", + "Flashforge/Flashforge PVA @FF C5P", + "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge TPU 65D @FF G4 0.6 nozzle", + "Flashforge/Flashforge TPU 65D @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge TPU 65D @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge TPU 65D @FF G4P 0.6 nozzle", + "Flashforge/Flashforge TPU 65D @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge TPU 95A", + "Flashforge/Flashforge TPU 95A @FF AD5X", + "Flashforge/Flashforge TPU 95A @FF AD5X 0.6 nozzle", + "Flashforge/Flashforge TPU 95A @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge TPU 95A @FF G4", + "Flashforge/Flashforge TPU 95A @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge TPU 95A @FF G4 0.6 nozzle", + "Flashforge/Flashforge TPU 95A @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge TPU 95A @FF G4P", + "Flashforge/Flashforge TPU 95A @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge TPU 95A @FF G4P 0.6 nozzle", + "Flashforge/Flashforge TPU 95A @FF G4P 0.8 HF nozzle", + "Flashforge/Flashforge TPU-64D @FF C5", + "Flashforge/Flashforge TPU-64D @FF C5P", + "Flashforge/Flashforge TPU-90A @FF C5", + "Flashforge/Flashforge TPU-90A @FF C5P", + "Flashforge/Flashforge TPU-95A @FF C5", + "Flashforge/Flashforge TPU-95A @FF C5P", "Flashforge/FusRock Generic NexPA-CF25", "Flashforge/FusRock Generic PAHT-CF", "Flashforge/FusRock Generic PAHT-CF @G3U 0.6 Nozzle", @@ -6727,8 +7660,37 @@ "Flashforge/FusRock Generic S-Multi @G3U 0.6 Nozzle", "Flashforge/FusRock Generic S-PAHT", "Flashforge/FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "Flashforge/FusRock PAHT @FF G4 0.6 HF nozzle", + "Flashforge/FusRock PAHT @FF G4 0.6 nozzle", + "Flashforge/FusRock PAHT @FF G4 0.8 HF nozzle", + "Flashforge/FusRock PAHT @FF G4P 0.6 HF nozzle", + "Flashforge/FusRock PAHT @FF G4P 0.6 nozzle", + "Flashforge/FusRock PAHT @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PAHT-CF @FF C5", + "Flashforge/FusRock PAHT-CF @FF C5P", + "Flashforge/FusRock PAHT-CF @FF G4", + "Flashforge/FusRock PAHT-CF @FF G4 0.6 nozzle", + "Flashforge/FusRock PAHT-CF @FF G4P", + "Flashforge/FusRock PAHT-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock PET @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PET-CF @FF G4", + "Flashforge/FusRock PET-CF @FF G4 0.6 nozzle", + "Flashforge/FusRock PET-CF @FF G4P", + "Flashforge/FusRock PET-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock S-Multi @FF C5", + "Flashforge/FusRock S-Multi @FF C5P", + "Flashforge/FusRock S-PAHT @FF C5", + "Flashforge/FusRock S-PAHT @FF C5P", "Flashforge/Generic ABS @Flashforge AD4", "Flashforge/Generic ASA @Flashforge AD4", + "Flashforge/Generic PET @FF G4", + "Flashforge/Generic PET @FF G4 0.6 HF nozzle", + "Flashforge/Generic PET @FF G4 0.6 nozzle", + "Flashforge/Generic PET @FF G4 0.8 HF nozzle", + "Flashforge/Generic PET @FF G4P", + "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", + "Flashforge/Generic PET @FF G4P 0.6 nozzle", + "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", "Flashforge/Generic PETG @Flashforge AD4", "Flashforge/Generic PETG @Flashforge Artemis", "Flashforge/Generic PETG-CF10 @Flashforge AD4", @@ -6736,7 +7698,22 @@ "Flashforge/Generic PLA High Speed @Flashforge AD4", "Flashforge/Generic PLA Silk @Flashforge AD4", "Flashforge/Generic PLA-CF10 @Flashforge AD4", + "Flashforge/Generic TPU 85A @FF AD5X", + "Flashforge/Generic TPU 85A @FF AD5X 0.6 nozzle", + "Flashforge/Generic TPU 85A @FF AD5X 0.8 nozzle", "Flashforge/Generic TPU @Flashforge AD4", + "Flashforge/Generic TPU-64D @FF C5", + "Flashforge/Generic TPU-64D @FF C5P", + "Flashforge/Generic TPU-90A @FF C5", + "Flashforge/Generic TPU-90A @FF C5P", + "Flashforge/Generic TPU-95A @FF C5", + "Flashforge/Generic TPU-95A @FF C5P", + "Flashforge/Polymaker CoPA @FF G4 0.6 HF nozzle", + "Flashforge/Polymaker CoPA @FF G4 0.6 nozzle", + "Flashforge/Polymaker CoPA @FF G4 0.8 HF nozzle", + "Flashforge/Polymaker CoPA @FF G4P 0.6 HF nozzle", + "Flashforge/Polymaker CoPA @FF G4P 0.6 nozzle", + "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", "Flashforge/Polymaker Generic CoPA", "Flashforge/Polymaker Generic S1", "FlyingBear/FlyingBear ABS @Ghost7", From 674344b3c1b6d73379c9b076a43a26da6d8288b8 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:08:08 +0800 Subject: [PATCH 06/52] Elegoo: per-product-line roots and filament_ids Phase 2 of the filament_id cleanup (37 collision groups; one systematic mistake: every commercial line inherits the material-class @base and its EB00 id). 23 new per-line @base roots with fresh deterministic mints (no per-line roots existed, contrary to the plan text), 155 inherits repoints, 23 index entries inserted between the parent @base and the line's members (load-bearing order), 6 in-place mints on single-member generic derivatives. The @base-owning families keep their ids (Elegoo PLA=EPLAB00 etc.); 2 forced family-atomic re-ids outside collision groups (Elegoo Rapid TPU 95A @EN2 Series/@Elegoo Giga follow their family). Residual 2-family shares (GPETGB00/GASAB00 with the Centauri -CF lines, pure-template ETPUB00/ EPAHTB00) are printer-disjoint, validator-clean, and frozen in the snapshot. Verified: config-equivalence gate zero unexpected diffs; extra check exit 0; --check exit 0; validator -l 2 exit 0; extended -f -v Elegoo exit 0 (was 37 groups / 1332 printer-level errors on the pre-apply copy). --- resources/profiles/Elegoo.json | 92 ++++++++++ .../filament/BASE/Elegoo ASA-CF @base.json | 8 + .../filament/BASE/Elegoo PC-FR @base.json | 8 + .../filament/BASE/Elegoo PET-CF @base.json | 8 + .../filament/BASE/Elegoo PETG HF @base.json | 8 + .../filament/BASE/Elegoo PETG PRO @base.json | 8 + .../BASE/Elegoo PETG Translucent @base.json | 8 + .../filament/BASE/Elegoo PETG-CF @base.json | 8 + .../filament/BASE/Elegoo PETG-GF @base.json | 8 + .../filament/BASE/Elegoo PLA Basic @base.json | 8 + .../BASE/Elegoo PLA Galaxy @base.json | 8 + .../filament/BASE/Elegoo PLA Glow @base.json | 8 + .../BASE/Elegoo PLA Marble @base.json | 8 + .../filament/BASE/Elegoo PLA Matte @base.json | 8 + .../filament/BASE/Elegoo PLA PRO @base.json | 8 + .../filament/BASE/Elegoo PLA Silk @base.json | 8 + .../BASE/Elegoo PLA Sparkle @base.json | 8 + .../BASE/Elegoo PLA Translucent2 @base.json | 8 + .../filament/BASE/Elegoo PLA Wood @base.json | 8 + .../filament/BASE/Elegoo PLA+ @base.json | 8 + .../filament/BASE/Elegoo PLA-CF @base.json | 8 + .../BASE/Elegoo Rapid PETG @base.json | 8 + .../BASE/Elegoo Rapid PLA+ @base.json | 8 + .../BASE/Elegoo Rapid TPU 95A @base.json | 8 + .../Elegoo/filament/EC/Elegoo PC-FR @EC.json | 2 +- .../filament/EC/Elegoo PETG PRO @EC.json | 2 +- .../EC/Elegoo PETG Translucent @EC.json | 2 +- .../filament/EC/Elegoo PETG-CF @EC.json | 2 +- .../filament/EC/Elegoo PETG-GF @EC.json | 2 +- .../filament/EC/Elegoo PLA Basic @EC.json | 2 +- .../filament/EC/Elegoo PLA Galaxy @EC.json | 2 +- .../filament/EC/Elegoo PLA Marble @EC.json | 2 +- .../filament/EC/Elegoo PLA Matte @EC.json | 2 +- .../filament/EC/Elegoo PLA PRO @EC.json | 2 +- .../filament/EC/Elegoo PLA Silk @EC.json | 2 +- .../filament/EC/Elegoo PLA Sparkle @EC.json | 2 +- .../filament/EC/Elegoo PLA Wood @EC.json | 2 +- .../Elegoo/filament/EC/Elegoo PLA+ @EC.json | 2 +- .../filament/EC/Elegoo Rapid PETG @EC.json | 2 +- .../filament/EC/Elegoo Rapid PLA+ @EC.json | 2 +- .../filament/EC/Elegoo Rapid TPU 95A @EC.json | 2 +- .../filament/EC2/Elegoo ASA-CF @EC2.json | 2 +- .../filament/EC2/Elegoo PC-FR @EC2.json | 2 +- .../filament/EC2/Elegoo PET-CF @EC2.json | 2 +- .../filament/EC2/Elegoo PETG HF @EC2.json | 2 +- .../filament/EC2/Elegoo PETG PRO @EC2.json | 2 +- .../EC2/Elegoo PETG Translucent @EC2.json | 2 +- .../filament/EC2/Elegoo PETG-CF @EC2.json | 2 +- .../filament/EC2/Elegoo PETG-GF @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Basic @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Galaxy @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Glow @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Marble @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Matte @EC2.json | 2 +- .../filament/EC2/Elegoo PLA PRO @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Silk @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Sparkle @EC2.json | 2 +- .../EC2/Elegoo PLA Translucent2 @EC2.json | 2 +- .../filament/EC2/Elegoo PLA Wood @EC2.json | 2 +- .../Elegoo/filament/EC2/Elegoo PLA+ @EC2.json | 2 +- .../filament/EC2/Elegoo PLA-CF @EC2.json | 2 +- .../filament/EC2/Elegoo Rapid PETG @EC2.json | 2 +- .../filament/EC2/Elegoo Rapid PLA+ @EC2.json | 2 +- .../EC2/Elegoo Rapid TPU 95A @EC2.json | 2 +- .../filament/ECC/Elegoo PC-FR @ECC.json | 2 +- .../filament/ECC/Elegoo PETG PRO @ECC.json | 2 +- .../ECC/Elegoo PETG Translucent @ECC.json | 2 +- .../filament/ECC/Elegoo PETG-CF @ECC.json | 2 +- .../filament/ECC/Elegoo PETG-GF @ECC.json | 2 +- .../filament/ECC/Elegoo PLA Basic @ECC.json | 2 +- .../filament/ECC/Elegoo PLA Galaxy @ECC.json | 2 +- .../filament/ECC/Elegoo PLA Marble @ECC.json | 2 +- .../filament/ECC/Elegoo PLA Matte @ECC.json | 2 +- .../filament/ECC/Elegoo PLA PRO @ECC.json | 2 +- .../filament/ECC/Elegoo PLA Silk @ECC.json | 2 +- .../filament/ECC/Elegoo PLA Sparkle @ECC.json | 2 +- .../filament/ECC/Elegoo PLA Wood @ECC.json | 2 +- .../Elegoo/filament/ECC/Elegoo PLA+ @ECC.json | 2 +- .../filament/ECC/Elegoo PLA-CF @ECC.json | 2 +- .../filament/ECC/Elegoo Rapid PETG @ECC.json | 2 +- .../filament/ECC/Elegoo Rapid PLA+ @ECC.json | 2 +- .../ECC/Elegoo Rapid TPU 95A @ECC.json | 2 +- .../filament/ECC2/Elegoo ASA-CF @ECC2.json | 2 +- .../filament/ECC2/Elegoo PC-FR @ECC2.json | 2 +- .../filament/ECC2/Elegoo PET-CF @ECC2.json | 2 +- .../filament/ECC2/Elegoo PETG HF @ECC2.json | 2 +- .../filament/ECC2/Elegoo PETG PRO @ECC2.json | 2 +- .../ECC2/Elegoo PETG Translucent @ECC2.json | 2 +- .../filament/ECC2/Elegoo PETG-CF @ECC2.json | 2 +- .../filament/ECC2/Elegoo PETG-GF @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA Basic @ECC2.json | 2 +- .../ECC2/Elegoo PLA Galaxy @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA Glow @ECC2.json | 2 +- .../ECC2/Elegoo PLA Marble @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA Matte @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA PRO @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA Silk @ECC2.json | 2 +- .../ECC2/Elegoo PLA Sparkle @ECC2.json | 2 +- .../ECC2/Elegoo PLA Translucent2 @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA Wood @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA+ @ECC2.json | 2 +- .../filament/ECC2/Elegoo PLA-CF @ECC2.json | 2 +- .../ECC2/Elegoo Rapid PETG @ECC2.json | 2 +- .../ECC2/Elegoo Rapid PLA+ @ECC2.json | 2 +- .../ECC2/Elegoo Rapid TPU 95A @ECC2.json | 2 +- .../Elegoo PC-FR @0.2 nozzle.json | 2 +- .../Elegoo PETG PRO @0.2 nozzle.json | 2 +- .../Elegoo PETG Translucent @0.2 nozzle.json | 2 +- .../Elegoo PLA Basic @0.2 nozzle.json | 2 +- .../Elegoo PLA Matte @0.2 nozzle.json | 2 +- .../Elegoo PLA PRO @0.2 nozzle.json | 2 +- .../Elegoo PLA Silk @0.2 nozzle.json | 2 +- .../Elegoo PLA+ @0.2 nozzle.json | 2 +- .../Elegoo Rapid PETG @0.2 nozzle.json | 2 +- .../Elegoo Rapid PLA+ @0.2 nozzle.json | 2 +- .../Elegoo PETG PRO @EN2 Series.json | 2 +- .../Elegoo PETG Translucent @EN2 Series.json | 2 +- .../EN2SERIES/Elegoo PETG-CF @EN2 Series.json | 2 +- .../EN2SERIES/Elegoo PETG-GF @EN2 Series.json | 2 +- .../Elegoo PLA Basic @EN2 Series.json | 2 +- .../Elegoo PLA Galaxy @EN2 Series.json | 2 +- .../Elegoo PLA Marble @EN2 Series.json | 2 +- .../Elegoo PLA Matte @EN2 Series.json | 2 +- .../EN2SERIES/Elegoo PLA PRO @EN2 Series.json | 2 +- .../Elegoo PLA Silk @EN2 Series.json | 2 +- .../Elegoo PLA Sparkle @EN2 Series.json | 2 +- .../Elegoo PLA Wood @EN2 Series.json | 2 +- .../EN2SERIES/Elegoo PLA+ @EN2 Series.json | 2 +- .../EN2SERIES/Elegoo PLA-CF @EN2 Series.json | 2 +- .../Elegoo Rapid PETG @EN2 Series.json | 2 +- .../Elegoo Rapid PLA+ @EN2 Series.json | 2 +- .../Elegoo Rapid TPU 95A @EN2 Series.json | 2 +- .../Elegoo PETG PRO @EN3 Series.json | 2 +- .../Elegoo PETG Translucent @EN3 Series.json | 2 +- .../EN3SERIES/Elegoo PETG-CF @EN3 Series.json | 2 +- .../EN3SERIES/Elegoo PETG-GF @EN3 Series.json | 2 +- .../Elegoo PLA Basic @EN3 Series.json | 2 +- .../Elegoo PLA Galaxy @EN3 Series.json | 2 +- .../Elegoo PLA Marble @EN3 Series.json | 2 +- .../Elegoo PLA Matte @EN3 Series.json | 2 +- .../EN3SERIES/Elegoo PLA PRO @EN3 Series.json | 2 +- .../Elegoo PLA Silk @EN3 Series.json | 2 +- .../Elegoo PLA Sparkle @EN3 Series.json | 2 +- .../Elegoo PLA Wood @EN3 Series.json | 2 +- .../EN3SERIES/Elegoo PLA+ @EN3 Series.json | 2 +- .../EN3SERIES/Elegoo PLA-CF @EN3 Series.json | 2 +- .../Elegoo Rapid PETG @EN3 Series.json | 2 +- .../Elegoo Rapid PLA+ @EN3 Series.json | 2 +- .../Elegoo Rapid TPU 95A @EN3 Series.json | 2 +- .../Elegoo PETG PRO @EN4 Series.json | 2 +- .../Elegoo PETG Translucent @EN4 Series.json | 2 +- .../EN4SERIES/Elegoo PETG-CF @EN4 Series.json | 2 +- .../EN4SERIES/Elegoo PETG-GF @EN4 Series.json | 2 +- .../Elegoo PLA Basic @EN4 Series.json | 2 +- .../Elegoo PLA Galaxy @EN4 Series.json | 2 +- .../Elegoo PLA Marble @EN4 Series.json | 2 +- .../Elegoo PLA Matte @EN4 Series.json | 2 +- .../EN4SERIES/Elegoo PLA PRO @EN4 Series.json | 2 +- .../Elegoo PLA Silk @EN4 Series.json | 2 +- .../Elegoo PLA Sparkle @EN4 Series.json | 2 +- .../Elegoo PLA Wood @EN4 Series.json | 2 +- .../EN4SERIES/Elegoo PLA+ @EN4 Series.json | 2 +- .../EN4SERIES/Elegoo PLA-CF @EN4 Series.json | 2 +- .../Elegoo Rapid PETG @EN4 Series.json | 2 +- .../Elegoo Rapid PLA+ @EN4 Series.json | 2 +- .../Elegoo Rapid TPU 95A @EN4 Series.json | 2 +- .../EOSGIGA/Elegoo PETG PRO @Elegoo Giga.json | 2 +- .../Elegoo PETG Translucent @Elegoo Giga.json | 2 +- .../EOSGIGA/Elegoo PETG-CF @Elegoo Giga.json | 2 +- .../EOSGIGA/Elegoo PETG-GF @Elegoo Giga.json | 2 +- .../Elegoo PLA Basic @Elegoo Giga.json | 2 +- .../Elegoo PLA Galaxy @Elegoo Giga.json | 2 +- .../Elegoo PLA Marble @Elegoo Giga.json | 2 +- .../Elegoo PLA Matte @Elegoo Giga.json | 2 +- .../Elegoo PLA Sparkle @Elegoo Giga.json | 2 +- .../EOSGIGA/Elegoo PLA Wood @Elegoo Giga.json | 2 +- .../Elegoo Rapid PETG @Elegoo Giga.json | 2 +- .../Elegoo Rapid PLA+ @Elegoo Giga.json | 2 +- .../Elegoo Rapid TPU 95A @Elegoo Giga.json | 2 +- .../Generic ABS-CF @Elegoo Centauri.json | 1 + .../Generic/Generic PA6-CF @Elegoo.json | 1 + .../Generic/Generic PC-CF @Elegoo.json | 1 + .../Generic PET-CF @Elegoo Centauri.json | 1 + .../Generic/Generic PETG PRO @Elegoo.json | 1 + .../Generic/Generic PLA Matte @Elegoo.json | 1 + scripts/filament_id_snapshot.json | 169 ++++++++++++++---- 186 files changed, 568 insertions(+), 193 deletions(-) create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json create mode 100644 resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json index 077c264b84..3813f93348 100644 --- a/resources/profiles/Elegoo.json +++ b/resources/profiles/Elegoo.json @@ -1276,6 +1276,10 @@ "name": "Elegoo PETG @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PETG @0.2 nozzle.json" }, + { + "name": "Elegoo PETG PRO @base", + "sub_path": "filament/BASE/Elegoo PETG PRO @base.json" + }, { "name": "Elegoo PETG PRO @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PETG PRO @0.2 nozzle.json" @@ -1284,26 +1288,50 @@ "name": "Elegoo PLA @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PLA @0.2 nozzle.json" }, + { + "name": "Elegoo PLA Matte @base", + "sub_path": "filament/BASE/Elegoo PLA Matte @base.json" + }, { "name": "Elegoo PLA Matte @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PLA Matte @0.2 nozzle.json" }, + { + "name": "Elegoo PLA PRO @base", + "sub_path": "filament/BASE/Elegoo PLA PRO @base.json" + }, { "name": "Elegoo PLA PRO @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PLA PRO @0.2 nozzle.json" }, + { + "name": "Elegoo PLA Silk @base", + "sub_path": "filament/BASE/Elegoo PLA Silk @base.json" + }, { "name": "Elegoo PLA Silk @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PLA Silk @0.2 nozzle.json" }, + { + "name": "Elegoo PLA+ @base", + "sub_path": "filament/BASE/Elegoo PLA+ @base.json" + }, { "name": "Elegoo PLA+ @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PLA+ @0.2 nozzle.json" }, + { + "name": "Elegoo Rapid PLA+ @base", + "sub_path": "filament/BASE/Elegoo Rapid PLA+ @base.json" + }, { "name": "Elegoo Rapid PLA+ @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo Rapid PLA+ @0.2 nozzle.json" }, + { + "name": "Elegoo Rapid PETG @base", + "sub_path": "filament/BASE/Elegoo Rapid PETG @base.json" + }, { "name": "Elegoo Rapid PETG @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo Rapid PETG @0.2 nozzle.json" @@ -1316,14 +1344,26 @@ "name": "Elegoo PC @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PC @0.2 nozzle.json" }, + { + "name": "Elegoo PC-FR @base", + "sub_path": "filament/BASE/Elegoo PC-FR @base.json" + }, { "name": "Elegoo PC-FR @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PC-FR @0.2 nozzle.json" }, + { + "name": "Elegoo PLA Basic @base", + "sub_path": "filament/BASE/Elegoo PLA Basic @base.json" + }, { "name": "Elegoo PLA Basic @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PLA Basic @0.2 nozzle.json" }, + { + "name": "Elegoo PETG Translucent @base", + "sub_path": "filament/BASE/Elegoo PETG Translucent @base.json" + }, { "name": "Elegoo PETG Translucent @0.2 nozzle", "sub_path": "filament/ELEGOO_02_NOZZLE/Elegoo PETG Translucent @0.2 nozzle.json" @@ -1352,6 +1392,10 @@ "name": "Elegoo PLA Matte @ECC", "sub_path": "filament/ECC/Elegoo PLA Matte @ECC.json" }, + { + "name": "Elegoo PLA-CF @base", + "sub_path": "filament/BASE/Elegoo PLA-CF @base.json" + }, { "name": "Elegoo PLA-CF @ECC", "sub_path": "filament/ECC/Elegoo PLA-CF @ECC.json" @@ -1380,6 +1424,10 @@ "name": "Elegoo ABS @ECC", "sub_path": "filament/ECC/Elegoo ABS @ECC.json" }, + { + "name": "Elegoo PLA Galaxy @base", + "sub_path": "filament/BASE/Elegoo PLA Galaxy @base.json" + }, { "name": "Elegoo PLA Galaxy @ECC", "sub_path": "filament/ECC/Elegoo PLA Galaxy @ECC.json" @@ -1388,14 +1436,26 @@ "name": "Elegoo PLA Basic @ECC", "sub_path": "filament/ECC/Elegoo PLA Basic @ECC.json" }, + { + "name": "Elegoo PLA Marble @base", + "sub_path": "filament/BASE/Elegoo PLA Marble @base.json" + }, { "name": "Elegoo PLA Marble @ECC", "sub_path": "filament/ECC/Elegoo PLA Marble @ECC.json" }, + { + "name": "Elegoo PLA Sparkle @base", + "sub_path": "filament/BASE/Elegoo PLA Sparkle @base.json" + }, { "name": "Elegoo PLA Sparkle @ECC", "sub_path": "filament/ECC/Elegoo PLA Sparkle @ECC.json" }, + { + "name": "Elegoo PLA Wood @base", + "sub_path": "filament/BASE/Elegoo PLA Wood @base.json" + }, { "name": "Elegoo PLA Wood @ECC", "sub_path": "filament/ECC/Elegoo PLA Wood @ECC.json" @@ -1412,10 +1472,18 @@ "name": "Elegoo PC-FR @ECC", "sub_path": "filament/ECC/Elegoo PC-FR @ECC.json" }, + { + "name": "Elegoo PETG-CF @base", + "sub_path": "filament/BASE/Elegoo PETG-CF @base.json" + }, { "name": "Elegoo PETG-CF @ECC", "sub_path": "filament/ECC/Elegoo PETG-CF @ECC.json" }, + { + "name": "Elegoo PETG-GF @base", + "sub_path": "filament/BASE/Elegoo PETG-GF @base.json" + }, { "name": "Elegoo PETG-GF @ECC", "sub_path": "filament/ECC/Elegoo PETG-GF @ECC.json" @@ -1424,6 +1492,10 @@ "name": "Elegoo PETG Translucent @ECC", "sub_path": "filament/ECC/Elegoo PETG Translucent @ECC.json" }, + { + "name": "Elegoo Rapid TPU 95A @base", + "sub_path": "filament/BASE/Elegoo Rapid TPU 95A @base.json" + }, { "name": "Elegoo Rapid TPU 95A @ECC", "sub_path": "filament/ECC/Elegoo Rapid TPU 95A @ECC.json" @@ -1716,6 +1788,10 @@ "name": "Elegoo PETG Translucent @EC2", "sub_path": "filament/EC2/Elegoo PETG Translucent @EC2.json" }, + { + "name": "Elegoo ASA-CF @base", + "sub_path": "filament/BASE/Elegoo ASA-CF @base.json" + }, { "name": "Elegoo ASA-CF @ECC2", "sub_path": "filament/ECC2/Elegoo ASA-CF @ECC2.json" @@ -1724,6 +1800,10 @@ "name": "Elegoo ASA-CF @EC2", "sub_path": "filament/EC2/Elegoo ASA-CF @EC2.json" }, + { + "name": "Elegoo PET-CF @base", + "sub_path": "filament/BASE/Elegoo PET-CF @base.json" + }, { "name": "Elegoo PET-CF @ECC2", "sub_path": "filament/ECC2/Elegoo PET-CF @ECC2.json" @@ -1732,6 +1812,10 @@ "name": "Elegoo PET-CF @EC2", "sub_path": "filament/EC2/Elegoo PET-CF @EC2.json" }, + { + "name": "Elegoo PETG HF @base", + "sub_path": "filament/BASE/Elegoo PETG HF @base.json" + }, { "name": "Elegoo PETG HF @ECC2", "sub_path": "filament/ECC2/Elegoo PETG HF @ECC2.json" @@ -1740,6 +1824,10 @@ "name": "Elegoo PETG HF @EC2", "sub_path": "filament/EC2/Elegoo PETG HF @EC2.json" }, + { + "name": "Elegoo PLA Glow @base", + "sub_path": "filament/BASE/Elegoo PLA Glow @base.json" + }, { "name": "Elegoo PLA Glow @ECC2", "sub_path": "filament/ECC2/Elegoo PLA Glow @ECC2.json" @@ -1748,6 +1836,10 @@ "name": "Elegoo PLA Glow @EC2", "sub_path": "filament/EC2/Elegoo PLA Glow @EC2.json" }, + { + "name": "Elegoo PLA Translucent2 @base", + "sub_path": "filament/BASE/Elegoo PLA Translucent2 @base.json" + }, { "name": "Elegoo PLA Translucent2 @ECC2", "sub_path": "filament/ECC2/Elegoo PLA Translucent2 @ECC2.json" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json new file mode 100644 index 0000000000..bc100dfe2f --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo ASA-CF @base", + "inherits": "Elegoo ASA @base", + "from": "system", + "filament_id": "OFAiqi5v", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json new file mode 100644 index 0000000000..9aeb40e0a8 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PC-FR @base", + "inherits": "Elegoo PC @base", + "from": "system", + "filament_id": "OFzFbFcl", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json new file mode 100644 index 0000000000..6290eba7f9 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PET-CF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFSCm6pJ", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json new file mode 100644 index 0000000000..ba3e4715a3 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG HF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFxjFYxE", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json new file mode 100644 index 0000000000..4df7589911 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG PRO @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFmOWC74", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json new file mode 100644 index 0000000000..b75929e76a --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG Translucent @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFOkTA0C", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json new file mode 100644 index 0000000000..3a3b837513 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG-CF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFiyGNbI", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json new file mode 100644 index 0000000000..e7020a00bf --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PETG-GF @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OFBvxnjM", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json new file mode 100644 index 0000000000..42f77b0b2b --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Basic @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFHtQDC9", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json new file mode 100644 index 0000000000..ef7c46673d --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Galaxy @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OF09vOcG", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json new file mode 100644 index 0000000000..cffd7b0185 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Glow @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFuXkYly", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json new file mode 100644 index 0000000000..bda871cae8 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Marble @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFbYP6Wb", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json new file mode 100644 index 0000000000..a216c20e7c --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Matte @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFwyqcGn", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json new file mode 100644 index 0000000000..d6d1e30e6c --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA PRO @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFklg4aM", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json new file mode 100644 index 0000000000..b0ba1af2d6 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Silk @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFkfK62J", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json new file mode 100644 index 0000000000..1120084d6a --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Sparkle @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFaKIoH2", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json new file mode 100644 index 0000000000..d06d60e5cc --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Translucent2 @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFcqs5g7", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json new file mode 100644 index 0000000000..ab43fb2bf2 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA Wood @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFh5GUhZ", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json new file mode 100644 index 0000000000..028fd42383 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA+ @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFDMWB6t", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json new file mode 100644 index 0000000000..706b60f0c9 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo PLA-CF @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFuPC4S8", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json new file mode 100644 index 0000000000..5eeb29bad3 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo Rapid PETG @base", + "inherits": "Elegoo PETG @base", + "from": "system", + "filament_id": "OF3arl18", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json new file mode 100644 index 0000000000..b83fe4b688 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo Rapid PLA+ @base", + "inherits": "Elegoo PLA @base", + "from": "system", + "filament_id": "OFAHagT9", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json new file mode 100644 index 0000000000..fe1bae90a0 --- /dev/null +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Elegoo Rapid TPU 95A @base", + "inherits": "Elegoo TPU @base", + "from": "system", + "filament_id": "OFL4KniM", + "instantiation": "false" +} diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PC-FR @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PC-FR @EC.json index 8fae500404..85c449d63d 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PC-FR @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PC-FR @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PC-FR @EC", - "inherits": "Elegoo PC @base", + "inherits": "Elegoo PC-FR @base", "from": "system", "setting_id": "DOX4jdBlUuiFx27J", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PETG PRO @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PETG PRO @EC.json index e86269bb09..a31310c99e 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PETG PRO @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PETG PRO @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @EC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "ADLcWU2wDYdXUM0F", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PETG Translucent @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PETG Translucent @EC.json index 28f8027a7a..82cf5984ce 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PETG Translucent @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PETG Translucent @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @EC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "bkdR8uTPqu0nMTMW", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PETG-CF @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PETG-CF @EC.json index 1875a4b76d..40c06c2ea6 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PETG-CF @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PETG-CF @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @EC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "bNOqwg4q2TE94jEj", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PETG-GF @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PETG-GF @EC.json index fcfd9e3ed8..978d44137c 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PETG-GF @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PETG-GF @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @EC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "jDvyk3UkeiNb2U9m", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Basic @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Basic @EC.json index a69e1b0daa..53fb8da44e 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Basic @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Basic @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "hO0eeJKhhc9aWSqV", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Galaxy @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Galaxy @EC.json index cb692d090b..9e4e4e75fa 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Galaxy @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Galaxy @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "F55l4bPdEauXI3Zf", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Marble @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Marble @EC.json index 521d677ac9..5f15585557 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Marble @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Marble @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "lZOlnGqn1G7V5NBY", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Matte @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Matte @EC.json index ba0cdcff72..2ebc1acdcb 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Matte @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Matte @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "GC7p8OUHQheNbsms", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA PRO @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA PRO @EC.json index 59b3d04f4b..96e4da2470 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA PRO @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA PRO @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "23RCuAK92MPaxyqe", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Silk @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Silk @EC.json index 1641f49732..3de7272685 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Silk @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Silk @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "vSomzlfdeel8Fkkc", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Sparkle @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Sparkle @EC.json index cea1875a1e..ccb945dea0 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Sparkle @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Sparkle @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "XbPbopAAmos9Fhe5", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Wood @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Wood @EC.json index 329eca7704..c023839c9e 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA Wood @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA Wood @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "4cqc0qMp58PbLivG", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PLA+ @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PLA+ @EC.json index 4b02ef0ff2..e4f500e3d9 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PLA+ @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PLA+ @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "TtRiwCEgVej4q1bD", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PETG @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PETG @EC.json index 5651aabd4e..aaa6b6ed57 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PETG @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PETG @EC.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @EC", "renamed_from": "Elegoo RAPID PETG @EC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "BIkMBzPkBJNZtn9I", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PLA+ @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PLA+ @EC.json index 441e1c1844..f91163b60b 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PLA+ @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo Rapid PLA+ @EC.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @EC", "renamed_from": "Elegoo RAPID PLA+ @EC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "SdBul5AmPj8ZwaKm", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo Rapid TPU 95A @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo Rapid TPU 95A @EC.json index b698d51e37..1bb675bcad 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo Rapid TPU 95A @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo Rapid TPU 95A @EC.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @EC", "renamed_from": "Elegoo RAPID TPU 95A @EC", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "XWoU9g1mRLapDWmY", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo ASA-CF @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo ASA-CF @EC2.json index d448a14146..09a741f456 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo ASA-CF @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo ASA-CF @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo ASA-CF @EC2", - "inherits": "Elegoo ASA @base", + "inherits": "Elegoo ASA-CF @base", "from": "system", "setting_id": "12kyjckYS59VKuJr", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PC-FR @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PC-FR @EC2.json index e27e485702..fef1cd2942 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PC-FR @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PC-FR @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PC-FR @EC2", - "inherits": "Elegoo PC @base", + "inherits": "Elegoo PC-FR @base", "from": "system", "setting_id": "4y2nFqOY9OLYQT4I", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PET-CF @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PET-CF @EC2.json index 0e73748900..9cfd0df698 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PET-CF @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PET-CF @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PET-CF @EC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PET-CF @base", "from": "system", "setting_id": "YuxImosRqvxeXky9", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG HF @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG HF @EC2.json index db3eac6a9b..3cc09b1253 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG HF @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG HF @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG HF @EC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG HF @base", "from": "system", "setting_id": "JXAbqQk05wQC2ZsV", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG PRO @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG PRO @EC2.json index f443590f79..19f171099d 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG PRO @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG PRO @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @EC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "7eE7wOnwAMmDk3N8", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG Translucent @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG Translucent @EC2.json index e5d38ae804..117eff2f6c 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG Translucent @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG Translucent @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @EC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "c62Io0F7o3YY9UfY", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-CF @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-CF @EC2.json index 521e3f54d6..ef5bc10365 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-CF @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-CF @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @EC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "H5b1oB4xwcsOGVYG", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-GF @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-GF @EC2.json index 0376628dd7..78f93ab630 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-GF @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PETG-GF @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @EC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "UXEBZHN5QuEKg2dX", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Basic @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Basic @EC2.json index bf2e6de3d6..5ca3f673a6 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Basic @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Basic @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "YBylnOIc1QhV45N0", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Galaxy @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Galaxy @EC2.json index 485a267cc4..f907a9add4 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Galaxy @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Galaxy @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "BZ67cDxyhlFdrNPf", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Glow @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Glow @EC2.json index d9cd47f31e..5942a1353b 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Glow @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Glow @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Glow @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Glow @base", "from": "system", "setting_id": "X18eV3oo6N3xDJXN", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Marble @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Marble @EC2.json index 819bcc8fb7..41e18aac91 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Marble @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Marble @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "D4UWZLfsmnwQSQP0", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Matte @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Matte @EC2.json index 5713ef1094..fa490188d9 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Matte @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Matte @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "EMVja9n1ZwI2Lq3R", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA PRO @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA PRO @EC2.json index 128866138d..3f52d014e1 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA PRO @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA PRO @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "TXUB904pAsT5napV", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Silk @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Silk @EC2.json index def1a54169..6b334b031a 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Silk @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Silk @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "9M8QYAJcLTyKLgNL", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Sparkle @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Sparkle @EC2.json index 17abe488dc..76efd87383 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Sparkle @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Sparkle @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "l7NSciXWqkFqbTgB", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Translucent2 @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Translucent2 @EC2.json index 8bd5e92dea..6e09760383 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Translucent2 @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Translucent2 @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Translucent2 @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Translucent2 @base", "from": "system", "setting_id": "RKBHiiO580ou2vr1", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Wood @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Wood @EC2.json index 1071c52353..153ace7d5d 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Wood @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA Wood @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "ym42CllFezpl1XEg", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA+ @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA+ @EC2.json index cbf217cae1..5dfd3d5218 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA+ @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA+ @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "vf5ap9MNwVgptsvO", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA-CF @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA-CF @EC2.json index e148759647..7f77984b7b 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PLA-CF @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PLA-CF @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "UpGOamlqBkqj71bx", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PETG @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PETG @EC2.json index 7242ba793e..c6973a9316 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PETG @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PETG @EC2.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @EC2", "renamed_from": "Elegoo RAPID PETG @EC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "1qDXoSeuwBcAbZmk", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PLA+ @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PLA+ @EC2.json index e3d33b2243..b44278d6e2 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PLA+ @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid PLA+ @EC2.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @EC2", "renamed_from": "Elegoo RAPID PLA+ @EC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "lfHbQa7hrJ7wg4oC", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid TPU 95A @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid TPU 95A @EC2.json index 7195e17e93..14b585d079 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid TPU 95A @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo Rapid TPU 95A @EC2.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @EC2", "renamed_from": "Elegoo RAPID TPU 95A @EC2", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "siG31sp4DyxsrhAc", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PC-FR @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PC-FR @ECC.json index 4fc22048cb..739780ead3 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PC-FR @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PC-FR @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PC-FR @ECC", - "inherits": "Elegoo PC @base", + "inherits": "Elegoo PC-FR @base", "from": "system", "setting_id": "nCZkQRo7hh7vwwbL", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG PRO @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG PRO @ECC.json index 49692dd335..95beb0642f 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG PRO @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG PRO @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @ECC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "VfYr5aZoseuXcbN6", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG Translucent @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG Translucent @ECC.json index de9d234ce4..d5e37e6443 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG Translucent @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG Translucent @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @ECC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "X5cTMTTWd0GWWj6d", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-CF @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-CF @ECC.json index a2f6620a79..4f71ace3fa 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-CF @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-CF @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @ECC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "WNaFMeStUh8INJGx", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-GF @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-GF @ECC.json index 68df019a74..ad02614622 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-GF @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PETG-GF @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @ECC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "s5zG5lNveft4RPEX", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Basic @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Basic @ECC.json index 2470cead83..0b6855e93b 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Basic @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Basic @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "zCxfCnJcHoGLipVy", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Galaxy @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Galaxy @ECC.json index 5e0e0819c1..a60319429e 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Galaxy @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Galaxy @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "M5uv0mruFXpkbauD", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Marble @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Marble @ECC.json index d9104d271f..c436f05881 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Marble @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Marble @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "BFEnBt0IBILLmhri", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Matte @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Matte @ECC.json index 79e4a2b076..d8259d1668 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Matte @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Matte @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "niMCkAjPd2bJdjZs", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA PRO @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA PRO @ECC.json index bbd35a7c58..4405d9eabc 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA PRO @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA PRO @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "JfYUDBI0wNnLpEsL", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Silk @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Silk @ECC.json index 7d135cd9fd..d67e21299f 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Silk @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Silk @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "n4hPXKakxN4xmQsj", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Sparkle @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Sparkle @ECC.json index 6143048aa1..b26a6d0486 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Sparkle @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Sparkle @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "kn34IfbyhDKllxwq", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Wood @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Wood @ECC.json index 92842d8fbf..4160c5a11a 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Wood @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA Wood @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "kI7ZFyzYkMcrKrM1", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA+ @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA+ @ECC.json index 06c833d7b2..3d96576667 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA+ @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA+ @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "UbOYgGsK00v3gLL8", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA-CF @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA-CF @ECC.json index 4743d13a9f..a7ff2af7ea 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PLA-CF @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PLA-CF @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "rvrpVcpcUAtwXgsn", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PETG @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PETG @ECC.json index 6ea852850d..78be9ad0c5 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PETG @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PETG @ECC.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @ECC", "renamed_from": "Elegoo RAPID PETG @ECC", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "r4F3n71ajBUlmLgN", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PLA+ @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PLA+ @ECC.json index 859b66e8ad..e331dcb593 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PLA+ @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid PLA+ @ECC.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @ECC", "renamed_from": "Elegoo RAPID PLA+ @ECC", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "OvdHgrXbSulHkLWz", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid TPU 95A @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid TPU 95A @ECC.json index 6faef1d73a..af4902d2a0 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid TPU 95A @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo Rapid TPU 95A @ECC.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @ECC", "renamed_from": "Elegoo RAPID TPU 95A @ECC", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "uVpRY8TCq9S6kr8M", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo ASA-CF @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo ASA-CF @ECC2.json index 0974b25503..9e9de44980 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo ASA-CF @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo ASA-CF @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo ASA-CF @ECC2", - "inherits": "Elegoo ASA @base", + "inherits": "Elegoo ASA-CF @base", "from": "system", "setting_id": "X7ugJOOrWixpeke8", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PC-FR @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PC-FR @ECC2.json index 5875d26411..e179a2fae0 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PC-FR @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PC-FR @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PC-FR @ECC2", - "inherits": "Elegoo PC @base", + "inherits": "Elegoo PC-FR @base", "from": "system", "setting_id": "M86WAPT5jr5ge7Ni", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PET-CF @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PET-CF @ECC2.json index 9519266c2d..57de3396b7 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PET-CF @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PET-CF @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PET-CF @ECC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PET-CF @base", "from": "system", "setting_id": "sIwAf2oRC7VqYjIR", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG HF @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG HF @ECC2.json index 27ad64e1b5..06551d42b3 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG HF @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG HF @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG HF @ECC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG HF @base", "from": "system", "setting_id": "EAt1AJX3ZupILYWV", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG PRO @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG PRO @ECC2.json index bb535d3213..52621252b8 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG PRO @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG PRO @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @ECC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "YjUFi1BuigQdJGfe", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG Translucent @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG Translucent @ECC2.json index de86ebaae6..81f11bb3cf 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG Translucent @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG Translucent @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @ECC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "Nk21n7x4I5xjwNqV", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-CF @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-CF @ECC2.json index 1e40c2a305..a8f66ceb18 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-CF @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-CF @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @ECC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "TsJJG9mgzBt5GWPZ", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-GF @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-GF @ECC2.json index 13060e74ba..a80a50283a 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-GF @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PETG-GF @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @ECC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "Po38QP4RqkGBZTHq", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Basic @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Basic @ECC2.json index e301741c27..e0e19454e5 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Basic @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Basic @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "CG6nOQRYTWN0jJNV", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Galaxy @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Galaxy @ECC2.json index 638fef599c..1f4c3a24ea 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Galaxy @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Galaxy @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "jieMxZQRwSJ8lOQK", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Glow @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Glow @ECC2.json index 7944c67d88..9d44f32e96 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Glow @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Glow @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Glow @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Glow @base", "from": "system", "setting_id": "S6c2IXcIWDpViP2T", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Marble @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Marble @ECC2.json index 297ac4fcd0..4a1592daef 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Marble @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Marble @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "vBkiE3Uh1LdCiOig", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Matte @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Matte @ECC2.json index 025d40e19d..5522f8f92f 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Matte @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Matte @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "C3IdNUQ5dSe1wQua", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA PRO @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA PRO @ECC2.json index f1b8a7a1d2..b3ed52adae 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA PRO @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA PRO @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "nIBhL1ZCxYZSMZTO", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Silk @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Silk @ECC2.json index 62efb49b53..970a859a26 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Silk @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Silk @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "R20HD2TcTFmVt8ei", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Sparkle @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Sparkle @ECC2.json index da6927987e..7357f57dd7 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Sparkle @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Sparkle @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "RoM3TYRuszinvW6b", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Translucent2 @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Translucent2 @ECC2.json index 8a81ff7ccf..4119a7c009 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Translucent2 @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Translucent2 @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Translucent2 @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Translucent2 @base", "from": "system", "setting_id": "K1pIYbrCCJUBwAOt", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Wood @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Wood @ECC2.json index 0b794f78a6..c1ee9ccb34 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Wood @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA Wood @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "7D7QoTRo7U4HGaZB", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA+ @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA+ @ECC2.json index 7b6e068061..bad7a5e25d 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA+ @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA+ @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "GCMagCIZUPjPBpuH", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA-CF @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA-CF @ECC2.json index a95b21ddba..1c7d88298d 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA-CF @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PLA-CF @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "0pllUBj7uWuhIr0v", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PETG @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PETG @ECC2.json index fe19d98291..f550c51ee9 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PETG @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PETG @ECC2.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @ECC2", "renamed_from": "Elegoo RAPID PETG @ECC2", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "oVp14HbITUsNcgvp", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PLA+ @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PLA+ @ECC2.json index c173221004..4baa2ba58d 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PLA+ @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid PLA+ @ECC2.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @ECC2", "renamed_from": "Elegoo RAPID PLA+ @ECC2", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "qXybozVO1oL7MEud", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid TPU 95A @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid TPU 95A @ECC2.json index ebbdefb767..267956ac99 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid TPU 95A @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo Rapid TPU 95A @ECC2.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @ECC2", "renamed_from": "Elegoo RAPID TPU 95A @ECC2", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "5osmvljNWBUEc9Kc", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PC-FR @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PC-FR @0.2 nozzle.json index 88c968cf23..734234a7e5 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PC-FR @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PC-FR @0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PC-FR @0.2 nozzle", - "inherits": "Elegoo PC @base", + "inherits": "Elegoo PC-FR @base", "from": "system", "setting_id": "Q6LfquCFYpzmrILa", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG PRO @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG PRO @0.2 nozzle.json index 9978fb863b..f8cc2b9fc2 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG PRO @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG PRO @0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @0.2 nozzle", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "TBkoABUqBy51TLtW", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG Translucent @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG Translucent @0.2 nozzle.json index 7b11b3b54e..82e74b3448 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG Translucent @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PETG Translucent @0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @0.2 nozzle", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "3zgNnsZ5SmrldddZ", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Basic @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Basic @0.2 nozzle.json index c606063a33..9f9b494683 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Basic @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Basic @0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @0.2 nozzle", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "cBFHhPKahRBGfAg6", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Matte @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Matte @0.2 nozzle.json index f5bb2921b3..cb1dbf6ebd 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Matte @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Matte @0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @0.2 nozzle", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "TyHg4K4ZNiYKgaso", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA PRO @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA PRO @0.2 nozzle.json index 80f9b0cab9..9514bef332 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA PRO @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA PRO @0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @0.2 nozzle", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "ed7EP0Fx9X6WoP8q", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Silk @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Silk @0.2 nozzle.json index e6a61535b3..7cd383baf0 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Silk @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo PLA Silk @0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @0.2 nozzle", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "9cy4zu57LxlFIrLB", "instantiation": "true", 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 7bab03c3c0..960d70e8b4 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @0.2 nozzle", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "IODCNDnNbt1xXMQR", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PETG @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PETG @0.2 nozzle.json index 4f9d3ddacd..a2c6a17ee8 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PETG @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PETG @0.2 nozzle.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @0.2 nozzle", "renamed_from": "Elegoo RAPID PETG @0.2 nozzle", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "Vn71U93sqvxWaq5J", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PLA+ @0.2 nozzle.json b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PLA+ @0.2 nozzle.json index f7d3bf2b8b..5677780b04 100644 --- a/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PLA+ @0.2 nozzle.json +++ b/resources/profiles/Elegoo/filament/ELEGOO_02_NOZZLE/Elegoo Rapid PLA+ @0.2 nozzle.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @0.2 nozzle", "renamed_from": "Elegoo RAPID PLA+ @0.2 nozzle", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "52q6GSMo16aOU2a0", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG PRO @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG PRO @EN2 Series.json index 2d540432f1..ee33397b89 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG PRO @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG PRO @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @EN2 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "47TFK2SdXkanFany", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG Translucent @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG Translucent @EN2 Series.json index ec6735ee45..9cc8d43f42 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG Translucent @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG Translucent @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @EN2 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "PG4cLzHQ2okqwTVi", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-CF @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-CF @EN2 Series.json index f4cb06df03..15c6fe281b 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-CF @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-CF @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @EN2 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "xVvTmdiPx4DqsoSt", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-GF @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-GF @EN2 Series.json index 1d4376f603..655a9b4ff0 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-GF @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PETG-GF @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @EN2 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "Wuj48uGxkjtu1k0E", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Basic @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Basic @EN2 Series.json index 1625d88ade..02f95a30e4 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Basic @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Basic @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "rKMXIa1T57ARSSew", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Galaxy @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Galaxy @EN2 Series.json index 969338f3fb..5ce5cb9b03 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Galaxy @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Galaxy @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "dK5fXHKyvXbajhfU", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Marble @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Marble @EN2 Series.json index 49de0c172a..e65cfd721a 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Marble @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Marble @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "vcJBgxGVh5Rl3dRy", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Matte @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Matte @EN2 Series.json index b526d88f8a..4ba71c6f1c 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Matte @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Matte @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "pFzHY2WtgjYBAq1c", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA PRO @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA PRO @EN2 Series.json index bbca38423a..fc4a9de6d7 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA PRO @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA PRO @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "AP6zWYwNv7aXdT4e", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Silk @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Silk @EN2 Series.json index b75a9105f7..1100589ce7 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Silk @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Silk @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "AquzfXzcf6CxPLmL", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Sparkle @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Sparkle @EN2 Series.json index a63d22f72b..309f296c35 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Sparkle @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Sparkle @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "sYpjo9kbuDSM5YXe", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Wood @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Wood @EN2 Series.json index 1f52f7a951..10ee31a860 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Wood @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA Wood @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "FCCgNMxR3m3CtWBL", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA+ @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA+ @EN2 Series.json index aa2afe2789..cdbb0a9336 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA+ @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA+ @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "qn1N6b1JCgut6S69", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA-CF @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA-CF @EN2 Series.json index 51be7c9afc..d90f5a7d86 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA-CF @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo PLA-CF @EN2 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "vmxHMRDkf1EpLGx1", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PETG @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PETG @EN2 Series.json index 66e35e0448..b60d3aa948 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PETG @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PETG @EN2 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @EN2 Series", "renamed_from": "Elegoo RAPID PETG @EN2 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "7Nqa8yKgcpoRnMhS", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PLA+ @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PLA+ @EN2 Series.json index 16f84c1480..a2e29df5f2 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PLA+ @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid PLA+ @EN2 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @EN2 Series", "renamed_from": "Elegoo RAPID PLA+ @EN2 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "GRiM2kKnyW0xiFoS", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid TPU 95A @EN2 Series.json b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid TPU 95A @EN2 Series.json index f7fd820319..5c3a6c4bd8 100644 --- a/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid TPU 95A @EN2 Series.json +++ b/resources/profiles/Elegoo/filament/EN2SERIES/Elegoo Rapid TPU 95A @EN2 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @EN2 Series", "renamed_from": "Elegoo RAPID TPU 95A @EN2 Series", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "NcE57l7rlZXMQqqO", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG PRO @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG PRO @EN3 Series.json index d7b7d77e88..68076528bc 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG PRO @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG PRO @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @EN3 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "hcpl3lUmYmocda9K", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG Translucent @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG Translucent @EN3 Series.json index a5df1863a2..3b3c367d85 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG Translucent @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG Translucent @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @EN3 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "vvE6QSdUAwZyExFq", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-CF @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-CF @EN3 Series.json index 85b4e262ce..d47880e700 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-CF @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-CF @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @EN3 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "w31T0qj9YkyNYfXR", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-GF @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-GF @EN3 Series.json index a0c6dffa1e..74e80e0306 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-GF @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PETG-GF @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @EN3 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "Ss1cK4Mg4Qsmq60H", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Basic @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Basic @EN3 Series.json index d322e76d4a..c7008362e1 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Basic @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Basic @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "HuzVgg6RrpAtYYEv", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Galaxy @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Galaxy @EN3 Series.json index 70a9903ae6..213d2cdd80 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Galaxy @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Galaxy @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "BpZZWJcuFxWOCCnw", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Marble @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Marble @EN3 Series.json index b6e4d20992..4ccc34dbc8 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Marble @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Marble @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "BxsWsE3wgE9wgBmm", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Matte @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Matte @EN3 Series.json index 8360ac8d5c..511c9d9677 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Matte @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Matte @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "L3da64GFIKUFdDJA", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA PRO @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA PRO @EN3 Series.json index 114e264047..a62506cc92 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA PRO @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA PRO @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "V7HUl0gBvGKwKD1A", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Silk @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Silk @EN3 Series.json index d7fa7b836b..8498c99ccb 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Silk @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Silk @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "ik0YrrrI6oUpXz79", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Sparkle @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Sparkle @EN3 Series.json index b40ed87cf6..990ab62ced 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Sparkle @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Sparkle @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "5NjKDHvQ2r1kxHGU", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Wood @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Wood @EN3 Series.json index 3d3ac38460..22f0c6486c 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Wood @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA Wood @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "aieihLgO1a0ZdWfJ", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA+ @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA+ @EN3 Series.json index 00844dd1e8..02b51855fc 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA+ @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA+ @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "LqnrFp0vDbiCMJ8I", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA-CF @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA-CF @EN3 Series.json index ab7ccd7730..8284fd2279 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA-CF @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo PLA-CF @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "1NWIyM71opgpoto1", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PETG @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PETG @EN3 Series.json index 30ca32476f..bbbb7a044b 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PETG @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PETG @EN3 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @EN3 Series", "renamed_from": "Elegoo RAPID PETG @EN3 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "WrjA1jFlRkBjm8sV", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PLA+ @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PLA+ @EN3 Series.json index a8755142d5..2e79376216 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PLA+ @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid PLA+ @EN3 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @EN3 Series", "renamed_from": "Elegoo RAPID PLA+ @EN3 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "HLIz2ghBgZEcM67x", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid TPU 95A @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid TPU 95A @EN3 Series.json index 0a9d3251b0..11370d1342 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid TPU 95A @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo Rapid TPU 95A @EN3 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @EN3 Series", "renamed_from": "Elegoo RAPID TPU 95A @EN3 Series", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "q51os4xSncl4kA7h", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG PRO @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG PRO @EN4 Series.json index 3f514f290c..b3bf57532d 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG PRO @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG PRO @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @EN4 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "9vWaWFD7kELXCz9k", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG Translucent @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG Translucent @EN4 Series.json index 9d4befe58d..64d7fe70b4 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG Translucent @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG Translucent @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @EN4 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "MGNtc9J7whLEQzfo", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-CF @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-CF @EN4 Series.json index 6b6d93b07e..570205ae49 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-CF @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-CF @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @EN4 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "OqmWX74QvP3luz8T", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-GF @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-GF @EN4 Series.json index 9c60c02542..14c7c8cd16 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-GF @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PETG-GF @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @EN4 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "l9VHRBqMe9jvI5x6", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Basic @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Basic @EN4 Series.json index a35c8b06f3..3393aa3998 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Basic @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Basic @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "djQpscbgnpi9yeDU", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Galaxy @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Galaxy @EN4 Series.json index 3b8b23e8d2..510ef8199f 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Galaxy @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Galaxy @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "rDOS8SneslZCJyiY", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Marble @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Marble @EN4 Series.json index 6aaaa87311..81be94abca 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Marble @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Marble @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "EXITbaYE2JGd9m6w", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Matte @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Matte @EN4 Series.json index b05ed89beb..5240be0bad 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Matte @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Matte @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "PKKBmF1QUn3byAbe", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA PRO @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA PRO @EN4 Series.json index d993878b35..d8852e7c62 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA PRO @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA PRO @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA PRO @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA PRO @base", "from": "system", "setting_id": "912jZphbXGIftHOj", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Silk @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Silk @EN4 Series.json index 0f01fc1e0e..9e87cd98c4 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Silk @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Silk @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Silk @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Silk @base", "from": "system", "setting_id": "3Gwsgkj54YfChaTX", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Sparkle @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Sparkle @EN4 Series.json index 50750bf2cb..da863b088e 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Sparkle @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Sparkle @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "fpSoENagRf6Xkgtr", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Wood @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Wood @EN4 Series.json index 3e84f6da3f..cadcf8122c 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Wood @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA Wood @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "9HTUZ0mmSCp2asTR", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA+ @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA+ @EN4 Series.json index 569f2e4a73..270d303450 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA+ @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA+ @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA+ @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA+ @base", "from": "system", "setting_id": "aFHpETdqnjrmKoh2", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA-CF @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA-CF @EN4 Series.json index 174db0000f..3eba08c02a 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA-CF @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo PLA-CF @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA-CF @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA-CF @base", "from": "system", "setting_id": "tRWzBsYXsnpNVsQ4", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PETG @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PETG @EN4 Series.json index 5355c6c52f..855ce546c9 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PETG @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PETG @EN4 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @EN4 Series", "renamed_from": "Elegoo RAPID PETG @EN4 Series", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "fvbwrYR63t9NnL8m", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PLA+ @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PLA+ @EN4 Series.json index 024aa42f17..5ec149fee7 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PLA+ @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid PLA+ @EN4 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @EN4 Series", "renamed_from": "Elegoo RAPID PLA+ @EN4 Series", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "Eu5Ao6aTdlnV5o7e", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid TPU 95A @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid TPU 95A @EN4 Series.json index bcf333c319..0c3389a1d2 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid TPU 95A @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo Rapid TPU 95A @EN4 Series.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @EN4 Series", "renamed_from": "Elegoo RAPID TPU 95A @EN4 Series", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "0FWDHJF7V9rGXugP", "instantiation": "true", 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 e5a75475c3..bf3942c6c9 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG PRO @Elegoo Giga", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG PRO @base", "from": "system", "setting_id": "cO87yMETWbUTIweN", "instantiation": "true", 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 61c21f7d5f..89b17d0d8c 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG Translucent @Elegoo Giga", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG Translucent @base", "from": "system", "setting_id": "fkE2LCMu63t1NQtI", "instantiation": "true", 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 8f90166c6b..633fee4d01 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-CF @Elegoo Giga", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-CF @base", "from": "system", "setting_id": "uGF6puqnX1jW2pmn", "instantiation": "true", 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 0d280b37cb..085eba8e80 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PETG-GF @Elegoo Giga", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo PETG-GF @base", "from": "system", "setting_id": "S4ZpKZDyr5g5HMPi", "instantiation": "true", 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 d49474bcfe..345eb9b131 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Basic @Elegoo Giga", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Basic @base", "from": "system", "setting_id": "vdtyGUjloveBjsGV", "instantiation": "true", 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 c9ba6949ab..4c6df1a2ac 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Galaxy @Elegoo Giga", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Galaxy @base", "from": "system", "setting_id": "Nq1YaFeJ6Osr7OZ9", "instantiation": "true", 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 435e05d0ab..a76087fb41 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Marble @Elegoo Giga", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Marble @base", "from": "system", "setting_id": "6mfjc7t9ntuG1ZKW", "instantiation": "true", 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 9ab372abee..ebc4a86a33 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Matte @Elegoo Giga", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Matte @base", "from": "system", "setting_id": "mHbvYB78eds96SH8", "instantiation": "true", 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 9b11bc2cae..68ad38e31a 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Sparkle @Elegoo Giga", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Sparkle @base", "from": "system", "setting_id": "pgsOuYMxtcm3Fkar", "instantiation": "true", 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 9dd74672fc..2d3118d9f9 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,7 +1,7 @@ { "type": "filament", "name": "Elegoo PLA Wood @Elegoo Giga", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo PLA Wood @base", "from": "system", "setting_id": "BI2euv7xwM9F2hKC", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PETG @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PETG @Elegoo Giga.json index b91444664e..41aaa430e8 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PETG @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PETG @Elegoo Giga.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PETG @Elegoo Giga", "renamed_from": "Elegoo RAPID PETG @Elegoo Giga;Elegoo Rapid PETG @EOS Giga;Elegoo RAPID PETG @EOS Giga", - "inherits": "Elegoo PETG @base", + "inherits": "Elegoo Rapid PETG @base", "from": "system", "setting_id": "4ut2mjKopnW6tfxj", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PLA+ @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PLA+ @Elegoo Giga.json index da6b0baf35..e42850d3e8 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PLA+ @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid PLA+ @Elegoo Giga.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid PLA+ @Elegoo Giga", "renamed_from": "Elegoo RAPID PLA+ @Elegoo Giga;Elegoo Rapid PLA+ @EOS Giga;Elegoo RAPID PLA+ @EOS Giga", - "inherits": "Elegoo PLA @base", + "inherits": "Elegoo Rapid PLA+ @base", "from": "system", "setting_id": "9I2DPoLgiCzn1S3i", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid TPU 95A @Elegoo Giga.json b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid TPU 95A @Elegoo Giga.json index f634875fd5..01ccd899d4 100644 --- a/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid TPU 95A @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/EOSGIGA/Elegoo Rapid TPU 95A @Elegoo Giga.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Elegoo Rapid TPU 95A @Elegoo Giga", "renamed_from": "Elegoo RAPID TPU 95A @Elegoo Giga;Elegoo Rapid TPU 95A @EOS Giga;Elegoo RAPID TPU 95A @EOS Giga", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo Rapid TPU 95A @base", "from": "system", "setting_id": "i0PeAUTlls9DGtRK", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json b/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json index 2ebff4843e..7931a6604e 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json @@ -4,6 +4,7 @@ "inherits": "Generic ABS @base", "from": "system", "setting_id": "fRiriEvlcxDDO5tc", + "filament_id": "OFo4VB3w", "instantiation": "true", "nozzle_temperature": [ "260" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json index 46b8157cf4..5fa54d9eb4 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json @@ -4,6 +4,7 @@ "inherits": "Generic PA @base", "from": "system", "setting_id": "TPgpyakWZ7NjVnj5", + "filament_id": "OFk388hR", "instantiation": "true", "fan_min_speed": [ "10" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json index da160366dd..479ae9f275 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json @@ -4,6 +4,7 @@ "inherits": "Generic PC @base", "from": "system", "setting_id": "KMhdBJbiUeXxKgPS", + "filament_id": "OFypQeKR", "instantiation": "true", "filament_type": [ "PC-CF" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json b/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json index 4e9aa92be9..b7542f46f7 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json @@ -4,6 +4,7 @@ "inherits": "Generic PET @base", "from": "system", "setting_id": "Q6wiKjigmzkcMxFz", + "filament_id": "OF0TODnN", "instantiation": "true", "filament_type": [ "PET-CF" 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 c2ba7dfa97..fc750fdcc6 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json @@ -4,6 +4,7 @@ "name": "Generic PETG PRO @Elegoo", "renamed_from": "Elegoo Generic PETG PRO", "from": "system", + "filament_id": "OFhKNHC8", "instantiation": "true", "inherits": "Generic PETG @base", "cool_plate_temp": [ 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 db84f78382..aee418bd18 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json @@ -3,6 +3,7 @@ "setting_id": "dH2Yf92iqsOj5XYo", "name": "Generic PLA Matte @Elegoo", "from": "system", + "filament_id": "OFsLkLw6", "instantiation": "true", "inherits": "Generic PLA @base", "cool_plate_temp": [ diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index f9d84b029c..71b62c1814 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -601,15 +601,44 @@ "DeltaMaker/DeltaMaker Generic PETG", "DeltaMaker/DeltaMaker Generic PLA", "Dremel/Dremel Generic PLA", + "Elegoo/Elegoo ASA-CF @base", "Elegoo/Elegoo PAHT @base", "Elegoo/Elegoo PC @base", + "Elegoo/Elegoo PC-FR @base", + "Elegoo/Elegoo PET-CF @base", "Elegoo/Elegoo PETG @base", + "Elegoo/Elegoo PETG HF @base", + "Elegoo/Elegoo PETG PRO @base", + "Elegoo/Elegoo PETG Translucent @base", + "Elegoo/Elegoo PETG-CF @base", + "Elegoo/Elegoo PETG-GF @base", "Elegoo/Elegoo PLA @base", + "Elegoo/Elegoo PLA Basic @base", + "Elegoo/Elegoo PLA Galaxy @base", + "Elegoo/Elegoo PLA Glow @base", + "Elegoo/Elegoo PLA Marble @base", + "Elegoo/Elegoo PLA Matte @base", + "Elegoo/Elegoo PLA PRO @base", + "Elegoo/Elegoo PLA Silk @base", + "Elegoo/Elegoo PLA Sparkle @base", + "Elegoo/Elegoo PLA Translucent2 @base", + "Elegoo/Elegoo PLA Wood @base", + "Elegoo/Elegoo PLA+ @base", + "Elegoo/Elegoo PLA-CF @base", + "Elegoo/Elegoo Rapid PETG @base", + "Elegoo/Elegoo Rapid PLA+ @base", + "Elegoo/Elegoo Rapid TPU 95A @base", + "Elegoo/Generic ABS-CF @Elegoo Centauri", "Elegoo/Generic PA @base", + "Elegoo/Generic PA6-CF @Elegoo", "Elegoo/Generic PC @base", + "Elegoo/Generic PC-CF @Elegoo", "Elegoo/Generic PET @base", + "Elegoo/Generic PET-CF @Elegoo Centauri", "Elegoo/Generic PETG @base", + "Elegoo/Generic PETG PRO @Elegoo", "Elegoo/Generic PLA @base", + "Elegoo/Generic PLA Matte @Elegoo", "FLSun/FLSun Generic PA", "FLSun/FLSun Generic PA-CF", "FLSun/FLSun Generic PC", @@ -2698,8 +2727,7 @@ "Elegoo/Elegoo ABS" ], "EASAB00": [ - "Elegoo/Elegoo ASA", - "Elegoo/Elegoo ASA-CF" + "Elegoo/Elegoo ASA" ], "EFL33": [ "Eryone/Eryone PP-CF" @@ -2748,34 +2776,13 @@ "Elegoo/Elegoo PAHT-CF" ], "EPCB00": [ - "Elegoo/Elegoo PC", - "Elegoo/Elegoo PC-FR" + "Elegoo/Elegoo PC" ], "EPETGB00": [ - "Elegoo/Elegoo PET-CF", - "Elegoo/Elegoo PETG", - "Elegoo/Elegoo PETG HF", - "Elegoo/Elegoo PETG PRO", - "Elegoo/Elegoo PETG Translucent", - "Elegoo/Elegoo PETG-CF", - "Elegoo/Elegoo PETG-GF", - "Elegoo/Elegoo Rapid PETG" + "Elegoo/Elegoo PETG" ], "EPLAB00": [ - "Elegoo/Elegoo PLA", - "Elegoo/Elegoo PLA Basic", - "Elegoo/Elegoo PLA Galaxy", - "Elegoo/Elegoo PLA Glow", - "Elegoo/Elegoo PLA Marble", - "Elegoo/Elegoo PLA Matte", - "Elegoo/Elegoo PLA PRO", - "Elegoo/Elegoo PLA Silk", - "Elegoo/Elegoo PLA Sparkle", - "Elegoo/Elegoo PLA Translucent2", - "Elegoo/Elegoo PLA Wood", - "Elegoo/Elegoo PLA+", - "Elegoo/Elegoo PLA-CF", - "Elegoo/Elegoo Rapid PLA+" + "Elegoo/Elegoo PLA" ], "ESN02": [ "OrcaFilamentLibrary/eSUN ePLA-LW" @@ -2784,7 +2791,6 @@ "OrcaFilamentLibrary/eSUN PETG" ], "ETPUB00": [ - "Elegoo/Elegoo Rapid TPU 95A", "Elegoo/Elegoo TPU 95A" ], "FDPLAST01": [ @@ -3023,8 +3029,7 @@ "OrcaFilamentLibrary/FILL3D PETG CF" ], "GABSB00": [ - "Elegoo/Generic ABS", - "Elegoo/Generic ABS-CF" + "Elegoo/Generic ABS" ], "GASAB00": [ "Elegoo/Generic ASA", @@ -4492,25 +4497,20 @@ "Prusa/Prusa Generic TPU HF" ], "GPAB00": [ - "Elegoo/Generic PA", - "Elegoo/Generic PA6-CF" + "Elegoo/Generic PA" ], "GPCB00": [ - "Elegoo/Generic PC", - "Elegoo/Generic PC-CF" + "Elegoo/Generic PC" ], "GPETB00": [ - "Elegoo/Generic PET", - "Elegoo/Generic PET-CF" + "Elegoo/Generic PET" ], "GPETGB00": [ "Elegoo/Generic PETG", - "Elegoo/Generic PETG PRO", "Elegoo/Generic PETG-CF" ], "GPLAB00": [ - "Elegoo/Generic PLA", - "Elegoo/Generic PLA Matte" + "Elegoo/Generic PLA" ], "Generic ABS @E3NG v1.2S": [ "RH3D/Generic ABS" @@ -4681,12 +4681,18 @@ "OETPUB00": [ "OrcaFilamentLibrary/Elegoo TPU 95A" ], + "OF09vOcG": [ + "Elegoo/Elegoo PLA Galaxy" + ], "OF0M6QAQ": [ "OrcaFilamentLibrary/Elegoo PLA Galaxy" ], "OF0SyJhk": [ "Flashforge/Flashforge PA6-CF" ], + "OF0TODnN": [ + "Elegoo/Generic PET-CF" + ], "OF0TjJ0G": [ "Qidi/Qidi ASA-Aero" ], @@ -4720,6 +4726,9 @@ "OF3XeEuV": [ "Qidi/QIDI PET-GF" ], + "OF3arl18": [ + "Elegoo/Elegoo Rapid PETG" + ], "OF41QVDH": [ "Flashforge/Flashforge Generic PLA-Silk" ], @@ -4792,6 +4801,9 @@ "OFAGrVjP": [ "Flashforge/Flashforge PLA Silk" ], + "OFAHagT9": [ + "Elegoo/Elegoo Rapid PLA+" + ], "OFAUDGEQ": [ "Qidi/QIDI PLA Rapido Matte" ], @@ -4801,12 +4813,18 @@ "OFAdZFD1": [ "Flashforge/FusRock Generic PET-GF" ], + "OFAiqi5v": [ + "Elegoo/Elegoo ASA-CF" + ], "OFAnyzjN": [ "Qidi/HATCHBOX PETG" ], "OFAtydxE": [ "Flashforge/FusRock S-Multi" ], + "OFBvxnjM": [ + "Elegoo/Elegoo PETG-GF" + ], "OFC2FSsV": [ "Qidi/Overture PLA" ], @@ -4822,6 +4840,9 @@ "OFDCk0cz": [ "OrcaFilamentLibrary/Generic PETG-CF" ], + "OFDMWB6t": [ + "Elegoo/Elegoo PLA+" + ], "OFDNiRTx": [ "OrcaFilamentLibrary/Elegoo PLA+" ], @@ -4843,6 +4864,9 @@ "OFHBTqyD": [ "Flashforge/Flashforge PLA Basic" ], + "OFHtQDC9": [ + "Elegoo/Elegoo PLA Basic" + ], "OFICPchn": [ "OrcaFilamentLibrary/Elegoo PLA Basic" ], @@ -4873,6 +4897,9 @@ "OFKjlAbC": [ "Qidi/QIDI UltraPA-CF25" ], + "OFL4KniM": [ + "Elegoo/Elegoo Rapid TPU 95A" + ], "OFL7vEML": [ "Flashforge/FlashForge PC" ], @@ -4912,6 +4939,9 @@ "OFOW9K96": [ "Qidi/Qidi TPU 95A-HF" ], + "OFOkTA0C": [ + "Elegoo/Elegoo PETG Translucent" + ], "OFOysPuE": [ "Qidi/QIDI TPU-GF" ], @@ -4951,6 +4981,9 @@ "OFRgDMDJ": [ "Flashforge/Flashforge PETG Transparent" ], + "OFSCm6pJ": [ + "Elegoo/Elegoo PET-CF" + ], "OFSSuKRr": [ "Qidi/QIDI PETG Basic" ], @@ -5041,15 +5074,24 @@ "OFa6L3Of": [ "Qidi/Qidi PC-ABS-FR" ], + "OFaKIoH2": [ + "Elegoo/Elegoo PLA Sparkle" + ], "OFbS9rjH": [ "Qidi/QIDI PETG Rapido" ], + "OFbYP6Wb": [ + "Elegoo/Elegoo PLA Marble" + ], "OFbgt3u3": [ "OrcaFilamentLibrary/Elas PLA Basic" ], "OFceJcLf": [ "Qidi/PolyLite PLA" ], + "OFcqs5g7": [ + "Elegoo/Elegoo PLA Translucent2" + ], "OFcy60o4": [ "Flashforge/Flashforge ASA Basic" ], @@ -5086,6 +5128,12 @@ "OFgJX0Fc": [ "Flashforge/FlashForge PPS" ], + "OFh5GUhZ": [ + "Elegoo/Elegoo PLA Wood" + ], + "OFhKNHC8": [ + "Elegoo/Generic PETG PRO" + ], "OFhzHd2Y": [ "Flashforge/Flashforge HIPS" ], @@ -5098,6 +5146,9 @@ "OFidJLn8": [ "Qidi/PolyLite ABS" ], + "OFiyGNbI": [ + "Elegoo/Elegoo PETG-CF" + ], "OFjepy6j": [ "Flashforge/FusRock Generic S-PAHT" ], @@ -5107,9 +5158,18 @@ "OFjqPjjl": [ "Flashforge/Generic PET" ], + "OFk388hR": [ + "Elegoo/Generic PA6-CF" + ], "OFkaDtKx": [ "Flashforge/Flashforge PA66-CF" ], + "OFkfK62J": [ + "Elegoo/Elegoo PLA Silk" + ], + "OFklg4aM": [ + "Elegoo/Elegoo PLA PRO" + ], "OFlNKZLP": [ "Flashforge/Flashforge PLA Metal" ], @@ -5122,6 +5182,9 @@ "OFmKNi3f": [ "Qidi/QIDI PLA Rapido" ], + "OFmOWC74": [ + "Elegoo/Elegoo PETG PRO" + ], "OFmduKVr": [ "Flashforge/FlashForge PPS-CF" ], @@ -5137,6 +5200,9 @@ "OFnsWQTp": [ "Qidi/QIDI WOOD Rapido" ], + "OFo4VB3w": [ + "Elegoo/Generic ABS-CF" + ], "OFo9EwvK": [ "Flashforge/Generic PETG-CF10" ], @@ -5179,6 +5245,9 @@ "OFsKqcQW": [ "OrcaFilamentLibrary/Elegoo PLA PRO" ], + "OFsLkLw6": [ + "Elegoo/Generic PLA Matte" + ], "OFsNZcid": [ "OrcaFilamentLibrary/PolyLite Dual PLA" ], @@ -5194,9 +5263,15 @@ "OFtJMczs": [ "Flashforge/Flashforge TPU-64D" ], + "OFuPC4S8": [ + "Elegoo/Elegoo PLA-CF" + ], "OFuTFxVP": [ "Qidi/Overture ABS" ], + "OFuXkYly": [ + "Elegoo/Elegoo PLA Glow" + ], "OFuidAEg": [ "Qidi/Bambu ABS" ], @@ -5230,12 +5305,24 @@ "OFwf0oWp": [ "Flashforge/Flashforge PLA Luminous" ], + "OFwyqcGn": [ + "Elegoo/Elegoo PLA Matte" + ], + "OFxjFYxE": [ + "Elegoo/Elegoo PETG HF" + ], "OFyoW5W2": [ "Flashforge/Flashforge PLA Color Change" ], + "OFypQeKR": [ + "Elegoo/Generic PC-CF" + ], "OFyxAbO4": [ "Flashforge/Flashforge TPU-95A" ], + "OFzFbFcl": [ + "Elegoo/Elegoo PC-FR" + ], "OFzrWlH5": [ "OrcaFilamentLibrary/Elegoo PETG HF" ], @@ -7154,6 +7241,12 @@ "DeltaMaker/DeltaMaker Generic PLA", "DeltaMaker/DeltaMaker Generic TPU", "Dremel/Dremel Generic PLA", + "Elegoo/Generic ABS-CF @Elegoo Centauri", + "Elegoo/Generic PA6-CF @Elegoo", + "Elegoo/Generic PC-CF @Elegoo", + "Elegoo/Generic PET-CF @Elegoo Centauri", + "Elegoo/Generic PETG PRO @Elegoo", + "Elegoo/Generic PLA Matte @Elegoo", "Eryone/Eryone ABS", "Eryone/Eryone ABS-CF", "Eryone/Eryone ASA", From 095fd9fba40617300ed99d54d4afda380bcd88a9 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:09:05 +0800 Subject: [PATCH 07/52] Prusa: move filament_ids off shared templates onto family roots Phase 2 of the filament_id cleanup (31 collision groups, all one mechanism: material-class ids on shared fdm_filament_* templates collapsing HF/-CF/ Prusament lines onto one id, plus 3 overclaims). 18 new @base family roots (owner generic keeps the legacy id, 12 impostor families get deterministic mints), 72 config-neutral inherits repoints, 6 template filament_id keys removed (only where every id-less inheritor is covered by a new root; fdm_filament_asa/pc keep theirs for the frozen Prusament @XL riders), 3 compatible_printers trims on MINIIS printers covered by dedicated @MINIIS variants. Frozen name-shaped and _NN per-variant ids stay byte-identical. Verified: config-equivalence gate zero unexpected diffs; extra check exit 0; --check exit 0; validator -l 2 exit 0; extended -f -v Prusa exit 0 (was 31 groups / 1035 printer-level errors on the pre-apply copy). --- resources/profiles/Prusa.json | 72 +++++++++++++++++ .../Prusa Generic ABS @MINIIS 0.25.json | 2 +- .../Prusa Generic ABS @MINIIS 0.6.json | 2 +- .../Prusa Generic ABS @MINIIS 0.8.json | 2 +- .../filament/Prusa Generic ABS @MINIIS.json | 2 +- .../filament/Prusa Generic ABS @MK4.json | 2 +- .../filament/Prusa Generic ABS @XL 5T.json | 2 +- .../Prusa/filament/Prusa Generic ABS @XL.json | 2 +- .../filament/Prusa Generic ABS @base.json | 8 ++ .../Prusa Generic ABS HF @MINIIS 0.6.json | 2 +- .../Prusa Generic ABS HF @MINIIS 0.8.json | 2 +- .../Prusa Generic ABS HF @MINIIS.json | 2 +- .../filament/Prusa Generic ABS HF @base.json | 8 ++ .../Prusa/filament/Prusa Generic ABS.json | 2 +- .../Prusa Generic ASA HF @MINIIS 0.6.json | 2 +- .../Prusa Generic ASA HF @MINIIS 0.8.json | 2 +- .../Prusa Generic ASA HF @MINIIS.json | 2 +- .../filament/Prusa Generic ASA HF @base.json | 8 ++ .../Prusa Generic PA @MINIIS 0.25.json | 2 +- .../Prusa Generic PA @MINIIS 0.6.json | 2 +- .../Prusa Generic PA @MINIIS 0.8.json | 2 +- .../filament/Prusa Generic PA @MINIIS.json | 2 +- .../filament/Prusa Generic PA @base.json | 8 ++ .../Prusa Generic PA-CF @MINIIS 0.25.json | 2 +- .../Prusa Generic PA-CF @MINIIS 0.6.json | 2 +- .../Prusa Generic PA-CF @MINIIS 0.8.json | 2 +- .../filament/Prusa Generic PA-CF @MINIIS.json | 2 +- .../filament/Prusa Generic PA-CF @base.json | 8 ++ .../Prusa/filament/Prusa Generic PA-CF.json | 8 +- .../Prusa/filament/Prusa Generic PA.json | 8 +- .../Prusa Generic PC HF @MINIIS 0.6.json | 2 +- .../Prusa Generic PC HF @MINIIS 0.8.json | 2 +- .../filament/Prusa Generic PC HF @MINIIS.json | 2 +- .../filament/Prusa Generic PC HF @base.json | 8 ++ .../Prusa Generic PETG @MINIIS 0.25.json | 2 +- .../Prusa Generic PETG @MINIIS 0.6.json | 2 +- .../Prusa Generic PETG @MINIIS 0.8.json | 2 +- .../filament/Prusa Generic PETG @MINIIS.json | 2 +- .../filament/Prusa Generic PETG @MK4.json | 2 +- .../filament/Prusa Generic PETG @XL 5T.json | 2 +- .../filament/Prusa Generic PETG @XL.json | 2 +- .../filament/Prusa Generic PETG @base.json | 8 ++ .../Prusa Generic PETG HF @MINIIS 0.6.json | 2 +- .../Prusa Generic PETG HF @MINIIS 0.8.json | 2 +- .../Prusa Generic PETG HF @MINIIS.json | 2 +- .../filament/Prusa Generic PETG HF @base.json | 8 ++ .../Prusa/filament/Prusa Generic PETG.json | 2 +- .../Prusa Generic PLA @MINIIS 0.25.json | 2 +- .../Prusa Generic PLA @MINIIS 0.6.json | 2 +- .../Prusa Generic PLA @MINIIS 0.8.json | 2 +- .../filament/Prusa Generic PLA @MINIIS.json | 2 +- .../filament/Prusa Generic PLA @MK4.json | 2 +- .../filament/Prusa Generic PLA @XL 5T.json | 2 +- .../Prusa/filament/Prusa Generic PLA @XL.json | 2 +- .../filament/Prusa Generic PLA @base.json | 8 ++ .../Prusa Generic PLA HF @MINIIS 0.6.json | 2 +- .../Prusa Generic PLA HF @MINIIS 0.8.json | 2 +- .../Prusa Generic PLA HF @MINIIS.json | 2 +- .../filament/Prusa Generic PLA HF @base.json | 8 ++ .../Prusa Generic PLA-CF @MINIIS 0.25.json | 2 +- .../Prusa Generic PLA-CF @MINIIS 0.6.json | 2 +- .../Prusa Generic PLA-CF @MINIIS 0.8.json | 2 +- .../Prusa Generic PLA-CF @MINIIS.json | 2 +- .../filament/Prusa Generic PLA-CF @base.json | 8 ++ .../Prusa/filament/Prusa Generic PLA-CF.json | 8 +- .../Prusa/filament/Prusa Generic PLA.json | 2 +- .../Prusa Generic PVA @MINIIS 0.25.json | 2 +- .../Prusa Generic PVA @MINIIS 0.6.json | 2 +- .../Prusa Generic PVA @MINIIS 0.8.json | 2 +- .../filament/Prusa Generic PVA @MINIIS.json | 2 +- .../filament/Prusa Generic PVA @base.json | 8 ++ .../Prusa Generic PVA HF @MINIIS 0.6.json | 2 +- .../Prusa Generic PVA HF @MINIIS 0.8.json | 2 +- .../Prusa Generic PVA HF @MINIIS.json | 2 +- .../filament/Prusa Generic PVA HF @base.json | 8 ++ .../Prusa/filament/Prusa Generic PVA.json | 2 +- .../filament/Prusa Generic TPU @MINIIS.json | 2 +- .../filament/Prusa Generic TPU @MK4.json | 2 +- .../filament/Prusa Generic TPU @base.json | 8 ++ .../Prusa Generic TPU HF @MINIIS.json | 2 +- .../filament/Prusa Generic TPU HF @base.json | 8 ++ .../Prusa/filament/Prusa Generic TPU.json | 2 +- .../Prusa/filament/Prusament PETG @XL 5T.json | 2 +- .../Prusa/filament/Prusament PETG @XL.json | 2 +- .../Prusa/filament/Prusament PETG @base.json | 8 ++ .../Prusa/filament/Prusament PLA @XL 5T.json | 2 +- .../Prusa/filament/Prusament PLA @XL.json | 2 +- .../Prusa/filament/Prusament PLA @base.json | 8 ++ .../Prusa/filament/Prusament rPLA @XL 5T.json | 2 +- .../Prusa/filament/Prusament rPLA @XL.json | 2 +- .../Prusa/filament/Prusament rPLA @base.json | 8 ++ .../Prusa/filament/fdm_filament_abs.json | 1 - .../Prusa/filament/fdm_filament_pa.json | 1 - .../Prusa/filament/fdm_filament_pet.json | 1 - .../Prusa/filament/fdm_filament_pla.json | 1 - .../Prusa/filament/fdm_filament_pva.json | 1 - .../Prusa/filament/fdm_filament_tpu.json | 1 - scripts/filament_id_snapshot.json | 81 +++++++++++-------- 98 files changed, 340 insertions(+), 125 deletions(-) create mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PA @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PETG @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PLA @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PVA @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic TPU @base.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json create mode 100644 resources/profiles/Prusa/filament/Prusament PETG @base.json create mode 100644 resources/profiles/Prusa/filament/Prusament PLA @base.json create mode 100644 resources/profiles/Prusa/filament/Prusament rPLA @base.json diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 935de537be..4fa412325a 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -1448,6 +1448,10 @@ "name": "fdm_filament_tpu", "sub_path": "filament/fdm_filament_tpu.json" }, + { + "name": "Prusa Generic ABS @base", + "sub_path": "filament/Prusa Generic ABS @base.json" + }, { "name": "Prusa Generic ABS", "sub_path": "filament/Prusa Generic ABS.json" @@ -1504,6 +1508,10 @@ "name": "Prusa Generic ABS @XL 5T", "sub_path": "filament/Prusa Generic ABS @XL 5T.json" }, + { + "name": "Prusa Generic ABS HF @base", + "sub_path": "filament/Prusa Generic ABS HF @base.json" + }, { "name": "Prusa Generic ABS HF @MINIIS", "sub_path": "filament/Prusa Generic ABS HF @MINIIS.json" @@ -1576,6 +1584,10 @@ "name": "Prusa Generic ASA @MK4S", "sub_path": "filament/Prusa Generic ASA @MK4S.json" }, + { + "name": "Prusa Generic ASA HF @base", + "sub_path": "filament/Prusa Generic ASA HF @base.json" + }, { "name": "Prusa Generic ASA HF @MINIIS", "sub_path": "filament/Prusa Generic ASA HF @MINIIS.json" @@ -1624,6 +1636,10 @@ "name": "Prusa Generic TPU @CORE One", "sub_path": "filament/Prusa Generic TPU @CORE One.json" }, + { + "name": "Prusa Generic PA @base", + "sub_path": "filament/Prusa Generic PA @base.json" + }, { "name": "Prusa Generic PA", "sub_path": "filament/Prusa Generic PA.json" @@ -1660,6 +1676,10 @@ "name": "Prusa Generic PA @MK3.5 0.8", "sub_path": "filament/Prusa Generic PA @MK3.5 0.8.json" }, + { + "name": "Prusa Generic PA-CF @base", + "sub_path": "filament/Prusa Generic PA-CF @base.json" + }, { "name": "Prusa Generic PA-CF", "sub_path": "filament/Prusa Generic PA-CF.json" @@ -1744,6 +1764,10 @@ "name": "Prusa Generic PC @MK3.5 0.8", "sub_path": "filament/Prusa Generic PC @MK3.5 0.8.json" }, + { + "name": "Prusa Generic PC HF @base", + "sub_path": "filament/Prusa Generic PC HF @base.json" + }, { "name": "Prusa Generic PC HF @MINIIS", "sub_path": "filament/Prusa Generic PC HF @MINIIS.json" @@ -1792,6 +1816,10 @@ "name": "Prusament PC-CF @XL 5T", "sub_path": "filament/Prusament PC-CF @XL 5T.json" }, + { + "name": "Prusa Generic PETG @base", + "sub_path": "filament/Prusa Generic PETG @base.json" + }, { "name": "Prusa Generic PETG", "sub_path": "filament/Prusa Generic PETG.json" @@ -1848,6 +1876,10 @@ "name": "Prusa Generic PETG @XL 5T", "sub_path": "filament/Prusa Generic PETG @XL 5T.json" }, + { + "name": "Prusa Generic PETG HF @base", + "sub_path": "filament/Prusa Generic PETG HF @base.json" + }, { "name": "Prusa Generic PETG HF @MINIIS", "sub_path": "filament/Prusa Generic PETG HF @MINIIS.json" @@ -1876,6 +1908,10 @@ "name": "Prusament PETG @CORE One", "sub_path": "filament/Prusament PETG @CORE One.json" }, + { + "name": "Prusament PETG @base", + "sub_path": "filament/Prusament PETG @base.json" + }, { "name": "Prusament PETG @XL", "sub_path": "filament/Prusament PETG @XL.json" @@ -1884,6 +1920,10 @@ "name": "Prusament PETG @XL 5T", "sub_path": "filament/Prusament PETG @XL 5T.json" }, + { + "name": "Prusa Generic PLA @base", + "sub_path": "filament/Prusa Generic PLA @base.json" + }, { "name": "Prusa Generic PLA", "sub_path": "filament/Prusa Generic PLA.json" @@ -1940,6 +1980,10 @@ "name": "Prusa Generic PLA @XL 5T", "sub_path": "filament/Prusa Generic PLA @XL 5T.json" }, + { + "name": "Prusa Generic PLA HF @base", + "sub_path": "filament/Prusa Generic PLA HF @base.json" + }, { "name": "Prusa Generic PLA HF @MINIIS", "sub_path": "filament/Prusa Generic PLA HF @MINIIS.json" @@ -1968,6 +2012,10 @@ "name": "Prusa Generic PLA Silk @CORE One", "sub_path": "filament/Prusa Generic PLA Silk @CORE One.json" }, + { + "name": "Prusa Generic PLA-CF @base", + "sub_path": "filament/Prusa Generic PLA-CF @base.json" + }, { "name": "Prusa Generic PLA-CF", "sub_path": "filament/Prusa Generic PLA-CF.json" @@ -2008,6 +2056,10 @@ "name": "Prusament PLA @CORE One", "sub_path": "filament/Prusament PLA @CORE One.json" }, + { + "name": "Prusament PLA @base", + "sub_path": "filament/Prusament PLA @base.json" + }, { "name": "Prusament PLA @XL", "sub_path": "filament/Prusament PLA @XL.json" @@ -2020,6 +2072,10 @@ "name": "Prusament rPLA @CORE One", "sub_path": "filament/Prusament rPLA @CORE One.json" }, + { + "name": "Prusament rPLA @base", + "sub_path": "filament/Prusament rPLA @base.json" + }, { "name": "Prusament rPLA @XL", "sub_path": "filament/Prusament rPLA @XL.json" @@ -2028,6 +2084,10 @@ "name": "Prusament rPLA @XL 5T", "sub_path": "filament/Prusament rPLA @XL 5T.json" }, + { + "name": "Prusa Generic PVA @base", + "sub_path": "filament/Prusa Generic PVA @base.json" + }, { "name": "Prusa Generic PVA", "sub_path": "filament/Prusa Generic PVA.json" @@ -2064,6 +2124,10 @@ "name": "Prusa Generic PVA @MK3.5 0.8", "sub_path": "filament/Prusa Generic PVA @MK3.5 0.8.json" }, + { + "name": "Prusa Generic PVA HF @base", + "sub_path": "filament/Prusa Generic PVA HF @base.json" + }, { "name": "Prusa Generic PVA HF @MINIIS", "sub_path": "filament/Prusa Generic PVA HF @MINIIS.json" @@ -2100,6 +2164,10 @@ "name": "Prusament PVB @XL 5T", "sub_path": "filament/Prusament PVB @XL 5T.json" }, + { + "name": "Prusa Generic TPU @base", + "sub_path": "filament/Prusa Generic TPU @base.json" + }, { "name": "Prusa Generic TPU", "sub_path": "filament/Prusa Generic TPU.json" @@ -2120,6 +2188,10 @@ "name": "Prusa Generic TPU @MK4S", "sub_path": "filament/Prusa Generic TPU @MK4S.json" }, + { + "name": "Prusa Generic TPU HF @base", + "sub_path": "filament/Prusa Generic TPU HF @base.json" + }, { "name": "Prusa Generic TPU HF @MINIIS", "sub_path": "filament/Prusa Generic TPU HF @MINIIS.json" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json index 9cb0f8b001..ca834afe43 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS @MINIIS 0.25", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "NdGEi7BdP59bqz53", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json index e1d4f272ae..b4c5c636bf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS @MINIIS 0.6", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "f8RXAaEZ13jSgN9u", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json index a867f7d6a6..7b847c26b0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS @MINIIS 0.8", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "0QdQCdtcKqM9HhpD", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json index c52dd45677..35bf33de08 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS @MINIIS", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "LmdcShjNmbZ8E5fo", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json index 3cbcf73b85..6b4f8d9fdf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS @MK4", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "Yeqfgyq1l0b1tCaT", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json index 3aef5fc5e9..38559e4b26 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS @XL 5T", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "BVYagI9PtDtO1Jhu", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json index 2abed48083..e40a10cbeb 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS @XL", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "fN9NUlg8l5DWy4LN", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json new file mode 100644 index 0000000000..ffa4525a5a --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic ABS @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "GFB99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json index 287f5d03f9..f8959a77b2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS HF @MINIIS 0.6", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS HF @base", "from": "system", "setting_id": "86pFdkE3ly08xst7", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json index 358d9a3c46..63c1207fd9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS HF @MINIIS 0.8", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS HF @base", "from": "system", "setting_id": "yn9imamHaXlFDsPr", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json index 1b72e67a4d..358aa57b6d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS HF @MINIIS", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS HF @base", "from": "system", "setting_id": "KFoCfgUW9k9Yglwj", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json new file mode 100644 index 0000000000..228807da84 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic ABS HF @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "OFCgpxn2", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS.json b/resources/profiles/Prusa/filament/Prusa Generic ABS.json index 0f77dd0216..9fef1f871c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ABS", - "inherits": "fdm_filament_abs", + "inherits": "Prusa Generic ABS @base", "from": "system", "setting_id": "pqQMpMgbSN3XvTdK", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json index 2f8cb00374..1dda0e52e2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ASA HF @MINIIS 0.6", - "inherits": "fdm_filament_asa", + "inherits": "Prusa Generic ASA HF @base", "from": "system", "setting_id": "uf2mhiPodkiOu8Ui", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json index 2a238156f7..b3d9bad889 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ASA HF @MINIIS 0.8", - "inherits": "fdm_filament_asa", + "inherits": "Prusa Generic ASA HF @base", "from": "system", "setting_id": "GMfOVAhKgKoiGZH5", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json index 9f97b95631..68ade52513 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic ASA HF @MINIIS", - "inherits": "fdm_filament_asa", + "inherits": "Prusa Generic ASA HF @base", "from": "system", "setting_id": "o8mGAPApXYWIvPhm", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json new file mode 100644 index 0000000000..000196a2a1 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic ASA HF @base", + "inherits": "fdm_filament_asa", + "from": "system", + "filament_id": "OFkeeluv", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json index 7fdf301829..a74492d2aa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA @MINIIS 0.25", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA @base", "from": "system", "setting_id": "tGSqS5YX8FXkVAKa", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json index ada7470a27..a28f3eedf0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA @MINIIS 0.6", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA @base", "from": "system", "setting_id": "u3ZeKEiAwme06ioU", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json index f08a354372..cbf0faa16a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA @MINIIS 0.8", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA @base", "from": "system", "setting_id": "nE90oPuU8lRFVBCl", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json index 1f62ce1a85..c8ff9bf5cb 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA @MINIIS", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA @base", "from": "system", "setting_id": "hda5VGcBTJOFu6B0", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PA @base.json new file mode 100644 index 0000000000..42e8d47bbd --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PA @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "GFN99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json index c262a5fe97..cc78a91ff9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA-CF @MINIIS 0.25", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA-CF @base", "from": "system", "setting_id": "R9H0mIGTEh4rxRag", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json index 61047938ef..9cca375d20 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA-CF @MINIIS 0.6", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA-CF @base", "from": "system", "setting_id": "qy8b2cQmrhmxfUfm", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json index e38f123038..930599ddf8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA-CF @MINIIS 0.8", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA-CF @base", "from": "system", "setting_id": "PNdZVpjyekMxgAWx", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json index a41ec893e7..320eaaccd5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA-CF @MINIIS", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA-CF @base", "from": "system", "setting_id": "B2SFfVrYjPnN9rw3", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json new file mode 100644 index 0000000000..0b0059fa9a --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PA-CF @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OFXfgh61", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json index 5144b143d6..ac15c94417 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA-CF", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA-CF @base", "from": "system", "setting_id": "bptwthfCtglFSoMw", "instantiation": "true", @@ -29,10 +29,6 @@ "Prusa MK4 0.25 nozzle", "Prusa MK4 0.4 nozzle", "Prusa MK4 0.6 nozzle", - "Prusa MK4 0.8 nozzle", - "Prusa MINIIS 0.4 nozzle", - "Prusa MINIIS 0.25 nozzle", - "Prusa MINIIS 0.6 nozzle", - "Prusa MINIIS 0.8 nozzle" + "Prusa MK4 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA.json b/resources/profiles/Prusa/filament/Prusa Generic PA.json index 9893d5a390..b50c329fab 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PA", - "inherits": "fdm_filament_pa", + "inherits": "Prusa Generic PA @base", "from": "system", "setting_id": "lWO6oNoV0wjzRVja", "instantiation": "true", @@ -26,10 +26,6 @@ "Prusa MK4 0.25 nozzle", "Prusa MK4 0.4 nozzle", "Prusa MK4 0.6 nozzle", - "Prusa MK4 0.8 nozzle", - "Prusa MINIIS 0.4 nozzle", - "Prusa MINIIS 0.25 nozzle", - "Prusa MINIIS 0.6 nozzle", - "Prusa MINIIS 0.8 nozzle" + "Prusa MK4 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json index bc82e730f2..e3d400892f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PC HF @MINIIS 0.6", - "inherits": "fdm_filament_pc", + "inherits": "Prusa Generic PC HF @base", "from": "system", "setting_id": "oj7iq8Bsz8lYyoG8", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json index d864903081..5965ff9d5d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PC HF @MINIIS 0.8", - "inherits": "fdm_filament_pc", + "inherits": "Prusa Generic PC HF @base", "from": "system", "setting_id": "SK8h5tE5di3YWaJp", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json index 96720cc606..b198ed3af4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PC HF @MINIIS", - "inherits": "fdm_filament_pc", + "inherits": "Prusa Generic PC HF @base", "from": "system", "setting_id": "onMXXnQNjbSimzbW", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json new file mode 100644 index 0000000000..ece79b1919 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PC HF @base", + "inherits": "fdm_filament_pc", + "from": "system", + "filament_id": "OFQ9dI8j", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json index b804e798b1..1254f1aede 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG @MINIIS 0.25", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "u4zA4rasW1vfwG1o", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json index 8d4d00ea99..7e849e01af 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG @MINIIS 0.6", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "QJQIAwmRSZW3hNI4", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json index 81c4d41aaf..2a943198aa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG @MINIIS 0.8", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "nXFZVAKBc3hkxbRt", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json index 8803f3e7fd..49d8e83444 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG @MINIIS", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "nXB864FJ4Dbz5oXc", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json index b0e684dd68..f4d8216caa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG @MK4", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "Xk2dCGMzSaT73Gq5", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json index 3a90f36035..4babb91e3f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG @XL 5T", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "FbtB9og6yXm2ZktD", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json index 14cb0f610b..793b97e290 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG @XL", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "SQKcHBt6A4D8PwFZ", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json new file mode 100644 index 0000000000..7cc123d8fd --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PETG @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "GFT02", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json index 03675e06e7..da8b0f68e5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG HF @MINIIS 0.6", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG HF @base", "from": "system", "setting_id": "tt7C6k90F51Q17NL", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json index 86b9431c5f..c8eb08ef87 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG HF @MINIIS 0.8", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG HF @base", "from": "system", "setting_id": "hivI3u5bpGKEJuPR", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json index 8df215da56..dcb87593dc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG HF @MINIIS", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG HF @base", "from": "system", "setting_id": "SHIhEzb8wJonmulf", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json new file mode 100644 index 0000000000..b9c02872b2 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PETG HF @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFphFSUJ", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG.json b/resources/profiles/Prusa/filament/Prusa Generic PETG.json index 6963412e1c..db17c39162 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PETG", - "inherits": "fdm_filament_pet", + "inherits": "Prusa Generic PETG @base", "from": "system", "setting_id": "b55Rd5kKGP1A3BM2", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json index 67a5bbca62..73ce7b1606 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA @MINIIS 0.25", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "GOomDjqbF1CGAy8O", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json index 7bb32fd4d9..437eeeb6b8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA @MINIIS 0.6", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "rKRRhdLk0Heg3slz", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json index 96016b318a..cd95805fb3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA @MINIIS 0.8", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "XC2NBSQXjiKIXnTi", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json index 2de81c0947..5f3c8f9bb4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA @MINIIS", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "GUG6Ug0cZt0gs2Z2", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json index 13a0df5f2b..22f8bb274c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA @MK4", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "1aLBPgVpr7XZmmX6", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json index 9264a2b0c1..2d149b8b7b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA @XL 5T", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "orBUSq1sDBeMGMON", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json index fd1ffa1425..3206f6f3c5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA @XL", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "tGG7egsphB0I1i6Z", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json new file mode 100644 index 0000000000..be5218517e --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "GFL99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json index 7ae24d6fe7..6b9f364da7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA HF @MINIIS 0.6", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA HF @base", "from": "system", "setting_id": "A6tgkt5mCN7hFzoU", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json index 10353f147e..b4a25d21a1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA HF @MINIIS 0.8", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA HF @base", "from": "system", "setting_id": "3MSF1ZEw3D7bVhEI", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json index ea67606d37..243b69a393 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA HF @MINIIS", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA HF @base", "from": "system", "setting_id": "eVuV41lUXe9SEmeh", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json new file mode 100644 index 0000000000..4cff82d6a5 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PLA HF @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFicxmSa", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json index 8b41f21ce1..1e95879fdf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA-CF @MINIIS 0.25", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA-CF @base", "from": "system", "setting_id": "Sv0IcpOJBk95F94d", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json index 642ec54a07..3736da09d7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA-CF @MINIIS 0.6", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA-CF @base", "from": "system", "setting_id": "tKAu2YX7WADQuJqv", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json index 90be6a1703..83c781352d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA-CF @MINIIS 0.8", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA-CF @base", "from": "system", "setting_id": "dHVVnfZSJ6xEgzdQ", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json index 1be8101e9a..4cb69a99ec 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA-CF @MINIIS", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA-CF @base", "from": "system", "setting_id": "VESr5xWPvPIlhyKh", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json new file mode 100644 index 0000000000..f45f0e0bf0 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PLA-CF @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFv8SRZh", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json index 8e24ebcd12..d156be1004 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA-CF", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA-CF @base", "from": "system", "setting_id": "NqmFeHNZtfNefmvd", "instantiation": "true", @@ -32,10 +32,6 @@ "Prusa MK4 0.25 nozzle", "Prusa MK4 0.4 nozzle", "Prusa MK4 0.6 nozzle", - "Prusa MK4 0.8 nozzle", - "Prusa MINIIS 0.4 nozzle", - "Prusa MINIIS 0.25 nozzle", - "Prusa MINIIS 0.6 nozzle", - "Prusa MINIIS 0.8 nozzle" + "Prusa MK4 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA.json b/resources/profiles/Prusa/filament/Prusa Generic PLA.json index ae5ca3e50c..a2f1521fec 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PLA", - "inherits": "fdm_filament_pla", + "inherits": "Prusa Generic PLA @base", "from": "system", "setting_id": "pKHhR3Hx6AUoyIO3", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json index 7391c7c004..4357a8eb1f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA @MINIIS 0.25", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA @base", "from": "system", "setting_id": "B0Dmo1DvtrwBwM7U", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json index fadbdc53b2..1a4d7c6aa5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA @MINIIS 0.6", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA @base", "from": "system", "setting_id": "yGTFSZeo1sUdCpeO", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json index 18e1965b76..7c3a77c52d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA @MINIIS 0.8", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA @base", "from": "system", "setting_id": "ISdXFzAcVUj3ZIfQ", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json index 9598a6f09b..f6eecea619 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA @MINIIS", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA @base", "from": "system", "setting_id": "rhZNRY8BNI1TskG2", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json new file mode 100644 index 0000000000..dc77145268 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PVA @base", + "inherits": "fdm_filament_pva", + "from": "system", + "filament_id": "GFS99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json index 3bc8a6b7aa..bd810e4933 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA HF @MINIIS 0.6", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA HF @base", "from": "system", "setting_id": "4C7OAcG8LVPSTJsh", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json index b26ca248ad..a2557cd576 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA HF @MINIIS 0.8", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA HF @base", "from": "system", "setting_id": "xj6xYUYJ0tAnfgao", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json index cd7b4f7b7d..467f0822bd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA HF @MINIIS", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA HF @base", "from": "system", "setting_id": "9MNzR7N4A1k64jne", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json new file mode 100644 index 0000000000..8d05e93111 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic PVA HF @base", + "inherits": "fdm_filament_pva", + "from": "system", + "filament_id": "OFxLeRyT", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA.json b/resources/profiles/Prusa/filament/Prusa Generic PVA.json index 17476b1ce5..260dfb5d01 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic PVA", - "inherits": "fdm_filament_pva", + "inherits": "Prusa Generic PVA @base", "from": "system", "setting_id": "yLrgUDS7cr4AkOed", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json index 8acb55983c..6108984ad1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic TPU @MINIIS", - "inherits": "fdm_filament_tpu", + "inherits": "Prusa Generic TPU @base", "from": "system", "setting_id": "TUqkAb8i9HpFdiCy", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json index 01db48abbf..11753a6232 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic TPU @MK4", - "inherits": "fdm_filament_tpu", + "inherits": "Prusa Generic TPU @base", "from": "system", "setting_id": "9KjaEcwnQA8CsnVy", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json new file mode 100644 index 0000000000..a86c7a2b91 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic TPU @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "GFU99", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json index 271c36e183..954e880fa6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic TPU HF @MINIIS", - "inherits": "fdm_filament_tpu", + "inherits": "Prusa Generic TPU HF @base", "from": "system", "setting_id": "a9fmPCI24EJoJ5OH", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json new file mode 100644 index 0000000000..0a41e94893 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusa Generic TPU HF @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "filament_id": "OFbK5wve", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU.json b/resources/profiles/Prusa/filament/Prusa Generic TPU.json index 58324d477d..5f1b953a7c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusa Generic TPU", - "inherits": "fdm_filament_tpu", + "inherits": "Prusa Generic TPU @base", "from": "system", "setting_id": "l9s40Rloq4urv3Y0", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json index e127263ad7..e0db59fde9 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @XL 5T.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusament PETG @XL 5T", - "inherits": "fdm_filament_pet", + "inherits": "Prusament PETG @base", "from": "system", "setting_id": "USigpRWuzpdkT6ZW", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusament PETG @XL.json b/resources/profiles/Prusa/filament/Prusament PETG @XL.json index b552f9ed09..f26140a0eb 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @XL.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusament PETG @XL", - "inherits": "fdm_filament_pet", + "inherits": "Prusament PETG @base", "from": "system", "setting_id": "vPPD8EkKFy5j8pg5", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusament PETG @base.json b/resources/profiles/Prusa/filament/Prusament PETG @base.json new file mode 100644 index 0000000000..eee47346ca --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusament PETG @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFpHq9gJ", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json index d74ad3f865..efda9cf4e3 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @XL 5T.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusament PLA @XL 5T", - "inherits": "fdm_filament_pla", + "inherits": "Prusament PLA @base", "from": "system", "setting_id": "3xyT73BMaAvbb1Ej", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusament PLA @XL.json b/resources/profiles/Prusa/filament/Prusament PLA @XL.json index 60825e3109..9d02a67491 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @XL.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusament PLA @XL", - "inherits": "fdm_filament_pla", + "inherits": "Prusament PLA @base", "from": "system", "setting_id": "PlHq1KqHrreo5W8m", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusament PLA @base.json b/resources/profiles/Prusa/filament/Prusament PLA @base.json new file mode 100644 index 0000000000..707640da25 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusament PLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFkoT6jl", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json b/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json index cb1d9258c9..8bfc482af6 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @XL 5T.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusament rPLA @XL 5T", - "inherits": "fdm_filament_pla", + "inherits": "Prusament rPLA @base", "from": "system", "setting_id": "yAiHzmW4pa8deage", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @XL.json b/resources/profiles/Prusa/filament/Prusament rPLA @XL.json index ab5867979b..9ed3d9af74 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @XL.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Prusament rPLA @XL", - "inherits": "fdm_filament_pla", + "inherits": "Prusament rPLA @base", "from": "system", "setting_id": "j2BSXHFa7D3Gze7C", "instantiation": "true", diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @base.json b/resources/profiles/Prusa/filament/Prusament rPLA @base.json new file mode 100644 index 0000000000..bdacf0cc19 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @base.json @@ -0,0 +1,8 @@ +{ + "type": "filament", + "name": "Prusament rPLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFjFPhUC", + "instantiation": "false" +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_abs.json b/resources/profiles/Prusa/filament/fdm_filament_abs.json index 50945a12e0..35c4d94e0e 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_abs.json +++ b/resources/profiles/Prusa/filament/fdm_filament_abs.json @@ -3,7 +3,6 @@ "name": "fdm_filament_abs", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFB99", "instantiation": "false", "cool_plate_temp": [ "105" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pa.json b/resources/profiles/Prusa/filament/fdm_filament_pa.json index 050df1ed25..8e2337a0bd 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pa.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pa.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pa", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFN99", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pet.json b/resources/profiles/Prusa/filament/fdm_filament_pet.json index b7d8b3d957..9d20738d06 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pet.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pet.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pet", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFT02", "instantiation": "false", "cool_plate_temp": [ "60" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pla.json b/resources/profiles/Prusa/filament/fdm_filament_pla.json index a00cd395a1..573c92fede 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pla.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pla.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pla", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFL99", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pva.json b/resources/profiles/Prusa/filament/fdm_filament_pva.json index b6bf5b64a1..b25a8332cc 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pva.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pva.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pva", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFS99", "instantiation": "false", "cool_plate_temp": [ "35" diff --git a/resources/profiles/Prusa/filament/fdm_filament_tpu.json b/resources/profiles/Prusa/filament/fdm_filament_tpu.json index cca57e64fa..dff9bf8f73 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_tpu.json +++ b/resources/profiles/Prusa/filament/fdm_filament_tpu.json @@ -3,7 +3,6 @@ "name": "fdm_filament_tpu", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFU99", "instantiation": "false", "cool_plate_temp": [ "30" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 71b62c1814..6c96ddbad0 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1447,27 +1447,18 @@ "Peopoly/Peopoly Generic PLA", "Peopoly/Peopoly Lancer PLA-C", "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", - "Prusa/Prusa Generic ABS @CORE One", "Prusa/Prusa Generic ABS @CORE One 0.6", "Prusa/Prusa Generic ABS @CORE One 0.8", "Prusa/Prusa Generic ABS @CORE One HF 0.4", "Prusa/Prusa Generic ABS @CORE One HF 0.5", "Prusa/Prusa Generic ABS @CORE One HF 0.6", "Prusa/Prusa Generic ABS @CORE One HF 0.8", - "Prusa/Prusa Generic ABS @MK3.5", - "Prusa/Prusa Generic ABS @MK3.5 0.25", - "Prusa/Prusa Generic ABS @MK3.5 0.6", - "Prusa/Prusa Generic ABS @MK3.5 0.8", - "Prusa/Prusa Generic ABS @MK4S", "Prusa/Prusa Generic ABS @MK4S 0.6", "Prusa/Prusa Generic ABS @MK4S 0.8", "Prusa/Prusa Generic ABS @MK4S HF0.4", "Prusa/Prusa Generic ABS @MK4S HF0.5", "Prusa/Prusa Generic ABS @MK4S HF0.6", "Prusa/Prusa Generic ABS @MK4S HF0.8", - "Prusa/Prusa Generic ABS HF @MK3.5", - "Prusa/Prusa Generic ABS HF @MK3.5 0.6", - "Prusa/Prusa Generic ABS HF @MK3.5 0.8", "Prusa/Prusa Generic ASA @CORE One", "Prusa/Prusa Generic ASA @CORE One 0.6", "Prusa/Prusa Generic ASA @CORE One 0.8", @@ -1489,14 +1480,17 @@ "Prusa/Prusa Generic ASA HF @MK3.5", "Prusa/Prusa Generic ASA HF @MK3.5 0.6", "Prusa/Prusa Generic ASA HF @MK3.5 0.8", + "Prusa/Prusa Generic ASA HF @base", "Prusa/Prusa Generic PA @MK3.5", "Prusa/Prusa Generic PA @MK3.5 0.25", "Prusa/Prusa Generic PA @MK3.5 0.6", "Prusa/Prusa Generic PA @MK3.5 0.8", + "Prusa/Prusa Generic PA @base", "Prusa/Prusa Generic PA-CF @MK3.5", "Prusa/Prusa Generic PA-CF @MK3.5 0.25", "Prusa/Prusa Generic PA-CF @MK3.5 0.6", "Prusa/Prusa Generic PA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PA-CF @base", "Prusa/Prusa Generic PC @MK3.5", "Prusa/Prusa Generic PC @MK3.5 0.25", "Prusa/Prusa Generic PC @MK3.5 0.6", @@ -1504,6 +1498,7 @@ "Prusa/Prusa Generic PC HF @MK3.5", "Prusa/Prusa Generic PC HF @MK3.5 0.6", "Prusa/Prusa Generic PC HF @MK3.5 0.8", + "Prusa/Prusa Generic PC HF @base", "Prusa/Prusa Generic PETG @CORE One", "Prusa/Prusa Generic PETG @CORE One 0.6", "Prusa/Prusa Generic PETG @CORE One 0.8", @@ -1522,9 +1517,11 @@ "Prusa/Prusa Generic PETG @MK4S HF0.5", "Prusa/Prusa Generic PETG @MK4S HF0.6", "Prusa/Prusa Generic PETG @MK4S HF0.8", + "Prusa/Prusa Generic PETG @base", "Prusa/Prusa Generic PETG HF @MK3.5", "Prusa/Prusa Generic PETG HF @MK3.5 0.6", "Prusa/Prusa Generic PETG HF @MK3.5 0.8", + "Prusa/Prusa Generic PETG HF @base", "Prusa/Prusa Generic PLA @CORE One", "Prusa/Prusa Generic PLA @CORE One 0.6", "Prusa/Prusa Generic PLA @CORE One 0.8", @@ -1543,9 +1540,11 @@ "Prusa/Prusa Generic PLA @MK4S HF0.5", "Prusa/Prusa Generic PLA @MK4S HF0.6", "Prusa/Prusa Generic PLA @MK4S HF0.8", + "Prusa/Prusa Generic PLA @base", "Prusa/Prusa Generic PLA HF @MK3.5", "Prusa/Prusa Generic PLA HF @MK3.5 0.6", "Prusa/Prusa Generic PLA HF @MK3.5 0.8", + "Prusa/Prusa Generic PLA HF @base", "Prusa/Prusa Generic PLA Silk @CORE One", "Prusa/Prusa Generic PLA Silk @CORE One 0.6", "Prusa/Prusa Generic PLA Silk @CORE One 0.8", @@ -1556,21 +1555,12 @@ "Prusa/Prusa Generic PLA-CF @MK3.5 0.25", "Prusa/Prusa Generic PLA-CF @MK3.5 0.6", "Prusa/Prusa Generic PLA-CF @MK3.5 0.8", - "Prusa/Prusa Generic PVA @MK3.5", - "Prusa/Prusa Generic PVA @MK3.5 0.25", - "Prusa/Prusa Generic PVA @MK3.5 0.6", - "Prusa/Prusa Generic PVA @MK3.5 0.8", - "Prusa/Prusa Generic PVA HF @MK3.5", - "Prusa/Prusa Generic PVA HF @MK3.5 0.6", - "Prusa/Prusa Generic PVA HF @MK3.5 0.8", + "Prusa/Prusa Generic PLA-CF @base", "Prusa/Prusa Generic TPU @CORE One", "Prusa/Prusa Generic TPU @CORE One 0.6", "Prusa/Prusa Generic TPU @CORE One 0.8", - "Prusa/Prusa Generic TPU @MK3.5", - "Prusa/Prusa Generic TPU @MK4S", "Prusa/Prusa Generic TPU @MK4S 0.6", "Prusa/Prusa Generic TPU @MK4S 0.8", - "Prusa/Prusa Generic TPU HF @MK3.5", "Prusa/Prusament ASA @CORE One", "Prusa/Prusament ASA @CORE One 0.6", "Prusa/Prusament ASA @CORE One 0.8", @@ -1598,6 +1588,7 @@ "Prusa/Prusament PETG @CORE One HF 0.5", "Prusa/Prusament PETG @CORE One HF 0.6", "Prusa/Prusament PETG @CORE One HF 0.8", + "Prusa/Prusament PETG @base", "Prusa/Prusament PLA @CORE One", "Prusa/Prusament PLA @CORE One 0.6", "Prusa/Prusament PLA @CORE One 0.8", @@ -1605,12 +1596,14 @@ "Prusa/Prusament PLA @CORE One HF 0.5", "Prusa/Prusament PLA @CORE One HF 0.6", "Prusa/Prusament PLA @CORE One HF 0.8", + "Prusa/Prusament PLA @base", "Prusa/Prusament PVB @CORE One", "Prusa/Prusament PVB @CORE One 0.6", "Prusa/Prusament PVB @CORE One 0.8", "Prusa/Prusament rPLA @CORE One", "Prusa/Prusament rPLA @CORE One 0.6", "Prusa/Prusament rPLA @CORE One 0.8", + "Prusa/Prusament rPLA @base", "Qidi/Bambu PETG", "Qidi/Bambu PLA", "Qidi/HATCHBOX PETG @Qidi", @@ -3182,7 +3175,6 @@ "FLSun/FLSun T1 ASA", "OrcaArena/OrcaArena Generic ASA", "Prusa/Prusa Generic ASA", - "Prusa/Prusa Generic ASA HF", "Prusa/Prusament ASA", "Ratrig/RatRig BigNozzle ASA", "Ratrig/RatRig Generic ASA", @@ -3244,7 +3236,6 @@ "Lulzbot/Lulzbot 2.85mm ABS", "OrcaArena/OrcaArena Generic ABS", "Prusa/Prusa Generic ABS", - "Prusa/Prusa Generic ABS HF", "Qidi/Qidi Generic ABS", "Ratrig/RatRig BigNozzle ABS", "Ratrig/RatRig Generic ABS", @@ -3314,7 +3305,6 @@ "InfiMech/Other PC", "OrcaArena/OrcaArena Generic PC", "Prusa/Prusa Generic PC", - "Prusa/Prusa Generic PC HF", "Prusa/Prusament PC Blend", "Qidi/Qidi Generic PC", "Ratrig/RatRig BigNozzle PCTG", @@ -3802,10 +3792,6 @@ "Peopoly/Peopoly Lancer PLA-C", "Phrozen/Phrozen PLA", "Prusa/Prusa Generic PLA", - "Prusa/Prusa Generic PLA HF", - "Prusa/Prusa Generic PLA-CF", - "Prusa/Prusament PLA", - "Prusa/Prusament rPLA", "Qidi/Qidi Generic PLA", "Ratrig/RatRig BigNozzle PLA", "Ratrig/RatRig BigNozzle TPU", @@ -3965,7 +3951,6 @@ "FLSun/FLSun Generic PA", "OrcaArena/OrcaArena Generic PA", "Prusa/Prusa Generic PA", - "Prusa/Prusa Generic PA-CF", "Qidi/Qidi Generic PA", "Ratrig/RatRig Generic PA", "SecKit/SecKit Generic PA", @@ -4273,7 +4258,6 @@ "FLSun/FLSun Generic PVA", "OrcaArena/OrcaArena Generic PVA", "Prusa/Prusa Generic PVA", - "Prusa/Prusa Generic PVA HF", "Qidi/Qidi Generic PVA", "Ratrig/RatRig Generic PVA", "SecKit/SecKit Generic PVA", @@ -4400,9 +4384,7 @@ ], "GFT02": [ "BBL/Bambu PPS-CF", - "Prusa/Prusa Generic PETG", - "Prusa/Prusa Generic PETG HF", - "Prusa/Prusament PETG" + "Prusa/Prusa Generic PETG" ], "GFT97": [ "BBL/Generic PPS", @@ -4475,7 +4457,6 @@ "OrcaArena/OrcaArena Generic TPU", "Prusa/Prusa Generic FLEX", "Prusa/Prusa Generic TPU", - "Prusa/Prusa Generic TPU HF", "Qidi/Qidi Generic TPU", "Ratrig/RatRig Generic TPU", "SecKit/SecKit Generic TPU", @@ -4834,6 +4815,9 @@ "OFCJaXZS": [ "Flashforge/Flashforge PPS" ], + "OFCgpxn2": [ + "Prusa/Prusa Generic ABS HF" + ], "OFD5e0sH": [ "OrcaFilamentLibrary/Elegoo Rapid PLA+" ], @@ -4957,6 +4941,9 @@ "OFPwi9X0": [ "Qidi/HATCHBOX ABS" ], + "OFQ9dI8j": [ + "Prusa/Prusa Generic PC HF" + ], "OFQCAYAt": [ "Flashforge/Flashforge PPA-CF" ], @@ -5035,6 +5022,9 @@ "OFXcfTEb": [ "Qidi/Tinmorry PETG-ECO" ], + "OFXfgh61": [ + "Prusa/Prusa Generic PA-CF" + ], "OFXkwkn6": [ "Qidi/QIDI PA-Ultra" ], @@ -5077,6 +5067,9 @@ "OFaKIoH2": [ "Elegoo/Elegoo PLA Sparkle" ], + "OFbK5wve": [ + "Prusa/Prusa Generic TPU HF" + ], "OFbS9rjH": [ "Qidi/QIDI PETG Rapido" ], @@ -5143,12 +5136,18 @@ "OFiJYDPC": [ "Qidi/HATCHBOX PLA" ], + "OFicxmSa": [ + "Prusa/Prusa Generic PLA HF" + ], "OFidJLn8": [ "Qidi/PolyLite ABS" ], "OFiyGNbI": [ "Elegoo/Elegoo PETG-CF" ], + "OFjFPhUC": [ + "Prusa/Prusament rPLA" + ], "OFjepy6j": [ "Flashforge/FusRock Generic S-PAHT" ], @@ -5164,12 +5163,18 @@ "OFkaDtKx": [ "Flashforge/Flashforge PA66-CF" ], + "OFkeeluv": [ + "Prusa/Prusa Generic ASA HF" + ], "OFkfK62J": [ "Elegoo/Elegoo PLA Silk" ], "OFklg4aM": [ "Elegoo/Elegoo PLA PRO" ], + "OFkoT6jl": [ + "Prusa/Prusament PLA" + ], "OFlNKZLP": [ "Flashforge/Flashforge PLA Metal" ], @@ -5218,6 +5223,12 @@ "OFp8lkYD": [ "Flashforge/Flashforge PPA-GF" ], + "OFpHq9gJ": [ + "Prusa/Prusament PETG" + ], + "OFphFSUJ": [ + "Prusa/Prusa Generic PETG HF" + ], "OFpwg2Qh": [ "OrcaFilamentLibrary/Elegoo ASA-CF" ], @@ -5287,6 +5298,9 @@ "OFv2NHLC": [ "Qidi/QIDI ABS-GF25" ], + "OFv8SRZh": [ + "Prusa/Prusa Generic PLA-CF" + ], "OFvN3117": [ "Qidi/QIDI PLA Matte Basic" ], @@ -5308,6 +5322,9 @@ "OFwyqcGn": [ "Elegoo/Elegoo PLA Matte" ], + "OFxLeRyT": [ + "Prusa/Prusa Generic PVA HF" + ], "OFxjFYxE": [ "Elegoo/Elegoo PETG HF" ], From 23b0aabb35cc48dfd13b644cd7355eef7550b308 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:13:24 +0800 Subject: [PATCH 08/52] Cubicon, Dremel, Anycubic, Artillery, InfiMech, Creality: family filament_ids Phase 2 long-tail migrations (56 collision groups across six vendors), zero effective-config change except where stated: Cubicon (17): 'Cubicon PC @base' verbatim-copied PA-CF's P510cfd0 at introduction (90a6c53ad5; PC was the config-light stub) - the PC family gets a fresh mint via its root. The other groups were all one shape: nine @base presets instantiated on exactly the two printers their dedicated variants cover with byte-identical passthrough configs, so no compatible_printers trim exists that CI would accept (instantiated presets must claim a printer). Fix: flip the nine @bases to instantiation:false and drop their setting_ids (bases carry none by convention). Every printer keeps an identical-config selectable preset per family - verified programmatically before flipping; no machine default_materials references an @base name. Dremel (3): 'Dremel Generic PLA' is deliberately selectable alongside its per-printer variants (#6837 re-exposed it), and the variants carry real overrides - a genuine AMS ambiguity with no config-neutral trim. The three variants share the fresh family mint OFUYjPc4 as own keys; the root keeps GFL99. A deliberate same-family id split (P8 shape): Dremel has no device ecosystem consuming filament_id, and every alternative is a user-visible regression of #6837. default_materials resolve unchanged. Anycubic (14): copy-paste/generic-riding across three id eras; 2022-era Anycubic Generic ABS/PETG/PLA/TPU keep the catalog ids, 13 families re-minted atomically (72 edits incl. 48 forced same-family re-ids), retiring the invented GFABS/GFL92/GFL93/GFPLA* space-containing ids. Artillery (8): GFL99 umbrella + P-hex copy-pastes; Artillery Generic PLA keeps GFL99, Artillery PLA keeps Pfcf9c4c, 17 families minted (52 edits), P284941e retired. InfiMech (14): pure verbatim Bambu-generic copy-paste; the six InfiMech Generic owners keep their ids, 15 impostor families minted (34 edits). Creality (8): HF generics copy-pasted GFL99 + id-less sub-brand lines riding keeper families; owners keep their git-verified ids, 8 families minted (17 edits, own-key layout for members inheriting heterogeneous per-series parents). Verified per batch: config-equivalence gate zero unexpected diffs (the nine Cubicon @base instantiation flips are the only preset-set changes, reviewed above); orca_extra_profile_check.py exit 0; assign_filament_ids.py --check exit 0; validator -l 2 exit 0; extended -f exit 0 for all six vendors (-v Cubicon/Dremel/Anycubic/Artillery/InfiMech/Creality); 14 fully-vanished ids appended to the retirement ledger. --- ... ABS @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ... ABS @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ... ABS @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...bic ABS @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...BS @Anycubic Kobra S1 Max 0.25 nozzle.json | 2 +- ...ABS @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ABS @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ABS @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...ubic ABS @Anycubic Kobra X 0.4 nozzle.json | 2 +- ... 95A @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...bic PETG @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...PETG @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...PETG @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ...PETG @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...ic PETG @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...TG @Anycubic Kobra S1 Max 0.25 nozzle.json | 2 +- ...ETG @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ETG @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ETG @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...bic PETG @Anycubic Kobra X 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Max 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json | 2 +- ...PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.2 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.6 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.8 nozzle.json | 2 +- ... PLA @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ... PLA @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...ic PLA @Anycubic Kobra Neo 0.4 nozzle.json | 2 +- ...bic PLA @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...LA @Anycubic Kobra S1 Max 0.25 nozzle.json | 2 +- ...PLA @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...PLA @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...PLA @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...gh Speed @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...peed @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...h Speed @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...eed @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...eed @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...eed @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...gh Speed @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...nous @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...LA Matte @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...atte @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...tte @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...tte @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...tte @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...LA Matte @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...Silk @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...LA Silk @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...ilk @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ilk @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ilk @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...PLA Silk @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...bic PLA+ @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...ic PLA+ @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...LA+ @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...LA+ @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...LA+ @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...bic PLA+ @Anycubic Kobra X 0.4 nozzle.json | 2 +- ... TPU @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ... TPU @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ... TPU @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...bic TPU @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...eric ABS @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...asic @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...eric TPU @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...lery ABS @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery ABS @Artillery M1 Pro 0.4 nozzle.json | 1 + ...lery ABS @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery ABS @Artillery M1 Pro 0.8 nozzle.json | 2 +- .../Artillery/filament/Artillery ABS.json | 1 + ...lery ASA @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery ASA @Artillery M1 Pro 0.4 nozzle.json | 1 + ...lery ASA @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery ASA @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...llery PA @Artillery M1 Pro 0.4 nozzle.json | 1 + ...ry PA-CF @Artillery M1 Pro 0.4 nozzle.json | 1 + ...llery PC @Artillery M1 Pro 0.4 nozzle.json | 1 + ...lery PET @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery PET @Artillery M1 Pro 0.4 nozzle.json | 1 + ...lery PET @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery PET @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.4 nozzle.json | 1 + ...ery PETG @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.4 nozzle.json | 1 + ...TG Basic @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.8 nozzle.json | 2 +- ... PETG-CF @Artillery M1 Pro 0.4 nozzle.json | 1 + .../Artillery/filament/Artillery PETG.json | 1 + ...LA Basic @Artillery M1 Pro 0.2 nozzle.json | 1 + ...LA Basic @Artillery M1 Pro 0.4 nozzle.json | 1 + ...LA Basic @Artillery M1 Pro 0.6 nozzle.json | 1 + ...LA Basic @Artillery M1 Pro 0.8 nozzle.json | 1 + ...A Basic+ @Artillery M1 Pro 0.4 nozzle.json | 1 + .../filament/Artillery PLA Basic.json | 1 + ...LA Matte @Artillery M1 Pro 0.2 nozzle.json | 1 + ...LA Matte @Artillery M1 Pro 0.4 nozzle.json | 1 + ...LA Matte @Artillery M1 Pro 0.6 nozzle.json | 1 + ...LA Matte @Artillery M1 Pro 0.8 nozzle.json | 1 + .../filament/Artillery PLA Matte.json | 1 + ...PLA Silk @Artillery M1 Pro 0.2 nozzle.json | 1 + ...PLA Silk @Artillery M1 Pro 0.4 nozzle.json | 1 + ...PLA Silk @Artillery M1 Pro 0.6 nozzle.json | 1 + ...PLA Silk @Artillery M1 Pro 0.8 nozzle.json | 1 + .../filament/Artillery PLA Silk.json | 1 + .../filament/Artillery PLA Tough.json | 1 + ...y PLA-CF @Artillery M1 Pro 0.4 nozzle.json | 1 + ...lery PVA @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery PVA @Artillery M1 Pro 0.4 nozzle.json | 1 + ...lery PVA @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery PVA @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...lery TPU @Artillery M1 Pro 0.4 nozzle.json | 1 + ...lery TPU @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery TPU @Artillery M1 Pro 0.8 nozzle.json | 2 +- .../Artillery/filament/Artillery TPU.json | 1 + .../Creality Generic ASA-CF @Hi-all.json | 1 + .../Creality Generic PETG-CF @Hi-all.json | 1 + ...Generic PLA High Speed @Ender-3V3-all.json | 1 + ...eality Generic PLA High Speed @Hi-all.json | 1 + ...eality Generic PLA High Speed @K1-all.json | 1 + ...eality Generic PLA High Speed @K2-all.json | 1 + ...lity Generic PLA Matte @Ender-3V3-all.json | 1 + .../Creality Generic PLA Matte @Hi-all.json | 1 + .../Creality Generic PLA Matte @K1-all.json | 1 + .../Creality Generic PLA Matte @K2-all.json | 1 + ...ality Generic PLA Silk @Ender-3V3-all.json | 1 + .../Creality Generic PLA Silk @Hi-all.json | 1 + .../Creality Generic PLA Silk @K1-all.json | 1 + .../Creality Generic PLA Silk @K2-all.json | 1 + .../Creality Generic PLA Wood @Hi-all.json | 1 + .../filament/Creality HF Generic PLA.json | 2 +- .../Creality HF Generic Speed PLA.json | 2 +- .../Cubicon/filament/Cubicon ABS @base.json | 3 +- .../filament/Cubicon ABS-A100 @base.json | 3 +- .../Cubicon/filament/Cubicon ABSk @base.json | 3 +- .../Cubicon/filament/Cubicon PA-CF @base.json | 3 +- .../Cubicon/filament/Cubicon PC @base.json | 5 +- .../Cubicon/filament/Cubicon PETG @base.json | 3 +- .../Cubicon/filament/Cubicon PLA @base.json | 3 +- .../Cubicon/filament/Cubicon PLA+ @base.json | 3 +- .../filament/Cubicon PLAi21 @base.json | 3 +- .../Dremel Generic PLA @3D20 all.json | 1 + .../Dremel Generic PLA @3D40 all.json | 1 + .../Dremel Generic PLA @3D45 all.json | 1 + .../filament/EX+APS/InfiMech ABS @EX+APS.json | 2 +- .../EX+APS/InfiMech PA-CF @EX+APS.json | 2 +- .../filament/EX+APS/InfiMech PC @EX+APS.json | 2 +- .../EX+APS/InfiMech PETG @EX+APS.json | 2 +- .../EX+APS/InfiMech PLA Basic @EX+APS.json | 2 +- .../EX+APS/InfiMech PLA Hyper @EX+APS.json | 2 +- .../filament/EX/InfiMech ABS @EX.json | 2 +- .../filament/EX/InfiMech PA-CF @EX.json | 2 +- .../InfiMech/filament/EX/InfiMech PC @EX.json | 2 +- .../filament/EX/InfiMech PETG @EX.json | 2 +- .../filament/EX/InfiMech PLA Basic @EX.json | 2 +- .../filament/EX/InfiMech PLA Hyper @EX.json | 2 +- .../filament/HSN/InfiMech ABS @HSN.json | 2 +- .../filament/HSN/InfiMech PA-CF @HSN.json | 2 +- .../filament/HSN/InfiMech PC @HSN.json | 2 +- .../filament/HSN/InfiMech PETG @HSN.json | 2 +- .../filament/HSN/InfiMech PLA @HSN.json | 2 +- .../filament/HSN/InfiMech PLA Hyper @HSN.json | 2 +- .../filament/HSN/InfiMech TPU @HSN.json | 2 +- .../InfiMech/filament/HSN/Other ABS @HSN.json | 2 +- .../filament/HSN/Other PA-CF @HSN.json | 2 +- .../InfiMech/filament/HSN/Other PC @HSN.json | 2 +- .../filament/HSN/Other PETG @HSN.json | 2 +- .../InfiMech/filament/HSN/Other PLA @HSN.json | 2 +- .../filament/HSN/Other PLA Hyper @HSN.json | 2 +- .../InfiMech/filament/HSN/Other TPU @HSN.json | 2 +- .../InfiMech/filament/InfiMech PLA Hyper.json | 2 +- .../profiles/InfiMech/filament/Other ABS.json | 2 +- .../InfiMech/filament/Other PA-CF.json | 2 +- .../profiles/InfiMech/filament/Other PC.json | 2 +- .../InfiMech/filament/Other PETG.json | 2 +- .../InfiMech/filament/Other PLA Hyper.json | 2 +- .../profiles/InfiMech/filament/Other PLA.json | 2 +- .../profiles/InfiMech/filament/Other TPU.json | 2 +- scripts/filament_id_snapshot.json | 390 +++++++++++++----- scripts/retired_filament_ids.json | 46 ++- 189 files changed, 509 insertions(+), 262 deletions(-) diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json index f560328d28..35ea99a5fa 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "RDI26qeSRSTe0PDg", - "filament_id": "GFB99", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json index 4e5b8117bc..6cbc0b1dca 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "Moc1cylP6mmSQjlb", - "filament_id": "GFB99", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json index 5b5dbd88a8..bc96d4e812 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "2xgfnUKyOUQwYWPa", - "filament_id": "GFB99", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json index 762dee8f05..20d5e6463c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "NOiAgxA0BbvLhR1v", - "filament_id": "GFB99", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json index a37305a1bd..eb92f6134e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "MDWaiSjl89E6Edsn", - "filament_id": "GFABS", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json index 5638f4c226..2176e2e94b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "wZjVYc7dBDSKRusJ", - "filament_id": "GFABS", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json index 37cd31a19e..f6cbd13546 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "AbB6JtoPRsNgmxyy", - "filament_id": "GFABS", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json index 8a9663981c..85f03c921e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "exX565xnrLPkYkvu", - "filament_id": "GFABS", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json index 5443dacb34..0d16ce5f5d 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "KeEk3yQZrKmJY9Q0", - "filament_id": "GFABS", + "filament_id": "OFf2b9wu", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json index 035648964d..b7f6e07d05 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "gmni9H2Du5nxBqQu", - "filament_id": "GFU99", + "filament_id": "OFGb4hPY", "instantiation": "true", "filament_settings_id": [ "Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json index cc24576ed0..64ec79a2f4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PETG", "from": "system", "setting_id": "qe2wYLf7CEMjmfxj", - "filament_id": "GFG99", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json index bd02903dcc..68e4c4279c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uNktFymJ3RbGa7k0", - "filament_id": "GFG99", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json index e7f271b6a4..89ae50f686 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "EaW663aw4torYXG8", - "filament_id": "GFG99", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json index a0e8481d7f..11fc401b24 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "lgVEMmBHMen0sWsI", - "filament_id": "GFG99", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json index d513cdd1d4..52f8ed3f9c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uLRMTzyJIara4Hr2", - "filament_id": "GFG99", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json index 9c59bd3643..6a2292c913 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "FAyFkKpV5w6G5dU2", - "filament_id": "GFPETG", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json index d97f7fc564..e7cd08bc7e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "duduwoswLHk9I9sY", - "filament_id": "GFPETG", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json index bd1a1768c0..e8bd6e56ce 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "b3GU7ytZPEYNNyne", - "filament_id": "GFPETG", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json index d8913fe29e..a48eb618db 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "SrHKJh6prBzMz4Se", - "filament_id": "GFPETG", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json index a14c08e5c4..5b5b0bbebe 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "HyTi93UGno6uAJEO", - "filament_id": "GFPETG", + "filament_id": "OFdSGkUG", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json index 7e8a8b189b..70cdae2da4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "XIq1GeZdHqOl9Gtr", - "filament_id": "GFL92", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json index 2e2c0d094a..c078bb2d87 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "EaVdXQHAyocYUCez", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json index e96d1b0884..e26d8674f6 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "UpC1Qut0kjYRD9po", - "filament_id": "GFL92", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json index c60020dfda..04d4dc5e79 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "ELCOJflyY3DfpPAH", - "filament_id": "GFL92", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json index 4e058c6f74..ba87ad3145 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "enkHPcq0yYHsRk7g", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json index 42d757d7e9..95ddd20b35 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "qw4uL96miCLTNE7b", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json index f01ded111e..e61cdcd625 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "KrlWgkC2kVdSRNUx", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json index 0a12e310b4..c81db823c4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "gK0NhTnxz1VBNHbu", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json index c94f05a52f..7159efba5c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "4nCPU0WS74OXowyr", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json index 3fc828b305..6473007901 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "0Ae57Dt0KXnpQUJu", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json index 7f862c1b1c..edd899396c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "otxG4N1WrXHUw8Z9", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json index 03627128bc..236dbc4cef 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "GblA3LvgCL63V7Qx", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json index 717e533526..4c1cba8e20 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "zYYM5Fznkiz0UgHN", - "filament_id": "GFL99", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json index 13a4eccfc2..d1a975fb37 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Z0T8Mul8Ta7zqRjS", - "filament_id": "GFPLA", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json index f4a7632c12..5138470e26 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "61KPHMw1fRcuaGHk", - "filament_id": "GFPLA", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json index 82691cd80f..0c923b2fe0 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "RQJLrGtzvbP2PksP", - "filament_id": "GFPLA", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json index d00931d974..79439814b4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "50Ailboxk7bEclVp", - "filament_id": "GFPLA", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json index 795805eb82..286464d8c3 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "1hyHPSJZgUpLcW7u", - "filament_id": "GFPLA", + "filament_id": "OFgK2Xvv", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json index d36e50bf95..cfb1f50c1d 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "Sio4qE22N2krNjx1", - "filament_id": "GFL96", + "filament_id": "OFgSK1hL", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json index c5e434f90f..6e5c967420 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "4FQaTeouNl9pL4Vl", - "filament_id": "GFL99", + "filament_id": "OFgSK1hL", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json index d996d2d84b..0e975dc8d6 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "AEKT5WgqOTAVYijs", - "filament_id": "GFL99", + "filament_id": "OFgSK1hL", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json index ad8be5c9f1..0e949bd4a6 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "xTuh6dk8MdeAovdB", - "filament_id": "GFPLA High Speed", + "filament_id": "OFgSK1hL", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json index 4f2a9b55e4..219a05057c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "BpBYwZqt4ik1XIFp", - "filament_id": "GFPLA High Speed", + "filament_id": "OFgSK1hL", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json index 809c243223..fe6757653c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "2Rk0UA3rtW53ECqo", - "filament_id": "GFPLA High Speed", + "filament_id": "OFgSK1hL", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json index 12ba8b6984..b2bc996730 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "hQ90rvCLS2rVEPVJ", - "filament_id": "GFPLA High Speed", + "filament_id": "OFgSK1hL", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json index 18450cf484..046b4c87a3 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "wi26Yq5bX8oGt4CA", - "filament_id": "GFL99", + "filament_id": "OFEdyZqS", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json index 88dc0be839..02945fa977 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "kVOaVF3YyfGrXTdW", - "filament_id": "GFL95", + "filament_id": "OFvYfHPB", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json index 74e41f42aa..b30450f8ac 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qSpZJ4cRcg3xb2b2", - "filament_id": "GFL99", + "filament_id": "OFvYfHPB", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json index 64a690ea12..a70d0629b5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "WvmwXnXSDPPtXS8S", - "filament_id": "GFPLA Matte", + "filament_id": "OFvYfHPB", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json index bf2a4dfa91..41f1c5f6a8 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "jFKsrMeqeUAcMAyf", - "filament_id": "GFPLA Matte", + "filament_id": "OFvYfHPB", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json index 6b0be29514..2f2719cb19 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ueznw2fLdjN2EbIC", - "filament_id": "GFPLA Matte", + "filament_id": "OFvYfHPB", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json index dc79a8b11f..4f7d332aaa 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "JxYmWTeCtw0VvUcC", - "filament_id": "GFPLA Matte", + "filament_id": "OFvYfHPB", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json index 51dbc781fa..60f18577e5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Fszb00FtQHFOcDmz", - "filament_id": "GFL99", + "filament_id": "OFjdTQd6", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json index 24db6eab18..18a8f258ec 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "wnt68LydXcNxhGhN", - "filament_id": "GFL99", + "filament_id": "OFjdTQd6", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json index 269f5acf24..075d1e2afd 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "AzEerDakdHs9Rj3I", - "filament_id": "GFPLA Silk", + "filament_id": "OFjdTQd6", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json index aeaed4784e..70e61016a5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "pUB5V3n7yAbPxFQC", - "filament_id": "GFPLA Silk", + "filament_id": "OFjdTQd6", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json index 91edc58d3c..11ad26dcbf 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "N96XNT6EoNVVFYz0", - "filament_id": "GFPLA Silk", + "filament_id": "OFjdTQd6", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json index 426ea3744d..e80cdc8383 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Yc1P4D9Z42Abjfut", - "filament_id": "GFPLA Silk", + "filament_id": "OFjdTQd6", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json index 836edf10c5..56c46b1ca2 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "1va1bLu3J0b5GQt3", - "filament_id": "GFL93", + "filament_id": "OFgrGfPy", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json index 625e0ddad2..33aa19252c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "XN8zwImhwbZCkl6m", - "filament_id": "GFL99", + "filament_id": "OFgrGfPy", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json index a7b7d4f595..85f0e8a993 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Vs1ZyZJWHFue8Vc8", - "filament_id": "GFL99", + "filament_id": "OFgrGfPy", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json index e437edc973..061215d818 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "CjXfeHJpdOaSEzN0", - "filament_id": "GFPLA+", + "filament_id": "OFgrGfPy", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json index 7bd1cded91..7f8105621a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ol5UhwlAQy7yrXYU", - "filament_id": "GFPLA+", + "filament_id": "OFgrGfPy", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json index 087e7e479c..2c8e3db0b7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "u9nOmt30hBeZoN2w", - "filament_id": "GFPLA+", + "filament_id": "OFgrGfPy", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json index 9bddef96ad..dd1ac32507 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "lehlBFE2WVyi24s0", - "filament_id": "GFPLA+", + "filament_id": "OFgrGfPy", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json index dbf66104c0..738fcbdc89 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "CdtZIoH8bvFOFU6l", - "filament_id": "GFU99", + "filament_id": "OFHL32M0", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json index 13f0c712e3..a30e14503f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "F3l2tNcFwp9qG7W6", - "filament_id": "GFU99", + "filament_id": "OFHL32M0", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json index 4310aba363..55f7df2a50 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "WkMd8rjotz7XNLDM", - "filament_id": "GFU99", + "filament_id": "OFHL32M0", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json index 85252f7057..645f098e04 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "ias4IbNNwygyeow9", - "filament_id": "GFU99", + "filament_id": "OFHL32M0", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json index 71e7beac0e..7904e7cc18 100644 --- a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic ABS", "from": "system", "setting_id": "W3GiC5YLzxbbjXLY", - "filament_id": "GFB99", + "filament_id": "OFOp3Oef", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json index cb51a5a339..f533e62694 100644 --- a/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "tUSAvzLu6pVk37kn", - "filament_id": "GFG99", + "filament_id": "OFaKZ6JI", "instantiation": "true", "filament_settings_id": [ "Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json index 42739229b1..3edff90e15 100644 --- a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic TPU", "from": "system", "setting_id": "kHB2rrxkyz4Clu3N", - "filament_id": "GFU99", + "filament_id": "OFsCOJv7", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json index b468e95d51..4b091e502a 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ABS @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "m023Z8IkkHMHxuag", - "filament_id": "P39db358", + "filament_id": "OFw1S8lL", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json index f21c7a5a31..f4a5d3f332 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "QGbNWGw8rqvq025W", + "filament_id": "OFw1S8lL", "instantiation": "true", "chamber_temperature": [ "50" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json index 8516077d0a..1edbbfc7f5 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ABS @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "PxGFsoMcfFrTDqzL", - "filament_id": "P39db358", + "filament_id": "OFw1S8lL", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json index 1bd222ade6..73a7118801 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ABS @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "o4JZKQmCdnO0hCXZ", - "filament_id": "P39db358", + "filament_id": "OFw1S8lL", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ABS.json b/resources/profiles/Artillery/filament/Artillery ABS.json index 111c2c39a1..b7d3189738 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS.json +++ b/resources/profiles/Artillery/filament/Artillery ABS.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "fsbfMiamVemzRxkG", + "filament_id": "OFw1S8lL", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json index 9894337b5c..ebfb82fdf0 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ASA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "AE7wKVIZXHXSXzL5", - "filament_id": "P87436f6", + "filament_id": "OFtmT4Nd", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json index eb4a720cc3..ab290c02b6 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "eSwM3ZfSBWqR8Gcf", + "filament_id": "OFtmT4Nd", "instantiation": "true", "chamber_temperature": [ "55" diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json index 422b050df8..7a0228d38e 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ASA @Artillery M1 Pro 0.6 nozzle", "from": "User", "setting_id": "znMfTFfxvJC7a732", - "filament_id": "P87436f6", + "filament_id": "OFtmT4Nd", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json index 16a9ff7c3d..a90093dbc5 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ASA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "y2DU36j0slaHzg04", - "filament_id": "P87436f6", + "filament_id": "OFtmT4Nd", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json index 756e67a5e2..662524238b 100644 --- a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "lOsH1teHe8Pgzx2g", + "filament_id": "OFp90N8a", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json index ec9009a5e1..3c2efc54ed 100644 --- a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "b4BKJMUxArvLuEOh", + "filament_id": "OFnY9ovF", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json index 4fa54353f0..d734ab4c40 100644 --- a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "WawbnfhWn4MT6Hz7", + "filament_id": "OFNRgSch", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json index 6fd06c0d66..e4f3c78276 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PET @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "a5jwQ6nyffW1Vqv1", - "filament_id": "P11851ba", + "filament_id": "OFw0qp7w", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json index a82b3b7948..9af913f87a 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "QeiSAakfMW7HyhJ7", + "filament_id": "OFw0qp7w", "instantiation": "true", "chamber_temperature": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json index 26e71cefc8..c9294a933d 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PET @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "VGu7C3uk8d6ibIg4", - "filament_id": "P11851ba", + "filament_id": "OFw0qp7w", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json index b5461ec03c..b204a0b6a6 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PET @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "Oj11BhU0QajmDrh3", - "filament_id": "P11851ba", + "filament_id": "OFw0qp7w", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json index 5ed45d7e7d..d29a639777 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "kAlZ7nCYo53UVVx3", - "filament_id": "P284941e", + "filament_id": "OFEYKrjb", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json index f6bbdd3cef..4620665cc8 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "g7UIfJTOPzMQzfrH", + "filament_id": "OFEYKrjb", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json index 3fcc8e175b..4ffe6eaa01 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "uuPf0MfNTZ2lihtG", - "filament_id": "P284941e", + "filament_id": "OFEYKrjb", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json index 4842427a49..2ae4e8e114 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG @Artillery M1 Pro 0.8 nozzle", "from": "User", "setting_id": "dQBp2T4ap90uAOYs", - "filament_id": "P284941e", + "filament_id": "OFEYKrjb", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json index 03fc583bfa..b90df9567f 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "GrdWgUGdXt23jnBu", - "filament_id": "P284941e", + "filament_id": "OFt5bvKK", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json index b8a3c33acd..5d14168c7b 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "RTQvSwJBWnut5aBo", + "filament_id": "OFt5bvKK", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json index 3ab0575058..7c7046e7b9 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "Wkt1IClO4nwH3Xa7", - "filament_id": "P284941e", + "filament_id": "OFt5bvKK", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json index 2b83852a34..5152d65dd6 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle", "from": "User", "setting_id": "Zlvodz3cris0hmof", - "filament_id": "P284941e", + "filament_id": "OFt5bvKK", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json index 22d124da46..66416e969a 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "JvmeW29kHCp7HiA6", + "filament_id": "OF9vnvM8", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Artillery/filament/Artillery PETG.json b/resources/profiles/Artillery/filament/Artillery PETG.json index ecea0ae80b..a4922a1f32 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG.json +++ b/resources/profiles/Artillery/filament/Artillery PETG.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "1MyhYGMxJCmZnJRP", + "filament_id": "OFEYKrjb", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json index cee58991c8..4efb9507a5 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "N3iYnDshA5ruihVE", + "filament_id": "OF57IbZT", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json index 56498727fa..08e2927b0e 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "zBUD1JyuZF9MOncA", + "filament_id": "OF57IbZT", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json index 884e7d428e..4c009a344b 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "NKkZjEtDjxOMLjoo", + "filament_id": "OF57IbZT", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json index cffdcde5ed..7c08a8ffba 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "c9BAMzt2w30nB2rC", + "filament_id": "OF57IbZT", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json index 18e7f77ad4..b636c0f7d6 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "2VIrSoq3kufjHMXj", + "filament_id": "OFXA8vy9", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "100" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic.json b/resources/profiles/Artillery/filament/Artillery PLA Basic.json index 052ceac5e5..5455de4a86 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "DcGBMRjdcgLx6pWG", + "filament_id": "OF57IbZT", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json index aff1bcb3cb..5156b5e69f 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "tgmFMdyhSX05kuxw", + "filament_id": "OFKDnrjL", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json index abd44e77d1..6c2a47f771 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "9zqAIfywiv9zm77X", + "filament_id": "OFKDnrjL", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json index a1fc1e5999..58702d5a69 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "W6ipHAoCgHIUIT3g", + "filament_id": "OFKDnrjL", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json index 4217f6836d..3548bc52a6 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "HggSuUWe1zWOlQIK", + "filament_id": "OFKDnrjL", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte.json b/resources/profiles/Artillery/filament/Artillery PLA Matte.json index 83e40133aa..04a2402b6f 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "kt8uKXpMqxrFrHaG", + "filament_id": "OFKDnrjL", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json index d2f3184864..d86ce77a43 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "TDwRIGXkpJIW38jG", + "filament_id": "OFnyirh9", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json index e8d65f465b..f5c6f05245 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "BWMjPUWXwumQoY5H", + "filament_id": "OFnyirh9", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json index ce102bb364..8743dd44bd 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "PpuiGWbDlVZwBIxb", + "filament_id": "OFnyirh9", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json index 6fb25927e3..8df6dd1d13 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "from": "User", "setting_id": "dr2wlzDc1AC3tciI", + "filament_id": "OFnyirh9", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk.json b/resources/profiles/Artillery/filament/Artillery PLA Silk.json index 85cd2eec08..9eb9ea142a 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "rd0U4uP6mM8S8lDg", + "filament_id": "OFnyirh9", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Tough.json b/resources/profiles/Artillery/filament/Artillery PLA Tough.json index 8f1ce758b5..bca655122d 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Tough.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Tough.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "hLFvQXsyyUrguGEp", + "filament_id": "OFtXBjvb", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json index 36c7d69b83..51433f69be 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "oT12s9CEV1CTD6eB", + "filament_id": "OFvxvkAd", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json index f7f700fa96..ec64d0b506 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PVA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "FIcb3cOIanxmvHe2", - "filament_id": "P8163162", + "filament_id": "OFc2SnEp", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json index 4c558166c5..c3f230b487 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "r2q4QIlfTUCIz43f", + "filament_id": "OFc2SnEp", "instantiation": "true", "chamber_temperature": [ "50" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json index b15f191878..1759d32ad5 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PVA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "h5xquKMT9l0rwcTU", - "filament_id": "P8163162", + "filament_id": "OFc2SnEp", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json index 1e682947c2..412d60e440 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PVA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "cElJlbCAgAqSQiPZ", - "filament_id": "P8163162", + "filament_id": "OFc2SnEp", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json index d722aa592f..3925e8963d 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "p6vnCneuwtM0PzL7", + "filament_id": "OFTbsWVg", "instantiation": "true", "close_fan_the_first_x_layers": [ "1" diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json index 9d29c06e42..0b0e495f7d 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery TPU @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "QIgpIamYbSdI4DPW", - "filament_id": "P2fbf0c0", + "filament_id": "OFTbsWVg", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json index d323279979..83a7dbd0f6 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery TPU @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "W22GbPPOgtH4NAAH", - "filament_id": "P2fbf0c0", + "filament_id": "OFTbsWVg", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery TPU.json b/resources/profiles/Artillery/filament/Artillery TPU.json index b769e8c61a..f4ec63c166 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU.json +++ b/resources/profiles/Artillery/filament/Artillery TPU.json @@ -4,6 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "IcV1jLJaS5rmdNOY", + "filament_id": "OFTbsWVg", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json index 4c11ce042b..e46869feb9 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic ASA @Hi-all", "from": "system", "setting_id": "C7IB6HSJxW598zFA", + "filament_id": "OFNbajj9", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json index 28f6f07150..c1888475bb 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PETG @Hi-all", "from": "system", "setting_id": "G4ZIJDNOpQvutOfs", + "filament_id": "OFvGSn0l", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json index 7538ad118c..c2f037e2b0 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @Ender-3V3-all", "from": "system", "setting_id": "4F3dZWvsniH9QHtr", + "filament_id": "OFLriDvE", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json index f1748f5d81..92e419b26a 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "KzaopZGQPw5OJFFD", + "filament_id": "OFLriDvE", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json index c810abe5e9..a30c1ec949 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @K1-all", "from": "system", "setting_id": "ptxV78rC6wevH916", + "filament_id": "OFLriDvE", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json index 559cb6c0d8..3f6d5e5633 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @K2-all", "from": "system", "setting_id": "ozHstwkc3N5LGWLV", + "filament_id": "OFLriDvE", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json index 8386488fcd..88b5c57c1a 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @Ender-3V3-all", "from": "system", "setting_id": "xF1B593frol5PWVw", + "filament_id": "OF43idK2", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json index fe7c08e6c5..d5247b1d32 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "R7Jo7NhjsR1iU2Fd", + "filament_id": "OF43idK2", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json index 9869ee37fa..f1b58bb091 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @K1-all", "from": "system", "setting_id": "3hreTG3DjcgmwZC2", + "filament_id": "OF43idK2", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json index 1659fed28f..a13e886b89 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @K2-all", "from": "system", "setting_id": "fxZf5E6IHWWq3dsu", + "filament_id": "OF43idK2", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json index d4e1b1f7aa..f3686b9edd 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @Ender-3V3-all", "from": "system", "setting_id": "uPFnSMh7WoXmMAoy", + "filament_id": "OFTszIHE", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json index 17b55e5202..2762cdee53 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "RPDVqZcn8EZizd1U", + "filament_id": "OFTszIHE", "instantiation": "true", "filament_flow_ratio": [ "0.97" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json index 13cd1e7c93..ff94adbabf 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @K1-all", "from": "system", "setting_id": "pxvc0ICvqc0M3wYV", + "filament_id": "OFTszIHE", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json index 3b9a3d242c..5eba612ef7 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @K2-all", "from": "system", "setting_id": "qS0Mlt24iz1k4P7n", + "filament_id": "OFTszIHE", "instantiation": "true", "filament_max_volumetric_speed": [ "10" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json index 53637dd460..3ac6f207f4 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json @@ -4,6 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "OEc7Bc7WG99tuO5D", + "filament_id": "OFdLGn0R", "instantiation": "true", "filament_flow_ratio": [ "0.88" diff --git a/resources/profiles/Creality/filament/Creality HF Generic PLA.json b/resources/profiles/Creality/filament/Creality HF Generic PLA.json index 0b0c7d7d70..2cad2fa504 100644 --- a/resources/profiles/Creality/filament/Creality HF Generic PLA.json +++ b/resources/profiles/Creality/filament/Creality HF Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "p07b7w0HDxavGLdd", - "filament_id": "GFL99", + "filament_id": "OFZjZ1k7", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json b/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json index dabcf7cdba..64319441a4 100644 --- a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json +++ b/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Jp93uqYennsWVAKe", - "filament_id": "GFL99", + "filament_id": "OFfkPhrJ", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json index 55fbd40ee4..cae2d0bcf9 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon ABS @base", "inherits": "fdm_filament_abs", - "setting_id": "aZRVIlDze62Bbw81", "filament_id": "P510cfb0", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json index dddc147ff2..b715900dae 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon ABS-A100 @base", "inherits": "Cubicon ABS @base", - "setting_id": "vGIT4KZvqojIh2up", "filament_id": "P510cfb1", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json index e1546d3bae..7daddfb940 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon ABSk @base", "inherits": "Cubicon ABS @base", - "setting_id": "UbOUO0K3Y2iRPBtf", "filament_id": "P510cfb2", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json index 51c89949f6..6177b6fd6a 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon PA-CF @base", "inherits": "fdm_filament_pa", - "setting_id": "55cJDyCoEudfOePY", "filament_id": "P510cfd0", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @base.json b/resources/profiles/Cubicon/filament/Cubicon PC @base.json index de42989e84..aa2f9ac347 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon PC @base", "inherits": "fdm_filament_pc", - "setting_id": "Mzg6jfwb2nqfGkdV", - "filament_id": "P510cfd0", - "instantiation": "true", + "filament_id": "OFnLnZQo", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json index 2242ba36ca..0912884adf 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon PETG @base", "inherits": "fdm_filament_pet", - "setting_id": "bGfz4phwIdqSz0Hx", "filament_id": "P510cfc0", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json index 665ba58d59..82dffb7070 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json @@ -3,9 +3,8 @@ "name": "Cubicon PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "setting_id": "ypwdJAu0NlEsWpf4", "filament_id": "P510cfa0", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json index cb916a9410..0e31e96a81 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon PLA+ @base", "inherits": "Cubicon PLA @base", - "setting_id": "ETnuhiOZRh1jxrVk", "filament_id": "P510cfa1", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json index 831450deef..a9d46012c6 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json @@ -2,9 +2,8 @@ "type": "filament", "name": "Cubicon PLAi21 @base", "inherits": "Cubicon PLA @base", - "setting_id": "mnwC7ijXXV72lBOt", "filament_id": "P510cfa2", - "instantiation": "true", + "instantiation": "false", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json index 7e76e2404b..273eb70ec5 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json +++ b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json @@ -4,6 +4,7 @@ "inherits": "Dremel Generic PLA", "from": "system", "setting_id": "weKWPiNIe3TmOXRn", + "filament_id": "OFUYjPc4", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json index 8074c6f0a3..822f95fe2c 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json +++ b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json @@ -4,6 +4,7 @@ "inherits": "Dremel Generic PLA", "from": "system", "setting_id": "kZAEjhLS29WQeyf1", + "filament_id": "OFUYjPc4", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json index fb9c31fe0e..62373995e2 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json +++ b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json @@ -4,6 +4,7 @@ "inherits": "Dremel Generic PLA", "from": "system", "setting_id": "pIlkZjNrXnHJDszp", + "filament_id": "OFUYjPc4", "instantiation": "true", "slow_down_min_speed": "10", "close_fan_the_first_x_layers": "3", diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json index ab07650434..d0a6f7dc61 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @EX+APS", "from": "system", "setting_id": "3EdHfL9KE4oRVHB7", - "filament_id": "GFB99", + "filament_id": "OFVBNoov", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json index 0173f7ee05..c2b0d8543f 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @EX+APS", "from": "system", "setting_id": "6YMXdKicP2hGUUJn", - "filament_id": "GFN98", + "filament_id": "OFb3UzMZ", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json index c68955287b..df76f5ffe8 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @EX+APS", "from": "system", "setting_id": "GsYpyooWb6ymAb36", - "filament_id": "GFC99", + "filament_id": "OFTsGps3", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json index 39d510f085..d04816c3f0 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @EX+APS", "from": "system", "setting_id": "sNsRp3vHhcWAxp7d", - "filament_id": "GFG99", + "filament_id": "OFvaXhYD", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json index 8d715771b9..e1a7aaa359 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @EX+APS", "from": "system", "setting_id": "UTrjyqqetOSYNZxJ", - "filament_id": "GFL99", + "filament_id": "OFuq9tqb", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json index cbc94ccedd..aecb50b1a4 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @EX+APS", "from": "system", "setting_id": "p08bW50lbzMjwL5B", - "filament_id": "GFL99", + "filament_id": "OFefhSuj", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json index 05b1f4e017..080a6dfede 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @EX", "from": "system", "setting_id": "e6st01mMFr98LVEH", - "filament_id": "GFB99", + "filament_id": "OFVBNoov", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json index 3042fe20f8..3beb4794b3 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @EX", "from": "system", "setting_id": "qPCd5oTrCmZi63Ng", - "filament_id": "GFN98", + "filament_id": "OFb3UzMZ", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json index b1c46585e0..2e0ecd34bd 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @EX", "from": "system", "setting_id": "Uc2o223YSyShp7EI", - "filament_id": "GFC99", + "filament_id": "OFTsGps3", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json index 47172fa13a..9f7230ea11 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @EX", "from": "system", "setting_id": "5vqLJrKLKv40sT7y", - "filament_id": "GFG99", + "filament_id": "OFvaXhYD", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json index 071d0eb53c..cb78703d14 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @EX", "from": "system", "setting_id": "bGOpriWvEFZOmqR4", - "filament_id": "GFL99", + "filament_id": "OFuq9tqb", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json index 1fab11094e..57ec47283d 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @EX", "from": "system", "setting_id": "y8A92Dw8EMplnZAM", - "filament_id": "GFL99", + "filament_id": "OFefhSuj", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json index 202565b819..2c6f0a1f18 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @HSN", "from": "system", "setting_id": "QnEhnvxibr6g1nou", - "filament_id": "GFB99", + "filament_id": "OFVBNoov", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json index 3f6524b54c..0aa59d2664 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @HSN", "from": "system", "setting_id": "L1j3mDKXjE2RKO1B", - "filament_id": "GFN98", + "filament_id": "OFb3UzMZ", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json index 35a3314a90..a8a0810980 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @HSN", "from": "system", "setting_id": "HBNOABPFLninXsW6", - "filament_id": "GFC99", + "filament_id": "OFTsGps3", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json index 1997c1b375..c4873f921e 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @HSN", "from": "system", "setting_id": "DJyFBjQ5n9n1UHv0", - "filament_id": "GFG99", + "filament_id": "OFvaXhYD", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json index f3118fe1d6..8a5765eac9 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @HSN", "from": "system", "setting_id": "NWKMG5q4ITfHcYOD", - "filament_id": "GFL99", + "filament_id": "OFKzh9lx", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json index a7988eaa70..52cbdd6732 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @HSN", "from": "system", "setting_id": "fAw5pB53L8ZT1Fkm", - "filament_id": "GFL99", + "filament_id": "OFefhSuj", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json index 098ed99ae0..4716c5ac9b 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu @HSN", "from": "system", "setting_id": "CvTHZpKuTaGS186F", - "filament_id": "GFU99", + "filament_id": "OFmcJsqt", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json index c7b6451fab..5bcb620e15 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs_other @HSN", "from": "system", "setting_id": "IuZcFrVQ2rJoMDLP", - "filament_id": "GFB99", + "filament_id": "OFAK2XjZ", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json index fe5f2097d5..354cd3d8e3 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa_other @HSN", "from": "system", "setting_id": "4I0FW5meyC53Xf8n", - "filament_id": "GFN98", + "filament_id": "OFSpTWdv", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json index e87712a278..daeed5e540 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc_other @HSN", "from": "system", "setting_id": "vUuSuioOUXsg2P3p", - "filament_id": "GFC99", + "filament_id": "OFyD1Zo8", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json index 0a4f102aa3..8aef779240 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet_other @HSN", "from": "system", "setting_id": "lWYq9XssEyY3uWEe", - "filament_id": "GFG99", + "filament_id": "OFw05rkF", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json index c775f37bfc..2788d2639f 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_other @HSN", "from": "system", "setting_id": "wOExDniXvR7CcF1w", - "filament_id": "GFL99", + "filament_id": "OFS3HrR1", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json index b3cc531849..26fe3ad6ff 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper_other @HSN", "from": "system", "setting_id": "154azDg7YNNWCkNK", - "filament_id": "GFL99", + "filament_id": "OFrbbq6E", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json index adbf1cc254..83fb180e74 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu_other @HSN", "from": "system", "setting_id": "0bU2fl92vCQobYnt", - "filament_id": "GFU99", + "filament_id": "OFFrbsvQ", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json b/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json index dee081317f..f7cc33ef70 100644 --- a/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json +++ b/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper", "from": "system", "setting_id": "j86QMTif4fGujRbg", - "filament_id": "GFL99", + "filament_id": "OFefhSuj", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other ABS.json b/resources/profiles/InfiMech/filament/Other ABS.json index a120f2dda6..d2d4fc2a21 100644 --- a/resources/profiles/InfiMech/filament/Other ABS.json +++ b/resources/profiles/InfiMech/filament/Other ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs_other", "from": "system", "setting_id": "nDLB3RZq23limiBn", - "filament_id": "GFB99", + "filament_id": "OFAK2XjZ", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other PA-CF.json b/resources/profiles/InfiMech/filament/Other PA-CF.json index 1829ec16bb..37a58115f9 100644 --- a/resources/profiles/InfiMech/filament/Other PA-CF.json +++ b/resources/profiles/InfiMech/filament/Other PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa_other", "from": "system", "setting_id": "rgz4LjU9KyvbLhRQ", - "filament_id": "GFN98", + "filament_id": "OFSpTWdv", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/Other PC.json b/resources/profiles/InfiMech/filament/Other PC.json index dda6d2def7..212ed3117e 100644 --- a/resources/profiles/InfiMech/filament/Other PC.json +++ b/resources/profiles/InfiMech/filament/Other PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc_other", "from": "system", "setting_id": "VXkW5oukQdBX6B6T", - "filament_id": "GFC99", + "filament_id": "OFyD1Zo8", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/Other PETG.json b/resources/profiles/InfiMech/filament/Other PETG.json index 552e3e4fe7..4d5ecee6c4 100644 --- a/resources/profiles/InfiMech/filament/Other PETG.json +++ b/resources/profiles/InfiMech/filament/Other PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet_other", "from": "system", "setting_id": "onLEWi8GYK0avard", - "filament_id": "GFG99", + "filament_id": "OFw05rkF", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/Other PLA Hyper.json b/resources/profiles/InfiMech/filament/Other PLA Hyper.json index 4d1aa6c742..44ec23e383 100644 --- a/resources/profiles/InfiMech/filament/Other PLA Hyper.json +++ b/resources/profiles/InfiMech/filament/Other PLA Hyper.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper_other", "from": "system", "setting_id": "Iop52BLp5ou8u4QG", - "filament_id": "GFL99", + "filament_id": "OFrbbq6E", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other PLA.json b/resources/profiles/InfiMech/filament/Other PLA.json index aa1fa0a091..5e4a3eddd6 100644 --- a/resources/profiles/InfiMech/filament/Other PLA.json +++ b/resources/profiles/InfiMech/filament/Other PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_other", "from": "system", "setting_id": "2Bl4sfgGJBjNMk37", - "filament_id": "GFL99", + "filament_id": "OFS3HrR1", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other TPU.json b/resources/profiles/InfiMech/filament/Other TPU.json index edbee9b887..656c5a9e81 100644 --- a/resources/profiles/InfiMech/filament/Other TPU.json +++ b/resources/profiles/InfiMech/filament/Other TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu_other", "from": "system", "setting_id": "nqDc2q94Q2hwMi7B", - "filament_id": "GFU99", + "filament_id": "OFFrbsvQ", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 6c96ddbad0..9145cab4da 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -42,6 +42,7 @@ "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", @@ -55,11 +56,17 @@ "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", @@ -105,15 +112,49 @@ "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", + "Anycubic/Generic ABS @Anycubic Kobra 3 0.4 nozzle", "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Generic TPU @Anycubic Kobra 3 0.4 nozzle", "Anycubic/Panchroma PLA @Anycubic Kobra S1", "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", + "Artillery/Artillery ABS", + "Artillery/Artillery ABS @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery ASA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery Generic PETG", "Artillery/Artillery Generic PLA", "Artillery/Artillery Generic PLA-CF", + "Artillery/Artillery PA @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PC @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PET @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PETG", + "Artillery/Artillery PETG @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Basic", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Matte", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA Silk", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA Tough", + "Artillery/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PVA @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery TPU", + "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", "BBL/BETA HIPS @base", "BBL/BETA PAHT-CF @base", "BBL/BETA PETG @base", @@ -349,10 +390,25 @@ "Creality/CR-Wood @K1C_CFS-C-all", "Creality/CR-Wood @K1_CFS-C-all", "Creality/CR-Wood @K2 Plus-all", + "Creality/Creality Generic ASA-CF @Hi-all", "Creality/Creality Generic PA-CF", "Creality/Creality Generic PC", "Creality/Creality Generic PETG", + "Creality/Creality Generic PETG-CF @Hi-all", "Creality/Creality Generic PLA", + "Creality/Creality Generic PLA High Speed @Ender-3V3-all", + "Creality/Creality Generic PLA High Speed @Hi-all", + "Creality/Creality Generic PLA High Speed @K1-all", + "Creality/Creality Generic PLA High Speed @K2-all", + "Creality/Creality Generic PLA Matte @Ender-3V3-all", + "Creality/Creality Generic PLA Matte @Hi-all", + "Creality/Creality Generic PLA Matte @K1-all", + "Creality/Creality Generic PLA Matte @K2-all", + "Creality/Creality Generic PLA Silk @Ender-3V3-all", + "Creality/Creality Generic PLA Silk @Hi-all", + "Creality/Creality Generic PLA Silk @K1-all", + "Creality/Creality Generic PLA Silk @K2-all", + "Creality/Creality Generic PLA Wood @Hi-all", "Creality/Creality Generic PLA-CF", "Creality/Creality HF Generic PLA", "Creality/Creality HF Generic Speed PLA", @@ -601,6 +657,9 @@ "DeltaMaker/DeltaMaker Generic PETG", "DeltaMaker/DeltaMaker Generic PLA", "Dremel/Dremel Generic PLA", + "Dremel/Dremel Generic PLA @3D20 all", + "Dremel/Dremel Generic PLA @3D40 all", + "Dremel/Dremel Generic PLA @3D45 all", "Elegoo/Elegoo ASA-CF @base", "Elegoo/Elegoo PAHT @base", "Elegoo/Elegoo PC @base", @@ -3117,9 +3176,6 @@ "CoLiDo/CoLiDo PLA Silk", "CoLiDo/CoLiDo PLA+" ], - "GFABS": [ - "Anycubic/Anycubic ABS" - ], "GFASA": [ "Anycubic/Anycubic ASA" ], @@ -3169,7 +3225,6 @@ "Artillery/Artillery Generic ASA", "BBL/Generic ASA", "Creality/Creality Generic ASA", - "Creality/Creality Generic ASA-CF", "FLSun/FLSun Generic ASA", "FLSun/FLSun S1 ASA", "FLSun/FLSun T1 ASA", @@ -3208,9 +3263,7 @@ "Anker/Anker Generic ABS", "Anker/Anker Generic ABS 0.2 nozzle", "Anker/Anker Generic ABS 0.25 nozzle", - "Anycubic/Anycubic ABS", "Anycubic/Anycubic Generic ABS", - "Anycubic/Generic ABS", "Artillery/Artillery Generic ABS", "BBL/Generic ABS", "Chuanying/Chuanying ABS", @@ -3230,9 +3283,7 @@ "FlyingBear/FlyingBear ABS", "FlyingBear/FlyingBear Generic ABS", "FlyingBear/Other ABS", - "InfiMech/InfiMech ABS", "InfiMech/InfiMech Generic ABS", - "InfiMech/Other ABS", "Lulzbot/Lulzbot 2.85mm ABS", "OrcaArena/OrcaArena Generic ABS", "Prusa/Prusa Generic ABS", @@ -3301,8 +3352,6 @@ "FlyingBear/FlyingBear PC", "FlyingBear/Other PC", "InfiMech/InfiMech Generic PC", - "InfiMech/InfiMech PC", - "InfiMech/Other PC", "OrcaArena/OrcaArena Generic PC", "Prusa/Prusa Generic PC", "Prusa/Prusament PC Blend", @@ -3393,8 +3442,6 @@ "Anker/Anker Generic PETG 0.2 nozzle", "Anker/Anker Generic PETG 0.25 nozzle", "Anycubic/Anycubic Generic PETG", - "Anycubic/Anycubic PETG", - "Anycubic/Generic PETG Basic", "Artillery/Artillery Generic PETG", "BBL/Generic PETG", "CONSTRUCT3D/C1 Generic High Flow PETG", @@ -3407,7 +3454,6 @@ "CoLiDo/CoLiDo PETG", "Comgrow/Comgrow Generic PETG", "Creality/Creality Generic PETG", - "Creality/Creality Generic PETG-CF", "Custom/Generic PETG", "DeltaMaker/DeltaMaker Generic PETG", "FLSun/FLSun Generic PETG", @@ -3420,8 +3466,6 @@ "FlyingBear/FlyingBear PETG Basic", "FlyingBear/Other PETG", "InfiMech/InfiMech Generic PETG", - "InfiMech/InfiMech PETG", - "InfiMech/Other PETG", "Lulzbot/Lulzbot 2.85mm PETG", "MagicMaker/MM Generic PEEK", "OrcaArena/OrcaArena Generic PETG", @@ -3640,12 +3684,6 @@ "Anycubic/Polymaker PLA Pro Metallic", "Snapmaker/Polymaker PLA Pro Metallic" ], - "GFL92": [ - "Anycubic/Anycubic PLA" - ], - "GFL93": [ - "Anycubic/Anycubic PLA+" - ], "GFL94": [ "Anycubic/Anycubic PLA Slik" ], @@ -3653,7 +3691,6 @@ "Anker/Anker Generic PLA+", "Anker/Anker Generic PLA+ 0.2 nozzle", "Anker/Anker Generic PLA+ 0.25 nozzle", - "Anycubic/Anycubic PLA Matte", "BBL/Generic PLA High Speed", "Tiertime/Tiertime Generic PLA High Speed" ], @@ -3664,7 +3701,6 @@ "Anker/Anker Generic PLA Silk", "Anker/Anker Generic PLA Silk 0.2 nozzle", "Anker/Anker Generic PLA Silk 0.25 nozzle", - "Anycubic/Anycubic PLA High Speed", "BBL/Generic PLA Silk", "Tiertime/Tiertime Generic PLA Silk" ], @@ -3710,30 +3746,7 @@ "Anker/Anker Generic PLA 0.2 nozzle", "Anker/Anker Generic PLA 0.25 nozzle", "Anycubic/Anycubic Generic PLA", - "Anycubic/Anycubic PLA", - "Anycubic/Anycubic PLA High Speed", - "Anycubic/Anycubic PLA Luminous", - "Anycubic/Anycubic PLA Matte", - "Anycubic/Anycubic PLA Silk", - "Anycubic/Anycubic PLA+", - "Artillery/Artillery ABS", - "Artillery/Artillery ASA", "Artillery/Artillery Generic PLA", - "Artillery/Artillery PA", - "Artillery/Artillery PA-CF", - "Artillery/Artillery PC", - "Artillery/Artillery PET", - "Artillery/Artillery PETG", - "Artillery/Artillery PETG Basic", - "Artillery/Artillery PETG-CF", - "Artillery/Artillery PLA Basic", - "Artillery/Artillery PLA Basic+", - "Artillery/Artillery PLA Matte", - "Artillery/Artillery PLA Silk", - "Artillery/Artillery PLA Tough", - "Artillery/Artillery PLA-CF", - "Artillery/Artillery PVA", - "Artillery/Artillery TPU", "BBL/Generic PLA", "CONSTRUCT3D/C1 Generic PLA", "Chuanying/Chuanying ASA", @@ -3752,12 +3765,6 @@ "Comgrow/Comgrow Generic PLA", "Comgrow/Comgrow T300 PLA", "Creality/Creality Generic PLA", - "Creality/Creality Generic PLA High Speed", - "Creality/Creality Generic PLA Matte", - "Creality/Creality Generic PLA Silk", - "Creality/Creality Generic PLA Wood", - "Creality/Creality HF Generic PLA", - "Creality/Creality HF Generic Speed PLA", "Custom/Generic PLA", "DeltaMaker/DeltaMaker Brand PLA", "DeltaMaker/DeltaMaker Generic PLA", @@ -3778,11 +3785,6 @@ "FlyingBear/Other PLA", "FlyingBear/Other PLA Hyper", "InfiMech/InfiMech Generic PLA", - "InfiMech/InfiMech PLA", - "InfiMech/InfiMech PLA Basic", - "InfiMech/InfiMech PLA Hyper", - "InfiMech/Other PLA", - "InfiMech/Other PLA Hyper", "Lulzbot/Lulzbot 2.85mm PLA", "OrcaArena/OrcaArena Generic PLA", "Peopoly/Peopoly Generic PLA", @@ -3917,8 +3919,6 @@ "FlyingBear/FlyingBear PA-CF", "FlyingBear/Other PA-CF", "InfiMech/InfiMech Generic PA-CF", - "InfiMech/InfiMech PA-CF", - "InfiMech/Other PA-CF", "OrcaArena/OrcaArena Generic PA-CF", "Prusa/Prusament PA-CF", "Qidi/Qidi Generic PA-CF", @@ -4071,7 +4071,6 @@ "Anycubic/Anycubic PET-CF" ], "GFPETG": [ - "Anycubic/Anycubic PETG", "Anycubic/Generic PETG" ], "GFPETG-1": [ @@ -4080,27 +4079,12 @@ "GFPETG-CF": [ "Anycubic/Anycubic PETG-CF" ], - "GFPLA": [ - "Anycubic/Anycubic PLA" - ], "GFPLA Glow": [ "Anycubic/Anycubic PLA Glow" ], - "GFPLA High Speed": [ - "Anycubic/Anycubic PLA High Speed" - ], - "GFPLA Matte": [ - "Anycubic/Anycubic PLA Matte" - ], - "GFPLA Silk": [ - "Anycubic/Anycubic PLA Silk" - ], "GFPLA Translucent": [ "Anycubic/Anycubic PLA Translucent" ], - "GFPLA+": [ - "Anycubic/Anycubic PLA+" - ], "GFPLA-CF": [ "Anycubic/Anycubic PLA-CF" ], @@ -4435,9 +4419,6 @@ "GFU99": [ "Anker/Anker Generic TPU", "Anycubic/Anycubic Generic TPU", - "Anycubic/Anycubic PEBA 95A", - "Anycubic/Anycubic TPU", - "Anycubic/Generic TPU", "Artillery/Artillery Generic TPU", "BBL/Generic TPU", "CoLiDo/CoLiDo Generic TPU", @@ -4451,9 +4432,7 @@ "FlyingBear/FlyingBear TPU Basic", "FlyingBear/Other TPU", "InfiMech/InfiMech Generic TPU", - "InfiMech/InfiMech TPU", "InfiMech/InfiMech TPU Basic", - "InfiMech/Other TPU", "OrcaArena/OrcaArena Generic TPU", "Prusa/Prusa Generic FLEX", "Prusa/Prusa Generic TPU", @@ -4713,6 +4692,9 @@ "OF41QVDH": [ "Flashforge/Flashforge Generic PLA-Silk" ], + "OF43idK2": [ + "Creality/Creality Generic PLA Matte" + ], "OF48G7He": [ "Qidi/QIDI PETG Tough 0.8 nozzle" ], @@ -4728,6 +4710,9 @@ "OF4m9A5w": [ "Flashforge/Flashforge Generic HIPS" ], + "OF57IbZT": [ + "Artillery/Artillery PLA Basic" + ], "OF5T1Y9R": [ "Flashforge/Flashforge ABS Basic" ], @@ -4776,6 +4761,9 @@ "OF9sr3Vn": [ "Flashforge/Flashforge PLA Sparkle" ], + "OF9vnvM8": [ + "Artillery/Artillery PETG-CF" + ], "OFAEqlWa": [ "Flashforge/Flashforge Generic PLA-SILK" ], @@ -4785,6 +4773,9 @@ "OFAHagT9": [ "Elegoo/Elegoo Rapid PLA+" ], + "OFAK2XjZ": [ + "InfiMech/Other ABS" + ], "OFAUDGEQ": [ "Qidi/QIDI PLA Rapido Matte" ], @@ -4836,18 +4827,33 @@ "OFE22Uba": [ "Flashforge/Flashforge TPU-90A" ], + "OFEYKrjb": [ + "Artillery/Artillery PETG" + ], + "OFEdyZqS": [ + "Anycubic/Anycubic PLA Luminous" + ], "OFFIL5pD": [ "Qidi/QIDI PA12-CF" ], + "OFFrbsvQ": [ + "InfiMech/Other TPU" + ], "OFG8vHw8": [ "Qidi/Qidi Generic ASA" ], + "OFGb4hPY": [ + "Anycubic/Anycubic PEBA 95A" + ], "OFGfdP6J": [ "Flashforge/FusRock Generic S-Multi" ], "OFHBTqyD": [ "Flashforge/Flashforge PLA Basic" ], + "OFHL32M0": [ + "Anycubic/Anycubic TPU" + ], "OFHtQDC9": [ "Elegoo/Elegoo PLA Basic" ], @@ -4872,6 +4878,9 @@ "OFK820gS": [ "Qidi/QIDI ASA" ], + "OFKDnrjL": [ + "Artillery/Artillery PLA Matte" + ], "OFKWVi10": [ "Flashforge/Flashforge Generic PLA-CF10" ], @@ -4881,6 +4890,9 @@ "OFKjlAbC": [ "Qidi/QIDI UltraPA-CF25" ], + "OFKzh9lx": [ + "InfiMech/InfiMech PLA" + ], "OFL4KniM": [ "Elegoo/Elegoo Rapid TPU 95A" ], @@ -4893,6 +4905,9 @@ "OFLeFaUO": [ "Flashforge/Flashforge Generic PVA" ], + "OFLriDvE": [ + "Creality/Creality Generic PLA High Speed" + ], "OFLxO2Oc": [ "Flashforge/FusRock PET" ], @@ -4914,9 +4929,15 @@ "OFN0pBpo": [ "Qidi/Qidi Generic TPU 95A" ], + "OFNRgSch": [ + "Artillery/Artillery PC" + ], "OFNX5uRT": [ "Qidi/QIDI TPU-Aero" ], + "OFNbajj9": [ + "Creality/Creality Generic ASA-CF" + ], "OFOSzSuh": [ "Flashforge/Flashforge PA-CF" ], @@ -4926,6 +4947,9 @@ "OFOkTA0C": [ "Elegoo/Elegoo PETG Translucent" ], + "OFOp3Oef": [ + "Anycubic/Generic ABS" + ], "OFOysPuE": [ "Qidi/QIDI TPU-GF" ], @@ -4968,6 +4992,9 @@ "OFRgDMDJ": [ "Flashforge/Flashforge PETG Transparent" ], + "OFS3HrR1": [ + "InfiMech/Other PLA" + ], "OFSCm6pJ": [ "Elegoo/Elegoo PET-CF" ], @@ -4977,24 +5004,42 @@ "OFSdF3B1": [ "Flashforge/FusRock PAHT-CF" ], + "OFSpTWdv": [ + "InfiMech/Other PA-CF" + ], "OFT3TqB6": [ "OrcaFilamentLibrary/Elas ASA" ], "OFTa6gPH": [ "Flashforge/Flashforge PLA Pro" ], + "OFTbsWVg": [ + "Artillery/Artillery TPU" + ], "OFToBodi": [ "Qidi/QIDI ABS Rapido Metal" ], + "OFTsGps3": [ + "InfiMech/InfiMech PC" + ], + "OFTszIHE": [ + "Creality/Creality Generic PLA Silk" + ], "OFUJw3Lx": [ "Qidi/QIDI PEBA 95A" ], + "OFUYjPc4": [ + "Dremel/Dremel Generic PLA" + ], "OFUkpobY": [ "Qidi/QIDI PAHT-CF" ], "OFV4hD1o": [ "Qidi/QIDI PLA Rapido Metal" ], + "OFVBNoov": [ + "InfiMech/InfiMech ABS" + ], "OFVLuVmD": [ "OrcaFilamentLibrary/Elegoo Rapid PETG" ], @@ -5016,6 +5061,9 @@ "OFWyCd0Y": [ "Qidi/QIDI Support For PET/PA" ], + "OFXA8vy9": [ + "Artillery/Artillery PLA Basic+" + ], "OFXNO5Of": [ "Qidi/QIDI PLA Rapido 0.2 nozzle" ], @@ -5058,6 +5106,9 @@ "OFZhdVnP": [ "OrcaFilamentLibrary/eSUN PLA-Basic" ], + "OFZjZ1k7": [ + "Creality/Creality HF Generic PLA" + ], "OFa5cFqE": [ "Qidi/QIDI Support For PAHT" ], @@ -5067,6 +5118,12 @@ "OFaKIoH2": [ "Elegoo/Elegoo PLA Sparkle" ], + "OFaKZ6JI": [ + "Anycubic/Generic PETG Basic" + ], + "OFb3UzMZ": [ + "InfiMech/InfiMech PA-CF" + ], "OFbK5wve": [ "Prusa/Prusa Generic TPU HF" ], @@ -5079,6 +5136,9 @@ "OFbgt3u3": [ "OrcaFilamentLibrary/Elas PLA Basic" ], + "OFc2SnEp": [ + "Artillery/Artillery PVA" + ], "OFceJcLf": [ "Qidi/PolyLite PLA" ], @@ -5088,9 +5148,15 @@ "OFcy60o4": [ "Flashforge/Flashforge ASA Basic" ], + "OFdLGn0R": [ + "Creality/Creality Generic PLA Wood" + ], "OFdNORGt": [ "Flashforge/Flashforge ASA-GF" ], + "OFdSGkUG": [ + "Anycubic/Anycubic PETG" + ], "OFdhVJql": [ "Flashforge/Flashforge PLA Buint Ti" ], @@ -5100,12 +5166,18 @@ "OFeWMAGH": [ "Flashforge/Flashforge HS PLA Burnt Ti" ], + "OFefhSuj": [ + "InfiMech/InfiMech PLA Hyper" + ], "OFenGPBR": [ "OrcaFilamentLibrary/Elegoo PETG Translucent" ], "OFeybQvK": [ "Qidi/QIDI ABS Rapido 0.2 nozzle" ], + "OFf2b9wu": [ + "Anycubic/Anycubic ABS" + ], "OFfB1QKi": [ "OrcaFilamentLibrary/Generic PETG HF" ], @@ -5115,12 +5187,24 @@ "OFfdxQok": [ "Qidi/Generic PLA+" ], + "OFfkPhrJ": [ + "Creality/Creality HF Generic Speed PLA" + ], "OFftQOek": [ "Flashforge/Flashforge PLA Matte" ], "OFgJX0Fc": [ "Flashforge/FlashForge PPS" ], + "OFgK2Xvv": [ + "Anycubic/Anycubic PLA" + ], + "OFgSK1hL": [ + "Anycubic/Anycubic PLA High Speed" + ], + "OFgrGfPy": [ + "Anycubic/Anycubic PLA+" + ], "OFh5GUhZ": [ "Elegoo/Elegoo PLA Wood" ], @@ -5148,6 +5232,9 @@ "OFjFPhUC": [ "Prusa/Prusament rPLA" ], + "OFjdTQd6": [ + "Anycubic/Anycubic PLA Silk" + ], "OFjepy6j": [ "Flashforge/FusRock Generic S-PAHT" ], @@ -5190,6 +5277,9 @@ "OFmOWC74": [ "Elegoo/Elegoo PETG PRO" ], + "OFmcJsqt": [ + "InfiMech/InfiMech TPU" + ], "OFmduKVr": [ "Flashforge/FlashForge PPS-CF" ], @@ -5199,12 +5289,21 @@ "OFmgesco": [ "Flashforge/Flashforge TPU 65D" ], + "OFnLnZQo": [ + "Cubicon/Cubicon PC" + ], + "OFnY9ovF": [ + "Artillery/Artillery PA-CF" + ], "OFnj7bPm": [ "Qidi/QIDI ABS Rapido 0.6 nozzle" ], "OFnsWQTp": [ "Qidi/QIDI WOOD Rapido" ], + "OFnyirh9": [ + "Artillery/Artillery PLA Silk" + ], "OFo4VB3w": [ "Elegoo/Generic ABS-CF" ], @@ -5223,6 +5322,9 @@ "OFp8lkYD": [ "Flashforge/Flashforge PPA-GF" ], + "OFp90N8a": [ + "Artillery/Artillery PA" + ], "OFpHq9gJ": [ "Prusa/Prusament PETG" ], @@ -5244,6 +5346,9 @@ "OFqyIUDi": [ "Qidi/Qidi PLA-CF" ], + "OFrbbq6E": [ + "InfiMech/Other PLA Hyper" + ], "OFrgQ1Ns": [ "OrcaFilamentLibrary/Elas PLA Pro" ], @@ -5253,6 +5358,9 @@ "OFs6lLH7": [ "OrcaFilamentLibrary/Elegoo PLA Silk" ], + "OFsCOJv7": [ + "Anycubic/Generic TPU" + ], "OFsKqcQW": [ "OrcaFilamentLibrary/Elegoo PLA PRO" ], @@ -5265,6 +5373,9 @@ "OFsgANe3": [ "Flashforge/Flashforge PAHT-CF" ], + "OFt5bvKK": [ + "Artillery/Artillery PETG Basic" + ], "OFt9AiN5": [ "Flashforge/Polymaker CoPA" ], @@ -5274,6 +5385,12 @@ "OFtJMczs": [ "Flashforge/Flashforge TPU-64D" ], + "OFtXBjvb": [ + "Artillery/Artillery PLA Tough" + ], + "OFtmT4Nd": [ + "Artillery/Artillery ASA" + ], "OFuPC4S8": [ "Elegoo/Elegoo PLA-CF" ], @@ -5286,6 +5403,9 @@ "OFuidAEg": [ "Qidi/Bambu ABS" ], + "OFuq9tqb": [ + "InfiMech/InfiMech PLA Basic" + ], "OFuswXlp": [ "Flashforge/Generic TPU 85A" ], @@ -5301,15 +5421,36 @@ "OFv8SRZh": [ "Prusa/Prusa Generic PLA-CF" ], + "OFvGSn0l": [ + "Creality/Creality Generic PETG-CF" + ], "OFvN3117": [ "Qidi/QIDI PLA Matte Basic" ], + "OFvYfHPB": [ + "Anycubic/Anycubic PLA Matte" + ], + "OFvaXhYD": [ + "InfiMech/InfiMech PETG" + ], "OFviQ9lH": [ "Flashforge/Flashforge Generic TPU" ], "OFvsS7Fb": [ "Flashforge/Generic TPU-64D" ], + "OFvxvkAd": [ + "Artillery/Artillery PLA-CF" + ], + "OFw05rkF": [ + "InfiMech/Other PETG" + ], + "OFw0qp7w": [ + "Artillery/Artillery PET" + ], + "OFw1S8lL": [ + "Artillery/Artillery ABS" + ], "OFw4OHWE": [ "OrcaFilamentLibrary/Elas PETG Basic" ], @@ -5328,6 +5469,9 @@ "OFxjFYxE": [ "Elegoo/Elegoo PETG HF" ], + "OFyD1Zo8": [ + "InfiMech/Other PC" + ], "OFyoW5W2": [ "Flashforge/Flashforge PLA Color Change" ], @@ -5693,19 +5837,6 @@ "P1004": [ "Creality/PolySonic PLA" ], - "P11851ba": [ - "Artillery/Artillery PET" - ], - "P284941e": [ - "Artillery/Artillery PETG", - "Artillery/Artillery PETG Basic" - ], - "P2fbf0c0": [ - "Artillery/Artillery TPU" - ], - "P39db358": [ - "Artillery/Artillery ABS" - ], "P510cfa0": [ "Cubicon/Cubicon PLA" ], @@ -5728,24 +5859,14 @@ "Cubicon/Cubicon PETG" ], "P510cfd0": [ - "Cubicon/Cubicon PA-CF", - "Cubicon/Cubicon PC" + "Cubicon/Cubicon PA-CF" ], "P510eff9": [ "Ginger Additive/Ginger Generic PETG", "Ginger Additive/Ginger Generic PLA" ], - "P8163162": [ - "Artillery/Artillery PVA" - ], - "P87436f6": [ - "Artillery/Artillery ASA" - ], "Pfcf9c4c": [ - "Artillery/Artillery PLA", - "Artillery/Artillery PLA Basic", - "Artillery/Artillery PLA Matte", - "Artillery/Artillery PLA Silk" + "Artillery/Artillery PLA" ], "Prusa Generic ABS @CORE One": [ "Prusa/Prusa Generic ABS" @@ -6661,10 +6782,13 @@ "Anycubic/Panchroma PLA @Anycubic Kobra S1", "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", + "Artillery/Artillery ABS", "Artillery/Artillery ABS @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery ABS @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery ABS @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery ABS @Artillery M1 Pro 0.8 nozzle", "Artillery/Artillery ASA @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery ASA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery ASA @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery ASA @Artillery M1 Pro 0.8 nozzle", "Artillery/Artillery Generic ABS", @@ -6673,21 +6797,50 @@ "Artillery/Artillery Generic PLA", "Artillery/Artillery Generic PLA-CF", "Artillery/Artillery Generic TPU", + "Artillery/Artillery PA @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PC @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PET @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PET @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PET @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery PET @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PETG", "Artillery/Artillery PETG @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PETG @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PETG @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery PETG @Artillery M1 Pro 0.8 nozzle", "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PLA @Artillery M1 Pro 0.2 nozzle", "Artillery/Artillery PLA @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery PLA @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA Basic", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Matte", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA Silk", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", + "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery PLA Tough", + "Artillery/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PVA @Artillery M1 Pro 0.2 nozzle", + "Artillery/Artillery PVA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PVA @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery PVA @Artillery M1 Pro 0.8 nozzle", + "Artillery/Artillery TPU", + "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery TPU @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery TPU @Artillery M1 Pro 0.8 nozzle", "BBL/Generic SBS", @@ -6837,12 +6990,27 @@ "Creality/Creality Generic ABS @Ender-5Max-all", "Creality/Creality Generic ASA", "Creality/Creality Generic ASA @Ender-5Max-all", + "Creality/Creality Generic ASA-CF @Hi-all", "Creality/Creality Generic PA @Ender-5Max-all", "Creality/Creality Generic PA-CF", "Creality/Creality Generic PETG", "Creality/Creality Generic PETG @Ender-5Max-all", + "Creality/Creality Generic PETG-CF @Hi-all", "Creality/Creality Generic PLA", "Creality/Creality Generic PLA @Ender-5Max-all", + "Creality/Creality Generic PLA High Speed @Ender-3V3-all", + "Creality/Creality Generic PLA High Speed @Hi-all", + "Creality/Creality Generic PLA High Speed @K1-all", + "Creality/Creality Generic PLA High Speed @K2-all", + "Creality/Creality Generic PLA Matte @Ender-3V3-all", + "Creality/Creality Generic PLA Matte @Hi-all", + "Creality/Creality Generic PLA Matte @K1-all", + "Creality/Creality Generic PLA Matte @K2-all", + "Creality/Creality Generic PLA Silk @Ender-3V3-all", + "Creality/Creality Generic PLA Silk @Hi-all", + "Creality/Creality Generic PLA Silk @K1-all", + "Creality/Creality Generic PLA Silk @K2-all", + "Creality/Creality Generic PLA Wood @Hi-all", "Creality/Creality Generic PLA-CF", "Creality/Creality Generic TPU", "Creality/Creality Generic TPU @Ender-5Max-all", @@ -7238,15 +7406,6 @@ "Creality/eSUN PLA-Lite @K2 Plus-all", "Creality/eSUN PLA-Matte @K2 Plus-all", "Creality/eSUN PLA-Silk @K2 Plus-all", - "Cubicon/Cubicon ABS @base", - "Cubicon/Cubicon ABS-A100 @base", - "Cubicon/Cubicon ABSk @base", - "Cubicon/Cubicon PA-CF @base", - "Cubicon/Cubicon PC @base", - "Cubicon/Cubicon PETG @base", - "Cubicon/Cubicon PLA @base", - "Cubicon/Cubicon PLA+ @base", - "Cubicon/Cubicon PLAi21 @base", "Custom/Generic PC @MyToolChanger", "Custom/Generic PETG @MyToolChanger", "Custom/Generic PLA @MyToolChanger", @@ -7258,6 +7417,9 @@ "DeltaMaker/DeltaMaker Generic PLA", "DeltaMaker/DeltaMaker Generic TPU", "Dremel/Dremel Generic PLA", + "Dremel/Dremel Generic PLA @3D20 all", + "Dremel/Dremel Generic PLA @3D40 all", + "Dremel/Dremel Generic PLA @3D45 all", "Elegoo/Generic ABS-CF @Elegoo Centauri", "Elegoo/Generic PA6-CF @Elegoo", "Elegoo/Generic PC-CF @Elegoo", diff --git a/scripts/retired_filament_ids.json b/scripts/retired_filament_ids.json index d4c5f3faf5..d71f89d9ac 100644 --- a/scripts/retired_filament_ids.json +++ b/scripts/retired_filament_ids.json @@ -1,3 +1,47 @@ { - "retired": {} + "retired": { + "GFABS": [ + "Anycubic/Anycubic ABS" + ], + "GFL92": [ + "Anycubic/Anycubic PLA" + ], + "GFL93": [ + "Anycubic/Anycubic PLA+" + ], + "GFPLA": [ + "Anycubic/Anycubic PLA" + ], + "GFPLA High Speed": [ + "Anycubic/Anycubic PLA High Speed" + ], + "GFPLA Matte": [ + "Anycubic/Anycubic PLA Matte" + ], + "GFPLA Silk": [ + "Anycubic/Anycubic PLA Silk" + ], + "GFPLA+": [ + "Anycubic/Anycubic PLA+" + ], + "P11851ba": [ + "Artillery/Artillery PET" + ], + "P284941e": [ + "Artillery/Artillery PETG", + "Artillery/Artillery PETG Basic" + ], + "P2fbf0c0": [ + "Artillery/Artillery TPU" + ], + "P39db358": [ + "Artillery/Artillery ABS" + ], + "P8163162": [ + "Artillery/Artillery PVA" + ], + "P87436f6": [ + "Artillery/Artillery ASA" + ] + } } From ee125975cffca12fb9e29e88b8c166417a83679f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:14:27 +0800 Subject: [PATCH 09/52] Snapmaker, FlyingBear, Sovol: family filament_ids Phase 2 long-tail migrations (25 collision groups), zero effective-config change: Snapmaker (11 + the tree's one live library-cross group): three Benchy demo presets coexisting via compatible_prints gating (invisible to the -f check) get their own mints; the TPE/TPU-High-Flow lines riding shared bases get family mints across the plain/U1/Dual/J1 variants; 'Snapmaker PLA Matte @U1' minted; 'Snapmaker PET @Dual' unified onto its own family root id; 'Snapmaker PA-CF @U1' had its compatible_printers triple-duplicated (self-collision) - deduplicated. The PolyTerra J1/Dual PLA presets that re-exposed the library's PolyTerra PLA (alias rename) get family mints while 'PolyTerra PLA @0.2 nozzle' keeps the library id via inheritance. Fiberon families keep their authentic byte-copied Bambu catalog ids (sanctioned multi-vendor brand sharing, frozen in the snapshot). FlyingBear (8): every preset carries an own-key Bambu generic id; owners keep theirs, 15 impostor families (S1/Ghost7/Hyper lines) re-minted family-atomically - '@S1' and '@Ghost7' siblings move together (20 edits). Sovol (6): the GFL99 copy-paste epidemic. The five same-alias 'Generic * @Sovol SV08 MAX' tunings just DROP their wrong own-id lines so the library family ids flow through inheritance (alias-shadow-verified); Generic PLA Silk / SUNLU PETG adopt their library family ids as own keys (their inherits point at other families, so deletion would collide); the 21 dedicated Sovol/Polymaker families get fresh mints (23 edits). 'Sovol SV07 PLA' keeps GFL99 unambiguously (sole claimant on SV07), frozen in the snapshot. Verified: config-equivalence gate zero unexpected diffs; extra check exit 0; --check exit 0; validator -l 2 exit 0; extended -f -v Snapmaker/FlyingBear/ Sovol all exit 0. --- .../filament/FlyingBear PLA Hyper.json | 2 +- .../Ghost7/FlyingBear ABS @Ghost7.json | 2 +- .../Ghost7/FlyingBear PA-CF @Ghost7.json | 2 +- .../Ghost7/FlyingBear PC @Ghost7.json | 2 +- .../Ghost7/FlyingBear PLA Basic @Ghost7.json | 2 +- .../Ghost7/FlyingBear PLA Hyper @Ghost7.json | 2 +- .../filament/S1/FlyingBear ABS @S1.json | 2 +- .../filament/S1/FlyingBear PA-CF @S1.json | 2 +- .../filament/S1/FlyingBear PC @S1.json | 2 +- .../filament/S1/FlyingBear PETG @S1.json | 2 +- .../filament/S1/FlyingBear PLA @S1.json | 2 +- .../filament/S1/FlyingBear PLA Hyper @S1.json | 2 +- .../filament/S1/FlyingBear TPU @S1.json | 2 +- .../FlyingBear/filament/S1/Other ABS @S1.json | 2 +- .../filament/S1/Other PA-CF @S1.json | 2 +- .../FlyingBear/filament/S1/Other PC @S1.json | 2 +- .../filament/S1/Other PETG @S1.json | 2 +- .../FlyingBear/filament/S1/Other PLA @S1.json | 2 +- .../filament/S1/Other PLA Hyper @S1.json | 2 +- .../FlyingBear/filament/S1/Other TPU @S1.json | 2 +- .../PolyTerra Dual PLA @0.2 nozzle.json | 1 + .../PolyTerra J1 PLA @0.2 nozzle.json | 1 + .../filament/Polymaker/PolyTerra J1 PLA.json | 1 + .../filament/Snapmaker ABS Benchy @U1.json | 1 + .../filament/Snapmaker Dual ABS Benchy.json | 1 + .../filament/Snapmaker Dual TPE.json | 1 + .../Snapmaker Dual TPU High-Flow.json | 1 + .../filament/Snapmaker J1 ABS Benchy.json | 1 + .../Snapmaker/filament/Snapmaker J1 TPE.json | 1 + .../filament/Snapmaker J1 TPU High-Flow.json | 1 + .../filament/Snapmaker PA-CF @U1.json | 2 - .../filament/Snapmaker PET @Dual.json | 1 + .../Snapmaker PLA Matte @U1 base.json | 2 +- .../filament/Snapmaker PLA Matte @U1.json | 1 + .../Snapmaker/filament/Snapmaker TPE @U1.json | 1 + .../Snapmaker/filament/Snapmaker TPE.json | 1 + .../filament/Snapmaker TPU High-Flow @U1.json | 1 + .../filament/Generic ABS @Sovol SV08 MAX.json | 1 - .../filament/Generic PC @Sovol SV08 MAX.json | 1 - .../Generic PETG @Sovol SV08 MAX.json | 1 - .../filament/Generic PLA @Sovol SV08 MAX.json | 1 - .../Generic PLA Silk @Sovol SV08 MAX.json | 2 +- .../filament/Generic TPU @Sovol SV08 MAX.json | 1 - .../Polymaker PETG @Sovol SV08 MAX.json | 2 +- .../filament/SUNLU PETG @Sovol SV08 MAX.json | 2 +- .../Sovol/filament/Sovol SV06 ACE ABS.json | 2 +- .../Sovol/filament/Sovol SV06 ACE PETG.json | 2 +- .../Sovol/filament/Sovol SV06 ACE PLA.json | 2 +- .../Sovol/filament/Sovol SV06 ACE TPU.json | 2 +- .../filament/Sovol SV06 Plus ACE ABS.json | 2 +- .../filament/Sovol SV06 Plus ACE PETG.json | 2 +- .../filament/Sovol SV06 Plus ACE PLA.json | 2 +- .../filament/Sovol SV06 Plus ACE TPU.json | 2 +- .../Sovol/filament/Sovol SV08 ABS.json | 2 +- .../Sovol/filament/Sovol SV08 PETG.json | 2 +- .../Sovol SV08 PLA @SV08 0.2 nozzle.json | 2 +- .../Sovol/filament/Sovol SV08 PLA.json | 2 +- .../Sovol/filament/Sovol SV08 TPU.json | 2 +- .../Sovol/filament/Sovol Zero ABS.json | 2 +- .../Sovol/filament/Sovol Zero PC.json | 2 +- .../filament/Sovol Zero PETG HS Nozzle.json | 2 +- .../Sovol/filament/Sovol Zero PETG.json | 2 +- .../Sovol Zero PLA Basic HS Nozzle.json | 2 +- .../Sovol/filament/Sovol Zero PLA Basic.json | 2 +- .../Sovol Zero PLA Silk HS Nozzle.json | 2 +- .../Sovol/filament/Sovol Zero PLA Silk.json | 2 +- .../Sovol/filament/Sovol Zero TPU.json | 2 +- scripts/filament_id_snapshot.json | 282 ++++++++++++------ 68 files changed, 260 insertions(+), 136 deletions(-) diff --git a/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json b/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json index 6d3f9019b2..eca01c7a14 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper", "from": "system", "setting_id": "72RZHGo7eACm2tN5", - "filament_id": "GFL99", + "filament_id": "OFNz8rrn", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json index 814a100880..5147461208 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @Ghost7", "from": "system", "setting_id": "UyTzid0zVMCxSrgx", - "filament_id": "GFB99", + "filament_id": "OFnMW5jr", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json index ecbff8839e..5f2f9522fb 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @Ghost7", "from": "system", "setting_id": "NZwDOWmMdBYEejNQ", - "filament_id": "GFN98", + "filament_id": "OFCKK3u9", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json index 5a72ae3680..96f7e5a026 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @Ghost7", "from": "system", "setting_id": "QYOEUrnmNMUcVOVF", - "filament_id": "GFC99", + "filament_id": "OF4jILJA", "instantiation": "true", "filament_max_volumetric_speed": [ "12" 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 41f16faf65..c970880f0c 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json @@ -5,7 +5,7 @@ "renamed_from": "FlyingBear PLA @Ghost7", "from": "system", "setting_id": "3JBTG6IDrBCnvIhf", - "filament_id": "GFL99", + "filament_id": "OF50NUZI", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json index 488cda963c..6e44f41595 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @Ghost7", "from": "system", "setting_id": "qQZUolZHgJxgLo17", - "filament_id": "GFL99", + "filament_id": "OFNz8rrn", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json index a04e655f4b..af609d3348 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @S1", "from": "system", "setting_id": "7dtepGnoDDAdPtUh", - "filament_id": "GFB99", + "filament_id": "OFnMW5jr", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json index f24c0d882e..c94440b570 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @S1", "from": "system", "setting_id": "CLggyaDcebZSbqIH", - "filament_id": "GFN98", + "filament_id": "OFCKK3u9", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json index 54fb8a7ca1..41c4c28166 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @S1", "from": "system", "setting_id": "bPeSARy9AGqM8Y32", - "filament_id": "GFC99", + "filament_id": "OF4jILJA", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json index 77bc4b151f..3145034b51 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @S1", "from": "system", "setting_id": "yKU5mMW0nKvNH98B", - "filament_id": "GFG99", + "filament_id": "OFg4N6ZL", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json index 3c3fbd5af8..7ded765608 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @S1", "from": "system", "setting_id": "k58jL17n8cOla3Gd", - "filament_id": "GFL99", + "filament_id": "OFBGxHgT", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json index 06148f4f70..f422d04c4e 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @S1", "from": "system", "setting_id": "h8XGgMBjEwxNkldf", - "filament_id": "GFL99", + "filament_id": "OFNz8rrn", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json index 2cd4a9e943..57c0c169d3 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu @S1", "from": "system", "setting_id": "IVFpAlGo8KButueJ", - "filament_id": "GFU99", + "filament_id": "OFYfZgxU", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json b/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json index 7e37ab1996..9b28644704 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs_other @S1", "from": "system", "setting_id": "Nadd5NX7eDvEnlKO", - "filament_id": "GFB99", + "filament_id": "OFVJXE4n", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json index 8eff7046ea..074988bb61 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa_other @S1", "from": "system", "setting_id": "sSKkzXv1cn33fF7p", - "filament_id": "GFN98", + "filament_id": "OFLiTjQK", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json index 9a09e1c0d5..47bc577217 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc_other @S1", "from": "system", "setting_id": "mHuxaHppNFZbldHD", - "filament_id": "GFC99", + "filament_id": "OFTbdJyT", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json index b610388077..bc460077c8 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet_other @S1", "from": "system", "setting_id": "Ko5q6BgADth36RJC", - "filament_id": "GFG99", + "filament_id": "OFuPN3iW", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json index 1df8312686..79007e6e83 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_other @S1", "from": "system", "setting_id": "sayo3sMQKH4ZdhEk", - "filament_id": "GFL99", + "filament_id": "OF5Ugv12", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json index b9913afec4..58243ad2bc 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper_other @S1", "from": "system", "setting_id": "2QHCKH0yDmBzpQnY", - "filament_id": "GFL99", + "filament_id": "OFFmJ8aR", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json b/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json index aa56b7f0f7..2c3632740e 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu_other @S1", "from": "system", "setting_id": "wh8PHrEbFYKsQxo0", - "filament_id": "GFU99", + "filament_id": "OFvOhSjO", "instantiation": "true", "filament_max_volumetric_speed": [ "3" 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 b45068dd52..bdadb828e9 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 @@ -1,6 +1,7 @@ { "type": "filament", "from": "system", + "filament_id": "OF17cONC", "instantiation": "true", "name": "PolyTerra Dual PLA @0.2 nozzle", "setting_id": "UQYgjH1uVxf3d2Nv", 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 dd4f969f62..6062914ff0 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 @@ -1,6 +1,7 @@ { "type": "filament", "from": "system", + "filament_id": "OFjZw7k1", "instantiation": "true", "name": "PolyTerra J1 PLA @0.2 nozzle", "setting_id": "mxKHxGmBZzPLS82O", diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json index 7b66438058..1c23dc5fb4 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json @@ -1,6 +1,7 @@ { "type": "filament", "from": "system", + "filament_id": "OFjZw7k1", "instantiation": "true", "name": "PolyTerra J1 PLA", "setting_id": "4MZWZX7QPBzxdEGj", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json index db8dea187b..a0e8b152b7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker ABS @U1 base", "from": "system", "setting_id": "xszx4XRGrp88OdP8", + "filament_id": "OFgtZjeX", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json index e42e9efc4a..dd1863eac8 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Dual ABS @base", "from": "system", "setting_id": "YMUFsOzEISsMqCLe", + "filament_id": "OFxxa5yn", "instantiation": "true", "compatible_printers": [ "Snapmaker Artisan (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json index f29f3f2189..98b7787775 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Dual TPU @base", "from": "system", "setting_id": "KoZqZ4l1tYZ99JYz", + "filament_id": "OFAbsMuV", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json index 7db3a84d21..2696168f9d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Dual TPU @base", "from": "system", "setting_id": "D1vA7cdI5kghtrxf", + "filament_id": "OF0Ee2jQ", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json index 4b3dcc5e2f..c85da00ba2 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker J1 ABS @base", "from": "system", "setting_id": "b1Z94AhG8viXuDsq", + "filament_id": "OFePPmng", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json index b3c6a49434..80c1ff3650 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker J1 TPU @base", "from": "system", "setting_id": "6N7VB3mKAShGVYL3", + "filament_id": "OFChH9xu", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json index 4186cea511..81cc01669e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker J1 TPU @base", "from": "system", "setting_id": "wdN8j0Zv2bJ29XHA", + "filament_id": "OFKhtNBx", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json index 402b5785dd..b2dc562d3b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json @@ -6,8 +6,6 @@ "setting_id": "8aP6ye4aeOS7qKpG", "instantiation": "true", "compatible_printers": [ - "Snapmaker U1 (0.4 nozzle)", - "Snapmaker U1 (0.4 nozzle)", "Snapmaker U1 (0.4 nozzle)" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json index 4bf208ea44..4eb1143082 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Dual PET @base", "from": "system", "setting_id": "3xJOWlbt2feyRKTV", + "filament_id": "2549587591", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.8 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json index 3ffb3314a1..ac2ea870ea 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Snapmaker PLA Matte @U1 base", "from": "system", - "filament_id": "141703112701", + "filament_id": "OFlbn4FY", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json index fcb1d74c92..67c1ebd2e3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker PLA @U1 base", "from": "system", "setting_id": "uAhykL5ap1DAKacf", + "filament_id": "OFlbn4FY", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json index 846f7acff9..59f4b2af8e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker TPU @U1 base", "from": "system", "setting_id": "aqE9IR6dFd2MQLXR", + "filament_id": "OF70DKqH", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPE.json b/resources/profiles/Snapmaker/filament/Snapmaker TPE.json index 861f11ff09..78b8f2484f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPE.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPE.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker TPU @base", "from": "system", "setting_id": "pFGj8sxkPmk10bP4", + "filament_id": "OF70DKqH", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json index d338d8e4b9..96252c2de1 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker TPU @U1 base", "from": "system", "setting_id": "5AXIg8WCdcd74S5v", + "filament_id": "OFtet8ui", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)", 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 8e043a5a48..8532e5bee0 100644 --- a/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08 MAX.json @@ -1,6 +1,5 @@ { "type": "filament", - "filament_id": "GFL99", "setting_id": "7julgReKEcp5tg0d", "name": "Generic ABS @Sovol SV08 MAX", "from": "system", 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 ec1fefce99..242c320a7d 100644 --- a/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic PC @Sovol SV08 MAX.json @@ -1,6 +1,5 @@ { "type": "filament", - "filament_id": "GFL99", "setting_id": "UPoqjanrvN173sVS", "name": "Generic PC @Sovol SV08 MAX", "from": "system", 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 d23224b8f9..550d30ccf5 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08 MAX.json @@ -1,6 +1,5 @@ { "type": "filament", - "filament_id": "GFL99", "setting_id": "ib7AtR3tQ2dSrFNP", "name": "Generic PETG @Sovol SV08 MAX", "from": "system", 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 7ef7748ec1..b29bc1b069 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 MAX.json @@ -1,6 +1,5 @@ { "type": "filament", - "filament_id": "GFL99", "setting_id": "kcFykpuuxMy7KwNu", "name": "Generic PLA @Sovol SV08 MAX", "from": "system", 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 40f10eb1ed..9fe50fc1b6 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OGFL96", "setting_id": "WAHQZmwHoS4WjoTx", "name": "Generic PLA Silk @Sovol SV08 MAX", "from": "system", 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 1c115fe8aa..a65978a50e 100644 --- a/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08 MAX.json @@ -1,6 +1,5 @@ { "type": "filament", - "filament_id": "GFL99", "setting_id": "hQByQ7FIhAiytli8", "name": "Generic TPU @Sovol SV08 MAX", "from": "system", 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 02b335f910..2d9196c316 100644 --- a/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OF22AxCm", "setting_id": "JBFKMaFtd7kO8Ksq", "name": "Polymaker PETG @Sovol SV08 MAX", "from": "system", 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 35ee5bcd03..9df001b6c9 100644 --- a/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OGFSNL08", "setting_id": "x68SPQCqVacBSGd5", "name": "SUNLU PETG @Sovol SV08 MAX", "from": "system", diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json index c77c7812b6..b904edd7d4 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "okqqqm0P8ehlQuDY", - "filament_id": "GFL99", + "filament_id": "OFtemzzw", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json index b8151d47f4..82969be3fb 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "5mtng0PM8CMglpD7", - "filament_id": "GFL99", + "filament_id": "OFGFZhWu", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json index da10d948ab..317c30a966 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "kgtcANsbfwSbdgOh", - "filament_id": "GFL99", + "filament_id": "OFic2uNr", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json index 3d560d9905..c4c0397846 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ERN0ozxmPhIMze0i", - "filament_id": "GFL99", + "filament_id": "OFglpvEE", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json index 42652117ef..9a2b1e5cae 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "Me1iSJmocW35ClmN", - "filament_id": "GFL99", + "filament_id": "OF5Bmdtg", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json index 483d28af10..87f012c539 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "ZrAm6Nm4FI7p4PgC", - "filament_id": "GFL99", + "filament_id": "OFgMGSpF", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json index ef249ea17f..806b3a35fd 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "YEEOGJYm4Z8W4vGV", - "filament_id": "GFL99", + "filament_id": "OFSoZBK2", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json index 2589b13e37..f19fb592b9 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "oNucKLcIdxwBPpUN", - "filament_id": "GFL99", + "filament_id": "OFsmPFwh", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 ABS.json b/resources/profiles/Sovol/filament/Sovol SV08 ABS.json index 0bb16950d3..f35a2372a1 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 ABS.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "nq4vvrWqKjWKELEz", - "filament_id": "GFL99", + "filament_id": "OFKH15Hd", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PETG.json b/resources/profiles/Sovol/filament/Sovol SV08 PETG.json index 4fe3cc866f..81e3e2db41 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PETG.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "CWd7KULbXvJeTTEy", - "filament_id": "GFL99", + "filament_id": "OFIl3ar9", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json b/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json index 046d787dc5..b013826043 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "qmnuve3FgzrXgjPA", - "filament_id": "GFL99", + "filament_id": "OFcsHCy4", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PLA.json b/resources/profiles/Sovol/filament/Sovol SV08 PLA.json index 2132557b68..cb32bceb71 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PLA.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "nnU0222BS0F1c5ki", - "filament_id": "GFL99", + "filament_id": "OFcsHCy4", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 TPU.json b/resources/profiles/Sovol/filament/Sovol SV08 TPU.json index a1d0cb0fdc..f93c734acc 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 TPU.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "tpBbCQhcSJsBesnG", - "filament_id": "GFL99", + "filament_id": "OFY1U4uM", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero ABS.json b/resources/profiles/Sovol/filament/Sovol Zero ABS.json index ecd862970a..16fabab6e8 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero ABS.json +++ b/resources/profiles/Sovol/filament/Sovol Zero ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "9pI7op6U4azpfNfb", - "filament_id": "GFL99", + "filament_id": "OFgNzLVh", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PC.json b/resources/profiles/Sovol/filament/Sovol Zero PC.json index ac866620dd..9c82b6a60b 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PC.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PC.json @@ -4,7 +4,7 @@ "inherits": "Generic PC @System", "from": "system", "setting_id": "vuuZXnlrMgUKtSI0", - "filament_id": "GFL99", + "filament_id": "OFtwA91m", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json b/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json index a458307c64..569c670407 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "AfxHmpdOkMDJa2fk", - "filament_id": "GFL99", + "filament_id": "OFk6T5YH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PETG.json b/resources/profiles/Sovol/filament/Sovol Zero PETG.json index e7b328ac6f..db83f4d2e4 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PETG.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "75OJvkXlmbcaHQfW", - "filament_id": "GFL99", + "filament_id": "OFjurQ3I", "instantiation": "true", "filament_flow_ratio": [ "1.0348" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json index f7e634386c..b3d235da7d 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "i9wDnSEIrOBPbOZl", - "filament_id": "GFL99", + "filament_id": "OFtL05hE", "instantiation": "true", "filament_flow_ratio": [ "1.0348" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json index b7fb7f63e8..93c2382024 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "ZVvOaMwZ7noevsYf", - "filament_id": "GFL99", + "filament_id": "OF5J2axC", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json index d6b31b283d..2db612ff8f 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "XxEJBNFLRltR2Xwn", - "filament_id": "GFL99", + "filament_id": "OFP4poIv", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json index 64c8b8a465..d86d68212d 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "QowhGzqSwGQoAp1a", - "filament_id": "GFL99", + "filament_id": "OF2tvNYA", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero TPU.json b/resources/profiles/Sovol/filament/Sovol Zero TPU.json index 307a58ff01..d2f9247ada 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero TPU.json +++ b/resources/profiles/Sovol/filament/Sovol Zero TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "iZHXx0RyRO096L0z", - "filament_id": "GFL99", + "filament_id": "OFO5R9KJ", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 9145cab4da..7272d33806 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1882,6 +1882,9 @@ "Snapmaker/PolyLite PLA Pro Metallic @Snapmaker U1 base", "Snapmaker/PolyLite PLA Starlight @Snapmaker U1 base", "Snapmaker/PolyLite PLA Translucent @Snapmaker U1 base", + "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", + "Snapmaker/PolyTerra J1 PLA", + "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", "Snapmaker/PolyTerra PLA @Snapmaker U1 base", "Snapmaker/PolyTerra PLA Marble @Snapmaker U1 base", "Snapmaker/PolyTerra PLA+ @Snapmaker U1 base", @@ -1890,6 +1893,8 @@ "Snapmaker/Polymaker PLA @Snapmaker U1 base", "Snapmaker/Polymaker PLA Pro @Snapmaker U1 base", "Snapmaker/Polymaker PLA Pro Metallic @Snapmaker U1 base", + "Snapmaker/Snapmaker ABS Benchy @U1", + "Snapmaker/Snapmaker Dual ABS Benchy", "Snapmaker/Snapmaker Dual PA-CF @base", "Snapmaker/Snapmaker Dual PET @base", "Snapmaker/Snapmaker Dual PLA @base", @@ -1898,6 +1903,9 @@ "Snapmaker/Snapmaker Dual PLA Metal @base", "Snapmaker/Snapmaker Dual PLA Silk @base", "Snapmaker/Snapmaker Dual PLA-CF @base", + "Snapmaker/Snapmaker Dual TPE", + "Snapmaker/Snapmaker Dual TPU High-Flow", + "Snapmaker/Snapmaker J1 ABS Benchy", "Snapmaker/Snapmaker J1 PA-CF @base", "Snapmaker/Snapmaker J1 PET @base", "Snapmaker/Snapmaker J1 PLA @base", @@ -1906,25 +1914,27 @@ "Snapmaker/Snapmaker J1 PLA Metal @base", "Snapmaker/Snapmaker J1 PLA Silk @base", "Snapmaker/Snapmaker J1 PLA-CF @base", + "Snapmaker/Snapmaker J1 TPE", + "Snapmaker/Snapmaker J1 TPU High-Flow", "Snapmaker/Snapmaker PA-CF @U1 base", "Snapmaker/Snapmaker PA-CF @base", + "Snapmaker/Snapmaker PET @Dual", "Snapmaker/Snapmaker PET @U1 base", "Snapmaker/Snapmaker PET @base", "Snapmaker/Snapmaker PLA @U1 base", "Snapmaker/Snapmaker PLA @base", "Snapmaker/Snapmaker PLA Eco @U1 base", "Snapmaker/Snapmaker PLA Eco @base", + "Snapmaker/Snapmaker PLA Matte @U1", "Snapmaker/Snapmaker PLA Metal @U1 base", "Snapmaker/Snapmaker PLA Silk @U1 base", "Snapmaker/Snapmaker PLA Silk @base", "Snapmaker/Snapmaker PLA-CF @U1 base", "Snapmaker/Snapmaker PLA-CF @base", - "Sovol/Generic ABS @Sovol SV08 MAX", - "Sovol/Generic PC @Sovol SV08 MAX", - "Sovol/Generic PETG @Sovol SV08 MAX", - "Sovol/Generic PLA @Sovol SV08 MAX", + "Snapmaker/Snapmaker TPE", + "Snapmaker/Snapmaker TPE @U1", + "Snapmaker/Snapmaker TPU High-Flow @U1", "Sovol/Generic PLA Silk @Sovol SV08 MAX", - "Sovol/Generic TPU @Sovol SV08 MAX", "Sovol/Polymaker PETG @Sovol SV08 MAX", "Sovol/SUNLU PETG @Sovol SV08 MAX", "Sovol/Sovol SV06 ACE ABS", @@ -2287,8 +2297,7 @@ "Snapmaker/Snapmaker J1 PA-CF" ], "1223824394": [ - "Snapmaker/Snapmaker J1 ABS", - "Snapmaker/Snapmaker J1 ABS Benchy" + "Snapmaker/Snapmaker J1 ABS" ], "1247172706": [ "Snapmaker/Snapmaker Dual ASA" @@ -2317,8 +2326,7 @@ "Snapmaker/Snapmaker Dual PLA" ], "14170311270": [ - "Snapmaker/Snapmaker PLA", - "Snapmaker/Snapmaker PLA Matte" + "Snapmaker/Snapmaker PLA" ], "141703112701": [ "Snapmaker/Snapmaker PLA SnapSpeed" @@ -2330,7 +2338,6 @@ "Snapmaker/Snapmaker J1 ASA" ], "1480063856": [ - "Snapmaker/Snapmaker TPE", "Snapmaker/Snapmaker TPU" ], "15001": [ @@ -2346,12 +2353,10 @@ "Snapmaker/Snapmaker PLA Silk" ], "168223792": [ - "Snapmaker/Snapmaker Dual ABS", - "Snapmaker/Snapmaker Dual ABS Benchy" + "Snapmaker/Snapmaker Dual ABS" ], "1682237920": [ - "Snapmaker/Snapmaker ABS", - "Snapmaker/Snapmaker ABS Benchy" + "Snapmaker/Snapmaker ABS" ], "1695556157": [ "Snapmaker/Snapmaker PLA Eco" @@ -2388,8 +2393,7 @@ "Snapmaker/Snapmaker PLA Metal" ], "2128577941": [ - "Snapmaker/Snapmaker Dual PET", - "Snapmaker/Snapmaker PET" + "Snapmaker/Snapmaker Dual PET" ], "21285779410": [ "Snapmaker/Snapmaker PET" @@ -2410,14 +2414,10 @@ "Creality/Hyper Marble" ], "2971656290": [ - "Snapmaker/Snapmaker Dual TPE", - "Snapmaker/Snapmaker Dual TPU", - "Snapmaker/Snapmaker Dual TPU High-Flow" + "Snapmaker/Snapmaker Dual TPU" ], "29716562900": [ - "Snapmaker/Snapmaker TPE", - "Snapmaker/Snapmaker TPU", - "Snapmaker/Snapmaker TPU High-Flow" + "Snapmaker/Snapmaker TPU" ], "297165629001": [ "Snapmaker/Snapmaker TPU 95A" @@ -2462,9 +2462,7 @@ "Snapmaker/Snapmaker J1 PLA Metal" ], "4092268632": [ - "Snapmaker/Snapmaker J1 TPE", - "Snapmaker/Snapmaker J1 TPU", - "Snapmaker/Snapmaker J1 TPU High-Flow" + "Snapmaker/Snapmaker J1 TPU" ], "4227461134": [ "Snapmaker/Snapmaker Breakaway Support For PLA", @@ -3280,9 +3278,7 @@ "FLSun/FLSun T1 ABS", "Flashforge/Flashforge Generic ABS", "Flashforge/Generic ABS", - "FlyingBear/FlyingBear ABS", "FlyingBear/FlyingBear Generic ABS", - "FlyingBear/Other ABS", "InfiMech/InfiMech Generic ABS", "Lulzbot/Lulzbot 2.85mm ABS", "OrcaArena/OrcaArena Generic ABS", @@ -3349,8 +3345,6 @@ "Custom/Generic PC", "FLSun/FLSun Generic PC", "FlyingBear/FlyingBear Generic PC", - "FlyingBear/FlyingBear PC", - "FlyingBear/Other PC", "InfiMech/InfiMech Generic PC", "OrcaArena/OrcaArena Generic PC", "Prusa/Prusa Generic PC", @@ -3462,9 +3456,7 @@ "Flashforge/Flashforge Generic PETG", "Flashforge/Generic PETG", "FlyingBear/FlyingBear Generic PETG", - "FlyingBear/FlyingBear PETG", "FlyingBear/FlyingBear PETG Basic", - "FlyingBear/Other PETG", "InfiMech/InfiMech Generic PETG", "Lulzbot/Lulzbot 2.85mm PETG", "MagicMaker/MM Generic PEEK", @@ -3779,11 +3771,6 @@ "Flashforge/Generic PLA", "Flashforge/Generic PLA High Speed", "FlyingBear/FlyingBear Generic PLA", - "FlyingBear/FlyingBear PLA", - "FlyingBear/FlyingBear PLA Basic", - "FlyingBear/FlyingBear PLA Hyper", - "FlyingBear/Other PLA", - "FlyingBear/Other PLA Hyper", "InfiMech/InfiMech Generic PLA", "Lulzbot/Lulzbot 2.85mm PLA", "OrcaArena/OrcaArena Generic PLA", @@ -3799,36 +3786,7 @@ "Ratrig/RatRig BigNozzle TPU", "Ratrig/RatRig Generic PLA", "SecKit/SecKit Generic PLA", - "Sovol/Generic ABS", - "Sovol/Generic PC", - "Sovol/Generic PETG", - "Sovol/Generic PLA", - "Sovol/Generic PLA Silk", - "Sovol/Generic TPU", - "Sovol/Polymaker PETG", - "Sovol/SUNLU PETG", - "Sovol/Sovol SV06 ACE ABS", - "Sovol/Sovol SV06 ACE PETG", - "Sovol/Sovol SV06 ACE PLA", - "Sovol/Sovol SV06 ACE TPU", - "Sovol/Sovol SV06 Plus ACE ABS", - "Sovol/Sovol SV06 Plus ACE PETG", - "Sovol/Sovol SV06 Plus ACE PLA", - "Sovol/Sovol SV06 Plus ACE TPU", "Sovol/Sovol SV07 PLA", - "Sovol/Sovol SV08 ABS", - "Sovol/Sovol SV08 PETG", - "Sovol/Sovol SV08 PLA", - "Sovol/Sovol SV08 TPU", - "Sovol/Sovol Zero ABS", - "Sovol/Sovol Zero PC", - "Sovol/Sovol Zero PETG", - "Sovol/Sovol Zero PETG HS Nozzle", - "Sovol/Sovol Zero PLA Basic", - "Sovol/Sovol Zero PLA Basic HS Nozzle", - "Sovol/Sovol Zero PLA Silk", - "Sovol/Sovol Zero PLA Silk HS Nozzle", - "Sovol/Sovol Zero TPU", "Tiertime/Tiertime Generic PLA", "Tiertime/Tiertime Generic SBS", "Volumic/Volumic PLA Ultra", @@ -3916,8 +3874,6 @@ "Creality/Creality Generic PA-CF", "FLSun/FLSun Generic PA-CF", "FlyingBear/FlyingBear Generic PA-CF", - "FlyingBear/FlyingBear PA-CF", - "FlyingBear/Other PA-CF", "InfiMech/InfiMech Generic PA-CF", "OrcaArena/OrcaArena Generic PA-CF", "Prusa/Prusament PA-CF", @@ -4428,9 +4384,7 @@ "FLSun/FLSun S1 TPU", "FLSun/FLSun T1 TPU", "FlyingBear/FlyingBear Generic TPU", - "FlyingBear/FlyingBear TPU", "FlyingBear/FlyingBear TPU Basic", - "FlyingBear/Other TPU", "InfiMech/InfiMech Generic TPU", "InfiMech/InfiMech TPU Basic", "OrcaArena/OrcaArena Generic TPU", @@ -4644,6 +4598,9 @@ "OF09vOcG": [ "Elegoo/Elegoo PLA Galaxy" ], + "OF0Ee2jQ": [ + "Snapmaker/Snapmaker Dual TPU High-Flow" + ], "OF0M6QAQ": [ "OrcaFilamentLibrary/Elegoo PLA Galaxy" ], @@ -4671,12 +4628,21 @@ "OF102WKM": [ "OrcaFilamentLibrary/Elegoo PETG PRO" ], + "OF17cONC": [ + "Snapmaker/PolyTerra Dual PLA" + ], "OF1Zypyy": [ "Qidi/QIDI PETG Tough" ], + "OF22AxCm": [ + "Sovol/Polymaker PETG" + ], "OF2UFmOo": [ "Qidi/Bambu PLA" ], + "OF2tvNYA": [ + "Sovol/Sovol Zero PLA Silk" + ], "OF38Hyk4": [ "Flashforge/Flashforge PETG Pro" ], @@ -4707,18 +4673,33 @@ "OF4gzzE4": [ "Qidi/QIDI PET-CF" ], + "OF4jILJA": [ + "FlyingBear/FlyingBear PC" + ], "OF4m9A5w": [ "Flashforge/Flashforge Generic HIPS" ], + "OF50NUZI": [ + "FlyingBear/FlyingBear PLA Basic" + ], "OF57IbZT": [ "Artillery/Artillery PLA Basic" ], + "OF5Bmdtg": [ + "Sovol/Sovol SV06 Plus ACE ABS" + ], + "OF5J2axC": [ + "Sovol/Sovol Zero PLA Basic" + ], "OF5T1Y9R": [ "Flashforge/Flashforge ABS Basic" ], "OF5UUaUM": [ "Qidi/Qidi Generic PLA High Speed" ], + "OF5Ugv12": [ + "FlyingBear/Other PLA" + ], "OF5kwfZu": [ "Flashforge/FusRock Generic NexPA-CF25" ], @@ -4740,6 +4721,9 @@ "OF6XIeUW": [ "Flashforge/Generic PLA-CF10" ], + "OF70DKqH": [ + "Snapmaker/Snapmaker TPE" + ], "OF79FFkO": [ "OrcaFilamentLibrary/Elegoo PC-FR" ], @@ -4779,6 +4763,9 @@ "OFAUDGEQ": [ "Qidi/QIDI PLA Rapido Matte" ], + "OFAbsMuV": [ + "Snapmaker/Snapmaker Dual TPE" + ], "OFAdAYYk": [ "Qidi/QIDI PPS-CF" ], @@ -4794,6 +4781,9 @@ "OFAtydxE": [ "Flashforge/FusRock S-Multi" ], + "OFBGxHgT": [ + "FlyingBear/FlyingBear PLA" + ], "OFBvxnjM": [ "Elegoo/Elegoo PETG-GF" ], @@ -4806,9 +4796,15 @@ "OFCJaXZS": [ "Flashforge/Flashforge PPS" ], + "OFCKK3u9": [ + "FlyingBear/FlyingBear PA-CF" + ], "OFCgpxn2": [ "Prusa/Prusa Generic ABS HF" ], + "OFChH9xu": [ + "Snapmaker/Snapmaker J1 TPE" + ], "OFD5e0sH": [ "OrcaFilamentLibrary/Elegoo Rapid PLA+" ], @@ -4836,12 +4832,18 @@ "OFFIL5pD": [ "Qidi/QIDI PA12-CF" ], + "OFFmJ8aR": [ + "FlyingBear/Other PLA Hyper" + ], "OFFrbsvQ": [ "InfiMech/Other TPU" ], "OFG8vHw8": [ "Qidi/Qidi Generic ASA" ], + "OFGFZhWu": [ + "Sovol/Sovol SV06 ACE PETG" + ], "OFGb4hPY": [ "Anycubic/Anycubic PEBA 95A" ], @@ -4863,6 +4865,9 @@ "OFIGHU7W": [ "OrcaFilamentLibrary/Elegoo PETG-CF" ], + "OFIl3ar9": [ + "Sovol/Sovol SV08 PETG" + ], "OFJIImD5": [ "OrcaFilamentLibrary/Elegoo PET-CF" ], @@ -4881,12 +4886,18 @@ "OFKDnrjL": [ "Artillery/Artillery PLA Matte" ], + "OFKH15Hd": [ + "Sovol/Sovol SV08 ABS" + ], "OFKWVi10": [ "Flashforge/Flashforge Generic PLA-CF10" ], "OFKZH00L": [ "Flashforge/FusRock Generic PET-CF" ], + "OFKhtNBx": [ + "Snapmaker/Snapmaker J1 TPU High-Flow" + ], "OFKjlAbC": [ "Qidi/QIDI UltraPA-CF25" ], @@ -4905,6 +4916,9 @@ "OFLeFaUO": [ "Flashforge/Flashforge Generic PVA" ], + "OFLiTjQK": [ + "FlyingBear/Other PA-CF" + ], "OFLriDvE": [ "Creality/Creality Generic PLA High Speed" ], @@ -4938,6 +4952,12 @@ "OFNbajj9": [ "Creality/Creality Generic ASA-CF" ], + "OFNz8rrn": [ + "FlyingBear/FlyingBear PLA Hyper" + ], + "OFO5R9KJ": [ + "Sovol/Sovol Zero TPU" + ], "OFOSzSuh": [ "Flashforge/Flashforge PA-CF" ], @@ -4953,6 +4973,9 @@ "OFOysPuE": [ "Qidi/QIDI TPU-GF" ], + "OFP4poIv": [ + "Sovol/Sovol Zero PLA Silk HS Nozzle" + ], "OFPJJxkF": [ "Flashforge/Flashforge PET-CF" ], @@ -5004,6 +5027,9 @@ "OFSdF3B1": [ "Flashforge/FusRock PAHT-CF" ], + "OFSoZBK2": [ + "Sovol/Sovol SV06 Plus ACE PLA" + ], "OFSpTWdv": [ "InfiMech/Other PA-CF" ], @@ -5013,6 +5039,9 @@ "OFTa6gPH": [ "Flashforge/Flashforge PLA Pro" ], + "OFTbdJyT": [ + "FlyingBear/Other PC" + ], "OFTbsWVg": [ "Artillery/Artillery TPU" ], @@ -5040,6 +5069,9 @@ "OFVBNoov": [ "InfiMech/InfiMech ABS" ], + "OFVJXE4n": [ + "FlyingBear/Other ABS" + ], "OFVLuVmD": [ "OrcaFilamentLibrary/Elegoo Rapid PETG" ], @@ -5082,6 +5114,9 @@ "OFXv4FUi": [ "Flashforge/Flashforge PLA Galaxy" ], + "OFY1U4uM": [ + "Sovol/Sovol SV08 TPU" + ], "OFYH00jV": [ "Qidi/QIDI ABS-GF" ], @@ -5094,6 +5129,9 @@ "OFYZs7dN": [ "Flashforge/Flashforge Generic HS PLA" ], + "OFYfZgxU": [ + "FlyingBear/FlyingBear TPU" + ], "OFZAkPHG": [ "Qidi/QIDI PPS-GF" ], @@ -5145,6 +5183,9 @@ "OFcqs5g7": [ "Elegoo/Elegoo PLA Translucent2" ], + "OFcsHCy4": [ + "Sovol/Sovol SV08 PLA" + ], "OFcy60o4": [ "Flashforge/Flashforge ASA Basic" ], @@ -5163,6 +5204,9 @@ "OFeFRwST": [ "Flashforge/Flashforge PVA" ], + "OFePPmng": [ + "Snapmaker/Snapmaker J1 ABS Benchy" + ], "OFeWMAGH": [ "Flashforge/Flashforge HS PLA Burnt Ti" ], @@ -5193,18 +5237,33 @@ "OFftQOek": [ "Flashforge/Flashforge PLA Matte" ], + "OFg4N6ZL": [ + "FlyingBear/FlyingBear PETG" + ], "OFgJX0Fc": [ "Flashforge/FlashForge PPS" ], "OFgK2Xvv": [ "Anycubic/Anycubic PLA" ], + "OFgMGSpF": [ + "Sovol/Sovol SV06 Plus ACE PETG" + ], + "OFgNzLVh": [ + "Sovol/Sovol Zero ABS" + ], "OFgSK1hL": [ "Anycubic/Anycubic PLA High Speed" ], + "OFglpvEE": [ + "Sovol/Sovol SV06 ACE TPU" + ], "OFgrGfPy": [ "Anycubic/Anycubic PLA+" ], + "OFgtZjeX": [ + "Snapmaker/Snapmaker ABS Benchy" + ], "OFh5GUhZ": [ "Elegoo/Elegoo PLA Wood" ], @@ -5220,6 +5279,9 @@ "OFiJYDPC": [ "Qidi/HATCHBOX PLA" ], + "OFic2uNr": [ + "Sovol/Sovol SV06 ACE PLA" + ], "OFicxmSa": [ "Prusa/Prusa Generic PLA HF" ], @@ -5232,6 +5294,9 @@ "OFjFPhUC": [ "Prusa/Prusament rPLA" ], + "OFjZw7k1": [ + "Snapmaker/PolyTerra J1 PLA" + ], "OFjdTQd6": [ "Anycubic/Anycubic PLA Silk" ], @@ -5244,9 +5309,15 @@ "OFjqPjjl": [ "Flashforge/Generic PET" ], + "OFjurQ3I": [ + "Sovol/Sovol Zero PETG" + ], "OFk388hR": [ "Elegoo/Generic PA6-CF" ], + "OFk6T5YH": [ + "Sovol/Sovol Zero PETG HS Nozzle" + ], "OFkaDtKx": [ "Flashforge/Flashforge PA66-CF" ], @@ -5265,6 +5336,9 @@ "OFlNKZLP": [ "Flashforge/Flashforge PLA Metal" ], + "OFlbn4FY": [ + "Snapmaker/Snapmaker PLA Matte" + ], "OFm1VZed": [ "Flashforge/Flashforge Generic PLA-CF" ], @@ -5292,6 +5366,9 @@ "OFnLnZQo": [ "Cubicon/Cubicon PC" ], + "OFnMW5jr": [ + "FlyingBear/FlyingBear ABS" + ], "OFnY9ovF": [ "Artillery/Artillery PA-CF" ], @@ -5373,6 +5450,9 @@ "OFsgANe3": [ "Flashforge/Flashforge PAHT-CF" ], + "OFsmPFwh": [ + "Sovol/Sovol SV06 Plus ACE TPU" + ], "OFt5bvKK": [ "Artillery/Artillery PETG Basic" ], @@ -5385,15 +5465,30 @@ "OFtJMczs": [ "Flashforge/Flashforge TPU-64D" ], + "OFtL05hE": [ + "Sovol/Sovol Zero PLA Basic HS Nozzle" + ], "OFtXBjvb": [ "Artillery/Artillery PLA Tough" ], + "OFtemzzw": [ + "Sovol/Sovol SV06 ACE ABS" + ], + "OFtet8ui": [ + "Snapmaker/Snapmaker TPU High-Flow" + ], "OFtmT4Nd": [ "Artillery/Artillery ASA" ], + "OFtwA91m": [ + "Sovol/Sovol Zero PC" + ], "OFuPC4S8": [ "Elegoo/Elegoo PLA-CF" ], + "OFuPN3iW": [ + "FlyingBear/Other PETG" + ], "OFuTFxVP": [ "Qidi/Overture ABS" ], @@ -5427,6 +5522,9 @@ "OFvN3117": [ "Qidi/QIDI PLA Matte Basic" ], + "OFvOhSjO": [ + "FlyingBear/Other TPU" + ], "OFvYfHPB": [ "Anycubic/Anycubic PLA Matte" ], @@ -5469,6 +5567,9 @@ "OFxjFYxE": [ "Elegoo/Elegoo PETG HF" ], + "OFxxa5yn": [ + "Snapmaker/Snapmaker Dual ABS Benchy" + ], "OFyD1Zo8": [ "InfiMech/Other PC" ], @@ -5559,7 +5660,8 @@ ], "OGFB99": [ "Custom/Generic ABS", - "OrcaFilamentLibrary/Generic ABS" + "OrcaFilamentLibrary/Generic ABS", + "Sovol/Generic ABS" ], "OGFC00": [ "OrcaFilamentLibrary/Bambu PC" @@ -5568,7 +5670,8 @@ "OrcaFilamentLibrary/Bambu PC FR" ], "OGFC99": [ - "OrcaFilamentLibrary/Generic PC" + "OrcaFilamentLibrary/Generic PC", + "Sovol/Generic PC" ], "OGFG00": [ "OrcaFilamentLibrary/Bambu PETG Basic" @@ -5589,7 +5692,8 @@ "OrcaFilamentLibrary/Generic PCTG" ], "OGFG99": [ - "OrcaFilamentLibrary/Generic PETG" + "OrcaFilamentLibrary/Generic PETG", + "Sovol/Generic PETG" ], "OGFGG300": [ "OrcaFilamentLibrary/GreenGate3D PETG" @@ -5602,8 +5706,6 @@ ], "OGFL01": [ "OrcaFilamentLibrary/PolyTerra PLA", - "Snapmaker/PolyTerra Dual PLA", - "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra PLA" ], "OGFL03": [ @@ -5641,14 +5743,16 @@ ], "OGFL96": [ "Flashforge/Generic PLA Silk", - "OrcaFilamentLibrary/Generic PLA Silk" + "OrcaFilamentLibrary/Generic PLA Silk", + "Sovol/Generic PLA Silk" ], "OGFL98": [ "OrcaFilamentLibrary/Generic PLA-CF" ], "OGFL99": [ "Flashforge/Generic PLA", - "OrcaFilamentLibrary/Generic PLA" + "OrcaFilamentLibrary/Generic PLA", + "Sovol/Generic PLA" ], "OGFLC99": [ "OrcaFilamentLibrary/Generic CoPE" @@ -5807,7 +5911,8 @@ "OrcaFilamentLibrary/SUNLU Wood PLA" ], "OGFSNL08": [ - "OrcaFilamentLibrary/SUNLU PETG" + "OrcaFilamentLibrary/SUNLU PETG", + "Sovol/SUNLU PETG" ], "OGFT01": [ "OrcaFilamentLibrary/Bambu PET-CF" @@ -5820,7 +5925,8 @@ "OrcaFilamentLibrary/Bambu TPU 95A" ], "OGFU99": [ - "OrcaFilamentLibrary/Generic TPU" + "OrcaFilamentLibrary/Generic TPU", + "Sovol/Generic TPU" ], "OVTABS08": [ "OrcaFilamentLibrary/Overture ABS Basic" @@ -8933,12 +9039,22 @@ "SeeMeCNC/SeeMeCNC PETG-CF", "SeeMeCNC/SeeMeCNC PLA", "SeeMeCNC/SeeMeCNC TPU", - "Sovol/Generic ABS @Sovol SV08 MAX", - "Sovol/Generic PC @Sovol SV08 MAX", - "Sovol/Generic PETG @Sovol SV08 MAX", - "Sovol/Generic PLA @Sovol SV08 MAX", + "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", + "Snapmaker/PolyTerra J1 PLA", + "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", + "Snapmaker/Snapmaker ABS Benchy @U1", + "Snapmaker/Snapmaker Dual ABS Benchy", + "Snapmaker/Snapmaker Dual TPE", + "Snapmaker/Snapmaker Dual TPU High-Flow", + "Snapmaker/Snapmaker J1 ABS Benchy", + "Snapmaker/Snapmaker J1 TPE", + "Snapmaker/Snapmaker J1 TPU High-Flow", + "Snapmaker/Snapmaker PET @Dual", + "Snapmaker/Snapmaker PLA Matte @U1", + "Snapmaker/Snapmaker TPE", + "Snapmaker/Snapmaker TPE @U1", + "Snapmaker/Snapmaker TPU High-Flow @U1", "Sovol/Generic PLA Silk @Sovol SV08 MAX", - "Sovol/Generic TPU @Sovol SV08 MAX", "Sovol/Polymaker PETG @Sovol SV08 MAX", "Sovol/SUNLU PETG @Sovol SV08 MAX", "Sovol/Sovol SV06 ACE ABS", From 55a3114ec93a748a99de27084fe6ef5da43d57a1 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:16:01 +0800 Subject: [PATCH 10/52] Long-tail vendors: family filament_ids (17 vendors, 41 collision groups) Phase 2 completion - Volumic, Ratrig, Chuanying, Afinia, Eryone, FLSun, Tiertime, Blocks, CONSTRUCT3D, Co Print, CoLiDo, DeltaMaker, Ginger Additive, OrcaArena, Peopoly, Wanhao France, iQ. All are P1 copy-paste or small structural fixes; owners keep their ids by Bambu-catalog/OFL/historic- introducer precedence, impostor families get fresh deterministic mints, zero effective-config change: - Volumic 10 mints (ABS/ASA/PP, PETG/PCTG/ESD, PLA/UNIVERSAL, PA/PPS lines); Ratrig 10 (BigNozzle/PunkFil lines off the Generic line's ids); Chuanying 8 (plus 3 redundant own-id lines removed so parents' minted ids flow to the 0.25-nozzle variants); FLSun 4 (S1/T1 High Speed + Silk); Peopoly 4 (Lancer lines off Generic PLA's GFL99); Afinia 3 (Value PLA/ABS+/Value ABS inside the frozen GFx##_## scheme); Co Print 3 (ABS/PETG/TPU off GFL99). - Tiertime: Generic SBS had copy-pasted Generic PLA's ids on both printer lines - one family mint on both variants collapses the split. Eryone: PP copy-pasted PETG-CF's EFL43 (same introducing commit) - PP minted. Blocks: ASA-CF copy-pasted PLA-CF's BSFI010 - ASA-CF minted. CONSTRUCT3D: High Flow PETG minted off GFG99. CoLiDo: both claimants of the invented GFA99 re-minted. DeltaMaker: Brand PLA minted off GFL99. OrcaArena: Generic PLA Silk minted; the Bambu-clone Arena PLA Silk keeps GFA05 (catalog precedence). iQ: Grauts HPP4GF25 minted off Fiberthree's IQM1. - Ginger Additive (P5): the shared fdm_filament_common template carried P510eff9; moved onto the two pellet families (Generic PETG keeps it as first claimant, Generic PLA minted), template key removed after verifying every inheritor still resolves an id. - Wanhao France (P4): YUMI PLA Bowden stops over-claiming the six direct-drive printers covered by YUMI PLA Direct Drive (trim only, no mints). Verified: config-equivalence gate zero unexpected diffs; extra check exit 0; --check exit 0; validator -l 2 exit 0; and with all 30 vendor migrations now applied, the extended validator's -f check is clean TREE-WIDE (0 ambiguity errors, down from 1256 baseline / 16448 with the library-aware extension); -r exit 0 for BBL and Qidi. --- .../Afinia/filament/Afinia ABS+@HS.json | 2 +- .../Afinia/filament/Afinia Value ABS@HS.json | 2 +- .../Afinia/filament/Afinia Value PLA@HS.json | 2 +- .../filament/Blocks Generic ASA-CF.json | 2 +- .../filament/C1 Generic High Flow PETG.json | 2 +- ...uanying ASA @Chuanying X1 0.25 Nozzle.json | 1 - .../filament/Chuanying Generic ASA.json | 2 +- .../filament/Chuanying Generic HIPS.json | 2 +- .../filament/Chuanying Generic HS PLA.json | 2 +- .../filament/Chuanying Generic PETG-CF10.json | 2 +- .../filament/Chuanying Generic PLA-CF10.json | 2 +- .../filament/Chuanying Generic PLA-Silk.json | 2 +- .../filament/Chuanying Generic PVA.json | 2 +- .../filament/Chuanying Generic TPU.json | 2 +- ...ying HS PLA @Chuanying X1 0.25 Nozzle.json | 1 - ...ng PLA-SILK @Chuanying X1 0.25 Nozzle.json | 1 - .../filament/CoPrint Generic ABS.json | 2 +- .../filament/CoPrint Generic PETG.json | 2 +- .../filament/CoPrint Generic TPU.json | 2 +- .../filament/CoLiDo PLA @CoLiDo SR1.json | 2 +- .../filament/CoLiDo PLA Silk @CoLiDo SR1.json | 2 +- .../filament/DeltaMaker Brand PLA.json | 2 +- .../profiles/Eryone/filament/Eryone PP.json | 2 +- .../filament/FLSun S1 PLA High Speed.json | 2 +- .../FLSun/filament/FLSun S1 PLA Silk.json | 2 +- .../filament/FLSun T1 PLA High Speed.json | 2 +- .../FLSun/filament/FLSun T1 PLA Silk.json | 2 +- .../filament/Ginger Generic PETG.json | 1 + .../filament/Ginger Generic PLA.json | 1 + .../filament/fdm_filament_common.json | 1 - .../OrcaArena Generic PLA Silk @base.json | 2 +- .../filament/Peopoly Lancer ABS-GF.json | 2 +- .../filament/Peopoly Lancer PET-CF.json | 2 +- .../filament/Peopoly Lancer PETG-C.json | 2 +- .../filament/Peopoly Lancer PLA-C.json | 2 +- .../Ratrig/filament/RatRig BigNozzle ABS.json | 2 +- .../Ratrig/filament/RatRig BigNozzle ASA.json | 2 +- .../filament/RatRig BigNozzle PCTG.json | 2 +- .../filament/RatRig BigNozzle PETG.json | 2 +- .../Ratrig/filament/RatRig BigNozzle PLA.json | 2 +- .../Ratrig/filament/RatRig BigNozzle TPU.json | 2 +- .../Ratrig/filament/RatRig Generic PCTG.json | 2 +- .../Ratrig/filament/RatRig PunkFil ABS.json | 2 +- .../filament/RatRig PunkFil PETG CF.json | 2 +- .../Ratrig/filament/RatRig PunkFil PETG.json | 2 +- .../filament/Tiertime Generic SBS.json | 2 +- .../filament/Tiertime Generic SBS@300HS.json | 2 +- .../filament/PA6 CF20 (Performance).json | 2 +- .../filament/PETG ESD (Performance).json | 2 +- .../filament/PPS Carbone (Performance).json | 2 +- .../Volumic ASA Ultra Performance.json | 2 +- .../Volumic/filament/Volumic ASA Ultra.json | 2 +- .../Volumic PCTG Ultra (Performance).json | 2 +- .../Volumic PP Ultra Performance.json | 2 +- .../Volumic/filament/Volumic PP Ultra.json | 2 +- .../Volumic UNIVERSAL Ultra Performance.json | 2 +- .../filament/Volumic UNIVERSAL Ultra.json | 2 +- .../filament/YUMI PLA Bowden.json | 6 - ...rauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json | 2 +- scripts/filament_id_snapshot.json | 236 +++++++++++++----- 60 files changed, 227 insertions(+), 125 deletions(-) diff --git a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json index 79a5b294b9..d480c574c0 100644 --- a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json +++ b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00_01", + "filament_id": "OFYG2Gfy", "setting_id": "wAJTMxtCY7EoavRi", "name": "Afinia ABS+@HS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json index 79b0ea9db3..37daf620a9 100644 --- a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json +++ b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00_01", + "filament_id": "OFuYvNS3", "setting_id": "OxIiEYjbhEvSykaQ", "name": "Afinia Value ABS@HS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json index 20dceb0249..da0a1ecb8c 100644 --- a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json +++ b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFA00_01", + "filament_id": "OFvw0owy", "setting_id": "BASsUdyvElEVJ9AA", "name": "Afinia Value PLA@HS", "from": "system", diff --git a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json b/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json index d6d5a092ef..5373b92b4c 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json +++ b/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "FF6D7i492XTrb8AO", - "filament_id": "BSFI010", + "filament_id": "OFy7oQ1g", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json b/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json index 355637d63c..9e0a23abf9 100644 --- a/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json +++ b/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "3IxBZSWFfFGmKAQ7", - "filament_id": "GFG99", + "filament_id": "OFAUX5fB", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json index 10415dcb72..e7f023b4a2 100644 --- a/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json @@ -4,7 +4,6 @@ "inherits": "Chuanying Generic ASA", "from": "system", "setting_id": "px1EPCDgOG8eE81V", - "filament_id": "GFL99", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json b/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json index b95df151c5..d48f96d7cc 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "wBBQiy8JV2LrnIav", - "filament_id": "GFL99", + "filament_id": "OF7tgL9c", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json b/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json index 1087346c34..c919e8f921 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json @@ -4,7 +4,7 @@ "inherits": "Chuanying Generic ABS", "from": "system", "setting_id": "bBNozld07rP6mV3d", - "filament_id": "GFB99", + "filament_id": "OFzQQeCi", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json b/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json index f53cf22703..d12453cdb1 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "YZT1Uv73b8ArVoX3", - "filament_id": "GFL99", + "filament_id": "OFfiN1Lw", "instantiation": "true", "bed_temperature_difference": [ "10" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json b/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json index c7b8e6008d..99304dfd88 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "S2vCGI7sqN8FwodT", - "filament_id": "GFG99", + "filament_id": "OF3YOOOs", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json index f001e5b391..58b3a1d750 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "EZA59VPwew1cpyUJ", - "filament_id": "GFL99", + "filament_id": "OFxVzzn4", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json index ca9a1398ed..861b4d9721 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "M9wzNVOPRQlayQH1", - "filament_id": "GFL99", + "filament_id": "OFlN56xW", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json b/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json index a68d62d485..d8650e8a97 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "Chuanying Generic PLA", "from": "system", "setting_id": "ePZFnkgBiyFuKvji", - "filament_id": "GFB99", + "filament_id": "OFQ5xAKf", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json b/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json index d9a05782e4..a743d646e4 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "HYciEf4160uMYGnH", - "filament_id": "GFG99", + "filament_id": "OFUqBrgf", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json index e4a7a6eba5..fb874cdb9f 100644 --- a/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json @@ -4,7 +4,6 @@ "inherits": "Chuanying Generic HS PLA", "from": "system", "setting_id": "CAdli5S8JIFafvRG", - "filament_id": "GFL99", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" diff --git a/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json index 3008059f68..4e3a0391dc 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json @@ -4,7 +4,6 @@ "inherits": "Chuanying Generic PLA-Silk", "from": "system", "setting_id": "kph5feBjhPi0oo0G", - "filament_id": "GFL99", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic ABS.json b/resources/profiles/Co Print/filament/CoPrint Generic ABS.json index 930950d68e..6ec666e6f0 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic ABS.json +++ b/resources/profiles/Co Print/filament/CoPrint Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "CoPrint Generic PLA", "from": "system", "setting_id": "xW2rHuxT9o7MG8qB", - "filament_id": "GFL99", + "filament_id": "OFNvrbnf", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic PETG.json b/resources/profiles/Co Print/filament/CoPrint Generic PETG.json index f4540a98b2..b2661a6c91 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic PETG.json +++ b/resources/profiles/Co Print/filament/CoPrint Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "CoPrint Generic PLA", "from": "system", "setting_id": "k4m484S1samBGEVb", - "filament_id": "GFL99", + "filament_id": "OFDramZ2", "instantiation": "true", "fan_max_speed": [ "90" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic TPU.json b/resources/profiles/Co Print/filament/CoPrint Generic TPU.json index b4e28ee73b..506acb77ff 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic TPU.json +++ b/resources/profiles/Co Print/filament/CoPrint Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "CoPrint Generic PLA", "from": "system", "setting_id": "2mWqeih012I5D2CK", - "filament_id": "GFL99", + "filament_id": "OF2Psxdc", "instantiation": "true", "fan_max_speed": [ "80" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json b/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json index 40e871c663..013aa09259 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Gj0o6Rmn4qWXDLov", - "filament_id": "GFA99", + "filament_id": "OFfoA8kJ", "instantiation": "true", "filament_vendor": [ "CoLiDo" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json b/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json index b9a15b3e1b..677ec930e3 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "mLgBNw0OzvJSS8IG", - "filament_id": "GFA99", + "filament_id": "OFxlch4V", "instantiation": "true", "filament_vendor": [ "CoLiDo" diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json b/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json index 2d905807fb..e32baac8f9 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json +++ b/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "bvZOHe5ejWqBALPQ", - "filament_id": "GFL99", + "filament_id": "OFxodd2u", "instantiation": "true", "filament_flow_ratio": [ "0.987" diff --git a/resources/profiles/Eryone/filament/Eryone PP.json b/resources/profiles/Eryone/filament/Eryone PP.json index 835f8fc5a0..ffca123024 100644 --- a/resources/profiles/Eryone/filament/Eryone PP.json +++ b/resources/profiles/Eryone/filament/Eryone PP.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "sZF6qOPqqu88Yu5e", - "filament_id": "EFL43", + "filament_id": "OFf0JIqs", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json b/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json index 4cb721859e..91e22b993c 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "v2clpNXXo8m6dV33", - "filament_id": "GFL99", + "filament_id": "OFR8dTVW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json index af4d4b9379..9536db0750 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "164Bn4YchxJAaLsa", - "filament_id": "GFL99", + "filament_id": "OFFenwbU", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json b/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json index 95b2ba75a5..a1316569c2 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "E4lpSLLlAxUW04ik", - "filament_id": "GFL99", + "filament_id": "OFyt23xJ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json index 04c82ce071..b76f537a45 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "gElUb4GnCoEfVlEd", - "filament_id": "GFL99", + "filament_id": "OFt1YdX8", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json b/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json index 45c67d8876..3437d6f571 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json +++ b/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json @@ -5,6 +5,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "ue95N2e65rdp5K6c", + "filament_id": "P510eff9", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json b/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json index 8038a710c0..4575f32060 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json +++ b/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json @@ -5,6 +5,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "Z1scjKDBFoDaTa2C", + "filament_id": "OFziUL2X", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Ginger Additive/filament/fdm_filament_common.json b/resources/profiles/Ginger Additive/filament/fdm_filament_common.json index 8c906528a0..71e447d01e 100644 --- a/resources/profiles/Ginger Additive/filament/fdm_filament_common.json +++ b/resources/profiles/Ginger Additive/filament/fdm_filament_common.json @@ -2,7 +2,6 @@ "type": "filament", "name": "fdm_filament_common", "from": "system", - "filament_id": "P510eff9", "instantiation": "false", "activate_air_filtration": [ "0" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json index 7d6f5e3020..88fca4407a 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA05", + "filament_id": "OFqSTJ3I", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json b/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json index c00354396c..b6da7244c7 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "ufcIVt3x0FqV69h4", - "filament_id": "GFL99", + "filament_id": "OFqkcvDI", "instantiation": "true", "filament_flow_ratio": [ "0.91" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json index 3ec4ef2909..1877ed8e3d 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "xSaZKOpjStJuKiM7", - "filament_id": "GFL99", + "filament_id": "OFlzQ0IS", "instantiation": "true", "filament_flow_ratio": [ "0.90" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json index ccdc0fc0ba..34e8f586a4 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_petg", "from": "system", "setting_id": "aUX6OHQrKPghlPBb", - "filament_id": "GFL99", + "filament_id": "OFV1szQh", "instantiation": "true", "fan_cooling_layer_time": [ "20" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json index 7f417378eb..d9d1acd1d5 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "EFHW4uKJCsBCjAEU", - "filament_id": "GFL99", + "filament_id": "OF9tjFbj", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json index 8f601dba61..cd5e2573fa 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "oE39mwr3PCpeBxZN", - "filament_id": "GFB99", + "filament_id": "OFtcTs1o", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json index a99d58ae34..55855d2045 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "GGkbwdd79jAXnwuf", - "filament_id": "GFB98", + "filament_id": "OFSkBwxf", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json index 38db026fe4..ee05b628c1 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uCKZhFAPvEa2wKnA", - "filament_id": "GFC99", + "filament_id": "OFS1ekCg", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json index e1cf036ece..ba7316afc7 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "bf3YMNVRSE1i1E8N", - "filament_id": "GFG99", + "filament_id": "OFjj9Yiz", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json index d734dce4b7..fd155fac44 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "dyG3zLuhX2qe8XJP", - "filament_id": "GFL99", + "filament_id": "OF7M9vy4", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json index 11dae068e0..1dc5ca8791 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "wLJ3X05Jnz1EqeOI", - "filament_id": "GFL99", + "filament_id": "OFYehFGr", "instantiation": "true", "filament_max_volumetric_speed": [ "5" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json b/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json index 89031567bf..754c1e5667 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "SG4Gt87iS1ql3s8S", - "filament_id": "GFC99", + "filament_id": "OFzb2BLs", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json index 5fa20b8246..3e5428690b 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "AzjpmeEXD6enWOG6", - "filament_id": "GFB99", + "filament_id": "OFL7U2MV", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json index 73a5920ee8..8765e295fc 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "o2dP6EwooarikQ8R", - "filament_id": "GFB99", + "filament_id": "OFXQX0tr", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json index 170b1e0c99..14bc8db764 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "e1QXBJqpkhHxXor1", - "filament_id": "GFB99", + "filament_id": "OFnRTkEq", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json index 353838867a..359885ab4a 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_sbs", "from": "system", "setting_id": "tHfCQJdD7qiIF4uT", - "filament_id": "GFL99", + "filament_id": "OFlxnxDx", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json index 429f1bd78a..9fed905ccd 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_sbs", "from": "system", "setting_id": "neqjohDEPRiOa6ut", - "filament_id": "GFL99_01", + "filament_id": "OFlxnxDx", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json b/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json index 362b3b3720..f780cd48c2 100644 --- a/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json +++ b/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFN99", + "filament_id": "OFHDaMut", "setting_id": "wuZ0EvlbcJ8GxajY", "name": "PA6 CF20 (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/PETG ESD (Performance).json b/resources/profiles/Volumic/filament/PETG ESD (Performance).json index ba8e94a875..c50871b2a5 100644 --- a/resources/profiles/Volumic/filament/PETG ESD (Performance).json +++ b/resources/profiles/Volumic/filament/PETG ESD (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "OFO3IOWM", "setting_id": "May8rNEMOOs1qtae", "name": "PETG ESD (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/PPS Carbone (Performance).json b/resources/profiles/Volumic/filament/PPS Carbone (Performance).json index 996494cc43..19d79c2174 100644 --- a/resources/profiles/Volumic/filament/PPS Carbone (Performance).json +++ b/resources/profiles/Volumic/filament/PPS Carbone (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFN99", + "filament_id": "OFBRSZom", "setting_id": "HE0yILdkhbiXbH1j", "name": "PPS Carbone (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json index ea3f078ce4..212d36d0d7 100644 --- a/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFLhOFQk", "setting_id": "uE5jxeOBISvO5o7L", "name": "Volumic ASA Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic ASA Ultra.json b/resources/profiles/Volumic/filament/Volumic ASA Ultra.json index 62de93ee24..638b2ce47c 100644 --- a/resources/profiles/Volumic/filament/Volumic ASA Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic ASA Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OF7f0eUZ", "setting_id": "LOAp2zgQWqg1lQQ4", "name": "Volumic ASA Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json b/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json index d28d3732ed..d45447dbe7 100644 --- a/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json +++ b/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "OFxfCy9m", "setting_id": "NdegYSDVrQ4Rawtp", "name": "Volumic PCTG Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json index 91bfcf197d..401033bc96 100644 --- a/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFPGelMX", "setting_id": "nsiOJ8ExySR1RksQ", "name": "Volumic PP Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PP Ultra.json b/resources/profiles/Volumic/filament/Volumic PP Ultra.json index 895c9ed467..a79589876f 100644 --- a/resources/profiles/Volumic/filament/Volumic PP Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic PP Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFAGqTQG", "setting_id": "UA91pv54dzbBRkFe", "name": "Volumic PP Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json index e20e88ed67..025e1ada57 100644 --- a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFPeGtB1", "setting_id": "rxVkBvMZYgHOoFW6", "name": "Volumic UNIVERSAL Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json index 568b3a5beb..b061d498c2 100644 --- a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFIzguhB", "setting_id": "6iOFERN4x6xBbtuT", "name": "Volumic UNIVERSAL Ultra", "from": "system", diff --git a/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json b/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json index d6a5d6dcc6..f7bac7a60c 100644 --- a/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json +++ b/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json @@ -58,12 +58,6 @@ "0.4" ], "compatible_printers": [ - "D12 230 PRO M2 DIRECT 0.4 nozzle", - "D12 230 PRO SMARTPAD DIRECT 0.4 nozzle", - "D12 300 PRO M2 DIRECT 0.4 nozzle", - "D12 300 PRO SMARTPAD DIRECT 0.4 nozzle", - "D12 500 PRO M2 DIRECT 0.4 nozzle", - "D12 500 PRO SMARTPAD DIRECT 0.4 nozzle", "D12 230 PRO M2 MONO DUAL 0.4 nozzle", "D12 230 PRO M2 MONO DUAL 0.4 nozzle PoopTool", "D12 300 PRO M2 MONO DUAL PoopTool 0.4 nozzle", diff --git a/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json b/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json index b692152c71..986de30106 100644 --- a/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json +++ b/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "5M829nxsQdq2Sde5", - "filament_id": "IQM1", + "filament_id": "OFL4BLAC", "instantiation": "true", "compatible_prints": [ "0.20mm Standard @iQ TiQ2 P1 - HPP4GF25 Grauts (0.4 Nozzle)" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 7272d33806..ea53ee25cc 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -314,6 +314,7 @@ "CONSTRUCT3D/C1 Generic High Flow PETG", "CONSTRUCT3D/C1 Generic PETG", "CONSTRUCT3D/C1 Generic PLA", + "Chuanying/Chuanying Generic HIPS", "Chuanying/Chuanying Generic HS PLA", "Chuanying/Chuanying Generic PETG", "Chuanying/Chuanying Generic PETG-CF10", @@ -321,7 +322,10 @@ "Chuanying/Chuanying Generic PLA-CF10", "Chuanying/Chuanying Generic PLA-Silk", "Chuanying/Chuanying Generic PVA", + "Co Print/CoPrint Generic ABS", + "Co Print/CoPrint Generic PETG", "Co Print/CoPrint Generic PLA", + "Co Print/CoPrint Generic TPU", "CoLiDo/CoLiDo Generic PETG @CoLiDo DIY 4.0", "CoLiDo/CoLiDo Generic PETG @CoLiDo X16", "CoLiDo/CoLiDo Generic PLA @CoLiDo DIY 4.0", @@ -704,6 +708,10 @@ "FLSun/FLSun Generic PETG", "FLSun/FLSun Generic PLA", "FLSun/FLSun Generic PLA-CF", + "FLSun/FLSun S1 PLA High Speed", + "FLSun/FLSun S1 PLA Silk", + "FLSun/FLSun T1 PLA High Speed", + "FLSun/FLSun T1 PLA Silk", "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", "Flashforge/FlashForge PC @FF G4 0.6 nozzle", "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", @@ -2645,7 +2653,6 @@ "Blocks/Blocks Generic PVA" ], "BSFI010": [ - "Blocks/Blocks Generic ASA-CF", "Blocks/Blocks Generic PLA-CF" ], "BTUB00": [ @@ -2786,8 +2793,7 @@ "Eryone/Eryone PLA-CF" ], "EFL43": [ - "Eryone/Eryone PETG-CF", - "Eryone/Eryone PP" + "Eryone/Eryone PETG-CF" ], "EFL71": [ "Eryone/Eryone PA" @@ -3095,7 +3101,6 @@ ], "GFA00_01": [ "Afinia/Afinia PLA", - "Afinia/Afinia Value PLA", "Tiertime/Tiertime PLA" ], "GFA01": [ @@ -3114,7 +3119,6 @@ "GFA05": [ "BBL/Bambu PLA Silk", "OrcaArena/Arena PLA Silk", - "OrcaArena/OrcaArena Generic PLA Silk", "Qidi/Qidi Generic PLA Silk", "WonderMaker/WonderMaker PLA Silk" ], @@ -3170,8 +3174,6 @@ "GFA99": [ "Anycubic/Anycubic ASA", "CoLiDo/CoLiDo Generic PLA", - "CoLiDo/CoLiDo PLA", - "CoLiDo/CoLiDo PLA Silk", "CoLiDo/CoLiDo PLA+" ], "GFASA": [ @@ -3188,8 +3190,6 @@ ], "GFB00_01": [ "Afinia/Afinia ABS", - "Afinia/Afinia ABS+", - "Afinia/Afinia Value ABS", "Tiertime/Tiertime ABS" ], "GFB01": [ @@ -3229,7 +3229,6 @@ "OrcaArena/OrcaArena Generic ASA", "Prusa/Prusa Generic ASA", "Prusa/Prusament ASA", - "Ratrig/RatRig BigNozzle ASA", "Ratrig/RatRig Generic ASA", "SecKit/SecKit Generic ASA", "Tiertime/Tiertime Generic ASA", @@ -3266,8 +3265,6 @@ "BBL/Generic ABS", "Chuanying/Chuanying ABS", "Chuanying/Chuanying Generic ABS", - "Chuanying/Chuanying Generic HIPS", - "Chuanying/Chuanying Generic PVA", "CoLiDo/CoLiDo ABS", "CoLiDo/CoLiDo Generic ABS", "Comgrow/Comgrow Generic ABS", @@ -3284,19 +3281,11 @@ "OrcaArena/OrcaArena Generic ABS", "Prusa/Prusa Generic ABS", "Qidi/Qidi Generic ABS", - "Ratrig/RatRig BigNozzle ABS", "Ratrig/RatRig Generic ABS", - "Ratrig/RatRig PunkFil ABS", - "Ratrig/RatRig PunkFil PETG", - "Ratrig/RatRig PunkFil PETG CF", "SecKit/SecKit Generic ABS", "Tiertime/Tiertime Generic ABS", "Volumic/Volumic ABS Ultra", "Volumic/Volumic ABS Ultra (Performance)", - "Volumic/Volumic ASA Ultra", - "Volumic/Volumic ASA Ultra (Performance)", - "Volumic/Volumic PP Ultra", - "Volumic/Volumic PP Ultra (Performance)", "Vzbot/Vzbot Generic ABS" ], "GFB99_01": [ @@ -3350,9 +3339,7 @@ "Prusa/Prusa Generic PC", "Prusa/Prusament PC Blend", "Qidi/Qidi Generic PC", - "Ratrig/RatRig BigNozzle PCTG", "Ratrig/RatRig Generic PC", - "Ratrig/RatRig Generic PCTG", "SecKit/SecKit Generic PC", "Tiertime/Tiertime Generic PC", "Volumic/Volumic PC", @@ -3438,11 +3425,8 @@ "Anycubic/Anycubic Generic PETG", "Artillery/Artillery Generic PETG", "BBL/Generic PETG", - "CONSTRUCT3D/C1 Generic High Flow PETG", "CONSTRUCT3D/C1 Generic PETG", "Chuanying/Chuanying Generic PETG", - "Chuanying/Chuanying Generic PETG-CF10", - "Chuanying/Chuanying Generic TPU", "Chuanying/Chuanying PETG", "CoLiDo/CoLiDo Generic PETG", "CoLiDo/CoLiDo PETG", @@ -3462,12 +3446,9 @@ "MagicMaker/MM Generic PEEK", "OrcaArena/OrcaArena Generic PETG", "Qidi/Qidi Generic PETG", - "Ratrig/RatRig BigNozzle PETG", "Ratrig/RatRig Generic PETG", "SecKit/SecKit Generic PETG", "Tiertime/Tiertime Generic PETG", - "Volumic/PETG ESD (Performance)", - "Volumic/Volumic PCTG Ultra (Performance)", "Volumic/Volumic PETG Ultra", "Volumic/Volumic PETG Ultra (Performance)", "Vzbot/Vzbot Generic PETG", @@ -3741,33 +3722,18 @@ "Artillery/Artillery Generic PLA", "BBL/Generic PLA", "CONSTRUCT3D/C1 Generic PLA", - "Chuanying/Chuanying ASA", - "Chuanying/Chuanying Generic ASA", - "Chuanying/Chuanying Generic HS PLA", "Chuanying/Chuanying Generic PLA", - "Chuanying/Chuanying Generic PLA-CF10", - "Chuanying/Chuanying Generic PLA-Silk", - "Chuanying/Chuanying HS PLA", "Chuanying/Chuanying PLA", - "Chuanying/Chuanying PLA-SILK", - "Co Print/CoPrint Generic ABS", - "Co Print/CoPrint Generic PETG", "Co Print/CoPrint Generic PLA", - "Co Print/CoPrint Generic TPU", "Comgrow/Comgrow Generic PLA", "Comgrow/Comgrow T300 PLA", "Creality/Creality Generic PLA", "Custom/Generic PLA", - "DeltaMaker/DeltaMaker Brand PLA", "DeltaMaker/DeltaMaker Generic PLA", "Dremel/Dremel Generic PLA", "FLSun/FLSun Generic PLA", "FLSun/FLSun S1 PLA Generic", - "FLSun/FLSun S1 PLA High Speed", - "FLSun/FLSun S1 PLA Silk", "FLSun/FLSun T1 PLA Generic", - "FLSun/FLSun T1 PLA High Speed", - "FLSun/FLSun T1 PLA Silk", "Flashforge/Generic PLA", "Flashforge/Generic PLA High Speed", "FlyingBear/FlyingBear Generic PLA", @@ -3775,30 +3741,20 @@ "Lulzbot/Lulzbot 2.85mm PLA", "OrcaArena/OrcaArena Generic PLA", "Peopoly/Peopoly Generic PLA", - "Peopoly/Peopoly Lancer ABS-GF", - "Peopoly/Peopoly Lancer PET-CF", - "Peopoly/Peopoly Lancer PETG-C", - "Peopoly/Peopoly Lancer PLA-C", "Phrozen/Phrozen PLA", "Prusa/Prusa Generic PLA", "Qidi/Qidi Generic PLA", - "Ratrig/RatRig BigNozzle PLA", - "Ratrig/RatRig BigNozzle TPU", "Ratrig/RatRig Generic PLA", "SecKit/SecKit Generic PLA", "Sovol/Sovol SV07 PLA", "Tiertime/Tiertime Generic PLA", - "Tiertime/Tiertime Generic SBS", "Volumic/Volumic PLA Ultra", "Volumic/Volumic PLA Ultra (Performance)", - "Volumic/Volumic UNIVERSAL Ultra", - "Volumic/Volumic UNIVERSAL Ultra (Performance)", "Vzbot/Vzbot Generic PLA", "re3D/re3D PLA" ], "GFL99_01": [ - "Tiertime/Tiertime Generic PLA", - "Tiertime/Tiertime Generic SBS" + "Tiertime/Tiertime Generic PLA" ], "GFL99_2": [ "Prusa/Prusa Generic PLA" @@ -3911,8 +3867,6 @@ "Ratrig/RatRig Generic PA", "SecKit/SecKit Generic PA", "Tiertime/Tiertime Generic PA", - "Volumic/PA6 CF20 (Performance)", - "Volumic/PPS Carbone (Performance)", "Volumic/Volumic NYLON Ultra", "Volumic/Volumic NYLON Ultra (Performance)", "Vzbot/Vzbot Generic PA" @@ -4526,8 +4480,7 @@ "RH3D/Generic TPU" ], "IQM1": [ - "iQ/Fiberthree PACF Pro P1", - "iQ/Grauts HPP4GF25 P1" + "iQ/Fiberthree PACF Pro P1" ], "IQM1011": [ "iQ/VXL90 TiQ2 P2" @@ -4637,6 +4590,9 @@ "OF22AxCm": [ "Sovol/Polymaker PETG" ], + "OF2Psxdc": [ + "Co Print/CoPrint Generic TPU" + ], "OF2UFmOo": [ "Qidi/Bambu PLA" ], @@ -4652,6 +4608,9 @@ "OF3XeEuV": [ "Qidi/QIDI PET-GF" ], + "OF3YOOOs": [ + "Chuanying/Chuanying Generic PETG-CF10" + ], "OF3arl18": [ "Elegoo/Elegoo Rapid PETG" ], @@ -4727,9 +4686,19 @@ "OF79FFkO": [ "OrcaFilamentLibrary/Elegoo PC-FR" ], + "OF7M9vy4": [ + "Ratrig/RatRig BigNozzle PLA" + ], "OF7cv1Ub": [ "Qidi/QIDI PLA-CF" ], + "OF7f0eUZ": [ + "Volumic/Volumic ASA Ultra" + ], + "OF7tgL9c": [ + "Chuanying/Chuanying ASA", + "Chuanying/Chuanying Generic ASA" + ], "OF8HQmJD": [ "OrcaFilamentLibrary/Elegoo PLA Sparkle" ], @@ -4745,12 +4714,18 @@ "OF9sr3Vn": [ "Flashforge/Flashforge PLA Sparkle" ], + "OF9tjFbj": [ + "Peopoly/Peopoly Lancer PLA-C" + ], "OF9vnvM8": [ "Artillery/Artillery PETG-CF" ], "OFAEqlWa": [ "Flashforge/Flashforge Generic PLA-SILK" ], + "OFAGqTQG": [ + "Volumic/Volumic PP Ultra" + ], "OFAGrVjP": [ "Flashforge/Flashforge PLA Silk" ], @@ -4763,6 +4738,9 @@ "OFAUDGEQ": [ "Qidi/QIDI PLA Rapido Matte" ], + "OFAUX5fB": [ + "CONSTRUCT3D/C1 Generic High Flow PETG" + ], "OFAbsMuV": [ "Snapmaker/Snapmaker Dual TPE" ], @@ -4784,6 +4762,9 @@ "OFBGxHgT": [ "FlyingBear/FlyingBear PLA" ], + "OFBRSZom": [ + "Volumic/PPS Carbone (Performance)" + ], "OFBvxnjM": [ "Elegoo/Elegoo PETG-GF" ], @@ -4820,6 +4801,9 @@ "OFDkABjZ": [ "Flashforge/Generic TPU-90A" ], + "OFDramZ2": [ + "Co Print/CoPrint Generic PETG" + ], "OFE22Uba": [ "Flashforge/Flashforge TPU-90A" ], @@ -4832,6 +4816,9 @@ "OFFIL5pD": [ "Qidi/QIDI PA12-CF" ], + "OFFenwbU": [ + "FLSun/FLSun S1 PLA Silk" + ], "OFFmJ8aR": [ "FlyingBear/Other PLA Hyper" ], @@ -4853,6 +4840,9 @@ "OFHBTqyD": [ "Flashforge/Flashforge PLA Basic" ], + "OFHDaMut": [ + "Volumic/PA6 CF20 (Performance)" + ], "OFHL32M0": [ "Anycubic/Anycubic TPU" ], @@ -4868,6 +4858,9 @@ "OFIl3ar9": [ "Sovol/Sovol SV08 PETG" ], + "OFIzguhB": [ + "Volumic/Volumic UNIVERSAL Ultra" + ], "OFJIImD5": [ "OrcaFilamentLibrary/Elegoo PET-CF" ], @@ -4904,9 +4897,15 @@ "OFKzh9lx": [ "InfiMech/InfiMech PLA" ], + "OFL4BLAC": [ + "iQ/Grauts HPP4GF25 P1" + ], "OFL4KniM": [ "Elegoo/Elegoo Rapid TPU 95A" ], + "OFL7U2MV": [ + "Ratrig/RatRig PunkFil ABS" + ], "OFL7vEML": [ "Flashforge/FlashForge PC" ], @@ -4916,6 +4915,9 @@ "OFLeFaUO": [ "Flashforge/Flashforge Generic PVA" ], + "OFLhOFQk": [ + "Volumic/Volumic ASA Ultra (Performance)" + ], "OFLiTjQK": [ "FlyingBear/Other PA-CF" ], @@ -4952,9 +4954,15 @@ "OFNbajj9": [ "Creality/Creality Generic ASA-CF" ], + "OFNvrbnf": [ + "Co Print/CoPrint Generic ABS" + ], "OFNz8rrn": [ "FlyingBear/FlyingBear PLA Hyper" ], + "OFO3IOWM": [ + "Volumic/PETG ESD (Performance)" + ], "OFO5R9KJ": [ "Sovol/Sovol Zero TPU" ], @@ -4976,18 +4984,27 @@ "OFP4poIv": [ "Sovol/Sovol Zero PLA Silk HS Nozzle" ], + "OFPGelMX": [ + "Volumic/Volumic PP Ultra (Performance)" + ], "OFPJJxkF": [ "Flashforge/Flashforge PET-CF" ], "OFPJrlC3": [ "Flashforge/Flashforge PLA-CF" ], + "OFPeGtB1": [ + "Volumic/Volumic UNIVERSAL Ultra (Performance)" + ], "OFPokkKe": [ "Qidi/QIDI PETG-CF" ], "OFPwi9X0": [ "Qidi/HATCHBOX ABS" ], + "OFQ5xAKf": [ + "Chuanying/Chuanying Generic PVA" + ], "OFQ9dI8j": [ "Prusa/Prusa Generic PC HF" ], @@ -5003,6 +5020,9 @@ "OFQkWxJy": [ "OrcaFilamentLibrary/Elegoo PLA Matte" ], + "OFR8dTVW": [ + "FLSun/FLSun S1 PLA High Speed" + ], "OFRNU58t": [ "Flashforge/Flashforge TPU 95A" ], @@ -5015,6 +5035,9 @@ "OFRgDMDJ": [ "Flashforge/Flashforge PETG Transparent" ], + "OFS1ekCg": [ + "Ratrig/RatRig BigNozzle PCTG" + ], "OFS3HrR1": [ "InfiMech/Other PLA" ], @@ -5027,6 +5050,9 @@ "OFSdF3B1": [ "Flashforge/FusRock PAHT-CF" ], + "OFSkBwxf": [ + "Ratrig/RatRig BigNozzle ASA" + ], "OFSoZBK2": [ "Sovol/Sovol SV06 Plus ACE PLA" ], @@ -5063,6 +5089,12 @@ "OFUkpobY": [ "Qidi/QIDI PAHT-CF" ], + "OFUqBrgf": [ + "Chuanying/Chuanying Generic TPU" + ], + "OFV1szQh": [ + "Peopoly/Peopoly Lancer PETG-C" + ], "OFV4hD1o": [ "Qidi/QIDI PLA Rapido Metal" ], @@ -5099,6 +5131,9 @@ "OFXNO5Of": [ "Qidi/QIDI PLA Rapido 0.2 nozzle" ], + "OFXQX0tr": [ + "Ratrig/RatRig PunkFil PETG CF" + ], "OFXcfTEb": [ "Qidi/Tinmorry PETG-ECO" ], @@ -5117,6 +5152,9 @@ "OFY1U4uM": [ "Sovol/Sovol SV08 TPU" ], + "OFYG2Gfy": [ + "Afinia/Afinia ABS+" + ], "OFYH00jV": [ "Qidi/QIDI ABS-GF" ], @@ -5129,6 +5167,9 @@ "OFYZs7dN": [ "Flashforge/Flashforge Generic HS PLA" ], + "OFYehFGr": [ + "Ratrig/RatRig BigNozzle TPU" + ], "OFYfZgxU": [ "FlyingBear/FlyingBear TPU" ], @@ -5219,6 +5260,9 @@ "OFeybQvK": [ "Qidi/QIDI ABS Rapido 0.2 nozzle" ], + "OFf0JIqs": [ + "Eryone/Eryone PP" + ], "OFf2b9wu": [ "Anycubic/Anycubic ABS" ], @@ -5231,9 +5275,16 @@ "OFfdxQok": [ "Qidi/Generic PLA+" ], + "OFfiN1Lw": [ + "Chuanying/Chuanying Generic HS PLA", + "Chuanying/Chuanying HS PLA" + ], "OFfkPhrJ": [ "Creality/Creality HF Generic Speed PLA" ], + "OFfoA8kJ": [ + "CoLiDo/CoLiDo PLA" + ], "OFftQOek": [ "Flashforge/Flashforge PLA Matte" ], @@ -5303,6 +5354,9 @@ "OFjepy6j": [ "Flashforge/FusRock Generic S-PAHT" ], + "OFjj9Yiz": [ + "Ratrig/RatRig BigNozzle PETG" + ], "OFjohFkg": [ "Qidi/QIDI PETG Translucent" ], @@ -5333,12 +5387,22 @@ "OFkoT6jl": [ "Prusa/Prusament PLA" ], + "OFlN56xW": [ + "Chuanying/Chuanying Generic PLA-Silk", + "Chuanying/Chuanying PLA-SILK" + ], "OFlNKZLP": [ "Flashforge/Flashforge PLA Metal" ], "OFlbn4FY": [ "Snapmaker/Snapmaker PLA Matte" ], + "OFlxnxDx": [ + "Tiertime/Tiertime Generic SBS" + ], + "OFlzQ0IS": [ + "Peopoly/Peopoly Lancer PET-CF" + ], "OFm1VZed": [ "Flashforge/Flashforge Generic PLA-CF" ], @@ -5369,6 +5433,9 @@ "OFnMW5jr": [ "FlyingBear/FlyingBear ABS" ], + "OFnRTkEq": [ + "Ratrig/RatRig PunkFil PETG" + ], "OFnY9ovF": [ "Artillery/Artillery PA-CF" ], @@ -5417,9 +5484,15 @@ "OFqRWRU6": [ "Flashforge/Flashforge ABS-GF" ], + "OFqSTJ3I": [ + "OrcaArena/OrcaArena Generic PLA Silk" + ], "OFqh1Ngp": [ "OrcaFilamentLibrary/Elegoo PLA-CF" ], + "OFqkcvDI": [ + "Peopoly/Peopoly Lancer ABS-GF" + ], "OFqyIUDi": [ "Qidi/Qidi PLA-CF" ], @@ -5453,6 +5526,9 @@ "OFsmPFwh": [ "Sovol/Sovol SV06 Plus ACE TPU" ], + "OFt1YdX8": [ + "FLSun/FLSun T1 PLA Silk" + ], "OFt5bvKK": [ "Artillery/Artillery PETG Basic" ], @@ -5471,6 +5547,9 @@ "OFtXBjvb": [ "Artillery/Artillery PLA Tough" ], + "OFtcTs1o": [ + "Ratrig/RatRig BigNozzle ABS" + ], "OFtemzzw": [ "Sovol/Sovol SV06 ACE ABS" ], @@ -5495,6 +5574,9 @@ "OFuXkYly": [ "Elegoo/Elegoo PLA Glow" ], + "OFuYvNS3": [ + "Afinia/Afinia Value ABS" + ], "OFuidAEg": [ "Qidi/Bambu ABS" ], @@ -5537,6 +5619,9 @@ "OFvsS7Fb": [ "Flashforge/Generic TPU-64D" ], + "OFvw0owy": [ + "Afinia/Afinia Value PLA" + ], "OFvxvkAd": [ "Artillery/Artillery PLA-CF" ], @@ -5564,12 +5649,27 @@ "OFxLeRyT": [ "Prusa/Prusa Generic PVA HF" ], + "OFxVzzn4": [ + "Chuanying/Chuanying Generic PLA-CF10" + ], + "OFxfCy9m": [ + "Volumic/Volumic PCTG Ultra (Performance)" + ], "OFxjFYxE": [ "Elegoo/Elegoo PETG HF" ], + "OFxlch4V": [ + "CoLiDo/CoLiDo PLA Silk" + ], + "OFxodd2u": [ + "DeltaMaker/DeltaMaker Brand PLA" + ], "OFxxa5yn": [ "Snapmaker/Snapmaker Dual ABS Benchy" ], + "OFy7oQ1g": [ + "Blocks/Blocks Generic ASA-CF" + ], "OFyD1Zo8": [ "InfiMech/Other PC" ], @@ -5579,12 +5679,24 @@ "OFypQeKR": [ "Elegoo/Generic PC-CF" ], + "OFyt23xJ": [ + "FLSun/FLSun T1 PLA High Speed" + ], "OFyxAbO4": [ "Flashforge/Flashforge TPU-95A" ], "OFzFbFcl": [ "Elegoo/Elegoo PC-FR" ], + "OFzQQeCi": [ + "Chuanying/Chuanying Generic HIPS" + ], + "OFzb2BLs": [ + "Ratrig/RatRig Generic PCTG" + ], + "OFziUL2X": [ + "Ginger Additive/Ginger Generic PLA" + ], "OFzrWlH5": [ "OrcaFilamentLibrary/Elegoo PETG HF" ], @@ -5968,8 +6080,7 @@ "Cubicon/Cubicon PA-CF" ], "P510eff9": [ - "Ginger Additive/Ginger Generic PETG", - "Ginger Additive/Ginger Generic PLA" + "Ginger Additive/Ginger Generic PETG" ], "Pfcf9c4c": [ "Artillery/Artillery PLA" @@ -6965,7 +7076,6 @@ "CONSTRUCT3D/C1 Generic PETG", "CONSTRUCT3D/C1 Generic PLA", "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", - "Chuanying/Chuanying ASA @Chuanying X1 0.25 Nozzle", "Chuanying/Chuanying Generic ABS", "Chuanying/Chuanying Generic ASA", "Chuanying/Chuanying Generic HIPS", @@ -6977,9 +7087,7 @@ "Chuanying/Chuanying Generic PLA-Silk", "Chuanying/Chuanying Generic PVA", "Chuanying/Chuanying Generic TPU", - "Chuanying/Chuanying HS PLA @Chuanying X1 0.25 Nozzle", "Chuanying/Chuanying PETG @Chuanying X1 0.25 Nozzle", - "Chuanying/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle", "Co Print/CoPrint Generic ABS", "Co Print/CoPrint Generic PETG", "Co Print/CoPrint Generic PLA", @@ -8122,6 +8230,8 @@ "FlyingBear/Other PLA @S1", "FlyingBear/Other PLA Hyper @S1", "FlyingBear/Other TPU @S1", + "Ginger Additive/Ginger Generic PETG", + "Ginger Additive/Ginger Generic PLA", "InfiMech/InfiMech ABS @EX", "InfiMech/InfiMech ABS @EX+APS", "InfiMech/InfiMech ABS @HSN", From 33923464aed34770eceea86162e8bb3bcdf247bd Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 00:51:29 +0800 Subject: [PATCH 11/52] Cubicon: keep @base presets selectable; mint the variant tier instead The custom-preset fixture validation (check_profiles.yml step 5, run locally against the v2.3.2/v2.4.0/v2.4.1 archives) caught a real regression in the previous Cubicon fix: those archives contain user presets whose inherits names the @base presets directly ("can not find parent Cubicon ABS @base"). A system preset with instantiation:false is not added to the preset collection, so flipping the nine @bases was equivalent to deleting their names - exactly the user-preset drop hazard the migration rules forbid. Repair: restore all nine @bases byte-identically to their pre-flip state (instantiated, setting_id, original P510cf* ids; Cubicon PC @base keeps its minted OFnLnZQo from the copy-paste fix). The AMS ambiguity is instead resolved Dremel-style: each family's three passthrough variants share one fresh variant-tier mint as own keys, so on every printer the base and the variant carry different ids. Zero preset-set change, zero config change, user presets and fixtures resolve exactly as before the migration. Verified: fixture archives v2.3.2/v2.4.0/v2.4.1 no longer report missing parents; config-equivalence holds; orca_extra_profile_check.py exit 0; assign_filament_ids.py --check exit 0; validator -l 2 exit 0; tree-wide extended -f still exit 0. --- ...icon ABS @Cubicon xCeler-I 0.4 nozzle.json | 1 + ...n ABS @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ...n ABS @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon ABS @base.json | 3 +- ...ABS-A100 @Cubicon xCeler-I 0.4 nozzle.json | 1 + ...-A100 @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ...-A100 @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../filament/Cubicon ABS-A100 @base.json | 3 +- ...con ABSk @Cubicon xCeler-I 0.4 nozzle.json | 1 + ... ABSk @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ... ABSk @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon ABSk @base.json | 3 +- ...on PA-CF @Cubicon xCeler-I 0.4 nozzle.json | 1 + ...PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ...PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PA-CF @base.json | 3 +- ...bicon PC @Cubicon xCeler-I 0.4 nozzle.json | 1 + ...on PC @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ...on PC @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PC @base.json | 3 +- ...con PETG @Cubicon xCeler-I 0.4 nozzle.json | 1 + ... PETG @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ... PETG @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PETG @base.json | 3 +- ...icon PLA @Cubicon xCeler-I 0.4 nozzle.json | 1 + ...n PLA @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ...n PLA @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PLA @base.json | 3 +- ...con PLA+ @Cubicon xCeler-I 0.4 nozzle.json | 1 + ... PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ... PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PLA+ @base.json | 3 +- ...n PLAi21 @Cubicon xCeler-I 0.4 nozzle.json | 1 + ...LAi21 @Cubicon xCeler-Mini 0.4 nozzle.json | 1 + ...LAi21 @Cubicon xCeler-Plus 0.4 nozzle.json | 1 + .../filament/Cubicon PLAi21 @base.json | 3 +- scripts/filament_id_snapshot.json | 90 +++++++++++++++++++ 37 files changed, 135 insertions(+), 9 deletions(-) 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 ca0143d65c..8446df4752 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 @@ -3,6 +3,7 @@ "name": "Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABS @base", "setting_id": "VJEyK87ZYvHmamB9", + "filament_id": "OF6XuVQE", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json index 72b2c51e50..c7b34c9694 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon ABS @base", "from": "system", "setting_id": "Kz41mb2M9xLbEJ97", + "filament_id": "OF6XuVQE", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json index 38a00a4624..3865f034fa 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,6 +3,7 @@ "name": "Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon ABS @base", "setting_id": "A5FQdwh0Xo7aTRpq", + "filament_id": "OF6XuVQE", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json index cae2d0bcf9..55fbd40ee4 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon ABS @base", "inherits": "fdm_filament_abs", + "setting_id": "aZRVIlDze62Bbw81", "filament_id": "P510cfb0", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 897f3cceff..40cec441cc 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 @@ -3,6 +3,7 @@ "name": "Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABS-A100 @base", "setting_id": "OfiOryklf7FDVCz8", + "filament_id": "OFcZZWnB", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json index f0d3715d32..77205f02c2 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon ABS-A100 @base", "from": "system", "setting_id": "pIyU9uXQ5V3hsg5F", + "filament_id": "OFcZZWnB", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json index c6965435a0..c78d3720df 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,6 +3,7 @@ "name": "Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon ABS-A100 @base", "setting_id": "xhYh9x1vescinfbF", + "filament_id": "OFcZZWnB", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json index b715900dae..dddc147ff2 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon ABS-A100 @base", "inherits": "Cubicon ABS @base", + "setting_id": "vGIT4KZvqojIh2up", "filament_id": "P510cfb1", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 7596fa618a..296268a3f0 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 @@ -3,6 +3,7 @@ "name": "Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABSk @base", "setting_id": "TXcodZkab4fofnEn", + "filament_id": "OFNQHqAV", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json index 63c827c034..afd798384f 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon ABSk @base", "from": "system", "setting_id": "CsthNnKn8WlBbkP4", + "filament_id": "OFNQHqAV", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json index 586982ea51..6f60bb4c13 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,6 +3,7 @@ "name": "Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon ABSk @base", "setting_id": "UVitMFMxvdf34qZw", + "filament_id": "OFNQHqAV", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json index 7daddfb940..e1546d3bae 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon ABSk @base", "inherits": "Cubicon ABS @base", + "setting_id": "UbOUO0K3Y2iRPBtf", "filament_id": "P510cfb2", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 c8af313f4f..8edf5f65e5 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 @@ -3,6 +3,7 @@ "name": "Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PA-CF @base", "setting_id": "nupuIJggdc1EKDqG", + "filament_id": "OFOJUJAS", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json index 40aa29b577..eda94acc49 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PA-CF @base", "from": "system", "setting_id": "NPjuy4deP6Ly7u9s", + "filament_id": "OFOJUJAS", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json index 6e307bed78..f67e32c8ac 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,6 +3,7 @@ "name": "Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon PA-CF @base", "setting_id": "ygB1Uf9Vbw9LJZc8", + "filament_id": "OFOJUJAS", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json index 6177b6fd6a..51c89949f6 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon PA-CF @base", "inherits": "fdm_filament_pa", + "setting_id": "55cJDyCoEudfOePY", "filament_id": "P510cfd0", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 b83d690fff..aa761b7454 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 @@ -3,6 +3,7 @@ "name": "Cubicon PC @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PC @base", "setting_id": "c0sUPS0SRYUNjEpB", + "filament_id": "OFaxQnfz", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json index 868ec82e34..e5c07509a4 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PC @base", "from": "system", "setting_id": "XGXjHwuHUjtAJGl1", + "filament_id": "OFaxQnfz", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json index 07a2308add..f565564c82 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,6 +3,7 @@ "name": "Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon PC @base", "setting_id": "jbYKOK1A0Oxm9t0f", + "filament_id": "OFaxQnfz", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @base.json b/resources/profiles/Cubicon/filament/Cubicon PC @base.json index aa2f9ac347..5ecc4082c8 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon PC @base", "inherits": "fdm_filament_pc", + "setting_id": "Mzg6jfwb2nqfGkdV", "filament_id": "OFnLnZQo", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 62a4f58c53..c9db611832 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 @@ -3,6 +3,7 @@ "name": "Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PETG @base", "setting_id": "dsX01tCkd2Usk104", + "filament_id": "OF0VEdLB", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json index 9c1108a73f..653ca65758 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PETG @base", "from": "system", "setting_id": "2hYoCR5qUXCWIAxZ", + "filament_id": "OF0VEdLB", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json index 14a23cc728..919a262523 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,6 +3,7 @@ "name": "Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon PETG @base", "setting_id": "5pfiRdyNz9dvT4Q6", + "filament_id": "OF0VEdLB", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json index 0912884adf..2242ba36ca 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon PETG @base", "inherits": "fdm_filament_pet", + "setting_id": "bGfz4phwIdqSz0Hx", "filament_id": "P510cfc0", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 bca40b2814..fc5d62bdc5 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 @@ -4,6 +4,7 @@ "inherits": "Cubicon PLA @base", "from": "system", "setting_id": "xXJgHAeNf1JdCitr", + "filament_id": "OFq6IhFg", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json index 54ffbd694c..39d9a7835e 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PLA @base", "from": "system", "setting_id": "o2BQL6OKtxDmBkWV", + "filament_id": "OFq6IhFg", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json index 04cac6ab7d..d94d38529c 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PLA @base", "from": "system", "setting_id": "WkZrzDlGvb25OtrF", + "filament_id": "OFq6IhFg", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json index 82dffb7070..665ba58d59 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json @@ -3,8 +3,9 @@ "name": "Cubicon PLA @base", "inherits": "fdm_filament_pla", "from": "system", + "setting_id": "ypwdJAu0NlEsWpf4", "filament_id": "P510cfa0", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 7442cf2490..c068eba680 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 @@ -4,6 +4,7 @@ "inherits": "Cubicon PLA+ @base", "from": "system", "setting_id": "fNR2Bw3e4TGcWhq0", + "filament_id": "OF2HQqTC", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json index 76a31d14c1..f8c8331b31 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PLA+ @base", "from": "system", "setting_id": "wukhnaCJaOLUUdiU", + "filament_id": "OF2HQqTC", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json index 2f37996fe3..0da1b35a44 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PLA+ @base", "from": "system", "setting_id": "JVShu8DKQ3euGHec", + "filament_id": "OF2HQqTC", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json index 0e31e96a81..cb916a9410 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon PLA+ @base", "inherits": "Cubicon PLA @base", + "setting_id": "ETnuhiOZRh1jxrVk", "filament_id": "P510cfa1", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" 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 10d2a2e6ae..b0a23bdd31 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 @@ -4,6 +4,7 @@ "inherits": "Cubicon PLAi21 @base", "from": "system", "setting_id": "vcLVF3cglagBfVAF", + "filament_id": "OFti31HS", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json index 73404c4729..43f571041e 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PLAi21 @base", "from": "system", "setting_id": "3TbOucKB5TGk8sXG", + "filament_id": "OFti31HS", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json index 0769e1fa3d..e797ea0312 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Cubicon PLAi21 @base", "from": "system", "setting_id": "Vm1oDASHoFUfDrzQ", + "filament_id": "OFti31HS", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json index a9d46012c6..831450deef 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json @@ -2,8 +2,9 @@ "type": "filament", "name": "Cubicon PLAi21 @base", "inherits": "Cubicon PLA @base", + "setting_id": "mnwC7ijXXV72lBOt", "filament_id": "P510cfa2", - "instantiation": "false", + "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index ea53ee25cc..24d51970bc 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -643,13 +643,40 @@ "Creality/eSUN PLA-Lite @K2 Plus-all", "Creality/eSUN PLA-Matte @K2 Plus-all", "Creality/eSUN PLA-Silk @K2 Plus-all", + "Cubicon/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon ABS-A100 @base", + "Cubicon/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon ABSk @base", + "Cubicon/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PA-CF @base", + "Cubicon/Cubicon PC @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PC @base", + "Cubicon/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PETG @base", + "Cubicon/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PLA @base", + "Cubicon/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PLA+ @base", + "Cubicon/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PLAi21 @base", "Custom/Generic PC @MyToolChanger", "Custom/Generic PETG @MyToolChanger", @@ -4569,6 +4596,9 @@ "OF0UbONm": [ "Flashforge/FusRock S-PAHT" ], + "OF0VEdLB": [ + "Cubicon/Cubicon PETG" + ], "OF0Y5MLd": [ "Qidi/QIDI PETG-GF" ], @@ -4590,6 +4620,9 @@ "OF22AxCm": [ "Sovol/Polymaker PETG" ], + "OF2HQqTC": [ + "Cubicon/Cubicon PLA+" + ], "OF2Psxdc": [ "Co Print/CoPrint Generic TPU" ], @@ -4680,6 +4713,9 @@ "OF6XIeUW": [ "Flashforge/Generic PLA-CF10" ], + "OF6XuVQE": [ + "Cubicon/Cubicon ABS" + ], "OF70DKqH": [ "Snapmaker/Snapmaker TPE" ], @@ -4945,6 +4981,9 @@ "OFN0pBpo": [ "Qidi/Qidi Generic TPU 95A" ], + "OFNQHqAV": [ + "Cubicon/Cubicon ABSk" + ], "OFNRgSch": [ "Artillery/Artillery PC" ], @@ -4966,6 +5005,9 @@ "OFO5R9KJ": [ "Sovol/Sovol Zero TPU" ], + "OFOJUJAS": [ + "Cubicon/Cubicon PA-CF" + ], "OFOSzSuh": [ "Flashforge/Flashforge PA-CF" ], @@ -5200,6 +5242,9 @@ "OFaKZ6JI": [ "Anycubic/Generic PETG Basic" ], + "OFaxQnfz": [ + "Cubicon/Cubicon PC" + ], "OFb3UzMZ": [ "InfiMech/InfiMech PA-CF" ], @@ -5218,6 +5263,9 @@ "OFc2SnEp": [ "Artillery/Artillery PVA" ], + "OFcZZWnB": [ + "Cubicon/Cubicon ABS-A100" + ], "OFceJcLf": [ "Qidi/PolyLite PLA" ], @@ -5478,6 +5526,9 @@ "OFpwg2Qh": [ "OrcaFilamentLibrary/Elegoo ASA-CF" ], + "OFq6IhFg": [ + "Cubicon/Cubicon PLA" + ], "OFqPp2yL": [ "Qidi/QIDI PETG Tough 0.6 nozzle" ], @@ -5556,6 +5607,9 @@ "OFtet8ui": [ "Snapmaker/Snapmaker TPU High-Flow" ], + "OFti31HS": [ + "Cubicon/Cubicon PLAi21" + ], "OFtmT4Nd": [ "Artillery/Artillery ASA" ], @@ -7620,6 +7674,42 @@ "Creality/eSUN PLA-Lite @K2 Plus-all", "Creality/eSUN PLA-Matte @K2 Plus-all", "Creality/eSUN PLA-Silk @K2 Plus-all", + "Cubicon/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon ABS @base", + "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon ABS-A100 @base", + "Cubicon/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon ABSk @base", + "Cubicon/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon PA-CF @base", + "Cubicon/Cubicon PC @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon PC @base", + "Cubicon/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon PETG @base", + "Cubicon/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon PLA @base", + "Cubicon/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon PLA+ @base", + "Cubicon/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle", + "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle", + "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", + "Cubicon/Cubicon PLAi21 @base", "Custom/Generic PC @MyToolChanger", "Custom/Generic PETG @MyToolChanger", "Custom/Generic PLA @MyToolChanger", From ac12dff1af225f7f5526a20e567ee6f95fc89503 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 01:10:54 +0800 Subject: [PATCH 12/52] CI: run the filament subtype check tree-wide With every vendor's filament_id collisions fixed (356 collision groups / 1256 printer-level ambiguity errors across 30 vendors, plus the 16 library-internal ids and the 10 live library-cross groups), the duplicate-filament-subtype validation no longer needs the BBL-only scope: drop -v BBL from the -f step so any new ambiguity in any vendor fails CI. Local verification of the full workflow against this branch: - extra JSON check exit 0; validator -l 2 exit 0 (66 vendors); -f tree-wide exit 0 (with the library-aware extended validator, which is strictly stricter than the released binary CI downloads); -r exit 0 for BBL and Qidi. - custom-preset fixture archives v1.9.0..v2.4.1 overlaid per the workflow: six pass outright; v2.3.1/v2.3.2/v2.4.0/v2.4.1 fail locally only on a pre-existing Windows-only validator limitation (a user preset with a non-ASCII filename reads as empty; reproduced byte-identically on the pre-migration base commit, and absent on CI's Linux runners where these archives validate green). --- .github/workflows/check_profiles.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check_profiles.yml b/.github/workflows/check_profiles.yml index e8404d9e4e..8fbd7fc393 100644 --- a/.github/workflows/check_profiles.yml +++ b/.github/workflows/check_profiles.yml @@ -49,13 +49,14 @@ jobs: set +e ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_system.log exit ${PIPESTATUS[0]} - # For now run filament subtype check only for BBL profiles until we fix other vendors' profiles. - - name: validate filament subtype check for BBL profiles + # All vendors' filament_id collisions were fixed (see scripts/filament_id_snapshot.json), + # so the duplicate-filament-subtype check runs tree-wide. + - name: validate filament subtype check id: validate_filament_subtypes continue-on-error: true run: | set +e - ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 -v BBL -f 2>&1 | tee ${{ runner.temp }}/validate_filament_subtypes.log + ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 -f 2>&1 | tee ${{ runner.temp }}/validate_filament_subtypes.log exit ${PIPESTATUS[0]} # Flag inherits/compatible_printers/compatible_prints references that point at a deleted or # renamed preset. Opt-in per vendor for now (via -r); enabled for BBL and Qidi until other @@ -207,7 +208,7 @@ jobs: fi if [ "${{ steps.validate_filament_subtypes.outcome }}" = "failure" ]; then - echo "### BBL Filament Subtype Validation Failed" + echo "### Filament Subtype Validation Failed" echo "" echo '```' head -c 30000 ${{ runner.temp }}/validate_filament_subtypes.log || echo "No output captured" From a395701f29cda51f32eaa108ce2dd97c0810b7bb Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 3 Jul 2026 10:12:21 +0800 Subject: [PATCH 13/52] plan: validate the P+md5 (get_filament_id) mint proposal; record verdict as plan v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Examined minting system filament_ids with CreatePresetsDialog.cpp:487's user-custom allocator (adopt-by-base-name, else "P"+md5(name)[0:7]) for Bambu AMS-sync compatibility. Verdict: keep the OF* mint; capture the proposal's value through bounded work items instead of a re-mint. - The device path never validates id shape: tray_info_idx is an opaque string end-to-end (DeviceManager.cpp:1642; DevFilaSystem.cpp:512-514) and firmware persists arbitrary bytes (bambulab/BambuStudio#5436). Resolution is by value against the GF catalog plus the account's cloud custom cache; unknown ids show "?" regardless of shape, and system presets can never enter that cache (Preset.cpp:2071 gates upload on is_user()). - The only id-shape dispatch in the tree is destructive for P-shaped ids: check_ams_filament_valid (DeviceManager.cpp:5335/5352/5395/5410) remotely clears an AMS tray (:5345) or rewrites its temps when a P-shaped tray id drops out of the user-root preset list — a state name-keyed minting creates by construction. GF* and OF* ids are structurally immune. - The real value is captured without re-minting 391 unshipped ids across 1327 files: the adopt step == curated GF adoption via the snapshot ledger (W4); the hash belongs to user presets (W5, cf. PR #13315); client hardening (W1) that the ten already-shipped P-hex system ids (Cubicon x8, Ginger, Artillery) need today anyway. Method: 6 parallel evidence agents (generator semantics, AMS/device path, exhaustive shape-dispatch sweep, upstream + online sources, tree-wide dry-run over 5892 presets / 1148 base names, branch change inventory) into a 3-judge panel (keep-OF* won 23/40 aggregate); the upstream generator was verified byte-identical to BambuStudio master, and every load-bearing file:line and number in the document was re-verified against the tree before commit. --- filament_id_plan_v2.md | 310 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) create mode 100644 filament_id_plan_v2.md diff --git a/filament_id_plan_v2.md b/filament_id_plan_v2.md new file mode 100644 index 0000000000..dd8c6957c3 --- /dev/null +++ b/filament_id_plan_v2.md @@ -0,0 +1,310 @@ +# filament_id plan v2: the `get_filament_id` (P+md5) proposal, validated + +Follow-up to `filament_id_plan.md` (v1, implemented on `feature/filament_id`: deterministic +`OF*` mint + snapshot ledger + 30-vendor migration, tree-wide validator `-f` = 0). + +**Proposal under review:** mint system `filament_id`s with the scheme of +`static std::string get_filament_id(std::string vendor_typr_serial)` +(`src/slic3r/GUI/CreatePresetsDialog.cpp:487-552`) — Bambu's user-custom-filament id +allocator — so system ids are "compatible with Bambu AMS sync". + +Every claim below was verified in source (`file:line`), against upstream BambuStudio, or in +primary online sources (URLs in §8). Verdict first, evidence after. + +--- + +## 0. Executive summary — the verdict + +**Do not re-mint system ids as `P+md5(name)`. Keep the v1 `OF*` mint.** Three facts decide it: + +1. **The AMS/device path never validates id *shape*.** `tray_info_idx` is an opaque string + end-to-end: sent verbatim (`DeviceManager.cpp:1642`), parsed verbatim + (`DevFilaSystem.cpp:512-514`), and firmware persists arbitrary bytes — an A1 stored and + echoed a *corrupted* id `Pde2\xea58c` (bambulab/BambuStudio#5436). A P-shaped system id + is not "more acceptable" to the device than an `OF*` one. +2. **P-shape buys zero recognition.** The printer resolves tray ids only against its built-in + `GF*` catalog plus the *account's* cloud custom-filament cache (official Bambu wiki); ids + it cannot resolve round-trip as `?`. Orca can never upload system presets into that cache + (`Preset.cpp:2071` gates cloud upload on `is_user()`), so an Orca system `P` id shows `?` + exactly like an `OF` id. The public catalog id space is 100% `GF*` (ha-bambulab + `filaments.json`: 86/86 ids). +3. **P-shape is the one shape the codebase punishes.** The *only* id-shape dispatch in the + entire tree is `MachineObject::check_ams_filament_valid` + `update_filament_list` + (`DeviceManager.cpp:5335/5352/5395/5410`, gate `setting_id.size()==8 && [0]=='P'`), a + user-custom lifecycle reconciler that **remotely wipes an AMS tray** + (`command_ams_filament_settings(..., "", "", white, "", 0, 0)` at `:5345`) or rewrites its + temps (`:5361-5367`) when a P-shaped tray id drops out of the user-root preset list + (`:5219`, armed at `:5268`). Name-keyed minting makes system id == user-custom id *by + design* (same name → same id), so "user deletes their now-redundant custom after the + system preset ships" becomes a remote tray wipe. `GF*` (wrong length) and `OF*` (wrong + first char) are structurally immune. + +The proposal's *real* value lives in two places, and v2 captures both without the re-mint: + +- **The adopt step** (the function's first branch, `:509-511/:526-528`): same base name → + same id. In-app, this already gives Orca-local convergence today — a user custom named + like a system family adopts the system id *whatever its shape*. At authoring time, the + same semantics = the v1 `shared_catalog` mechanism; §5/W4 extends it (curated, optional) + to let byte-authentic Bambu-catalog families carry authentic `GF*` ids. +- **The hash step belongs to user space.** `P+md5(name)` is Bambu's allocator for *user* + presets; the community is already asking for it there (OrcaSlicer PR #13315, unique ids + for inherited user presets). §5/W5 endorses that lane. System profiles stay out of the + `P` namespace — and v2 adds client hardening (W1) because ten *already-shipped* system + P-hex ids (Cubicon `P510cf**`×8, Ginger `P510eff9`, Artillery `Pfcf9c4c`) sit inside the + wipe-gate's shape match today. + +Judge panel (3 independent lenses over 4 variants; §7): keep-`OF*` won 23/40 aggregate +(device-ecosystem 6, identity-semantics 8, migration-enforceability 9) vs full Bambu +emulation 11, hash-only name-keyed 12, vendor-scoped P-hash 12. The single dissent +(device-ecosystem, favoring adoption) is honored by W4; its own verdict on the shape was +"adopt the semantics, not the costume". + +--- + +## 1. What the proposed generator actually is (verified) + +`get_filament_id(vendor_typr_serial)` (`CreatePresetsDialog.cpp:487-552`), called with +`" "` (`:1128`, `PLA-AERO`→`"PLA Aero"`), and per-preset with the +display base name when cloning presets for a user-created printer +(`Preset.cpp:2785-2803` → `:2798-2800`): + +1. **Adopt:** scan a temp bundle of *every* vendor bundle on disk + (`PresetBundle::load_system_filaments_json`, `PresetBundle.cpp:2342-2391`) plus the + user's presets, then the live bundle (`Preset.cpp:2831-2842`); if any preset's base name + (`name.substr(0, first('@') - 1)`) equals the input and its id ≠ `"null"`, **return that + id** — which can be `GF*`, `QD_*`, `OF*`, or another user's P-hex. +2. **Mint:** `"P" + md5(input)[0:7]`, lowercase hex over the raw UTF-8 bytes (`:533`, + `:480`). +3. **Collide:** if the id is held by a *different* name, re-hash with a local wall-clock + salt (`md5(input + get_curr_time())`, `:547`) — non-deterministic by construction. + +Upstream parity: the function and its caller input construction are **byte-identical** in +BambuStudio master (`CreatePresetsDialog.cpp` L434-499 / L1061; diff empty, fetched +2026-07-03). So identical dialog inputs in BBS and Orca yield identical ids — the kernel of +the proposal's compatibility claim. + +Reproduction limits (why "exactly the approach" cannot be ported to system minting anyway): + +- The base-name parser truncates names lacking a space before `@` (`"Afinia PLA@HS"` → + `"Afinia PL"`); 48 shipped presets hit this, and the *clone* path parses differently + (`" @"` two-char, `Preset.cpp:2792`), so the app itself is internally inconsistent. +- 597 presets (361 whole families, e.g. all of Anker) contain no `@` and are invisible to + the adopt scan and its collision map (`:505-508`). +- The collision salt is wall-clock time — unreproducible across machines, so id values + cannot be CI-verified from names; a ledger would still be the sole source of truth. +- Shipped P-hex ids don't round-trip from names today: Cubicon `P510cfb0` ≠ + `P+md5("Cubicon ABS")` = `Pc624b68` (verified) — so even Bambu-lineage P ids are not + name-derivable in practice. + +## 2. What Bambu AMS sync actually consumes (verified) + +- Send: `command_ams_filament_settings` puts the preset's `filament_id` verbatim into + `tray_info_idx` (`DeviceManager.cpp:1642`); cloud vs LAN differ only in transport + (`:2502-2536`). No client- or firmware-side rejection path exists; the ack parse stores + whatever the printer echoes (`:3808-3860`). +- Resolve (slicer side): tray id → first compatible root preset with equal `filament_id` — + system *and* user roots, no shape filter (`PresetBundle.cpp:3151`, `:3252-3254`); misses + fall back by `"Generic "` name, then similarity, then keep-previous + (`:3157-3169`, `:3260-3305`). `setting_id_to_type` resolves against `is_system` presets + only (`DeviceManager.cpp:2538-2559`) — a system preset resolves *because it is system*, + never because of its id shape. +- Resolve (device side): built-in `GF*` catalog + the account's cloud custom cache; + custom-filament sync is **cloud-only** (not LAN), and an id the printer has no data for + displays `?` until opened once on the printer screen (official wiki, §8). Third-party + consumers see customs as "unknown" (ha-bambulab #466/#540). +- Since Jan 2025, AMS configuration is gated behind Bambu-signed clients on new firmware + (Developer Mode / older firmware exempt) — any AMS-sync benefit for Orca is conditional + on that regardless of id scheme (Bambu authorization blog, §8). +- Orca already ships non-`GF`/non-`P` shapes to Bambu trays in the field: OFL presets are + compatible with every printer (`PresetBundle.cpp:5681-5684`) and carry `OGF*`/`OFL*` ids + (e.g. `OFLSBS99`, hardcoded in `MoonrakerPrinterAgent.cpp:654`). The premise "the + ecosystem has only ever seen `GF*`/P-hex" is already false, with no observed rejection. + +**Cross-client reality check.** The name-keyed benefit ("a BBS-created custom named like an +Orca system preset lands on the same id, so Orca's sync matches the system preset") is +mechanically true but narrow: it needs byte-exact names (including the `PLA Aero` mapping +and single spacing), the unsalted hash path, cloud mode, and permissive firmware. The +symmetric case already works in Orca *without* any re-mint: an Orca user creating a custom +named like a system family **adopts the system id** via the in-app adopt branch, so local +custom ↔ system ↔ tray matching is shape-independent today. + +## 3. The disqualifying finding, in mechanism form + +`update_filament_list` (`DeviceManager.cpp:5208-5272`) snapshots `{filament_id → temps}` +over **user root presets only** (`preset.is_user() && preset.inherits() == ""`, `:5219`); +ids that vanish or change temps between snapshots are armed into `checked_filament` +(`:5268`). `check_ams_filament_valid` (`:5311-5445`) then, for every AMS/virtual tray whose +`setting_id` matches `size()==8 && [0]=='P'`: + +- id armed and **not** in the current user-root list → remotely **clears the tray** + (`:5335-5349`, `:5395-5408`); +- id armed and in the list with unequal temps → **rewrites tray temps from the user + preset**, ignoring same-id system presets (`:5352-5374`; `PresetBundle.cpp:3719` skips + non-user presets; unguarded `find()->second` at `:3717`). + +Failure scenario under the proposal: system `"PolyLite PLA"` ships with +`P+md5("PolyLite PLA")`. A user's same-named custom (BBS- or Orca-created — same id by +design) is on an AMS tray. The user deletes the now-redundant custom. Next status refresh: +the id is armed, absent from user roots → Orca wipes the tray, even though the system +preset still resolves that id perfectly. Runs continuously (`StatusPanel.cpp:3275-3277`). + +Two corollaries independent of the proposal (→ W1): + +- The ten shipped P-hex **system** ids (Cubicon/Ginger/Artillery) already pass the shape + gate; only the "id must transit a user root" arming condition protects them, and the + in-app adopt branch can create exactly that transit today. +- `assert(it->first.size() == 8 && it->first[0] == 'P')` (`:5252`) is violable today: a + user custom named `"Bambu PLA Basic"` adopts `GFA00` onto a user root and aborts debug + builds. + +## 4. Identity costs the re-mint would add (quantified, tree dry-run) + +- 1148 distinct family base names; **198** appear in 2+ vendors; **159** groups carry ≥2 + distinct ids today and would silently merge under name-keying (Generic PETG alone: 15 + ids today). 112 involve BBL; 82 are `GF↔OGF` mirror pairs. +- **4** cross-vendor groups share a name across materially different `filament_type` + (Generic PLA Silk, Generic PETG-CF, Generic PA6-CF, Generic PE-CF) — one merged id would + feed wrong type/name/vitrification to the global unscoped consumers + (`PresetBundle.cpp:690-733`; `DeviceManager.cpp:2538`; `FilamentGroup.cpp:513-519`) (→ W3). +- 33 deliberately-split families on the branch would re-merge (25 Elegoo-vs-OFL pairs, 7 + FlyingBear-vs-InfiMech "Other *" pairs, the salted Cubicon PC pair) — undoing v1 + decisions that the fixture gate forced. +- Renames become id migrations: name-keyed ids re-key on any marketing rename; the ledger + can freeze them, but then name-derivability — the scheme's selling point — dies family + by family. The `OF*` key (`vendor/family`) survives display-name churn. +- Entropy drops 35.7 → 28 bits (still 0 collisions at today's 1148 names; ~0.75 expected + at 20k). Re-mint surface: 391 unshipped ids across 1327 files, 13 hardcoded tests, the + reserved-namespace policy inversion, and a retired-ledger rebuild. + +## 5. Work items (delta from `feature/filament_id` HEAD) + +**W1 — client hardening (C++, small, ships with the migration PR train).** + a. Skip the tray-reset and temp-rewrite in `check_ams_filament_valid` when **any + `is_system` filament preset carries the tray's id** — no compatibility filter, + mirroring the semantics of the global consumers (`get_filament_by_filament_id`, + `setting_id_to_type`). This protects the ten shipped P-hex system ids and any BBS + custom colliding with them, while ids resolving only to user presets (or to nothing) + keep today's cleanup behavior. + b. Relax the debug assert `DeviceManager.cpp:5252` to a log (user roots legitimately + carry adopted `GF*`/`OF*` ids). + c. Guard `PresetBundle.cpp:3717` (`find()` unchecked before `->second`). + d. Regression-check that AMS sync never clears trays whose id it merely cannot resolve + (OrcaSlicer#4431 class): the keep-previous fallbacks at `PresetBundle.cpp:3163-3169`, + `:3296-3305` must cover the UI paths. + +**W2 — tooling + doc guardrails.** + a. Document `^OF[0-9A-Za-z]{6}$` as the system-mint namespace. **Do not add it to + `reserved_space_owner`** (`scripts/assign_filament_ids.py:394-402`): check 6 exempts + only snapshot-grandfathered claims and the `--update-snapshot` refusal gate + (`:596-621`) would then reject every *future* mint. The space is already enforced — + check 3 (mint conformance, `:488-509`) errors on any OF-shaped id that does not equal + its own family's mint (covered by `test_check3_of_id_must_match_mint`), and the + snapshot diff is the human gate. Add one doc paragraph + a test asserting a foreign + vendor claiming another family's OF id fails check 3. + b. `doc/developer-reference/filament_id.md`: add a "why not P-hex" section citing the + `DeviceManager.cpp:5335` gate and the account-cache resolution model — community + pressure toward `P+md5` exists (PR #13315) and will recur. + c. Document that user roots may legitimately hold adopted system ids (incl. what that + means for cloud upload, `Preset.cpp:1874-1876`), matching BBS behavior. + +**W3 — data hygiene: the 4 same-name-different-type groups.** Audit each (they confuse + name-based fallback matching and any future interop even under vendor-scoped ids): + verify whether the divergent `filament_type` is a data bug (e.g. OFL `Generic PETG-CF` + resolving `PETG`, OFL `Generic PE-CF` resolving `PE`, Flashforge `Generic PLA Silk` + mixing `SILK`+`PLA`, Creality-vs-Elegoo `Generic PA6-CF` as `PA-CF`/`PA6-CF`) or + intentional; fix by type alignment or rename with evidence, gated by + config-equivalence (only `filament_type` diffs as prescribed) + full validator suite. + +**W4 — optional, curated GF adoption (the proposal's adopt step, done safely).** Extend the + v1 `--allow-shared-catalog` mechanism into an explicit per-family adoption worksheet: a + family may carry a byte-authentic Bambu catalog id iff (i) it is verifiably the same + commercial product as the BBL family (vendor evidence + equal `filament_type`), (ii) + validator `-f` stays 0 tree-wide (alias shadowing covers BBL/OFL overlaps), (iii) the + fixture gate passes, (iv) the snapshot diff records the adoption. Candidates: the 13 + actionable BBL-overlapping families minted `OF*` in v1 (e.g. Qidi `Bambu ABS`→`GFB00`, + `PolyLite PLA`→`GFL00`, `Overture PLA`→`GFL04`, `PolyLite ABS`→`GFB60`; `OFLSBS99` is + shipped and frozen; the two type-hazard OFL families are excluded until W3 lands). + **Honest benefit statement:** these presets are compatible only with non-Bambu printers, + so no Bambu device resolves their ids today; the payoff is one-product-one-id coherence + for the global consumers, project portability, and readiness for W6. Recommended seed: + the four Qidi brand families; generics deferred. + +**W5 — user-preset lane (where the proposal's hash belongs).** Support unique ids for + inherited user presets (the PR #13315 pain: children share the parent's id, so AMS always + resolves the generic parent). `P + md5(preset name)` matching + `CreatePresetsDialog::get_filament_id` is correct *in user space*: adopt-first against + existing ids, then hash; ids frozen per preset after mint. Constraints: never emitted + into system profiles (W2a makes that mechanical); W1 must land first so shared-id + lifecycles can't wipe trays. + +**W6 — recorded future option:** SoftFever's "upload OrcaSlicer's filament database + (especially the filament ID) to the printer" (PR #12724 comment). If pursued, Orca ids + become first-class device-visible artifacts and the P-mimicry question is permanently + moot; the `OF*` scheme is the *better* citizen there (collision-free vendor-scoped ids, + no user-custom masquerade). + +Unchanged from v1: mint rule, snapshot/retired ledgers (no OF retirement — nothing is +re-minted), CI wiring, migration commits. `filament_id_plan.md` remains the implemented +baseline; this document records the v2 decision and its follow-on work. + +## 6. Gates (per work item) + +Same battery as v1, all local: `python scripts/orca_extra_profile_check.py` exit 0; +`assign_filament_ids.py --check` exit 0 (46+ unit tests green; new tests for W2a +reservation and, when implemented, W4 adoption sanctioning); validator `-l 2` exit 0, +`-f` tree-wide exit 0, `-r` BBL+Qidi exit 0; custom-preset fixture overlays (the W1/W4 +changes touch exactly the preset-visibility machinery the fixtures exist to protect); +config-equivalence: flattened effective configs differ only in prescribed keys +(`filament_id` for W4, `filament_type` for W3, none for W1/W2). W1 additionally needs a +manual AMS smoke test on a live Bambu printer (tray set/clear round-trip) — a release +checklist item, not CI (the workflows have no hardware runners). + +## 7. Scheme comparison (judge panel record) + +| Variant | Device lens | Identity lens | Migration lens | Σ | +|---|---|---|---|---| +| V1 full Bambu emulation (adopt incl. `GF*` + P+md5 + salt) | 7 | 2 | 2 | 11 | +| V2 hash-only name-keyed `P+md5(base name)` | 4 | 4 | 4 | 12 | +| V3 vendor-scoped P-hash (`P+md5(vendor/family)`) | 2 | 5 | 5 | 12 | +| **V4 keep `OF*` uuid5 vendor-scoped (chosen)** | 6 | 8 | 9 | **23** | + +All three judges answered the pivotal question the same way: the P-hex **shape** confers no +device/cloud benefit (resolution is by value against catalog + account cache; the path is +otherwise shape-agnostic) and is the only shape with a destructive client-side gate. V3 is +strictly dominated (all of the re-mint cost, none of the name-keyed benefit). V1's genuine +half — GF adoption — is captured by W4 at zero re-mint cost. + +## 8. Evidence index + +Code (this branch): `CreatePresetsDialog.cpp:487-552,1128,2798-2800` (generator + callers); +`DeviceManager.cpp:1642` (verbatim send), `:2538-2559` (system-only type resolve), +`:5208-5272` (user-root snapshot, `:5219`, `:5252` assert, `:5268` arming), `:5311-5445` +(P-shape gate + tray wipe `:5335/:5345`, temp rewrite `:5352-5374`, virtual tray +`:5395-5435`); `DevFilaSystem.cpp:512-524`; `PresetBundle.cpp:690-733,3116-3128,3151, +3252-3254,3709-3767,5674-5753`; `Preset.cpp:1874-1876,2071,2785-2842`; +`AMSMaterialsSetting.cpp:886,894-897`; `WebGuideDialog.cpp:67`; +`PresetComboBoxes.cpp:1952-1966`; `MoonrakerPrinterAgent.cpp:654`; +`scripts/assign_filament_ids.py:69,71-72,118-144,394-402,596-621`. + +Online (fetched 2026-07-03): BambuStudio master `CreatePresetsDialog.cpp` L434-499 +(byte-identical generator); wiki.bambulab.com `create-filament` (custom filaments AMS-able +from firmware 1.6.6; only dialog-created presets sync) and `custom-filament-issue` +(cloud-only sync; unknown ids show `?`); blog.bambulab.com authorization-control (Jan-2025 +AMS-config gating); bambulab/BambuStudio#5436 (firmware persists corrupted id); +OrcaSlicer #4431 (tray clobber to `?`), #3874 (cloud-only confirmation), PR #14459 +(the `-f` invariant), PR #14423 + PR #12724 + PR #13315 (maintainer statements / community +P+md5 pressure); greghesp/ha-bambulab `filaments.json` (86/86 `GF*`) + #466/#540. + +Method: 6 parallel evidence agents (generator semantics; AMS/device path; exhaustive +shape-dispatch sweep; upstream/online; tree-wide dry-run over 5892 presets / 1455 families; +branch change inventory) → 3-judge panel (device-ecosystem, identity-semantics, +migration-enforceability lenses). Dry-run artifacts: session scratchpad +`phex_dryrun_{summary,details,followup}.json`. + +## 9. Open decisions for maintainers + +1. **W4 scope**: none / 4 Qidi brand families (recommended) / + generic-tier re-adoption. +2. **W5 timing**: implement in-repo vs review upstream PR #13315 with the W1 hardening as a + prerequisite either way. +3. **W6**: pursue the filament-database-upload design (makes Orca ids device-visible and + ends the mimicry debate for good). From 67406b24babaada2694787ce62620d2ced61bc78 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 4 Jul 2026 14:54:48 +0800 Subject: [PATCH 14/52] plan v3: OFL as the catalog, content-addressed product ids MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revises the v1 mint rule after the maintainer catch that its key scoped families to the profile bundle (printer brand), fragmenting one commercial product into N ids (PolyLite PLA: five bundles, all filament_vendor "Polymaker", up to five ids). Architecture: BBL and QD_* stay frozen islands; OrcaFilamentLibrary becomes the single declaration point for every other material family; vendor bundles carry only same-alias specializations (no filament_id key) that shadow the OFL preset per printer and resolve its id through the loader walk. New mint key: uuid5 over "filament_product///" from the root's flattened config — bundle-independent (hoisting families into OFL is id-stable), and the type component keeps the four known same-name- different-type groups apart until their data bugs are fixed. Content-addressing replaces "ids immutable once shipped": identity edits re-id the family, made safe by turning retired_filament_ids.json into a shipped succession ledger (old id -> successor, chains allowed, cross-island hints permitted) consulted on resolution miss in the AMS sync and lookup paths. The MoonrakerPrinterAgent hardcoded generic-id map is replaced by a runtime preset lookup, removing the code/profile lockstep. Migration: v3.0 tooling + W1 client hardening + W3 type fixes; v3.1 OFL re-mint with succession entries; v3.2 vendor bundles (391 unshipped OF ids re-derive without retirement; generic tunings re-point to OFL; ~800 shipped legacy ids re-mint with succession, incl. the 57 multi-vendor GF residue and the 10 P-hex system ids, which also exits them from the destructive check_ams_filament_valid P-gate); v3.3 optional id-stable consolidation into OFL. Gate battery unchanged plus succession-resolution tests. filament_id_plan_v2.md gets a status note: its P+md5 verdict stands; its work items are absorbed or superseded by v3. --- filament_id_plan_v2.md | 4 + filament_id_plan_v3.md | 203 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) create mode 100644 filament_id_plan_v3.md diff --git a/filament_id_plan_v2.md b/filament_id_plan_v2.md index dd8c6957c3..b5bf0f1c65 100644 --- a/filament_id_plan_v2.md +++ b/filament_id_plan_v2.md @@ -1,5 +1,9 @@ # filament_id plan v2: the `get_filament_id` (P+md5) proposal, validated +> **Status note:** the verdict in §0-§4 and §7-§8 stands. The work items in §5 are +> superseded by `filament_id_plan_v3.md` (OFL-as-catalog, content-addressed triple key, +> succession ledger): W1/W3 are carried into v3.0, W2/W5 carry unchanged, W4 is dropped. + Follow-up to `filament_id_plan.md` (v1, implemented on `feature/filament_id`: deterministic `OF*` mint + snapshot ledger + 30-vendor migration, tree-wide validator `-f` = 0). diff --git a/filament_id_plan_v3.md b/filament_id_plan_v3.md new file mode 100644 index 0000000000..5cf4cf61a4 --- /dev/null +++ b/filament_id_plan_v3.md @@ -0,0 +1,203 @@ +# filament_id plan v3: OFL as the catalog, content-addressed product ids + +Supersedes §5 of `filament_id_plan_v2.md` (whose P+md5 verdict stands unchanged) and +revises the mint rule of `filament_id_plan.md` (v1, implemented on `feature/filament_id`). +Decision driver: v1's mint key scoped families to the *profile bundle* (printer brand), so +one commercial product tuned in N bundles carries N ids — e.g. PolyLite PLA ships in five +bundles (`BBL`, `OrcaFilamentLibrary`, `OrcaArena`, `Qidi`, `Snapmaker`), all with +`filament_vendor: "Polymaker"`, under up to five different ids (`GFL00`, `OFceJcLf`, …). +That contradicts what `filament_id` means: one id per commercial product line. + +## 0. The architecture + +Three tiers, two frozen islands: + +1. **BBL island — untouched.** Bambu profiles keep their `GF*` catalog ids byte-for-byte + (device/RFID/cloud contract). No convergence between GF and OFL ids is attempted: the + same product may permanently carry `GFL00` on the BBL side and an `OF*` id everywhere + else. This is a deliberate trade for simplicity; v2's curated-GF-adoption (old W4) is + dropped. +2. **`QD_*` island — untouched.** Qidi's box builds `QD___` from + device enums and requires exactly-matching presets (`QidiPrinterAgent.cpp:146-152`). + Qidi presets carrying `QD_*` are exempt from re-minting, forever. +3. **Everything else converges on OrcaFilamentLibrary.** OFL is the product catalog: a + material family's id is declared once, on its OFL family root. Vendor bundles carry + only per-printer *specializations* of OFL families — same base name, non-empty + `compatible_printers`, **no `filament_id` key** — which (a) alias-shadow the OFL preset + on the printers they claim (`Preset.cpp:3684-3714`: "Generic PLA @Qidi Q2 0.4mm nozzle" + hides "Generic PLA @System" on that machine) and (b) resolve the OFL family's id + through the loader's inherits/base-bundle walk (`PresetBundle.cpp:4842-5080`). Products + OFL does not (yet) carry mint their id in the vendor bundle **with the same rule**; + because the key is bundle-independent (§1), later hoisting the family into OFL never + changes its id. + +Convergence therefore happens by *single declaration point*, not by copying ids across +bundles — no adoption registry, no cross-bundle id claims to curate. + +## 1. The mint rule + +``` +triple = (filament_vendor, filament_type, family_name) # from the family ROOT's flattened config +key = "filament_product///" +id = "OF" + base62_6( uuid5( FILAMENT_ID_NAMESPACE, key ) ) # namespace unchanged: + # c4d3ff49-4c32-5534-a3e3-00894157ab97 +``` + +- **Triple resolution.** All three values come from the family root preset's *flattened + effective config* (`filament_vendor` and `filament_type` are inheritable list options — + take the first element; family_name = the root's base name, `\s?@.*` stripped once). + For own-key-layout families (no root), each declaring preset's flattened config is used + and CI requires all declarers of one family to agree on the triple. A root that resolves + an empty `filament_vendor` or `filament_type` is a CI error (generics use `"Generic"`). + Values enter the key verbatim (UTF-8, no case folding). +- **Bundle-independent by design.** The key contains no bundle name, so the same product + yields the same id whether minted in OFL or in a vendor bundle; migrating a family into + OFL (§0.3) is id-stable. Two bundles independently adding the same triple converge + automatically — and that is correct, because equal (vendor, type, name) *is* the + definition of "same product" here. The known look-alike hazards stay separated by the + type component: the 4 same-name-different-type groups (Flashforge `Generic PLA Silk` as + SILK, OFL `Generic PETG-CF` as PETG, `Generic PA6-CF`, `Generic PE-CF`) hash apart until + their type bugs are fixed (§5, W3) and converge automatically after — self-healing that + pure name-keying (rejected in v2) could not provide. +- **Format and salt unchanged from v1**: 8 chars, `OF` + 6 base62; deterministic `/1`, + `/2`… salt past any taken or retired id (the O+7 widening was evaluated and rejected: + 62⁶ expects 1.9×10⁻⁵ collisions at today's 1,455 families, and `^O.{7}$` would sweep 35 + legacy ids into the conformance gate vs. one today). +- **Content-addressed, deliberately.** If any triple component changes — a family rename, + a `filament_vendor` correction, a `filament_type` fix — the id changes with it. This + *replaces* v1's "ids are immutable once shipped" with "ids are derivable from the + product identity, and identity changes are migrations" — made safe by the succession + ledger (§2). `renamed_from` still gates preset-name compatibility as before. +- CLI: `--mint "Polymaker/PLA/PolyLite PLA"` prints without touching the tree; running + the script plain inserts missing ids; CI errors print the expected id. + +## 2. The succession ledger (the amendment that makes this safe) + +Shipped ids are referenced outside the tree: AFC/Klipper lane data, Bambu AMS trays +holding OFL-only materials, on-device PA-calibration records, user-root preset copies, +3mf `slice_info`. Retiring an id without a forwarding pointer downgrades all of those to +`Generic ` fallbacks. Therefore: + +- **Schema.** `scripts/retired_filament_ids.json` entries become objects: + `{"retired": {"OGFL99": {"claims": [...], "successor": "OFxxxxxx"}}}`. Append-only as + before; a successor may itself be retired later (chains allowed, cycle-checked, and + followed to the live end). A retired id may never be minted again (check 4 unchanged). + Cross-island *hint* entries are permitted for ids Orca cannot retire because another + island owns them (e.g. `GFL99 → `): consulted only when no live + preset matches, so BBL installs still resolve `GFL99` natively first. +- **Shipped and consulted at runtime.** The ledger ships in `resources/`; a small helper + (`resolve_filament_id_succession(id)`) follows the chain and is consulted **only on + resolution miss**, before the `Generic ` name fallback, in: + `PresetBundle::get_filament_by_filament_id` (covers `DevFilaBlackList`, `SelectMachine` + warnings, `Plater` tray configs in one place), the AMS sync match predicates + (`PresetBundle.cpp:3151`, `:3252-3254` miss paths at `:3157-3169`/`:3260-3305`), + `PresetComboBoxes::add_ams_filaments`, `MachineObject::setting_id_to_type` + (`DeviceManager.cpp:2545` miss branch), calibration-history name lookup + (`CaliHistoryDialog.cpp:62`), and the #14423 Moonraker lane matching when it lands. + With this in place the OFL re-mint is near-residue-free and every future + content-addressed rename stays safe. +- **Kill the hardcoded generic map.** `MoonrakerPrinterAgent::map_filament_type_to_generic_id` + (`MoonrakerPrinterAgent.cpp:608-658`) hardcodes 23 OFL ids (`OGFL99`… `OFLSBS99`). + Replace it with a runtime lookup of the OFL generic preset by name ("Generic PLA + @System" → its current id), removing the code↔profile lockstep permanently. (This also + releases `OFLSBS99`, v2's one frozen OF-shaped legacy id, for normal re-minting.) + +## 3. Validation rule changes + +- **Check 3 (mint conformance)** becomes a pure function of the root's triple: a non-BBL, + non-`QD_*` id must equal `mint(triple)` ± salt, or be snapshot-grandfathered (the + grandfather set shrinks to ≈ nothing for non-BBL once migration completes). +- **Check 5 (alias hygiene) generalizes and becomes load-bearing.** For *every* + OFL-carried family (not just `Generic * @System`): a vendor specialization must keep the + OFL base name (else the OFL preset un-shadows and creates a live per-printer duplicate — + v1's P7 pattern) and non-empty `compatible_printers`, and must not declare an id. The + C++ validator's OFL-aware `-f` (`PresetBundle.cpp:5674-5753`) already enforces the + runtime consequence; the script check names the rename as the cause. +- **New check 8 (triple integrity):** every id-declaring family resolves a complete, + family-consistent triple; roots missing `filament_vendor`/`filament_type` error. +- **New check 9 (succession integrity):** every retired entry's successor chain ends at a + live tree id (or a documented cross-island hint target); no cycles; retired ids absent + from the tree. +- Snapshot mechanism, reserved spaces (`GF*`→BBL, `QD_*`→Qidi, `P`-hex/`null`→user-custom; + v2's do-not-reserve-`OF*` note stands), and check 1/2/4/7 are unchanged. + +## 4. Migration phases + +**v3.0 — tooling + prerequisites (no profile changes).** New mint + triple resolver +(reuse the flatten machinery), succession schema migration + C++ lookup helper wired into +the §2 miss paths, Moonraker map → runtime lookup, checks 3/5/8/9, tests. Carry v2's W1 +client hardening (skip tray-wipe/temp-rewrite when a system preset holds the id; relax +the `DeviceManager.cpp:5252` assert; guard the `PresetBundle.cpp:3717` deref) — it ships +first regardless. **W3 type fixes land here**, *before* any re-mint: type is now a key +component, so minting before fixing OFL `Generic PETG-CF`/`Generic PE-CF` would re-id +those families twice. + +**v3.1 — OFL re-mint.** Every OFL-declared id re-derives from its triple (mirrors like +`OGFA00`, generics like `OGFL99`, blocks like `OEPLAB00` — all of it); each old shipped id +gains a succession entry pointing at its replacement; the 26 BBL×OFL byte-shared ids +dissolve (BBL keeps its id; the OFL family gets its own — two-island purity). Snapshot +regenerated; full gate battery + fixture overlays (this phase touches preset-visibility +machinery only via ids, but the fixtures are cheap insurance). + +**v3.2 — vendor bundles, worksheet-per-vendor (v1 machinery).** Three sub-cases: + (a) the **391 unshipped v1 `OF*` mints** re-derive under the triple key — no succession + entries (they never shipped; a documented one-time `--forget-never-shipped ` drops + them from the ledger lineage instead of retiring them, since the ledger's rationale — + ids live on in user presets and 3mfs — cannot apply to unreleased ids); + (b) **true generic tunings** riding copied legacy ids (`GFL99`-class) drop their own id + and re-point to the OFL generic family (the v1 Sovol pattern) — their old ids get + cross-island hints where BBL owns them, succession entries otherwise; + (c) remaining **shipped legacy ids** (numeric, name-shaped, pseudo-GF, the 57 + multi-vendor GF residue, the 10 P-hex — everything non-BBL/non-`QD_*`, ~800 ids) + re-mint with succession entries. Retiring the 10 P-hex system ids also removes the last + system ids from `check_ams_filament_valid`'s destructive P-gate. + +**v3.3 — ongoing consolidation (optional, per-vendor, id-stable).** Hoist vendor-unique +products into OFL where a family is genuinely multi-vendor material; thanks to the +bundle-independent key this never changes ids, so it can proceed opportunistically. + +## 5. Gates (every phase) + +`python scripts/orca_extra_profile_check.py` exit 0; `assign_filament_ids.py --check` +exit 0; unit tests green (existing 46 + new triple/succession/adoption tests); validator +`-l 2` exit 0, `-f` tree-wide exit 0, `-r` BBL+Qidi exit 0; custom-preset fixture +archives; config-equivalence — flattened effective configs differ only in `filament_id` +(re-mints), `inherits`/`compatible_printers` (re-points, as prescribed per worksheet), and +the W3 `filament_type` corrections. New for v3: a C++ test that a retired id resolves +through the succession chain in the sync miss path, and a Moonraker test that the generic +map lookup matches the shipped OFL presets. Manual AMS smoke test (tray set → old-id +resolve → clear) stays a release-checklist item. + +## 6. Accepted costs (explicit) + +- **GF ↔ OFL divergence is permanent** for products in both catalogs (PolyLite PLA ≠ + `GFL00` outside BBL). The forward-looking fix is PR #12724-style filament-database + upload, where Orca ids become first-class device artifacts. +- **Renames/type-fixes re-id families** (by design); the succession ledger absorbs the + device/user residue, but each one is still a ledger entry and a snapshot diff to review. +- **User roots** keep whatever id they copied at creation; with succession lookup in + `get_filament_by_filament_id` they now *resolve* instead of dangling — strictly better + than v1's accepted residue. +- **One-time field transition**: devices holding pre-v3 ids (AFC lanes, AMS trays, cali + records) resolve via succession on updated clients; *older* Orca versions and + BambuStudio never resolved OFL-only ids anyway (`?`/generic fallback — unchanged for + them). + +## 7. Open decisions + +1. Whether v3.2(b)'s cross-island hints (`GFL99` → OFL generic) are wanted at launch or + deferred (pure-miss-path feature; zero risk to BBL installs, small review surface). +2. v3.3 pacing: per-vendor PRs opportunistically vs. a dedicated consolidation train. +3. Whether to fold v2's W5 (P+md5 ids for inherited *user* presets, PR #13315) into v3.0's + C++ work or keep it a separate PR (recommended: separate; W1 is its only prerequisite). + +## 8. Evidence + +Carried from v2 §8 (all re-verified this session), plus: `filament_vendor` audit — 49 +distinct strings tree-wide, `"Polymaker"` byte-consistent across all five PolyLite-PLA +bundles; multi-vendor different-family GF residue = 57 ids; `MoonrakerPrinterAgent.cpp: +608-658` = 23 hardcoded OFL ids; mint examples verified live (`Qidi/PolyLite PLA` → +`OFceJcLf` under the v1 key — the fragmentation this plan removes; salt determinism +`OF8afiMO`). Alias shadowing and the OFL id fallback verified at `Preset.cpp:3684-3714` +and `PresetBundle.cpp:4842-5080` during the v1 audit; per-printer `-f` semantics at +`PresetBundle.cpp:5674-5753`. From 2c0867619c1276454c9c6f9ae73c99de00e35f06 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 4 Jul 2026 16:28:35 +0800 Subject: [PATCH 15/52] v3.0: content-addressed mint tooling, succession runtime, W1 hardening Implements phase v3.0 of filament_id_plan_v3.md - tooling and client prerequisites. No filament_id values change in this commit. Tooling (scripts/assign_filament_ids.py; 106 unit tests): - The mint key becomes "filament_product/// ", resolved loader-faithfully from the declarer's flattened config - bundle-independent and content-addressed; identity fixes re-id by design and are made safe by the succession ledger. --mint now takes the triple. - The snapshot gains "triples" and "triple_exceptions" sections, folded into the equality gate: any vendor/type/name change surfaces as a reviewable snapshot diff. Check 3 rewritten to triple-mint conformance with (id, triple) grandfathering; check 5 generalized from OFL generics to every OFL-riding vendor preset; new check 8 (triple integrity) and check 9 (succession integrity). - The retired ledger moves to resources/profiles/retired_filament_ids.json so it ships with the app; schema {claims, successor} plus cross-island "hints". The 14 v1 entries are migrated with mode-rule successors. Vanished ids in a foreign island's space (GF*/QD_*) are RELEASED with a hint instead of retired: the island catalog owns them and may legitimately (re)ship them, which check 4 must never block. - New maintenance modes: --remint VENDOR, --drop-redundant-ids VENDOR, --add-hint "OLD=NEW", and --update-snapshot --forget-never-shipped FILE (never-shipped ids drop from lineage; chains splice through them). Runtime (C++): - Succession helpers in libslic3r/Preset (pure chain-follow + lazy ledger load from resources), consulted only on resolution miss in get_filament_by_filament_id, both AMS sync predicates, add_ams_filaments, setting_id_to_type, and the calibration-history lookup; behavior is byte-identical while the ledger has no matching entry. Catch2 coverage in tests/libslic3r. - W1 hardening: check_ams_filament_valid no longer remote-wipes trays or rewrites temps for P-shaped ids that a system preset carries (ten such system ids ship today); the size==8 && [0]=='P' assert is relaxed; the unguarded filament_list find deref in the temp-equation check returns non-destructively on a miss. - MoonrakerPrinterAgent: the 23 hardcoded OFL generic ids are replaced by a runtime lookup of "Generic @System" (id-equivalent on today's shipped profiles, follows future re-mints automatically); scripts/test_moonraker_lane_data.py derives its expectations from the shipped profiles and gains --check-ofl-map. Profile data (W3 - type is now a key component, so type bugs are fixed before any re-mint): - 17 same-name-different-type groups corrected across 50 files (OFL Generic PETG-CF/PE-CF/PP-CF; Flashforge ASA Basic/ASA-CF/ABS-CF/HIPS/ PAHT-CF/PLA Silk; FusRock PAHT; Creality Generic PA6-CF; InfiMech PETG; Anycubic TPU 95A / TPU for ACE; Prusa Generic PA-CF/PLA-CF) - every value validated against MaterialType::all(); 3 Snapmaker U1 roots gain their missing filament_vendor. Flattened-config equivalence vs the previous commit: exactly the 54 intended diffs, zero BBL. - doc/developer-reference/filament_id.md rewritten for the v3 rule. Ambiguous type divergences (Prusa Generic TPU/TPU HF FLEX-vs-TPU, FusRock S-Multi/S-PAHT) and all same-type vendor-tag divergences are deferred to the v3.2 vendor worksheets, catalogued with analysis. --- doc/developer-reference/filament_id.md | 74 +- filament_id_plan_v3.md | 12 +- ...95A @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ACE @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ACE @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- .../Generic PA6-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PA6-CF @K1C-all.json | 2 +- .../Generic PA6-CF @K1C_CFS-C-all.json | 2 +- .../Generic PA6-CF @K1_CFS-C-all.json | 2 +- .../filament/Generic PA6-CF @K2 Plus-all.json | 2 +- .../filament/Generic PA6-CF @K2 Pro-all.json | 2 +- .../filament/Flashforge ABS-CF @FF G4.json | 3 + .../filament/Flashforge ABS-CF @FF G4P.json | 3 + ...shforge ASA Basic @FF AD5X 0.6 nozzle.json | 3 + ...shforge ASA Basic @FF AD5X 0.8 nozzle.json | 3 + .../Flashforge ASA Basic @FF AD5X.json | 3 + .../filament/Flashforge ASA-CF @FF G4.json | 2 +- .../filament/Flashforge ASA-CF @FF G4P.json | 2 +- .../filament/Flashforge ASA-CF.json | 2 +- .../Flashforge HIPS @FF G4 0.6 HF nozzle.json | 3 + .../Flashforge HIPS @FF G4 0.6 nozzle.json | 3 + .../Flashforge HIPS @FF G4 0.8 HF nozzle.json | 3 + ...Flashforge HIPS @FF G4P 0.6 HF nozzle.json | 3 + .../Flashforge HIPS @FF G4P 0.6 nozzle.json | 3 + ...Flashforge HIPS @FF G4P 0.8 HF nozzle.json | 3 + .../filament/Flashforge PAHT-CF @FF G4.json | 2 +- .../filament/Flashforge PAHT-CF @FF G4P.json | 2 +- ...shforge PLA Silk @FF AD5X 0.25 nozzle.json | 2 +- ...ashforge PLA Silk @FF AD5X 0.6 nozzle.json | 2 +- ...ashforge PLA Silk @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Silk @FF AD5X.json | 2 +- .../filament/Flashforge PLA Silk @FF C5.json | 2 +- .../filament/Flashforge PLA Silk @FF C5P.json | 2 +- .../FusRock PAHT @FF G4 0.6 HF nozzle.json | 3 + .../FusRock PAHT @FF G4 0.8 HF nozzle.json | 3 + .../FusRock PAHT @FF G4P 0.6 HF nozzle.json | 3 + .../FusRock PAHT @FF G4P 0.8 HF nozzle.json | 3 + .../filament/FusRock PAHT-CF @FF G4.json | 2 +- .../filament/FusRock PAHT-CF @FF G4P.json | 2 +- .../FusRock/FusRock Generic PAHT-CF.json | 2 +- .../filament/Generic PLA Silk @FF C5.json | 2 +- .../filament/Generic PLA Silk @FF C5P.json | 2 +- .../EX+APS/fdm_filament_pet @EX+APS.json | 2 +- .../filament/EX/fdm_filament_pet @EX.json | 2 +- .../filament/Generic PE-CF @base.json | 5 +- .../filament/Generic PETG-CF @base.json | 5 +- .../filament/Generic PP-CF @base.json | 5 +- .../filament/Prusa Generic PA-CF @base.json | 5 +- .../filament/Prusa Generic PLA-CF @base.json | 5 +- .../filament/Snapmaker PLA Lite @U1 base.json | 3 + .../Snapmaker PLA Matte @U1 base.json | 3 + .../Snapmaker PLA SnapSpeed @U1 base.json | 3 + resources/profiles/retired_filament_ids.json | 90 + scripts/assign_filament_ids.py | 941 +- scripts/filament_id_snapshot.json | 11001 +++++++++++++++- scripts/retired_filament_ids.json | 47 - scripts/test_moonraker_lane_data.py | 115 +- scripts/tests/test_filament_id.py | 917 +- src/libslic3r/Preset.cpp | 54 + src/libslic3r/Preset.hpp | 17 + src/libslic3r/PresetBundle.cpp | 31 +- src/slic3r/GUI/CaliHistoryDialog.cpp | 8 +- src/slic3r/GUI/DeviceManager.cpp | 42 +- src/slic3r/GUI/PresetComboBoxes.cpp | 7 + src/slic3r/Utils/MoonrakerPrinterAgent.cpp | 90 +- tests/libslic3r/CMakeLists.txt | 1 + .../libslic3r/test_filament_id_succession.cpp | 61 + 67 files changed, 13311 insertions(+), 330 deletions(-) create mode 100644 resources/profiles/retired_filament_ids.json delete mode 100644 scripts/retired_filament_ids.json create mode 100644 tests/libslic3r/test_filament_id_succession.cpp diff --git a/doc/developer-reference/filament_id.md b/doc/developer-reference/filament_id.md index a45268b6aa..377c390422 100644 --- a/doc/developer-reference/filament_id.md +++ b/doc/developer-reference/filament_id.md @@ -69,9 +69,12 @@ the `Generic X` base name, write no id key). `Generic X @System`, keeps the `Generic X` base name (that alias is what hides the library preset on your printers), sets a non-empty `compatible_printers`, and writes no id key. A vendor-*branded* filament never rides a generic family id. -5. **Ids are immutable once shipped.** Renaming a family does not change its id — use - `renamed_from`. A shipped id is never recycled for a different material: old ids live on in - user presets and 3mf files and a recycled id would silently match the wrong material. +5. **Ids follow the product identity.** The id is a pure function of the product triple + `(filament_vendor, filament_type, family name)` — correcting any of them re-mints the id + **by design**, and `--update-snapshot` records the old id in the shipped succession ledger + with its successor so device trays, calibration records, and user presets keep resolving + (`renamed_from` still gates preset-*name* compatibility as before). A shipped id is never + recycled for a different material: retired ids are blocked forever. ## Minting — nobody invents ids @@ -81,15 +84,20 @@ New ids are deterministic, computed exactly like the `setting_id` precedent ```text FILAMENT_ID_NAMESPACE = uuid5(setting-id NAMESPACE, "filament_id") = c4d3ff49-4c32-5534-a3e3-00894157ab97 -filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, "filament_family//") ) +filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, + "filament_product///") ) ``` `base62_6` is the low 6 base62 digits (alphabet `0-9A-Za-z`) of the UUID taken as a big-endian -integer, most-significant digit first — 8 chars total, within the AMS length limit. `` -is the vendor bundle name (the stem of the vendor index json, e.g. `Qidi`, -`OrcaFilamentLibrary`); `` is the family base name. On the rare collision with any -existing or retired id, the minter salts the input (`…/1`, `…/2`, …) until free and the result -is frozen in the file. Example: family `MyBrand PLA` in vendor `Orca 3D` mints `OFvCEY5V`. +integer, most-significant digit first — 8 chars total, within the AMS length limit. The triple +comes from the family root's *flattened* config: `` is the filament +**manufacturer** (`"Polymaker"`, or `"Generic"` for generics — never the printer brand), +`` the material type, `` the root's base name; the two config +values are inheritable list options and the first element counts. The key contains no bundle +name, so the same product mints the same id in every bundle — hoisting a family into +OrcaFilamentLibrary never changes its id. On the rare collision with any existing or retired +id, the minter salts the input (`…/1`, `…/2`, …) until free and the result is frozen in the +file. Example: `Polymaker/PLA/PolyLite PLA` mints `OF5CgdDq`. Workflow for a new family: @@ -101,8 +109,12 @@ python scripts/assign_filament_ids.py --check # 4. verify — the sam # 5. Commit the profile edits together with scripts/filament_id_snapshot.json. ``` -`--mint "Vendor/Family"` prints the id for one family without touching anything. The default -run is idempotent and never rewrites a valid existing id. +`--mint "filament_vendor/filament_type/family_name"` prints the id a triple would mint without +touching anything. The default run is idempotent and never rewrites a valid existing id. +Maintenance modes (normally only used by id migrations): `--remint VENDOR` re-derives a +vendor's declared ids from their triples, `--drop-redundant-ids VENDOR` deletes declarations +that merely re-declare an inherited OFL id, and `--add-hint "OLD=NEW"` records a cross-island +succession hint. If you skip the tooling, CI fails and prints the remedy: the expected id for your family, and the instruction to run `python scripts/assign_filament_ids.py --update-snapshot` and commit @@ -116,7 +128,20 @@ the resulting diff. | `QD_*` | Qidi device protocol | frozen device contract; Qidi vendor only | | `P` + 7 hex chars (case-insensitive), `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp`) | never appears in system profiles | | every already-shipped id | grandfather snapshot | frozen as-is; new claims need maintainer sign-off | -| every retired id | `scripts/retired_filament_ids.json` | never used again, for anything | +| every retired id | `resources/profiles/retired_filament_ids.json` | never used again, for anything | + +## The succession ledger + +`resources/profiles/retired_filament_ids.json` ships with the app. Each retired id maps to +`{"claims": [...], "successor": }` — successor chains are followed to the live end — +and a `hints` map carries the same forwarding for ids Orca cannot retire because another +island owns them (e.g. a `GF*` id whose material also exists as an OFL family). The client +consults the ledger **only on resolution miss** (AMS tray sync, tray-id type lookup, +calibration history, filament-id preset lookup): a live preset always wins first, so BBL +installs resolve `GF*` natively and behavior is unchanged wherever the raw id still exists. +This is what makes identity-driven re-mints (structure rule 5) safe: the old id keeps +resolving to the family's current preset instead of degrading to a `Generic ` fallback. +The file is append-only and maintained exclusively by `--update-snapshot` / `--add-hint`. ## How CI enforces this @@ -131,14 +156,22 @@ deterministically (running it twice changes nothing). The checks, in brief: - **Format** — every id is either in the snapshot, `OF` + 6 base62 chars, BBL's, or Qidi `QD_*`. -- **Snapshot equality** — tree claims == snapshot claims, both directions. -- **Mint conformance** — a non-grandfathered `OF*` claim must equal the mint (or a salt - iteration) of its `(vendor, family)`; the error prints the expected id. -- **Retired reuse** — any tree id present in `scripts/retired_filament_ids.json` is an error. +- **Snapshot equality** — tree claims == snapshot claims **and** tree triples == snapshot + triples, both directions: any `filament_vendor`/`filament_type`/family-name change surfaces + as a snapshot diff. +- **Mint conformance** — a non-grandfathered `OF*` id must equal the mint (or a salt + iteration) of its declarer's product triple; the error prints the expected id. +- **Retired reuse** — any tree id present in `resources/profiles/retired_filament_ids.json` is an error. Ids that fully vanish from the tree are appended there by `--update-snapshot`; the file is **append-only**. -- **Alias hygiene** — a tuned generic must keep the library preset's base name and a non-empty - `compatible_printers` (structure rule 4); the error names the rename as the cause. +- **Alias hygiene** — any vendor preset riding an OFL family id must keep the library + preset's base name, a non-empty `compatible_printers`, and no own id key (structure rule 4); + the error names the rename as the cause. +- **Triple integrity** — every declarer outside the BBL/`QD_*` islands must resolve a + non-empty `filament_vendor` and `filament_type` (generics use `"Generic"`), and all + declarers of one family within a bundle must agree on the triple. +- **Succession integrity** — retired successor chains terminate at a live id (or null) with + no cycles; `hints` keys are live, island-owned ids. - **Reserved namespaces** — `GF*` outside BBL, `QD_*` outside Qidi, `P<7-hex>` or `null` anywhere, unless that exact claim is grandfathered in the snapshot. - **Structure** — no `filament_id` key on instantiated presets; no declared-vs-inherited id @@ -161,7 +194,10 @@ check instead. inherit the family's root, write no id key. - **A tuned generic ("our profile for Generic PLA")?** Inherit `Generic PLA @System`, keep the `Generic PLA` base name, set `compatible_printers`, write no id key. -- **I need to rename a family.** Keep the id, add `renamed_from`. Ids never change. +- **I need to rename a family (or fix its `filament_vendor`/`filament_type`).** Add + `renamed_from` for the name, run `--remint ` then `--update-snapshot`: the id + re-derives from the corrected identity and the old id lands in the succession ledger + pointing at the new one. Commit the profile, snapshot, and ledger diffs together. - **CI says my family needs an id.** Run `python scripts/assign_filament_ids.py`, then `--update-snapshot`, and commit both diffs. Do not type an id by hand. diff --git a/filament_id_plan_v3.md b/filament_id_plan_v3.md index 5cf4cf61a4..5a4bdedb26 100644 --- a/filament_id_plan_v3.md +++ b/filament_id_plan_v3.md @@ -84,7 +84,12 @@ holding OFL-only materials, on-device PA-calibration records, user-root preset c followed to the live end). A retired id may never be minted again (check 4 unchanged). Cross-island *hint* entries are permitted for ids Orca cannot retire because another island owns them (e.g. `GFL99 → `): consulted only when no live - preset matches, so BBL installs still resolve `GFL99` natively first. + preset matches, so BBL installs still resolve `GFL99` natively first. By the same + principle, an id in a foreign island's space (`GF*`/`QD_*`) that vanishes from the tree + is **released with a hint, never retired** — the island's catalog owns it and may + legitimately (re)ship it later, which check 4 must never block. (Implementation + amendment, v3.0: `--update-snapshot` routes such ids to `hints` automatically; hint + keys may be absent from the tree.) - **Shipped and consulted at runtime.** The ledger ships in `resources/`; a small helper (`resolve_filament_id_succession(id)`) follows the chain and is consulted **only on resolution miss**, before the `Generic ` name fallback, in: @@ -134,8 +139,9 @@ those families twice. **v3.1 — OFL re-mint.** Every OFL-declared id re-derives from its triple (mirrors like `OGFA00`, generics like `OGFL99`, blocks like `OEPLAB00` — all of it); each old shipped id -gains a succession entry pointing at its replacement; the 26 BBL×OFL byte-shared ids -dissolve (BBL keeps its id; the OFL family gets its own — two-island purity). Snapshot +gains a succession entry pointing at its replacement; the 26 GF-shaped ids OFL declares +(measured at v3.0: only one of them, `GFOT001`, is also declared by BBL) are released to +the BBL island space with hints at the re-minted families — two-island purity. Snapshot regenerated; full gate battery + fixture overlays (this phase touches preset-visibility machinery only via ids, but the fixtures are cheap insurance). diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json index ababa2bbb9..6b5699d6eb 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -13,7 +13,7 @@ "Anycubic" ], "filament_type": [ - "PEBA" + "TPU" ], "compatible_printers": [ "Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json index 7f8d97a333..7d4b5e30c3 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -13,7 +13,7 @@ "Anycubic" ], "filament_type": [ - "TPU for ACE" + "TPU" ], "compatible_printers": [ "Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json index e9b2079dff..7b820c0957 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -13,7 +13,7 @@ "Anycubic" ], "filament_type": [ - "PEBA" + "TPU" ], "compatible_printers": [ "Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json index c9aa3f2918..82cd2c4faa 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json @@ -87,7 +87,7 @@ "0" ], "filament_type": [ - "PA-CF" + "PA6-CF" ], "filament_vendor": [ "Generic" diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json index c3108d354a..12f1662b2d 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json @@ -87,7 +87,7 @@ "0" ], "filament_type": [ - "PA-CF" + "PA6-CF" ], "filament_vendor": [ "Generic" diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json index d745af0009..9e3a508a5d 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json @@ -87,7 +87,7 @@ "0" ], "filament_type": [ - "PA-CF" + "PA6-CF" ], "filament_vendor": [ "Generic" diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json index 6eb1569816..ee75cdd734 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json @@ -87,7 +87,7 @@ "0" ], "filament_type": [ - "PA-CF" + "PA6-CF" ], "filament_vendor": [ "Generic" diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json index 162ec5e7d1..71c4ef7a31 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json @@ -84,7 +84,7 @@ "0" ], "filament_type": [ - "PA-CF" + "PA6-CF" ], "filament_vendor": [ "Generic" diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json index 6049b3b882..5c71b8ea97 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json @@ -84,7 +84,7 @@ "0" ], "filament_type": [ - "PA-CF" + "PA6-CF" ], "filament_vendor": [ "Generic" 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 b45e46341e..f1917abb9a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json @@ -39,6 +39,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material: ABS-CF\n" ], + "filament_type": [ + "ABS-CF" + ], "compatible_printers": [ "Flashforge Guider4 0.4 nozzle" ], 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 16bcc1aeb3..03194dd913 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json @@ -39,6 +39,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material: ABS-CF\n" ], + "filament_type": [ + "ABS-CF" + ], "compatible_printers": [ "Flashforge Guider4 Pro 0.4 nozzle" ], 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 bf4a2d3194..eb123cc3ad 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 @@ -27,6 +27,9 @@ "filament_settings_id": [ "Flashforge ASA Basic @FF AD5X 0.6 nozzle" ], + "filament_type": [ + "ASA" + ], "compatible_printers": [ "Flashforge AD5X 0.6 nozzle" ], 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 f74bcf4ab7..2e7ff56b63 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 @@ -27,6 +27,9 @@ "filament_settings_id": [ "Flashforge ASA Basic @FF AD5X 0.8 nozzle" ], + "filament_type": [ + "ASA" + ], "compatible_printers": [ "Flashforge AD5X 0.8 nozzle" ], 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 4c3018a061..a63e1c7dfe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json @@ -27,6 +27,9 @@ "filament_settings_id": [ "Flashforge ASA Basic @FF AD5X" ], + "filament_type": [ + "ASA" + ], "compatible_printers": [ "Flashforge AD5X 0.4 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json index d59ed639a3..62f2f92006 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json @@ -37,7 +37,7 @@ "; filament start gcode\n;right_extruder_material: ASA-CF\n" ], "filament_type": [ - "ASA" + "ASA-CF" ], "compatible_printers": [ "Flashforge Guider4 0.4 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json index ed2467c6e7..8d88edb2ad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json @@ -37,7 +37,7 @@ "; filament start gcode\n;right_extruder_material: ASA-CF\n" ], "filament_type": [ - "ASA" + "ASA-CF" ], "compatible_printers": [ "Flashforge Guider4 Pro 0.4 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json index 30ead39e25..b400c7d253 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json @@ -16,7 +16,7 @@ "Flashforge ASA-CF" ], "filament_type": [ - "ASA" + "ASA-CF" ], "hot_plate_temp": [ "100" 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 cd5ca2143f..9622514949 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 @@ -63,6 +63,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:HIPS" ], + "filament_type": [ + "HIPS" + ], "compatible_printers": [ "Flashforge Guider4 0.6 HF nozzle" ], 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 e4b4e3171d..1f6bec0997 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 @@ -63,6 +63,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:HIPS" ], + "filament_type": [ + "HIPS" + ], "compatible_printers": [ "Flashforge Guider4 0.6 nozzle" ], 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 03cf58e9e0..684f303f65 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 @@ -63,6 +63,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:HIPS" ], + "filament_type": [ + "HIPS" + ], "compatible_printers": [ "Flashforge Guider4 0.8 HF nozzle" ], 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 7ea19866be..2468478e6a 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 @@ -63,6 +63,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:HIPS" ], + "filament_type": [ + "HIPS" + ], "compatible_printers": [ "Flashforge Guider4 Pro 0.6 HF nozzle" ], 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 3a44280bc2..7b28d67e08 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 @@ -63,6 +63,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:HIPS" ], + "filament_type": [ + "HIPS" + ], "compatible_printers": [ "Flashforge Guider4 Pro 0.6 nozzle" ], 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 5943947947..4356a46961 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 @@ -63,6 +63,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:HIPS" ], + "filament_type": [ + "HIPS" + ], "compatible_printers": [ "Flashforge Guider4 Pro 0.8 HF nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json index 784d279539..62f9c06854 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json @@ -61,7 +61,7 @@ "; filament start gcode\n;right_extruder_material:PA-CF\n" ], "filament_type": [ - "PA-CF" + "PAHT-CF" ], "compatible_printers": [ "Flashforge Guider4 0.4 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json index f5b823f2ea..b7f3bc5386 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json @@ -61,7 +61,7 @@ "; filament start gcode\n;right_extruder_material:PA-CF\n" ], "filament_type": [ - "PA-CF" + "PAHT-CF" ], "compatible_printers": [ "Flashforge Guider4 Pro 0.4 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json index 3074f553f0..e3d9c57369 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json @@ -31,7 +31,7 @@ "Flashforge PLA Silk @FF AD5X 0.25 nozzle" ], "filament_type": [ - "SILK" + "PLA" ], "compatible_printers": [ "Flashforge AD5X 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 9de378b7cc..058dce03c0 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 @@ -22,7 +22,7 @@ "Flashforge PLA Silk @FF AD5X 0.6 nozzle" ], "filament_type": [ - "SILK" + "PLA" ], "compatible_printers": [ "Flashforge AD5X 0.6 nozzle" 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 c3dbf86193..c2f9796beb 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 @@ -22,7 +22,7 @@ "Flashforge PLA Silk @FF AD5X 0.8 nozzle" ], "filament_type": [ - "SILK" + "PLA" ], "compatible_printers": [ "Flashforge AD5X 0.8 nozzle" 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 5d7ff07d01..6ebc636b10 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json @@ -22,7 +22,7 @@ "Flashforge PLA Silk @FF AD5X" ], "filament_type": [ - "SILK" + "PLA" ], "hot_plate_temp": [ "60" 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 069b924da4..7aa85e29bf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json @@ -54,7 +54,7 @@ "; filament start gcode" ], "filament_type": [ - "SILK" + "PLA" ], "hot_plate_temp": [ "65" 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 4c9b89d97e..67ca938c59 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json @@ -57,7 +57,7 @@ "; filament start gcode" ], "filament_type": [ - "SILK" + "PLA" ], "nozzle_temperature": [ "230" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json index 06012ecf04..646f8971b2 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json @@ -36,6 +36,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PA" ], + "filament_type": [ + "PAHT" + ], "compatible_printers": [ "Flashforge Guider4 0.6 HF nozzle" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json index 57380ab9e4..b0cb4812c8 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json @@ -36,6 +36,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PA" ], + "filament_type": [ + "PAHT" + ], "compatible_printers": [ "Flashforge Guider4 0.8 HF nozzle" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json index c6b435b34b..dbccec4551 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json @@ -36,6 +36,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PA" ], + "filament_type": [ + "PAHT" + ], "compatible_printers": [ "Flashforge Guider4 Pro 0.6 HF nozzle" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json index e69ba59f78..07e8702da2 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json @@ -36,6 +36,9 @@ "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PA" ], + "filament_type": [ + "PAHT" + ], "compatible_printers": [ "Flashforge Guider4 Pro 0.8 HF nozzle" ], 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 ac82265489..2e264e4b2f 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json @@ -55,7 +55,7 @@ "; filament start gcode\n;right_extruder_material:PA-CF\n" ], "filament_type": [ - "PA-CF" + "PAHT-CF" ], "compatible_printers": [ "Flashforge Guider4 0.4 nozzle" 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 71b3ae9af1..0aaa19dd68 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json @@ -55,7 +55,7 @@ "; filament start gcode\n;right_extruder_material:PA-CF\n" ], "filament_type": [ - "PA-CF" + "PAHT-CF" ], "compatible_printers": [ "Flashforge Guider4 Pro 0.4 nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json index 98dcbdde4c..16ce25c253 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json @@ -168,7 +168,7 @@ "0" ], "filament_type": [ - "PA-CF" + "PAHT-CF" ], "filament_unload_time": [ "0" 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 16e1f0d278..2087257bcb 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5.json @@ -53,7 +53,7 @@ "; filament start gcode" ], "filament_type": [ - "SILK" + "PLA" ], "hot_plate_temp": [ "65" 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 eb0aa584da..a5de4c8f4a 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic PLA Silk @FF C5P.json @@ -56,7 +56,7 @@ "; filament start gcode" ], "filament_type": [ - "SILK" + "PLA" ], "nozzle_temperature": [ "230" diff --git a/resources/profiles/InfiMech/filament/EX+APS/fdm_filament_pet @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/fdm_filament_pet @EX+APS.json index 396373accc..0d8b7f36ef 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/fdm_filament_pet @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/fdm_filament_pet @EX+APS.json @@ -44,7 +44,7 @@ "12" ], "filament_type": [ - "PETG Basic" + "PETG" ], "filament_density": [ "1.27" diff --git a/resources/profiles/InfiMech/filament/EX/fdm_filament_pet @EX.json b/resources/profiles/InfiMech/filament/EX/fdm_filament_pet @EX.json index c718df9d89..0213942153 100644 --- a/resources/profiles/InfiMech/filament/EX/fdm_filament_pet @EX.json +++ b/resources/profiles/InfiMech/filament/EX/fdm_filament_pet @EX.json @@ -44,7 +44,7 @@ "12" ], "filament_type": [ - "PETG Basic" + "PETG" ], "filament_density": [ "1.27" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json index 74aea8b342..48212f7143 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pe", "from": "system", "filament_id": "OFJfx0Cl", - "instantiation": "false" + "instantiation": "false", + "filament_type": [ + "PE-CF" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json index 21b93a089d..08bc8ad547 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pet", "from": "system", "filament_id": "OFDCk0cz", - "instantiation": "false" + "instantiation": "false", + "filament_type": [ + "PETG-CF" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json index f1898eb1f6..f5fefcf0cb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pp", "from": "system", "filament_id": "OFRS2Ggt", - "instantiation": "false" + "instantiation": "false", + "filament_type": [ + "PP-CF" + ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json index 0b0059fa9a..350ab54889 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pa", "from": "system", "filament_id": "OFXfgh61", - "instantiation": "false" + "instantiation": "false", + "filament_type": [ + "PA-CF" + ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json index f45f0e0bf0..c899728e68 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFv8SRZh", - "instantiation": "false" + "instantiation": "false", + "filament_type": [ + "PLA-CF" + ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json index b75944c3ec..351390aace 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json @@ -46,6 +46,9 @@ "filament_type": [ "PLA" ], + "filament_vendor": [ + "Snapmaker" + ], "filament_density": [ "1.24" ], diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json index ac2ea870ea..816b04dcd5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json @@ -46,6 +46,9 @@ "filament_type": [ "PLA" ], + "filament_vendor": [ + "Snapmaker" + ], "filament_density": [ "1.24" ], diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json index adaaf5c3c6..12caa4b25c 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json @@ -46,6 +46,9 @@ "filament_type": [ "PLA" ], + "filament_vendor": [ + "Snapmaker" + ], "filament_density": [ "1.24" ], diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json new file mode 100644 index 0000000000..3840098c11 --- /dev/null +++ b/resources/profiles/retired_filament_ids.json @@ -0,0 +1,90 @@ +{ + "hints": {}, + "retired": { + "GFABS": { + "claims": [ + "Anycubic/Anycubic ABS" + ], + "successor": "OFf2b9wu" + }, + "GFL92": { + "claims": [ + "Anycubic/Anycubic PLA" + ], + "successor": "OFgK2Xvv" + }, + "GFL93": { + "claims": [ + "Anycubic/Anycubic PLA+" + ], + "successor": "OFgrGfPy" + }, + "GFPLA": { + "claims": [ + "Anycubic/Anycubic PLA" + ], + "successor": "OFgK2Xvv" + }, + "GFPLA High Speed": { + "claims": [ + "Anycubic/Anycubic PLA High Speed" + ], + "successor": "OFgSK1hL" + }, + "GFPLA Matte": { + "claims": [ + "Anycubic/Anycubic PLA Matte" + ], + "successor": "OFvYfHPB" + }, + "GFPLA Silk": { + "claims": [ + "Anycubic/Anycubic PLA Silk" + ], + "successor": "OFjdTQd6" + }, + "GFPLA+": { + "claims": [ + "Anycubic/Anycubic PLA+" + ], + "successor": "OFgrGfPy" + }, + "P11851ba": { + "claims": [ + "Artillery/Artillery PET" + ], + "successor": "OFw0qp7w" + }, + "P284941e": { + "claims": [ + "Artillery/Artillery PETG", + "Artillery/Artillery PETG Basic" + ], + "successor": "OFEYKrjb" + }, + "P2fbf0c0": { + "claims": [ + "Artillery/Artillery TPU" + ], + "successor": "OFTbsWVg" + }, + "P39db358": { + "claims": [ + "Artillery/Artillery ABS" + ], + "successor": "OFw1S8lL" + }, + "P8163162": { + "claims": [ + "Artillery/Artillery PVA" + ], + "successor": "OFc2SnEp" + }, + "P87436f6": { + "claims": [ + "Artillery/Artillery ASA" + ], + "successor": "OFtmT4Nd" + } + } +} diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index 8100ecb880..3945c2ec8d 100644 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -1,44 +1,69 @@ #!/usr/bin/env python3 """ -Mint deterministic filament_id values for OrcaSlicer system filament families and +Mint deterministic filament_id values for OrcaSlicer system filament products and validate the tree against the sanctioned-state ledger. -Policy (companion to assign_vendor_setting_ids.py; see filament_id_plan.md): - * filament_id is a MATERIAL-FAMILY id: one commercial product line = one id, - shared by all of that material's per-printer/per-nozzle variants. The key is - declared only on family ROOT presets (instantiation != "true"); instantiated - variants inherit it through `inherits` and never write the key themselves. - * New ids are a pure function of the family's identity: +Policy (companion to assign_vendor_setting_ids.py; see filament_id_plan_v3.md): + * filament_id is a PRODUCT id: one commercial product line = one id, shared by + all of that material's per-printer/per-nozzle variants in every bundle. + OrcaFilamentLibrary (OFL) is the product catalog: a family's id is declared + once, on its family root (instantiation != "true"); vendor bundles carry + only specializations of OFL families — same base name, non-empty + compatible_printers, no filament_id key — which resolve the OFL id through + the loader's inherits/base-bundle walk. Products OFL does not carry mint + their id in the vendor bundle with the same rule; the key is + bundle-independent, so hoisting a family into OFL never changes its id. + * New ids are content-addressed by the product triple, resolved from the + declaring preset's flattened config (filament_vendor and filament_type are + inheritable list options — first element; family name = preset base name): filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, - "filament_family//") ) - where is the vendor bundle name (stem of the vendor index json) and - is the family name = preset base name (name with /\\s?@.*$/ stripped). + "filament_product///") ) 8 chars total, which satisfies the AMS length limit. Nobody invents ids by - hand; on the astronomically rare collision with any existing or retired id the - input is salted ("/1", "/2", ...) until free and the result is frozen in file. + hand; on the astronomically rare collision with any existing or retired id + the input is salted ("/1", "/2", ...) until free and the result is frozen + in file. Identity changes (a family rename, a filament_vendor/filament_type + fix) change the id BY DESIGN — the succession ledger keeps old ids + resolving. * Reserved id spaces that are never minted into or altered: - GF* Bambu AMS/RFID catalog (vendor BBL untouchable) - QD_* Qidi device protocol - P + 7 hex chars (case-insensitive) and the literal "null" user-custom presets (CreatePresetsDialog.cpp) - every already-shipped id, grandfathered via scripts/filament_id_snapshot.json - * scripts/filament_id_snapshot.json is the sanctioned-state ledger: it must - exactly equal the tree-derived state at all times, so any id/claim change shows - up as a reviewable diff to that file (the maintainer gate). Ids that fully - vanish from the tree are appended to scripts/retired_filament_ids.json; a - retired id may never be used again for anything. + * scripts/filament_id_snapshot.json is the sanctioned-state ledger (ids, + claims and declared triples): it must exactly equal the tree-derived state + at all times, so any id/claim/triple change shows up as a reviewable diff to + that file (the maintainer gate). Ids that fully vanish from the tree are + appended to the SHIPPED succession ledger + resources/profiles/retired_filament_ids.json as + {"claims": [...], "successor": } — successor picked by the mode + rule over the vanished id's old claims — and the runtime follows those + chains (plus cross-island "hints" for ids Orca cannot retire, e.g. GF*) + on resolution miss. A retired id may never be used again for anything. + Vanished ids in a FOREIGN island's space (GF*/QD_*) are released with a + hint instead of retired: the island's catalog owns them and may + legitimately (re)ship them. The effective-id resolution below is loader-faithful (PresetBundle.cpp load_vendor_configs_from_json): own filament_id key, else walk `inherits` within the vendor map, with OrcaFilamentLibrary base-bundle fallback; once a chain enters OFL it stays in OFL; a vendor chain that dead-ends id-less retries its direct -parent in the OFL map. +parent in the OFL map. filament_vendor / filament_type resolve the same way. Run from anywhere: python3 scripts/assign_filament_ids.py (default) mint + insert ids for id-less families; idempotent, never rewrites a valid existing id; a no-op on a fully-idded tree - --mint "V/Family" print the id that would be minted; touches nothing + --mint "Vendor/Type/Family" + print the id that triple would mint; touches nothing --update-snapshot regenerate the snapshot from the tree; retire vanished ids + with a mode-rule successor (--forget-never-shipped FILE + drops listed never-shipped ids from lineage instead) + --add-hint "OLD=NEW" + record a cross-island succession hint (standalone) + --remint VENDOR re-derive VENDOR's declared ids from their triples and + rewrite mismatches in place (repeatable) + --drop-redundant-ids VENDOR + delete declarations that re-declare an inherited OFL id --check run the validation checks (also run by CI through orca_extra_profile_check.py); exit nonzero on errors """ @@ -62,7 +87,10 @@ FILAMENT_ID_LENGTH = 6 # base62 digits after the "OF" prefix -> 8 chars total SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) PROFILES_DIR = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "resources", "profiles")) SNAPSHOT_PATH = os.path.join(SCRIPTS_DIR, "filament_id_snapshot.json") -RETIRED_PATH = os.path.join(SCRIPTS_DIR, "retired_filament_ids.json") +# The succession ledger ships with the app (resources/) so the runtime can +# follow retired->successor chains and cross-island hints on resolution miss. +RETIRED_PATH = os.path.join(PROFILES_DIR, "retired_filament_ids.json") +RETIRED_REL = "resources/profiles/retired_filament_ids.json" OFL = "OrcaFilamentLibrary" @@ -73,8 +101,6 @@ USER_CUSTOM_ID_RE = re.compile(r"^P[0-9A-Fa-f]{7}$", re.IGNORECASE) # Family name = preset base name: strip the first "@..." suffix. The space before # "@" is optional because names like "Afinia PLA@HS" exist. BASE_NAME_RE = re.compile(r"\s?@.*$") -# OFL generic presets relevant for alias hygiene (check 5). -OFL_GENERIC_RE = re.compile(r"^Generic .* @System$") # Salt iterations accepted by the mint-conformance check (check 3). MAX_CHECK_SALT = 8 @@ -115,15 +141,15 @@ def base_name(name): return BASE_NAME_RE.sub("", name, count=1) -def generate_filament_id(vendor, family, salt=0): - """Deterministic "OF" + 6-char base62 filament_id for a material family. +def generate_filament_id(filament_vendor, filament_type, family, salt=0): + """Deterministic "OF" + 6-char base62 filament_id for a filament product. - input = "filament_family//" (+ "/" when salted); - u = uuid5(FILAMENT_ID_NAMESPACE, input); the id tail is the low - FILAMENT_ID_LENGTH base62 digits of int(u.bytes, "big"), most-significant - first — the same derivation as generate_preset_setting_id. + input = "filament_product///" + (+ "/" when salted); u = uuid5(FILAMENT_ID_NAMESPACE, input); the id + tail is the low FILAMENT_ID_LENGTH base62 digits of int(u.bytes, "big"), + most-significant first — the same derivation as generate_preset_setting_id. """ - key = f"filament_family/{vendor}/{family}" + key = f"filament_product/{filament_vendor}/{filament_type}/{family}" if salt: key = f"{key}/{salt}" u = uuid.uuid5(FILAMENT_ID_NAMESPACE, key) @@ -135,13 +161,14 @@ def generate_filament_id(vendor, family, salt=0): return "OF" + "".join(reversed(digits)) -def mint_filament_id(vendor, family, taken): - """Mint the family's id, salting past any id in `taken` (existing + retired).""" +def mint_filament_id(filament_vendor, filament_type, family, taken): + """Mint the product's id, salting past any id in `taken` (existing + retired).""" for salt in range(10000): - candidate = generate_filament_id(vendor, family, salt) + candidate = generate_filament_id(filament_vendor, filament_type, family, salt) if candidate not in taken: return candidate - raise RuntimeError(f"could not mint a free filament_id for {vendor}/{family}") + raise RuntimeError( + f"could not mint a free filament_id for {filament_vendor}/{filament_type}/{family}") # --------------------------------------------------------------------------- @@ -157,7 +184,7 @@ def list_vendor_names(profiles_dir): """Vendor bundles = subdirectories with a matching .json index file. (Ignores stray non-bundle entries such as the tracked "user" directory, - which has no user.json index.) + which has no user.json index, and the retired_filament_ids.json ledger.) """ profiles_dir = str(profiles_dir) return sorted( @@ -196,6 +223,8 @@ def load_vendor_filaments(profiles_dir, vendor): "inherits": data.get("inherits"), "instantiation": str(data.get("instantiation", "")).lower() == "true", "compatible_printers": data.get("compatible_printers") or [], + "filament_vendor": data.get("filament_vendor"), + "filament_type": data.get("filament_type"), } return presets, errors @@ -248,6 +277,53 @@ def resolve_filament_id(name, filaments, ofl_filaments, seen=None, in_ofl=False, return None, "missing", entry +def resolve_filament_field(name, field, filaments, ofl_filaments, seen=None, in_ofl=False): + """Resolve an inheritable list option (filament_vendor / filament_type) with + the same hop semantics as resolve_filament_id: own value, else walk + `inherits` in the vendor map with OFL base-bundle fallback. Values are list + options — the first element counts; "" when the chain never defines one. + """ + if seen is None: + seen = set() + if name in seen: + return "" + seen.add(name) + if in_ofl: + rec = ofl_filaments.get(name) + else: + rec = filaments.get(name) + if rec is None and name in ofl_filaments: + rec, in_ofl = ofl_filaments[name], True + if rec is None: + return "" + value = rec.get(field) + if isinstance(value, str): + value = [value] + if value and value[0]: + return value[0] + parent = rec.get("inherits") + if parent: + found = resolve_filament_field(parent, field, filaments, ofl_filaments, seen, in_ofl) + if found or in_ofl: + return found + if parent in ofl_filaments: + return resolve_filament_field(parent, field, filaments, ofl_filaments, set(), True) + return found + return "" + + +def resolve_triple(name, filaments, ofl_filaments): + """The preset's mint-key triple (filament_vendor, filament_type, family).""" + return (resolve_filament_field(name, "filament_vendor", filaments, ofl_filaments), + resolve_filament_field(name, "filament_type", filaments, ofl_filaments), + base_name(name)) + + +def is_island_declaration(vendor, fid): + """Declarations frozen outside the OF mint domain: all of BBL, QD_* in Qidi.""" + return vendor == "BBL" or (vendor == "Qidi" and fid.startswith("QD_")) + + def analyze_tree(profiles_dir): """Load every vendor bundle and derive the full filament_id state. @@ -260,6 +336,7 @@ def analyze_tree(profiles_dir): ofl_filaments, ofl_errors = ( load_vendor_filaments(profiles_dir, OFL) if OFL in vendor_names else ({}, []) ) + ofl_declared = {r["filament_id"] for r in ofl_filaments.values() if r.get("filament_id")} vendors = {} read_errors = list(ofl_errors) @@ -287,21 +364,35 @@ def analyze_tree(profiles_dir): instantiated_with_id = [] # "Vendor/PresetName" (own filament_id key on an instantiated preset) overrides = [] # (vendor, name, declared, inherited, file) missing_effective = [] # (vendor, name, file) instantiated presets resolving no id - alias_candidates = [] # (vendor, rec, ofl_entry) presets id-resolved through an OFL generic + alias_candidates = [] # (vendor, rec, ofl_entry, own_key) presets riding an OFL family + triples = {} # fid -> set of triples of its non-island declarers + declarer_triples = [] # (vendor, rec, fid, triple) per non-island declarer + family_triples = {} # (vendor, family) -> {triple: [declarer names]} for vendor, filaments in vendors.items(): occurring = vendor_ids.setdefault(vendor, set()) for rec in filaments.values(): if rec.get("filament_id"): - occurring.add(rec["filament_id"]) - declared_ids.setdefault(vendor, set()).add(rec["filament_id"]) - ids.setdefault(rec["filament_id"], set()) + fid = rec["filament_id"] + occurring.add(fid) + declared_ids.setdefault(vendor, set()).add(fid) + ids.setdefault(fid, set()) + if not is_island_declaration(vendor, fid): + triple = resolve_triple(rec["name"], filaments, ofl_filaments) + rec["triple"] = triple + declarer_triples.append((vendor, rec, fid, triple)) + triples.setdefault(fid, set()).add(triple) + family_triples.setdefault( + (vendor, base_name(rec["name"])), {}).setdefault( + triple, []).append(rec["name"]) if rec.get("inherits"): - inherited, _src, _e = resolve_filament_id( + inherited, _src, skip_entry = resolve_filament_id( rec["name"], filaments, ofl_filaments, skip_own=True) - if inherited and inherited != rec["filament_id"]: - overrides.append( - (vendor, rec["name"], rec["filament_id"], inherited, rec["file"])) + if inherited and inherited != fid: + overrides.append((vendor, rec["name"], fid, inherited, rec["file"])) + if (vendor != OFL and skip_entry and inherited + and inherited in ofl_declared): + alias_candidates.append((vendor, rec, skip_entry, True)) if not rec["instantiation"]: continue eff = rec.get("eff_filament_id") @@ -312,18 +403,25 @@ def analyze_tree(profiles_dir): ids.setdefault(eff, set()).add(f"{vendor}/{base_name(rec['name'])}") if rec.get("filament_id"): instantiated_with_id.append(f"{vendor}/{rec['name']}") - if vendor != OFL and rec["ofl_entry"] and OFL_GENERIC_RE.match(rec["ofl_entry"]): - alias_candidates.append((vendor, rec, rec["ofl_entry"])) + if vendor != OFL and rec["ofl_entry"] and eff in ofl_declared: + alias_candidates.append((vendor, rec, rec["ofl_entry"], False)) - # Alias hygiene (check 5): a vendor preset that tunes an OFL generic (no id - # anywhere in its vendor-side chain) is matched to the OFL preset by ALIAS - # (base name); renaming it re-exposes the OFL generic and creates a live - # duplicate, and empty compatible_printers cannot claim any printer. + # Alias hygiene (check 5): a vendor preset that rides an OFL family (its id + # resolves through OFL) is matched to the OFL preset by ALIAS (base name); + # renaming it re-exposes the OFL preset and creates a live duplicate, empty + # compatible_printers cannot claim any printer, and declaring its own + # filament_id key forks the family off the catalog id. alias_violations = [] # (vendor, name, ofl_entry, reason, file) - for vendor, rec, entry in alias_candidates: + for vendor, rec, entry, own_key in alias_candidates: expected = base_name(entry) own_base = base_name(rec["name"]) - if own_base != expected: + if own_key: + alias_violations.append(( + vendor, rec["name"], entry, + f'declares its own filament_id "{rec["filament_id"]}" — dropping the key ' + f"lets it resolve the OFL family's id through inherits", + rec["file"])) + elif own_base != expected: alias_violations.append(( vendor, rec["name"], entry, f'base name "{own_base}" != "{expected}" — the rename re-exposes the ' @@ -335,6 +433,18 @@ def analyze_tree(profiles_dir): "empty compatible_printers cannot shadow the OFL preset anywhere", rec["file"])) + # Cross-bundle triple divergence (check 8, warning only): the same family + # name declared in several bundles with different triples cannot converge + # on one id until the divergence is fixed. + name_bundles = {} + for (vendor, family), tmap in family_triples.items(): + name_bundles.setdefault(family, {})[vendor] = frozenset(tmap) + cross_bundle_triples = [ + (family, {v: sorted(ts) for v, ts in per_vendor.items()}) + for family, per_vendor in sorted(name_bundles.items()) + if len(per_vendor) > 1 and len(set(per_vendor.values())) > 1 + ] + return { "vendors": vendors, "read_errors": read_errors, @@ -347,11 +457,18 @@ def analyze_tree(profiles_dir): "missing_effective": sorted(missing_effective), "alias_violations": alias_violations, "alias_exceptions": sorted(f"{v}/{n}" for v, n, _e, _r, _f in alias_violations), + "triples": {fid: sorted(list(t) for t in ts) for fid, ts in triples.items()}, + "triple_sets": triples, + "declarer_triples": declarer_triples, + "family_triples": family_triples, + "triple_exceptions": sorted( + f"{v}/{f}" for (v, f), tmap in family_triples.items() if len(tmap) > 1), + "cross_bundle_triples": cross_bundle_triples, } # --------------------------------------------------------------------------- -# Snapshot / retired-ledger IO +# Snapshot / succession-ledger IO # --------------------------------------------------------------------------- def snapshot_from_analysis(analysis): @@ -360,6 +477,8 @@ def snapshot_from_analysis(analysis): "instantiated_with_id": analysis["instantiated_with_id"], "id_overrides": analysis["id_overrides"], "alias_exceptions": analysis["alias_exceptions"], + "triples": analysis["triples"], + "triple_exceptions": analysis["triple_exceptions"], } @@ -368,16 +487,28 @@ def load_snapshot(path): if not os.path.exists(path): return None data = load_json(path) - for key in ("ids", "instantiated_with_id", "id_overrides", "alias_exceptions"): - data.setdefault(key, {} if key == "ids" else []) + for key in ("ids", "triples"): + data.setdefault(key, {}) + for key in ("instantiated_with_id", "id_overrides", "alias_exceptions", + "triple_exceptions"): + data.setdefault(key, []) return data -def load_retired(path): - """Return the retired-ids map {id: ["Vendor/Family", ...]} ({} if absent).""" +def load_ledger(path): + """The shipped succession ledger: + {"retired": {id: {"claims": [...], "successor": id|None}}, "hints": {id: id}}. + Empty maps when the file is absent. + """ if not os.path.exists(path): - return {} - return load_json(path).get("retired", {}) + return {"retired": {}, "hints": {}} + data = load_json(path) + return {"retired": data.get("retired", {}), "hints": data.get("hints", {})} + + +def load_retired(path): + """The ledger's retired map (see load_ledger); {} when the file is absent.""" + return load_ledger(path)["retired"] def write_ledger(path, obj): @@ -387,6 +518,72 @@ def write_ledger(path, obj): f.write("\n") +def claim_effective_ids(analysis): + """Reverse of analysis["ids"]: claim "Vendor/Family" -> set of effective ids.""" + claim_ids = {} + for fid, claims in analysis["ids"].items(): + for claim in claims: + claim_ids.setdefault(claim, set()).add(fid) + return claim_ids + + +def successor_by_mode(claims, claim_ids): + """Mode rule for a retiring id's successor: every old claim whose family + still exists votes for the family's current effective id(s); most votes + wins, ties break to the lexicographically smallest id, no votes -> None. + Returns (successor_or_None, vote_counts). + """ + counts = {} + for claim in claims: + for fid in claim_ids.get(claim, ()): + counts[fid] = counts.get(fid, 0) + 1 + if not counts: + return None, counts + best = max(counts.values()) + return min(f for f, n in counts.items() if n == best), counts + + +def migrate_retired_entries(old_retired, claim_ids): + """One-shot v3 schema migration: list-valued entries {id: [claims]} become + {id: {"claims": [...], "successor": }}; object entries + pass through untouched. + """ + migrated = {} + for fid, entry in old_retired.items(): + if isinstance(entry, dict): + migrated[fid] = entry + continue + successor, _counts = successor_by_mode(entry, claim_ids) + migrated[fid] = {"claims": sorted(entry), "successor": successor} + return migrated + + +def follow_succession(fid, seen, retired, hints, live): + """Follow retired->successor / hints->target forwarding starting at `fid`. + + Returns (status, node): "null" (chain ended on an heirless retirement), + "live" (reached a live tree id), "cycle", or "dead-end" (an id that is + neither live nor forwarded anywhere). `seen` pre-seeds the cycle guard. + """ + seen = set(seen) + cur = fid + while True: + if cur is None: + return "null", None + if cur in seen: + return "cycle", cur + seen.add(cur) + if cur in live: + return "live", cur + entry = retired.get(cur) + if entry is not None: + cur = entry.get("successor") if isinstance(entry, dict) else None + elif cur in hints: + cur = hints[cur] + else: + return "dead-end", cur + + # --------------------------------------------------------------------------- # Reserved namespaces # --------------------------------------------------------------------------- @@ -414,17 +611,28 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, the snapshot, or match ^OF[0-9A-Za-z]{6}$, or belong to vendor BBL, or be a QD_* id within vendor Qidi. 2. Snapshot equality, both directions: the tree-derived id->families multimap - must equal the snapshot exactly (the snapshot diff is the maintainer gate). - 3. Mint conformance: an OF-format id's claim that is not grandfathered must - equal the mint of (vendor, family) or a salted iteration. + AND the id->triples map of the declarers must equal the snapshot exactly + (the snapshot diff is the maintainer gate). + 3. Mint conformance: a non-island OF-format declaration must equal the mint + of the declarer's triple or a salted iteration, unless that exact + (id, triple) pair is grandfathered in the snapshot. 4. Retired ids may never occur again. - 5. Alias hygiene: a tuned OFL generic must keep the generic's base name and - claim printers via non-empty compatible_printers. + 5. Alias hygiene: a vendor preset riding an OFL family must keep the OFL + base name, claim printers via non-empty compatible_printers, and declare + no filament_id key of its own. 6. Reserved namespaces (GF*/QD_*/P-hex/"null") only for their owner vendors, except claims grandfathered in the snapshot. 7. Structure ratchet: (a) no NEW instantiated preset carries its own filament_id key; (b) no NEW declared-vs-inherited id drift; (c) every instantiated filament resolves an effective id (a hard load error in C++). + 8. Triple integrity: (a) every non-island declarer resolves non-empty + filament_vendor and filament_type (hard error, no grandfathering); + (b) declarers of one (bundle, family) resolve identical triples, unless + grandfathered in snapshot triple_exceptions; cross-bundle divergence on + the same family name is a warning only. + 9. Succession integrity: retired successor chains terminate at a live id or + null without cycles; hint keys are live island-declared ids and hint + chains terminate live. """ _utf8_console() errors = 0 @@ -433,7 +641,9 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, if snapshot is None: print_error(f"filament_id snapshot not found at {snapshot_path}; {UPDATE_HINT}") return 1 - retired = load_retired(retired_path) + ledger = load_ledger(retired_path) + retired = ledger["retired"] + hints = ledger["hints"] for msg in analysis["read_errors"]: print_error(msg) @@ -475,38 +685,48 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, if fid not in tree_ids: print_error( f'filament_id stability: snapshot id "{fid}" vanished from the tree ' - f"(ids are immutable once shipped); {UPDATE_HINT}") + f"(shipped ids retire through the succession ledger); {UPDATE_HINT}") errors += 1 continue for claim in snap_ids[fid]: if claim not in tree_ids[fid]: print_error( f'filament_id stability: snapshot claim "{claim}" of id "{fid}" ' - f"vanished from the tree (ids are immutable once shipped); {UPDATE_HINT}") + f"vanished from the tree; {UPDATE_HINT}") + errors += 1 + # ... and the declared triples, both directions. + snap_triples = snapshot["triples"] + tree_triples = analysis["triples"] + for fid in sorted(tree_triples): + for t in tree_triples[fid]: + if t not in snap_triples.get(fid, []): + print_error( + f'filament_id "{fid}" triple "{"/".join(t)}" is not sanctioned by ' + f"scripts/filament_id_snapshot.json; {UPDATE_HINT}") + errors += 1 + for fid in sorted(snap_triples): + for t in snap_triples[fid]: + if t not in tree_triples.get(fid, []): + print_error( + f'filament_id triple stability: snapshot triple "{"/".join(t)}" of ' + f'id "{fid}" vanished from the tree; {UPDATE_HINT}') errors += 1 - # -- 3. mint conformance for OF-format ids ------------------------------ - for fid in sorted(tree_ids): + # -- 3. mint conformance for OF-format declarations ---------------------- + for vendor, rec, fid, triple in sorted( + analysis["declarer_triples"], key=lambda x: (x[0], x[1]["file"])): if not OF_ID_RE.match(fid): continue - for claim in tree_ids[fid]: - if claim in snap_ids.get(fid, []): - continue # grandfathered - vendor, family = claim.split("/", 1) - if fid not in analysis["declared_ids"].get(vendor, set()): - # The claiming vendor never declares this id — it is inherited - # from another vendor's root (an OFL generic family): correctly - # tuned generics ride the OFL family id by design, so only the - # snapshot gate (check 2) applies to this claim. - continue - minted = [generate_filament_id(vendor, family, s) for s in range(MAX_CHECK_SALT + 1)] - if fid not in minted: - print_error( - f'filament_id "{fid}" of family "{claim}" does not match its mint: ' - f'expected "{minted[0]}" (or a salted iteration); paste the expected ' - f"id into the family root (or, for an intentionally shared id, " - f"{UPDATE_HINT})") - errors += 1 + if list(triple) in snap_triples.get(fid, []): + continue # grandfathered (id, triple) pair + minted = [generate_filament_id(*triple, salt=s) for s in range(MAX_CHECK_SALT + 1)] + if fid not in minted: + print_error( + f'filament_id "{fid}" declared by "{rec["name"]}" ({rec["file"]}) does ' + f'not match the mint of its triple "{"/".join(triple)}": expected ' + f'"{minted[0]}" (or a salted iteration); paste the expected id into the ' + f"family root (or, for an intentionally kept id, {UPDATE_HINT})") + errors += 1 # -- 4. retired ids may never come back --------------------------------- for vendor in sorted(analysis["vendor_ids"]): @@ -514,18 +734,19 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, if fid in retired: print_error( f'filament_id "{fid}" ({vendor}) is retired ' - f"(scripts/retired_filament_ids.json) and may never be reused") + f"({RETIRED_REL}) and may never be reused") errors += 1 - # -- 5. alias hygiene for tuned OFL generics ----------------------------- + # -- 5. alias hygiene for presets riding OFL families -------------------- exceptions = set(snapshot["alias_exceptions"]) for vendor, name, entry, reason, file in analysis["alias_violations"]: if f"{vendor}/{name}" in exceptions: continue print_error( - f'preset "{name}" ({file}) tunes the OFL generic "{entry}" but {reason}; ' - f'keep the OFL base name and non-empty compatible_printers, or give the ' - f"family its own minted id") + f'preset "{name}" ({file}) rides the OFL family "{entry}" but {reason}; ' + f"a vendor specialization keeps the OFL base name, sets non-empty " + f"compatible_printers and declares no filament_id key — or the family " + f"gets its own minted id") errors += 1 # -- 6. reserved namespaces ---------------------------------------------- @@ -562,8 +783,10 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f'inherits chain resolves "{inherited}"; a preset must not override its ' f"family's id") errors += 1 + ofl_map = analysis["vendors"].get(OFL, {}) for vendor, name, file in analysis["missing_effective"]: - expected = generate_filament_id(vendor, base_name(name)) + triple = resolve_triple(name, analysis["vendors"][vendor], ofl_map) + expected = generate_filament_id(*triple) print_error( f'instantiated filament "{name}" ({file}) resolves no filament_id anywhere ' f"in its inherits chain — this is a hard load error in the C++ loader; " @@ -571,6 +794,95 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f'"{vendor}/{base_name(name)}": "{expected}", salted if taken)') errors += 1 + # -- 8. triple integrity --------------------------------------------------- + for vendor, rec, fid, triple in sorted( + analysis["declarer_triples"], key=lambda x: (x[0], x[1]["file"])): + if triple[0] and triple[1]: + continue + missing = " and ".join( + k for k, v in (("filament_vendor", triple[0]), + ("filament_type", triple[1])) if not v) + print_error( + f'preset "{rec["name"]}" ({rec["file"]}) declares filament_id "{fid}" but ' + f"resolves empty {missing}; the mint key needs both (generic materials " + f'use filament_vendor "Generic")') + errors += 1 + triple_exceptions = set(snapshot["triple_exceptions"]) + for (vendor, family), tmap in sorted(analysis["family_triples"].items()): + if len(tmap) < 2 or f"{vendor}/{family}" in triple_exceptions: + continue + detail = "; ".join( + f'"{"/".join(t)}" ({", ".join(sorted(names))})' + for t, names in sorted(tmap.items())) + print_error( + f'family "{vendor}/{family}" declarers resolve divergent triples: {detail}; ' + f"declarers of one family must agree on (filament_vendor, filament_type)") + errors += 1 + for family, per_vendor in analysis["cross_bundle_triples"]: + detail = "; ".join( + f'{v}: {", ".join("/".join(t) for t in ts)}' + for v, ts in sorted(per_vendor.items())) + print_warning( + f'family name "{family}" resolves different triples across bundles ' + f"({detail}); bundles of one product converge on one id only once " + f"their triples agree") + + # -- 9. succession integrity (ledger-internal) ----------------------------- + live = set(tree_ids) + for fid in sorted(retired): + entry = retired[fid] + if (not isinstance(entry, dict) + or not isinstance(entry.get("claims", []), list) + or not (entry.get("successor") is None + or isinstance(entry.get("successor"), str))): + print_error( + f'retired entry "{fid}" ({RETIRED_REL}) is not of the form ' + f'{{"claims": [...], "successor": }}') + errors += 1 + continue + status, node = follow_succession(entry.get("successor"), {fid}, retired, hints, live) + if status == "cycle": + print_error( + f'succession chain of retired id "{fid}" cycles at "{node}" ({RETIRED_REL})') + errors += 1 + elif status == "dead-end": + print_error( + f'succession chain of retired id "{fid}" dead-ends at "{node}", which is ' + f"neither a live tree id nor retired/hinted ({RETIRED_REL})") + errors += 1 + for key in sorted(hints): + target = hints[key] + _is_reserved, island = reserved_space_owner(key) + if island is None: + print_error( + f'hint key "{key}" ({RETIRED_REL}) is not in an island id space ' + f"(GF*/QD_*); non-island ids are retired with a successor instead") + errors += 1 + continue + if key in retired: + print_error( + f'hint key "{key}" ({RETIRED_REL}) is also retired; an id is either ' + f"retired (Orca-owned) or hinted (island-owned), never both") + errors += 1 + continue + # A hint key may be absent from the tree (released to its island); when + # live, only island vendors may declare it. + outsiders = sorted( + v for v in analysis["declared_ids"] + if key in analysis["declared_ids"][v] and not is_island_declaration(v, key)) + if outsiders: + print_error( + f'hint key "{key}" ({RETIRED_REL}) is declared by non-island vendor(s) ' + f"{outsiders}; hints apply only once no non-island vendor declares the " + f"id — re-mint those declarers first") + errors += 1 + status, node = follow_succession(target, {key}, retired, hints, live) + if status != "live": + print_error( + f'hint "{key}" -> "{target}" ({RETIRED_REL}) must chain-terminate at a ' + f"live tree id (got {status} at \"{node}\")") + errors += 1 + return errors @@ -579,9 +891,19 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, # --------------------------------------------------------------------------- def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, - retired_path=RETIRED_PATH, allow_shared_catalog=False): + retired_path=RETIRED_PATH, allow_shared_catalog=False, + forget_path=None): """Regenerate the snapshot from the tree; retire ids that fully vanished. + Vanished ids gain a succession-ledger entry whose successor is picked by + the mode rule over their old claims (None when the family died heirless); + vanished ids in a foreign island's space (GF*/QD_*) are released with a + hint instead — the island catalog owns them, so they must stay mintable + there and must never be blocked by check 4. + --forget-never-shipped lists ids to drop from lineage instead of retiring + (never shipped => nothing outside the tree references them); succession + chains through them are spliced to their mode-rule successor. + Refuses to sanction NEW reserved-namespace ids (or new claims on them) for non-owner vendors unless --allow-shared-catalog is passed. Idempotent: a second run over an unchanged tree changes nothing. Returns 0 on success. @@ -593,6 +915,21 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, old_snap = load_snapshot(snapshot_path) old_ids = old_snap["ids"] if old_snap else {} + forget = set() + if forget_path: + data = load_json(forget_path) + if not isinstance(data, list) or not all(isinstance(x, str) for x in data): + print_error(f"--forget-never-shipped expects a JSON list of ids: {forget_path}") + return 1 + forget = set(data) + still_live = sorted(forget & set(new_snap["ids"])) + if still_live: + for fid in still_live: + print_error( + f'--forget-never-shipped: id "{fid}" is still in the tree and can ' + f"neither be forgotten nor retired") + return 1 + # Gate: new reserved-namespace ids / claims for non-owner vendors. refusals = [] for fid, claims in sorted(new_snap["ids"].items()): @@ -622,22 +959,69 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, # Retirement is permanent: refuse to sanction a tree that resurrects a # retired id (check 4 would reject the resulting snapshot forever anyway). - retired = load_retired(retired_path) + ledger = load_ledger(retired_path) + retired = ledger["retired"] reused = sorted(set(new_snap["ids"]) & set(retired)) if reused: for fid in reused: print_error( f'refusing to sanction retired filament_id "{fid}" ' - f"(scripts/retired_filament_ids.json is append-only; retired ids may " + f"({RETIRED_REL} is append-only; retired ids may " f"never be reused — mint a fresh id for the family instead)") return 1 - # Retire ids that fully vanished from the tree (append-only ledger). + # Retire ids that fully vanished from the tree (append-only ledger), with a + # mode-rule successor so devices and user presets keep resolving. Vanished + # ids in a FOREIGN island's reserved space (GF*/QD_*) are never retired — + # the island's catalog still owns them and may legitimately (re)ship them — + # they are RELEASED, with a succession hint so they keep resolving on miss. + claim_ids = claim_effective_ids(analysis) newly_retired = [] + forgotten = [] + released = [] for fid in sorted(old_ids): - if fid not in new_snap["ids"]: - retired[fid] = sorted(set(retired.get(fid, [])) | set(old_ids[fid])) - newly_retired.append(fid) + if fid in new_snap["ids"]: + continue + if fid in forget: + forgotten.append(fid) + print_info(f'forgotten (never shipped): "{fid}" — no retirement entry') + continue + _is_reserved, island = reserved_space_owner(fid) + if island is not None: + successor, _counts = successor_by_mode(old_ids[fid], claim_ids) + if successor and fid not in ledger["hints"]: + ledger["hints"][fid] = successor + released.append(fid) + print_info( + f'released to the {island} island space: "{fid}"' + + (f' — hint -> "{ledger["hints"][fid]}"' if fid in ledger["hints"] + else " (no successor computable; --add-hint if one is needed)")) + continue + entry = retired.get(fid) + if not isinstance(entry, dict): + successor, counts = successor_by_mode(old_ids[fid], claim_ids) + if len(counts) > 1: + losers = sorted(set(counts) - {successor}) + print_warning( + f'retiring "{fid}": successor "{successor}" won the claim vote ' + f"({counts[successor]}); losing candidate(s): {', '.join(losers)}") + entry = {"claims": list(entry) if entry else [], "successor": successor} + entry["claims"] = sorted(set(entry["claims"]) | set(old_ids[fid])) + retired[fid] = entry + newly_retired.append(fid) + + # Splice succession chains through forgotten ids so they stay live. + spliced = [] + for fid in sorted(retired): + entry = retired[fid] + successor = entry.get("successor") if isinstance(entry, dict) else None + if successor in forget: + new_successor, _counts = successor_by_mode(old_ids.get(successor, []), claim_ids) + entry["successor"] = new_successor + spliced.append(fid) + print_info( + f'spliced succession: "{fid}" -> {json.dumps(new_successor)} ' + f'(through forgotten "{successor}")') # Diff summary. added_ids = sorted(set(new_snap["ids"]) - set(old_ids)) @@ -649,20 +1033,29 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, len(set(claims) - set(new_snap["ids"].get(fid, []))) for fid, claims in old_ids.items()) old_snap = old_snap or {"ids": {}, "instantiated_with_id": [], "id_overrides": [], - "alias_exceptions": []} + "alias_exceptions": [], "triples": {}, + "triple_exceptions": []} changed = new_snap != old_snap if changed: write_ledger(snapshot_path, new_snap) - if newly_retired or not os.path.exists(retired_path): - write_ledger(retired_path, {"retired": retired}) + if newly_retired or spliced or released or not os.path.exists(retired_path): + write_ledger(retired_path, {"retired": retired, "hints": ledger["hints"]}) print_info(f"snapshot ids : {len(new_snap['ids'])} (+{len(added_ids)} / -{len(removed_ids)})") print_info(f"claims added : {added_claims}") print_info(f"claims removed : {removed_claims}") + print_info(f"declared triples : {len(new_snap['triples'])}") print_info(f"ids retired now : {len(newly_retired)}" + (f" ({', '.join(newly_retired)})" if newly_retired else "")) - for section in ("instantiated_with_id", "id_overrides", "alias_exceptions"): + if forgotten: + print_info(f"ids forgotten : {len(forgotten)} ({', '.join(forgotten)})") + if released: + print_info(f"ids released : {len(released)} ({', '.join(released)})") + if spliced: + print_info(f"chains spliced : {len(spliced)} ({', '.join(spliced)})") + for section in ("instantiated_with_id", "id_overrides", "alias_exceptions", + "triple_exceptions"): before, after = len(old_snap.get(section, [])), len(new_snap[section]) print_info(f"{section:<18}: {after} ({after - before:+d})") if changed: @@ -672,8 +1065,64 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, return 0 +def add_hints(pairs, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): + """--add-hint "OLD=NEW": forward an island-space id to a live id. + + OLD must sit in an island id space (GF*/QD_*), must not be retired, and — + when live in the tree — may be declared only by island vendors (Orca cannot + retire it). An absent OLD is fine: island catalogs own ids Orca never + shipped or has released. NEW must be live in the tree. All pairs validate + before anything is written. Returns 0 on success. + """ + _utf8_console() + analysis = analyze_tree(profiles_dir) + errors = 0 + for msg in analysis["read_errors"]: + print_error(msg) + errors += 1 + ledger = load_ledger(retired_path) + live = set(analysis["ids"]) + parsed = [] + for pair in pairs: + if "=" not in pair: + print_error(f'--add-hint expects "OLD=NEW", got "{pair}"') + errors += 1 + continue + old, new = pair.split("=", 1) + _is_reserved, island = reserved_space_owner(old) + outsiders = sorted( + v for v in analysis["declared_ids"] + if old in analysis["declared_ids"][v] and not is_island_declaration(v, old)) + if old in ledger["retired"]: + print_error(f'--add-hint: "{old}" is retired; its succession entry already forwards it') + errors += 1 + elif island is None: + print_error( + f'--add-hint: "{old}" is not in an island id space (GF*/QD_*); ' + f"non-island ids are retired with a successor by --update-snapshot") + errors += 1 + elif outsiders: + print_error( + f'--add-hint: "{old}" is declared by non-island vendor(s) {outsiders}; ' + f"hints apply only once no non-island vendor declares the id — re-mint " + f"those declarers first") + errors += 1 + elif new not in live: + print_error(f'--add-hint: target "{new}" is not a live tree id') + errors += 1 + else: + parsed.append((old, new)) + if errors: + return 1 + for old, new in parsed: + ledger["hints"][old] = new + print_info(f'hint added: "{old}" -> "{new}"') + write_ledger(retired_path, {"retired": ledger["retired"], "hints": ledger["hints"]}) + return 0 + + # --------------------------------------------------------------------------- -# Default run: mint + insert ids for id-less families +# Byte-preserving profile edits # --------------------------------------------------------------------------- def insert_filament_id(text, new_id): @@ -694,33 +1143,90 @@ def insert_filament_id(text, new_id): return text, 0 -def write_filament_id(path, new_id): - """Insert new_id into the profile at path, byte-preserving everything else. +def replace_filament_id_value(text, old_id, new_id): + """Swap the JSON string VALUE on the `"filament_id"` line, byte-preserving + everything else. Returns (text, replacements made). + """ + pattern = re.compile( + r'(^[ \t]*"filament_id"[ \t]*:[ \t]*)' + + re.escape(json.dumps(old_id, ensure_ascii=False)), + re.MULTILINE) + return pattern.subn( + lambda m: m.group(1) + json.dumps(new_id, ensure_ascii=False), text, count=1) - Binary IO keeps the file's original line endings (LF or CRLF) and exact - formatting apart from the inserted line; the result is re-parsed to - guarantee it is still valid JSON. + +def delete_filament_id_line(text, old_id): + """Delete the `"filament_id"` line, byte-preserving the rest. + + Handles both the canonical layout (trailing comma) and a last-property + layout (comma on the preceding line). Returns (text, deletions made). + """ + val = re.escape(json.dumps(old_id, ensure_ascii=False)) + m = re.search(r'^[ \t]*"filament_id"[ \t]*:[ \t]*' + val + r'[ \t]*,[ \t]*\r?\n', + text, re.MULTILINE) + if m: + return text[:m.start()] + text[m.end():], 1 + m = re.search(r',[ \t]*\r?\n[ \t]*"filament_id"[ \t]*:[ \t]*' + val + r'[ \t]*(?=\r?\n)', + text) + if m: + return text[:m.start()] + text[m.end():], 1 + return text, 0 + + +def _edit_profile(path, edit): + """Apply `edit(text) -> (text, n)` to the profile at path, byte-preserving. + + Binary IO keeps the file's original line endings (LF or CRLF), BOM and exact + formatting apart from the edit; the result is re-parsed and returned so the + caller can verify the outcome. Raises when the edit found no anchor. """ with open(path, "rb") as f: raw = f.read() bom = raw.startswith(b"\xef\xbb\xbf") text = raw.decode("utf-8-sig") - text, n = insert_filament_id(text, new_id) + text, n = edit(text) if n == 0: - raise RuntimeError(f"Could not insert filament_id into {path}") - json.loads(text) # fail loudly if the edit broke the JSON + raise RuntimeError(f"could not apply filament_id edit to {path}") + data = json.loads(text) # fail loudly if the edit broke the JSON with open(path, "wb") as f: f.write((b"\xef\xbb\xbf" if bom else b"") + text.encode("utf-8")) + return data +def write_filament_id(path, new_id): + """Insert new_id into the profile at path, byte-preserving everything else.""" + _edit_profile(path, lambda text: insert_filament_id(text, new_id)) + + +def rewrite_filament_id(path, old_id, new_id): + """Replace the filament_id value old_id -> new_id; re-parses to verify.""" + data = _edit_profile(path, lambda text: replace_filament_id_value(text, old_id, new_id)) + if data.get("filament_id") != new_id: + raise RuntimeError(f'rewrite of filament_id "{old_id}" -> "{new_id}" in {path} ' + f"did not take effect") + + +def remove_filament_id(path, old_id): + """Delete the filament_id declaration line; re-parses to verify.""" + data = _edit_profile(path, lambda text: delete_filament_id_line(text, old_id)) + if "filament_id" in data: + raise RuntimeError(f'deletion of filament_id "{old_id}" from {path} did not take effect') + + +# --------------------------------------------------------------------------- +# Default run: mint + insert ids for id-less families +# --------------------------------------------------------------------------- + def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, retired_path=RETIRED_PATH): """Mint + insert ids for id-less families. Never rewrites a valid existing id. A family = (vendor, base name) group over instantiated filaments with no - effective id. The minted id is inserted into the family's root(s): the - presets its members inherit that carry no id, or the member itself when it - has no vendor-side parent. Returns (files_changed, errors). + effective id. The minted id is a pure function of the family's triple — + (filament_vendor, filament_type) resolved on the root(s), family name — and + is inserted into the family's root(s): the presets its members inherit that + carry no id, or the member itself when it has no vendor-side parent. + Returns (files_changed, errors). """ analysis = analyze_tree(profiles_dir) errors = 0 @@ -767,6 +1273,7 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, root_claims.setdefault((vendor, root["name"]), set()).add(key) roots[key] = family_roots + ofl_map = analysis["vendors"].get(OFL, {}) files_changed = 0 families_minted = 0 for key, family_roots in sorted(roots.items()): @@ -782,7 +1289,29 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"roots so each family has its own") errors += 1 continue - new_id = mint_filament_id(vendor, family, taken) + vendor_map = analysis["vendors"][vendor] + fields = {(resolve_filament_field(n, "filament_vendor", vendor_map, ofl_map), + resolve_filament_field(n, "filament_type", vendor_map, ofl_map)) + for n in family_roots} + if len(fields) > 1: + print_error( + f'cannot mint for family "{vendor}/{family}": its roots resolve ' + f"divergent (filament_vendor, filament_type) pairs {sorted(fields)}; " + f"align the fields first") + errors += 1 + continue + fvendor, ftype = next(iter(fields)) + if not fvendor or not ftype: + missing = " and ".join( + k for k, v in (("filament_vendor", fvendor), + ("filament_type", ftype)) if not v) + print_error( + f'cannot mint for family "{vendor}/{family}": it resolves empty ' + f'{missing}; the mint key needs both (generic materials use ' + f'filament_vendor "Generic")') + errors += 1 + continue + new_id = mint_filament_id(fvendor, ftype, family, taken) taken.add(new_id) families_minted += 1 for name in sorted(family_roots): @@ -798,6 +1327,130 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, return files_changed, errors +# --------------------------------------------------------------------------- +# --remint / --drop-redundant-ids (v3.1/v3.2 migration modes) +# --------------------------------------------------------------------------- + +def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): + """Re-derive every non-island declared id in the given vendors from its + triple; rewrite mismatching declarations in place (byte-preserving). Never + touches the snapshot — run --update-snapshot afterwards and review the diff. + + A candidate id is blocked when it is a retired key, a hints key, or occurs + in the tree with any triple set other than exactly {T}. Equal-triple reuse + is convergence: the same product must end up under the same id everywhere. + Returns (rewritten, errors). + """ + _utf8_console() + analysis = analyze_tree(profiles_dir) + errors = 0 + for msg in analysis["read_errors"]: + print_error(msg) + errors += 1 + if "BBL" in vendor_list: + print_error("--remint BBL is forbidden (the GF* catalog is frozen)") + return 0, errors + 1 + unknown = sorted(set(vendor_list) - set(analysis["vendors"])) + if unknown: + for v in unknown: + print_error(f"--remint: unknown vendor {v!r}") + return 0, errors + len(unknown) + + ledger = load_ledger(retired_path) + blocked_keys = set(ledger["retired"]) | set(ledger["hints"]) + occurring = set() + for vids in analysis["vendor_ids"].values(): + occurring |= vids + triple_sets = analysis["triple_sets"] + + assigned = {} # triple -> id chosen this run (all declarers converge) + run_taken = {} # id -> triple (a run-local mint may not collide either) + + def want_id(triple): + if triple in assigned: + return assigned[triple] + for salt in range(10000): + cand = generate_filament_id(*triple, salt=salt) + if cand in blocked_keys: + continue + if cand in occurring and triple_sets.get(cand, set()) != {triple}: + continue + if run_taken.get(cand, triple) != triple: + continue + assigned[triple] = cand + run_taken[cand] = triple + return cand + raise RuntimeError(f"could not mint a free filament_id for triple {triple}") + + scanned = 0 + rewritten = 0 + for vendor in sorted(set(vendor_list)): + recs = sorted( + (rec for rec in analysis["vendors"][vendor].values() if rec.get("filament_id")), + key=lambda r: r["file"]) + for rec in recs: + fid = rec["filament_id"] + if is_island_declaration(vendor, fid): + continue + scanned += 1 + want = want_id(rec["triple"]) + if fid == want: + continue + rewrite_filament_id(rec["path"], fid, want) + rewritten += 1 + print_info(f'{rec["file"]}: "{fid}" -> "{want}" ' + f'(triple "{"/".join(rec["triple"])}")') + print_info(f"declarations scanned : {scanned}") + print_info(f"declarations reminted: {rewritten}") + if rewritten: + print_warning(f"now {UPDATE_HINT}") + return rewritten, errors + + +def drop_redundant_ids(vendor, profiles_dir=PROFILES_DIR): + """Delete filament_id declarations in `vendor` that merely re-declare an OFL + family's id path: ignoring its own key, the preset's inherits chain enters + OFL and resolves an OFL-declared id, and the preset keeps the OFL family's + base name. Such a preset is a specialization and rides the OFL id (v3.2(b)). + Never touches the snapshot. Returns (dropped, errors). + """ + _utf8_console() + analysis = analyze_tree(profiles_dir) + errors = 0 + for msg in analysis["read_errors"]: + print_error(msg) + errors += 1 + if vendor == "BBL": + print_error("--drop-redundant-ids BBL is forbidden (the GF* catalog is frozen)") + return 0, errors + 1 + if vendor not in analysis["vendors"]: + print_error(f"--drop-redundant-ids: unknown vendor {vendor!r}") + return 0, errors + 1 + + vendor_map = analysis["vendors"][vendor] + ofl_map = analysis["vendors"].get(OFL, {}) + ofl_declared = {r["filament_id"] for r in ofl_map.values() if r.get("filament_id")} + dropped = 0 + for rec in sorted(vendor_map.values(), key=lambda r: r["file"]): + fid = rec.get("filament_id") + if not fid or is_island_declaration(vendor, fid) or not rec.get("inherits"): + continue + resolved, _src, entry = resolve_filament_id( + rec["name"], vendor_map, ofl_map, skip_own=True) + if not (entry and resolved and resolved in ofl_declared): + continue + if base_name(rec["name"]) != base_name(entry): + continue + remove_filament_id(rec["path"], fid) + dropped += 1 + print_info(f'{rec["file"]}: dropped filament_id "{fid}" ' + f'(rides OFL "{entry}", id "{resolved}")') + print_info(f"declarations dropped : {dropped}") + if dropped: + print_warning(f"now {UPDATE_HINT}") + return dropped, errors + + # --------------------------------------------------------------------------- # CLI # --------------------------------------------------------------------------- @@ -807,33 +1460,73 @@ def main(argv=None): parser = argparse.ArgumentParser( description="Mint deterministic filament_id values for id-less filament " "families and validate the tree against the sanctioned snapshot.") - parser.add_argument("--mint", metavar='"Vendor/Family"', - help="print the id that would be minted for a family; " - "touches nothing") + parser.add_argument("--mint", metavar='"Vendor/Type/Family"', + help="print the id the (filament_vendor, filament_type, " + "family name) triple would mint; touches nothing") parser.add_argument("--update-snapshot", action="store_true", help="regenerate scripts/filament_id_snapshot.json from the " - "tree; ids that fully vanished are retired") + "tree; ids that fully vanished are retired with a " + "mode-rule successor") parser.add_argument("--check", action="store_true", help="run the filament_id checks; exit nonzero on errors") parser.add_argument("--allow-shared-catalog", action="store_true", help="with --update-snapshot: allow sanctioning new claims " "on reserved-namespace ids for non-owner vendors") + parser.add_argument("--forget-never-shipped", metavar="JSON_FILE", + help="with --update-snapshot: vanished ids listed in the file " + "(JSON list) are dropped without a retirement entry and " + "succession chains are spliced through them; refused if " + "a listed id is still in the tree") + parser.add_argument("--add-hint", metavar='"OLD=NEW"', action="append", + help="record a cross-island succession hint (island-owned " + "live id -> live id) in the shipped ledger; standalone, " + "repeatable") + parser.add_argument("--remint", metavar="VENDOR", action="append", + help="re-derive VENDOR's declared filament_ids from their " + "triples and rewrite mismatches in place; repeatable") + parser.add_argument("--drop-redundant-ids", metavar="VENDOR", + help="delete filament_id declarations in VENDOR that " + "re-declare the OFL family id they already resolve " + "through inherits") parser.add_argument("--profiles", default=PROFILES_DIR, help="profiles directory (default: resources/profiles)") args = parser.parse_args(argv) + if args.forget_never_shipped and not args.update_snapshot: + parser.error("--forget-never-shipped requires --update-snapshot") + if args.mint: - if "/" not in args.mint: - parser.error('--mint expects "Vendor/Family"') - vendor, family = args.mint.split("/", 1) + parts = args.mint.split("/", 2) + if len(parts) != 3 or not all(parts): + parser.error('--mint expects "filament_vendor/filament_type/family_name" ' + "with all three components non-empty (check 8 rejects empty " + "vendor/type in the tree)") snapshot = load_snapshot(SNAPSHOT_PATH) or {"ids": {}} taken = set(snapshot["ids"]) | set(load_retired(RETIRED_PATH)) - print(mint_filament_id(vendor, family, taken)) + print(mint_filament_id(parts[0], parts[1], parts[2], taken)) return 0 + if args.add_hint: + if args.update_snapshot or args.check or args.remint or args.drop_redundant_ids: + parser.error("--add-hint runs standalone") + return add_hints(args.add_hint, args.profiles, RETIRED_PATH) + + if args.remint: + if args.update_snapshot or args.check or args.drop_redundant_ids: + parser.error("--remint cannot be combined with other modes") + _changed, errors = remint_vendors(args.remint, args.profiles, RETIRED_PATH) + return 1 if errors else 0 + + if args.drop_redundant_ids: + if args.update_snapshot or args.check: + parser.error("--drop-redundant-ids cannot be combined with other modes") + _changed, errors = drop_redundant_ids(args.drop_redundant_ids, args.profiles) + return 1 if errors else 0 + if args.update_snapshot: return update_snapshot(args.profiles, SNAPSHOT_PATH, RETIRED_PATH, - allow_shared_catalog=args.allow_shared_catalog) + allow_shared_catalog=args.allow_shared_catalog, + forget_path=args.forget_never_shipped) if args.check: errors = check_filament_ids(args.profiles, SNAPSHOT_PATH, RETIRED_PATH) diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 24d51970bc..f3004c5077 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1,5 +1,1042 @@ { - "alias_exceptions": [], + "alias_exceptions": [ + "Afinia/Afinia PLA", + "Afinia/Afinia PLA@HS", + "Afinia/Afinia Value PLA", + "Afinia/Afinia Value PLA@HS", + "Anker/Anker Generic PA @base", + "Anker/Anker Generic PA-CF @base", + "Anker/Anker Generic PC @base", + "Anker/Anker Generic PETG @base", + "Anker/Anker Generic PETG-CF @base", + "Anker/Anker Generic PLA @base", + "Anker/Anker Generic PLA Silk @base", + "Anker/Anker Generic PLA+ @base", + "Anker/Anker Generic PLA-CF @base", + "Anycubic/Anycubic Generic PA", + "Anycubic/Anycubic Generic PA-CF", + "Anycubic/Anycubic Generic PC", + "Anycubic/Anycubic Generic PETG", + "Anycubic/Anycubic Generic PLA", + "Anycubic/Anycubic Generic PLA-CF", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PETG @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", + "Anycubic/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", + "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", + "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Panchroma PLA @Anycubic Kobra S1", + "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", + "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", + "Artillery/Artillery Generic PETG", + "Artillery/Artillery Generic PLA", + "Artillery/Artillery Generic PLA-CF", + "BBL/BETA HIPS @base", + "BBL/BETA PAHT-CF @base", + "BBL/BETA PETG @base", + "BBL/BETA PETG Fluorescence @base", + "BBL/BETA PETG Glitter @base", + "BBL/BETA PETG Glow @base", + "BBL/BETA PETG Gradient @base", + "BBL/BETA PETG HF @base", + "BBL/BETA PETG Heat Color Change @base", + "BBL/BETA PETG Marble @base", + "BBL/BETA PETG Matte @base", + "BBL/BETA PETG Metallic @base", + "BBL/BETA PETG Transparent @base", + "BBL/BETA PETG UV Color Change @base", + "BBL/BETA PETG-CF @base", + "BBL/BETA PETG-GF @base", + "BBL/BETA PLA Basic @base", + "BBL/BETA PLA Chameleon @base", + "BBL/BETA PLA Fluorescence @base", + "BBL/BETA PLA Glitter @base", + "BBL/BETA PLA Glow @base", + "BBL/BETA PLA Gradient @base", + "BBL/BETA PLA Heat Color Change @base", + "BBL/BETA PLA High Speed @base", + "BBL/BETA PLA High Temp @base", + "BBL/BETA PLA Marble @base", + "BBL/BETA PLA Matte @base", + "BBL/BETA PLA Metal @base", + "BBL/BETA PLA Metallic @base", + "BBL/BETA PLA PRO @base", + "BBL/BETA PLA Silk @base", + "BBL/BETA PLA Silk+ @base", + "BBL/BETA PLA Transparent @base", + "BBL/BETA PLA UV Color Change @base", + "BBL/BETA PLA Wood @base", + "BBL/BETA PLA Youth @base", + "BBL/BETA PLA-CF @base", + "BBL/Bambu PA-CF @base", + "BBL/Bambu PA6-CF @base", + "BBL/Bambu PA6-GF @base", + "BBL/Bambu PAHT-CF @base", + "BBL/Bambu PC @base", + "BBL/Bambu PC FR @base", + "BBL/Bambu PET-CF @base", + "BBL/Bambu PETG Basic @base", + "BBL/Bambu PETG HF @base", + "BBL/Bambu PETG Translucent @base", + "BBL/Bambu PETG-CF @base", + "BBL/Bambu PLA Aero @base", + "BBL/Bambu PLA Basic @base", + "BBL/Bambu PLA Dynamic @base", + "BBL/Bambu PLA Galaxy @base", + "BBL/Bambu PLA Glow @base", + "BBL/Bambu PLA Lite @base", + "BBL/Bambu PLA Marble @base", + "BBL/Bambu PLA Matte @base", + "BBL/Bambu PLA Metal @base", + "BBL/Bambu PLA Silk @base", + "BBL/Bambu PLA Silk+ @base", + "BBL/Bambu PLA Sparkle @base", + "BBL/Bambu PLA Tough @base", + "BBL/Bambu PLA Tough+ @base", + "BBL/Bambu PLA Translucent @base", + "BBL/Bambu PLA Wood @base", + "BBL/Bambu PLA-CF @base", + "BBL/Bambu PPA-CF @base", + "BBL/Bambu Support For PA/PET @base", + "BBL/Bambu Support For PLA @base", + "BBL/Bambu Support For PLA/PETG @base", + "BBL/Bambu Support G @base", + "BBL/Bambu Support W @base", + "BBL/COEX NYLEX UNFILLED @BBL X1C", + "BBL/Fiberon PA12-CF @base", + "BBL/Fiberon PA12-CF10 @base", + "BBL/Fiberon PA6-CF @base", + "BBL/Fiberon PA6-CF20 @base", + "BBL/Fiberon PA6-GF @base", + "BBL/Fiberon PA6-GF25 @base", + "BBL/Fiberon PA612-CF @base", + "BBL/Fiberon PA612-CF15 @base", + "BBL/Fiberon PET-CF @base", + "BBL/Fiberon PET-CF17 @base", + "BBL/Fiberon PETG-ESD @base", + "BBL/Fiberon PETG-rCF @base", + "BBL/Fiberon PETG-rCF08 @base", + "BBL/Generic BVOH @base", + "BBL/Generic EVA @base", + "BBL/Generic HIPS @base", + "BBL/Generic PA @base", + "BBL/Generic PA-CF @base", + "BBL/Generic PC @base", + "BBL/Generic PCTG @base", + "BBL/Generic PE @base", + "BBL/Generic PE-CF @base", + "BBL/Generic PETG @base", + "BBL/Generic PETG HF @base", + "BBL/Generic PETG-CF @base", + "BBL/Generic PHA @base", + "BBL/Generic PLA @base", + "BBL/Generic PLA High Speed @base", + "BBL/Generic PLA Silk @base", + "BBL/Generic PLA-CF @base", + "BBL/Generic PP @base", + "BBL/Generic PP-CF @base", + "BBL/Generic PP-GF @base", + "BBL/Generic PPA-CF @base", + "BBL/Generic PPA-GF @base", + "BBL/Generic SBS @base", + "BBL/Numakers PLA+ @base", + "BBL/Overture Matte PLA @base", + "BBL/Overture PLA @base", + "BBL/Overture PLA Pro @base", + "BBL/Panchroma CoPE @base", + "BBL/Panchroma PLA @base", + "BBL/Panchroma PLA Celestial @base", + "BBL/Panchroma PLA Galaxy @base", + "BBL/Panchroma PLA Glow @base", + "BBL/Panchroma PLA Luminous @base", + "BBL/Panchroma PLA Marble @base", + "BBL/Panchroma PLA Matte @base", + "BBL/Panchroma PLA Metallic @base", + "BBL/Panchroma PLA Neon @base", + "BBL/Panchroma PLA Satin @base", + "BBL/Panchroma PLA Silk @base", + "BBL/Panchroma PLA Starlight @base", + "BBL/Panchroma PLA Temp Shift @base", + "BBL/Panchroma PLA Translucent @base", + "BBL/Panchroma PLA UV Shift @base", + "BBL/PolyLite CosPLA @base", + "BBL/PolyLite PETG @base", + "BBL/PolyLite PLA @base", + "BBL/PolyLite PLA Galaxy @base", + "BBL/PolyLite PLA Glow @base", + "BBL/PolyLite PLA Luminous @base", + "BBL/PolyLite PLA Neon @base", + "BBL/PolyLite PLA Pro @base", + "BBL/PolyLite PLA Starlight @base", + "BBL/PolyLite PLA Translucent @base", + "BBL/PolyTerra PLA @base", + "BBL/PolyTerra PLA Marble @base", + "BBL/PolyTerra PLA+ @base", + "BBL/Polymaker HT-PLA @base", + "BBL/Polymaker HT-PLA-GF @base", + "BBL/SUNLU PETG @base", + "BBL/SUNLU PLA Marble @base", + "BBL/SUNLU PLA Matte @base", + "BBL/SUNLU PLA+ 2.0 @base", + "BBL/SUNLU PLA+ @base", + "BBL/SUNLU Silk PLA+ @base", + "BBL/SUNLU Wood PLA @base", + "BBL/eSUN PLA+ @base", + "Blocks/Blocks Generic PA", + "Blocks/Blocks Generic PA-CF", + "Blocks/Blocks Generic PC", + "Blocks/Blocks Generic PLA", + "Blocks/Blocks Generic PLA-CF", + "CONSTRUCT3D/C1 Generic High Flow PETG", + "CONSTRUCT3D/C1 Generic PETG", + "CONSTRUCT3D/C1 Generic PLA", + "Chuanying/Chuanying Generic HS PLA", + "Chuanying/Chuanying Generic PETG", + "Chuanying/Chuanying Generic PETG-CF10", + "Chuanying/Chuanying Generic PLA", + "Chuanying/Chuanying Generic PLA-CF10", + "Chuanying/Chuanying Generic PLA-Silk", + "Co Print/CoPrint Generic PLA", + "CoLiDo/CoLiDo Generic PETG @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic PETG @CoLiDo X16", + "CoLiDo/CoLiDo Generic PLA @CoLiDo DIY 4.0", + "CoLiDo/CoLiDo Generic PLA @CoLiDo X16", + "CoLiDo/CoLiDo PETG @CoLiDo SR1", + "CoLiDo/CoLiDo PLA @CoLiDo SR1", + "CoLiDo/CoLiDo PLA Silk @CoLiDo SR1", + "CoLiDo/CoLiDo PLA+ @CoLiDo DIY 4.0 V2", + "Comgrow/Comgrow Generic PETG", + "Comgrow/Comgrow Generic PLA", + "Creality/CR-Nylon @K1 Max_CFS-C-all", + "Creality/CR-Nylon @K1C-all", + "Creality/CR-Nylon @K1C_CFS-C-all", + "Creality/CR-Nylon @K1_CFS-C-all", + "Creality/CR-Nylon @K2 Plus-all", + "Creality/CR-PLA @Ender-3 V4-all", + "Creality/CR-PLA @Hi-all", + "Creality/CR-PLA @K1 Max_CFS-C-all", + "Creality/CR-PLA @K1 SE-all", + "Creality/CR-PLA @K1 SE_CFS-C-all", + "Creality/CR-PLA @K1C-all", + "Creality/CR-PLA @K1C_CFS-C-all", + "Creality/CR-PLA @K1_CFS-C-all", + "Creality/CR-PLA @K2 Plus-all", + "Creality/CR-PLA @K2 Pro-all", + "Creality/CR-PLA @K2 SE-all", + "Creality/CR-PLA @K2-all", + "Creality/CR-PLA @SPARKX i7-all", + "Creality/CR-PLA Carbon @K1 Max_CFS-C-all", + "Creality/CR-PLA Carbon @K1C-all", + "Creality/CR-PLA Carbon @K1C_CFS-C-all", + "Creality/CR-PLA Carbon @K1_CFS-C-all", + "Creality/CR-PLA Carbon @K2 Plus-all", + "Creality/CR-PLA Fluo @K1 Max_CFS-C-all", + "Creality/CR-PLA Fluo @K1C-all", + "Creality/CR-PLA Fluo @K1C_CFS-C-all", + "Creality/CR-PLA Fluo @K1_CFS-C-all", + "Creality/CR-PLA Fluo @K2 Plus-all", + "Creality/CR-PLA Fluo @K2 Pro-all", + "Creality/CR-PLA Fluo @K2-all", + "Creality/CR-PLA Fluo @SPARKX i7-all", + "Creality/CR-PLA Matte @Ender-3 V4-all", + "Creality/CR-PLA Matte @K1 Max_CFS-C-all", + "Creality/CR-PLA Matte @K1C-all", + "Creality/CR-PLA Matte @K1C_CFS-C-all", + "Creality/CR-PLA Matte @K1_CFS-C-all", + "Creality/CR-PLA Matte @K2 Plus-all", + "Creality/CR-PLA Matte @K2 Pro-all", + "Creality/CR-PLA Matte @K2-all", + "Creality/CR-PLA Matte @SPARKX i7-all", + "Creality/CR-Silk @Ender-3 V4-all", + "Creality/CR-Silk @Hi-all", + "Creality/CR-Silk @K1 Max_CFS-C-all", + "Creality/CR-Silk @K1 SE-all", + "Creality/CR-Silk @K1 SE_CFS-C-all", + "Creality/CR-Silk @K1C-all", + "Creality/CR-Silk @K1C_CFS-C-all", + "Creality/CR-Silk @K1_CFS-C-all", + "Creality/CR-Silk @K2 Plus-all", + "Creality/CR-Silk @K2 Pro-all", + "Creality/CR-Silk @K2 SE-all", + "Creality/CR-Silk @K2-all", + "Creality/CR-Silk @SPARKX i7-all", + "Creality/CR-Wood @K1 Max_CFS-C-all", + "Creality/CR-Wood @K1C-all", + "Creality/CR-Wood @K1C_CFS-C-all", + "Creality/CR-Wood @K1_CFS-C-all", + "Creality/CR-Wood @K2 Plus-all", + "Creality/Creality Generic PA-CF", + "Creality/Creality Generic PC", + "Creality/Creality Generic PETG", + "Creality/Creality Generic PLA", + "Creality/Creality Generic PLA-CF", + "Creality/Creality HF Generic PLA", + "Creality/Creality HF Generic Speed PLA", + "Creality/EN-PLA+ @K1 Max_CFS-C-all", + "Creality/EN-PLA+ @K1C-all", + "Creality/EN-PLA+ @K1C_CFS-C-all", + "Creality/EN-PLA+ @K1_CFS-C-all", + "Creality/EN-PLA+ @K2 Plus-all", + "Creality/EN-PLA+ @K2 Pro-all", + "Creality/EN-PLA+ @K2-all", + "Creality/EN-PLA+ @SPARKX i7-all", + "Creality/ENDER FAST PLA @Hi-all", + "Creality/ENDER FAST PLA @K2 Plus-all", + "Creality/ENDER FAST PLA @K2 Pro-all", + "Creality/ENDER FAST PLA @K2-all", + "Creality/ENDER FAST PLA @SPARKX i7-all", + "Creality/Ender-PLA @Ender-3 V4-all", + "Creality/Ender-PLA @Hi-all", + "Creality/Ender-PLA @K1 Max_CFS-C-all", + "Creality/Ender-PLA @K1C-all", + "Creality/Ender-PLA @K1C_CFS-C-all", + "Creality/Ender-PLA @K1_CFS-C-all", + "Creality/Ender-PLA @K2 Plus-all", + "Creality/Ender-PLA @K2 Pro-all", + "Creality/Ender-PLA @K2-all", + "Creality/Ender-PLA @SPARKX i7-all", + "Creality/Generic HIPS @K1 Max_CFS-C-all", + "Creality/Generic HIPS @K1C-all", + "Creality/Generic HIPS @K1C_CFS-C-all", + "Creality/Generic HIPS @K1_CFS-C-all", + "Creality/Generic HIPS @K2 Plus-all", + "Creality/Generic PA @K1 Max_CFS-C-all", + "Creality/Generic PA @K1C-all", + "Creality/Generic PA @K1C_CFS-C-all", + "Creality/Generic PA @K1_CFS-C-all", + "Creality/Generic PA @K2 Plus-all", + "Creality/Generic PA @K2 Pro-all", + "Creality/Generic PA @K2-all", + "Creality/Generic PA-CF @K1 Max_CFS-C-all", + "Creality/Generic PA-CF @K1C-all", + "Creality/Generic PA-CF @K1C_CFS-C-all", + "Creality/Generic PA-CF @K1_CFS-C-all", + "Creality/Generic PA-CF @K2 Plus-all", + "Creality/Generic PA12-CF @K2 Plus-all", + "Creality/Generic PA6-CF @K1 Max_CFS-C-all", + "Creality/Generic PA6-CF @K1C-all", + "Creality/Generic PA6-CF @K1C_CFS-C-all", + "Creality/Generic PA6-CF @K1_CFS-C-all", + "Creality/Generic PA6-CF @K2 Plus-all", + "Creality/Generic PA6-CF @K2 Pro-all", + "Creality/Generic PA612-CF @K2 Plus-all", + "Creality/Generic PA612-CF @K2 Pro-all", + "Creality/Generic PAHT-CF @K1 Max_CFS-C-all", + "Creality/Generic PAHT-CF @K1C-all", + "Creality/Generic PAHT-CF @K1C_CFS-C-all", + "Creality/Generic PAHT-CF @K1_CFS-C-all", + "Creality/Generic PAHT-CF @K2 Plus-all", + "Creality/Generic PAHT-CF @K2 Pro-all", + "Creality/Generic PAHT-CF @K2-all", + "Creality/Generic PC @K1 Max_CFS-C-all", + "Creality/Generic PC @K1C-all", + "Creality/Generic PC @K1C_CFS-C-all", + "Creality/Generic PC @K1_CFS-C-all", + "Creality/Generic PC @K2 Plus-all", + "Creality/Generic PC @K2 Pro-all", + "Creality/Generic PET @K1 Max_CFS-C-all", + "Creality/Generic PET @K1C-all", + "Creality/Generic PET @K1C_CFS-C-all", + "Creality/Generic PET @K1_CFS-C-all", + "Creality/Generic PET @K2 Plus-all", + "Creality/Generic PET @K2 Pro-all", + "Creality/Generic PET @K2-all", + "Creality/Generic PET-CF @K1 Max_CFS-C-all", + "Creality/Generic PET-CF @K1C-all", + "Creality/Generic PET-CF @K1C_CFS-C-all", + "Creality/Generic PET-CF @K1_CFS-C-all", + "Creality/Generic PET-CF @K2 Plus-all", + "Creality/Generic PET-CF @K2 Pro-all", + "Creality/Generic PLA @Ender-3 V4-all", + "Creality/Generic PLA @Hi-all", + "Creality/Generic PLA @K1 Max_CFS-C-all", + "Creality/Generic PLA @K1 SE-all", + "Creality/Generic PLA @K1 SE_CFS-C-all", + "Creality/Generic PLA @K1C-all", + "Creality/Generic PLA @K1C_CFS-C-all", + "Creality/Generic PLA @K1_CFS-C-all", + "Creality/Generic PLA @K2 Plus-all", + "Creality/Generic PLA @K2 Pro-all", + "Creality/Generic PLA @K2 SE-all", + "Creality/Generic PLA @K2-all", + "Creality/Generic PLA @SPARKX i7-all", + "Creality/Generic PLA-CF @Ender-3 V4-all", + "Creality/Generic PLA-CF @K1 Max_CFS-C-all", + "Creality/Generic PLA-CF @K1 SE-all", + "Creality/Generic PLA-CF @K1 SE_CFS-C-all", + "Creality/Generic PLA-CF @K1C-all", + "Creality/Generic PLA-CF @K1C_CFS-C-all", + "Creality/Generic PLA-CF @K1_CFS-C-all", + "Creality/Generic PLA-CF @K2 Plus-all", + "Creality/Generic PLA-CF @K2 Pro-all", + "Creality/Generic PLA-CF @K2 SE-all", + "Creality/Generic PLA-CF @K2-all", + "Creality/Generic PLA-CF @SPARKX i7-all", + "Creality/Generic PLA-Silk @Ender-3 V4-all", + "Creality/Generic PLA-Silk @Hi-all", + "Creality/Generic PLA-Silk @K1 Max_CFS-C-all", + "Creality/Generic PLA-Silk @K1 SE-all", + "Creality/Generic PLA-Silk @K1 SE_CFS-C-all", + "Creality/Generic PLA-Silk @K1C-all", + "Creality/Generic PLA-Silk @K1C_CFS-C-all", + "Creality/Generic PLA-Silk @K1_CFS-C-all", + "Creality/Generic PLA-Silk @K2 Plus-all", + "Creality/Generic PLA-Silk @K2 Pro-all", + "Creality/Generic PLA-Silk @K2 SE-all", + "Creality/Generic PLA-Silk @K2-all", + "Creality/Generic PLA-Silk @SPARKX i7-all", + "Creality/Generic PP @K1 Max_CFS-C-all", + "Creality/Generic PP @K1C-all", + "Creality/Generic PP @K1C_CFS-C-all", + "Creality/Generic PP @K1_CFS-C-all", + "Creality/Generic PP @K2 Plus-all", + "Creality/Generic PP @K2 Pro-all", + "Creality/Generic PP @K2-all", + "Creality/Generic Support for PA @K2 Plus-all", + "Creality/Generic Support for PLA @K2 Plus-all", + "Creality/HP Ultra PLA @K1 Max_CFS-C-all", + "Creality/HP Ultra PLA @K1C-all", + "Creality/HP Ultra PLA @K1C_CFS-C-all", + "Creality/HP Ultra PLA @K1_CFS-C-all", + "Creality/HP Ultra PLA @K2 Plus-all", + "Creality/Hyper L-W PLA @Hi-all", + "Creality/Hyper L-W PLA @K1 Max_CFS-C-all", + "Creality/Hyper L-W PLA @K1 SE-all", + "Creality/Hyper L-W PLA @K1 SE_CFS-C-all", + "Creality/Hyper L-W PLA @K1C-all", + "Creality/Hyper L-W PLA @K1C_CFS-C-all", + "Creality/Hyper L-W PLA @K1_CFS-C-all", + "Creality/Hyper L-W PLA @K2 Plus-all", + "Creality/Hyper L-W PLA @K2 Pro-all", + "Creality/Hyper L-W PLA @K2-all", + "Creality/Hyper Luminous @Hi-all", + "Creality/Hyper Luminous @K1C-all", + "Creality/Hyper Luminous @K2 Plus-all", + "Creality/Hyper Luminous @K2 Pro-all", + "Creality/Hyper Luminous @K2-all", + "Creality/Hyper Luminous @SPARKX i7-all", + "Creality/Hyper Marble @Hi-all", + "Creality/Hyper Marble @K1 Max_CFS-C-all", + "Creality/Hyper Marble @K1C-all", + "Creality/Hyper Marble @K1C_CFS-C-all", + "Creality/Hyper Marble @K1_CFS-C-all", + "Creality/Hyper Marble @K2 Plus-all", + "Creality/Hyper Marble @K2 Pro-all", + "Creality/Hyper Marble @K2 SE-all", + "Creality/Hyper Marble @K2-all", + "Creality/Hyper Marble @SPARKX i7-all", + "Creality/Hyper PA6-CF @K2 Plus-all", + "Creality/Hyper PA6-CF @K2 Pro-all", + "Creality/Hyper PA612-CF @K2 Plus-all", + "Creality/Hyper PA612-CF @K2 Pro-all", + "Creality/Hyper PAHT-CF @K1 Max_CFS-C-all", + "Creality/Hyper PAHT-CF @K1C-all", + "Creality/Hyper PAHT-CF @K1C_CFS-C-all", + "Creality/Hyper PAHT-CF @K1_CFS-C-all", + "Creality/Hyper PAHT-CF @K2 Plus-all", + "Creality/Hyper PAHT-CF @K2 Pro-all", + "Creality/Hyper PAHT-CF @K2-all", + "Creality/Hyper PC @K2 Plus-all", + "Creality/Hyper PC @K2 Pro-all", + "Creality/Hyper PLA @Ender-3 V4-all", + "Creality/Hyper PLA @Hi-all", + "Creality/Hyper PLA @K1 Max_CFS-C-all", + "Creality/Hyper PLA @K1 SE-all", + "Creality/Hyper PLA @K1 SE_CFS-C-all", + "Creality/Hyper PLA @K1C-all", + "Creality/Hyper PLA @K1C_CFS-C-all", + "Creality/Hyper PLA @K1_CFS-C-all", + "Creality/Hyper PLA @K2 Plus-all", + "Creality/Hyper PLA @K2 Pro-all", + "Creality/Hyper PLA @K2 SE-all", + "Creality/Hyper PLA @K2-all", + "Creality/Hyper PLA @SPARKX i7-all", + "Creality/Hyper PLA-CF @Ender-3 V4-all", + "Creality/Hyper PLA-CF @Hi-all", + "Creality/Hyper PLA-CF @K1 Max_CFS-C-all", + "Creality/Hyper PLA-CF @K1 SE-all", + "Creality/Hyper PLA-CF @K1 SE_CFS-C-all", + "Creality/Hyper PLA-CF @K1C-all", + "Creality/Hyper PLA-CF @K1C_CFS-C-all", + "Creality/Hyper PLA-CF @K1_CFS-C-all", + "Creality/Hyper PLA-CF @K2 Plus-all", + "Creality/Hyper PLA-CF @K2 Pro-all", + "Creality/Hyper PLA-CF @K2 SE-all", + "Creality/Hyper PLA-CF @K2-all", + "Creality/Hyper PLA-CF @SPARKX i7-all", + "Creality/Hyper PPA-CF @K2 Plus-all", + "Creality/Hyper PPA-CF @K2 Pro-all", + "Creality/Hyper Stardust @Hi-all", + "Creality/Hyper Stardust @K1 Max_CFS-C-all", + "Creality/Hyper Stardust @K1C-all", + "Creality/Hyper Stardust @K1C_CFS-C-all", + "Creality/Hyper Stardust @K1_CFS-C-all", + "Creality/Hyper Stardust @K2 Plus-all", + "Creality/Hyper Stardust @K2 Pro-all", + "Creality/Hyper Stardust @K2 SE-all", + "Creality/Hyper Stardust @K2-all", + "Creality/Hyper Stardust @SPARKX i7-all", + "Creality/Panchroma PLA Matte @K2 Plus-all", + "Creality/Panchroma PLA Satin @K2 Plus-all", + "Creality/PolySonic PLA @K2 Plus-all", + "Creality/PolySonic PLA Pro @K2 Plus-all", + "Creality/Soleyin Ultra PLA @Ender-3 V4-all", + "Creality/Soleyin Ultra PLA @Hi-all", + "Creality/Soleyin Ultra PLA @K1 Max_CFS-C-all", + "Creality/Soleyin Ultra PLA @K1C-all", + "Creality/Soleyin Ultra PLA @K1C_CFS-C-all", + "Creality/Soleyin Ultra PLA @K1_CFS-C-all", + "Creality/Soleyin Ultra PLA @K2 Plus-all", + "Creality/Soleyin Ultra PLA @K2 Pro-all", + "Creality/Soleyin Ultra PLA @K2 SE-all", + "Creality/Soleyin Ultra PLA @K2-all", + "Creality/Soleyin Ultra PLA @SPARKX i7-all", + "Creality/eSUN PET-Basic @K2 Plus-all", + "Creality/eSUN PLA+ @K2 Plus-all", + "Creality/eSUN PLA-CF @K2 Plus-all", + "Creality/eSUN PLA-HS @K2 Plus-all", + "Creality/eSUN PLA-LW @K2 Plus-all", + "Creality/eSUN PLA-Lite @K2 Plus-all", + "Creality/eSUN PLA-Matte @K2 Plus-all", + "Creality/eSUN PLA-Silk @K2 Plus-all", + "Cubicon/Cubicon PLA @base", + "Custom/Generic PC @MyToolChanger", + "Custom/Generic PETG @MyToolChanger", + "Custom/Generic PLA @MyToolChanger", + "Custom/Generic PLA-CF @MyToolChanger", + "Custom/Generic PVA @MyToolChanger", + "Custom/Generic TPU @MyToolChanger", + "DeltaMaker/DeltaMaker Brand PLA", + "DeltaMaker/DeltaMaker Generic PETG", + "DeltaMaker/DeltaMaker Generic PLA", + "Dremel/Dremel Generic PLA", + "Elegoo/Elegoo PAHT @base", + "Elegoo/Elegoo PC @base", + "Elegoo/Elegoo PETG @base", + "Elegoo/Elegoo PLA @base", + "Elegoo/Generic PA @base", + "Elegoo/Generic PC @base", + "Elegoo/Generic PET @base", + "Elegoo/Generic PETG @base", + "Elegoo/Generic PLA @base", + "FLSun/FLSun Generic PA", + "FLSun/FLSun Generic PA-CF", + "FLSun/FLSun Generic PC", + "FLSun/FLSun Generic PETG", + "FLSun/FLSun Generic PLA", + "FLSun/FLSun Generic PLA-CF", + "Flashforge/Flashforge ABS Basic @FF C5", + "Flashforge/Flashforge ABS Basic @FF C5P", + "Flashforge/Flashforge ABS-GF @FF C5", + "Flashforge/Flashforge ABS-GF @FF C5P", + "Flashforge/Flashforge ASA Basic @FF C5", + "Flashforge/Flashforge ASA Basic @FF C5P", + "Flashforge/Flashforge ASA-CF @FF C5", + "Flashforge/Flashforge ASA-CF @FF C5P", + "Flashforge/Flashforge ASA-GF @FF C5", + "Flashforge/Flashforge ASA-GF @FF C5P", + "Flashforge/Flashforge Generic HS PLA", + "Flashforge/Flashforge Generic PETG", + "Flashforge/Flashforge Generic PETG-CF10", + "Flashforge/Flashforge Generic PLA", + "Flashforge/Flashforge Generic PLA-CF10", + "Flashforge/Flashforge Generic PLA-Silk", + "Flashforge/Flashforge HIPS @FF C5", + "Flashforge/Flashforge HIPS @FF C5P", + "Flashforge/Flashforge HS PETG @FF C5", + "Flashforge/Flashforge HS PETG @FF C5P", + "Flashforge/Flashforge HS PLA @FF C5", + "Flashforge/Flashforge HS PLA @FF C5P", + "Flashforge/Flashforge PA-CF @FF C5", + "Flashforge/Flashforge PA-CF @FF C5P", + "Flashforge/Flashforge PAHT-CF @FF C5", + "Flashforge/Flashforge PAHT-CF @FF C5P", + "Flashforge/Flashforge PET-CF @FF C5", + "Flashforge/Flashforge PET-CF @FF C5P", + "Flashforge/Flashforge PETG", + "Flashforge/Flashforge PETG Pro @FF C5", + "Flashforge/Flashforge PETG Pro @FF C5P", + "Flashforge/Flashforge PETG Transparent @FF C5", + "Flashforge/Flashforge PETG Transparent @FF C5P", + "Flashforge/Flashforge PETG-CF @FF C5", + "Flashforge/Flashforge PETG-CF @FF C5P", + "Flashforge/Flashforge PLA", + "Flashforge/Flashforge PLA Matte @FF C5", + "Flashforge/Flashforge PLA Matte @FF C5P", + "Flashforge/Flashforge PLA Metal @FF C5", + "Flashforge/Flashforge PLA Metal @FF C5P", + "Flashforge/Flashforge PLA Pro @FF C5", + "Flashforge/Flashforge PLA Pro @FF C5P", + "Flashforge/Flashforge PLA Basic @FF C5", + "Flashforge/Flashforge PLA Basic @FF C5P", + "Flashforge/Flashforge PLA Color Change @FF C5", + "Flashforge/Flashforge PLA Color Change @FF C5P", + "Flashforge/Flashforge PLA Galaxy @FF C5", + "Flashforge/Flashforge PLA Galaxy @FF C5P", + "Flashforge/Flashforge PLA Luminous @FF C5", + "Flashforge/Flashforge PLA Luminous @FF C5P", + "Flashforge/Flashforge PLA Silk @FF C5", + "Flashforge/Flashforge PLA Silk @FF C5P", + "Flashforge/Flashforge PLA-CF @FF C5", + "Flashforge/Flashforge PLA-CF @FF C5P", + "Flashforge/Flashforge PPA-CF @FF C5", + "Flashforge/Flashforge PPA-CF @FF C5P", + "Flashforge/Flashforge PPS-CF @FF C5", + "Flashforge/Flashforge PPS-CF @FF C5P", + "Flashforge/Flashforge PVA @FF C5", + "Flashforge/Flashforge PVA @FF C5P", + "Flashforge/Flashforge TPU-64D @FF C5", + "Flashforge/Flashforge TPU-64D @FF C5P", + "Flashforge/Flashforge TPU-90A @FF C5", + "Flashforge/Flashforge TPU-90A @FF C5P", + "Flashforge/Flashforge TPU-95A @FF C5", + "Flashforge/Flashforge TPU-95A @FF C5P", + "Flashforge/FusRock PAHT-CF @FF C5", + "Flashforge/FusRock PAHT-CF @FF C5P", + "Flashforge/FusRock S-Multi @FF C5", + "Flashforge/FusRock S-Multi @FF C5P", + "Flashforge/FusRock S-PAHT @FF C5", + "Flashforge/FusRock S-PAHT @FF C5P", + "Flashforge/Generic PETG @Flashforge Artemis", + "Flashforge/Generic TPU-64D @FF C5", + "Flashforge/Generic TPU-64D @FF C5P", + "Flashforge/Generic TPU-90A @FF C5", + "Flashforge/Generic TPU-90A @FF C5P", + "Flashforge/Generic TPU-95A @FF C5", + "Flashforge/Generic TPU-95A @FF C5P", + "Flashforge/SUNLU PETG @base", + "Flashforge/SUNLU PLA Marble @base", + "Flashforge/SUNLU PLA Matte @base", + "Flashforge/SUNLU PLA+ 2.0 @base", + "Flashforge/SUNLU PLA+ @base", + "Flashforge/SUNLU Silk PLA+ @base", + "Flashforge/SUNLU Wood PLA @base", + "FlyingBear/FlyingBear Generic PA-CF", + "FlyingBear/FlyingBear Generic PC", + "FlyingBear/FlyingBear Generic PETG", + "FlyingBear/FlyingBear Generic PLA", + "InfiMech/InfiMech Generic PA-CF", + "InfiMech/InfiMech Generic PC", + "InfiMech/InfiMech Generic PETG", + "InfiMech/InfiMech Generic PLA", + "LH/LHS PC CF", + "LH/LHS PCTG", + "LH/LHS PETG", + "LH/LHS PLA", + "LONGER/Generic PETG @LONGER LK10", + "LONGER/Generic PETG @LONGER LK10 Plus", + "LONGER/Generic PLA @LONGER LK10", + "LONGER/Generic PLA @LONGER LK10 Plus", + "Lulzbot/Lulzbot 2.85mm ABS", + "Lulzbot/Lulzbot 2.85mm PETG", + "Lulzbot/Lulzbot 2.85mm PLA", + "OrcaArena/Arena PA-CF @base", + "OrcaArena/Arena PAHT-CF @base", + "OrcaArena/Arena PC @base", + "OrcaArena/Arena PET-CF @base", + "OrcaArena/Arena PETG Basic @base", + "OrcaArena/Arena PETG-CF @base", + "OrcaArena/Arena PLA Basic @base", + "OrcaArena/Arena PLA Impact @base", + "OrcaArena/Arena PLA Marble @base", + "OrcaArena/Arena PLA Matte @base", + "OrcaArena/Arena PLA Metal @base", + "OrcaArena/Arena PLA Silk @base", + "OrcaArena/Arena PLA Sparkle @base", + "OrcaArena/Arena PLA Tough @base", + "OrcaArena/Arena PLA-CF @base", + "OrcaArena/Arena Support G @base", + "OrcaArena/Arena Support W @base", + "OrcaArena/OrcaArena Generic PA", + "OrcaArena/OrcaArena Generic PA-CF", + "OrcaArena/OrcaArena Generic PC @base", + "OrcaArena/OrcaArena Generic PETG @base", + "OrcaArena/OrcaArena Generic PETG-CF @base", + "OrcaArena/OrcaArena Generic PLA @base", + "OrcaArena/OrcaArena Generic PLA Silk @base", + "OrcaArena/OrcaArena Generic PLA-CF @base", + "OrcaArena/PolyLite PLA @base", + "OrcaArena/PolyTerra PLA @base", + "Peopoly/Peopoly Generic PLA", + "Peopoly/Peopoly Lancer PLA-C", + "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", + "Prusa/Prusa Generic PA @MK3.5", + "Prusa/Prusa Generic PA @MK3.5 0.25", + "Prusa/Prusa Generic PA @MK3.5 0.6", + "Prusa/Prusa Generic PA @MK3.5 0.8", + "Prusa/Prusa Generic PA @base", + "Prusa/Prusa Generic PA-CF @MK3.5", + "Prusa/Prusa Generic PA-CF @MK3.5 0.25", + "Prusa/Prusa Generic PA-CF @MK3.5 0.6", + "Prusa/Prusa Generic PA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PA-CF @base", + "Prusa/Prusa Generic PETG @CORE One", + "Prusa/Prusa Generic PETG @MK3.5", + "Prusa/Prusa Generic PETG @MK3.5 0.25", + "Prusa/Prusa Generic PETG @MK3.5 0.6", + "Prusa/Prusa Generic PETG @MK3.5 0.8", + "Prusa/Prusa Generic PETG @MK4S", + "Prusa/Prusa Generic PETG @base", + "Prusa/Prusa Generic PETG HF @MK3.5", + "Prusa/Prusa Generic PETG HF @MK3.5 0.6", + "Prusa/Prusa Generic PETG HF @MK3.5 0.8", + "Prusa/Prusa Generic PETG HF @base", + "Prusa/Prusa Generic PLA @CORE One", + "Prusa/Prusa Generic PLA @MK3.5", + "Prusa/Prusa Generic PLA @MK3.5 0.25", + "Prusa/Prusa Generic PLA @MK3.5 0.6", + "Prusa/Prusa Generic PLA @MK3.5 0.8", + "Prusa/Prusa Generic PLA @MK4S", + "Prusa/Prusa Generic PLA @base", + "Prusa/Prusa Generic PLA HF @MK3.5", + "Prusa/Prusa Generic PLA HF @MK3.5 0.6", + "Prusa/Prusa Generic PLA HF @MK3.5 0.8", + "Prusa/Prusa Generic PLA HF @base", + "Prusa/Prusa Generic PLA Silk @CORE One", + "Prusa/Prusa Generic PLA-CF @MK3.5", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.25", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.6", + "Prusa/Prusa Generic PLA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PLA-CF @base", + "Prusa/Prusament PA-CF @CORE One", + "Prusa/Prusament PETG @CORE One", + "Prusa/Prusament PETG @base", + "Prusa/Prusament PLA @CORE One", + "Prusa/Prusament PLA @base", + "Prusa/Prusament rPLA @CORE One", + "Prusa/Prusament rPLA @base", + "Qidi/Bambu PETG", + "Qidi/Bambu PLA", + "Qidi/HATCHBOX PETG @Qidi", + "Qidi/HATCHBOX PLA @Qidi", + "Qidi/Overture PLA @Qidi", + "Qidi/PolyLite PLA @Qidi", + "Qidi/QIDI PA-Ultra", + "Qidi/QIDI PA12-CF", + "Qidi/QIDI PAHT-CF", + "Qidi/QIDI PAHT-GF", + "Qidi/QIDI PET-CF", + "Qidi/QIDI PET-GF", + "Qidi/QIDI PETG Basic", + "Qidi/QIDI PETG Rapido", + "Qidi/QIDI PETG Tough", + "Qidi/QIDI PETG Translucent", + "Qidi/QIDI PETG-CF", + "Qidi/QIDI PETG-GF", + "Qidi/QIDI PLA Basic", + "Qidi/QIDI PLA Matte Basic", + "Qidi/QIDI PLA Rapido", + "Qidi/QIDI PLA Rapido Matte", + "Qidi/QIDI PLA Rapido Metal", + "Qidi/QIDI PLA Rapido Silk", + "Qidi/QIDI PPS-CF", + "Qidi/QIDI PPS-GF", + "Qidi/QIDI Support For PAHT", + "Qidi/QIDI Support For PET/PA", + "Qidi/QIDI UltraPA-CF25", + "Qidi/QIDI WOOD Rapido", + "Qidi/Qidi Generic PA", + "Qidi/Qidi Generic PA-CF", + "Qidi/Qidi Generic PC", + "Qidi/Qidi Generic PETG", + "Qidi/Qidi Generic PETG-CF", + "Qidi/Qidi Generic PLA", + "Qidi/Qidi Generic PLA Silk", + "Qidi/Qidi Generic PLA+", + "Qidi/Qidi Generic PLA-CF", + "Qidi/Qidi PLA-CF", + "Qidi/Tinmorry PETG-ECO", + "Ratrig/RatRig BigNozzle PCTG", + "Ratrig/RatRig BigNozzle PETG", + "Ratrig/RatRig BigNozzle PLA", + "Ratrig/RatRig Generic PA", + "Ratrig/RatRig Generic PA-CF", + "Ratrig/RatRig Generic PC", + "Ratrig/RatRig Generic PCTG", + "Ratrig/RatRig Generic PETG", + "Ratrig/RatRig Generic PLA", + "Ratrig/RatRig Generic PLA-CF", + "Ratrig/RatRig PunkFil PETG", + "Ratrig/RatRig PunkFil PETG CF", + "SecKit/SecKit Generic PA", + "SecKit/SecKit Generic PA-CF", + "SecKit/SecKit Generic PC", + "SecKit/SecKit Generic PETG", + "SecKit/SecKit Generic PLA", + "SecKit/SecKit Generic PLA-CF", + "Snapmaker/Fiberon PA12-CF10 @Snapmaker U1 base", + "Snapmaker/Fiberon PA6-CF20 @Snapmaker U1 base", + "Snapmaker/Fiberon PA612-ESD @Snapmaker U1 base", + "Snapmaker/Panchroma CoPE @Snapmaker U1 base", + "Snapmaker/Panchroma PLA @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Celestial @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Galaxy @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Glow @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Luminous @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Marble @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Matte @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Metallic @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Neon @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Satin @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Silk @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Starlight @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Temp Shift @Snapmaker U1 base", + "Snapmaker/Panchroma PLA Translucent @Snapmaker U1 base", + "Snapmaker/Panchroma PLA UV Shift @Snapmaker U1 base", + "Snapmaker/PolyLite CosPLA @Snapmaker U1 base", + "Snapmaker/PolyLite PLA @Snapmaker U1 base", + "Snapmaker/PolyLite PLA @base", + "Snapmaker/PolyLite PLA Galaxy @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Glow @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Luminous @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Neon @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Pro @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Pro Metallic @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Starlight @Snapmaker U1 base", + "Snapmaker/PolyLite PLA Translucent @Snapmaker U1 base", + "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", + "Snapmaker/PolyTerra J1 PLA", + "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", + "Snapmaker/PolyTerra PLA @Snapmaker U1 base", + "Snapmaker/PolyTerra PLA Marble @Snapmaker U1 base", + "Snapmaker/PolyTerra PLA+ @Snapmaker U1 base", + "Snapmaker/Polymaker HT-PLA @Snapmaker U1 base", + "Snapmaker/Polymaker HT-PLA-GF @Snapmaker U1 base", + "Snapmaker/Polymaker PLA @Snapmaker U1 base", + "Snapmaker/Polymaker PLA Pro @Snapmaker U1 base", + "Snapmaker/Polymaker PLA Pro Metallic @Snapmaker U1 base", + "Snapmaker/Snapmaker Dual PA-CF @base", + "Snapmaker/Snapmaker Dual PET @base", + "Snapmaker/Snapmaker Dual PLA @base", + "Snapmaker/Snapmaker Dual PLA Eco @base", + "Snapmaker/Snapmaker Dual PLA Matte @base", + "Snapmaker/Snapmaker Dual PLA Metal @base", + "Snapmaker/Snapmaker Dual PLA Silk @base", + "Snapmaker/Snapmaker Dual PLA-CF @base", + "Snapmaker/Snapmaker J1 PA-CF @base", + "Snapmaker/Snapmaker J1 PET @base", + "Snapmaker/Snapmaker J1 PLA @base", + "Snapmaker/Snapmaker J1 PLA Eco @base", + "Snapmaker/Snapmaker J1 PLA Matte @base", + "Snapmaker/Snapmaker J1 PLA Metal @base", + "Snapmaker/Snapmaker J1 PLA Silk @base", + "Snapmaker/Snapmaker J1 PLA-CF @base", + "Snapmaker/Snapmaker PA-CF @U1 base", + "Snapmaker/Snapmaker PA-CF @base", + "Snapmaker/Snapmaker PET @U1 base", + "Snapmaker/Snapmaker PET @base", + "Snapmaker/Snapmaker PLA @U1 base", + "Snapmaker/Snapmaker PLA @base", + "Snapmaker/Snapmaker PLA Eco @U1 base", + "Snapmaker/Snapmaker PLA Eco @base", + "Snapmaker/Snapmaker PLA Metal @U1 base", + "Snapmaker/Snapmaker PLA Silk @U1 base", + "Snapmaker/Snapmaker PLA Silk @base", + "Snapmaker/Snapmaker PLA-CF @U1 base", + "Snapmaker/Snapmaker PLA-CF @base", + "Sovol/Generic PLA Silk @Sovol SV08 MAX", + "Sovol/Polymaker PETG @Sovol SV08 MAX", + "Sovol/SUNLU PETG @Sovol SV08 MAX", + "Sovol/Sovol SV06 ACE ABS", + "Sovol/Sovol SV06 ACE PETG", + "Sovol/Sovol SV06 ACE PLA", + "Sovol/Sovol SV06 ACE TPU", + "Sovol/Sovol SV06 Plus ACE ABS", + "Sovol/Sovol SV06 Plus ACE PETG", + "Sovol/Sovol SV06 Plus ACE PLA", + "Sovol/Sovol SV06 Plus ACE TPU", + "Sovol/Sovol SV07 PLA", + "Sovol/Sovol SV08 ABS", + "Sovol/Sovol SV08 PETG", + "Sovol/Sovol SV08 PLA", + "Sovol/Sovol SV08 PLA @SV08 0.2 nozzle", + "Sovol/Sovol SV08 TPU", + "Sovol/Sovol Zero ABS", + "Sovol/Sovol Zero PC", + "Sovol/Sovol Zero PETG", + "Sovol/Sovol Zero PETG HS Nozzle", + "Sovol/Sovol Zero PLA Basic", + "Sovol/Sovol Zero PLA Basic HS Nozzle", + "Sovol/Sovol Zero PLA Silk", + "Sovol/Sovol Zero PLA Silk HS Nozzle", + "Sovol/Sovol Zero TPU", + "Tiertime/Tiertime Generic BVOH", + "Tiertime/Tiertime Generic BVOH@300HS", + "Tiertime/Tiertime Generic EVA", + "Tiertime/Tiertime Generic EVA@300HS", + "Tiertime/Tiertime Generic HIPS", + "Tiertime/Tiertime Generic HIPS@300HS", + "Tiertime/Tiertime Generic PA", + "Tiertime/Tiertime Generic PA-CF", + "Tiertime/Tiertime Generic PA-CF@300HS", + "Tiertime/Tiertime Generic PA@300HS", + "Tiertime/Tiertime Generic PC", + "Tiertime/Tiertime Generic PC@300HS", + "Tiertime/Tiertime Generic PCTG", + "Tiertime/Tiertime Generic PCTG@300HS", + "Tiertime/Tiertime Generic PE", + "Tiertime/Tiertime Generic PE-CF", + "Tiertime/Tiertime Generic PE-CF@300HS", + "Tiertime/Tiertime Generic PE@300HS", + "Tiertime/Tiertime Generic PETG", + "Tiertime/Tiertime Generic PETG-CF", + "Tiertime/Tiertime Generic PETG-CF@300HS", + "Tiertime/Tiertime Generic PETG@300HS", + "Tiertime/Tiertime Generic PHA", + "Tiertime/Tiertime Generic PHA@300HS", + "Tiertime/Tiertime Generic PLA", + "Tiertime/Tiertime Generic PLA High Speed", + "Tiertime/Tiertime Generic PLA High Speed@300HS", + "Tiertime/Tiertime Generic PLA Silk", + "Tiertime/Tiertime Generic PLA Silk@300HS", + "Tiertime/Tiertime Generic PLA-CF", + "Tiertime/Tiertime Generic PLA-CF@300HS", + "Tiertime/Tiertime Generic PLA@300HS", + "Tiertime/Tiertime Generic PP", + "Tiertime/Tiertime Generic PP-CF", + "Tiertime/Tiertime Generic PP-CF@300HS", + "Tiertime/Tiertime Generic PP-GF", + "Tiertime/Tiertime Generic PP-GF@300HS", + "Tiertime/Tiertime Generic PP@300HS", + "Tiertime/Tiertime Generic PPA-CF", + "Tiertime/Tiertime Generic PPA-CF@300HS", + "Tiertime/Tiertime Generic PPA-GF", + "Tiertime/Tiertime Generic PPA-GF@300HS", + "Tiertime/Tiertime Generic SBS", + "Tiertime/Tiertime Generic SBS@300HS", + "Tiertime/Tiertime PA6-CF", + "Tiertime/Tiertime PA6-CF@300HS", + "Tiertime/Tiertime PC", + "Tiertime/Tiertime PC@300HS", + "Tiertime/Tiertime PET-CF", + "Tiertime/Tiertime PET-CF@300HS", + "Tiertime/Tiertime PETG", + "Tiertime/Tiertime PETG@300HS", + "Tiertime/Tiertime PLA", + "Tiertime/Tiertime PLA-CF", + "Tiertime/Tiertime PLA-CF@300HS", + "Tiertime/Tiertime PLA@300HS", + "TwoTrees/TwoTrees Generic HS PLA @SK1", + "Volumic/Désactivé", + "Volumic/PA6 CF20 (Performance)", + "Volumic/PETG ESD (Performance)", + "Volumic/PPS Carbone (Performance)", + "Volumic/Volumic NYLON Ultra", + "Volumic/Volumic NYLON Ultra (Performance)", + "Volumic/Volumic PC", + "Volumic/Volumic PC (Performance)", + "Volumic/Volumic PCTG Ultra (Performance)", + "Volumic/Volumic PETG Ultra", + "Volumic/Volumic PETG Ultra (Performance)", + "Volumic/Volumic PETG Ultra carbone", + "Volumic/Volumic PETG Ultra carbone (Performance)", + "Volumic/Volumic PLA Ultra", + "Volumic/Volumic PLA Ultra (Performance)", + "Volumic/Volumic PP Ultra", + "Volumic/Volumic PP Ultra (Performance)", + "Volumic/Volumic UNIVERSAL Ultra", + "Volumic/Volumic UNIVERSAL Ultra (Performance)", + "Vzbot/Vzbot Generic PA", + "Vzbot/Vzbot Generic PA-CF", + "Vzbot/Vzbot Generic PC", + "Vzbot/Vzbot Generic PETG", + "Vzbot/Vzbot Generic PLA", + "Vzbot/Vzbot Generic PLA-CF", + "Wanhao France/Yumi Generic PETG", + "Wanhao France/Yumi Generic PLA", + "WonderMaker/WonderMaker PET-CF", + "WonderMaker/WonderMaker PETG Basic", + "WonderMaker/WonderMaker PLA Basic", + "WonderMaker/WonderMaker PLA Marble", + "WonderMaker/WonderMaker PLA Matte", + "WonderMaker/WonderMaker PLA Metal", + "WonderMaker/WonderMaker PLA Silk", + "WonderMaker/WonderMaker PLA Wood", + "Z-Bolt/Generic PA @Z-Bolt Base", + "Z-Bolt/Generic PETG @Z-Bolt Base", + "Z-Bolt/Generic PLA @Z-Bolt Base", + "re3D/re3D Greengate rPETG", + "re3D/re3D Greengate rPETG @0.8 nozzle", + "re3D/re3D Greengate rPETG @1.75 nozzle", + "re3D/re3D PC", + "re3D/re3D PC @0.4 nozzle", + "re3D/re3D PC @0.8 nozzle", + "re3D/re3D PETG", + "re3D/re3D PETG @0.4 nozzle", + "re3D/re3D PETG @0.8 nozzle", + "re3D/re3D PLA", + "re3D/re3D PLA @0.4 nozzle", + "re3D/re3D PLA @0.8 nozzle", + "re3D/re3D rPP", + "re3D/re3D rPP @0.8 nozzle", + "re3D/re3D rPP @1.75 nozzle" + ], "id_overrides": [ "Afinia/Afinia PLA", "Afinia/Afinia PLA@HS", @@ -9446,5 +10483,9965 @@ "re3D/re3D rPP", "re3D/re3D rPP @0.8 nozzle", "re3D/re3D rPP @1.75 nozzle" - ] + ], + "triple_exceptions": [ + "Anycubic/Anycubic ABS", + "Anycubic/Anycubic ASA", + "Anycubic/Anycubic PETG", + "Anycubic/Anycubic PLA", + "Anycubic/Anycubic PLA High Speed", + "Anycubic/Anycubic PLA Silk", + "Anycubic/Anycubic PLA+", + "Anycubic/Anycubic TPU", + "Anycubic/Generic PETG", + "Creality/Creality Generic ABS", + "Creality/Creality Generic ASA", + "Creality/Creality Generic PETG", + "Creality/Creality Generic TPU", + "Creality/Generic PETG-GF", + "Flashforge/Flashforge ABS", + "Flashforge/Flashforge ASA-CF", + "Flashforge/Flashforge PET-CF", + "Flashforge/Flashforge PETG", + "Flashforge/Flashforge PPA-CF", + "Flashforge/Flashforge PPS-CF", + "Flashforge/FusRock Generic PAHT-CF", + "Flashforge/FusRock Generic PET-CF", + "Flashforge/FusRock Generic S-Multi", + "Flashforge/FusRock Generic S-PAHT", + "Prusa/Prusa Generic ASA", + "Prusa/Prusa Generic TPU", + "Prusa/Prusa Generic TPU HF", + "Prusa/Prusament PETG", + "Prusa/Prusament PLA", + "Prusa/Prusament rPLA", + "Snapmaker/PolyLite PLA", + "re3D/re3D Greengate rPETG" + ], + "triples": { + "00001": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "00002": [ + [ + "Generic", + "PLA", + "Generic PLA-Silk" + ] + ], + "00003": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "00004": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "00005": [ + [ + "Generic", + "TPU", + "Generic TPU" + ] + ], + "00006": [ + [ + "Generic", + "PLA-CF", + "Generic PLA-CF" + ] + ], + "00007": [ + [ + "Generic", + "ASA", + "Generic ASA" + ] + ], + "00008": [ + [ + "Generic", + "PA", + "Generic PA" + ] + ], + "00009": [ + [ + "Generic", + "PA-CF", + "Generic PA-CF" + ] + ], + "00010": [ + [ + "Generic", + "BVOH", + "Generic BVOH" + ] + ], + "00011": [ + [ + "Generic", + "PVA", + "Generic PVA" + ] + ], + "00012": [ + [ + "Generic", + "HIPS", + "Generic HIPS" + ] + ], + "00013": [ + [ + "Generic", + "PET-CF", + "Generic PET-CF" + ] + ], + "00014": [ + [ + "Generic", + "PETG-CF", + "Generic PETG-CF" + ] + ], + "00015": [ + [ + "Generic", + "PA6-CF", + "Generic PA6-CF" + ] + ], + "00016": [ + [ + "Generic", + "PA-CF", + "Generic PAHT-CF" + ] + ], + "00017": [ + [ + "Generic", + "PPS", + "Generic PPS" + ] + ], + "00018": [ + [ + "Generic", + "PPS-CF", + "Generic PPS-CF" + ] + ], + "00019": [ + [ + "Generic", + "PP", + "Generic PP" + ] + ], + "00020": [ + [ + "Generic", + "PET", + "Generic PET" + ] + ], + "00021": [ + [ + "Generic", + "PC", + "Generic PC" + ] + ], + "00022": [ + [ + "Generic", + "PA-CF", + "Generic PA612-CF" + ] + ], + "00023": [ + [ + "Generic", + "PA", + "Generic Support for PA" + ] + ], + "00024": [ + [ + "Generic", + "PLA", + "Generic Support for PLA" + ] + ], + "00025": [ + [ + "Generic", + "PA-CF", + "Generic PA12-CF" + ] + ], + "00026": [ + [ + "Generic", + "TPU", + "Generic TPU 64D" + ] + ], + "00027": [ + [ + "Creality", + "PETG-GF", + "Generic PETG-GF" + ], + [ + "Generic", + "PETG-GF", + "Generic PETG-GF" + ] + ], + "00031": [ + [ + "Generic", + "PP-CF", + "Generic PP-CF" + ] + ], + "00032": [ + [ + "Generic", + "PCTG", + "Generic PCTG" + ] + ], + "00033": [ + [ + "Generic", + "ASA-CF", + "Generic ASA-CF" + ] + ], + "00034": [ + [ + "Generic", + "PA-GF", + "Generic PA6-GF" + ] + ], + "00035": [ + [ + "eSUN", + "PLA", + "eSUN PLA-LW" + ] + ], + "01001": [ + [ + "Creality", + "PLA", + "Creality Hyper PLA" + ], + [ + "Creality", + "PLA", + "Hyper PLA" + ] + ], + "01002": [ + [ + "Creality", + "PLA", + "Hyper L-W PLA" + ] + ], + "01003": [ + [ + "Creality", + "PLA", + "Hyper Luminous" + ] + ], + "01004": [ + [ + "Creality", + "PLA", + "Hyper Stardust" + ] + ], + "01601": [ + [ + "Creality", + "PLA", + "Soleyin Ultra PLA" + ] + ], + "02001": [ + [ + "Creality", + "PLA-CF", + "Creality Hyper PLA-CF" + ], + [ + "Creality", + "PLA-CF", + "Hyper PLA-CF" + ] + ], + "03001": [ + [ + "Creality", + "ABS", + "Creality Hyper ABS" + ], + [ + "Creality", + "ABS", + "Hyper ABS" + ] + ], + "04001": [ + [ + "Creality", + "PLA", + "CR-PLA" + ], + [ + "Generic", + "PLA", + "Creality Generic PLA" + ] + ], + "05001": [ + [ + "Creality", + "PLA", + "CR-Silk" + ], + [ + "Creality", + "PLA", + "Creality Silk PLA" + ] + ], + "06001": [ + [ + "Creality", + "PETG", + "CR-PETG" + ], + [ + "Creality", + "PETG", + "Creality Generic PETG" + ] + ], + "06002": [ + [ + "Creality", + "PETG", + "Hyper PETG" + ] + ], + "06003": [ + [ + "Creality", + "PETG-CF", + "Hyper PETG-CF" + ] + ], + "06004": [ + [ + "Creality", + "PETG-GF", + "Hyper PETG-GF" + ] + ], + "06005": [ + [ + "Creality", + "PETG", + "Soleyin Basic PETG" + ] + ], + "07001": [ + [ + "Creality", + "ABS", + "CR-ABS" + ], + [ + "Creality", + "ABS", + "Creality Generic ABS" + ] + ], + "07002": [ + [ + "Creality", + "PC", + "Hyper PC" + ] + ], + "08001": [ + [ + "Creality", + "PLA", + "Ender-PLA" + ] + ], + "09001": [ + [ + "Creality", + "PLA", + "EN-PLA+" + ] + ], + "09002": [ + [ + "Creality", + "PLA", + "ENDER FAST PLA" + ] + ], + "10001": [ + [ + "Creality", + "TPU", + "Creality Generic TPU" + ], + [ + "Creality", + "TPU", + "HP-TPU" + ] + ], + "1009481135": [ + [ + "Snapmaker", + "PET", + "Snapmaker J1 PET" + ] + ], + "1042511226": [ + [ + "Snapmaker", + "PETG-CF", + "Snapmaker Dual PETG-CF" + ] + ], + "10425112260": [ + [ + "Snapmaker", + "PETG-CF", + "Snapmaker PETG-CF" + ] + ], + "11001": [ + [ + "Creality", + "PA", + "CR-Nylon" + ], + [ + "Creality", + "PA", + "Creality Generic PA" + ] + ], + "1172603684": [ + [ + "Snapmaker", + "PETG", + "Snapmaker J1 PETG" + ] + ], + "1181363872": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Silk" + ] + ], + "11813638720": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Silk" + ] + ], + "1192769348": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Matte" + ] + ], + "12002": [ + [ + "Creality", + "PA-CF", + "Hyper PPA-CF" + ] + ], + "12003": [ + [ + "Creality", + "PA-CF", + "Hyper PAHT-CF" + ] + ], + "12004": [ + [ + "Creality", + "PA-CF", + "Hyper PA612-CF" + ] + ], + "12005": [ + [ + "Creality", + "PA-CF", + "Hyper PA6-CF" + ] + ], + "1207881278": [ + [ + "Snapmaker", + "Breakaway Support", + "Snapmaker Dual Breakaway" + ] + ], + "1210173120": [ + [ + "Snapmaker", + "PA-CF", + "Snapmaker J1 PA-CF" + ] + ], + "1223824394": [ + [ + "Snapmaker", + "ABS", + "Snapmaker J1 ABS" + ] + ], + "1247172706": [ + [ + "Snapmaker", + "ASA", + "Snapmaker Dual ASA" + ] + ], + "12471727060": [ + [ + "Snapmaker", + "ASA", + "Snapmaker ASA" + ] + ], + "13001": [ + [ + "Creality", + "PLA-CF", + "CR-PLA Carbon" + ] + ], + "1344609062": [ + [ + "Snapmaker", + "PVA", + "Snapmaker PVA" + ] + ], + "1355502217": [ + [ + "Snapmaker", + "PETG-CF", + "Snapmaker PETG-CF" + ] + ], + "1393866034": [ + [ + "Snapmaker", + "PLA", + "PolyLite PLA" + ] + ], + "14001": [ + [ + "Creality", + "PLA", + "CR-PLA Matte" + ] + ], + "1417031127": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA" + ] + ], + "14170311270": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA" + ] + ], + "141703112701": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA SnapSpeed" + ] + ], + "1417031127011": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Lite" + ] + ], + "144877656": [ + [ + "Snapmaker", + "ASA", + "Snapmaker J1 ASA" + ] + ], + "1480063856": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPU" + ] + ], + "15001": [ + [ + "Creality", + "PLA", + "CR-PLA Fluo" + ] + ], + "1528786603": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Silk" + ] + ], + "16001": [ + [ + "Creality", + "TPU", + "CR-TPU" + ] + ], + "1655727393": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Silk" + ] + ], + "168223792": [ + [ + "Snapmaker", + "ABS", + "Snapmaker Dual ABS" + ] + ], + "1682237920": [ + [ + "Snapmaker", + "ABS", + "Snapmaker ABS" + ] + ], + "1695556157": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Eco" + ] + ], + "17001": [ + [ + "Creality", + "PLA", + "CR-Wood" + ] + ], + "1702147325": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker Dual PLA-CF" + ] + ], + "17021473250": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker PLA-CF" + ] + ], + "18001": [ + [ + "Creality", + "PLA", + "HP Ultra PLA" + ] + ], + "1895495477": [ + [ + "Snapmaker", + "PETG", + "Snapmaker PETG" + ] + ], + "19001": [ + [ + "Creality", + "ASA", + "Creality Generic ASA" + ], + [ + "Creality", + "ASA", + "HP-ASA" + ] + ], + "200803790": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Eco" + ] + ], + "2008037900": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Eco" + ] + ], + "2029994346": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Metal" + ] + ], + "20299943460": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Metal" + ] + ], + "2128577941": [ + [ + "Snapmaker", + "PET", + "Snapmaker Dual PET" + ] + ], + "21285779410": [ + [ + "Snapmaker", + "PET", + "Snapmaker PET" + ] + ], + "2209001062": [ + [ + "Snapmaker", + "PETG", + "Snapmaker Dual PETG" + ] + ], + "22090010620": [ + [ + "Snapmaker", + "PETG", + "Snapmaker PETG" + ] + ], + "2549587591": [ + [ + "Snapmaker", + "PET", + "Snapmaker PET" + ] + ], + "2742961008": [ + [ + "Snapmaker", + "ASA", + "Snapmaker ASA" + ] + ], + "29001": [ + [ + "Creality", + "PLA", + "Hyper Marble" + ] + ], + "2971656290": [ + [ + "Snapmaker", + "TPU", + "Snapmaker Dual TPU" + ] + ], + "29716562900": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPU" + ] + ], + "297165629001": [ + [ + "Generic", + "TPU", + "Snapmaker TPU 95A" + ] + ], + "3104636980": [ + [ + "Snapmaker", + "PVA", + "Snapmaker Dual PVA" + ] + ], + "31046369800": [ + [ + "Snapmaker", + "PVA", + "Snapmaker PVA" + ] + ], + "3177068229": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA" + ] + ], + "3383257822": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Eco" + ] + ], + "3492897526": [ + [ + "Snapmaker", + "Breakaway Support", + "Snapmaker J1 Breakaway" + ] + ], + "3493177425": [ + [ + "Snapmaker", + "PA-CF", + "Snapmaker Dual PA-CF" + ] + ], + "34931774250": [ + [ + "Snapmaker", + "PA-CF", + "Snapmaker PA-CF" + ] + ], + "3503790988": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Matte" + ] + ], + "377675245": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA" + ] + ], + "3806593857": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker J1 PLA-CF" + ] + ], + "3811508002": [ + [ + "Snapmaker", + "ABS", + "Snapmaker ABS" + ] + ], + "3864371306": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker PLA-CF" + ] + ], + "4012961186": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Metal" + ] + ], + "4092268632": [ + [ + "Snapmaker", + "TPU", + "Snapmaker J1 TPU" + ] + ], + "4227461134": [ + [ + "Snapmaker", + "PVA", + "Snapmaker J1 PVA" + ] + ], + "4235401834": [ + [ + "Snapmaker", + "PETG-CF", + "Snapmaker J1 PETG-CF" + ] + ], + "581236806": [ + [ + "Snapmaker", + "PA-CF", + "Snapmaker PA-CF" + ] + ], + "AZ01-1": [ + [ + "Aliz", + "PETG-CF", + "AliZ PETG-CF" + ] + ], + "AZ01-2": [ + [ + "Aliz", + "PETG", + "AliZ PETG-Metal" + ] + ], + "AliZ001": [ + [ + "Aliz", + "PETG", + "AliZ PETG" + ] + ], + "AliZ002": [ + [ + "Aliz", + "PLA", + "AliZ PLA" + ] + ], + "AliZ003": [ + [ + "Aliz", + "PA-CF", + "AliZ PA-CF" + ] + ], + "BSFI001": [ + [ + "Generic", + "PLA", + "Blocks Generic PLA" + ] + ], + "BSFI002": [ + [ + "Generic", + "PETG", + "Blocks Generic PETG" + ] + ], + "BSFI003": [ + [ + "Generic", + "TPU", + "Blocks Generic TPU" + ] + ], + "BSFI004": [ + [ + "Generic", + "ABS", + "Blocks Generic ABS" + ] + ], + "BSFI005": [ + [ + "Generic", + "ASA", + "Blocks Generic ASA" + ] + ], + "BSFI006": [ + [ + "Generic", + "PA", + "Blocks Generic PA" + ] + ], + "BSFI007": [ + [ + "Generic", + "PA-CF", + "Blocks Generic PA-CF" + ] + ], + "BSFI008": [ + [ + "Generic", + "PC", + "Blocks Generic PC" + ] + ], + "BSFI009": [ + [ + "Generic", + "PVA", + "Blocks Generic PVA" + ] + ], + "BSFI010": [ + [ + "Generic", + "PLA-CF", + "Blocks Generic PLA-CF" + ] + ], + "CX30DB20": [ + [ + "COEX 3D", + "TPU", + "COEX TPE 30D" + ] + ], + "CX40DB20": [ + [ + "COEX 3D", + "TPU", + "COEX TPE 40D" + ] + ], + "CX60AB17": [ + [ + "COEX 3D", + "TPU", + "COEX TPU 60A" + ] + ], + "CX60DB19": [ + [ + "COEX 3D", + "TPU", + "COEX TPE 60D" + ] + ], + "CXABPB09": [ + [ + "COEX 3D", + "ABS", + "COEX ABS PRIME" + ] + ], + "CXABSB01": [ + [ + "COEX 3D", + "ABS", + "COEX ABS" + ] + ], + "CXASAB04": [ + [ + "COEX 3D", + "ASA", + "COEX ASA PRIME" + ] + ], + "CXPACB23": [ + [ + "COEX 3D", + "PA-CF", + "COEX NYLEX PA6-CF" + ] + ], + "CXPAUB21": [ + [ + "COEX 3D", + "PA", + "COEX NYLEX UNFILLED" + ] + ], + "CXPCTB15": [ + [ + "COEX 3D", + "PCTG", + "COEX PCTG PRIME" + ] + ], + "CXPETB13": [ + [ + "COEX 3D", + "PETG", + "COEX PETG" + ] + ], + "CXPLAB02": [ + [ + "COEX 3D", + "PLA", + "COEX PLA" + ] + ], + "CXPLAB08": [ + [ + "COEX 3D", + "PLA", + "COEX PLA PRIME" + ] + ], + "CXPLSB03": [ + [ + "COEX 3D", + "PLA", + "COEX PLA+Silk" + ] + ], + "DFL99": [ + [ + "Volumic", + "PLA", + "Désactivé" + ] + ], + "DREMC001": [ + [ + "DREMC", + "PLA", + "DREMC PLA+" + ] + ], + "DREMC002": [ + [ + "DREMC", + "PETG", + "DREMC PETG" + ] + ], + "DREMC003": [ + [ + "DREMC", + "ABS", + "DREMC ABS" + ] + ], + "DREMC004": [ + [ + "DREMC", + "ABS", + "DREMC ABS+" + ] + ], + "DREMC005": [ + [ + "DREMC", + "ASA", + "DREMC ASA" + ] + ], + "DREMC006": [ + [ + "DREMC", + "PA6-CF", + "DREMC PA6-CF" + ] + ], + "DREMC007": [ + [ + "DREMC", + "PA-CF", + "DREMC PA12-CF" + ] + ], + "DREMC008": [ + [ + "DREMC", + "PET-CF", + "DREMC PET-CF" + ] + ], + "DREMC009": [ + [ + "DREMC", + "ABS-GF", + "DREMC ABS-GF" + ] + ], + "DREMC010": [ + [ + "DREMC", + "PPA-CF", + "DREMC PPA-CF" + ], + [ + "DREMC", + "TPU", + "DREMC TPU 95A" + ] + ], + "DREMC011": [ + [ + "DREMC", + "PLA", + "DREMC PLA+ HS" + ] + ], + "DREMC012": [ + [ + "DREMC", + "ASA", + "DREMC ASA CF" + ] + ], + "DREMC013": [ + [ + "DREMC", + "ASA", + "DREMC ASA GF" + ] + ], + "E1001": [ + [ + "eSUN", + "PLA", + "eSUN PLA+" + ] + ], + "E1002": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Silk" + ] + ], + "E1003": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Matte" + ] + ], + "E1004": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Lite" + ] + ], + "E1005": [ + [ + "eSUN", + "PLA-CF", + "eSUN PLA-CF" + ] + ], + "E1006": [ + [ + "eSUN", + "PLA", + "eSUN PLA-HS" + ] + ], + "E2001": [ + [ + "eSUN", + "PETG", + "eSUN PETG" + ] + ], + "E2002": [ + [ + "eSUN", + "PETG", + "eSUN PETG+HS" + ] + ], + "E2003": [ + [ + "eSUN", + "PETG", + "eSUN PETG-Basic" + ] + ], + "E3001": [ + [ + "eSUN", + "ABS", + "eSUN ABS+" + ] + ], + "E4001": [ + [ + "eSUN", + "ASA", + "eSUN ASA+" + ] + ], + "E8001": [ + [ + "eSUN", + "PET", + "eSUN PET-Basic" + ] + ], + "EABSB00": [ + [ + "Elegoo", + "ABS", + "Elegoo ABS" + ] + ], + "EASAB00": [ + [ + "Elegoo", + "ASA", + "Elegoo ASA" + ] + ], + "EFL33": [ + [ + "Eryone", + "PP-CF", + "Eryone PP-CF" + ] + ], + "EFL40": [ + [ + "Eryone", + "PLA-CF", + "Eryone PLA-CF" + ] + ], + "EFL43": [ + [ + "Eryone", + "PETG-CF", + "Eryone PETG-CF" + ] + ], + "EFL71": [ + [ + "Eryone", + "PA", + "Eryone PA" + ] + ], + "EFL72": [ + [ + "Eryone", + "PA-CF", + "Eryone PA-CF" + ] + ], + "EFL73": [ + [ + "Eryone", + "PA-GF", + "Eryone PA-GF" + ] + ], + "EFL81": [ + [ + "Eryone", + "ABS-CF", + "Eryone ABS-CF" + ] + ], + "EFL82": [ + [ + "Eryone", + "ASA-CF", + "Eryone ASA-CF" + ] + ], + "EFL90": [ + [ + "Eryone", + "PLA", + "Eryone PLA" + ] + ], + "EFL91": [ + [ + "Eryone", + "ABS", + "Eryone ABS" + ] + ], + "EFL92": [ + [ + "Eryone", + "ASA", + "Eryone ASA" + ] + ], + "EFL93": [ + [ + "Eryone", + "PETG", + "Eryone PETG" + ] + ], + "EFL941": [ + [ + "Eryone", + "PLA Silk", + "Eryone Silk PLA" + ] + ], + "EFL95": [ + [ + "Eryone", + "TPU", + "Eryone TPU" + ] + ], + "EPAHTB00": [ + [ + "Elegoo", + "PA", + "Elegoo PAHT" + ] + ], + "EPCB00": [ + [ + "Elegoo", + "PC", + "Elegoo PC" + ] + ], + "EPETGB00": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG" + ] + ], + "EPLAB00": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA" + ] + ], + "ESN02": [ + [ + "eSUN", + "PLA-AERO", + "eSUN ePLA-LW" + ] + ], + "ESN03": [ + [ + "eSUN", + "PETG", + "eSUN PETG" + ] + ], + "ETPUB00": [ + [ + "Elegoo", + "TPU", + "Elegoo TPU" + ] + ], + "FDPLAST01": [ + [ + "FDplast", + "ABS", + "FDplast ABS" + ] + ], + "FDPLAST02": [ + [ + "FDplast", + "HIPS", + "FDplast HIPS" + ] + ], + "FDPLAST03": [ + [ + "FDplast", + "PETG", + "FDplast PETG" + ] + ], + "FDPLAST04": [ + [ + "FDplast", + "PLA", + "FDplast PLA" + ] + ], + "FDPLAST05": [ + [ + "FDplast", + "SBS", + "FDplast SBS" + ] + ], + "FDPLAST06": [ + [ + "FDplast", + "TPU", + "FDplast TPU" + ] + ], + "FFF01": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA" + ] + ], + "FFF02": [ + [ + "Flashforge", + "ABS", + "Flashforge ABS" + ] + ], + "FFF03": [ + [ + "Flashforge", + "PETG", + "Flashforge PETG" + ], + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "FFG01": [ + [ + "Generic", + "PLA", + "Flashforge Generic PLA" + ] + ], + "FILAR0001": [ + [ + "FilAr", + "PLA", + "FilAr PLA Bronce" + ] + ], + "FILAR0002": [ + [ + "FilAr", + "PLA", + "FilAr PLA Gris Plata" + ] + ], + "FILAR0003": [ + [ + "FilAr", + "PLA", + "FilAr PLA Cobre" + ] + ], + "FILAR0004": [ + [ + "FilAr", + "PLA", + "FilAr PLA Titanio" + ] + ], + "FILAR0005": [ + [ + "FilAr", + "PLA", + "FilAr PLA Tabaco" + ] + ], + "FILAR0006": [ + [ + "FilAr", + "PLA", + "FilAr PLA Cafe con Leche" + ] + ], + "FILAR0007": [ + [ + "FilAr", + "PLA", + "FilAr PLA Manteca" + ] + ], + "FILAR0008": [ + [ + "FilAr", + "PLA", + "FilAr PLA Marron Oxido" + ] + ], + "FILAR0009": [ + [ + "FilAr", + "PLA", + "FilAr PLA Carpincho" + ] + ], + "FILAR0010": [ + [ + "FilAr", + "PLA", + "FilAr PLA Rosa Amaranto" + ] + ], + "FILAR0011": [ + [ + "FilAr", + "PLA", + "FilAr PLA Rosa Flamenco" + ] + ], + "FILAR0012": [ + [ + "FilAr", + "PLA", + "FilAr PLA Piel" + ] + ], + "FILAR0013": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde FilAr" + ] + ], + "FILAR0014": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde Manzana" + ] + ], + "FILAR0015": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde Pixel" + ] + ], + "FILAR0016": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde Oliva" + ] + ], + "FILAR0017": [ + [ + "FilAr", + "PLA", + "FilAr PLA Blanco Antartida" + ] + ], + "FILAR0018": [ + [ + "FilAr", + "PLA", + "FilAr PLA Blanco Calido" + ] + ], + "FILAR0019": [ + [ + "FilAr", + "PLA", + "FilAr PLA Negro Azabache" + ] + ], + "FILAR0020": [ + [ + "FilAr", + "PLA", + "FilAr PLA Naranja Tigre" + ] + ], + "FILAR0021": [ + [ + "FilAr", + "PLA", + "FilAr PLA Rojo de Carreras" + ] + ], + "FILAR0022": [ + [ + "FilAr", + "PLA", + "FilAr PLA Amarillo Lirio" + ] + ], + "FILAR0023": [ + [ + "FilAr", + "PLA", + "FilAr PLA Violeta Jacaranda" + ] + ], + "FILAR0024": [ + [ + "FilAr", + "PLA", + "FilAr PLA Gris Pizarra" + ] + ], + "FILAR0025": [ + [ + "FilAr", + "PLA", + "FilAr PLA Gris Ceniza" + ] + ], + "FILAR0026": [ + [ + "FilAr", + "PLA", + "FilAr PLA Azul Francia" + ] + ], + "FILAR0027": [ + [ + "FilAr", + "PLA", + "FilAr PLA Celeste Cielo" + ] + ], + "FILAR0028": [ + [ + "FilAr", + "PLA", + "FilAr PLA Oro" + ] + ], + "FILAR0029": [ + [ + "FilAr", + "PLA", + "FilAr PLA Dorado" + ] + ], + "FILAR0030": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Amarillo" + ] + ], + "FILAR0031": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Azul" + ] + ], + "FILAR0032": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Beige" + ] + ], + "FILAR0033": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Blanco" + ] + ], + "FILAR0034": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Bordo" + ] + ], + "FILAR0035": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Celeste Cielo" + ] + ], + "FILAR0036": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Chocolate" + ] + ], + "FILAR0037": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Gris" + ] + ], + "FILAR0038": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Marron" + ] + ], + "FILAR0039": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Naranja" + ] + ], + "FILAR0040": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Negro" + ] + ], + "FILAR0041": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Piel" + ] + ], + "FILAR0042": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Rojo" + ] + ], + "FILAR0043": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Rosa" + ] + ], + "FILAR0044": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Uva" + ] + ], + "FILAR0045": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Verde" + ] + ], + "FILAR0046": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Violeta" + ] + ], + "FILAR0047": [ + [ + "FilAr", + "PETG", + "FilAr PETG Amarillo Lima" + ] + ], + "FILAR0048": [ + [ + "FilAr", + "PETG", + "FilAr PETG Amarillo Radiante" + ] + ], + "FILAR0049": [ + [ + "FilAr", + "PETG", + "FilAr PETG Azul Boreal" + ] + ], + "FILAR0050": [ + [ + "FilAr", + "PETG", + "FilAr PETG Azul Francia" + ] + ], + "FILAR0051": [ + [ + "FilAr", + "PETG", + "FilAr PETG Azul Imperial" + ] + ], + "FILAR0052": [ + [ + "FilAr", + "PETG", + "FilAr PETG Blanco Antartida" + ] + ], + "FILAR0053": [ + [ + "FilAr", + "PETG", + "FilAr PETG Cian" + ] + ], + "FILAR0054": [ + [ + "FilAr", + "PETG", + "FilAr PETG Coral" + ] + ], + "FILAR0055": [ + [ + "FilAr", + "PETG", + "FilAr PETG Cristal" + ] + ], + "FILAR0056": [ + [ + "FilAr", + "PETG", + "FilAr PETG Gris Ceniza" + ] + ], + "FILAR0057": [ + [ + "FilAr", + "PETG", + "FilAr PETG Gris Plata" + ] + ], + "FILAR0058": [ + [ + "FilAr", + "PETG", + "FilAr PETG Magenta" + ] + ], + "FILAR0059": [ + [ + "FilAr", + "PETG", + "FilAr PETG Negro Azabache" + ] + ], + "FILAR0060": [ + [ + "FilAr", + "PETG", + "FilAr PETG Rojo Carmesi" + ] + ], + "FILARB01": [ + [ + "FilAr", + "PLA", + "FilAr PLA" + ] + ], + "FILARB02": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate" + ] + ], + "FILARB03": [ + [ + "FilAr", + "PETG", + "FilAr PETG" + ] + ], + "FILL3D001": [ + [ + "FILL3D", + "PLA", + "FILL3D PLA Turbo" + ] + ], + "FILL3D002": [ + [ + "FILL3D", + "PLA", + "FILL3D PLA Basic" + ] + ], + "FILL3D003": [ + [ + "FILL3D", + "PETG", + "FILL3D PETG" + ] + ], + "FILL3D004": [ + [ + "FILL3D", + "PP", + "FILL3D PP" + ] + ], + "FILL3D005": [ + [ + "FILL3D", + "PP", + "FILL3D PPCF" + ] + ], + "FILL3D006": [ + [ + "FILL3D", + "PA", + "FILL3D PA" + ] + ], + "FILL3D007": [ + [ + "FILL3D", + "PETG-CF", + "FILL3D PETG CF" + ] + ], + "GABSB00": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "GASAB00": [ + [ + "Generic", + "ASA", + "Generic ASA" + ] + ], + "GFA00": [ + [ + "Afinia", + "PLA", + "Afinia PLA" + ], + [ + "Afinia", + "PLA", + "Afinia Value PLA" + ], + [ + "Orca Arena", + "PLA", + "Arena PLA Basic" + ], + [ + "Tiertime", + "PLA", + "Tiertime PLA" + ], + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Basic" + ] + ], + "GFA00_01": [ + [ + "Afinia", + "PLA", + "Afinia PLA" + ], + [ + "Tiertime", + "PLA", + "Tiertime PLA" + ] + ], + "GFA01": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Matte" + ], + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Matte" + ] + ], + "GFA02": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Metal" + ], + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Metal" + ] + ], + "GFA03": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Impact" + ] + ], + "GFA05": [ + [ + "Generic", + "PLA", + "Qidi Generic PLA Silk" + ], + [ + "Orca Arena", + "PLA", + "Arena PLA Silk" + ], + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Silk" + ] + ], + "GFA07": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Marble" + ], + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Marble" + ] + ], + "GFA08": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Sparkle" + ] + ], + "GFA09": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Tough" + ] + ], + "GFA16": [ + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Wood" + ] + ], + "GFA50": [ + [ + "Orca Arena", + "PLA-CF", + "Arena PLA-CF" + ], + [ + "Tiertime", + "PLA-CF", + "Tiertime PLA-CF" + ] + ], + "GFA50_01": [ + [ + "Tiertime", + "PLA-CF", + "Tiertime PLA-CF" + ] + ], + "GFA99": [ + [ + "Anycubic", + "ASA", + "Anycubic ASA" + ], + [ + "CoLiDo", + "PLA", + "CoLiDo Generic PLA" + ], + [ + "CoLiDo", + "PLA", + "CoLiDo PLA+" + ], + [ + "Generic", + "ASA", + "Anycubic ASA" + ] + ], + "GFASA": [ + [ + "Anycubic", + "ASA", + "Anycubic ASA" + ], + [ + "Generic", + "ASA", + "Anycubic ASA" + ] + ], + "GFB00": [ + [ + "Afinia", + "ABS", + "Afinia ABS" + ], + [ + "Afinia", + "ABS", + "Afinia ABS+" + ], + [ + "Afinia", + "ABS", + "Afinia Value ABS" + ], + [ + "Orca Arena", + "ABS", + "Arena ABS" + ], + [ + "Tiertime", + "ABS", + "Tiertime ABS" + ], + [ + "WonderMaker", + "ABS", + "WonderMaker ABS" + ] + ], + "GFB00_01": [ + [ + "Afinia", + "ABS", + "Afinia ABS" + ], + [ + "Tiertime", + "ABS", + "Tiertime ABS" + ] + ], + "GFB01": [ + [ + "Tiertime", + "ASA", + "Tiertime ASA" + ], + [ + "WonderMaker", + "ASA", + "WonderMaker ASA" + ] + ], + "GFB01_01": [ + [ + "Tiertime", + "ASA", + "Tiertime ASA" + ] + ], + "GFB98": [ + [ + "Generic", + "ASA", + "Anker Generic ASA" + ], + [ + "Generic", + "ASA", + "Anycubic Generic ASA" + ], + [ + "Generic", + "ASA", + "Artillery Generic ASA" + ], + [ + "Generic", + "ASA", + "Creality Generic ASA" + ], + [ + "Generic", + "ASA", + "FLSun Generic ASA" + ], + [ + "Generic", + "ASA", + "FLSun S1 ASA" + ], + [ + "Generic", + "ASA", + "FLSun T1 ASA" + ], + [ + "Generic", + "ASA", + "OrcaArena Generic ASA" + ], + [ + "Generic", + "ASA", + "RatRig Generic ASA" + ], + [ + "Generic", + "ASA", + "SecKit Generic ASA" + ], + [ + "Generic", + "ASA", + "Tiertime Generic ASA" + ], + [ + "Generic", + "ASA", + "Vzbot Generic ASA" + ], + [ + "Generic", + "ASA", + "fdm_filament_asa" + ] + ], + "GFB98_01": [ + [ + "Generic", + "ASA", + "Tiertime Generic ASA" + ] + ], + "GFB98_2": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "GFB98_3": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "GFB98_4": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "GFB98_5": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ], + [ + "Generic", + "ASA", + "Prusa Generic ASA HF" + ] + ], + "GFB98_6": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA HF" + ] + ], + "GFB98_7": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA HF" + ] + ], + "GFB99": [ + [ + "CoLiDo", + "ABS", + "CoLiDo ABS" + ], + [ + "CoLiDo", + "ABS", + "CoLiDo Generic ABS" + ], + [ + "FlyingBear", + "ABS", + "FlyingBear Generic ABS" + ], + [ + "Generic", + "ABS", + "Anker Generic ABS" + ], + [ + "Generic", + "ABS", + "Anycubic Generic ABS" + ], + [ + "Generic", + "ABS", + "Artillery Generic ABS" + ], + [ + "Generic", + "ABS", + "Chuanying ABS" + ], + [ + "Generic", + "ABS", + "Chuanying Generic ABS" + ], + [ + "Generic", + "ABS", + "Comgrow Generic ABS" + ], + [ + "Generic", + "ABS", + "Creality Generic ABS" + ], + [ + "Generic", + "ABS", + "FLSun Generic ABS" + ], + [ + "Generic", + "ABS", + "FLSun S1 ABS" + ], + [ + "Generic", + "ABS", + "FLSun T1 ABS" + ], + [ + "Generic", + "ABS", + "Flashforge ABS" + ], + [ + "Generic", + "ABS", + "Flashforge Generic ABS" + ], + [ + "Generic", + "ABS", + "Generic ABS" + ], + [ + "Generic", + "ABS", + "Lulzbot 2.85mm ABS" + ], + [ + "Generic", + "ABS", + "OrcaArena Generic ABS" + ], + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ], + [ + "Generic", + "ABS", + "Qidi Generic ABS" + ], + [ + "Generic", + "ABS", + "RatRig Generic ABS" + ], + [ + "Generic", + "ABS", + "SecKit Generic ABS" + ], + [ + "Generic", + "ABS", + "Tiertime Generic ABS" + ], + [ + "Generic", + "ABS", + "Vzbot Generic ABS" + ], + [ + "Generic", + "TPU", + "DeltaMaker Generic TPU" + ], + [ + "InfiMech", + "ABS", + "InfiMech Generic ABS" + ], + [ + "Volumic", + "ABS", + "Volumic ABS Ultra" + ], + [ + "Volumic", + "ABS", + "Volumic ABS Ultra (Performance)" + ] + ], + "GFB99_01": [ + [ + "Generic", + "ABS", + "Tiertime Generic ABS" + ] + ], + "GFB99_2": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "GFB99_3": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "GFB99_4": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "GFB99_5": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ], + [ + "Generic", + "ABS", + "Prusa Generic ABS HF" + ] + ], + "GFB99_6": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS HF" + ] + ], + "GFB99_7": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS HF" + ] + ], + "GFC00": [ + [ + "Orca Arena", + "PC", + "Arena PC" + ], + [ + "Tiertime", + "PC", + "Tiertime PC" + ] + ], + "GFC00_01": [ + [ + "Tiertime", + "PC", + "Tiertime PC" + ] + ], + "GFC98": [ + [ + "Generic", + "PC-CF", + "fdm_filament_pccf" + ] + ], + "GFC99": [ + [ + "FlyingBear", + "PC", + "FlyingBear Generic PC" + ], + [ + "Generic", + "PC", + "Anker Generic PC" + ], + [ + "Generic", + "PC", + "Anycubic Generic PC" + ], + [ + "Generic", + "PC", + "Creality Generic PC" + ], + [ + "Generic", + "PC", + "FLSun Generic PC" + ], + [ + "Generic", + "PC", + "Generic PC" + ], + [ + "Generic", + "PC", + "OrcaArena Generic PC" + ], + [ + "Generic", + "PC", + "Qidi Generic PC" + ], + [ + "Generic", + "PC", + "RatRig Generic PC" + ], + [ + "Generic", + "PC", + "SecKit Generic PC" + ], + [ + "Generic", + "PC", + "Tiertime Generic PC" + ], + [ + "Generic", + "PC", + "Vzbot Generic PC" + ], + [ + "Generic", + "PC", + "fdm_filament_pc" + ], + [ + "InfiMech", + "PC", + "InfiMech Generic PC" + ], + [ + "Volumic", + "PC", + "Volumic PC" + ], + [ + "Volumic", + "PC", + "Volumic PC (Performance)" + ] + ], + "GFC99_01": [ + [ + "Generic", + "PC", + "Tiertime Generic PC" + ] + ], + "GFC99_1": [ + [ + "Generic", + "PC", + "Prusa Generic PC" + ] + ], + "GFC99_2": [ + [ + "Generic", + "PC", + "Prusa Generic PC" + ] + ], + "GFC99_3": [ + [ + "Generic", + "PC", + "Prusa Generic PC" + ] + ], + "GFC99_4": [ + [ + "Generic", + "PC", + "Prusa Generic PC" + ], + [ + "Generic", + "PC", + "Prusa Generic PC HF" + ] + ], + "GFC99_5": [ + [ + "Generic", + "PC", + "Prusa Generic PC HF" + ] + ], + "GFC99_6": [ + [ + "Generic", + "PC", + "Prusa Generic PC HF" + ] + ], + "GFG00": [ + [ + "Orca Arena", + "PETG", + "Arena PETG Basic" + ], + [ + "Tiertime", + "PETG", + "Tiertime PETG" + ], + [ + "WonderMaker", + "PETG", + "WonderMaker PETG Basic" + ] + ], + "GFG00_01": [ + [ + "Tiertime", + "PETG", + "Tiertime PETG" + ] + ], + "GFG01": [ + [ + "Generic", + "PETG", + "re3D Greengate rPETG" + ], + [ + "re3D", + "PETG", + "re3D Greengate rPETG" + ] + ], + "GFG02": [ + [ + "re3D", + "PP", + "re3D rPP" + ] + ], + "GFG03": [ + [ + "re3D", + "PETG", + "re3D PETG" + ] + ], + "GFG50": [ + [ + "Orca Arena", + "PETG-CF", + "Arena PETG-CF" + ] + ], + "GFG60": [ + [ + "Polymaker", + "PETG", + "PolyLite PETG" + ] + ], + "GFG97": [ + [ + "Generic", + "PCTG", + "Tiertime Generic PCTG" + ] + ], + "GFG97-01": [ + [ + "Generic", + "PCTG", + "Tiertime Generic PCTG" + ] + ], + "GFG98": [ + [ + "Generic", + "PETG-CF", + "Anker Generic PETG-CF" + ], + [ + "Generic", + "PETG-CF", + "Qidi Generic PETG-CF" + ], + [ + "Generic", + "PETG-CF", + "Tiertime Generic PETG-CF" + ], + [ + "Orca Arena", + "PETG-CF", + "OrcaArena Generic PETG-CF" + ], + [ + "Volumic", + "PETG", + "Volumic PETG Ultra carbone" + ], + [ + "Volumic", + "PETG", + "Volumic PETG Ultra carbone (Performance)" + ] + ], + "GFG98_01": [ + [ + "Generic", + "PETG-CF", + "Tiertime Generic PETG-CF" + ] + ], + "GFG99": [ + [ + "CoLiDo", + "PETG", + "CoLiDo Generic PETG" + ], + [ + "CoLiDo", + "PETG", + "CoLiDo PETG" + ], + [ + "FlyingBear", + "PETG", + "FlyingBear Generic PETG" + ], + [ + "FlyingBear", + "PETG Basic", + "FlyingBear PETG Basic" + ], + [ + "Generic", + "PEEK", + "MM Generic PEEK" + ], + [ + "Generic", + "PETG", + "Anker Generic PETG" + ], + [ + "Generic", + "PETG", + "Anycubic Generic PETG" + ], + [ + "Generic", + "PETG", + "Artillery Generic PETG" + ], + [ + "Generic", + "PETG", + "C1 Generic PETG" + ], + [ + "Generic", + "PETG", + "Chuanying Generic PETG" + ], + [ + "Generic", + "PETG", + "Chuanying PETG" + ], + [ + "Generic", + "PETG", + "Comgrow Generic PETG" + ], + [ + "Generic", + "PETG", + "Creality Generic PETG" + ], + [ + "Generic", + "PETG", + "DeltaMaker Generic PETG" + ], + [ + "Generic", + "PETG", + "FLSun Generic PETG" + ], + [ + "Generic", + "PETG", + "FLSun S1 PETG" + ], + [ + "Generic", + "PETG", + "FLSun T1 PETG" + ], + [ + "Generic", + "PETG", + "Flashforge Generic PETG" + ], + [ + "Generic", + "PETG", + "Flashforge PETG" + ], + [ + "Generic", + "PETG", + "Generic PETG" + ], + [ + "Generic", + "PETG", + "Lulzbot 2.85mm PETG" + ], + [ + "Generic", + "PETG", + "OrcaArena Generic PETG" + ], + [ + "Generic", + "PETG", + "Qidi Generic PETG" + ], + [ + "Generic", + "PETG", + "RatRig Generic PETG" + ], + [ + "Generic", + "PETG", + "SecKit Generic PETG" + ], + [ + "Generic", + "PETG", + "Tiertime Generic PETG" + ], + [ + "Generic", + "PETG", + "Vzbot Generic PETG" + ], + [ + "Generic", + "PETG", + "Yumi Generic PETG" + ], + [ + "InfiMech", + "PETG", + "InfiMech Generic PETG" + ], + [ + "Volumic", + "PETG", + "Volumic PETG Ultra" + ], + [ + "Volumic", + "PETG", + "Volumic PETG Ultra (Performance)" + ], + [ + "Yumi", + "PETG", + "YUMI PETG" + ], + [ + "re3D", + "PC", + "re3D PC" + ] + ], + "GFG99_01": [ + [ + "Generic", + "PETG", + "Tiertime Generic PETG" + ] + ], + "GFG99_2": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "GFG99_3": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "GFG99_4": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "GFG99_5": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ], + [ + "Generic", + "PETG", + "Prusa Generic PETG HF" + ] + ], + "GFG99_6": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG HF" + ] + ], + "GFG99_7": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG HF" + ] + ], + "GFL00": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA" + ] + ], + "GFL01": [ + [ + "Polymaker", + "PLA", + "PolyTerra PLA" + ] + ], + "GFL06": [ + [ + "Polymaker", + "PETG", + "Fiberon PETG-ESD" + ] + ], + "GFL100": [ + [ + "Generic", + "PLA", + "Generic PLA" + ], + [ + "Generic", + "PLA", + "TwoTrees Generic HS PLA" + ] + ], + "GFL106": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "GFL108": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "GFL200": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "GFL204": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "GFL206": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "GFL208": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "GFL300": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GFL304": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GFL306": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GFL308": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GFL400": [ + [ + "Generic", + "PA", + "Generic PA" + ] + ], + "GFL404": [ + [ + "Generic", + "PA", + "Generic PA" + ] + ], + "GFL406": [ + [ + "Generic", + "PA", + "Generic PA" + ] + ], + "GFL408": [ + [ + "Generic", + "PA", + "Generic PA" + ] + ], + "GFL500": [ + [ + "Generic", + "ABS", + "Generic ABS HT" + ] + ], + "GFL504": [ + [ + "Generic", + "ABS", + "Generic ABS HT" + ] + ], + "GFL506": [ + [ + "Generic", + "ABS", + "Generic ABS HT" + ] + ], + "GFL508": [ + [ + "Generic", + "ABS", + "Generic ABS HT" + ] + ], + "GFL56": [ + [ + "Polymaker", + "PA-CF", + "Fiberon PA12-CF10" + ] + ], + "GFL57": [ + [ + "Polymaker", + "PA6-CF", + "Fiberon PA6-CF20" + ] + ], + "GFL62": [ + [ + "Polymaker", + "PLA", + "PolyLite CosPLA" + ] + ], + "GFL63": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Galaxy" + ] + ], + "GFL64": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Glow" + ] + ], + "GFL65": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Luminous" + ] + ], + "GFL66": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Neon" + ] + ], + "GFL67": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Starlight" + ] + ], + "GFL68": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Translucent" + ] + ], + "GFL69": [ + [ + "Polymaker", + "PLA", + "PolyTerra PLA Marble" + ] + ], + "GFL70": [ + [ + "Polymaker", + "PLA", + "PolyTerra PLA+" + ] + ], + "GFL71": [ + [ + "Polymaker", + "ASA", + "Fiberon ASA-CF08" + ] + ], + "GFL72": [ + [ + "Polymaker", + "PA-CF", + "Fiberon PA612-ESD" + ] + ], + "GFL73": [ + [ + "Polymaker", + "ABS", + "Fiberon PPS-GF20" + ] + ], + "GFL74": [ + [ + "Polymaker", + "PETG", + "PolyLite PETG Translucent" + ] + ], + "GFL75": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Pro Metallic" + ] + ], + "GFL76": [ + [ + "Polymaker", + "PETG", + "Polymaker PETG" + ] + ], + "GFL77": [ + [ + "Polymaker", + "PETG", + "Polymaker PETG Galaxy" + ] + ], + "GFL78": [ + [ + "Polymaker", + "PLA", + "Polymaker PLA" + ] + ], + "GFL79": [ + [ + "Polymaker", + "PLA", + "Polymaker PLA Pro" + ] + ], + "GFL80": [ + [ + "Polymaker", + "PLA", + "Polymaker PLA Pro Metallic" + ] + ], + "GFL94": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Slik" + ] + ], + "GFL95": [ + [ + "Generic", + "PLA", + "Anker Generic PLA+" + ], + [ + "Generic", + "PLA", + "Tiertime Generic PLA High Speed" + ] + ], + "GFL95_01": [ + [ + "Generic", + "PLA", + "Tiertime Generic PLA High Speed" + ] + ], + "GFL96": [ + [ + "Generic", + "PLA", + "Anker Generic PLA Silk" + ], + [ + "Generic", + "PLA", + "Tiertime Generic PLA Silk" + ] + ], + "GFL96_01": [ + [ + "Generic", + "PLA", + "Tiertime Generic PLA Silk" + ] + ], + "GFL97": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA SE" + ] + ], + "GFL98": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Glow" + ], + [ + "Generic", + "PLA-CF", + "Anker Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "Anycubic Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "Artillery Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "Creality Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "FLSun Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "OrcaArena Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "Qidi Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "RatRig Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "SecKit Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "Tiertime Generic PLA-CF" + ], + [ + "Generic", + "PLA-CF", + "Vzbot Generic PLA-CF" + ] + ], + "GFL98_01": [ + [ + "Generic", + "PLA-CF", + "Tiertime Generic PLA-CF" + ] + ], + "GFL98_1": [ + [ + "Generic", + "PLA-CF", + "Prusa Generic PLA-CF" + ] + ], + "GFL98_3": [ + [ + "Generic", + "PLA-CF", + "Prusa Generic PLA-CF" + ] + ], + "GFL98_4": [ + [ + "Generic", + "PLA-CF", + "Prusa Generic PLA-CF" + ] + ], + "GFL98_5": [ + [ + "Generic", + "PLA-CF", + "Prusa Generic PLA-CF" + ] + ], + "GFL99": [ + [ + "Co Print", + "PLA", + "CoPrint Generic PLA" + ], + [ + "FlyingBear", + "PLA", + "FlyingBear Generic PLA" + ], + [ + "Generic", + "ASA", + "Flashforge ASA" + ], + [ + "Generic", + "PLA", + "Anker Generic PLA" + ], + [ + "Generic", + "PLA", + "Anycubic Generic PLA" + ], + [ + "Generic", + "PLA", + "Artillery Generic PLA" + ], + [ + "Generic", + "PLA", + "C1 Generic PLA" + ], + [ + "Generic", + "PLA", + "Chuanying Generic PLA" + ], + [ + "Generic", + "PLA", + "Comgrow Generic PLA" + ], + [ + "Generic", + "PLA", + "Comgrow T300 PLA" + ], + [ + "Generic", + "PLA", + "Creality Generic PLA" + ], + [ + "Generic", + "PLA", + "DeltaMaker Generic PLA" + ], + [ + "Generic", + "PLA", + "Dremel Generic PLA" + ], + [ + "Generic", + "PLA", + "FLSun Generic PLA" + ], + [ + "Generic", + "PLA", + "FLSun S1 PLA Generic" + ], + [ + "Generic", + "PLA", + "FLSun T1 PLA Generic" + ], + [ + "Generic", + "PLA", + "Flashforge PLA-SILK" + ], + [ + "Generic", + "PLA", + "Generic PLA" + ], + [ + "Generic", + "PLA", + "Generic PLA High Speed" + ], + [ + "Generic", + "PLA", + "Lulzbot 2.85mm PLA" + ], + [ + "Generic", + "PLA", + "OrcaArena Generic PLA" + ], + [ + "Generic", + "PLA", + "Peopoly Generic PLA" + ], + [ + "Generic", + "PLA", + "Phrozen PLA" + ], + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ], + [ + "Generic", + "PLA", + "Qidi Generic PLA" + ], + [ + "Generic", + "PLA", + "RatRig Generic PLA" + ], + [ + "Generic", + "PLA", + "SecKit Generic PLA" + ], + [ + "Generic", + "PLA", + "Sovol SV07 PLA" + ], + [ + "Generic", + "PLA", + "Tiertime Generic PLA" + ], + [ + "Generic", + "PLA", + "Vzbot Generic PLA" + ], + [ + "Generic", + "PLA", + "Yumi Generic PLA" + ], + [ + "InfiMech", + "PLA", + "InfiMech Generic PLA" + ], + [ + "Volumic", + "PLA", + "Volumic PLA Ultra" + ], + [ + "Volumic", + "PLA", + "Volumic PLA Ultra (Performance)" + ], + [ + "re3D", + "PLA", + "re3D PLA" + ] + ], + "GFL99_01": [ + [ + "Generic", + "PLA", + "Tiertime Generic PLA" + ] + ], + "GFL99_2": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "GFL99_3": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "GFL99_4": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "GFL99_5": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ], + [ + "Generic", + "PLA", + "Prusa Generic PLA HF" + ] + ], + "GFL99_6": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA HF" + ] + ], + "GFL99_7": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA HF" + ] + ], + "GFLLK10PETG": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GFLLK10PLA": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "GFLLK10PPETG": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GFLLK10PPLA": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "GFN03": [ + [ + "Orca Arena", + "PA-CF", + "Arena PA-CF" + ] + ], + "GFN04": [ + [ + "Orca Arena", + "PA-CF", + "Arena PAHT-CF" + ] + ], + "GFN05": [ + [ + "Tiertime", + "PA6-CF", + "Tiertime PA6-CF" + ] + ], + "GFN05_01": [ + [ + "Tiertime", + "PA6-CF", + "Tiertime PA6-CF" + ] + ], + "GFN96": [ + [ + "Generic", + "PPA-GF", + "Tiertime Generic PPA-GF" + ] + ], + "GFN96_01": [ + [ + "Generic", + "PPA-GF", + "Tiertime Generic PPA-GF" + ] + ], + "GFN97": [ + [ + "Generic", + "PPA-CF", + "Tiertime Generic PPA-CF" + ] + ], + "GFN97_01": [ + [ + "Generic", + "PPA-CF", + "Tiertime Generic PPA-CF" + ] + ], + "GFN98": [ + [ + "FlyingBear", + "PA-CF", + "FlyingBear Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "Anker Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "Anycubic Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "Creality Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "FLSun Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "OrcaArena Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "Qidi Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "RatRig Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "SecKit Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "Tiertime Generic PA-CF" + ], + [ + "Generic", + "PA-CF", + "Vzbot Generic PA-CF" + ], + [ + "Generic", + "PA11-CF", + "fdm_filament_pa11cf" + ], + [ + "InfiMech", + "PA-CF", + "InfiMech Generic PA-CF" + ] + ], + "GFN98_02": [ + [ + "Generic", + "PA-CF", + "Tiertime Generic PA-CF" + ] + ], + "GFN98_1": [ + [ + "Generic", + "PA-CF", + "Prusa Generic PA-CF" + ] + ], + "GFN98_2": [ + [ + "Generic", + "PA-CF", + "Prusa Generic PA-CF" + ] + ], + "GFN98_3": [ + [ + "Generic", + "PA-CF", + "Prusa Generic PA-CF" + ] + ], + "GFN98_4": [ + [ + "Generic", + "PA-CF", + "Prusa Generic PA-CF" + ] + ], + "GFN99": [ + [ + "Generic", + "PA", + "Anker Generic PA" + ], + [ + "Generic", + "PA", + "Anycubic Generic PA" + ], + [ + "Generic", + "PA", + "FLSun Generic PA" + ], + [ + "Generic", + "PA", + "OrcaArena Generic PA" + ], + [ + "Generic", + "PA", + "Prusa Generic PA" + ], + [ + "Generic", + "PA", + "Qidi Generic PA" + ], + [ + "Generic", + "PA", + "RatRig Generic PA" + ], + [ + "Generic", + "PA", + "SecKit Generic PA" + ], + [ + "Generic", + "PA", + "Tiertime Generic PA" + ], + [ + "Generic", + "PA", + "Vzbot Generic PA" + ], + [ + "Volumic", + "PA", + "Volumic NYLON Ultra" + ], + [ + "Volumic", + "PA", + "Volumic NYLON Ultra (Performance)" + ] + ], + "GFN99_01": [ + [ + "Generic", + "PA", + "Tiertime Generic PA" + ] + ], + "GFN99_1": [ + [ + "Generic", + "PA", + "Prusa Generic PA" + ] + ], + "GFN99_2": [ + [ + "Generic", + "PA", + "Prusa Generic PA" + ] + ], + "GFN99_3": [ + [ + "Generic", + "PA", + "Prusa Generic PA" + ] + ], + "GFN99_4": [ + [ + "Generic", + "PA", + "Prusa Generic PA" + ] + ], + "GFOT001": [ + [ + "Overture", + "PLA", + "Overture PLA Pro" + ] + ], + "GFOT002": [ + [ + "Overture", + "PLA", + "Overture Silk PLA" + ] + ], + "GFOT003": [ + [ + "Overture", + "PLA", + "Overture Easy PLA" + ] + ], + "GFOT004": [ + [ + "Overture", + "PLA", + "Overture Rock PLA" + ] + ], + "GFOT005": [ + [ + "Overture", + "PLA", + "Overture Super PLA+" + ] + ], + "GFOT006": [ + [ + "Overture", + "PLA", + "Overture Air PLA" + ] + ], + "GFOT008": [ + [ + "Overture", + "TPU", + "Overture TPU" + ] + ], + "GFOT009": [ + [ + "Overture", + "ASA", + "Overture ASA" + ] + ], + "GFP95": [ + [ + "Generic", + "PP-GF", + "Tiertime Generic PP-GF" + ] + ], + "GFP95_01": [ + [ + "Generic", + "PP-GF", + "Tiertime Generic PP-GF" + ] + ], + "GFP96": [ + [ + "Generic", + "PP-CF", + "Tiertime Generic PP-CF" + ] + ], + "GFP96_01": [ + [ + "Generic", + "PP-CF", + "Tiertime Generic PP-CF" + ] + ], + "GFP97": [ + [ + "Generic", + "PP", + "Tiertime Generic PP" + ] + ], + "GFP97_01": [ + [ + "Generic", + "PP", + "Tiertime Generic PP" + ] + ], + "GFP98": [ + [ + "Generic", + "PE-CF", + "Tiertime Generic PE-CF" + ] + ], + "GFP98_01": [ + [ + "Generic", + "PE-CF", + "Tiertime Generic PE-CF" + ] + ], + "GFP99": [ + [ + "Generic", + "PE", + "Tiertime Generic PE" + ] + ], + "GFP99_01": [ + [ + "Generic", + "PE", + "Tiertime Generic PE" + ] + ], + "GFPA": [ + [ + "Anycubic", + "PA", + "Anycubic PA" + ] + ], + "GFPA6-CF": [ + [ + "Anycubic", + "PA6-CF", + "Anycubic PA6-CF" + ] + ], + "GFPAHT-CF": [ + [ + "Anycubic", + "PAHT-CF", + "Anycubic PAHT-CF" + ] + ], + "GFPC": [ + [ + "Anycubic", + "PC", + "Anycubic PC" + ] + ], + "GFPC-CF": [ + [ + "Anycubic", + "PC-CF", + "Anycubic PC-CF" + ] + ], + "GFPC-GF": [ + [ + "Anycubic", + "PC-GF", + "Anycubic PC-GF" + ] + ], + "GFPEBA": [ + [ + "Anycubic", + "PEBA", + "Anycubic PEBA" + ] + ], + "GFPET-CF": [ + [ + "Anycubic", + "PET-CF", + "Anycubic PET-CF" + ] + ], + "GFPETG": [ + [ + "Anycubic", + "PETG", + "Generic PETG" + ], + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GFPETG-1": [ + [ + "Generic", + "PETG", + "Peopoly Generic PETG" + ] + ], + "GFPETG-CF": [ + [ + "Anycubic", + "PETG-CF", + "Anycubic PETG-CF" + ] + ], + "GFPLA Glow": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Glow" + ] + ], + "GFPLA Translucent": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Translucent" + ] + ], + "GFPLA-CF": [ + [ + "Anycubic", + "PLA-CF", + "Anycubic PLA-CF" + ] + ], + "GFPM001": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA" + ] + ], + "GFPM002": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Matte" + ] + ], + "GFPM003": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Marble" + ] + ], + "GFPM004": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Silk" + ] + ], + "GFPM005": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Satin" + ] + ], + "GFPM006": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Translucent" + ] + ], + "GFPM007": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Galaxy" + ] + ], + "GFPM008": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Celestial" + ] + ], + "GFPM009": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Starlight" + ] + ], + "GFPM010": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Glow" + ] + ], + "GFPM011": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Luminous" + ] + ], + "GFPM012": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Metallic" + ] + ], + "GFPM013": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Neon" + ] + ], + "GFPM014": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA UV Shift" + ] + ], + "GFPM015": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Temp Shift" + ] + ], + "GFPM016": [ + [ + "Polymaker", + "PLA", + "Panchroma CoPE" + ] + ], + "GFPM017": [ + [ + "Polymaker", + "PLA", + "Polymaker HT-PLA" + ] + ], + "GFPM018": [ + [ + "Polymaker", + "PLA", + "Polymaker HT-PLA-GF" + ] + ], + "GFPM019": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Pro" + ] + ], + "GFPVA": [ + [ + "Anycubic", + "PVA", + "Anycubic PVA" + ] + ], + "GFR98": [ + [ + "Generic", + "PHA", + "Tiertime Generic PHA" + ] + ], + "GFR98_01": [ + [ + "Generic", + "PHA", + "Tiertime Generic PHA" + ] + ], + "GFR99": [ + [ + "Generic", + "EVA", + "Tiertime Generic EVA" + ] + ], + "GFR99_01": [ + [ + "Generic", + "EVA", + "Tiertime Generic EVA" + ] + ], + "GFRH01": [ + [ + "Generic", + "ABS", + "fdm_filament_abs" + ] + ], + "GFRH02": [ + [ + "Generic", + "ASA", + "fdm_filament_asa" + ] + ], + "GFRH03": [ + [ + "Generic", + "PETG", + "fdm_filament_petg" + ] + ], + "GFRH04": [ + [ + "Generic", + "PLA", + "fdm_filament_pla" + ] + ], + "GFRH05": [ + [ + "Generic", + "TPU", + "fdm_filament_tpu" + ] + ], + "GFRH06": [ + [ + "Generic", + "PC-CF", + "fdm_filament_pccf" + ] + ], + "GFS00": [ + [ + "Orca Arena", + "PLA", + "Arena Support W" + ] + ], + "GFS01": [ + [ + "Orca Arena", + "PA", + "Arena Support G" + ] + ], + "GFS04": [ + [ + "Tiertime", + "PVA", + "Tiertime PVA" + ], + [ + "WonderMaker", + "PVA", + "WonderMaker PVA" + ] + ], + "GFS04_01": [ + [ + "Tiertime", + "PVA", + "Tiertime PVA" + ] + ], + "GFS97": [ + [ + "Generic", + "BVOH", + "Tiertime Generic BVOH" + ] + ], + "GFS97_01": [ + [ + "Generic", + "BVOH", + "Tiertime Generic BVOH" + ] + ], + "GFS98": [ + [ + "Generic", + "HIPS", + "Tiertime Generic HIPS" + ], + [ + "Generic", + "PVB", + "fdm_filament_pvb" + ] + ], + "GFS98_01": [ + [ + "Generic", + "HIPS", + "Tiertime Generic HIPS" + ] + ], + "GFS99": [ + [ + "Generic", + "PVA", + "Anker Generic PVA" + ], + [ + "Generic", + "PVA", + "Anycubic Generic PVA" + ], + [ + "Generic", + "PVA", + "FLSun Generic PVA" + ], + [ + "Generic", + "PVA", + "Generic PVA" + ], + [ + "Generic", + "PVA", + "OrcaArena Generic PVA" + ], + [ + "Generic", + "PVA", + "Prusa Generic PVA" + ], + [ + "Generic", + "PVA", + "Qidi Generic PVA" + ], + [ + "Generic", + "PVA", + "RatRig Generic PVA" + ], + [ + "Generic", + "PVA", + "SecKit Generic PVA" + ], + [ + "Generic", + "PVA", + "Tiertime Generic PVA" + ], + [ + "Generic", + "PVA", + "Vzbot Generic PVA" + ], + [ + "Volumic", + "PVA", + "Volumic PVA" + ], + [ + "Volumic", + "PVA", + "Volumic PVA-BVOH (Performance)" + ] + ], + "GFS99_01": [ + [ + "Generic", + "PVA", + "Tiertime Generic PVA" + ] + ], + "GFS99_1": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA" + ] + ], + "GFS99_2": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA" + ] + ], + "GFS99_3": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA" + ] + ], + "GFS99_4": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA" + ], + [ + "Generic", + "PVA", + "Prusa Generic PVA HF" + ] + ], + "GFS99_5": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA HF" + ] + ], + "GFS99_6": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA HF" + ] + ], + "GFSEP001": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Premium" + ] + ], + "GFSEP002": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Matte" + ] + ], + "GFSEP003": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Silk" + ] + ], + "GFSEP004": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Neon" + ] + ], + "GFSEP005": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA High Speed" + ] + ], + "GFSEP006": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA INGEO 850" + ] + ], + "GFSEP007": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA INGEO 870" + ] + ], + "GFSEP008": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Antibacterial" + ] + ], + "GFSEP009": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Transition" + ] + ], + "GFSEP010": [ + [ + "Eolas Prints", + "PETG", + "Eolas Prints PETG" + ] + ], + "GFSEP011": [ + [ + "Eolas Prints", + "PETG", + "Eolas Prints PETG UV Resistant" + ] + ], + "GFSEP012": [ + [ + "Eolas Prints", + "PETG", + "Eolas Prints PETG Transition" + ] + ], + "GFSEP013": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU Flex 93A" + ] + ], + "GFSEP014": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU Flex D53" + ] + ], + "GFSEP015": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU D60 UV Resistant" + ] + ], + "GFSEP016": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU Transition" + ] + ], + "GFSEP017": [ + [ + "Eolas Prints", + "ABS", + "Eolas Prints ABS" + ] + ], + "GFSEP018": [ + [ + "Eolas Prints", + "ASA", + "Eolas Prints ASA" + ] + ], + "GFSL99": [ + [ + "Generic", + "ABS", + "Peopoly Generic ABS" + ] + ], + "GFSNL02": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA Matte" + ] + ], + "GFSNL03": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA+" + ] + ], + "GFSNL04": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA+ 2.0" + ] + ], + "GFSNL05": [ + [ + "SUNLU", + "PLA", + "SUNLU Silk PLA+" + ] + ], + "GFSNL06": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA Marble" + ] + ], + "GFSNL07": [ + [ + "SUNLU", + "PLA", + "SUNLU Wood PLA" + ] + ], + "GFSNL08": [ + [ + "SUNLU", + "PETG", + "SUNLU PETG" + ] + ], + "GFT01": [ + [ + "Orca Arena", + "PET-CF", + "Arena PET-CF" + ], + [ + "Tiertime", + "PET-CF", + "Tiertime PET-CF" + ], + [ + "WonderMaker", + "PET-CF", + "WonderMaker PET-CF" + ] + ], + "GFT01_01": [ + [ + "Tiertime", + "PET-CF", + "Tiertime PET-CF" + ] + ], + "GFT02": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "GFT97": [ + [ + "Generic", + "PPS", + "Tiertime Generic PPS" + ] + ], + "GFT97_01": [ + [ + "Generic", + "PPS", + "Tiertime Generic PPS" + ] + ], + "GFT98": [ + [ + "Generic", + "PPS-CF", + "Tiertime Generic PPS-CF" + ] + ], + "GFT98_01": [ + [ + "Generic", + "PPS-CF", + "Tiertime Generic PPS-CF" + ] + ], + "GFTPU 95A": [ + [ + "Anycubic", + "TPU", + "Anycubic TPU 95A" + ] + ], + "GFTPU for ACE": [ + [ + "Anycubic", + "TPU", + "Anycubic TPU for ACE" + ] + ], + "GFU01": [ + [ + "Afinia", + "TPU", + "Afinia TPU" + ], + [ + "Orca Arena", + "TPU", + "Arena TPU 95A" + ], + [ + "Tiertime", + "TPU", + "Tiertime TPU 95A" + ], + [ + "WonderMaker", + "TPU", + "WonderMaker TPU 95A" + ] + ], + "GFU01_01": [ + [ + "Afinia", + "TPU", + "Afinia TPU" + ], + [ + "Tiertime", + "TPU", + "Tiertime TPU 95A" + ] + ], + "GFU99": [ + [ + "CoLiDo", + "TPU", + "CoLiDo Generic TPU" + ], + [ + "FlyingBear", + "TPU", + "FlyingBear Generic TPU" + ], + [ + "FlyingBear", + "TPU", + "FlyingBear TPU Basic" + ], + [ + "Generic", + "FLEX", + "fdm_filament_flex" + ], + [ + "Generic", + "TPU", + "Anker Generic TPU" + ], + [ + "Generic", + "TPU", + "Anycubic Generic TPU" + ], + [ + "Generic", + "TPU", + "Artillery Generic TPU" + ], + [ + "Generic", + "TPU", + "Creality Generic TPU" + ], + [ + "Generic", + "TPU", + "FLSun Generic TPU" + ], + [ + "Generic", + "TPU", + "FLSun S1 TPU" + ], + [ + "Generic", + "TPU", + "FLSun T1 TPU" + ], + [ + "Generic", + "TPU", + "Generic TPU" + ], + [ + "Generic", + "TPU", + "OrcaArena Generic TPU" + ], + [ + "Generic", + "TPU", + "Prusa Generic TPU" + ], + [ + "Generic", + "TPU", + "Qidi Generic TPU" + ], + [ + "Generic", + "TPU", + "RatRig Generic TPU" + ], + [ + "Generic", + "TPU", + "SecKit Generic TPU" + ], + [ + "Generic", + "TPU", + "Tiertime Generic TPU" + ], + [ + "Generic", + "TPU", + "TwoTrees Generic 95A TPU" + ], + [ + "Generic", + "TPU", + "Vzbot Generic TPU" + ], + [ + "InfiMech", + "TPU", + "InfiMech Generic TPU" + ], + [ + "InfiMech", + "TPU", + "InfiMech TPU Basic" + ], + [ + "Volumic", + "TPU", + "Volumic FLEX93 Ultra" + ], + [ + "Volumic", + "TPU", + "Volumic FLEX93 Ultra (Performance)" + ], + [ + "Yumi", + "PLA", + "YUMI PLA Bowden" + ], + [ + "Yumi", + "PLA", + "YUMI PLA Direct Drive" + ] + ], + "GFU99_01": [ + [ + "Generic", + "TPU", + "Tiertime Generic TPU" + ] + ], + "GFU99_2": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU" + ] + ], + "GFU99_3": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU HF" + ] + ], + "GPAB00": [ + [ + "Generic", + "PA", + "Generic PA" + ] + ], + "GPCB00": [ + [ + "Generic", + "PC", + "Generic PC" + ] + ], + "GPETB00": [ + [ + "Generic", + "PET", + "Generic PET" + ] + ], + "GPETGB00": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "GPLAB00": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "Generic ABS @E3NG v1.2S": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "Generic ABS @MK4S": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Generic ABS @MK4S 0.6": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Generic ABS @MK4S 0.8": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Generic ABS @MK4S HF0.4": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Generic ABS @MK4S HF0.5": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Generic ABS @MK4S HF0.6": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Generic ABS @MK4S HF0.8": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Generic ASA @E3NG v1.2S": [ + [ + "Generic", + "ASA", + "Generic ASA" + ] + ], + "Generic FLEX @MK4S": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU" + ] + ], + "Generic FLEX @MK4S 0.6": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU" + ] + ], + "Generic FLEX @MK4S 0.8": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU" + ] + ], + "Generic PCCF @E3NG v1.2S": [ + [ + "Generic", + "PC-CF", + "Generic PCCF" + ] + ], + "Generic PETG @E3NG v1.2S": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "Generic PETG @MK4S": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Generic PETG @MK4S 0.6": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Generic PETG @MK4S 0.8": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Generic PETG @MK4S HF0.4": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Generic PETG @MK4S HF0.5": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Generic PETG @MK4S HF0.6": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Generic PETG @MK4S HF0.8": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Generic PLA @E3NG v1.2S": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "Generic PLA @MK4S": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Generic PLA @MK4S 0.6": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Generic PLA @MK4S 0.8": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Generic PLA @MK4S HF0.4": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Generic PLA @MK4S HF0.5": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Generic PLA @MK4S HF0.6": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Generic PLA @MK4S HF0.8": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Generic PLA Silk @MK4S": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA Silk" + ] + ], + "Generic PLA Silk @MK4S 0.6": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA Silk" + ] + ], + "Generic PLA Silk @MK4S 0.8": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA Silk" + ] + ], + "Generic TPU @E3NG v1.2S": [ + [ + "Generic", + "TPU", + "Generic TPU" + ] + ], + "IQM1": [ + [ + "iQ Materials", + "PACF Pro", + "Fiberthree PACF Pro P1" + ] + ], + "IQM1011": [ + [ + "iQ Materials", + "VXL90 Xioneer", + "VXL90 TiQ2 P2" + ] + ], + "IQM2": [ + [ + "iQ Materials", + "ABS Material4Print Natur", + "Material4Print ABS Natur P1" + ] + ], + "IQM3": [ + [ + "iQ Materials", + "PETG Polymax", + "Polymaker PETG Polymax black P1" + ] + ], + "IQM7": [ + [ + "iQ Materials", + "PACF Pro", + "Fiberthree PACF Pro P2" + ] + ], + "LHF_abs": [ + [ + "LH Stinger", + "ASA", + "LHS ABS" + ] + ], + "LHF_asa": [ + [ + "LH Stinger", + "ASA", + "LHS ASA" + ] + ], + "LHF_ftpuf": [ + [ + "LH Stinger", + "TPU", + "LHS TPU Foamy 78A" + ] + ], + "LHF_pccf": [ + [ + "LH Stinger", + "PC", + "LHS PC CF" + ] + ], + "LHF_pctg": [ + [ + "LH Stinger", + "PCTG", + "LHS PCTG" + ] + ], + "LHF_petg": [ + [ + "LH Stinger", + "PETG", + "LHS PETG" + ] + ], + "LHF_pla": [ + [ + "LH Stinger", + "PLA", + "LHS PLA" + ] + ], + "LHF_ptpu_pl": [ + [ + "LH Stinger", + "TPU", + "LHS TPU" + ] + ], + "NIT01": [ + [ + "NIT", + "ABS", + "NIT ABS" + ] + ], + "NIT02": [ + [ + "NIT", + "PLA", + "NIT PLA" + ] + ], + "NIT03": [ + [ + "NIT", + "PETG", + "NIT PETG" + ] + ], + "OEABSB00": [ + [ + "Elegoo", + "ABS", + "Elegoo ABS" + ] + ], + "OEASAB00": [ + [ + "Elegoo", + "ASA", + "Elegoo ASA" + ] + ], + "OEPAHTB0": [ + [ + "Elegoo", + "PA", + "Elegoo PAHT" + ] + ], + "OEPCB00": [ + [ + "Elegoo", + "PC", + "Elegoo PC" + ] + ], + "OEPETGB0": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG" + ] + ], + "OEPLAB00": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA" + ] + ], + "OETPUB00": [ + [ + "Elegoo", + "TPU", + "Elegoo TPU" + ] + ], + "OF09vOcG": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Galaxy" + ] + ], + "OF0Ee2jQ": [ + [ + "Snapmaker", + "TPU", + "Snapmaker Dual TPU High-Flow" + ] + ], + "OF0M6QAQ": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Galaxy" + ] + ], + "OF0SyJhk": [ + [ + "FusRock", + "PA6-CF", + "Flashforge PA6-CF" + ] + ], + "OF0TODnN": [ + [ + "Generic", + "PET-CF", + "Generic PET-CF" + ] + ], + "OF0TjJ0G": [ + [ + "QIDI", + "ASA-AERO", + "Qidi ASA-Aero" + ] + ], + "OF0UbONm": [ + [ + "Generic", + "S-PAHT", + "FusRock S-PAHT" + ] + ], + "OF0VEdLB": [ + [ + "Cubicon", + "PETG", + "Cubicon PETG" + ] + ], + "OF0Y5MLd": [ + [ + "QIDI", + "PETG-GF", + "QIDI PETG-GF" + ] + ], + "OF0wk0Pk": [ + [ + "Generic", + "PLA", + "Flashforge PLA Pro" + ] + ], + "OF0z1XpN": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Silk" + ] + ], + "OF102WKM": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG PRO" + ] + ], + "OF17cONC": [ + [ + "Polymaker", + "PLA", + "PolyTerra Dual PLA" + ] + ], + "OF1Zypyy": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough" + ] + ], + "OF22AxCm": [ + [ + "Generic", + "PETG", + "Polymaker PETG" + ] + ], + "OF2HQqTC": [ + [ + "Cubicon", + "PLA", + "Cubicon PLA+" + ] + ], + "OF2Psxdc": [ + [ + "Co Print", + "TPU", + "CoPrint Generic TPU" + ] + ], + "OF2UFmOo": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA" + ] + ], + "OF2tvNYA": [ + [ + "Generic", + "PLA", + "Sovol Zero PLA Silk" + ] + ], + "OF38Hyk4": [ + [ + "Generic", + "PETG", + "Flashforge PETG Pro" + ] + ], + "OF3GKs2i": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Matte" + ] + ], + "OF3XeEuV": [ + [ + "QIDI", + "PET-GF", + "QIDI PET-GF" + ] + ], + "OF3YOOOs": [ + [ + "Generic", + "PETG-CF", + "Chuanying Generic PETG-CF10" + ] + ], + "OF3arl18": [ + [ + "Elegoo", + "PETG", + "Elegoo Rapid PETG" + ] + ], + "OF41QVDH": [ + [ + "Generic", + "PLA", + "Flashforge Generic PLA-Silk" + ] + ], + "OF43idK2": [ + [ + "Generic", + "PLA", + "Creality Generic PLA Matte" + ] + ], + "OF48G7He": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough 0.8 nozzle" + ] + ], + "OF4RKeng": [ + [ + "Generic", + "ASA", + "Flashforge Generic ASA" + ] + ], + "OF4fgpse": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Marble" + ] + ], + "OF4gzzE4": [ + [ + "QIDI", + "PET-CF", + "QIDI PET-CF" + ] + ], + "OF4jILJA": [ + [ + "FlyingBear", + "PC", + "FlyingBear PC" + ] + ], + "OF4m9A5w": [ + [ + "Generic", + "HIPS", + "Flashforge Generic HIPS" + ] + ], + "OF50NUZI": [ + [ + "FlyingBear", + "PLA", + "FlyingBear PLA Basic" + ] + ], + "OF57IbZT": [ + [ + "Artillery", + "PLA Basic", + "Artillery PLA Basic" + ] + ], + "OF5Bmdtg": [ + [ + "Generic", + "ABS", + "Sovol SV06 Plus ACE ABS" + ] + ], + "OF5J2axC": [ + [ + "Generic", + "PLA", + "Sovol Zero PLA Basic" + ] + ], + "OF5T1Y9R": [ + [ + "Generic", + "ABS", + "Flashforge ABS Basic" + ] + ], + "OF5UUaUM": [ + [ + "Generic", + "PLA", + "Qidi Generic PLA High Speed" + ] + ], + "OF5Ugv12": [ + [ + "Other", + "PLA", + "Other PLA" + ] + ], + "OF5kwfZu": [ + [ + "FusRock", + "PA-CF", + "FusRock Generic NexPA-CF25" + ] + ], + "OF60Lmeq": [ + [ + "Generic", + "PLA", + "Flashforge PLA Matte" + ] + ], + "OF6EOy1A": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG" + ] + ], + "OF6FM5F7": [ + [ + "Generic", + "PAHT", + "FusRock PAHT" + ] + ], + "OF6Mxzsg": [ + [ + "Generic", + "TPU", + "Generic TPU" + ] + ], + "OF6SEkeJ": [ + [ + "Generic", + "PET-CF", + "FusRock PET-CF" + ] + ], + "OF6XIeUW": [ + [ + "Generic", + "PLA-CF", + "Generic PLA-CF10" + ] + ], + "OF6XuVQE": [ + [ + "Cubicon", + "ABS", + "Cubicon ABS" + ] + ], + "OF70DKqH": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPE" + ] + ], + "OF79FFkO": [ + [ + "Elegoo", + "PC", + "Elegoo PC-FR" + ] + ], + "OF7M9vy4": [ + [ + "Generic", + "PLA", + "RatRig BigNozzle PLA" + ] + ], + "OF7cv1Ub": [ + [ + "QIDI", + "PLA-CF", + "QIDI PLA-CF" + ] + ], + "OF7f0eUZ": [ + [ + "Volumic", + "ASA", + "Volumic ASA Ultra" + ] + ], + "OF7tgL9c": [ + [ + "Generic", + "ASA", + "Chuanying Generic ASA" + ] + ], + "OF8HQmJD": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Sparkle" + ] + ], + "OF8WvPVL": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido 0.8 nozzle" + ] + ], + "OF9RZyBz": [ + [ + "Polymaker", + "PA", + "Polymaker Generic S1" + ] + ], + "OF9qvJxV": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Translucent2" + ] + ], + "OF9sr3Vn": [ + [ + "Generic", + "PLA", + "Flashforge PLA Sparkle" + ] + ], + "OF9tjFbj": [ + [ + "Peopoly", + "PLA", + "Peopoly Lancer PLA-C" + ] + ], + "OF9vnvM8": [ + [ + "Artillery", + "PETG-CF", + "Artillery PETG-CF" + ] + ], + "OFAEqlWa": [ + [ + "Generic", + "PLA", + "Flashforge Generic PLA-SILK" + ] + ], + "OFAGqTQG": [ + [ + "Volumic", + "PP", + "Volumic PP Ultra" + ] + ], + "OFAGrVjP": [ + [ + "Generic", + "PLA", + "Flashforge PLA Silk" + ] + ], + "OFAHagT9": [ + [ + "Elegoo", + "PLA", + "Elegoo Rapid PLA+" + ] + ], + "OFAK2XjZ": [ + [ + "Other", + "ABS", + "Other ABS" + ] + ], + "OFAUDGEQ": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Matte" + ] + ], + "OFAUX5fB": [ + [ + "Generic", + "PETG", + "C1 Generic High Flow PETG" + ] + ], + "OFAbsMuV": [ + [ + "Snapmaker", + "TPU", + "Snapmaker Dual TPE" + ] + ], + "OFAdAYYk": [ + [ + "QIDI", + "PPS-CF", + "QIDI PPS-CF" + ] + ], + "OFAdZFD1": [ + [ + "FusRock", + "PET-GF", + "FusRock Generic PET-GF" + ] + ], + "OFAiqi5v": [ + [ + "Elegoo", + "ASA", + "Elegoo ASA-CF" + ] + ], + "OFAnyzjN": [ + [ + "HATCHBOX", + "PETG", + "HATCHBOX PETG" + ] + ], + "OFAtydxE": [ + [ + "Generic", + "S-Multi", + "FusRock S-Multi" + ] + ], + "OFBGxHgT": [ + [ + "FlyingBear", + "PLA", + "FlyingBear PLA" + ] + ], + "OFBRSZom": [ + [ + "Volumic", + "PPS-CF", + "PPS Carbone (Performance)" + ] + ], + "OFBvxnjM": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG-GF" + ] + ], + "OFC2FSsV": [ + [ + "Overture", + "PLA", + "Overture PLA" + ] + ], + "OFC5CCeo": [ + [ + "Generic", + "PETG-CF", + "Flashforge Generic PETG-CF" + ] + ], + "OFCJaXZS": [ + [ + "Generic", + "PPS", + "Flashforge PPS" + ] + ], + "OFCKK3u9": [ + [ + "FlyingBear", + "PA-CF", + "FlyingBear PA-CF" + ] + ], + "OFCgpxn2": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS HF" + ] + ], + "OFChH9xu": [ + [ + "Snapmaker", + "TPU", + "Snapmaker J1 TPE" + ] + ], + "OFD5e0sH": [ + [ + "Elegoo", + "PLA", + "Elegoo Rapid PLA+" + ] + ], + "OFDCk0cz": [ + [ + "Generic", + "PETG-CF", + "Generic PETG-CF" + ] + ], + "OFDMWB6t": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA+" + ] + ], + "OFDNiRTx": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA+" + ] + ], + "OFDkABjZ": [ + [ + "Generic", + "TPU-90A", + "Generic TPU-90A" + ] + ], + "OFDramZ2": [ + [ + "Co Print", + "PETG", + "CoPrint Generic PETG" + ] + ], + "OFE22Uba": [ + [ + "Generic", + "TPU-90A", + "Flashforge TPU-90A" + ] + ], + "OFEYKrjb": [ + [ + "Artillery", + "PETG", + "Artillery PETG" + ] + ], + "OFEdyZqS": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Luminous" + ] + ], + "OFFIL5pD": [ + [ + "QIDI", + "PA12-CF", + "QIDI PA12-CF" + ] + ], + "OFFenwbU": [ + [ + "Generic", + "PLA", + "FLSun S1 PLA Silk" + ] + ], + "OFFmJ8aR": [ + [ + "Other", + "PLA", + "Other PLA Hyper" + ] + ], + "OFFrbsvQ": [ + [ + "Other", + "TPU", + "Other TPU" + ] + ], + "OFG8vHw8": [ + [ + "Generic", + "ASA", + "Qidi Generic ASA" + ] + ], + "OFGFZhWu": [ + [ + "Generic", + "PETG", + "Sovol SV06 ACE PETG" + ] + ], + "OFGb4hPY": [ + [ + "Anycubic", + "PEBA", + "Anycubic PEBA 95A" + ] + ], + "OFGfdP6J": [ + [ + "FusRock", + "S-Multi", + "FusRock Generic S-Multi" + ], + [ + "Generic", + "PET-CF", + "FusRock Generic S-Multi" + ] + ], + "OFHBTqyD": [ + [ + "Generic", + "PLA", + "Flashforge PLA Basic" + ] + ], + "OFHDaMut": [ + [ + "Volumic", + "PA6-CF", + "PA6 CF20 (Performance)" + ] + ], + "OFHL32M0": [ + [ + "Anycubic", + "TPU", + "Anycubic TPU" + ], + [ + "Generic", + "TPU", + "Anycubic TPU" + ] + ], + "OFHtQDC9": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Basic" + ] + ], + "OFICPchn": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Basic" + ] + ], + "OFIGHU7W": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG-CF" + ] + ], + "OFIl3ar9": [ + [ + "Generic", + "PETG", + "Sovol SV08 PETG" + ] + ], + "OFIzguhB": [ + [ + "Volumic", + "UNIV", + "Volumic UNIVERSAL Ultra" + ] + ], + "OFJIImD5": [ + [ + "Elegoo", + "PETG", + "Elegoo PET-CF" + ] + ], + "OFJfx0Cl": [ + [ + "Generic", + "PE-CF", + "Generic PE-CF" + ] + ], + "OFJsqMzx": [ + [ + "Generic", + "PLA", + "Generic PLA Matte" + ] + ], + "OFK39W9u": [ + [ + "Generic", + "PETG-CF", + "Flashforge Generic PETG-CF10" + ] + ], + "OFK820gS": [ + [ + "QIDI", + "ASA", + "QIDI ASA" + ] + ], + "OFKDnrjL": [ + [ + "Artillery", + "PLA Matte", + "Artillery PLA Matte" + ] + ], + "OFKH15Hd": [ + [ + "Generic", + "ABS", + "Sovol SV08 ABS" + ] + ], + "OFKWVi10": [ + [ + "Generic", + "PLA-CF", + "Flashforge Generic PLA-CF10" + ] + ], + "OFKZH00L": [ + [ + "FusRock", + "PET-CF", + "FusRock Generic PET-CF" + ], + [ + "Generic", + "PET-CF", + "FusRock Generic PET-CF" + ] + ], + "OFKhtNBx": [ + [ + "Snapmaker", + "TPU", + "Snapmaker J1 TPU High-Flow" + ] + ], + "OFKjlAbC": [ + [ + "QIDI", + "UltraPA-CF25", + "QIDI UltraPA-CF25" + ] + ], + "OFKzh9lx": [ + [ + "InfiMech", + "PLA", + "InfiMech PLA" + ] + ], + "OFL4BLAC": [ + [ + "iQ Materials", + "HPP4GF25", + "Grauts HPP4GF25 P1" + ] + ], + "OFL4KniM": [ + [ + "Elegoo", + "TPU", + "Elegoo Rapid TPU 95A" + ] + ], + "OFL7U2MV": [ + [ + "RatRig", + "ABS", + "RatRig PunkFil ABS" + ] + ], + "OFL7vEML": [ + [ + "Generic", + "PC", + "FlashForge PC" + ] + ], + "OFLSBS99": [ + [ + "Generic", + "SBS", + "fdm_filament_sbs" + ] + ], + "OFLeFaUO": [ + [ + "Generic", + "PVA", + "Flashforge Generic PVA" + ] + ], + "OFLhOFQk": [ + [ + "Volumic", + "ASA", + "Volumic ASA Ultra (Performance)" + ] + ], + "OFLiTjQK": [ + [ + "Other", + "PA-CF", + "Other PA-CF" + ] + ], + "OFLriDvE": [ + [ + "Generic", + "PLA", + "Creality Generic PLA High Speed" + ] + ], + "OFLxO2Oc": [ + [ + "Generic", + "PET", + "FusRock PET" + ] + ], + "OFM3PeVe": [ + [ + "FusRock", + "ASA-CF", + "Flashforge ASA-CF" + ], + [ + "Generic", + "ASA-CF", + "Flashforge ASA-CF" + ] + ], + "OFMCMXSG": [ + [ + "Generic", + "PP", + "Generic PP-GF" + ] + ], + "OFMHTnPP": [ + [ + "FusRock", + "PA-CF", + "Flashforge PA12-CF" + ] + ], + "OFMQJToc": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG-GF" + ] + ], + "OFN0X7oN": [ + [ + "QIDI", + "PLA", + "QIDI PLA Basic" + ] + ], + "OFN0pBpo": [ + [ + "Generic", + "TPU", + "Qidi Generic TPU 95A" + ] + ], + "OFNQHqAV": [ + [ + "Cubicon", + "ABS", + "Cubicon ABSk" + ] + ], + "OFNRgSch": [ + [ + "Artillery", + "PC", + "Artillery PC" + ] + ], + "OFNX5uRT": [ + [ + "QIDI", + "TPU-AERO", + "QIDI TPU-Aero" + ] + ], + "OFNbajj9": [ + [ + "Generic", + "ASA", + "Creality Generic ASA-CF" + ] + ], + "OFNvrbnf": [ + [ + "Co Print", + "ABS", + "CoPrint Generic ABS" + ] + ], + "OFNz8rrn": [ + [ + "FlyingBear", + "PLA", + "FlyingBear PLA Hyper" + ] + ], + "OFO3IOWM": [ + [ + "Volumic", + "PETG-ESD", + "PETG ESD (Performance)" + ] + ], + "OFO5R9KJ": [ + [ + "Generic", + "TPU", + "Sovol Zero TPU" + ] + ], + "OFOJUJAS": [ + [ + "Cubicon", + "PA", + "Cubicon PA-CF" + ] + ], + "OFOSzSuh": [ + [ + "Generic", + "PA-CF", + "Flashforge PA-CF" + ] + ], + "OFOW9K96": [ + [ + "QIDI", + "TPU", + "Qidi TPU 95A-HF" + ] + ], + "OFOkTA0C": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG Translucent" + ] + ], + "OFOp3Oef": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "OFOysPuE": [ + [ + "QIDI", + "TPU-GF", + "QIDI TPU-GF" + ] + ], + "OFP4poIv": [ + [ + "Generic", + "PLA", + "Sovol Zero PLA Silk HS Nozzle" + ] + ], + "OFPGelMX": [ + [ + "Volumic", + "PP", + "Volumic PP Ultra (Performance)" + ] + ], + "OFPJJxkF": [ + [ + "FusRock", + "PET-CF", + "Flashforge PET-CF" + ], + [ + "Generic", + "PET-CF", + "Flashforge PET-CF" + ] + ], + "OFPJrlC3": [ + [ + "Generic", + "PLA-CF", + "Flashforge PLA-CF" + ] + ], + "OFPeGtB1": [ + [ + "Volumic", + "UNIV", + "Volumic UNIVERSAL Ultra (Performance)" + ] + ], + "OFPokkKe": [ + [ + "QIDI", + "PETG-CF", + "QIDI PETG-CF" + ] + ], + "OFPwi9X0": [ + [ + "HATCHBOX", + "ABS", + "HATCHBOX ABS" + ] + ], + "OFQ5xAKf": [ + [ + "Generic", + "PVA", + "Chuanying Generic PVA" + ] + ], + "OFQ9dI8j": [ + [ + "Generic", + "PC", + "Prusa Generic PC HF" + ] + ], + "OFQCAYAt": [ + [ + "FusRock", + "PPA-CF", + "Flashforge PPA-CF" + ], + [ + "Generic", + "PPA-CF", + "Flashforge PPA-CF" + ] + ], + "OFQZINrX": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF10" + ] + ], + "OFQhLoxN": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Wood" + ] + ], + "OFQkWxJy": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Matte" + ] + ], + "OFR8dTVW": [ + [ + "Generic", + "PLA", + "FLSun S1 PLA High Speed" + ] + ], + "OFRNU58t": [ + [ + "Generic", + "TPU", + "Flashforge TPU 95A" + ] + ], + "OFRR8LUh": [ + [ + "Generic", + "ASA", + "Generic ASA" + ] + ], + "OFRS2Ggt": [ + [ + "Generic", + "PP-CF", + "Generic PP-CF" + ] + ], + "OFRgDMDJ": [ + [ + "Generic", + "PETG", + "Flashforge PETG Transparent" + ] + ], + "OFS1ekCg": [ + [ + "Generic", + "PETG", + "RatRig BigNozzle PCTG" + ] + ], + "OFS3HrR1": [ + [ + "Other", + "PLA", + "Other PLA" + ] + ], + "OFSCm6pJ": [ + [ + "Elegoo", + "PETG", + "Elegoo PET-CF" + ] + ], + "OFSSuKRr": [ + [ + "QIDI", + "PETG", + "QIDI PETG Basic" + ] + ], + "OFSdF3B1": [ + [ + "Generic", + "PAHT-CF", + "FusRock PAHT-CF" + ] + ], + "OFSkBwxf": [ + [ + "Generic", + "ASA", + "RatRig BigNozzle ASA" + ] + ], + "OFSoZBK2": [ + [ + "Generic", + "PLA", + "Sovol SV06 Plus ACE PLA" + ] + ], + "OFSpTWdv": [ + [ + "Other", + "PA-CF", + "Other PA-CF" + ] + ], + "OFT3TqB6": [ + [ + "Elas", + "ASA", + "Elas ASA" + ] + ], + "OFTa6gPH": [ + [ + "Generic", + "PLA", + "Flashforge PLA Pro" + ] + ], + "OFTbdJyT": [ + [ + "Other", + "PC", + "Other PC" + ] + ], + "OFTbsWVg": [ + [ + "Artillery", + "TPU", + "Artillery TPU" + ] + ], + "OFToBodi": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido Metal" + ] + ], + "OFTsGps3": [ + [ + "InfiMech", + "PC", + "InfiMech PC" + ] + ], + "OFTszIHE": [ + [ + "Generic", + "PLA", + "Creality Generic PLA Silk" + ] + ], + "OFUJw3Lx": [ + [ + "QIDI", + "PEBA", + "QIDI PEBA 95A" + ] + ], + "OFUYjPc4": [ + [ + "Generic", + "PLA", + "Dremel Generic PLA" + ] + ], + "OFUkpobY": [ + [ + "QIDI", + "PAHT-CF", + "QIDI PAHT-CF" + ] + ], + "OFUqBrgf": [ + [ + "Generic", + "TPU", + "Chuanying Generic TPU" + ] + ], + "OFV1szQh": [ + [ + "Peopoly", + "PETG", + "Peopoly Lancer PETG-C" + ] + ], + "OFV4hD1o": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Metal" + ] + ], + "OFVBNoov": [ + [ + "InfiMech", + "ABS", + "InfiMech ABS" + ] + ], + "OFVJXE4n": [ + [ + "Other", + "ABS", + "Other ABS" + ] + ], + "OFVLuVmD": [ + [ + "Elegoo", + "PETG", + "Elegoo Rapid PETG" + ] + ], + "OFVhG0yM": [ + [ + "QIDI", + "ABS", + "QIDI ABS Odorless" + ] + ], + "OFW8UdlP": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido" + ] + ], + "OFWkCAdc": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough 0.2 nozzle" + ] + ], + "OFWs8KIZ": [ + [ + "Generic", + "ABS-CF", + "Flashforge ABS-CF" + ] + ], + "OFWv6JYn": [ + [ + "Generic", + "PLA", + "Flashforge PLA Metal" + ] + ], + "OFWyCd0Y": [ + [ + "QIDI", + "PA-S", + "QIDI Support For PET/PA" + ] + ], + "OFXA8vy9": [ + [ + "Artillery", + "PLA Basic+", + "Artillery PLA Basic+" + ] + ], + "OFXNO5Of": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido 0.2 nozzle" + ] + ], + "OFXQX0tr": [ + [ + "RatRig", + "PETG-CF10", + "RatRig PunkFil PETG CF" + ] + ], + "OFXcfTEb": [ + [ + "Generic", + "PETG", + "Tinmorry PETG-ECO" + ] + ], + "OFXfgh61": [ + [ + "Generic", + "PA-CF", + "Prusa Generic PA-CF" + ] + ], + "OFXkwkn6": [ + [ + "QIDI", + "UltraPA", + "QIDI PA-Ultra" + ] + ], + "OFXmQgno": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Marble" + ] + ], + "OFXv4FUi": [ + [ + "Generic", + "PLA", + "Flashforge PLA Galaxy" + ] + ], + "OFY1U4uM": [ + [ + "Generic", + "TPU", + "Sovol SV08 TPU" + ] + ], + "OFYG2Gfy": [ + [ + "Afinia", + "ABS", + "Afinia ABS+" + ] + ], + "OFYH00jV": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF" + ] + ], + "OFYICbI4": [ + [ + "FusRock", + "PAHT-CF", + "FusRock Generic PAHT-CF" + ], + [ + "Generic", + "PAHT-CF", + "FusRock Generic PAHT-CF" + ] + ], + "OFYRS7GZ": [ + [ + "Generic", + "TPU-95A", + "Generic TPU-95A" + ] + ], + "OFYZs7dN": [ + [ + "Generic", + "PLA", + "Flashforge Generic HS PLA" + ] + ], + "OFYehFGr": [ + [ + "Generic", + "TPU", + "RatRig BigNozzle TPU" + ] + ], + "OFYfZgxU": [ + [ + "FlyingBear", + "TPU", + "FlyingBear TPU" + ] + ], + "OFZAkPHG": [ + [ + "QIDI", + "PPS-GF", + "QIDI PPS-GF" + ] + ], + "OFZQFvHQ": [ + [ + "Generic", + "PETG", + "Flashforge HS PETG" + ] + ], + "OFZcrV9c": [ + [ + "FusRock", + "PPS-CF", + "Flashforge PPS-CF" + ], + [ + "Generic", + "PPS-CF", + "Flashforge PPS-CF" + ] + ], + "OFZhdVnP": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Basic" + ] + ], + "OFZjZ1k7": [ + [ + "Generic", + "PLA", + "Creality HF Generic PLA" + ] + ], + "OFa5cFqE": [ + [ + "QIDI", + "PAHT-S", + "QIDI Support For PAHT" + ] + ], + "OFa6L3Of": [ + [ + "QIDI", + "PC-ABS-FR", + "Qidi PC-ABS-FR" + ] + ], + "OFaKIoH2": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Sparkle" + ] + ], + "OFaKZ6JI": [ + [ + "Generic", + "PETG", + "Generic PETG Basic" + ] + ], + "OFaxQnfz": [ + [ + "Cubicon", + "PC", + "Cubicon PC" + ] + ], + "OFb3UzMZ": [ + [ + "InfiMech", + "PA-CF", + "InfiMech PA-CF" + ] + ], + "OFbK5wve": [ + [ + "Generic", + "TPU", + "Prusa Generic TPU HF" + ] + ], + "OFbS9rjH": [ + [ + "QIDI", + "PETG", + "QIDI PETG Rapido" + ] + ], + "OFbYP6Wb": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Marble" + ] + ], + "OFbgt3u3": [ + [ + "Elas", + "PLA", + "Elas PLA Basic" + ] + ], + "OFc2SnEp": [ + [ + "Artillery", + "PVA", + "Artillery PVA" + ] + ], + "OFcZZWnB": [ + [ + "Cubicon", + "ABS", + "Cubicon ABS-A100" + ] + ], + "OFceJcLf": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA" + ] + ], + "OFcqs5g7": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Translucent2" + ] + ], + "OFcsHCy4": [ + [ + "Generic", + "PLA", + "Sovol SV08 PLA" + ] + ], + "OFcy60o4": [ + [ + "Generic", + "ASA", + "Flashforge ASA Basic" + ] + ], + "OFdLGn0R": [ + [ + "Generic", + "PLA", + "Creality Generic PLA Wood" + ] + ], + "OFdNORGt": [ + [ + "Generic", + "ASA-GF", + "Flashforge ASA-GF" + ] + ], + "OFdSGkUG": [ + [ + "Anycubic", + "PETG", + "Anycubic PETG" + ], + [ + "Generic", + "PETG", + "Anycubic PETG" + ] + ], + "OFdhVJql": [ + [ + "Generic", + "PLA", + "Flashforge PLA Buint Ti" + ] + ], + "OFeFRwST": [ + [ + "Generic", + "PVA", + "Flashforge PVA" + ] + ], + "OFePPmng": [ + [ + "Snapmaker", + "ABS", + "Snapmaker J1 ABS Benchy" + ] + ], + "OFeWMAGH": [ + [ + "Generic", + "PLA", + "Flashforge HS PLA Burnt Ti" + ] + ], + "OFefhSuj": [ + [ + "InfiMech", + "PLA", + "InfiMech PLA Hyper" + ] + ], + "OFenGPBR": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG Translucent" + ] + ], + "OFeybQvK": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido 0.2 nozzle" + ] + ], + "OFf0JIqs": [ + [ + "Eryone", + "PP", + "Eryone PP" + ] + ], + "OFf2b9wu": [ + [ + "Anycubic", + "ABS", + "Anycubic ABS" + ], + [ + "Generic", + "ABS", + "Anycubic ABS" + ] + ], + "OFfB1QKi": [ + [ + "Generic", + "PETG", + "Generic PETG HF" + ] + ], + "OFfJoIgg": [ + [ + "QIDI", + "PAHT-GF", + "QIDI PAHT-GF" + ] + ], + "OFfdxQok": [ + [ + "Generic", + "PLA", + "Generic PLA+" + ] + ], + "OFfiN1Lw": [ + [ + "Generic", + "PLA", + "Chuanying Generic HS PLA" + ] + ], + "OFfkPhrJ": [ + [ + "Generic", + "PLA", + "Creality HF Generic Speed PLA" + ] + ], + "OFfoA8kJ": [ + [ + "CoLiDo", + "PLA", + "CoLiDo PLA" + ] + ], + "OFftQOek": [ + [ + "Generic", + "PLA", + "Flashforge PLA Matte" + ] + ], + "OFg4N6ZL": [ + [ + "FlyingBear", + "PETG", + "FlyingBear PETG" + ] + ], + "OFgJX0Fc": [ + [ + "Generic", + "PPS", + "FlashForge PPS" + ] + ], + "OFgK2Xvv": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA" + ], + [ + "Generic", + "PLA", + "Anycubic PLA" + ] + ], + "OFgMGSpF": [ + [ + "Generic", + "PETG", + "Sovol SV06 Plus ACE PETG" + ] + ], + "OFgNzLVh": [ + [ + "Generic", + "ABS", + "Sovol Zero ABS" + ] + ], + "OFgSK1hL": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA High Speed" + ], + [ + "Generic", + "PLA", + "Anycubic PLA High Speed" + ] + ], + "OFglpvEE": [ + [ + "Generic", + "TPU", + "Sovol SV06 ACE TPU" + ] + ], + "OFgrGfPy": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA+" + ], + [ + "Generic", + "PLA", + "Anycubic PLA+" + ] + ], + "OFgtZjeX": [ + [ + "Snapmaker", + "ABS", + "Snapmaker ABS Benchy" + ] + ], + "OFh5GUhZ": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Wood" + ] + ], + "OFhKNHC8": [ + [ + "Generic", + "PETG", + "Generic PETG PRO" + ] + ], + "OFhzHd2Y": [ + [ + "Generic", + "HIPS", + "Flashforge HIPS" + ] + ], + "OFi1ocNv": [ + [ + "Generic", + "PA", + "Flashforge PA" + ] + ], + "OFiJYDPC": [ + [ + "HATCHBOX", + "PLA", + "HATCHBOX PLA" + ] + ], + "OFic2uNr": [ + [ + "Generic", + "PLA", + "Sovol SV06 ACE PLA" + ] + ], + "OFicxmSa": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA HF" + ] + ], + "OFidJLn8": [ + [ + "Polymaker", + "ABS", + "PolyLite ABS" + ] + ], + "OFiyGNbI": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG-CF" + ] + ], + "OFjFPhUC": [ + [ + "Generic", + "PLA", + "Prusament rPLA" + ] + ], + "OFjZw7k1": [ + [ + "Polymaker", + "PLA", + "PolyTerra J1 PLA" + ] + ], + "OFjdTQd6": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Silk" + ], + [ + "Generic", + "PLA", + "Anycubic PLA Silk" + ] + ], + "OFjepy6j": [ + [ + "FusRock", + "S-PAHT", + "FusRock Generic S-PAHT" + ], + [ + "Generic", + "PA-CF", + "FusRock Generic S-PAHT" + ] + ], + "OFjj9Yiz": [ + [ + "Generic", + "PETG", + "RatRig BigNozzle PETG" + ] + ], + "OFjohFkg": [ + [ + "QIDI", + "PETG", + "QIDI PETG Translucent" + ] + ], + "OFjqPjjl": [ + [ + "Generic", + "PET", + "Generic PET" + ] + ], + "OFjurQ3I": [ + [ + "Generic", + "PETG", + "Sovol Zero PETG" + ] + ], + "OFk388hR": [ + [ + "Generic", + "PA6-CF", + "Generic PA6-CF" + ] + ], + "OFk6T5YH": [ + [ + "Generic", + "PETG", + "Sovol Zero PETG HS Nozzle" + ] + ], + "OFkaDtKx": [ + [ + "FusRock", + "PA-CF", + "Flashforge PA66-CF" + ] + ], + "OFkeeluv": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA HF" + ] + ], + "OFkfK62J": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Silk" + ] + ], + "OFklg4aM": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA PRO" + ] + ], + "OFkoT6jl": [ + [ + "Generic", + "PLA", + "Prusament PLA" + ] + ], + "OFlN56xW": [ + [ + "Generic", + "PLA", + "Chuanying Generic PLA-Silk" + ] + ], + "OFlNKZLP": [ + [ + "Generic", + "PLA", + "Flashforge PLA Metal" + ] + ], + "OFlbn4FY": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Matte" + ] + ], + "OFlxnxDx": [ + [ + "Generic", + "SBS", + "Tiertime Generic SBS" + ] + ], + "OFlzQ0IS": [ + [ + "Peopoly", + "PET-CF", + "Peopoly Lancer PET-CF" + ] + ], + "OFm1VZed": [ + [ + "Generic", + "PLA-CF", + "Flashforge Generic PLA-CF" + ] + ], + "OFmF1xL9": [ + [ + "QIDI", + "ASA-CF", + "QIDI ASA-CF" + ] + ], + "OFmKNi3f": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido" + ] + ], + "OFmOWC74": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG PRO" + ] + ], + "OFmcJsqt": [ + [ + "InfiMech", + "TPU", + "InfiMech TPU" + ] + ], + "OFmduKVr": [ + [ + "Generic", + "PPS-CF", + "FlashForge PPS-CF" + ] + ], + "OFmeQjRP": [ + [ + "Elegoo", + "TPU", + "Elegoo Rapid TPU 95A" + ] + ], + "OFmgesco": [ + [ + "Generic", + "TPU", + "Flashforge TPU 65D" + ] + ], + "OFnLnZQo": [ + [ + "Cubicon", + "PC", + "Cubicon PC" + ] + ], + "OFnMW5jr": [ + [ + "FlyingBear", + "ABS", + "FlyingBear ABS" + ] + ], + "OFnRTkEq": [ + [ + "RatRig", + "PETG", + "RatRig PunkFil PETG" + ] + ], + "OFnY9ovF": [ + [ + "Artillery", + "PA-CF", + "Artillery PA-CF" + ] + ], + "OFnj7bPm": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido 0.6 nozzle" + ] + ], + "OFnsWQTp": [ + [ + "QIDI", + "PLA", + "QIDI WOOD Rapido" + ] + ], + "OFnyirh9": [ + [ + "Artillery", + "PLA Silk", + "Artillery PLA Silk" + ] + ], + "OFo4VB3w": [ + [ + "Generic", + "ABS-CF", + "Generic ABS-CF" + ] + ], + "OFo9EwvK": [ + [ + "Generic", + "PETG-CF", + "Generic PETG-CF10" + ] + ], + "OFoAaHcF": [ + [ + "FusRock", + "PAHT-GF", + "FusRock Generic PAHT-GF" + ] + ], + "OFoJUGj6": [ + [ + "Generic", + "PLA", + "Flashforge HS PLA" + ] + ], + "OFoimrpo": [ + [ + "Generic", + "PETG-CF", + "Flashforge PETG-CF" + ] + ], + "OFp8lkYD": [ + [ + "FusRock", + "PPA-GF", + "Flashforge PPA-GF" + ] + ], + "OFp90N8a": [ + [ + "Artillery", + "PA", + "Artillery PA" + ] + ], + "OFpHq9gJ": [ + [ + "Generic", + "PETG", + "Prusament PETG" + ] + ], + "OFphFSUJ": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG HF" + ] + ], + "OFpwg2Qh": [ + [ + "Elegoo", + "ASA", + "Elegoo ASA-CF" + ] + ], + "OFq6IhFg": [ + [ + "Cubicon", + "PLA", + "Cubicon PLA" + ] + ], + "OFqPp2yL": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough 0.6 nozzle" + ] + ], + "OFqRWRU6": [ + [ + "Generic", + "ABS-GF", + "Flashforge ABS-GF" + ] + ], + "OFqSTJ3I": [ + [ + "Generic", + "PLA", + "OrcaArena Generic PLA Silk" + ] + ], + "OFqh1Ngp": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA-CF" + ] + ], + "OFqkcvDI": [ + [ + "Peopoly", + "ABS", + "Peopoly Lancer ABS-GF" + ] + ], + "OFqyIUDi": [ + [ + "QIDI", + "PLA-CF", + "Qidi PLA-CF" + ] + ], + "OFrbbq6E": [ + [ + "Other", + "PLA", + "Other PLA Hyper" + ] + ], + "OFrgQ1Ns": [ + [ + "Elas", + "PLA", + "Elas PLA Pro" + ] + ], + "OFs1CbB1": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido 0.8 nozzle" + ] + ], + "OFs6lLH7": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Silk" + ] + ], + "OFsCOJv7": [ + [ + "Generic", + "TPU", + "Generic TPU" + ] + ], + "OFsKqcQW": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA PRO" + ] + ], + "OFsLkLw6": [ + [ + "Generic", + "PLA", + "Generic PLA Matte" + ] + ], + "OFsNZcid": [ + [ + "Polymaker", + "PLA", + "PolyLite Dual PLA" + ] + ], + "OFsgANe3": [ + [ + "Generic", + "PAHT-CF", + "Flashforge PAHT-CF" + ] + ], + "OFsmPFwh": [ + [ + "Generic", + "TPU", + "Sovol SV06 Plus ACE TPU" + ] + ], + "OFt1YdX8": [ + [ + "Generic", + "PLA", + "FLSun T1 PLA Silk" + ] + ], + "OFt5bvKK": [ + [ + "Artillery", + "PETG Basic", + "Artillery PETG Basic" + ] + ], + "OFt9AiN5": [ + [ + "Generic", + "PA", + "Polymaker CoPA" + ] + ], + "OFtEFtsz": [ + [ + "Polymaker", + "PA", + "Polymaker Generic CoPA" + ] + ], + "OFtJMczs": [ + [ + "Generic", + "TPU-64D", + "Flashforge TPU-64D" + ] + ], + "OFtL05hE": [ + [ + "Generic", + "PLA", + "Sovol Zero PLA Basic HS Nozzle" + ] + ], + "OFtXBjvb": [ + [ + "Artillery", + "PLA Tough", + "Artillery PLA Tough" + ] + ], + "OFtcTs1o": [ + [ + "Generic", + "ABS", + "RatRig BigNozzle ABS" + ] + ], + "OFtemzzw": [ + [ + "Generic", + "ABS", + "Sovol SV06 ACE ABS" + ] + ], + "OFtet8ui": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPU High-Flow" + ] + ], + "OFti31HS": [ + [ + "Cubicon", + "PLA", + "Cubicon PLAi21" + ] + ], + "OFtmT4Nd": [ + [ + "Artillery", + "ASA", + "Artillery ASA" + ] + ], + "OFtwA91m": [ + [ + "Generic", + "PC", + "Sovol Zero PC" + ] + ], + "OFuPC4S8": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA-CF" + ] + ], + "OFuPN3iW": [ + [ + "Other", + "PETG", + "Other PETG" + ] + ], + "OFuTFxVP": [ + [ + "Overture", + "ABS", + "Overture ABS" + ] + ], + "OFuXkYly": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Glow" + ] + ], + "OFuYvNS3": [ + [ + "Afinia", + "ABS", + "Afinia Value ABS" + ] + ], + "OFuidAEg": [ + [ + "Bambu Lab", + "ABS", + "Bambu ABS" + ] + ], + "OFuq9tqb": [ + [ + "InfiMech", + "PLA", + "InfiMech PLA Basic" + ] + ], + "OFuswXlp": [ + [ + "Generic", + "TPU", + "Generic TPU 85A" + ] + ], + "OFutwD6f": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Glow" + ] + ], + "OFuyJhLF": [ + [ + "Generic", + "PETG", + "Flashforge PETG Basic" + ] + ], + "OFv2NHLC": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF25" + ] + ], + "OFv8SRZh": [ + [ + "Generic", + "PLA-CF", + "Prusa Generic PLA-CF" + ] + ], + "OFvGSn0l": [ + [ + "Generic", + "PETG", + "Creality Generic PETG-CF" + ] + ], + "OFvN3117": [ + [ + "QIDI", + "PLA", + "QIDI PLA Matte Basic" + ] + ], + "OFvOhSjO": [ + [ + "Other", + "TPU", + "Other TPU" + ] + ], + "OFvYfHPB": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Matte" + ] + ], + "OFvaXhYD": [ + [ + "InfiMech", + "PETG", + "InfiMech PETG" + ] + ], + "OFviQ9lH": [ + [ + "Generic", + "TPU", + "Flashforge Generic TPU" + ] + ], + "OFvsS7Fb": [ + [ + "Generic", + "TPU-64D", + "Generic TPU-64D" + ] + ], + "OFvw0owy": [ + [ + "Afinia", + "PLA", + "Afinia Value PLA" + ] + ], + "OFvxvkAd": [ + [ + "Artillery", + "PLA-CF", + "Artillery PLA-CF" + ] + ], + "OFw05rkF": [ + [ + "Other", + "PETG", + "Other PETG" + ] + ], + "OFw0qp7w": [ + [ + "Artillery", + "PET", + "Artillery PET" + ] + ], + "OFw1S8lL": [ + [ + "Artillery", + "ABS", + "Artillery ABS" + ] + ], + "OFw4OHWE": [ + [ + "Elas", + "PETG", + "Elas PETG Basic" + ] + ], + "OFwHPTvy": [ + [ + "Generic", + "PLA", + "Qidi Generic PLA+" + ] + ], + "OFwf0oWp": [ + [ + "Generic", + "PLA", + "Flashforge PLA Luminous" + ] + ], + "OFwyqcGn": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Matte" + ] + ], + "OFxLeRyT": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA HF" + ] + ], + "OFxVzzn4": [ + [ + "Generic", + "PLA-CF", + "Chuanying Generic PLA-CF10" + ] + ], + "OFxfCy9m": [ + [ + "Volumic", + "PETG", + "Volumic PCTG Ultra (Performance)" + ] + ], + "OFxjFYxE": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG HF" + ] + ], + "OFxlch4V": [ + [ + "CoLiDo", + "PLA", + "CoLiDo PLA Silk" + ] + ], + "OFxodd2u": [ + [ + "DeltaMaker", + "PLA", + "DeltaMaker Brand PLA" + ] + ], + "OFxxa5yn": [ + [ + "Snapmaker", + "ABS", + "Snapmaker Dual ABS Benchy" + ] + ], + "OFy7oQ1g": [ + [ + "Generic", + "ASA", + "Blocks Generic ASA-CF" + ] + ], + "OFyD1Zo8": [ + [ + "Other", + "PC", + "Other PC" + ] + ], + "OFyoW5W2": [ + [ + "Generic", + "PLA", + "Flashforge PLA Color Change" + ] + ], + "OFypQeKR": [ + [ + "Generic", + "PC-CF", + "Generic PC-CF" + ] + ], + "OFyt23xJ": [ + [ + "Generic", + "PLA", + "FLSun T1 PLA High Speed" + ] + ], + "OFyxAbO4": [ + [ + "Generic", + "TPU-95A", + "Flashforge TPU-95A" + ] + ], + "OFzFbFcl": [ + [ + "Elegoo", + "PC", + "Elegoo PC-FR" + ] + ], + "OFzQQeCi": [ + [ + "Generic", + "HIPS", + "Chuanying Generic HIPS" + ] + ], + "OFzb2BLs": [ + [ + "Generic", + "PETG", + "RatRig Generic PCTG" + ] + ], + "OFziUL2X": [ + [ + "Generic", + "PLA", + "Ginger Generic PLA" + ] + ], + "OFzrWlH5": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG HF" + ] + ], + "OGFA00": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Basic" + ] + ], + "OGFA01": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Matte" + ] + ], + "OGFA02": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Metal" + ] + ], + "OGFA03": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Impact" + ] + ], + "OGFA05": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Silk" + ] + ], + "OGFA06": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Silk+" + ] + ], + "OGFA07": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Marble" + ] + ], + "OGFA08": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Sparkle" + ] + ], + "OGFA09": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Tough" + ] + ], + "OGFA11": [ + [ + "Bambu Lab", + "PLA-AERO", + "Bambu PLA Aero" + ] + ], + "OGFA12": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Glow" + ] + ], + "OGFA13": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Dynamic" + ] + ], + "OGFA15": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Galaxy" + ] + ], + "OGFA16": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Wood" + ] + ], + "OGFA50": [ + [ + "Bambu Lab", + "PLA-CF", + "Bambu PLA-CF" + ] + ], + "OGFB00": [ + [ + "Bambu Lab", + "ABS", + "Bambu ABS" + ] + ], + "OGFB01": [ + [ + "Bambu Lab", + "ASA", + "Bambu ASA" + ] + ], + "OGFB02": [ + [ + "Bambu Lab", + "ASA-AERO", + "Bambu ASA-Aero" + ] + ], + "OGFB50": [ + [ + "Bambu Lab", + "ABS-GF", + "Bambu ABS-GF" + ] + ], + "OGFB51": [ + [ + "Bambu Lab", + "ASA-CF", + "Bambu ASA-CF" + ] + ], + "OGFB60": [ + [ + "Polymaker", + "ABS", + "PolyLite ABS" + ] + ], + "OGFB61": [ + [ + "Polymaker", + "ASA", + "PolyLite ASA" + ] + ], + "OGFB98": [ + [ + "Generic", + "ASA", + "Generic ASA" + ] + ], + "OGFB99": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "OGFC00": [ + [ + "Bambu Lab", + "PC", + "Bambu PC" + ] + ], + "OGFC01": [ + [ + "Bambu Lab", + "PC", + "Bambu PC FR" + ] + ], + "OGFC99": [ + [ + "Generic", + "PC", + "Generic PC" + ], + [ + "Generic", + "PC", + "fdm_filament_pc" + ] + ], + "OGFG00": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG Basic" + ] + ], + "OGFG01": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG Translucent" + ] + ], + "OGFG02": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG HF" + ] + ], + "OGFG50": [ + [ + "Bambu Lab", + "PETG-CF", + "Bambu PETG-CF" + ] + ], + "OGFG60": [ + [ + "Polymaker", + "PETG", + "PolyLite PETG" + ] + ], + "OGFG97": [ + [ + "Generic", + "PCTG", + "fdm_filament_pctg" + ] + ], + "OGFG99": [ + [ + "Generic", + "PETG", + "Generic PETG" + ], + [ + "Generic", + "PETG", + "fdm_filament_pet" + ] + ], + "OGFGG300": [ + [ + "GreenGate3D", + "PETG", + "GreenGate3D PETG" + ] + ], + "OGFL00": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA" + ] + ], + "OGFL00-1": [ + [ + "Polymaker", + "PLA", + "PolyTerra Dual PLA" + ] + ], + "OGFL01": [ + [ + "Polymaker", + "PLA", + "PolyTerra PLA" + ] + ], + "OGFL03": [ + [ + "eSUN", + "PLA", + "eSUN PLA+" + ] + ], + "OGFL04": [ + [ + "Overture", + "PLA", + "Overture PLA" + ] + ], + "OGFL05": [ + [ + "Overture", + "PLA", + "Overture Matte PLA" + ] + ], + "OGFL06": [ + [ + "Polymaker", + "PETG", + "Fiberon PETG-ESD" + ] + ], + "OGFL50": [ + [ + "Polymaker", + "PA6-CF", + "Fiberon PA6-CF" + ] + ], + "OGFL51": [ + [ + "Polymaker", + "PA-GF", + "Fiberon PA6-GF" + ] + ], + "OGFL52": [ + [ + "Polymaker", + "PA-CF", + "Fiberon PA12-CF" + ] + ], + "OGFL53": [ + [ + "Polymaker", + "PA", + "Fiberon PA612-CF" + ] + ], + "OGFL54": [ + [ + "Polymaker", + "PET-CF", + "Fiberon PET-CF" + ] + ], + "OGFL55": [ + [ + "Polymaker", + "PETG-CF", + "Fiberon PETG-rCF" + ] + ], + "OGFL95": [ + [ + "Generic", + "PLA", + "Generic PLA High Speed" + ] + ], + "OGFL96": [ + [ + "Generic", + "PLA", + "Generic PLA Silk" + ], + [ + "Generic", + "PLA", + "fdm_filament_pla_silk" + ] + ], + "OGFL98": [ + [ + "Generic", + "PLA-CF", + "Generic PLA-CF" + ] + ], + "OGFL99": [ + [ + "Generic", + "PLA", + "fdm_filament_pla" + ] + ], + "OGFLC99": [ + [ + "Generic", + "CoPE", + "fdm_filament_cope" + ] + ], + "OGFN03": [ + [ + "Bambu Lab", + "PA-CF", + "Bambu PA-CF" + ] + ], + "OGFN04": [ + [ + "Bambu Lab", + "PA-CF", + "Bambu PAHT-CF" + ] + ], + "OGFN05": [ + [ + "Bambu Lab", + "PA6-CF", + "Bambu PA6-CF" + ] + ], + "OGFN06": [ + [ + "Bambu Lab", + "PPA-CF", + "Bambu PPA-CF" + ] + ], + "OGFN08": [ + [ + "Bambu Lab", + "PA-GF", + "Bambu PA6-GF" + ] + ], + "OGFN96": [ + [ + "Generic", + "PPA-GF", + "Generic PPA-GF" + ] + ], + "OGFN97": [ + [ + "Generic", + "PPA-CF", + "fdm_filament_ppa" + ] + ], + "OGFN98": [ + [ + "Generic", + "PA-CF", + "Generic PA-CF" + ] + ], + "OGFN99": [ + [ + "Generic", + "PA", + "Generic PA" + ], + [ + "Generic", + "PA", + "fdm_filament_pa" + ] + ], + "OGFNMK00": [ + [ + "Numakers", + "PLA", + "Numakers PLA+" + ] + ], + "OGFP97": [ + [ + "Generic", + "PP", + "fdm_filament_pp" + ] + ], + "OGFP99": [ + [ + "Generic", + "PE", + "fdm_filament_pe" + ] + ], + "OGFPM001": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA" + ] + ], + "OGFPM002": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Matte" + ] + ], + "OGFPM003": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Marble" + ] + ], + "OGFPM004": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Silk" + ] + ], + "OGFPM005": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Satin" + ] + ], + "OGFPM006": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Translucent" + ] + ], + "OGFPM007": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Galaxy" + ] + ], + "OGFPM008": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Celestial" + ] + ], + "OGFPM009": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Starlight" + ] + ], + "OGFPM010": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Glow" + ] + ], + "OGFPM011": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Luminous" + ] + ], + "OGFPM012": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Metallic" + ] + ], + "OGFPM013": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Neon" + ] + ], + "OGFPM014": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA UV Shift" + ] + ], + "OGFPM015": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Temp Shift" + ] + ], + "OGFPM016": [ + [ + "Polymaker", + "PLA", + "Panchroma CoPE" + ] + ], + "OGFPM017": [ + [ + "Polymaker", + "PLA", + "Polymaker HT-PLA" + ] + ], + "OGFPM018": [ + [ + "Polymaker", + "PLA", + "Polymaker HT-PLA-GF" + ] + ], + "OGFPM019": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Pro" + ] + ], + "OGFR00": [ + [ + "FusRock", + "ABS-GF", + "FusRock ABS-GF" + ] + ], + "OGFR98": [ + [ + "Generic", + "PHA", + "fdm_filament_pha" + ] + ], + "OGFR99": [ + [ + "Generic", + "EVA", + "fdm_filament_eva" + ] + ], + "OGFS00": [ + [ + "Bambu Lab", + "PLA", + "Bambu Support W" + ] + ], + "OGFS01": [ + [ + "Bambu Lab", + "PA", + "Bambu Support G" + ] + ], + "OGFS02": [ + [ + "Bambu Lab", + "PLA", + "Bambu Support For PLA" + ] + ], + "OGFS03": [ + [ + "Bambu Lab", + "PA", + "Bambu Support For PA/PET" + ] + ], + "OGFS04": [ + [ + "Bambu Lab", + "PVA", + "Bambu PVA" + ] + ], + "OGFS05": [ + [ + "Bambu Lab", + "PLA", + "Bambu Support For PLA/PETG" + ] + ], + "OGFS06": [ + [ + "Bambu Lab", + "ABS", + "Bambu Support for ABS" + ] + ], + "OGFS97": [ + [ + "Generic", + "BVOH", + "fdm_filament_bvoh" + ] + ], + "OGFS98": [ + [ + "Generic", + "HIPS", + "fdm_filament_hips" + ] + ], + "OGFS99": [ + [ + "Generic", + "PVA", + "Generic PVA" + ] + ], + "OGFSNL02": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA Matte" + ] + ], + "OGFSNL03": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA+" + ] + ], + "OGFSNL04": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA+ 2.0" + ] + ], + "OGFSNL05": [ + [ + "SUNLU", + "PLA", + "SUNLU Silk PLA+" + ] + ], + "OGFSNL06": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA Marble" + ] + ], + "OGFSNL07": [ + [ + "SUNLU", + "PLA", + "SUNLU Wood PLA" + ] + ], + "OGFSNL08": [ + [ + "Generic", + "PETG", + "SUNLU PETG" + ], + [ + "SUNLU", + "PETG", + "SUNLU PETG" + ] + ], + "OGFT01": [ + [ + "Bambu Lab", + "PET-CF", + "Bambu PET-CF" + ] + ], + "OGFT02": [ + [ + "Bambu Lab", + "PPS-CF", + "Bambu PPS-CF" + ] + ], + "OGFU00": [ + [ + "Bambu Lab", + "TPU", + "Bambu TPU 95A HF" + ] + ], + "OGFU01": [ + [ + "Bambu Lab", + "TPU", + "Bambu TPU 95A" + ] + ], + "OGFU99": [ + [ + "Generic", + "TPU", + "Generic TPU" + ] + ], + "OVTABS08": [ + [ + "Overture", + "ABS", + "Overture ABS Basic" + ] + ], + "P1001": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Satin" + ] + ], + "P1002": [ + [ + "Polymaker", + "PLA", + "PolySonic PLA Pro" + ] + ], + "P1003": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Matte" + ] + ], + "P1004": [ + [ + "Polymaker", + "PLA", + "PolySonic PLA" + ] + ], + "P510cfa0": [ + [ + "Cubicon", + "PLA", + "Cubicon PLA" + ] + ], + "P510cfa1": [ + [ + "Cubicon", + "PLA", + "Cubicon PLA+" + ] + ], + "P510cfa2": [ + [ + "Cubicon", + "PLA", + "Cubicon PLAi21" + ] + ], + "P510cfb0": [ + [ + "Cubicon", + "ABS", + "Cubicon ABS" + ] + ], + "P510cfb1": [ + [ + "Cubicon", + "ABS", + "Cubicon ABS-A100" + ] + ], + "P510cfb2": [ + [ + "Cubicon", + "ABS", + "Cubicon ABSk" + ] + ], + "P510cfc0": [ + [ + "Cubicon", + "PETG", + "Cubicon PETG" + ] + ], + "P510cfd0": [ + [ + "Cubicon", + "PA", + "Cubicon PA-CF" + ] + ], + "P510eff9": [ + [ + "Generic", + "PETG", + "Ginger Generic PETG" + ] + ], + "Pfcf9c4c": [ + [ + "Artillery", + "PLA", + "Artillery PLA" + ] + ], + "Prusa Generic ABS @CORE One": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Prusa Generic ABS @CORE One 0.6": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Prusa Generic ABS @CORE One 0.8": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Prusa Generic ABS @CORE One HF 0.4": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Prusa Generic ABS @CORE One HF 0.5": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Prusa Generic ABS @CORE One HF 0.6": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Prusa Generic ABS @CORE One HF 0.8": [ + [ + "Generic", + "ABS", + "Prusa Generic ABS" + ] + ], + "Prusa Generic ASA @CORE One": [ + [ + "Prusa Polymers", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusa Generic ASA @CORE One 0.6": [ + [ + "Prusa Polymers", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusa Generic ASA @CORE One 0.8": [ + [ + "Prusa Polymers", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusa Generic ASA @CORE One HF 0.4": [ + [ + "Prusa Polymers", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusa Generic ASA @CORE One HF 0.5": [ + [ + "Prusa Polymers", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusa Generic ASA @CORE One HF 0.6": [ + [ + "Prusa Polymers", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusa Generic ASA @CORE One HF 0.8": [ + [ + "Prusa Polymers", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusa Generic PETG @CORE One": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Prusa Generic PETG @CORE One 0.6": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Prusa Generic PETG @CORE One 0.8": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Prusa Generic PETG @CORE One HF 0.4": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Prusa Generic PETG @CORE One HF 0.5": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Prusa Generic PETG @CORE One HF 0.6": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Prusa Generic PETG @CORE One HF 0.8": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" + ] + ], + "Prusa Generic PLA @CORE One": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Prusa Generic PLA @CORE One 0.6": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Prusa Generic PLA @CORE One 0.8": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Prusa Generic PLA @CORE One HF 0.4": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Prusa Generic PLA @CORE One HF 0.5": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Prusa Generic PLA @CORE One HF 0.6": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Prusa Generic PLA @CORE One HF 0.8": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" + ] + ], + "Prusa Generic PLA Silk @CORE One": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA Silk" + ] + ], + "Prusa Generic PLA Silk @CORE One 0.6": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA Silk" + ] + ], + "Prusa Generic PLA Silk @CORE One 0.8": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA Silk" + ] + ], + "Prusa Generic TPU @CORE One": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU" + ] + ], + "Prusa Generic TPU @CORE One 0.6": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU" + ] + ], + "Prusa Generic TPU @CORE One 0.8": [ + [ + "Generic", + "FLEX", + "Prusa Generic TPU" + ] + ], + "Prusament ASA @CORE One": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" + ] + ], + "Prusament ASA @CORE One 0.6": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" + ] + ], + "Prusament ASA @CORE One 0.8": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" + ] + ], + "Prusament ASA @CORE One HF 0.4": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" + ] + ], + "Prusament ASA @CORE One HF 0.5": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" + ] + ], + "Prusament ASA @CORE One HF 0.6": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" + ] + ], + "Prusament ASA @CORE One HF 0.8": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" + ] + ], + "Prusament ASA @MK4S": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusament ASA @MK4S 0.6": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusament ASA @MK4S 0.8": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusament ASA @MK4S HF0.4": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusament ASA @MK4S HF0.5": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusament ASA @MK4S HF0.6": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusament ASA @MK4S HF0.8": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" + ] + ], + "Prusament PA-CF @CORE One": [ + [ + "Prusa Polymers", + "PA", + "Prusament PA-CF" + ] + ], + "Prusament PA-CF @CORE One 0.6": [ + [ + "Prusa Polymers", + "PA", + "Prusament PA-CF" + ] + ], + "Prusament PA-CF @CORE One 0.8": [ + [ + "Prusa Polymers", + "PA", + "Prusament PA-CF" + ] + ], + "Prusament PC Blend @CORE One": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC Blend" + ] + ], + "Prusament PC Blend @CORE One 0.6": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC Blend" + ] + ], + "Prusament PC Blend @CORE One 0.8": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC Blend" + ] + ], + "Prusament PC Blend @CORE One HF 0.4": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC Blend" + ] + ], + "Prusament PC Blend @CORE One HF 0.5": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC Blend" + ] + ], + "Prusament PC Blend @CORE One HF 0.6": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC Blend" + ] + ], + "Prusament PC Blend @CORE One HF 0.8": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC Blend" + ] + ], + "Prusament PC-CF @CORE One": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC-CF" + ] + ], + "Prusament PC-CF @CORE One 0.6": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC-CF" + ] + ], + "Prusament PC-CF @CORE One 0.8": [ + [ + "Prusa Polymers", + "PC", + "Prusament PC-CF" + ] + ], + "Prusament PETG @CORE One": [ + [ + "Prusa Polymers", + "PETG", + "Prusament PETG" + ] + ], + "Prusament PETG @CORE One 0.6": [ + [ + "Prusa Polymers", + "PETG", + "Prusament PETG" + ] + ], + "Prusament PETG @CORE One 0.8": [ + [ + "Prusa Polymers", + "PETG", + "Prusament PETG" + ] + ], + "Prusament PETG @CORE One HF 0.4": [ + [ + "Prusa Polymers", + "PETG", + "Prusament PETG" + ] + ], + "Prusament PETG @CORE One HF 0.5": [ + [ + "Prusa Polymers", + "PETG", + "Prusament PETG" + ] + ], + "Prusament PETG @CORE One HF 0.6": [ + [ + "Prusa Polymers", + "PETG", + "Prusament PETG" + ] + ], + "Prusament PETG @CORE One HF 0.8": [ + [ + "Prusa Polymers", + "PETG", + "Prusament PETG" + ] + ], + "Prusament PLA @CORE One": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "Prusament PLA @CORE One 0.6": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "Prusament PLA @CORE One 0.8": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "Prusament PLA @CORE One HF 0.4": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "Prusament PLA @CORE One HF 0.5": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "Prusament PLA @CORE One HF 0.6": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "Prusament PLA @CORE One HF 0.8": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "Prusament PVB @CORE One": [ + [ + "Prusa Polymers", + "PVB", + "Prusament PVB" + ] + ], + "Prusament PVB @CORE One 0.6": [ + [ + "Prusa Polymers", + "PVB", + "Prusament PVB" + ] + ], + "Prusament PVB @CORE One 0.8": [ + [ + "Prusa Polymers", + "PVB", + "Prusament PVB" + ] + ], + "Prusament rPLA @CORE One": [ + [ + "Prusa Polymers", + "PLA", + "Prusament rPLA" + ] + ], + "Prusament rPLA @CORE One 0.6": [ + [ + "Prusa Polymers", + "PLA", + "Prusament rPLA" + ] + ], + "Prusament rPLA @CORE One 0.8": [ + [ + "Prusa Polymers", + "PLA", + "Prusament rPLA" + ] + ], + "SMCFB001": [ + [ + "SeeMeCNC", + "ABS", + "SeeMeCNC ABS" + ] + ], + "SMCFG001": [ + [ + "SeeMeCNC", + "PETG", + "SeeMeCNC PETG" + ] + ], + "SMCFG002": [ + [ + "SeeMeCNC", + "PETG-CF", + "SeeMeCNC PETG-CF" + ] + ], + "SMCFL001": [ + [ + "SeeMeCNC", + "PLA", + "SeeMeCNC PLA" + ] + ], + "SMCFN001": [ + [ + "SeeMeCNC", + "PA-CF", + "SeeMeCNC PA-CF" + ] + ], + "SMCFU001": [ + [ + "SeeMeCNC", + "TPU", + "SeeMeCNC TPU" + ] + ], + "VLMNT01": [ + [ + "Valment", + "PLA", + "Valment PLA" + ] + ], + "VLMNT02": [ + [ + "Valment", + "PLA", + "Valment PLA Silk" + ] + ], + "VLMNT03": [ + [ + "Valment", + "PLA-CF", + "Valment PLA-CF" + ] + ], + "VLMNT04": [ + [ + "Valment", + "PLA", + "Valment PLA Galaxy" + ] + ] + } } diff --git a/scripts/retired_filament_ids.json b/scripts/retired_filament_ids.json deleted file mode 100644 index d71f89d9ac..0000000000 --- a/scripts/retired_filament_ids.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "retired": { - "GFABS": [ - "Anycubic/Anycubic ABS" - ], - "GFL92": [ - "Anycubic/Anycubic PLA" - ], - "GFL93": [ - "Anycubic/Anycubic PLA+" - ], - "GFPLA": [ - "Anycubic/Anycubic PLA" - ], - "GFPLA High Speed": [ - "Anycubic/Anycubic PLA High Speed" - ], - "GFPLA Matte": [ - "Anycubic/Anycubic PLA Matte" - ], - "GFPLA Silk": [ - "Anycubic/Anycubic PLA Silk" - ], - "GFPLA+": [ - "Anycubic/Anycubic PLA+" - ], - "P11851ba": [ - "Artillery/Artillery PET" - ], - "P284941e": [ - "Artillery/Artillery PETG", - "Artillery/Artillery PETG Basic" - ], - "P2fbf0c0": [ - "Artillery/Artillery TPU" - ], - "P39db358": [ - "Artillery/Artillery ABS" - ], - "P8163162": [ - "Artillery/Artillery PVA" - ], - "P87436f6": [ - "Artillery/Artillery ASA" - ] - } -} diff --git a/scripts/test_moonraker_lane_data.py b/scripts/test_moonraker_lane_data.py index 44a0a7e30e..16ed4924e0 100644 --- a/scripts/test_moonraker_lane_data.py +++ b/scripts/test_moonraker_lane_data.py @@ -5,10 +5,15 @@ Inserts/deletes/modifies random lane data in Moonraker database, then reads back and displays with colored output. """ -import requests +try: + import requests +except ImportError: + requests = None # only needed for live-printer operations, not --check-ofl-map import random import argparse import json +import os +import re import time import sys @@ -16,6 +21,11 @@ import sys DEFAULT_HOST = "192.168.88.9" DEFAULT_PORT = 7125 NAMESPACE = "lane_data" + +# Repo-relative paths for the offline generic-map check +REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +MOONRAKER_AGENT_CPP = os.path.join(REPO_ROOT, "src", "slic3r", "Utils", "MoonrakerPrinterAgent.cpp") +OFL_FILAMENT_DIR = os.path.join(REPO_ROOT, "resources", "profiles", "OrcaFilamentLibrary", "filament") LANE_KEYS = [f"lane{i}" for i in range(1, 9)] # lane1-lane8 MATERIALS = ["PLA", "ABS", "PETG", "ASA", "ASA Sparkle", "TPU", ""] @@ -30,6 +40,95 @@ MATERIAL_TEMPS = { "": {"nozzle": None, "bed": None}, } +def parse_cpp_type_map(): + """Extract the normalized-type -> OFL generic family table from MoonrakerPrinterAgent.cpp. + + Reads MoonrakerPrinterAgent::map_filament_type_to_generic_id's type_to_ofl_family + initializer so the check tracks the C++ normalization without a duplicated list. + """ + with open(MOONRAKER_AGENT_CPP, encoding="utf-8") as f: + src = f.read() + m = re.search(r"type_to_ofl_family\s*=\s*\{(.*?)\n\s*\};", src, re.DOTALL) + if not m: + raise RuntimeError(f"type_to_ofl_family table not found in {MOONRAKER_AGENT_CPP}") + pairs = re.findall(r'\{\s*"([^"]+)"\s*,\s*"([^"]+)"\s*\}', m.group(1)) + if not pairs: + raise RuntimeError("type_to_ofl_family table parsed empty") + return dict(pairs) + +def load_ofl_presets(): + """Map preset name -> parsed JSON for every OrcaFilamentLibrary filament profile.""" + presets = {} + for root, _dirs, files in os.walk(OFL_FILAMENT_DIR): + for fn in files: + if not fn.endswith(".json"): + continue + try: + with open(os.path.join(root, fn), encoding="utf-8") as f: + data = json.load(f) + except (OSError, ValueError): + continue + name = data.get("name") + if isinstance(name, str) and name: + presets[name] = data + return presets + +def resolve_ofl_filament_id(presets, name): + """Follow the inherits chain (within OFL) until a filament_id is declared.""" + seen = set() + while name and name not in seen: + seen.add(name) + preset = presets.get(name) + if preset is None: + return None + fid = preset.get("filament_id") + if fid: + return fid + name = preset.get("inherits") + return None + +def check_ofl_generic_map(): + """Assert every material type the C++ normalization handles resolves to a shipped + OrcaFilamentLibrary generic preset carrying a filament_id. + + Expectations are derived from the shipped profiles, not pinned id literals, so the + check stays valid across filament_id re-mints. + """ + print("Checking C++ generic-type map against shipped OrcaFilamentLibrary presets...") + try: + type_map = parse_cpp_type_map() + except (OSError, RuntimeError) as e: + print(f" FAIL: {e}") + return False + presets = load_ofl_presets() + if not presets: + print(f" FAIL: no OFL filament profiles found under {OFL_FILAMENT_DIR}") + return False + errors = [] + for family in sorted(set(type_map.values())): + preset_name = f"Generic {family} @System" + if preset_name not in presets: + errors.append(f"{preset_name}: no such OFL preset") + continue + if str(presets[preset_name].get("instantiation", "")).lower() != "true": + errors.append(f"{preset_name}: not instantiated — the C++ runtime lookup " + f"only sees presets loaded into the PresetBundle") + continue + fid = resolve_ofl_filament_id(presets, preset_name) + if not fid: + errors.append(f"{preset_name}: no filament_id resolvable through inherits") + continue + aliases = ", ".join(sorted(t for t, fam in type_map.items() if fam == family)) + print(f" {fid:10s} {preset_name:32s} <- {aliases}") + if errors: + for e in errors: + print(f" FAIL: {e}") + print(f"OFL generic map check FAILED ({len(errors)} error(s))") + return False + print(f"OFL generic map check passed: {len(type_map)} type aliases, " + f"{len(set(type_map.values()))} OFL generic presets\n") + return True + def test_connection(host, port, api_key=None, verbose=False): """Test basic connectivity to Moonraker.""" url = f"http://{host}:{port}/server/info" @@ -404,11 +503,25 @@ def main(): help="Only read and display current lane data") parser.add_argument("--load", metavar="FILE", help="Load lane data from JSON file and overwrite printer lanes") + parser.add_argument("--check-ofl-map", action="store_true", + help="Only run the offline check that the C++ generic-type map " + "resolves against shipped OrcaFilamentLibrary presets") parser.add_argument("--verbose", "-v", action="store_true", help="Verbose output for debugging") args = parser.parse_args() + # Offline check first: the C++ type normalization must resolve against shipped + # OFL presets (no printer needed). + if not check_ofl_generic_map(): + return 1 + if args.check_ofl_map: + return 0 + + if requests is None: + print("The 'requests' module is required for live printer operations (pip install requests).") + return 1 + print(f"\nConnecting to Moonraker at {args.host}:{args.port}...") # First test basic connectivity diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index 14d7d439b7..d60377f51e 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -34,12 +34,18 @@ def load_json_file(path): # --------------------------------------------------------------------------- def preset(name, filament_id=None, inherits=None, instantiation=True, - compatible_printers=None): + compatible_printers=None, filament_vendor=None, filament_type=None): data = {"type": "filament", "name": name} if inherits is not None: data["inherits"] = inherits if filament_id is not None: data["filament_id"] = filament_id + if filament_vendor is not None: + data["filament_vendor"] = ( + [filament_vendor] if isinstance(filament_vendor, str) else filament_vendor) + if filament_type is not None: + data["filament_type"] = ( + [filament_type] if isinstance(filament_type, str) else filament_type) data["instantiation"] = "true" if instantiation else "false" if compatible_printers is not None: data["compatible_printers"] = compatible_printers @@ -102,13 +108,18 @@ class SyntheticTree: with open(idx_path, "w", encoding="utf-8") as f: json.dump(index, f, indent=4, ensure_ascii=False) + def write_ledger(self, retired=None, hints=None): + afi.write_ledger(self.retired, {"retired": retired or {}, + "hints": hints or {}}) + # -- pipeline wrappers --------------------------------------------------- - def update_snapshot(self, allow_shared_catalog=False): + def update_snapshot(self, allow_shared_catalog=False, forget_path=None): buf = io.StringIO() with contextlib.redirect_stdout(buf): rc = afi.update_snapshot(self.profiles, self.snapshot, self.retired, - allow_shared_catalog=allow_shared_catalog) + allow_shared_catalog=allow_shared_catalog, + forget_path=forget_path) return rc, buf.getvalue() def check(self): @@ -124,17 +135,37 @@ class SyntheticTree: self.retired) return changed, errors, buf.getvalue() + def remint(self, vendors): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + changed, errors = afi.remint_vendors(vendors, self.profiles, self.retired) + return changed, errors, buf.getvalue() + + def drop_redundant(self, vendor): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + dropped, errors = afi.drop_redundant_ids(vendor, self.profiles) + return dropped, errors, buf.getvalue() + + def add_hint(self, pairs): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + rc = afi.add_hints(pairs, self.profiles, self.retired) + return rc, buf.getvalue() + def make_clean_tree(): """Baseline tree: OFL base+generic, a vendor family, a clean tuned generic.""" t = SyntheticTree() t.add_vendor(OFL, [ - preset("fdm_pla", filament_id="OGFL99", instantiation=False), + preset("fdm_pla", filament_id="OGFL99", instantiation=False, + filament_vendor="Generic", filament_type="PLA"), preset("Generic PLA @System", inherits="fdm_pla", compatible_printers=[]), ]) t.add_vendor("VendorA", [ - preset("APLA @base", filament_id="AX01", instantiation=False), + preset("APLA @base", filament_id="AX01", instantiation=False, + filament_vendor="AVendor", filament_type="PLA"), preset("APLA @P1", inherits="APLA @base", compatible_printers=["P1 0.4 nozzle"]), # Correctly tuned OFL generic: keeps the OFL base name, claims a printer. @@ -163,33 +194,45 @@ class TestMint(unittest.TestCase): uuid.UUID("c4d3ff49-4c32-5534-a3e3-00894157ab97")) def test_known_vector(self): - # Hardcoded, independently computed vector: freezes prefix, input string - # layout ("filament_family//") and base62 derivation. - self.assertEqual(afi.generate_filament_id("Qidi", "HATCHBOX PLA"), "OFiJYDPC") + # Hardcoded, independently computed vectors: freeze prefix, input string + # layout ("filament_product///") and base62 tail. + self.assertEqual(afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA"), + "OF5CgdDq") + self.assertEqual(afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA", + salt=1), "OFD9mV8H") + self.assertEqual(afi.generate_filament_id("Generic", "PLA", "Generic PLA"), + "OFDSrzZ8") def test_determinism_and_format(self): - for vendor, family in [("Qidi", "HATCHBOX PLA"), ("Creality", "CR PLA"), - ("OrcaFilamentLibrary", "Generic ABS"), - ("BBL", "拓竹 PLA")]: # unicode family - a = afi.generate_filament_id(vendor, family) - b = afi.generate_filament_id(vendor, family) + for triple in [("Polymaker", "PLA", "PolyLite PLA"), + ("Creality", "PLA", "CR PLA"), + ("Generic", "ABS", "Generic ABS"), + ("拓竹", "PLA", "拓竹 PLA")]: # unicode components + a = afi.generate_filament_id(*triple) + b = afi.generate_filament_id(*triple) self.assertEqual(a, b) self.assertRegex(a, r"^OF[0-9A-Za-z]{6}$") self.assertEqual(len(a), 8) + def test_every_triple_component_changes_the_id(self): + base = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA") + self.assertNotEqual(base, afi.generate_filament_id("Other", "PLA", "PolyLite PLA")) + self.assertNotEqual(base, afi.generate_filament_id("Polymaker", "PETG", "PolyLite PLA")) + self.assertNotEqual(base, afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA Pro")) + def test_salt_changes_id(self): - base = afi.generate_filament_id("Qidi", "HATCHBOX PLA") - salted = afi.generate_filament_id("Qidi", "HATCHBOX PLA", salt=1) + base = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA") + salted = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA", salt=1) self.assertNotEqual(base, salted) self.assertRegex(salted, r"^OF[0-9A-Za-z]{6}$") def test_mint_salt_iteration(self): - v, fam = "Qidi", "HATCHBOX PLA" - taken = {afi.generate_filament_id(v, fam, s) for s in range(2)} - self.assertEqual(afi.mint_filament_id(v, fam, taken), - afi.generate_filament_id(v, fam, salt=2)) - self.assertEqual(afi.mint_filament_id(v, fam, set()), - afi.generate_filament_id(v, fam)) + triple = ("Polymaker", "PLA", "PolyLite PLA") + taken = {afi.generate_filament_id(*triple, salt=s) for s in range(2)} + self.assertEqual(afi.mint_filament_id(*triple, taken), + afi.generate_filament_id(*triple, salt=2)) + self.assertEqual(afi.mint_filament_id(*triple, set()), + afi.generate_filament_id(*triple)) class TestBaseName(unittest.TestCase): @@ -278,8 +321,74 @@ class TestResolver(unittest.TestCase): self.assertEqual(fid, "PARENT") +class TestTripleResolution(unittest.TestCase): + @staticmethod + def rec(name, inherits=None, filament_vendor=None, filament_type=None): + return {"name": name, "inherits": inherits, + "filament_vendor": filament_vendor, "filament_type": filament_type} + + def field(self, name, vendor_recs, ofl_recs, field="filament_vendor"): + fmap = {r["name"]: r for r in vendor_recs} + omap = {r["name"]: r for r in ofl_recs} + return afi.resolve_filament_field(name, field, fmap, omap) + + def test_own_value_first_element_of_list(self): + got = self.field("A", [self.rec("A", filament_vendor=["Poly", "Ignored"])], []) + self.assertEqual(got, "Poly") + + def test_plain_string_value_tolerated(self): + got = self.field("A", [self.rec("A", filament_vendor="Poly")], []) + self.assertEqual(got, "Poly") + + def test_inherited_within_vendor(self): + got = self.field( + "A", [self.rec("A", inherits="B"), self.rec("B", inherits="C"), + self.rec("C", filament_vendor=["Poly"])], []) + self.assertEqual(got, "Poly") + + def test_empty_list_keeps_walking(self): + got = self.field( + "A", [self.rec("A", inherits="B", filament_vendor=[]), + self.rec("B", filament_vendor=["Poly"])], []) + self.assertEqual(got, "Poly") + + def test_ofl_fallback(self): + got = self.field( + "A", [self.rec("A", inherits="Generic PLA @System")], + [self.rec("Generic PLA @System", inherits="fdm_pla"), + self.rec("fdm_pla", filament_vendor=["Generic"])]) + self.assertEqual(got, "Generic") + + def test_ofl_stays_in_ofl(self): + got = self.field( + "A", + [self.rec("A", inherits="ofl_entry"), + self.rec("fdm_pla", filament_vendor=["WRONG"])], + [self.rec("ofl_entry", inherits="fdm_pla"), + self.rec("fdm_pla", filament_vendor=["RIGHT"])]) + self.assertEqual(got, "RIGHT") + + def test_dead_end_retries_parent_in_ofl(self): + got = self.field( + "A", [self.rec("A", inherits="shared"), self.rec("shared")], + [self.rec("shared", filament_vendor=["Poly"])]) + self.assertEqual(got, "Poly") + + def test_missing_is_empty(self): + self.assertEqual(self.field("A", [self.rec("A")], []), "") + self.assertEqual(self.field("A", [self.rec("A", inherits="nope")], []), "") + + def test_resolve_triple(self): + recs = [self.rec("MyPLA @base", filament_vendor=["MyVendor"], + filament_type=["PLA"]), + self.rec("MyPLA @P1", inherits="MyPLA @base")] + fmap = {r["name"]: r for r in recs} + self.assertEqual(afi.resolve_triple("MyPLA @P1", fmap, {}), + ("MyVendor", "PLA", "MyPLA")) + + # --------------------------------------------------------------------------- -# reserved namespaces +# reserved namespaces / islands # --------------------------------------------------------------------------- class TestReservedSpaces(unittest.TestCase): @@ -289,9 +398,16 @@ class TestReservedSpaces(unittest.TestCase): self.assertEqual(afi.reserved_space_owner("P1234abc"), (True, None)) self.assertEqual(afi.reserved_space_owner("pAbCdEf1"), (True, None)) # case-insensitive self.assertEqual(afi.reserved_space_owner("null"), (True, None)) - self.assertEqual(afi.reserved_space_owner("OFiJYDPC"), (False, None)) + self.assertEqual(afi.reserved_space_owner("OF5CgdDq"), (False, None)) self.assertEqual(afi.reserved_space_owner("P1234abcd"), (False, None)) # 8 hex chars: not the user space + def test_island_declarations(self): + self.assertTrue(afi.is_island_declaration("BBL", "GFL99")) + self.assertTrue(afi.is_island_declaration("BBL", "OF5CgdDq")) + self.assertTrue(afi.is_island_declaration("Qidi", "QD_X4_PLA")) + self.assertFalse(afi.is_island_declaration("Qidi", "OF5CgdDq")) + self.assertFalse(afi.is_island_declaration("VendorA", "GFL99")) + # --------------------------------------------------------------------------- # checks on synthetic trees @@ -302,10 +418,12 @@ class TestChecks(SyntheticTreeCase): errors, out = self.t.check() self.assertEqual(errors, 0, out) self.assertNotIn("[ERROR]", out) + self.assertNotIn("[WARNING]", out) def test_check1_unknown_non_of_id(self): self.t.write_preset("VendorA", preset("BPLA @base", filament_id="BOGUS_9", - instantiation=False)) + instantiation=False, + filament_vendor="BV", filament_type="PLA")) self.t.write_preset("VendorA", preset("BPLA @P1", inherits="BPLA @base", compatible_printers=["P1"])) errors, out = self.t.check() @@ -328,27 +446,57 @@ class TestChecks(SyntheticTreeCase): self.assertIn("stability", out) self.assertIn('"VendorA/APLA"', out) - def test_check3_of_id_must_match_mint(self): + def test_check2_triple_change_needs_snapshot_update(self): + self.t.write_preset("VendorA", preset("APLA @base", filament_id="AX01", + instantiation=False, + filament_vendor="AVendor", + filament_type="PETG"), + register=False) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn('triple "AVendor/PETG/APLA" is not sanctioned', out) + self.assertIn('triple stability: snapshot triple "AVendor/PLA/APLA"', out) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_check3_of_id_must_match_triple_mint(self): self.t.write_preset("VendorA", preset("BNEW @base", filament_id="OFZZZZZZ", - instantiation=False)) + instantiation=False, + filament_vendor="BV", filament_type="PLA")) self.t.write_preset("VendorA", preset("BNEW @P1", inherits="BNEW @base", compatible_printers=["P1"])) errors, out = self.t.check() self.assertGreater(errors, 0) - self.assertIn("does not match its mint", out) - self.assertIn(afi.generate_filament_id("VendorA", "BNEW"), out) + self.assertIn("does not match the mint of its triple", out) + self.assertIn(afi.generate_filament_id("BV", "PLA", "BNEW"), out) def test_check3_salted_mint_is_accepted(self): - salted = afi.generate_filament_id("VendorA", "BNEW", salt=3) + salted = afi.generate_filament_id("BV", "PLA", "BNEW", salt=3) self.t.write_preset("VendorA", preset("BNEW @base", filament_id=salted, - instantiation=False)) + instantiation=False, + filament_vendor="BV", filament_type="PLA")) self.t.write_preset("VendorA", preset("BNEW @P1", inherits="BNEW @base", compatible_printers=["P1"])) _errors, out = self.t.check() # check 2 still wants a snapshot update - self.assertNotIn("does not match its mint", out) + self.assertNotIn("does not match the mint", out) + + def test_check3_grandfathered_id_triple_pair(self): + # A non-conforming (id, triple) pair sanctioned by the snapshot passes. + self.t.write_preset("VendorA", preset("CNEW @base", filament_id="OFZZZZZZ", + instantiation=False, + filament_vendor="CV", filament_type="PLA")) + self.t.write_preset("VendorA", preset("CNEW @P1", inherits="CNEW @base", + compatible_printers=["P1"])) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) def test_check4_retired_id_reuse(self): - afi.write_ledger(self.t.retired, {"retired": {"AX01": ["VendorA/APLA"]}}) + self.t.write_ledger(retired={"AX01": {"claims": ["VendorA/APLA"], + "successor": None}}) errors, out = self.t.check() self.assertGreater(errors, 0) self.assertIn("retired", out) @@ -371,6 +519,37 @@ class TestChecks(SyntheticTreeCase): self.assertGreater(errors, 0) self.assertIn("cannot shadow the OFL preset", out) + def test_check5_own_id_key_on_ofl_rider(self): + # A vendor root that declares its own id while inheriting an OFL family + # forks the family off the catalog id. + self.t.write_preset("VendorA", preset("GPLA @base", filament_id="AX77", + instantiation=False, + inherits="Generic PLA @System")) + self.t.write_preset("VendorA", preset("GPLA @P1", inherits="GPLA @base", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn('declares its own filament_id "AX77"', out) + + def test_check5_applies_to_non_generic_ofl_families(self): + fid = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA") + self.t.write_preset(OFL, preset("poly_pla_base", filament_id=fid, + instantiation=False, + filament_vendor="Polymaker", + filament_type="PLA")) + self.t.write_preset(OFL, preset("PolyLite PLA @System", + inherits="poly_pla_base", + compatible_printers=[])) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.t.write_preset("VendorA", preset("PolyX PLA @P1", + inherits="PolyLite PLA @System", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("rename re-exposes the OFL preset", out) + self.assertIn("PolyX PLA @P1", out) + def test_check5_exception_is_grandfathered(self): self.t.write_preset("VendorA", preset("Tuned PLA @P1", inherits="Generic PLA @System", @@ -388,7 +567,9 @@ class TestChecks(SyntheticTreeCase): with self.subTest(fid=fid): name = f"R{fid} @base" self.t.write_preset("VendorA", preset(name, filament_id=fid, - instantiation=False)) + instantiation=False, + filament_vendor="RV", + filament_type="PLA")) self.t.write_preset("VendorA", preset(f"R{fid} @P1", inherits=name, compatible_printers=["P1"])) errors, out = self.t.check() @@ -428,6 +609,184 @@ class TestChecks(SyntheticTreeCase): self.assertIn("snapshot not found", out) +class TestCheck8(SyntheticTreeCase): + def test_8a_empty_vendor_is_hard_error(self): + fid = afi.generate_filament_id("", "PLA", "NVPLA") + self.t.write_preset("VendorA", preset("NVPLA @base", filament_id=fid, + instantiation=False, + filament_type="PLA")) + self.t.write_preset("VendorA", preset("NVPLA @P1", inherits="NVPLA @base", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("resolves empty filament_vendor", out) + self.assertIn('filament_vendor "Generic"', out) + # No grandfathering: sanctioning the tree does not silence check 8a. + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + self.assertIn("resolves empty filament_vendor", out) + + def test_8b_divergent_family_triples(self): + id1 = afi.generate_filament_id("MV", "PLA", "MPLA") + id2 = afi.generate_filament_id("MV", "PETG", "MPLA") + self.t.write_preset("VendorA", preset("MPLA @base1", filament_id=id1, + instantiation=False, + filament_vendor="MV", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("MPLA @base2", filament_id=id2, + instantiation=False, + filament_vendor="MV", + filament_type="PETG")) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("divergent triples", out) + self.assertIn("MV/PLA/MPLA", out) + self.assertIn("MV/PETG/MPLA", out) + # ... until --update-snapshot grandfathers the family in triple_exceptions. + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.assertIn("VendorA/MPLA", load_json_file(self.t.snapshot)["triple_exceptions"]) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_8_cross_bundle_divergence_is_warning_only(self): + fid = afi.generate_filament_id("BV", "PETG", "APLA") + self.t.add_vendor("VendorB", [ + preset("APLA @base", filament_id=fid, instantiation=False, + filament_vendor="BV", filament_type="PETG"), + preset("APLA @PB", inherits="APLA @base", + compatible_printers=["PB 0.4 nozzle"]), + ]) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + self.assertIn("[WARNING]", out) + self.assertIn("across bundles", out) + self.assertIn('"APLA"', out) + + +class TestCheck9(SyntheticTreeCase): + def test_ok_chain_null_and_live(self): + self.t.write_ledger(retired={ + "R1": {"claims": ["VendorA/Gone1"], "successor": "AX01"}, + "R2": {"claims": ["VendorA/Gone2"], "successor": "R1"}, + "R3": {"claims": ["VendorA/Gone3"], "successor": None}, + }) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_cycle_is_an_error(self): + self.t.write_ledger(retired={ + "C1": {"claims": [], "successor": "C2"}, + "C2": {"claims": [], "successor": "C1"}, + }) + errors, out = self.t.check() + self.assertEqual(errors, 2, out) + self.assertIn("cycles", out) + + def test_dead_end_is_an_error(self): + self.t.write_ledger(retired={ + "D1": {"claims": [], "successor": "OFnope99"}, + }) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + self.assertIn("dead-ends", out) + self.assertIn("OFnope99", out) + + def test_hint_key_must_be_in_island_space(self): + self.t.write_ledger(hints={"AX01": "OGFL99"}) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + self.assertIn("not in an island id space", out) + + def test_hint_key_may_be_absent_island_id(self): + # Released / never-shipped island-catalog ids are valid hint keys. + self.t.write_ledger(hints={"GFXX99": "AX01"}) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_hint_key_must_not_be_retired_too(self): + self.t.write_ledger(retired={"GFXX99": {"claims": [], "successor": "AX01"}}, + hints={"GFXX99": "AX01"}) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + self.assertIn("never both", out) + + def test_live_hint_key_with_non_island_declarer_is_an_error(self): + self.t.write_preset("VendorA", preset( + "GPLA @base", filament_id="GFZZ01", instantiation=False, + filament_vendor="Generic", filament_type="PLA")) + self.t.write_preset("VendorA", preset( + "GPLA @P1", inherits="GPLA @base", + compatible_printers=["P1 0.4 nozzle"])) + rc, _out = self.t.update_snapshot(allow_shared_catalog=True) + self.assertEqual(rc, 0) + self.t.write_ledger(hints={"GFZZ01": "AX01"}) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + self.assertIn("re-mint those declarers first", out) + + def test_island_hint_ok_and_value_must_chain_live(self): + self.t.add_vendor("BBL", [ + preset("BPLA @base", filament_id="GFB01", instantiation=False), + preset("BPLA @X1C", inherits="BPLA @base", + compatible_printers=["X1C 0.4 nozzle"]), + ]) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.t.write_ledger(hints={"GFB01": "AX01"}) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + # A hint chain ending on a null retirement is dead for the runtime. + self.t.write_ledger(retired={"R9": {"claims": [], "successor": None}}, + hints={"GFB01": "R9"}) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + self.assertIn("chain-terminate at a live tree id", out) + + +# --------------------------------------------------------------------------- +# successor mode rule + ledger schema migration +# --------------------------------------------------------------------------- + +class TestSuccessorMode(unittest.TestCase): + def test_majority_wins(self): + claim_ids = {"V/A": {"ID1"}, "V/B": {"ID1"}, "V/C": {"ID2"}} + succ, counts = afi.successor_by_mode(["V/A", "V/B", "V/C"], claim_ids) + self.assertEqual(succ, "ID1") + self.assertEqual(counts, {"ID1": 2, "ID2": 1}) + + def test_tie_breaks_lexicographically(self): + claim_ids = {"V/A": {"IDB"}, "V/B": {"IDA"}} + succ, counts = afi.successor_by_mode(["V/A", "V/B"], claim_ids) + self.assertEqual(succ, "IDA") + self.assertEqual(counts, {"IDA": 1, "IDB": 1}) + + def test_no_surviving_family_means_null(self): + self.assertEqual(afi.successor_by_mode(["V/GONE"], {}), (None, {})) + self.assertEqual(afi.successor_by_mode([], {"V/A": {"ID1"}}), (None, {})) + + +class TestLedgerMigration(SyntheticTreeCase): + def test_backfill_successors_via_mode_rule(self): + analysis = afi.analyze_tree(self.t.profiles) + claim_ids = afi.claim_effective_ids(analysis) + old = { + "X9": ["VendorA/APLA"], # family lives on + "Y9": ["VendorA/GONE"], # family died + "Z9": {"claims": ["kept"], "successor": "AX01"}, # already migrated + } + migrated = afi.migrate_retired_entries(old, claim_ids) + self.assertEqual(migrated["X9"], + {"claims": ["VendorA/APLA"], "successor": "AX01"}) + self.assertEqual(migrated["Y9"], + {"claims": ["VendorA/GONE"], "successor": None}) + self.assertEqual(migrated["Z9"], old["Z9"]) + + # --------------------------------------------------------------------------- # --update-snapshot # --------------------------------------------------------------------------- @@ -448,30 +807,117 @@ class TestUpdateSnapshot(SyntheticTreeCase): self.assertEqual(snap["ids"]["AX01"], ["VendorA/APLA"]) self.assertEqual(snap["ids"]["OGFL99"], ["OrcaFilamentLibrary/Generic PLA", "VendorA/Generic PLA"]) + self.assertEqual(snap["triples"]["AX01"], [["AVendor", "PLA", "APLA"]]) + self.assertEqual(snap["triples"]["OGFL99"], [["Generic", "PLA", "fdm_pla"]]) + self.assertEqual(snap["triple_exceptions"], []) - def test_vanished_id_is_retired(self): + def test_vanished_island_id_released_with_hint_not_retired(self): + self.t.write_preset("VendorA", preset( + "GPLA @base", filament_id="GFZZ01", instantiation=False, + filament_vendor="Generic", filament_type="PLA")) + self.t.write_preset("VendorA", preset( + "GPLA @P1", inherits="GPLA @base", + compatible_printers=["P1 0.4 nozzle"])) + rc, _out = self.t.update_snapshot(allow_shared_catalog=True) + self.assertEqual(rc, 0) + # The family re-mints away from the island id: released, not retired. + self.t.write_preset("VendorA", preset( + "GPLA @base", filament_id="OFaaaaaa", instantiation=False, + filament_vendor="Generic", filament_type="PLA"), register=False) + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.assertIn("released to the BBL island space", out) + ledger = afi.load_ledger(self.t.retired) + self.assertNotIn("GFZZ01", ledger["retired"]) + self.assertEqual(ledger["hints"].get("GFZZ01"), "OFaaaaaa") + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + # The island may legitimately (re)ship a released id later. + self.t.add_vendor("BBL", [ + preset("BPLA @base", filament_id="GFZZ01", instantiation=False), + preset("BPLA @X1C", inherits="BPLA @base", + compatible_printers=["X1C 0.4 nozzle"]), + ]) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_vanished_id_is_retired_with_null_successor(self): self.t.remove_preset("VendorA", "APLA @base") self.t.remove_preset("VendorA", "APLA @P1") rc, out = self.t.update_snapshot() self.assertEqual(rc, 0) self.assertIn("AX01", out) - retired = load_json_file(self.t.retired) - self.assertEqual(retired["retired"], {"AX01": ["VendorA/APLA"]}) + retired = load_json_file(self.t.retired)["retired"] + self.assertEqual(retired, + {"AX01": {"claims": ["VendorA/APLA"], "successor": None}}) snap = load_json_file(self.t.snapshot) self.assertNotIn("AX01", snap["ids"]) + self.assertNotIn("AX01", snap["triples"]) # append-only + idempotent: a second run keeps the ledger intact rc, out = self.t.update_snapshot() self.assertEqual(rc, 0) self.assertIn("nothing changed", out) - retired2 = load_json_file(self.t.retired) - self.assertEqual(retired, retired2) + self.assertEqual(retired, load_json_file(self.t.retired)["retired"]) # ... and a retired id may never be minted again - self.assertNotIn(afi.mint_filament_id("VendorA", "APLA", - set(retired["retired"])), retired["retired"]) + self.assertNotIn(afi.mint_filament_id("AVendor", "PLA", "APLA", + set(retired)), retired) + + def test_vanished_id_successor_follows_surviving_family(self): + # The family lives on under a new id (a re-mint): the mode rule finds it. + self.t.write_preset("VendorA", preset("APLA @base", filament_id="AXNEW", + instantiation=False, + filament_vendor="AVendor", + filament_type="PLA"), + register=False) + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 0) + retired = load_json_file(self.t.retired)["retired"] + self.assertEqual(retired["AX01"], + {"claims": ["VendorA/APLA"], "successor": "AXNEW"}) + + def test_multi_candidate_retirement_warns_and_ties_break(self): + self.t.write_preset("VendorA", preset("SHRD @base", filament_id="SH01", + instantiation=False, + filament_vendor="SV", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("CH1 @P1", inherits="SHRD @base", + compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("CH2 @P1", inherits="SHRD @base", + compatible_printers=["P1"])) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + # Split the two families onto their own roots and drop the shared id. + self.t.write_preset("VendorA", preset("CH1 @base", filament_id="SA01", + instantiation=False, + filament_vendor="SV", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("CH2 @base", filament_id="SB01", + instantiation=False, + filament_vendor="SV", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("CH1 @P1", inherits="CH1 @base", + compatible_printers=["P1"]), + register=False) + self.t.write_preset("VendorA", preset("CH2 @P1", inherits="CH2 @base", + compatible_printers=["P1"]), + register=False) + self.t.remove_preset("VendorA", "SHRD @base") + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.assertIn("[WARNING]", out) + self.assertIn("SB01", out) # the losing candidate is named + retired = load_json_file(self.t.retired)["retired"] + self.assertEqual(retired["SH01"]["successor"], "SA01") + self.assertEqual(retired["SH01"]["claims"], + ["VendorA/CH1", "VendorA/CH2"]) def test_refuses_new_reserved_namespace_claims(self): self.t.write_preset("VendorA", preset("CNEW @base", filament_id="GFX99", - instantiation=False)) + instantiation=False, + filament_vendor="CV", + filament_type="PLA")) self.t.write_preset("VendorA", preset("CNEW @P1", inherits="CNEW @base", compatible_printers=["P1"])) with open(self.t.snapshot, "rb") as f: @@ -487,6 +933,122 @@ class TestUpdateSnapshot(SyntheticTreeCase): self.assertEqual(snap["ids"]["GFX99"], ["VendorA/CNEW"]) +class TestForgetNeverShipped(SyntheticTreeCase): + def forget_file(self, ids): + path = os.path.join(self.t.dir, "forget.json") + with open(path, "w", encoding="utf-8") as f: + json.dump(ids, f) + return path + + def test_refuses_when_listed_id_is_live(self): + with open(self.t.snapshot, "rb") as f: + before = f.read() + rc, out = self.t.update_snapshot(forget_path=self.forget_file(["AX01"])) + self.assertEqual(rc, 1) + self.assertIn("still in the tree", out) + with open(self.t.snapshot, "rb") as f: + self.assertEqual(f.read(), before) + + def test_forgotten_id_is_not_retired(self): + self.t.write_preset("VendorA", preset("ZN @base", filament_id="Y999", + instantiation=False, + filament_vendor="ZV", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("ZN @P1", inherits="ZN @base", + compatible_printers=["P1"])) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + self.t.remove_preset("VendorA", "ZN @base") + self.t.remove_preset("VendorA", "ZN @P1") + rc, out = self.t.update_snapshot(forget_path=self.forget_file(["Y999"])) + self.assertEqual(rc, 0) + self.assertIn("forgotten (never shipped)", out) + self.assertNotIn("Y999", load_json_file(self.t.retired)["retired"]) + self.assertNotIn("Y999", load_json_file(self.t.snapshot)["ids"]) + + def test_splices_chains_through_forgotten_id(self): + self.t.write_preset("VendorA", preset("ZN @base", filament_id="Y999", + instantiation=False, + filament_vendor="ZV", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("ZN @P1", inherits="ZN @base", + compatible_printers=["P1"])) + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + # A shipped id already forwards to Y999, which turns out never shipped. + self.t.write_ledger(retired={ + "OLD1": {"claims": ["VendorA/ZN"], "successor": "Y999"}}) + # The family re-mints to NEWZ and Y999 vanishes. + self.t.write_preset("VendorA", preset("ZN @base", filament_id="NEWZ", + instantiation=False, + filament_vendor="ZV", + filament_type="PLA"), + register=False) + rc, out = self.t.update_snapshot(forget_path=self.forget_file(["Y999"])) + self.assertEqual(rc, 0) + self.assertIn("spliced succession", out) + retired = load_json_file(self.t.retired)["retired"] + self.assertNotIn("Y999", retired) + self.assertEqual(retired["OLD1"], + {"claims": ["VendorA/ZN"], "successor": "NEWZ"}) + + +# --------------------------------------------------------------------------- +# --add-hint +# --------------------------------------------------------------------------- + +class TestAddHint(SyntheticTreeCase): + def add_bbl(self): + self.t.add_vendor("BBL", [ + preset("BPLA @base", filament_id="GFB01", instantiation=False), + preset("BPLA @X1C", inherits="BPLA @base", + compatible_printers=["X1C 0.4 nozzle"]), + ]) + rc, _out = self.t.update_snapshot() + assert rc == 0 + + def test_adds_island_hint(self): + self.add_bbl() + rc, out = self.t.add_hint(["GFB01=AX01"]) + self.assertEqual(rc, 0, out) + self.assertEqual(load_json_file(self.t.retired)["hints"], + {"GFB01": "AX01"}) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_rejects_non_island_old(self): + rc, out = self.t.add_hint(["AX01=OGFL99"]) + self.assertEqual(rc, 1) + self.assertIn("not in an island id space", out) + self.assertEqual(afi.load_ledger(self.t.retired)["hints"], {}) + + def test_accepts_absent_island_old(self): + # Island catalogs own ids Orca never shipped (or has released). + rc, out = self.t.add_hint(["GFXX99=AX01"]) + self.assertEqual(rc, 0, out) + self.assertEqual(load_json_file(self.t.retired)["hints"], + {"GFXX99": "AX01"}) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_rejects_retired_old(self): + self.t.write_ledger(retired={"ROLD": {"claims": [], "successor": None}}) + rc, out = self.t.add_hint(["ROLD=AX01"]) + self.assertEqual(rc, 1) + self.assertIn("is retired", out) + + def test_rejects_dead_target(self): + self.add_bbl() + rc, out = self.t.add_hint(["GFB01=OFnope99"]) + self.assertEqual(rc, 1) + self.assertIn("not a live tree id", out) + + def test_rejects_malformed_pair(self): + rc, out = self.t.add_hint(["GFB01"]) + self.assertEqual(rc, 1) + self.assertIn('expects "OLD=NEW"', out) + + # --------------------------------------------------------------------------- # default run: mint + insert # --------------------------------------------------------------------------- @@ -498,21 +1060,25 @@ class TestAssign(SyntheticTreeCase): self.assertIn("nothing to do (0 files changed)", out) def test_mints_into_family_root_and_rootless_member(self): - self.t.write_preset("VendorA", preset("FNEW @base", instantiation=False)) + self.t.write_preset("VendorA", preset("FNEW @base", instantiation=False, + filament_vendor="FV", + filament_type="PLA")) self.t.write_preset("VendorA", preset("FNEW @P1", inherits="FNEW @base", compatible_printers=["P1"])) self.t.write_preset("VendorA", preset("FNEW @P2", inherits="FNEW @base", compatible_printers=["P2"])) - self.t.write_preset("VendorA", preset("GNEW @P1", compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("GNEW @P1", compatible_printers=["P1"], + filament_vendor="GV", + filament_type="PETG")) changed, errors, _out = self.t.assign() self.assertEqual(errors, 0) self.assertEqual(changed, 2) # one root + one root-less member root = load_json_file(self.t.preset_path("VendorA", "FNEW @base")) self.assertEqual(root["filament_id"], - afi.generate_filament_id("VendorA", "FNEW")) + afi.generate_filament_id("FV", "PLA", "FNEW")) member = load_json_file(self.t.preset_path("VendorA", "GNEW @P1")) self.assertEqual(member["filament_id"], - afi.generate_filament_id("VendorA", "GNEW")) + afi.generate_filament_id("GV", "PETG", "GNEW")) # variants themselves never get the key child = load_json_file(self.t.preset_path("VendorA", "FNEW @P1")) self.assertNotIn("filament_id", child) @@ -521,8 +1087,36 @@ class TestAssign(SyntheticTreeCase): self.assertEqual((changed, errors), (0, 0)) self.assertIn("nothing to do", out) + def test_refuses_family_with_incomplete_triple(self): + self.t.write_preset("VendorA", preset("ENEW @base", instantiation=False)) + self.t.write_preset("VendorA", preset("ENEW @P1", inherits="ENEW @base", + compatible_printers=["P1"])) + changed, errors, out = self.t.assign() + self.assertEqual(changed, 0) + self.assertGreater(errors, 0) + self.assertIn("resolves empty filament_vendor and filament_type", out) + self.assertIn("mint key needs both", out) + + def test_refuses_family_with_divergent_root_fields(self): + self.t.write_preset("VendorA", preset("HNEW @base1", instantiation=False, + filament_vendor="HV", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("HNEW @base2", instantiation=False, + filament_vendor="HV", + filament_type="PETG")) + self.t.write_preset("VendorA", preset("HNEW @P1", inherits="HNEW @base1", + compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("HNEW @P2", inherits="HNEW @base2", + compatible_printers=["P2"])) + changed, errors, out = self.t.assign() + self.assertEqual(changed, 0) + self.assertGreater(errors, 0) + self.assertIn("divergent (filament_vendor, filament_type)", out) + def test_shared_root_between_families_is_refused(self): - self.t.write_preset("VendorA", preset("shared_base", instantiation=False)) + self.t.write_preset("VendorA", preset("shared_base", instantiation=False, + filament_vendor="SV", + filament_type="PLA")) self.t.write_preset("VendorA", preset("HNEW @P1", inherits="shared_base", compatible_printers=["P1"])) self.t.write_preset("VendorA", preset("INEW @P1", inherits="shared_base", @@ -533,6 +1127,10 @@ class TestAssign(SyntheticTreeCase): self.assertIn("shared with famil", out) +# --------------------------------------------------------------------------- +# byte-preserving profile edits +# --------------------------------------------------------------------------- + class TestInsertEditing(unittest.TestCase): CRLF_TEXT = ( '{\r\n' @@ -546,6 +1144,17 @@ class TestInsertEditing(unittest.TestCase): '\t]\r\n' '}\r\n' ) + CRLF_WITH_ID = ( + '{\r\n' + '\t"type": "filament",\r\n' + '\t"name": "JNEW @base",\r\n' + '\t"filament_id": "OFold123",\r\n' + '\t"instantiation": "false",\r\n' + '\t"filament_type": [\r\n' + '\t\t"PLA"\r\n' + '\t]\r\n' + '}\r\n' + ) def test_insert_before_instantiation_preserves_bytes(self): text, n = afi.insert_filament_id(self.CRLF_TEXT, "OFabc123") @@ -585,6 +1194,192 @@ class TestInsertEditing(unittest.TestCase): raw.replace(b'\t"filament_id": "OFabc123",\r\n', b"", 1), self.CRLF_TEXT.encode("utf-8")) + def test_replace_value_preserves_every_other_byte(self): + text, n = afi.replace_filament_id_value(self.CRLF_WITH_ID, + "OFold123", "OFnew456") + self.assertEqual(n, 1) + self.assertEqual(json.loads(text)["filament_id"], "OFnew456") + self.assertEqual(text, self.CRLF_WITH_ID.replace('"OFold123"', '"OFnew456"')) + + def test_replace_value_requires_exact_old_value(self): + _text, n = afi.replace_filament_id_value(self.CRLF_WITH_ID, + "OFwrong1", "OFnew456") + self.assertEqual(n, 0) + + def test_rewrite_filament_id_on_disk(self): + t = SyntheticTree() + self.addCleanup(t.cleanup) + t.add_vendor("VendorA", []) + path = t.preset_path("VendorA", "JNEW @base") + with open(path, "wb") as f: + f.write(self.CRLF_WITH_ID.encode("utf-8")) + afi.rewrite_filament_id(path, "OFold123", "OFnew456") + with open(path, "rb") as f: + raw = f.read() + self.assertEqual(raw, + self.CRLF_WITH_ID.replace('"OFold123"', '"OFnew456"') + .encode("utf-8")) + with self.assertRaises(RuntimeError): + afi.rewrite_filament_id(path, "OFold123", "OFxxx999") # stale old id + + def test_delete_line_with_trailing_comma(self): + text, n = afi.delete_filament_id_line(self.CRLF_WITH_ID, "OFold123") + self.assertEqual(n, 1) + self.assertNotIn("filament_id", json.loads(text)) + self.assertEqual(text, self.CRLF_WITH_ID.replace( + '\t"filament_id": "OFold123",\r\n', "", 1)) + + def test_delete_last_property_line(self): + lf_text = ('{\n "name": "K @base",\n "instantiation": "false",\n' + ' "filament_id": "OFold123"\n}\n') + text, n = afi.delete_filament_id_line(lf_text, "OFold123") + self.assertEqual(n, 1) + data = json.loads(text) + self.assertNotIn("filament_id", data) + self.assertEqual(data["instantiation"], "false") + + +# --------------------------------------------------------------------------- +# --remint +# --------------------------------------------------------------------------- + +class TestRemint(SyntheticTreeCase): + TRIPLE = ("AVendor", "PLA", "APLA") + + def test_rewrites_mismatching_declaration(self): + want = afi.generate_filament_id(*self.TRIPLE) + changed, errors, out = self.t.remint(["VendorA"]) + self.assertEqual(errors, 0, out) + self.assertEqual(changed, 1) + self.assertIn('"AX01" -> "%s"' % want, out) + root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) + self.assertEqual(root["filament_id"], want) + # OFL was not part of the run + ofl_root = load_json_file(self.t.preset_path(OFL, "fdm_pla")) + self.assertEqual(ofl_root["filament_id"], "OGFL99") + # idempotent: a second run over the same vendor rewrites nothing + changed, errors, _out = self.t.remint(["VendorA"]) + self.assertEqual((changed, errors), (0, 0)) + + def test_same_triple_converges_within_run(self): + self.t.add_vendor("VendorB", [ + preset("APLA @Bbase", filament_id="BX01", instantiation=False, + filament_vendor="AVendor", filament_type="PLA"), + preset("APLA @PB", inherits="APLA @Bbase", + compatible_printers=["PB 0.4 nozzle"]), + ]) + want = afi.generate_filament_id(*self.TRIPLE) + changed, errors, _out = self.t.remint(["VendorA", "VendorB"]) + self.assertEqual(errors, 0) + self.assertEqual(changed, 2) + a = load_json_file(self.t.preset_path("VendorA", "APLA @base")) + b = load_json_file(self.t.preset_path("VendorB", "APLA @Bbase")) + self.assertEqual(a["filament_id"], want) + self.assertEqual(b["filament_id"], want) + + def test_same_triple_converges_with_existing_tree_id(self): + # Another bundle already carries the conforming id for the same triple: + # reuse is required, not blocked. + want = afi.generate_filament_id(*self.TRIPLE) + self.t.add_vendor("VendorB", [ + preset("APLA @Bbase", filament_id=want, instantiation=False, + filament_vendor="AVendor", filament_type="PLA"), + ]) + changed, errors, _out = self.t.remint(["VendorA"]) + self.assertEqual((changed, errors), (1, 0)) + a = load_json_file(self.t.preset_path("VendorA", "APLA @base")) + self.assertEqual(a["filament_id"], want) + + def test_blocked_by_retired_id(self): + want0 = afi.generate_filament_id(*self.TRIPLE) + self.t.write_ledger(retired={want0: {"claims": [], "successor": None}}) + changed, errors, _out = self.t.remint(["VendorA"]) + self.assertEqual((changed, errors), (1, 0)) + root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) + self.assertEqual(root["filament_id"], + afi.generate_filament_id(*self.TRIPLE, salt=1)) + + def test_blocked_by_hint_key(self): + want0 = afi.generate_filament_id(*self.TRIPLE) + self.t.write_ledger(hints={want0: "AX01"}) + changed, errors, _out = self.t.remint(["VendorA"]) + self.assertEqual((changed, errors), (1, 0)) + root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) + self.assertEqual(root["filament_id"], + afi.generate_filament_id(*self.TRIPLE, salt=1)) + + def test_blocked_by_other_triple_occurrence(self): + want0 = afi.generate_filament_id(*self.TRIPLE) + self.t.add_vendor("VendorB", [ + preset("BPLA @base", filament_id=want0, instantiation=False, + filament_vendor="BV", filament_type="PETG"), + ]) + changed, errors, _out = self.t.remint(["VendorA"]) + self.assertEqual((changed, errors), (1, 0)) + root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) + self.assertEqual(root["filament_id"], + afi.generate_filament_id(*self.TRIPLE, salt=1)) + + def test_bbl_is_forbidden(self): + changed, errors, out = self.t.remint(["BBL"]) + self.assertEqual(changed, 0) + self.assertGreater(errors, 0) + self.assertIn("forbidden", out) + + +# --------------------------------------------------------------------------- +# --drop-redundant-ids +# --------------------------------------------------------------------------- + +class TestDropRedundantIds(SyntheticTreeCase): + def test_drops_only_ofl_riding_same_base_name_declarations(self): + # Redundant: same base name, rides the OFL generic, re-declares its id. + self.t.write_preset("VendorA", preset("Generic PLA @P2", + inherits="Generic PLA @System", + compatible_printers=["P2"], + filament_id="OGFL99")) + # Renamed rider: not dropped (a repoint worksheet decision, not a drop). + self.t.write_preset("VendorA", preset("Tuned PLA @P3", + inherits="Generic PLA @System", + compatible_printers=["P3"], + filament_id="OGFL99")) + dropped, errors, out = self.t.drop_redundant("VendorA") + self.assertEqual(errors, 0, out) + self.assertEqual(dropped, 1) + self.assertIn('dropped filament_id "OGFL99"', out) + self.assertIn('rides OFL "Generic PLA @System"', out) + gone = load_json_file(self.t.preset_path("VendorA", "Generic PLA @P2")) + self.assertNotIn("filament_id", gone) + kept = load_json_file(self.t.preset_path("VendorA", "Tuned PLA @P3")) + self.assertEqual(kept["filament_id"], "OGFL99") + # vendor-rooted families are untouched + root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) + self.assertEqual(root["filament_id"], "AX01") + + def test_bbl_is_forbidden(self): + dropped, errors, out = self.t.drop_redundant("BBL") + self.assertEqual(dropped, 0) + self.assertGreater(errors, 0) + self.assertIn("forbidden", out) + + +# --------------------------------------------------------------------------- +# --mint CLI +# --------------------------------------------------------------------------- + +class TestMintCli(unittest.TestCase): + def test_prints_an_of_id(self): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + rc = afi.main(["--mint", "Polymaker/PLA/PolyLite PLA"]) + self.assertEqual(rc, 0) + self.assertRegex(buf.getvalue().strip(), r"^OF[0-9A-Za-z]{6}$") + + def test_requires_exactly_three_parts(self): + with self.assertRaises(SystemExit), \ + contextlib.redirect_stderr(io.StringIO()): + afi.main(["--mint", "Vendor/Family"]) + # --------------------------------------------------------------------------- # the real tree @@ -610,9 +1405,11 @@ class TestRealTree(unittest.TestCase): class TestReviewFixes(SyntheticTreeCase): def test_update_snapshot_refuses_retired_id_reuse(self): - fid = afi.generate_filament_id("VendorA", "LONER") + fid = afi.generate_filament_id("LV", "PLA", "LONER") self.t.write_preset("VendorA", preset("LONER @base", filament_id=fid, - instantiation=False)) + instantiation=False, + filament_vendor="LV", + filament_type="PLA")) self.t.write_preset("VendorA", preset("LONER @P1", inherits="LONER @base", compatible_printers=["P1 0.4 nozzle"])) rc, _ = self.t.update_snapshot() @@ -624,7 +1421,9 @@ class TestReviewFixes(SyntheticTreeCase): self.assertIn(fid, afi.load_retired(self.t.retired)) # Resurrect the same id: --update-snapshot must refuse, not sanction. self.t.write_preset("VendorA", preset("LONER @base", filament_id=fid, - instantiation=False)) + instantiation=False, + filament_vendor="LV", + filament_type="PLA")) self.t.write_preset("VendorA", preset("LONER @P1", inherits="LONER @base", compatible_printers=["P1 0.4 nozzle"])) rc, out = self.t.update_snapshot() @@ -633,12 +1432,14 @@ class TestReviewFixes(SyntheticTreeCase): self.assertNotIn(fid, load_json_file(self.t.snapshot)["ids"]) def test_check3_skips_of_id_inherited_from_other_vendor(self): - # Post-Phase-1 world: an OFL generic carries its own minted OF id and a - # vendor tunes it correctly (same base name, non-empty printers). The - # new claim must trip only the snapshot gate, never mint conformance. - fid = afi.generate_filament_id(OFL, "Generic PLA Matte") + # An OFL family carries its own minted OF id and a vendor tunes it + # correctly (same base name, non-empty printers). The new claim must + # trip only the snapshot gate, never mint conformance. + fid = afi.generate_filament_id("Generic", "PLA", "Generic PLA Matte") self.t.write_preset(OFL, preset("Generic PLA Matte @base", filament_id=fid, - instantiation=False)) + instantiation=False, + filament_vendor="Generic", + filament_type="PLA")) self.t.write_preset(OFL, preset("Generic PLA Matte @System", inherits="Generic PLA Matte @base", compatible_printers=[])) @@ -648,7 +1449,7 @@ class TestReviewFixes(SyntheticTreeCase): inherits="Generic PLA Matte @System", compatible_printers=["P1 0.4 nozzle"])) errors, out = self.t.check() - self.assertNotIn("does not match its mint", out) + self.assertNotIn("does not match the mint", out) self.assertIn("not sanctioned", out) self.assertEqual(errors, 1, out) # After sanctioning the claim the tree is fully green again. @@ -659,10 +1460,12 @@ class TestReviewFixes(SyntheticTreeCase): def test_check7c_prints_expected_mint(self): self.t.write_preset("VendorA", preset("Orphan PLA @P1", - compatible_printers=["P1 0.4 nozzle"])) + compatible_printers=["P1 0.4 nozzle"], + filament_vendor="OV", + filament_type="PLA")) errors, out = self.t.check() self.assertGreater(errors, 0) - self.assertIn(afi.generate_filament_id("VendorA", "Orphan PLA"), out) + self.assertIn(afi.generate_filament_id("OV", "PLA", "Orphan PLA"), out) if __name__ == "__main__": diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index bc728f62e5..c3a44c25f1 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -555,6 +555,60 @@ std::string generate_preset_setting_id(const std::string& vendor, const std::str return std::string(out, 16); } +std::string follow_filament_id_succession(const std::string& id, const std::map& forwards) +{ + auto it = forwards.find(id); + if (it == forwards.end()) + return std::string(); + std::set visited { id }; + std::string current = id; + while (it != forwards.end() && visited.insert(it->second).second) { + current = it->second; + it = forwards.find(current); + } + // it == end(): current is the live end of the chain; otherwise the ledger is + // cyclic and current is the last id reached before a repeat. + return current; +} + +const std::map& filament_id_succession_map() +{ + // Loaded once; C++11 magic-static initialization makes this thread-safe. + // Succession is a best-effort miss-path fallback, so a missing or corrupt + // ledger is not an error for the client - it just yields an empty map. + static const std::map forwards = []() { + std::map map; + const std::string path = Slic3r::resources_dir() + "/profiles/retired_filament_ids.json"; + boost::nowide::ifstream file(path.c_str()); + if (!file.is_open()) { + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": cannot open " << path; + return map; + } + try { + nlohmann::json ledger; + file >> ledger; + if (ledger.contains("retired") && ledger["retired"].is_object()) + for (auto& [old_id, entry] : ledger["retired"].items()) + if (entry.is_object() && entry.contains("successor") && entry["successor"].is_string()) + map[old_id] = entry["successor"].get(); + if (ledger.contains("hints") && ledger["hints"].is_object()) + for (auto& [old_id, target] : ledger["hints"].items()) + if (target.is_string()) + map[old_id] = target.get(); + } catch (...) { + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": failed to parse " << path; + map.clear(); + } + return map; + }(); + return forwards; +} + +std::string resolve_filament_id_succession(const std::string& id) +{ + return follow_filament_id_succession(id, filament_id_succession_map()); +} + std::string Preset::get_iot_type_string(Preset::Type type) { switch (type) { diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp index bbbdc6c5ff..e84f56b107 100644 --- a/src/libslic3r/Preset.hpp +++ b/src/libslic3r/Preset.hpp @@ -100,6 +100,23 @@ std::string generate_preset_setting_id(const std::string& vendor, const std::string& type, const std::string& name); +// Succession forwarding for retired/renamed filament_ids, backed by the shipped +// ledger resources/profiles/retired_filament_ids.json. Consulted on a filament_id +// resolution miss only, so live ids always resolve natively first. +// +// Pure chain walk over `forwards` (old id -> successor). Returns the final id of the +// chain, or an empty string when `id` has no entry. Cycle-guarded: on a malformed +// cyclic ledger it stops at the last id reached before any repeat (a self-loop +// returns `id` itself). +std::string follow_filament_id_succession(const std::string& id, + const std::map& forwards); +// Forwarding map loaded once (thread-safe) from the ledger, merging +// "retired" {id -> non-null successor} and "hints" {island-owned id -> live id}. +// A missing or corrupt file yields an empty map. +const std::map& filament_id_succession_map(); +// Convenience: follow_filament_id_succession(id, filament_id_succession_map()). +std::string resolve_filament_id_succession(const std::string& id); + enum ConfigFileType { CONFIG_FILE_TYPE_UNKNOWN, diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 399443a706..a0f687c26b 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -729,6 +729,12 @@ std::optional PresetBundle::get_filament_by_filament_id(const } } } + // Miss: a retired/renamed id may forward to a live successor through the shipped + // succession ledger. resolve() returns a chain-final id, so the retry below cannot + // recurse further (a malformed cyclic ledger yields a non-final id, rejected here). + const std::string successor = resolve_filament_id_succession(filament_id); + if (!successor.empty() && resolve_filament_id_succession(successor).empty()) + return get_filament_by_filament_id(successor, printer_name); return std::nullopt; } @@ -3150,6 +3156,15 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info) auto iter = std::find_if(filaments.begin(), filaments.end(), [this, &filament_id](auto &f) { return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; }); warn_ambiguous_filament_id_match(filaments, iter, filament_id); + if (iter == filaments.end()) { + // Retired/renamed ids forward to a live successor through the shipped succession ledger. + const std::string successor = resolve_filament_id_succession(filament_id); + if (!successor.empty()) { + iter = std::find_if(filaments.begin(), filaments.end(), + [this, &successor](auto &f) { return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == successor; }); + warn_ambiguous_filament_id_match(filaments, iter, successor); + } + } if (iter == filaments.end()) { BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": filament_id %1% not found or system or compatible") % filament_id; auto filament_type = ams.opt_string("filament_type", 0u); @@ -3253,6 +3268,16 @@ unsigned int PresetBundle::sync_ams_list(std::vector> filament_list = filaments.get_filament_presets(); std::set printer_names = get_printer_names_by_printer_type_and_nozzle(printer_type, nozzle_diameter_str); - for (const Preset *preset : filament_list.find(setting_id)->second) { + auto filament_iter = filament_list.find(setting_id); + if (filament_iter == filament_list.end()) + return is_equation; + + for (const Preset *preset : filament_iter->second) { if (tag_uid == "0" || (tag_uid.size() == 16 && tag_uid.substr(12, 2) == "01")) continue; if (preset && !preset->is_user()) continue; ConfigOption * printer_opt = const_cast(preset)->config.option("compatible_printers"); diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 8ed0305369..e568078851 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -59,7 +59,7 @@ int get_colume_idx(CaliColumnType type, MachineObject* obj) return type; } -static wxString get_preset_name_by_filament_id(std::string filament_id) +static wxString get_preset_name_by_filament_id(std::string filament_id, bool follow_succession = true) { auto preset_bundle = wxGetApp().preset_bundle; auto collection = &preset_bundle->filaments; @@ -93,6 +93,12 @@ static wxString get_preset_name_by_filament_id(std::string filament_id) } } } + if (preset_name.empty() && follow_succession) { + // Retired/renamed ids forward to a live successor through the shipped succession ledger. + const std::string successor = resolve_filament_id_succession(filament_id); + if (!successor.empty()) + preset_name = get_preset_name_by_filament_id(successor, false); + } return preset_name; } diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 9d7afd13b9..963ecca4e5 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2540,14 +2540,22 @@ std::string MachineObject::setting_id_to_type(std::string setting_id, std::strin std::string type; PresetBundle* preset_bundle = GUI::wxGetApp().preset_bundle; if (preset_bundle) { - for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) { - - if (it->filament_id.compare(setting_id) == 0 && it->is_system) { - std::string display_filament_type; - it->config.get_filament_type(display_filament_type); - type = display_filament_type; - break; + auto lookup_system_type = [preset_bundle](const std::string &id) { + std::string display_filament_type; + for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) { + if (it->filament_id.compare(id) == 0 && it->is_system) { + it->config.get_filament_type(display_filament_type); + break; + } } + return display_filament_type; + }; + type = lookup_system_type(setting_id); + if (type.empty()) { + // Retired/renamed ids forward to a live successor through the shipped succession ledger. + const std::string successor = resolve_filament_id_succession(setting_id); + if (!successor.empty()) + type = lookup_system_type(successor); } } @@ -5249,7 +5257,10 @@ void MachineObject::update_filament_list() for (auto it = filament_list.begin(); it != filament_list.end(); it++) { if (m_filament_list.find(it->first) != m_filament_list.end()) { - assert(it->first.size() == 8 && it->first[0] == 'P'); + // User roots may legitimately carry adopted system-shaped ids (GF*/OF*/P-hex + // system), so a non-'P' id here is expected, not an invariant violation. + if (it->first.size() != 8 || it->first[0] != 'P') + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": user-root filament_id is not user-shaped: " << it->first; if (it->second.first != m_filament_list[it->first].first) { BOOST_LOG_TRIVIAL(info) << "old min temp is not equal to new min temp and filament id: " << it->first; @@ -5311,6 +5322,17 @@ void MachineObject::update_printer_preset_name() void MachineObject::check_ams_filament_valid() { PresetBundle * preset_bundle = Slic3r::GUI::wxGetApp().preset_bundle; + // A tray id carried by ANY system filament preset is not a dangling user-preset id + // (ten shipped P-hex system ids pass the 'P' shape gates below), so the destructive + // tray-wipe / temp-rewrite handling must never fire for it. + auto is_system_filament_id = [preset_bundle](const std::string &id) { + if (!preset_bundle) + return false; + for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) + if (it->is_system && it->filament_id == id) + return true; + return false; + }; auto printer_model = DevPrinterConfigUtil::get_printer_display_name(this->printer_type); std::map> need_checked_filament_id; for (auto &ams_pair : m_fila_system->GetAmsList()) { @@ -5332,6 +5354,8 @@ void MachineObject::check_ams_filament_valid() auto &checked_filament = data.checked_filament; for (const auto &[slot_id, curr_tray] : ams->GetTrays()) { + if (curr_tray->setting_id.size() == 8 && curr_tray->setting_id[0] == 'P' && is_system_filament_id(curr_tray->setting_id)) + continue; if (curr_tray->setting_id.size() == 8 && curr_tray->setting_id[0] == 'P' && filament_list.find(curr_tray->setting_id) == filament_list.end()) { if (checked_filament.find(curr_tray->setting_id) != checked_filament.end()) { need_checked_filament_id[nozzle_diameter_str].insert(curr_tray->setting_id); @@ -5392,6 +5416,8 @@ void MachineObject::check_ams_filament_valid() auto &data = m_nozzle_filament_data[nozzle_diameter_str]; auto &checked_filament = data.checked_filament; auto &filament_list = data.filament_list; + if (vt_tray.setting_id.size() == 8 && vt_tray.setting_id[0] == 'P' && is_system_filament_id(vt_tray.setting_id)) + continue; if (vt_tray.setting_id.size() == 8 && vt_tray.setting_id[0] == 'P' && filament_list.find(vt_tray.setting_id) == filament_list.end()) { if (checked_filament.find(vt_tray.setting_id) != checked_filament.end()) { need_checked_filament_id[nozzle_diameter_str].insert(vt_tray.setting_id); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 6475ae1c88..2a512497dc 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -537,6 +537,13 @@ bool PresetComboBox::add_ams_filaments(std::string selected, bool alias_name) } auto iter = std::find_if(filaments.begin(), filaments.end(), [&filament_id, this](auto &f) { return f.is_compatible && m_collection->get_preset_base(f) == &f && f.filament_id == filament_id; }); + if (iter == filaments.end()) { + // Retired/renamed ids forward to a live successor through the shipped succession ledger. + const std::string successor = resolve_filament_id_succession(filament_id); + if (!successor.empty()) + iter = std::find_if(filaments.begin(), filaments.end(), + [&successor, this](auto &f) { return f.is_compatible && m_collection->get_preset_base(f) == &f && f.filament_id == successor; }); + } if (iter == filaments.end()) { auto filament_type = tray.opt_string("filament_type", 0u); if (!filament_type.empty()) { diff --git a/src/slic3r/Utils/MoonrakerPrinterAgent.cpp b/src/slic3r/Utils/MoonrakerPrinterAgent.cpp index f1d892134b..ecb23c926c 100644 --- a/src/slic3r/Utils/MoonrakerPrinterAgent.cpp +++ b/src/slic3r/Utils/MoonrakerPrinterAgent.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include namespace { @@ -609,51 +610,70 @@ std::string MoonrakerPrinterAgent::map_filament_type_to_generic_id(const std::st { const std::string upper = trim_and_upper(filament_type); - // Map to OrcaFilamentLibrary preset IDs (compatible with all printers) - // Source: resources/profiles/OrcaFilamentLibrary/filament/ + // Normalize reported material names (trimmed, uppercased) to an OrcaFilamentLibrary + // generic family. The family's filament_id is resolved from the loaded system presets + // below rather than hardcoded, so profile id re-mints never require touching this table. + // scripts/test_moonraker_lane_data.py parses this initializer; keep the {"A", "B"} format. + static const std::map type_to_ofl_family = { + // PLA variants + {"PLA", "PLA"}, + {"PLA-CF", "PLA-CF"}, + {"PLA SILK", "PLA Silk"}, + {"PLA-SILK", "PLA Silk"}, + {"PLA HIGH SPEED", "PLA High Speed"}, + {"PLA-HS", "PLA High Speed"}, + {"PLA HS", "PLA High Speed"}, - // PLA variants - if (upper == "PLA") return "OGFL99"; - if (upper == "PLA-CF") return "OGFL98"; - if (upper == "PLA SILK" || upper == "PLA-SILK") return "OGFL96"; - if (upper == "PLA HIGH SPEED" || upper == "PLA-HS" || upper == "PLA HS") return "OGFL95"; + // ABS/ASA variants + {"ABS", "ABS"}, + {"ASA", "ASA"}, - // ABS/ASA variants - if (upper == "ABS") return "OGFB99"; - if (upper == "ASA") return "OGFB98"; + // PETG/PET variants + {"PETG", "PETG"}, + {"PET", "PETG"}, + {"PCTG", "PCTG"}, - // PETG/PET variants - if (upper == "PETG" || upper == "PET") return "OGFG99"; - if (upper == "PCTG") return "OGFG97"; + // PA/Nylon variants + {"PA", "PA"}, + {"NYLON", "PA"}, + {"PA-CF", "PA-CF"}, + {"PPA", "PPA-CF"}, + {"PPA-CF", "PPA-CF"}, + {"PPA-GF", "PPA-GF"}, - // PA/Nylon variants - if (upper == "PA" || upper == "NYLON") return "OGFN99"; - if (upper == "PA-CF") return "OGFN98"; - if (upper == "PPA" || upper == "PPA-CF") return "OGFN97"; - if (upper == "PPA-GF") return "OGFN96"; + // PC variants + {"PC", "PC"}, - // PC variants - if (upper == "PC") return "OGFC99"; + // PP/PE variants + {"PE", "PE"}, + {"PP", "PP"}, - // PP/PE variants - if (upper == "PE") return "OGFP99"; - if (upper == "PP") return "OGFP97"; + // Support materials + {"PVA", "PVA"}, + {"HIPS", "HIPS"}, + {"BVOH", "BVOH"}, - // Support materials - if (upper == "PVA") return "OGFS99"; - if (upper == "HIPS") return "OGFS98"; - if (upper == "BVOH") return "OGFS97"; + // TPU variants + {"TPU", "TPU"}, - // TPU variants - if (upper == "TPU") return "OGFU99"; + // Other materials + {"EVA", "EVA"}, + {"PHA", "PHA"}, + {"COPE", "CoPE"}, + {"SBS", "SBS"}, + }; - // Other materials - if (upper == "EVA") return "OGFR99"; - if (upper == "PHA") return "OGFR98"; - if (upper == "COPE") return "OGFLC99"; - if (upper == "SBS") return "OFLSBS99"; + auto it = type_to_ofl_family.find(upper); + if (it == type_to_ofl_family.end()) + return UNKNOWN_FILAMENT_ID; - // Unknown material + if (auto* bundle = GUI::wxGetApp().preset_bundle) { + const Preset* preset = bundle->filaments.find_preset("Generic " + it->second + " @System"); + if (preset != nullptr && preset->is_system && !preset->filament_id.empty()) + return preset->filament_id; + } + + // Unknown material, or no loaded preset data to resolve against return UNKNOWN_FILAMENT_ID; } diff --git a/tests/libslic3r/CMakeLists.txt b/tests/libslic3r/CMakeLists.txt index d5e6eb958e..328ffda8da 100644 --- a/tests/libslic3r/CMakeLists.txt +++ b/tests/libslic3r/CMakeLists.txt @@ -14,6 +14,7 @@ add_executable(${_TEST_NAME}_tests test_config.cpp test_preset_bundle_loading.cpp test_preset_setting_id.cpp + test_filament_id_succession.cpp test_elephant_foot_compensation.cpp test_geometry.cpp test_placeholder_parser.cpp diff --git a/tests/libslic3r/test_filament_id_succession.cpp b/tests/libslic3r/test_filament_id_succession.cpp new file mode 100644 index 0000000000..36268277f8 --- /dev/null +++ b/tests/libslic3r/test_filament_id_succession.cpp @@ -0,0 +1,61 @@ +#include + +#include "libslic3r/Preset.hpp" + +using namespace Slic3r; + +// Pure-function coverage of the succession chain walk (follow_filament_id_succession). +// The ledger-file loader (filament_id_succession_map) is deliberately untested here so +// the test carries no resources-dir dependency. +TEST_CASE("filament_id succession follows forwarding chains", "[Preset][filament_id]") { + SECTION("empty map returns empty") { + const std::map empty; + CHECK(follow_filament_id_succession("OFabc123", empty).empty()); + CHECK(follow_filament_id_succession("", empty).empty()); + } + + const std::map forwards = { + {"OFold001", "OFnew001"}, + {"OFchainA", "OFchainB"}, + {"OFchainB", "OFchainC"}, + {"OFchainC", "OFlive00"}, + }; + + SECTION("absent id returns empty") { + CHECK(follow_filament_id_succession("GFL99", forwards).empty()); + } + + SECTION("single hop resolves to the successor") { + CHECK(follow_filament_id_succession("OFold001", forwards) == "OFnew001"); + } + + SECTION("multi-hop chain resolves to the live end") { + CHECK(follow_filament_id_succession("OFchainA", forwards) == "OFlive00"); + CHECK(follow_filament_id_succession("OFchainB", forwards) == "OFlive00"); + CHECK(follow_filament_id_succession("OFchainC", forwards) == "OFlive00"); + } +} + +// Cycles are a ledger-validation error (script check 9) and never ship, but the client +// walk must still terminate on corrupt data: it stops at the last id reached before any +// id would repeat. +TEST_CASE("filament_id succession terminates on malformed cycles", "[Preset][filament_id]") { + SECTION("two-node cycle returns the last id before revisiting") { + const std::map cycle = {{"A", "B"}, {"B", "A"}}; + CHECK(follow_filament_id_succession("A", cycle) == "B"); + CHECK(follow_filament_id_succession("B", cycle) == "A"); + } + + SECTION("cycle entered through a tail stops before re-entering it") { + // T -> A -> B -> C -> A: stops at C, the last id reached before repeating A. + const std::map cycle = { + {"T", "A"}, {"A", "B"}, {"B", "C"}, {"C", "A"}}; + CHECK(follow_filament_id_succession("T", cycle) == "C"); + CHECK(follow_filament_id_succession("A", cycle) == "C"); + } + + SECTION("self-loop returns the id itself") { + const std::map loop = {{"A", "A"}}; + CHECK(follow_filament_id_succession("A", loop) == "A"); + } +} From acd5dd07947f4f9f47c99ebacd877afae860a14d Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 4 Jul 2026 16:41:41 +0800 Subject: [PATCH 16/52] v3.1: OrcaFilamentLibrary re-mint under the product-triple rule Phase v3.1 of filament_id_plan_v3.md: every OFL-declared filament_id re-derives from its product triple; the succession ledger absorbs the old ids. Config-equivalence verified: flattened effective configs differ ONLY in filament_id (284 consistent old->new changes tree-wide, including every vendor preset that rides an OFL family), zero config/compatible_printers/ setting_id drift. Structural pre-step (id-value-neutral, verified): OFL generic family ids move from the shared fdm_filament_* template bases onto the product-named "Generic X @System" presets, so the v3 triple's family component is the product name, not an internal file name (12 relocations; 2 dead duplicate declarations on fdm_filament_pa/pet pruned; every consumer chain itemized first - the +12 instantiated_with_id entries are this deliberate pattern, matching the 11 generics that already declared on @System). fdm_filament_pc keeps its declaration this phase: 7 Prusa presets (Prusa Generic PC, Prusament PC Blend) inherit it directly and re-home in the v3.2 Prusa worksheet; its transitional id is documented in the plan. Re-mint: 301 declarations re-derived (e.g. Generic PLA OGFL99 -> OFDSrzZ8 = mint("filament_product/Generic/PLA/Generic PLA")). Snapshot: 1477 ids (+300/-292). Ledger: - 230 shipped ids retired with mode-rule successors (OGF* library ids, OFLSBS99, DREMC/FILAR/AliZ/eSUN/... legacy strings). DREMC010 had been shared by a PPA-CF and a TPU family - a data bug this split resolves; its successor follows its only shipped claim (DREMC PPA-CF). - 25 GF-shaped ids OFL had copied from the Bambu catalog (GFOT00x Overture, GFSEP0xx) are RELEASED to the BBL island space with hints at the re-minted families - never retired, so a future legitimate BBL catalog addition is never blocked; plus an explicit GFOT001 -> OFxA1p01 hint (Overture PLA Pro, still live in BBL). - 37 never-shipped v1 branch mints dropped from lineage (--forget-never-shipped; they exist in no release, no forwarding needed). - OGFC99/OGFG99/OGFL96/OGFN99/OGFSNL08 stay live (still declared by vendor bundles); they retire in v3.2 when those declarers re-mint. Gates: 106 unit tests OK; --check exit 0; orca_extra_profile_check exit 0; validator -l 2 / -f tree-wide / -r BBL+Qidi exit 0; Moonraker OFL map check resolves all 29 aliases against the re-minted presets; flatten equivalence pre/post as above; snapshot regen idempotent. --- filament_id_plan_v3.md | 6 +- .../filament/AliZ/AliZ PA-CF @base.json | 2 +- .../filament/AliZ/AliZ PETG @base.json | 2 +- .../filament/AliZ/AliZ PETG-CF @base.json | 2 +- .../filament/AliZ/AliZ PETG-Metal @base.json | 2 +- .../filament/AliZ/AliZ PLA @base.json | 2 +- .../filament/Bambu/Bambu ABS @base.json | 2 +- .../filament/Bambu/Bambu ABS-GF @base.json | 2 +- .../filament/Bambu/Bambu ASA @base.json | 2 +- .../filament/Bambu/Bambu ASA-Aero @base.json | 2 +- .../filament/Bambu/Bambu ASA-CF @base.json | 2 +- .../filament/Bambu/Bambu PA-CF @base.json | 2 +- .../filament/Bambu/Bambu PA6-CF @base.json | 2 +- .../filament/Bambu/Bambu PA6-GF @base.json | 2 +- .../filament/Bambu/Bambu PAHT-CF @base.json | 2 +- .../filament/Bambu/Bambu PC @base.json | 2 +- .../filament/Bambu/Bambu PC FR @base.json | 2 +- .../filament/Bambu/Bambu PET-CF @base.json | 2 +- .../Bambu/Bambu PETG Basic @base.json | 2 +- .../filament/Bambu/Bambu PETG HF @base.json | 2 +- .../Bambu/Bambu PETG Translucent @base.json | 2 +- .../filament/Bambu/Bambu PETG-CF @base.json | 2 +- .../filament/Bambu/Bambu PLA Aero @base.json | 2 +- .../filament/Bambu/Bambu PLA Basic @base.json | 2 +- .../Bambu/Bambu PLA Dynamic @base.json | 2 +- .../Bambu/Bambu PLA Galaxy @base.json | 2 +- .../filament/Bambu/Bambu PLA Glow @base.json | 2 +- .../Bambu/Bambu PLA Impact @base.json | 2 +- .../Bambu/Bambu PLA Marble @base.json | 2 +- .../filament/Bambu/Bambu PLA Matte @base.json | 2 +- .../filament/Bambu/Bambu PLA Metal @base.json | 2 +- .../filament/Bambu/Bambu PLA Silk @base.json | 2 +- .../filament/Bambu/Bambu PLA Silk+ @base.json | 2 +- .../Bambu/Bambu PLA Sparkle @base.json | 2 +- .../filament/Bambu/Bambu PLA Tough @base.json | 2 +- .../filament/Bambu/Bambu PLA Wood @base.json | 2 +- .../filament/Bambu/Bambu PLA-CF @base.json | 2 +- .../filament/Bambu/Bambu PPA-CF @base.json | 2 +- .../filament/Bambu/Bambu PPS-CF @base.json | 2 +- .../filament/Bambu/Bambu PVA @base.json | 2 +- .../Bambu/Bambu Support For PA PET @base.json | 2 +- .../Bambu/Bambu Support For PLA @base.json | 2 +- .../Bambu Support For PLA-PETG @base.json | 2 +- .../filament/Bambu/Bambu Support G @base.json | 2 +- .../filament/Bambu/Bambu Support W @base.json | 2 +- .../Bambu/Bambu Support for ABS @base.json | 2 +- .../filament/Bambu/Bambu TPU 95A @base.json | 2 +- .../Bambu/Bambu TPU 95A HF @base.json | 2 +- .../filament/COEX/COEX ABS @base.json | 2 +- .../filament/COEX/COEX ABS PRIME @base.json | 2 +- .../filament/COEX/COEX ASA PRIME @base.json | 2 +- .../COEX/COEX NYLEX PA6-CF @base.json | 2 +- .../COEX/COEX NYLEX UNFILLED @base.json | 2 +- .../filament/COEX/COEX PCTG PRIME @base.json | 2 +- .../filament/COEX/COEX PETG @base.json | 2 +- .../filament/COEX/COEX PLA @base.json | 2 +- .../filament/COEX/COEX PLA PRIME @base.json | 2 +- .../filament/COEX/COEX PLA+Silk @base.json | 2 +- .../filament/COEX/COEX TPE 30D @base.json | 2 +- .../filament/COEX/COEX TPE 40D @base.json | 2 +- .../filament/COEX/COEX TPE 60D @base.json | 2 +- .../filament/COEX/COEX TPU 60A @base.json | 2 +- .../filament/DREMC/DREMC ABS @base.json | 2 +- .../filament/DREMC/DREMC ABS+ @base.json | 2 +- .../filament/DREMC/DREMC ABS-GF @base.json | 2 +- .../filament/DREMC/DREMC ASA @base.json | 2 +- .../filament/DREMC/DREMC ASA CF @base.json | 2 +- .../filament/DREMC/DREMC ASA GF @base.json | 2 +- .../filament/DREMC/DREMC PA12-CF @base.json | 2 +- .../filament/DREMC/DREMC PA6-CF @base.json | 2 +- .../filament/DREMC/DREMC PET-CF @base.json | 2 +- .../filament/DREMC/DREMC PETG @base.json | 2 +- .../filament/DREMC/DREMC PLA HS @base.json | 2 +- .../filament/DREMC/DREMC PLA+ @base.json | 2 +- .../filament/DREMC/DREMC PPA-CF @base.json | 2 +- .../filament/DREMC/DREMC TPU 95A @base.json | 2 +- .../filament/Elas/Elas ASA @base.json | 2 +- .../filament/Elas/Elas PETG Basic @base.json | 2 +- .../filament/Elas/Elas PLA Basic @base.json | 2 +- .../filament/Elas/Elas PLA Pro @base.json | 2 +- .../filament/Elegoo/Elegoo ABS @base.json | 2 +- .../filament/Elegoo/Elegoo ASA @base.json | 2 +- .../filament/Elegoo/Elegoo ASA-CF @base.json | 2 +- .../filament/Elegoo/Elegoo PAHT @base.json | 2 +- .../filament/Elegoo/Elegoo PC @base.json | 2 +- .../filament/Elegoo/Elegoo PC-FR @base.json | 2 +- .../filament/Elegoo/Elegoo PET-CF @base.json | 2 +- .../filament/Elegoo/Elegoo PETG @base.json | 2 +- .../filament/Elegoo/Elegoo PETG HF @base.json | 2 +- .../Elegoo/Elegoo PETG PRO @base.json | 2 +- .../Elegoo/Elegoo PETG Translucent @base.json | 2 +- .../filament/Elegoo/Elegoo PETG-CF @base.json | 2 +- .../filament/Elegoo/Elegoo PETG-GF @base.json | 2 +- .../filament/Elegoo/Elegoo PLA @base.json | 2 +- .../Elegoo/Elegoo PLA Basic @base.json | 2 +- .../Elegoo/Elegoo PLA Galaxy @base.json | 2 +- .../Elegoo/Elegoo PLA Glow @base.json | 2 +- .../Elegoo/Elegoo PLA Marble @base.json | 2 +- .../Elegoo/Elegoo PLA Matte @base.json | 2 +- .../filament/Elegoo/Elegoo PLA PRO @base.json | 2 +- .../Elegoo/Elegoo PLA Silk @base.json | 2 +- .../Elegoo/Elegoo PLA Sparkle @base.json | 2 +- .../Elegoo/Elegoo PLA Translucent2 @base.json | 2 +- .../Elegoo/Elegoo PLA Wood @base.json | 2 +- .../filament/Elegoo/Elegoo PLA+ @base.json | 2 +- .../filament/Elegoo/Elegoo PLA-CF @base.json | 2 +- .../Elegoo/Elegoo Rapid PETG @base.json | 2 +- .../Elegoo/Elegoo Rapid PLA+ @base.json | 2 +- .../Elegoo/Elegoo Rapid TPU 95A @base.json | 2 +- .../filament/Elegoo/Elegoo TPU @base.json | 2 +- .../Eolas Prints ABS @System.json | 2 +- .../Eolas Prints ASA @System.json | 2 +- .../Eolas Prints PETG @System.json | 2 +- .../Eolas Prints PETG Transition @System.json | 2 +- ...olas Prints PETG UV Resistant @System.json | 2 +- ...olas Prints PLA Antibacterial @System.json | 2 +- .../Eolas Prints PLA High Speed @System.json | 2 +- .../Eolas Prints PLA INGEO 850 @System.json | 2 +- .../Eolas Prints PLA INGEO 870 @System.json | 2 +- .../Eolas Prints PLA Matte @System.json | 2 +- .../Eolas Prints PLA Neon @System.json | 2 +- .../Eolas Prints PLA Premium @System.json | 2 +- .../Eolas Prints PLA Silk @System.json | 2 +- .../Eolas Prints PLA Transition @System.json | 2 +- .../Eolas Prints TPU Flex 93A @System.json | 2 +- .../Eolas Prints TPU Flex D53 @System.json | 2 +- ...nts TPU Flex D60 UV Resistant @System.json | 2 +- .../Eolas Prints TPU Transition @System.json | 2 +- .../filament/FDplast/FDplast ABS @base.json | 2 +- .../filament/FDplast/FDplast HIPS @base.json | 2 +- .../filament/FDplast/FDplast PETG @base.json | 2 +- .../filament/FDplast/FDplast PLA @base.json | 2 +- .../filament/FDplast/FDplast SBS @base.json | 2 +- .../filament/FDplast/FDplast TPU @base.json | 2 +- .../filament/FILL3D/FILL3D PA @base.json | 2 +- .../filament/FILL3D/FILL3D PETG @base.json | 2 +- .../filament/FILL3D/FILL3D PETG CF @base.json | 2 +- .../FILL3D/FILL3D PLA Basic @base.json | 2 +- .../FILL3D/FILL3D PLA Turbo @base.json | 2 +- .../filament/FILL3D/FILL3D PP @base.json | 2 +- .../filament/FILL3D/FILL3D PPCF @base.json | 2 +- .../filament/FilAr/FilAr PETG @base.json | 2 +- .../FilAr/FilAr PETG Amarillo Lima.json | 2 +- .../FilAr/FilAr PETG Amarillo Radiante.json | 2 +- .../FilAr/FilAr PETG Azul Boreal.json | 2 +- .../FilAr/FilAr PETG Azul Francia.json | 2 +- .../FilAr/FilAr PETG Azul Imperial.json | 2 +- .../FilAr/FilAr PETG Blanco Antartida.json | 2 +- .../filament/FilAr/FilAr PETG Cian.json | 2 +- .../filament/FilAr/FilAr PETG Coral.json | 2 +- .../filament/FilAr/FilAr PETG Cristal.json | 2 +- .../FilAr/FilAr PETG Gris Ceniza.json | 2 +- .../filament/FilAr/FilAr PETG Gris Plata.json | 2 +- .../filament/FilAr/FilAr PETG Magenta.json | 2 +- .../FilAr/FilAr PETG Negro Azabache.json | 2 +- .../FilAr/FilAr PETG Rojo Carmesi.json | 2 +- .../filament/FilAr/FilAr PLA @base.json | 2 +- .../FilAr/FilAr PLA Amarillo Lirio.json | 2 +- .../FilAr/FilAr PLA Azul Francia.json | 2 +- .../FilAr/FilAr PLA Blanco Antartida.json | 2 +- .../FilAr/FilAr PLA Blanco Calido.json | 2 +- .../filament/FilAr/FilAr PLA Bronce.json | 2 +- .../FilAr/FilAr PLA Cafe con Leche.json | 2 +- .../filament/FilAr/FilAr PLA Carpincho.json | 2 +- .../FilAr/FilAr PLA Celeste Cielo.json | 2 +- .../filament/FilAr/FilAr PLA Cobre.json | 2 +- .../filament/FilAr/FilAr PLA Dorado.json | 2 +- .../filament/FilAr/FilAr PLA Gris Ceniza.json | 2 +- .../FilAr/FilAr PLA Gris Pizarra.json | 2 +- .../filament/FilAr/FilAr PLA Gris Plata.json | 2 +- .../filament/FilAr/FilAr PLA Manteca.json | 2 +- .../FilAr/FilAr PLA Marron Oxido.json | 2 +- .../FilAr/FilAr PLA Naranja Tigre.json | 2 +- .../FilAr/FilAr PLA Negro Azabache.json | 2 +- .../filament/FilAr/FilAr PLA Oro.json | 2 +- .../filament/FilAr/FilAr PLA Piel.json | 2 +- .../FilAr/FilAr PLA Rojo de Carreras.json | 2 +- .../FilAr/FilAr PLA Rosa Amaranto.json | 2 +- .../FilAr/FilAr PLA Rosa Flamenco.json | 2 +- .../filament/FilAr/FilAr PLA Tabaco.json | 2 +- .../filament/FilAr/FilAr PLA Titanio.json | 2 +- .../filament/FilAr/FilAr PLA Verde FilAr.json | 2 +- .../FilAr/FilAr PLA Verde Manzana.json | 2 +- .../filament/FilAr/FilAr PLA Verde Oliva.json | 2 +- .../filament/FilAr/FilAr PLA Verde Pixel.json | 2 +- .../FilAr/FilAr PLA Violeta Jacaranda.json | 2 +- .../filament/FilAr/FilAr PLA-mate @base.json | 2 +- .../FilAr/FilAr PLA-mate Amarillo.json | 2 +- .../filament/FilAr/FilAr PLA-mate Azul.json | 2 +- .../filament/FilAr/FilAr PLA-mate Beige.json | 2 +- .../filament/FilAr/FilAr PLA-mate Blanco.json | 2 +- .../filament/FilAr/FilAr PLA-mate Bordo.json | 2 +- .../FilAr/FilAr PLA-mate Celeste Cielo.json | 2 +- .../FilAr/FilAr PLA-mate Chocolate.json | 2 +- .../filament/FilAr/FilAr PLA-mate Gris.json | 2 +- .../filament/FilAr/FilAr PLA-mate Marron.json | 2 +- .../FilAr/FilAr PLA-mate Naranja.json | 2 +- .../filament/FilAr/FilAr PLA-mate Negro.json | 2 +- .../filament/FilAr/FilAr PLA-mate Piel.json | 2 +- .../filament/FilAr/FilAr PLA-mate Rojo.json | 2 +- .../filament/FilAr/FilAr PLA-mate Rosa.json | 2 +- .../filament/FilAr/FilAr PLA-mate Uva.json | 2 +- .../filament/FilAr/FilAr PLA-mate Verde.json | 2 +- .../FilAr/FilAr PLA-mate Violeta.json | 2 +- .../FusRock/FusRock ABS-GF @base.json | 2 +- .../filament/Generic ABS @System.json | 2 +- .../filament/Generic ASA @System.json | 2 +- .../filament/Generic BVOH @System.json | 1 + .../filament/Generic CoPE @System.json | 1 + .../filament/Generic EVA @System.json | 1 + .../filament/Generic HIPS @System.json | 1 + .../filament/Generic PA @System.json | 2 +- .../filament/Generic PA-CF @System.json | 2 +- .../filament/Generic PC @System.json | 2 +- .../filament/Generic PCTG @System.json | 1 + .../filament/Generic PE @System.json | 1 + .../filament/Generic PE-CF @base.json | 2 +- .../filament/Generic PETG @System.json | 2 +- .../filament/Generic PETG HF @base.json | 2 +- .../filament/Generic PETG-CF @base.json | 2 +- .../filament/Generic PHA @System.json | 1 + .../filament/Generic PLA @System.json | 1 + .../Generic PLA High Speed @System.json | 2 +- .../filament/Generic PLA Matte @base.json | 2 +- .../filament/Generic PLA Silk @System.json | 1 + .../filament/Generic PLA-CF @System.json | 2 +- .../filament/Generic PP @System.json | 1 + .../filament/Generic PP-CF @base.json | 2 +- .../filament/Generic PP-GF @base.json | 2 +- .../filament/Generic PPA-CF @System.json | 1 + .../filament/Generic PPA-GF @System.json | 2 +- .../filament/Generic PVA @System.json | 2 +- .../filament/Generic SBS @System.json | 1 + .../filament/Generic TPU @System.json | 2 +- .../GreenGate3D/GreenGate3D PETG @base.json | 2 +- .../filament/NIT/NIT ABS @base.json | 2 +- .../filament/NIT/NIT PETG @base.json | 2 +- .../filament/NIT/NIT PLA @base.json | 2 +- .../Numakers/Numakers PLA+ @base.json | 2 +- .../Overture/Overture ABS Basic @base.json | 2 +- .../filament/Overture/Overture ASA @base.json | 2 +- .../Overture/Overture Air PLA @base.json | 2 +- .../Overture/Overture Easy PLA @base.json | 2 +- .../Overture/Overture Matte PLA @base.json | 2 +- .../filament/Overture/Overture PLA @base.json | 2 +- .../Overture/Overture PLA Pro @base.json | 2 +- .../Overture/Overture Rock PLA @base.json | 2 +- .../Overture/Overture Silk PLA @base.json | 2 +- .../Overture/Overture Super PLA+ @base.json | 2 +- .../filament/Overture/Overture TPU @base.json | 2 +- .../Polymaker/Fiberon PA12-CF @base.json | 2 +- .../Polymaker/Fiberon PA6-CF @base.json | 2 +- .../Polymaker/Fiberon PA6-GF @base.json | 2 +- .../Polymaker/Fiberon PA612-CF @base.json | 2 +- .../Polymaker/Fiberon PET-CF @base.json | 2 +- .../Polymaker/Fiberon PETG-ESD @base.json | 2 +- .../Polymaker/Fiberon PETG-rCF @base.json | 2 +- .../Polymaker/Panchroma CoPE @base.json | 2 +- .../Polymaker/Panchroma PLA @base.json | 2 +- .../Panchroma PLA Celestial @base.json | 2 +- .../Polymaker/Panchroma PLA Galaxy @base.json | 2 +- .../Polymaker/Panchroma PLA Glow @base.json | 2 +- .../Panchroma PLA Luminous @base.json | 2 +- .../Polymaker/Panchroma PLA Marble @base.json | 2 +- .../Polymaker/Panchroma PLA Matte @base.json | 2 +- .../Panchroma PLA Metallic @base.json | 2 +- .../Polymaker/Panchroma PLA Neon @base.json | 2 +- .../Polymaker/Panchroma PLA Satin @base.json | 2 +- .../Polymaker/Panchroma PLA Silk @base.json | 2 +- .../Panchroma PLA Starlight @base.json | 2 +- .../Panchroma PLA Temp Shift @base.json | 2 +- .../Panchroma PLA Translucent @base.json | 2 +- .../Panchroma PLA UV Shift @base.json | 2 +- .../Polymaker/PolyLite ABS @base.json | 2 +- .../Polymaker/PolyLite ASA @base.json | 2 +- .../Polymaker/PolyLite Dual PLA @base.json | 2 +- .../Polymaker/PolyLite PETG @base.json | 2 +- .../Polymaker/PolyLite PLA @System.json | 2 +- .../Polymaker/PolyLite PLA @base.json | 2 +- .../Polymaker/PolyLite PLA Pro @base.json | 2 +- .../Polymaker/PolyTerra Dual PLA @System.json | 2 +- .../Polymaker/PolyTerra PLA @base.json | 2 +- .../Polymaker/Polymaker HT-PLA @base.json | 2 +- .../Polymaker/Polymaker HT-PLA-GF @base.json | 2 +- .../SUNLU/SUNLU Marble PLA @base.json | 2 +- .../filament/SUNLU/SUNLU PETG @base.json | 2 +- .../filament/SUNLU/SUNLU PLA Matte @base.json | 2 +- .../filament/SUNLU/SUNLU PLA+ 2.0 @base.json | 2 +- .../filament/SUNLU/SUNLU PLA+ @base.json | 2 +- .../filament/SUNLU/SUNLU Silk PLA+ @base.json | 2 +- .../filament/SUNLU/SUNLU Wood PLA @base.json | 2 +- .../filament/Valment/Valment PLA @base.json | 2 +- .../Valment/Valment PLA Galaxy @base.json | 2 +- .../Valment/Valment PLA Silk @base.json | 2 +- .../Valment/Valment PLA-CF @base.json | 2 +- .../filament/base/fdm_filament_bvoh.json | 1 - .../filament/base/fdm_filament_cope.json | 1 - .../filament/base/fdm_filament_eva.json | 1 - .../filament/base/fdm_filament_hips.json | 1 - .../filament/base/fdm_filament_pa.json | 1 - .../filament/base/fdm_filament_pc.json | 2 +- .../filament/base/fdm_filament_pctg.json | 1 - .../filament/base/fdm_filament_pe.json | 1 - .../filament/base/fdm_filament_pet.json | 1 - .../filament/base/fdm_filament_pha.json | 1 - .../filament/base/fdm_filament_pla.json | 1 - .../filament/base/fdm_filament_pla_silk.json | 1 - .../filament/base/fdm_filament_pp.json | 1 - .../filament/base/fdm_filament_ppa.json | 1 - .../filament/base/fdm_filament_sbs.json | 1 - .../filament/eSUN/eSUN PETG @base.json | 2 +- .../filament/eSUN/eSUN PLA+ @base.json | 2 +- .../filament/eSUN/eSUN PLA-Basic @base.json | 2 +- .../filament/eSUN/eSUN PLA-Marble @base.json | 2 +- .../filament/eSUN/eSUN PLA-Matte @base.json | 2 +- .../filament/eSUN/eSUN ePLA-LW @System.json | 2 +- resources/profiles/retired_filament_ids.json | 1408 ++- scripts/filament_id_snapshot.json | 7716 +++++++---------- 318 files changed, 4636 insertions(+), 5098 deletions(-) diff --git a/filament_id_plan_v3.md b/filament_id_plan_v3.md index 5a4bdedb26..14b547600f 100644 --- a/filament_id_plan_v3.md +++ b/filament_id_plan_v3.md @@ -143,7 +143,11 @@ gains a succession entry pointing at its replacement; the 26 GF-shaped ids OFL d (measured at v3.0: only one of them, `GFOT001`, is also declared by BBL) are released to the BBL island space with hints at the re-minted families — two-island purity. Snapshot regenerated; full gate battery + fixture overlays (this phase touches preset-visibility -machinery only via ids, but the fixtures are cheap insurance). +machinery only via ids, but the fixtures are cheap insurance). Implementation notes +(v3.1, executed): OFL generic ids relocate from the fdm_filament_* template bases onto +the product-named "Generic X @System" presets first, so their triples carry the product +name; `fdm_filament_pc` keeps a (transitional) declaration because 7 Prusa presets +inherit it directly — the v3.2 Prusa worksheet re-homes them and deletes it. **v3.2 — vendor bundles, worksheet-per-vendor (v1 machinery).** Three sub-cases: (a) the **391 unshipped v1 `OF*` mints** re-derive under the triple key — no succession diff --git a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PA-CF @base.json index 29d9f1c39c..22fcfceefa 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PA-CF @base.json @@ -3,7 +3,7 @@ "name": "AliZ PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "AliZ003", + "filament_id": "OFd4zw5l", "instantiation": "false", "filament_type": [ "PA-CF" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG @base.json index 463a0d954e..1796d82a77 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG @base.json @@ -3,7 +3,7 @@ "name": "AliZ PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "AliZ001", + "filament_id": "OFocyw69", "instantiation": "false", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-CF @base.json index ad96c2621f..5c5a0113d5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "AliZ PETG-CF @base", "inherits": "AliZ PETG @base", "from": "system", - "filament_id": "AZ01-1", + "filament_id": "OFJOFnOZ", "instantiation": "false", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-Metal @base.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-Metal @base.json index f92cb73736..d6f9adc470 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-Metal @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PETG-Metal @base.json @@ -3,7 +3,7 @@ "name": "AliZ PETG-Metal @base", "inherits": "AliZ PETG @base", "from": "system", - "filament_id": "AZ01-2", + "filament_id": "OFOABq7t", "instantiation": "false", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PLA @base.json index 6323f62cca..8bb139bdbb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/AliZ PLA @base.json @@ -3,7 +3,7 @@ "name": "AliZ PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "AliZ002", + "filament_id": "OFyxayW4", "instantiation": "false", "enable_pressure_advance": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json index 6628007eef..62c2f3bc84 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json @@ -3,7 +3,7 @@ "name": "Bambu ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OGFB00", + "filament_id": "OFhuaUQB", "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": [ 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 a34c88e45d..5cdd145c56 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json @@ -3,7 +3,7 @@ "name": "Bambu ABS-GF @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OGFB50", + "filament_id": "OFknl9Iz", "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json index c06136e268..432f106879 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json @@ -3,7 +3,7 @@ "name": "Bambu ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OGFB01", + "filament_id": "OFfBpSRI", "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.", "eng_plate_temp": [ 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 043335fe0d..8343f4f8cb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json @@ -3,7 +3,7 @@ "name": "Bambu ASA-Aero @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OGFB02", + "filament_id": "OFXzQ4yL", "instantiation": "false", "description": "This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: ASA Aero Printing Guide.", "fan_cooling_layer_time": [ 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 98d86450d2..66abe8195a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu ASA-CF @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OGFB51", + "filament_id": "OF0wBGNx", "instantiation": "false", "eng_plate_temp": [ "100" 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 f63213b0b1..00df3d58ef 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFN03", + "filament_id": "OFFNYwWR", "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.", "filament_cost": [ 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 21d5b6c18b..578e30294c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PA6-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFN05", + "filament_id": "OFniMuTN", "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.", "fan_cooling_layer_time": [ 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 cd54c4ac9b..c9eb830cad 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PA6-GF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFN08", + "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.", "fan_cooling_layer_time": [ 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 9bde2b612b..a028b7f7dc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PAHT-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFN04", + "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json index 577ae892f4..5ce775f0d0 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json @@ -3,7 +3,7 @@ "name": "Bambu PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OGFC00", + "filament_id": "OFKhMPeX", "instantiation": "false", "filament_vendor": [ "Bambu Lab" 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 40527941a2..18c02b41a1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json @@ -3,7 +3,7 @@ "name": "Bambu PC FR @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OGFC01", + "filament_id": "OFg57Nmc", "instantiation": "false", "filament_cost": [ "0" 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 5a4e910502..a14ea627ab 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PET-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFT01", + "filament_id": "OFHa48An", "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.", "cool_plate_temp": [ 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 9117643990..9f30826efe 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG Basic @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFG00", + "filament_id": "OFFvzqcd", "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": [ 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 7a829f34dc..ef4a817974 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG HF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFG02", + "filament_id": "OFovEIbw", "instantiation": "false", "cool_plate_temp": [ "0" 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 69cfb1dab7..bbde9ee8a2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG Translucent @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFG01", + "filament_id": "OFwPrlCM", "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": [ 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 8112a1d025..89fe7b3dde 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFG50", + "filament_id": "OFTRZ8Y4", "instantiation": "false", "cool_plate_temp": [ "0" 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 889822b02f..ed2b367f9c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Aero @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA11", + "filament_id": "OFBSW57R", "instantiation": "false", "description": "This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: Instructions for printing RC model with foaming PLA (PLA Aero).", "fan_min_speed": [ 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 379db35b99..d5614af65f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA00", + "filament_id": "OFoiVqVM", "instantiation": "false", "filament_cost": [ "24.99" 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 abd30f6606..7b1290817d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Dynamic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA13", + "filament_id": "OFDGigEI", "instantiation": "false", "filament_cost": [ "31.99" 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 b52fc99f23..3ecc707ddf 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Galaxy @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA15", + "filament_id": "OFQ3e56w", "instantiation": "false", "filament_cost": [ "29.99" 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 9ab5d3b6ff..8395082e6d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Glow @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA12", + "filament_id": "OFEkPBwx", "instantiation": "false", "filament_cost": [ "29.99" 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 11edaa9736..1ff6cb84cc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Impact @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA03", + "filament_id": "OFTGHyNC", "instantiation": "false", "filament_cost": [ "25.4" 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 0f427b2047..0faa115520 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA07", + "filament_id": "OF9OlTWH", "instantiation": "false", "filament_cost": [ "29.99" 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 b1685a3aa1..ac7760f632 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA01", + "filament_id": "OFXIbw5D", "instantiation": "false", "filament_cost": [ "24.99" 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 c24f1d8d9b..81a9c95c24 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Metal @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA02", + "filament_id": "OFrKLeE3", "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": [ 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 e4930ed9c3..f76daf5b77 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA05", + "filament_id": "OFEGNJD4", "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": [ 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 c4e44ff4ac..93e6e81148 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Silk+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA06", + "filament_id": "OFUanySo", "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": [ 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 62ae9c7d6b..152b762069 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Sparkle @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA08", + "filament_id": "OFDxfPgH", "instantiation": "false", "filament_cost": [ "29.99" 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 d257a2bc53..a5aa15e8c1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Tough @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA09", + "filament_id": "OFaQMgRH", "instantiation": "false", "filament_cost": [ "28.99" 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 3ebad53cd8..b9686af187 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Wood @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA16", + "filament_id": "OFMjtqTC", "instantiation": "false", "filament_cost": [ "24.99" 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 e5c0a31499..7bd37d40a4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFA50", + "filament_id": "OFEswT5W", "instantiation": "false", "additional_cooling_fan_speed": [ "0" 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 43b897ca86..8519203173 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PPA-CF @base", "inherits": "fdm_filament_ppa", "from": "system", - "filament_id": "OGFN06", + "filament_id": "OF54B0S0", "instantiation": "false", "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 d27c9164d1..b48f3b9300 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PPS-CF @base", "inherits": "fdm_filament_pps", "from": "system", - "filament_id": "OGFT02", + "filament_id": "OF4RvVuU", "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.", "fan_max_speed": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json index 8b73770499..1c6e0f2201 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json @@ -3,7 +3,7 @@ "name": "Bambu PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "OGFS04", + "filament_id": "OFzyIxba", "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": [ 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 2662d49840..7adbcb812d 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 @@ -3,7 +3,7 @@ "name": "Bambu Support For PA/PET @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFS03", + "filament_id": "OFMTK0UC", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_cooling_layer_time": [ 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 68d2468a07..9511f5c0cd 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 @@ -3,7 +3,7 @@ "name": "Bambu Support For PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFS02", + "filament_id": "OFAnyRUI", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "cool_plate_temp": [ 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 49fdcb1e1b..10e57855ad 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 @@ -3,7 +3,7 @@ "name": "Bambu Support For PLA/PETG @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFS05", + "filament_id": "OFIfnzxC", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_cooling_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 5b7ce7f02b..35cc03e9b8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support G @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFS01", + "filament_id": "OFQHiNJs", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_cooling_layer_time": [ 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 2e1f1429c1..a922afd83e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support W @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFS00", + "filament_id": "OFsHSVZc", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "cool_plate_temp": [ 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 3fe47727e1..31dfbba311 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 @@ -3,7 +3,7 @@ "name": "Bambu Support for ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OGFS06", + "filament_id": "OFf6mfQO", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_max_speed": [ 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 a79d6a575e..5b71c52f81 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json @@ -3,7 +3,7 @@ "name": "Bambu TPU 95A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OGFU01", + "filament_id": "OFVCkX5w", "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": [ 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 00bef8980a..95263eb4ef 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 @@ -3,7 +3,7 @@ "name": "Bambu TPU 95A HF @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OGFU00", + "filament_id": "OFvKUnLh", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS @base.json index 201d230ad3..c234e34567 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS @base.json @@ -3,7 +3,7 @@ "name": "COEX ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "CXABSB01", + "filament_id": "OF99UMPq", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS PRIME @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS PRIME @base.json index 08c5edfc25..7e965bc256 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS PRIME @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ABS PRIME @base.json @@ -3,7 +3,7 @@ "name": "COEX ABS PRIME @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "CXABPB09", + "filament_id": "OFuWCQXN", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ASA PRIME @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ASA PRIME @base.json index b5c2b540be..1bc1230eae 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ASA PRIME @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX ASA PRIME @base.json @@ -3,7 +3,7 @@ "name": "COEX ASA PRIME @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "CXASAB04", + "filament_id": "OFtpXCCv", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX PA6-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX PA6-CF @base.json index 807e723f78..c023668f4a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX PA6-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX PA6-CF @base.json @@ -3,7 +3,7 @@ "name": "COEX NYLEX PA6-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "CXPACB23", + "filament_id": "OF0NgY1y", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX UNFILLED @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX UNFILLED @base.json index 34c323d800..15de223500 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX UNFILLED @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX NYLEX UNFILLED @base.json @@ -3,7 +3,7 @@ "name": "COEX NYLEX UNFILLED @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "CXPAUB21", + "filament_id": "OFJs1ToM", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PCTG PRIME @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PCTG PRIME @base.json index acecaf1737..9fce322405 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PCTG PRIME @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PCTG PRIME @base.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @base", "inherits": "fdm_filament_pctg", "from": "system", - "filament_id": "CXPCTB15", + "filament_id": "OFwu7IAG", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PETG @base.json index 09c882e777..9f22293450 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PETG @base.json @@ -3,7 +3,7 @@ "name": "COEX PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "CXPETB13", + "filament_id": "OFvTVZc3", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA @base.json index faabeaea75..a0b2f76888 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA @base.json @@ -3,7 +3,7 @@ "name": "COEX PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "CXPLAB02", + "filament_id": "OFhlCNqq", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA PRIME @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA PRIME @base.json index d2423972a7..a9a5e83c0b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA PRIME @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA PRIME @base.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "CXPLAB08", + "filament_id": "OFd2vX0G", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA+Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA+Silk @base.json index 40a9e1eb05..f06642c432 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA+Silk @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX PLA+Silk @base.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @base", "inherits": "fdm_filament_pla_silk", "from": "system", - "filament_id": "CXPLSB03", + "filament_id": "OF0pzFLc", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json index 4f1f540a5f..5c715dea33 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 30D @base.json @@ -3,7 +3,7 @@ "name": "COEX TPE 30D @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "CX30DB20", + "filament_id": "OFVptRxp", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json index 6130ef11b2..81d5d81f1c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 40D @base.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "CX40DB20", + "filament_id": "OFfnXFie", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json index 0ab5886963..b2e0aab688 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPE 60D @base.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "CX60DB19", + "filament_id": "OFfr4XNO", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json index 00834bb4a5..7ec2102478 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/COEX TPU 60A @base.json @@ -3,7 +3,7 @@ "name": "COEX TPU 60A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "CX60AB17", + "filament_id": "OFE0NFRh", "instantiation": "false", "filament_vendor": [ "COEX 3D" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json index b4835fdeca..fbd2a32e8f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS @base.json @@ -3,7 +3,7 @@ "name": "DREMC ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "DREMC003", + "filament_id": "OFzrUUxc", "instantiation": "false", "filament_cost": [ "24" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json index f9b2cd2c40..6817351573 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS+ @base.json @@ -3,7 +3,7 @@ "name": "DREMC ABS+ @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "DREMC004", + "filament_id": "OF99vXPs", "instantiation": "false", "filament_cost": [ "24" 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 b5917c922e..046a015930 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ABS-GF @base.json @@ -3,7 +3,7 @@ "name": "DREMC ABS-GF @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "DREMC009", + "filament_id": "OFCidU7j", "instantiation": "false", "fan_cooling_layer_time": [ "12" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json index 324e484437..5e5e96b148 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA @base.json @@ -3,7 +3,7 @@ "name": "DREMC ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "DREMC005", + "filament_id": "OFLNgV3C", "instantiation": "false", "eng_plate_temp": [ "110" 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 b15fa0f629..ef6c3bc7b5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA CF @base.json @@ -3,7 +3,7 @@ "name": "DREMC ASA CF @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "DREMC012", + "filament_id": "OFdI4zMo", "instantiation": "false", "eng_plate_temp": [ "110" 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 11f4e56de4..b916335f2f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC ASA GF @base.json @@ -3,7 +3,7 @@ "name": "DREMC ASA GF @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "DREMC013", + "filament_id": "OF2xccEe", "instantiation": "false", "eng_plate_temp": [ "110" 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 aee897f402..3482ecedf6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA12-CF @base.json @@ -3,7 +3,7 @@ "name": "DREMC PA12-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "DREMC007", + "filament_id": "OFEhuUNq", "instantiation": "false", "fan_cooling_layer_time": [ "15" 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 7d693fc142..fe5ef518a1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PA6-CF @base.json @@ -3,7 +3,7 @@ "name": "DREMC PA6-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "DREMC006", + "filament_id": "OFsoykbm", "instantiation": "false", "fan_cooling_layer_time": [ "15" 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 cc568e5ad6..9f7d27a1a0 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PET-CF @base.json @@ -3,7 +3,7 @@ "name": "DREMC PET-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "DREMC008", + "filament_id": "OFwJ0qu2", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json index 840e0104f3..c67e185527 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PETG @base.json @@ -3,7 +3,7 @@ "name": "DREMC PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "DREMC002", + "filament_id": "OFVBlUFH", "instantiation": "false", "cool_plate_temp": [ "0" 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 cb2f3e166d..1d7f1b47af 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA HS @base.json @@ -3,7 +3,7 @@ "name": "DREMC PLA+ HS @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "DREMC011", + "filament_id": "OFJHBEGD", "instantiation": "false", "filament_cost": [ "26" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json index 698712e1dd..b989f6d59d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PLA+ @base.json @@ -3,7 +3,7 @@ "name": "DREMC PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "DREMC001", + "filament_id": "OFSwbBWS", "instantiation": "false", "filament_cost": [ "26" 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 ec5cecd565..6a696177e7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC PPA-CF @base.json @@ -3,7 +3,7 @@ "name": "DREMC PPA-CF @base", "inherits": "fdm_filament_ppa", "from": "system", - "filament_id": "DREMC010", + "filament_id": "OFiWaoqD", "instantiation": "false", "filament_vendor": [ "DREMC" 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 ba17ff46a8..63d4669b47 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/DREMC/DREMC TPU 95A @base.json @@ -3,7 +3,7 @@ "name": "DREMC TPU 95A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "DREMC010", + "filament_id": "OFYd5uS3", "instantiation": "false", "filament_cost": [ "40" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json index 961b8aa903..027af22dce 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas ASA @base.json @@ -3,7 +3,7 @@ "name": "Elas ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OFT3TqB6", + "filament_id": "OFCoRobU", "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.", "activate_air_filtration": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json index 145e0472ae..378a0ea241 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PETG Basic @base.json @@ -3,7 +3,7 @@ "name": "Elas PETG Basic @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFw4OHWE", + "filament_id": "OFXTPuqV", "instantiation": "false", "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.", "complete_print_exhaust_fan_speed": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json index 64e0f025b8..f20c4cc388 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Basic @base.json @@ -3,7 +3,7 @@ "name": "Elas PLA Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFbgt3u3", + "filament_id": "OFMuXBmO", "instantiation": "false", "activate_air_filtration": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json index faba40142f..ec36457c48 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elas/Elas PLA Pro @base.json @@ -3,7 +3,7 @@ "name": "Elas PLA Pro @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFrgQ1Ns", + "filament_id": "OFaYz8iE", "instantiation": "false", "activate_air_filtration": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @base.json index af0dad8787..539b56876e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @base.json @@ -3,7 +3,7 @@ "name": "Elegoo ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OEABSB00", + "filament_id": "OFxOHhZw", "instantiation": "false", "eng_plate_temp": [ "90" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @base.json index da502cf7b6..64875346e3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA @base.json @@ -3,7 +3,7 @@ "name": "Elegoo ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OEASAB00", + "filament_id": "OFobDOW5", "instantiation": "false", "eng_plate_temp": [ "90" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json index ff15b78c5d..155d6f8290 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo ASA-CF @base", "inherits": "Elegoo ASA @base", "from": "system", - "filament_id": "OFpwg2Qh", + "filament_id": "OFryjl35", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT @base.json index dd444cd846..d85796e7b1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PAHT @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OEPAHTB0", + "filament_id": "OF0h7ERL", "instantiation": "false", "activate_air_filtration": [ "1" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @base.json index b7a5a62eda..ca5be19aa7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OEPCB00", + "filament_id": "OFUyDDNv", "instantiation": "false", "filament_density": [ "1.25" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json index 1f6564cbf1..91034fda41 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PC-FR @base", "inherits": "Elegoo PC @base", "from": "system", - "filament_id": "OF79FFkO", + "filament_id": "OFlsTpJG", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json index 9e669f1e14..c1b9e78897 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PET-CF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFJIImD5", + "filament_id": "OFV5tNw6", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @base.json index d6cd360eba..2f695a48b2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OEPETGB0", + "filament_id": "OFLcd093", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json index 2e3e74ef22..9645c4572f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG HF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFzrWlH5", + "filament_id": "OFlP3KWq", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json index 4b63edb4ed..ec604d722c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG PRO @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG PRO @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OF102WKM", + "filament_id": "OFOsHDnB", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json index 10b46e8f76..2d7d0f9777 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG Translucent @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFenGPBR", + "filament_id": "OF6Ll8lK", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json index 20897108cd..60a643b2a3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG-CF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFIGHU7W", + "filament_id": "OFuUuIhR", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json index 1b62b3aeaa..3ff4b96375 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG-GF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFMQJToc", + "filament_id": "OFmveLWz", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @base.json index 6b4622c0ed..45456ab6d8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OEPLAB00", + "filament_id": "OFvgE0Zh", "instantiation": "false", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json index d361721096..93c52a3382 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Basic @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFICPchn", + "filament_id": "OFm06H6V", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json index a36b51384a..a25fcf8daa 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Galaxy @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OF0M6QAQ", + "filament_id": "OFU1zPxE", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json index b839aca5dc..a07012d83b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Glow @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFutwD6f", + "filament_id": "OFjPXrXO", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json index 7fc24ca532..b8990a7c1b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Marble @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OF4fgpse", + "filament_id": "OFfuhviw", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json index 07c0dcf1ef..0394308e99 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Matte @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Matte @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFQkWxJy", + "filament_id": "OFsB2lxm", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json index 368f6b89d9..731f5c5ca4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA PRO @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA PRO @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFsKqcQW", + "filament_id": "OF1hznGB", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json index a19d767778..e708794eea 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Silk @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Silk @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFs6lLH7", + "filament_id": "OFXz7Mwx", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json index cdf18ad328..cc292ac240 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Sparkle @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OF8HQmJD", + "filament_id": "OFhcYzR8", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json index 00d0e20932..c0e2e23dfe 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Translucent2 @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OF9qvJxV", + "filament_id": "OFn1QaY3", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json index 934992440e..4e3362a5d3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Wood @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFQhLoxN", + "filament_id": "OFWYtgCa", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json index 23ae2c1ddb..f90355d85c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA+ @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA+ @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFDNiRTx", + "filament_id": "OFBUIlZ7", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json index 3115358207..4f4979d95f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA-CF @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFqh1Ngp", + "filament_id": "OFln72PT", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json index afdb0eda7a..e328cf0a75 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PETG @base.json @@ -3,6 +3,6 @@ "name": "Elegoo Rapid PETG @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFVLuVmD", + "filament_id": "OFLXvuMr", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json index 21c1b99c63..06fd489c41 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid PLA+ @base.json @@ -3,6 +3,6 @@ "name": "Elegoo Rapid PLA+ @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFD5e0sH", + "filament_id": "OFkhhUS0", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json index 299f0cee8d..58cec037c3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json @@ -3,6 +3,6 @@ "name": "Elegoo Rapid TPU 95A @base", "inherits": "Elegoo TPU @base", "from": "system", - "filament_id": "OFmeQjRP", + "filament_id": "OF30Ftju", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU @base.json index 28b8c921a6..e2fe95548a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU @base.json @@ -3,7 +3,7 @@ "name": "Elegoo TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OETPUB00", + "filament_id": "OFmhJs5V", "instantiation": "false", "filament_density": [ "1.21" 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 6d5dd368bf..09fe0e6298 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP017", + "filament_id": "OFXCBZTA", "setting_id": "R1lkPc60BdFq6i2Z", "name": "Eolas Prints ABS @System", "from": "system", 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 8446ca6746..263752abf1 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP018", + "filament_id": "OFlSNkhc", "setting_id": "JFXFsEzqXxNqxnsL", "name": "Eolas Prints ASA @System", "from": "system", 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 104dd1e567..9f1c691c30 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP010", + "filament_id": "OFhWhL1i", "setting_id": "u9fzEmHRAACOHT6J", "name": "Eolas Prints PETG @System", "from": "system", 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 8e1aa05628..47245f3f54 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP012", + "filament_id": "OFRiFnfQ", "setting_id": "BY3z4yKW9PQZwgto", "name": "Eolas Prints PETG Transition @System", "from": "system", 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 8c4c299849..749b37cb54 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP011", + "filament_id": "OFx8Lmsd", "setting_id": "eexjO9xiesNROPCK", "name": "Eolas Prints PETG UV Resistant @System", "from": "system", 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 9ce7087dd2..a9cbc62ed2 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP008", + "filament_id": "OFkzr35f", "setting_id": "LAihILsSxo3djWjq", "name": "Eolas Prints PLA Antibacterial @System", "from": "system", 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 2f7d92c799..7488530282 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP005", + "filament_id": "OFvzvwCu", "setting_id": "5g69jS4PRY0PbXvI", "name": "Eolas Prints PLA High Speed @System", "from": "system", 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 7200a7d631..c4c66400e4 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP006", + "filament_id": "OFH2nN08", "setting_id": "jdjLUTsIovrt3UAF", "name": "Eolas Prints PLA INGEO 850 @System", "from": "system", 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 4df9130980..f8ae8e662c 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP007", + "filament_id": "OFPc4zVY", "setting_id": "AafBj7XbFWaNhKHu", "name": "Eolas Prints PLA INGEO 870 @System", "from": "system", 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 4b14da901c..9489d9f0f7 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP002", + "filament_id": "OFf5awy4", "setting_id": "7LiJHuwirgABvbUa", "name": "Eolas Prints PLA Matte @System", "from": "system", 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 b40ce2310b..4486eac1f3 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP004", + "filament_id": "OFrFBEfd", "setting_id": "sKgUBhF3VvETDkwg", "name": "Eolas Prints PLA Neon @System", "from": "system", 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 b2455b02e3..03c332daa0 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP001", + "filament_id": "OFtudokz", "setting_id": "O2Ur7FIG2YlVEyZp", "name": "Eolas Prints PLA Premium @System", "from": "system", 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 843cf72fc5..d80cb44978 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP003", + "filament_id": "OFbP8zEO", "setting_id": "WN0GdqBsjhvnyDmG", "name": "Eolas Prints PLA Silk @System", "from": "system", 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 90e0b8d2f4..22bb2af20a 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP009", + "filament_id": "OFHfzQXo", "setting_id": "o3RoG3NGSBlyBkfZ", "name": "Eolas Prints PLA Transition @System", "from": "system", 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 c7b9c26180..c2252c5df8 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP013", + "filament_id": "OFhfd722", "setting_id": "bQPvp6BCMzcG8FOi", "name": "Eolas Prints TPU Flex 93A @System", "from": "system", 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 c5a9a84ac3..f6b85ebd29 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP014", + "filament_id": "OFIegjmD", "setting_id": "XIFP4KMuMtXF5bjQ", "name": "Eolas Prints TPU Flex D53 @System", "from": "system", 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 169d681f39..4fc33c0d64 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP015", + "filament_id": "OFvVy7yo", "setting_id": "rJmsm0zjvsk9Dy0G", "name": "Eolas Prints TPU D60 UV Resistant @System", "from": "system", 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 f5cd2eb40c..31dd33a87d 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFSEP016", + "filament_id": "OFTOPcx0", "setting_id": "CM24KGoHLt0yLH93", "name": "Eolas Prints TPU Transition @System", "from": "system", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast ABS @base.json index be5c677c64..644ba0b1b8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast ABS @base.json @@ -3,7 +3,7 @@ "name": "FDplast ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "FDPLAST01", + "filament_id": "OFjorDcx", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast HIPS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast HIPS @base.json index 41563b6208..60e86f17eb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast HIPS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast HIPS @base.json @@ -3,7 +3,7 @@ "name": "FDplast HIPS @base", "inherits": "fdm_filament_hips", "from": "system", - "filament_id": "FDPLAST02", + "filament_id": "OFmJAd3A", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PETG @base.json index a1cdfe34fc..9087e8afa7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PETG @base.json @@ -3,7 +3,7 @@ "name": "FDplast PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "FDPLAST03", + "filament_id": "OFfJSCzm", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PLA @base.json index c2ce9ccd38..e98c3d22fb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast PLA @base.json @@ -3,7 +3,7 @@ "name": "FDplast PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "FDPLAST04", + "filament_id": "OFtr8eZw", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast SBS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast SBS @base.json index e396fee0fb..1ae33c2990 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast SBS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast SBS @base.json @@ -3,7 +3,7 @@ "name": "FDplast SBS @base", "inherits": "fdm_filament_sbs", "from": "system", - "filament_id": "FDPLAST05", + "filament_id": "OFtRn8X8", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast TPU @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast TPU @base.json index 4db983cd87..bf288f545b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast TPU @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FDplast/FDplast TPU @base.json @@ -3,7 +3,7 @@ "name": "FDplast TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "FDPLAST06", + "filament_id": "OFfmZrI3", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json index 64800fce25..bb8f8905e3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PA @base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "FILL3D PA @base", "from": "system", - "filament_id": "FILL3D006", + "filament_id": "OFJNeELv", "instantiation": "false", "inherits": "fdm_filament_pa", "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json index c310be8cb2..f0a0e32f26 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG @base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "FILL3D PETG @base", "from": "system", - "filament_id": "FILL3D003", + "filament_id": "OFQbjX3s", "instantiation": "false", "inherits": "fdm_filament_pet", "filament_vendor": [ 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 38214eec2c..0d1dc4a737 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PETG CF @base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "FILL3D PETG CF @base", "from": "system", - "filament_id": "FILL3D007", + "filament_id": "OFOiJfLM", "instantiation": "false", "inherits": "fdm_filament_pet", "filament_vendor": [ 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 8f2ee4ddf8..13d29eaaa8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Basic @base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "FILL3D PLA Basic @base", "from": "system", - "filament_id": "FILL3D002", + "filament_id": "OFDpW3J8", "instantiation": "false", "inherits": "fdm_filament_pla", "filament_vendor": [ 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 f5ec5f906a..38be0d7078 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PLA Turbo @base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "FILL3D PLA Turbo @base", "from": "system", - "filament_id": "FILL3D001", + "filament_id": "OFoSknDB", "instantiation": "false", "inherits": "fdm_filament_pla", "adaptive_pressure_advance": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json index 9e74676e50..708e4c50ec 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PP @base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "FILL3D PP @base", "from": "system", - "filament_id": "FILL3D004", + "filament_id": "OFPWPlSC", "instantiation": "false", "inherits": "fdm_filament_pp", "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json index 813eb8faf2..6d6aaf9e34 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FILL3D/FILL3D PPCF @base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "FILL3D PPCF @base", "from": "system", - "filament_id": "FILL3D005", + "filament_id": "OFg8hMzT", "instantiation": "false", "inherits": "fdm_filament_pp", "filament_vendor": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json index 5195e151e3..340dc5da23 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG @base.json @@ -3,7 +3,7 @@ "name": "FilAr PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "FILARB03", + "filament_id": "OF5rnhjh", "instantiation": "false", "filament_type": [ "PETG" 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 f63b93f11f..b1284f1d3d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Lima.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Lima.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "QuJY74Af8ssl9uuB", - "filament_id": "FILAR0047", + "filament_id": "OFt6e0US", "instantiation": "true", "filament_vendor": [ "FilAr" 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 75b1bda3c7..00e5af59a1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Radiante.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Amarillo Radiante.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "aFO2PDBIQqvNlH9p", - "filament_id": "FILAR0048", + "filament_id": "OF0Vtzaw", "instantiation": "true", "filament_vendor": [ "FilAr" 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 ccb0abfbfe..cbed2c3aa7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Boreal.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Boreal.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "JQsOaH7Zcs0cLLPY", - "filament_id": "FILAR0049", + "filament_id": "OFNU9YIW", "instantiation": "true", "filament_vendor": [ "FilAr" 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 135bea1c45..f2d8c16a43 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Francia.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Francia.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "O24dTvHOzlbikvmq", - "filament_id": "FILAR0050", + "filament_id": "OF44VYzK", "instantiation": "true", "filament_vendor": [ "FilAr" 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 af4921a5a8..8c917d750a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Imperial.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Azul Imperial.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "JAUmcvfO2lnmxGj5", - "filament_id": "FILAR0051", + "filament_id": "OF2Z1nT5", "instantiation": "true", "filament_vendor": [ "FilAr" 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 19ece09a31..c2bd7f3368 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Blanco Antartida.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Blanco Antartida.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "dd4fL2ztjz4UiTaG", - "filament_id": "FILAR0052", + "filament_id": "OFsXQXbs", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json index cc9e4d7422..ac1d1be6fe 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cian.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "kQFbBS3nxU7M2yPa", - "filament_id": "FILAR0053", + "filament_id": "OFnejEt4", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json index 779c773a3e..9b3e380b57 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Coral.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "fspbgXmAOWjFBQqh", - "filament_id": "FILAR0054", + "filament_id": "OFysxCep", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json index 00b2b360f5..1e7c947bea 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Cristal.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "MnA2FnHdIuViwo41", - "filament_id": "FILAR0055", + "filament_id": "OFJQDUk3", "instantiation": "true", "filament_vendor": [ "FilAr" 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 194848d1bb..c20eb5fcad 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Ceniza.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Ceniza.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "oYjDczRs4U1JdteC", - "filament_id": "FILAR0056", + "filament_id": "OFybzvQN", "instantiation": "true", "filament_vendor": [ "FilAr" 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 bfba887890..93335c7951 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Plata.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Gris Plata.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "eCJ5aFcQ00m97U35", - "filament_id": "FILAR0057", + "filament_id": "OFgpLTMR", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json index a7bb2ee141..5a8ac777f5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Magenta.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "CEOhwBE63SWwuh6P", - "filament_id": "FILAR0058", + "filament_id": "OFurdQxc", "instantiation": "true", "filament_vendor": [ "FilAr" 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 6e51c8b275..5cba6c4a02 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Negro Azabache.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Negro Azabache.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "OPZin7y48ZEeiH8D", - "filament_id": "FILAR0059", + "filament_id": "OFq8gfS4", "instantiation": "true", "filament_vendor": [ "FilAr" 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 dc573cba91..3ed33ea0f9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Rojo Carmesi.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PETG Rojo Carmesi.json @@ -4,7 +4,7 @@ "inherits": "FilAr PETG @base", "from": "system", "setting_id": "ok1h38XzyQXPBIMM", - "filament_id": "FILAR0060", + "filament_id": "OFPbyOSk", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json index 04426a96ca..c5ed35c1f1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA @base.json @@ -3,7 +3,7 @@ "name": "FilAr PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "FILARB01", + "filament_id": "OF4KsW72", "instantiation": "false", "filament_type": [ "PLA" 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 6ba4cbfb87..1d6c41003b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Amarillo Lirio.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Amarillo Lirio.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "sZEY2QrlLsDkgZin", - "filament_id": "FILAR0022", + "filament_id": "OF8aFWfQ", "instantiation": "true", "filament_vendor": [ "FilAr" 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 ffc1c97a5a..a2f84470c4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Azul Francia.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Azul Francia.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "kOF3UfqKVqWKFwiH", - "filament_id": "FILAR0026", + "filament_id": "OFnYVFk2", "instantiation": "true", "filament_vendor": [ "FilAr" 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 a5bfa7d2d2..e9d68452dc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Antartida.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Antartida.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "9KxtnS1WoUAgH323", - "filament_id": "FILAR0017", + "filament_id": "OFHAccHz", "instantiation": "true", "filament_vendor": [ "FilAr" 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 2f03fc3ce8..1166928647 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Calido.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Blanco Calido.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "pAToQatK3PVTMHrW", - "filament_id": "FILAR0018", + "filament_id": "OFKTSiYF", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json index 58eafa2f7c..599c64038c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Bronce.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "bJuNDmVGIF0TXvkk", - "filament_id": "FILAR0001", + "filament_id": "OFWTRJ1K", "instantiation": "true", "filament_vendor": [ "FilAr" 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 3e98bc7ebf..b70feb22d4 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 @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "vlPu3T66cQhIr5nl", - "filament_id": "FILAR0006", + "filament_id": "OFWwF7K7", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json index 276d339eae..bdb948112a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Carpincho.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "dNsCH2BVjuq3jrN7", - "filament_id": "FILAR0009", + "filament_id": "OFKWWgyp", "instantiation": "true", "filament_vendor": [ "FilAr" 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 9294b3e0d5..f0ca1c323c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Celeste Cielo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Celeste Cielo.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "baAQZuzRZD0nwmqH", - "filament_id": "FILAR0027", + "filament_id": "OFaDOaNt", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json index 4fd0d180f7..44402e7b5a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Cobre.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "BpYgVH5d3LOdib3U", - "filament_id": "FILAR0003", + "filament_id": "OFNemJM6", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json index 77c31289ff..fd25d70050 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Dorado.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "KHIdy0oNw9YYDNOD", - "filament_id": "FILAR0029", + "filament_id": "OF5P4jgA", "instantiation": "true", "filament_vendor": [ "FilAr" 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 acd8b8c9a0..d09d053c53 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Ceniza.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Ceniza.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "LBpWNtHWPyZi96wr", - "filament_id": "FILAR0025", + "filament_id": "OFIamQnD", "instantiation": "true", "filament_vendor": [ "FilAr" 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 1bf3af9593..c6809d1104 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Pizarra.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Pizarra.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "SeePXOShT3cge6TS", - "filament_id": "FILAR0024", + "filament_id": "OFTlRzpe", "instantiation": "true", "filament_vendor": [ "FilAr" 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 1cb23756fb..3748c83352 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Plata.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Gris Plata.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "B6HABCdHSblZS7lQ", - "filament_id": "FILAR0002", + "filament_id": "OFKKajh6", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json index 00dbe089e4..81c6eb5928 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Manteca.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "tR4io22VQO0J8UsV", - "filament_id": "FILAR0007", + "filament_id": "OFexaZU2", "instantiation": "true", "filament_vendor": [ "FilAr" 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 bcd1b5ffb4..452b48010d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Marron Oxido.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Marron Oxido.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "r9eviTeCeTW4rLuz", - "filament_id": "FILAR0008", + "filament_id": "OFAt6ec0", "instantiation": "true", "filament_vendor": [ "FilAr" 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 ca76d328c1..dd5475f0c6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Naranja Tigre.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Naranja Tigre.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "zLZxXa78e1oiYWSg", - "filament_id": "FILAR0020", + "filament_id": "OFKZ9skj", "instantiation": "true", "filament_vendor": [ "FilAr" 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 06082ff8c6..aaf06f8833 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Negro Azabache.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Negro Azabache.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "glc7ip75qjodcceS", - "filament_id": "FILAR0019", + "filament_id": "OFgMWJ8T", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json index 9cb39d2135..03e171b525 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Oro.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "hCv43F2tNJagwzC7", - "filament_id": "FILAR0028", + "filament_id": "OF5nlfKY", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json index b18da8d2e8..4ae2924081 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Piel.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "6ZwTYvV27Oj3l33v", - "filament_id": "FILAR0012", + "filament_id": "OFsDXRpS", "instantiation": "true", "filament_vendor": [ "FilAr" 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 516ceb83f9..95c3c870bc 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 @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "5dINxIgy0kMYYNDT", - "filament_id": "FILAR0021", + "filament_id": "OFaEesXQ", "instantiation": "true", "filament_vendor": [ "FilAr" 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 512340cfdf..62763f36a5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Amaranto.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Amaranto.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "wgxgJfhOa2ZPikRH", - "filament_id": "FILAR0010", + "filament_id": "OFPqX3x2", "instantiation": "true", "filament_vendor": [ "FilAr" 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 afe39634fe..9fb203bb0c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Flamenco.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Rosa Flamenco.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "FhROwdLMSz3cyRZo", - "filament_id": "FILAR0011", + "filament_id": "OFZ4QbfK", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json index 05e71143ca..6925843d95 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Tabaco.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "6ax7ka7LBHqhBigT", - "filament_id": "FILAR0005", + "filament_id": "OFjT9PkZ", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json index fe00512045..f7b823fe5b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Titanio.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "ZRedeSWJhUayeJLw", - "filament_id": "FILAR0004", + "filament_id": "OFQWIKbV", "instantiation": "true", "filament_vendor": [ "FilAr" 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 da619c819a..e3355ffa43 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde FilAr.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde FilAr.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "SYWoimklLqx5O2Xh", - "filament_id": "FILAR0013", + "filament_id": "OFvPPMxL", "instantiation": "true", "filament_vendor": [ "FilAr" 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 ac3fae3303..46772cf083 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Manzana.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Manzana.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "FlPRrQEcKnVKwJDM", - "filament_id": "FILAR0014", + "filament_id": "OFdb8YNz", "instantiation": "true", "filament_vendor": [ "FilAr" 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 a1e594b840..6fe74aa2f3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Oliva.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Oliva.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "eWAcT15sDLZeV2uS", - "filament_id": "FILAR0016", + "filament_id": "OFkoLUtR", "instantiation": "true", "filament_vendor": [ "FilAr" 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 c6932f6b22..9068b293f2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Pixel.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Verde Pixel.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "Z7toK1R2GuzHVgfo", - "filament_id": "FILAR0015", + "filament_id": "OFkGvN4d", "instantiation": "true", "filament_vendor": [ "FilAr" 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 819187e0fe..fa12bcc077 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Violeta Jacaranda.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA Violeta Jacaranda.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA @base", "from": "system", "setting_id": "4VO2Qb2cTXQ1TJv2", - "filament_id": "FILAR0023", + "filament_id": "OFP26zNb", "instantiation": "true", "filament_vendor": [ "FilAr" 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 d012487eb7..729e9d7b9c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate @base.json @@ -3,7 +3,7 @@ "name": "FilAr PLA-mate @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "FILARB02", + "filament_id": "OFtOoWIj", "instantiation": "false", "filament_type": [ "PLA" 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 e6e4811b6c..98a2349ac1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Amarillo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Amarillo.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "f8DPrkYuTUPJ3cru", - "filament_id": "FILAR0030", + "filament_id": "OFj3bTjw", "instantiation": "true", "filament_vendor": [ "FilAr" 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 d752c69555..7688708656 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Azul.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Azul.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "QMBocqysEed86R9y", - "filament_id": "FILAR0031", + "filament_id": "OF5vgi2G", "instantiation": "true", "filament_vendor": [ "FilAr" 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 3d4c2eb19a..2324dadcc5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Beige.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Beige.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "XoilIv3HqpDTVRwv", - "filament_id": "FILAR0032", + "filament_id": "OFGcLA5R", "instantiation": "true", "filament_vendor": [ "FilAr" 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 d08673007a..92f10acf51 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Blanco.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Blanco.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "xkotTQheAIUUhPd7", - "filament_id": "FILAR0033", + "filament_id": "OFtefokm", "instantiation": "true", "filament_vendor": [ "FilAr" 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 8277b74545..4018c1d710 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Bordo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Bordo.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "zV2dKrknk0ThDv36", - "filament_id": "FILAR0034", + "filament_id": "OFiDpM1B", "instantiation": "true", "filament_vendor": [ "FilAr" 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 fadf1b26ff..ff47203106 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 @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "UZW4F0aVz1TqstYi", - "filament_id": "FILAR0035", + "filament_id": "OFqtx549", "instantiation": "true", "filament_vendor": [ "FilAr" 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 f184b6be29..b67e57db85 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Chocolate.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Chocolate.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "DdW1XKqqRuLM1cAd", - "filament_id": "FILAR0036", + "filament_id": "OFdzlrhi", "instantiation": "true", "filament_vendor": [ "FilAr" 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 b2740bc3b4..445a44b1e4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Gris.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Gris.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "6OtKg1UxWuNCqsZy", - "filament_id": "FILAR0037", + "filament_id": "OFGVwfK0", "instantiation": "true", "filament_vendor": [ "FilAr" 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 b3190c28d9..aa411c3d77 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Marron.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Marron.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "lKOXMY37q8WpMdBA", - "filament_id": "FILAR0038", + "filament_id": "OF8jh0Lk", "instantiation": "true", "filament_vendor": [ "FilAr" 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 b3fabc3603..2c382c085d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Naranja.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Naranja.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "MabNpNP8G9RqEruP", - "filament_id": "FILAR0039", + "filament_id": "OFmaeU4a", "instantiation": "true", "filament_vendor": [ "FilAr" 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 d46222cad5..7ec4105a25 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Negro.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Negro.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "Jwrm1uuCo7UjvgWn", - "filament_id": "FILAR0040", + "filament_id": "OFufTAK9", "instantiation": "true", "filament_vendor": [ "FilAr" 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 49fd32c1ac..6635fe8b78 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Piel.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Piel.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "ifbCS3WypTUa1JHr", - "filament_id": "FILAR0041", + "filament_id": "OFfZcoKr", "instantiation": "true", "filament_vendor": [ "FilAr" 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 63a280b0c4..bed097ad9a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rojo.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rojo.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "ak2QX0IS74Nmtyex", - "filament_id": "FILAR0042", + "filament_id": "OFIBXa0k", "instantiation": "true", "filament_vendor": [ "FilAr" 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 78208657c8..1767674916 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rosa.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Rosa.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "GrEXuL6TYue238MK", - "filament_id": "FILAR0043", + "filament_id": "OFausr3F", "instantiation": "true", "filament_vendor": [ "FilAr" 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 860ac8347d..0e5bb137e1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Uva.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Uva.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "PK1CsK7AS1p1IJaR", - "filament_id": "FILAR0044", + "filament_id": "OFEZ449N", "instantiation": "true", "filament_vendor": [ "FilAr" 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 7f49cb138e..67fe0ebfee 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Verde.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Verde.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "rsLi8jr62hHPgERG", - "filament_id": "FILAR0045", + "filament_id": "OFCjG251", "instantiation": "true", "filament_vendor": [ "FilAr" 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 f60b17b69e..e842875905 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Violeta.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FilAr/FilAr PLA-mate Violeta.json @@ -4,7 +4,7 @@ "inherits": "FilAr PLA-mate @base", "from": "system", "setting_id": "z2Pk06JzY9Tr1WjQ", - "filament_id": "FILAR0046", + "filament_id": "OF2EK9F1", "instantiation": "true", "filament_vendor": [ "FilAr" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FusRock/FusRock ABS-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/FusRock ABS-GF @base.json index bb09f036ff..95a8fd47ea 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/FusRock/FusRock ABS-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/FusRock ABS-GF @base.json @@ -3,7 +3,7 @@ "name": "FusRock ABS-GF @base", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFR00", + "filament_id": "OFmn9NZL", "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（https://wiki.fusrock.com）.", "filament_extruder_variant": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json index fa4788b45a..e499fa3a73 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "W0LP8Ah5MHMzogvV", - "filament_id": "OGFB99", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json index a4e10439c2..f55ee5e239 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "bcsNcj4DzLb4K5zN", - "filament_id": "OGFB98", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json index 96c3dc4f34..7b34746bb2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic BVOH @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_bvoh", "from": "system", "setting_id": "oUpbqz3uzQqND5DG", + "filament_id": "OFo2UF2C", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json index dbf10cf3f5..60c330fc39 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic CoPE @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_cope", "from": "system", "setting_id": "KlHtaJU2GM0uaRGM", + "filament_id": "OFjt9en1", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json index 6caf96f6b1..646bef3f28 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic EVA @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_eva", "from": "system", "setting_id": "cFGhkhQKiFilQ9gZ", + "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": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json index 44cedfc810..c4acb079be 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic HIPS @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_hips", "from": "system", "setting_id": "A7gedcxip65DXKuf", + "filament_id": "OFsFon5l", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json index 2cf8b79680..4bea15a407 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "9DoeedUBMRPSCyu2", - "filament_id": "OGFN99", + "filament_id": "OFg8ndtj", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json index f7b9df437a..002959ab2d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "rchW8WI6gcXuAE0V", - "filament_id": "OGFN98", + "filament_id": "OFQLcbps", "instantiation": "true", "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 fd5c80443c..f84c7fe7b6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "LNjv9LwZnbu7ZASC", - "filament_id": "OGFC99", + "filament_id": "OFLakOUI", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json index 967c5627cb..41ff08bd5c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PCTG @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pctg", "from": "system", "setting_id": "21dhMVBuVwR2lzIX", + "filament_id": "OFu1evlr", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json index 844ee902df..210c48b77a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pe", "from": "system", "setting_id": "8HpfeTNwthJ7L0XE", + "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": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json index 48212f7143..53ca2e0f9d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PE-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PE-CF @base", "inherits": "fdm_filament_pe", "from": "system", - "filament_id": "OFJfx0Cl", + "filament_id": "OFd0Fv0k", "instantiation": "false", "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 2eb975f56c..f6fb133324 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "YiQZfhL6hH0giSHL", - "filament_id": "OGFG99", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json index f8de64e2a8..173f397a49 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG HF @base.json @@ -3,6 +3,6 @@ "name": "Generic PETG HF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFfB1QKi", + "filament_id": "OF7lOgYF", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json index 08bc8ad547..8bf644a26d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFDCk0cz", + "filament_id": "OFoYSJKi", "instantiation": "false", "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 dab5219261..c50840c55a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PHA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PHA @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pha", "from": "system", "setting_id": "kks2z4JbypqY68RW", + "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": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json index c018544fa5..7bf0a0e72b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA @System.json @@ -5,6 +5,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "RcBNzytWgwRrwXXz", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [] } 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 041ff59c44..d587a6d68d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "L9wOwDxavVR7vrL7", - "filament_id": "OGFL95", + "filament_id": "OFmpMwxS", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json index 931ec3ea7e..7fed10e48e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Matte @base.json @@ -3,6 +3,6 @@ "name": "Generic PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFJsqMzx", + "filament_id": "OFmY0l6t", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json index 700b80761f..3bee7ccde6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA Silk @System.json @@ -5,6 +5,7 @@ "inherits": "fdm_filament_pla_silk", "from": "system", "setting_id": "oPkXDCBrTQB3SRm4", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json index d6a80ed8ee..972ef33800 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "l2LkEql1SVH0iRqY", - "filament_id": "OGFL98", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json index e2c16e704f..14e38bc340 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pp", "from": "system", "setting_id": "yos4oScjK83JuXJV", + "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": [] diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json index f5fefcf0cb..1852185476 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PP-CF @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "OFRS2Ggt", + "filament_id": "OFXkm8q1", "instantiation": "false", "filament_type": [ "PP-CF" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json index 2544bac78a..08a8158d91 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json @@ -3,6 +3,6 @@ "name": "Generic PP-GF @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "OFMCMXSG", + "filament_id": "OFNiSLfL", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json index a5fdd90f9c..99ee7acda7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-CF @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "rZpVQIyltFNiQyW3", + "filament_id": "OF8tPByX", "instantiation": "true", "fan_max_speed": [ "35" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json index 9ebf9cb656..3b5e1b7583 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "yJCAFLt5wstMgMAY", - "filament_id": "OGFN96", + "filament_id": "OF8Tlg47", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json index e1cf8643d1..c6300423ba 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "1dlLnJKh1HzQCZVJ", - "filament_id": "OGFS99", + "filament_id": "OFDvXujf", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json index 082c4dd4bf..cf5aa1a8f6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic SBS @System.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_sbs", "from": "system", "setting_id": "fjVWcIfxaOAZHNU1", + "filament_id": "OFhQfUQY", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json index be4543b662..c8ae9f2562 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "D6O8IcmSe8WGqOvb", - "filament_id": "OGFU99", + "filament_id": "OFgbpcy9", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/GreenGate3D/GreenGate3D PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/GreenGate3D/GreenGate3D PETG @base.json index 284c63ab9c..a0ba8360d6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/GreenGate3D/GreenGate3D PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/GreenGate3D/GreenGate3D PETG @base.json @@ -3,7 +3,7 @@ "name": "GreenGate3D PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFGG300", + "filament_id": "OFhMO9Kh", "instantiation": "false", "filament_cost": [ "32" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT ABS @base.json index 78d2166f9e..8fb4f4c187 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT ABS @base.json @@ -3,7 +3,7 @@ "name": "NIT ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "NIT01", + "filament_id": "OFhWc5Bv", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PETG @base.json index 8e84b68607..2fd955a1b1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PETG @base.json @@ -3,7 +3,7 @@ "name": "NIT PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "NIT03", + "filament_id": "OFJu1XwK", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PLA @base.json index 89b6842010..ff541d0239 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/NIT/NIT PLA @base.json @@ -3,7 +3,7 @@ "name": "NIT PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "NIT02", + "filament_id": "OFwRJ4g0", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Numakers/Numakers PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/Numakers PLA+ @base.json index c0c2c86585..818b181355 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Numakers/Numakers PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/Numakers PLA+ @base.json @@ -3,7 +3,7 @@ "name": "Numakers PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFNMK00", + "filament_id": "OFqGRZyH", "instantiation": "false", "filament_cost": [ "20.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ABS Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ABS Basic @base.json index 3ceb467a61..5029f42e5d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ABS Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ABS Basic @base.json @@ -3,7 +3,7 @@ "name": "Overture ABS Basic @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OVTABS08", + "filament_id": "OFDvqJ6n", "instantiation": "false", "description": "Overture ABS settings from https://overture3d.com/.", "activate_air_filtration": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @base.json index 415bf9e6d1..31357aadf6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture ASA @base.json @@ -3,7 +3,7 @@ "name": "Overture ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFOT009", + "filament_id": "OFM91vZs", "instantiation": "false", "fan_cooling_layer_time": [ "45" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json index 39e351a24c..6ce9a126cc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Air PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFOT006", + "filament_id": "OFcfQk4h", "instantiation": "false", "filament_cost": [ "27.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @base.json index a0c11e0a81..d4388a6c90 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Easy PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFOT003", + "filament_id": "OF1Pke8t", "instantiation": "false", "filament_cost": [ "17.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json index 3f4dd854a3..43d4abe1d8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture Matte PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL05", + "filament_id": "OFBw6eEG", "instantiation": "false", "filament_cost": [ "24.52" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json index 486d34d0e5..45ae0ba24b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL04", + "filament_id": "OFc3xdm9", "instantiation": "false", "filament_cost": [ "24.15" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @base.json index 80525e03b2..454c36e7b0 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA Pro @base.json @@ -3,7 +3,7 @@ "name": "Overture PLA Pro @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFOT001", + "filament_id": "OFxA1p01", "instantiation": "false", "filament_cost": [ "26.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @base.json index 3317a8e0a9..5027f3ac01 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Rock PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFOT004", + "filament_id": "OFMZvH0z", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @base.json index 0fd19a6323..ca1a187fe0 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Silk PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFOT002", + "filament_id": "OFGkyftV", "instantiation": "false", "filament_cost": [ "25.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @base.json index 0bab3f81f0..776367ba06 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Super PLA+ @base.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFOT005", + "filament_id": "OF2pj5l5", "instantiation": "false", "filament_cost": [ "28.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json index bdc7f4e236..20ff507393 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture TPU @base.json @@ -3,7 +3,7 @@ "name": "Overture TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFOT008", + "filament_id": "OFcvKkrs", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json index 7b5740c1df..a5aa03bf9b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA12-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFL52", + "filament_id": "OFX0ycRQ", "instantiation": "false", "eng_plate_temp": [ "40" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json index d96e531b0d..96b913c738 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFL50", + "filament_id": "OFkOviHk", "instantiation": "false", "eng_plate_temp": [ "40" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json index b5e9c57851..607b1c8e00 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-GF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFL51", + "filament_id": "OFwaYjL6", "instantiation": "false", "eng_plate_temp": [ "40" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json index 4fa1bd200d..3765f754f5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA612-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OGFL53", + "filament_id": "OFS2tn6G", "instantiation": "false", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json index 1e74b59930..6946d6e0a3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PET-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFL54", + "filament_id": "OFHWSM21", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json index 500fac4037..11d2f9023f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PETG-ESD @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFL06", + "filament_id": "OFcytyoA", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json index 12cc822453..489e03bc64 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PETG-rCF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFL55", + "filament_id": "OFk8t9mz", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma CoPE @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma CoPE @base.json index d856da86cc..52f2ed96f4 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma CoPE @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma CoPE @base.json @@ -3,7 +3,7 @@ "name": "Panchroma CoPE @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM016", + "filament_id": "OFqw2PQA", "instantiation": "false", "filament_cost": [ "19.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA @base.json index 2c4f278387..94d7383fef 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM001", + "filament_id": "OFsRDvTM", "instantiation": "false", "filament_cost": [ "19.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Celestial @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Celestial @base.json index 10c999c3a8..123ba02747 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Celestial @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Celestial @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Celestial @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM008", + "filament_id": "OFRiYgMK", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Galaxy @base.json index 40ae42e78c..d98e119c0b 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Galaxy @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Galaxy @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Galaxy @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM007", + "filament_id": "OFFkCLBl", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Glow @base.json index c5219dea65..9a162062a3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Glow @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Glow @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Glow @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM010", + "filament_id": "OF0gGRWk", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Luminous @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Luminous @base.json index 48158b336a..a6f61c9e5f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Luminous @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Luminous @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Luminous @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM011", + "filament_id": "OF0kCNDK", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Marble @base.json index 11954166b9..e514df6f78 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Marble @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM003", + "filament_id": "OFKiSMWR", "instantiation": "false", "filament_cost": [ "21.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Matte @base.json index 6e965f908d..87da70c021 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM002", + "filament_id": "OFrOh600", "instantiation": "false", "filament_cost": [ "20.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Metallic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Metallic @base.json index 3a7d3f93eb..820fc99703 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Metallic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Metallic @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Metallic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM012", + "filament_id": "OFjb0wos", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Neon @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Neon @base.json index d9a68636c8..c57c976d11 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Neon @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Neon @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Neon @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM013", + "filament_id": "OFO1GEq6", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json index 4e55dcd18c..52d96d24d1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json @@ -4,7 +4,7 @@ "renamed_from": "Panchroma PLA Stain @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM005", + "filament_id": "OFPkCJKE", "instantiation": "false", "filament_cost": [ "20.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Silk @base.json index 08fabb165e..d0df636abb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Silk @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM004", + "filament_id": "OFS8lTQt", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Starlight @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Starlight @base.json index bed7d34e53..d271daa50a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Starlight @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Starlight @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Starlight @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM009", + "filament_id": "OFC78WGQ", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Temp Shift @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Temp Shift @base.json index 5d8adcda38..9de5e084b3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Temp Shift @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Temp Shift @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Temp Shift @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM015", + "filament_id": "OFhASRWj", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Translucent @base.json index e3c3355b43..d6da194349 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Translucent @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Translucent @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Translucent @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM006", + "filament_id": "OFCIUsWh", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA UV Shift @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA UV Shift @base.json index 97009b894d..1a2662f1bc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA UV Shift @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA UV Shift @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA UV Shift @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM014", + "filament_id": "OF1N1qMK", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json index 759c29892a..540a6b846d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OGFB60", + "filament_id": "OFOvv91M", "instantiation": "false", "filament_cost": [ "26.9" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json index 78340f6984..95b4d39c1a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json @@ -3,7 +3,7 @@ "name": "PolyLite ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OGFB61", + "filament_id": "OFvrXuV7", "instantiation": "false", "eng_plate_temp": [ "100" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json index fc31b9bc35..814e641e1a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite Dual PLA @base.json @@ -3,6 +3,6 @@ "name": "PolyLite Dual PLA @base", "inherits": "PolyLite PLA @base", "from": "system", - "filament_id": "OFsNZcid", + "filament_id": "OFYGbPHX", "instantiation": "false" } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json index 448bb2c66f..7e8312f282 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFG60", + "filament_id": "OF0UJcb6", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json index 4fc233d3e6..00547fdbe8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @base", "from": "system", "setting_id": "MKxTIucBtfpUvIhZ", - "filament_id": "OGFL00", + "filament_id": "OF5CgdDq", "instantiation": "true", "filament_max_volumetric_speed": [ "15" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json index 65e8f261fb..55ea664946 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL00", + "filament_id": "OF5CgdDq", "instantiation": "false", "filament_cost": [ "25.4" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Pro @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Pro @base.json index bdd34f2b03..0b21f98254 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Pro @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Pro @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Pro @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM019", + "filament_id": "OFF9OKoY", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json index 84b6fb4aea..05d3492408 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json @@ -5,7 +5,7 @@ "inherits": "PolyTerra PLA @base", "from": "system", "setting_id": "OajdcsUZSmrTA2vC", - "filament_id": "OGFL00-1", + "filament_id": "OFCccVrQ", "instantiation": "true", "compatible_printers": [] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json index d2bec7fcd5..3b13c5b55c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL01", + "filament_id": "OFW29a9R", "instantiation": "false", "filament_cost": [ "25.4" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA @base.json index 22b1106271..db7624e45a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA @base.json @@ -3,7 +3,7 @@ "name": "Polymaker HT-PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM017", + "filament_id": "OFPoyiFs", "instantiation": "false", "filament_cost": [ "26.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA-GF @base.json index 38a73bca9f..866ce490e9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker HT-PLA-GF @base.json @@ -3,7 +3,7 @@ "name": "Polymaker HT-PLA-GF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFPM018", + "filament_id": "OFlwmqrC", "instantiation": "false", "filament_cost": [ "32.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json index 149a1dc107..aa1a2bab42 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFSNL06", + "filament_id": "OFxUwUeW", "instantiation": "false", "filament_cost": [ "31.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json index 4c564801df..e8152acbcf 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OGFSNL08", + "filament_id": "OF2GCW1l", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json index f99430b2f7..34035846fb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFSNL02", + "filament_id": "OFpW4gdi", "instantiation": "false", "filament_cost": [ "25.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json index 7424503b9f..832c2a4f06 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA+ 2.0 @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFSNL04", + "filament_id": "OFHmPYRy", "instantiation": "false", "filament_cost": [ "18.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json index f890c225be..1fffd42112 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFSNL03", + "filament_id": "OFMUWNkp", "instantiation": "false", "filament_cost": [ "18.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json index ac28782615..35f599e125 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json @@ -3,7 +3,7 @@ "name": "SUNLU Silk PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFSNL05", + "filament_id": "OFpPGSKG", "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": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json index cd9bbec953..fc94c630a0 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json @@ -3,7 +3,7 @@ "name": "SUNLU Wood PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFSNL07", + "filament_id": "OFLJ8S6I", "instantiation": "false", "filament_cost": [ "26.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA @base.json index 77fa861c7b..6fa2f8a04d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA @base.json @@ -3,7 +3,7 @@ "name": "Valment PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "VLMNT01", + "filament_id": "OFDe8uyM", "instantiation": "false", "filament_cost": [ "670" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Galaxy @base.json index 9920f9a504..e181556086 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Galaxy @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Galaxy @base.json @@ -3,7 +3,7 @@ "name": "Valment PLA Galaxy @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "VLMNT04", + "filament_id": "OFB5SmWk", "instantiation": "false", "filament_cost": [ "850" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Silk @base.json index d873590f08..1deb8d1983 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Silk @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Valment PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "VLMNT02", + "filament_id": "OFpBlrvY", "instantiation": "false", "filament_cost": [ "710" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA-CF @base.json index 4451cffadb..f498a6f162 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Valment/Valment PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Valment PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "VLMNT03", + "filament_id": "OFfq5YXA", "instantiation": "false", "filament_cost": [ "1400" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json index d37476f458..78a3698530 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json @@ -3,7 +3,6 @@ "name": "fdm_filament_bvoh", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFS97", "instantiation": "false", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_cope.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_cope.json index 80ffd173de..6f41efb419 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_cope.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_cope.json @@ -3,7 +3,6 @@ "name": "fdm_filament_cope", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFLC99", "instantiation": "false", "filament_type": [ "CoPE" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json index bf1ff86af1..4edb63b575 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json @@ -3,7 +3,6 @@ "name": "fdm_filament_eva", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFR99", "instantiation": "false", "filament_type": [ "EVA" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json index beaebbd0e7..f8684e81cf 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json @@ -3,7 +3,6 @@ "name": "fdm_filament_hips", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFS98", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json index c2e4cf86df..b75ab9a8c9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pa", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFN99", "instantiation": "false", "activate_air_filtration": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json index 0f550063ad..b33b21cdab 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json @@ -3,7 +3,7 @@ "name": "fdm_filament_pc", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFC99", + "filament_id": "OFtcKVgP", "instantiation": "false", "supertack_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json index 8ca7e39994..a7f543bac5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pctg", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFG97", "instantiation": "false", "eng_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json index beb533d07f..52bf63abab 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pe", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFP99", "instantiation": "false", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json index eabb12c708..81a9bf77ab 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pet", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFG99", "instantiation": "false", "eng_plate_temp": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json index f6ef3ffc0c..9d35570511 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pha", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFR98", "instantiation": "false", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json index ae82d44129..43d579a2eb 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pla", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFL99", "instantiation": "false", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json index 3680a85602..67f18caf9e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pla_silk", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL96", "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_flow_ratio": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json index ec9405ef9a..9ba5c3504c 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pp", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFP97", "instantiation": "false", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json index 3eac71bc69..abfda9f1a8 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json @@ -3,7 +3,6 @@ "name": "fdm_filament_ppa", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFN97", "instantiation": "false", "activate_air_filtration": [ "0" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json index 96626d808d..f8aa9b6d99 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json @@ -3,7 +3,6 @@ "name": "fdm_filament_sbs", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OFLSBS99", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @base.json index 576da66278..53a489aaf2 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PETG @base.json @@ -3,7 +3,7 @@ "name": "eSUN PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "ESN03", + "filament_id": "OF3kBrdA", "instantiation": "false", "filament_vendor": [ "eSUN" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json index 26bbba31d9..4e3ab1d49f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL03", + "filament_id": "OFqINlYj", "instantiation": "false", "filament_cost": [ "22.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json index cef96aa7fc..16fc0dad97 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Basic @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA-Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFZhdVnP", + "filament_id": "OFTcE0nA", "instantiation": "false", "filament_cost": [ "11.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json index 1b6302372c..13fda6764f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Marble @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA-Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFXmQgno", + "filament_id": "OF7H3VJM", "instantiation": "false", "filament_cost": [ "28.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json index e4c42a3a5b..ffb7bd8dcd 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA-Matte @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA-Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OF3GKs2i", + "filament_id": "OFDETOM6", "instantiation": "false", "filament_cost": [ "14.99" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json index 138a388419..d80efe22cf 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN ePLA-LW @System.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "pYoZnuVPPIlMbdT1", - "filament_id": "ESN02", + "filament_id": "OFRzR5mi", "instantiation": "true", "filament_type": [ "PLA-AERO" diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index 3840098c11..a23c0d8cbc 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -1,6 +1,685 @@ { - "hints": {}, + "hints": { + "GFOT001": "OFxA1p01", + "GFOT002": "OFGkyftV", + "GFOT003": "OF1Pke8t", + "GFOT004": "OFMZvH0z", + "GFOT005": "OF2pj5l5", + "GFOT006": "OFcfQk4h", + "GFOT008": "OFcvKkrs", + "GFOT009": "OFM91vZs", + "GFSEP001": "OFtudokz", + "GFSEP002": "OFf5awy4", + "GFSEP003": "OFbP8zEO", + "GFSEP004": "OFrFBEfd", + "GFSEP005": "OFvzvwCu", + "GFSEP006": "OFH2nN08", + "GFSEP007": "OFPc4zVY", + "GFSEP008": "OFkzr35f", + "GFSEP009": "OFHfzQXo", + "GFSEP010": "OFhWhL1i", + "GFSEP011": "OFx8Lmsd", + "GFSEP012": "OFRiFnfQ", + "GFSEP013": "OFhfd722", + "GFSEP014": "OFIegjmD", + "GFSEP015": "OFvVy7yo", + "GFSEP016": "OFTOPcx0", + "GFSEP017": "OFXCBZTA", + "GFSEP018": "OFlSNkhc" + }, "retired": { + "AZ01-1": { + "claims": [ + "BBL/AliZ PETG-CF", + "OrcaFilamentLibrary/AliZ PETG-CF" + ], + "successor": "OFJOFnOZ" + }, + "AZ01-2": { + "claims": [ + "BBL/AliZ PETG-Metal", + "OrcaFilamentLibrary/AliZ PETG-Metal" + ], + "successor": "OFOABq7t" + }, + "AliZ001": { + "claims": [ + "BBL/AliZ PETG", + "OrcaFilamentLibrary/AliZ PETG" + ], + "successor": "OFocyw69" + }, + "AliZ002": { + "claims": [ + "BBL/AliZ PLA", + "OrcaFilamentLibrary/AliZ PLA" + ], + "successor": "OFyxayW4" + }, + "AliZ003": { + "claims": [ + "BBL/AliZ PA-CF", + "OrcaFilamentLibrary/AliZ PA-CF" + ], + "successor": "OFd4zw5l" + }, + "CX30DB20": { + "claims": [ + "BBL/COEX TPE 30D", + "OrcaFilamentLibrary/COEX TPE 30D" + ], + "successor": "OFVptRxp" + }, + "CX40DB20": { + "claims": [ + "BBL/COEX TPE 40D", + "OrcaFilamentLibrary/COEX TPE 40D" + ], + "successor": "OFfnXFie" + }, + "CX60AB17": { + "claims": [ + "BBL/COEX TPU 60A", + "OrcaFilamentLibrary/COEX TPU 60A" + ], + "successor": "OFE0NFRh" + }, + "CX60DB19": { + "claims": [ + "BBL/COEX TPE 60D", + "OrcaFilamentLibrary/COEX TPE 60D" + ], + "successor": "OFfr4XNO" + }, + "CXABPB09": { + "claims": [ + "BBL/COEX ABS PRIME", + "OrcaFilamentLibrary/COEX ABS PRIME" + ], + "successor": "OFuWCQXN" + }, + "CXABSB01": { + "claims": [ + "BBL/COEX ABS", + "OrcaFilamentLibrary/COEX ABS" + ], + "successor": "OF99UMPq" + }, + "CXASAB04": { + "claims": [ + "BBL/COEX ASA PRIME", + "OrcaFilamentLibrary/COEX ASA PRIME" + ], + "successor": "OFtpXCCv" + }, + "CXPACB23": { + "claims": [ + "BBL/COEX NYLEX PA6-CF", + "OrcaFilamentLibrary/COEX NYLEX PA6-CF" + ], + "successor": "OF0NgY1y" + }, + "CXPAUB21": { + "claims": [ + "BBL/COEX NYLEX UNFILLED " + ], + "successor": "OFJs1ToM" + }, + "CXPCTB15": { + "claims": [ + "BBL/COEX PCTG PRIME", + "OrcaFilamentLibrary/COEX PCTG PRIME" + ], + "successor": "OFwu7IAG" + }, + "CXPETB13": { + "claims": [ + "BBL/COEX PETG", + "OrcaFilamentLibrary/COEX PETG" + ], + "successor": "OFvTVZc3" + }, + "CXPLAB02": { + "claims": [ + "BBL/COEX PLA", + "OrcaFilamentLibrary/COEX PLA" + ], + "successor": "OFhlCNqq" + }, + "CXPLAB08": { + "claims": [ + "BBL/COEX PLA PRIME", + "OrcaFilamentLibrary/COEX PLA PRIME" + ], + "successor": "OFd2vX0G" + }, + "CXPLSB03": { + "claims": [ + "BBL/COEX PLA+Silk", + "OrcaFilamentLibrary/COEX PLA+Silk" + ], + "successor": "OF0pzFLc" + }, + "DREMC001": { + "claims": [], + "successor": null + }, + "DREMC002": { + "claims": [], + "successor": null + }, + "DREMC003": { + "claims": [], + "successor": null + }, + "DREMC004": { + "claims": [], + "successor": null + }, + "DREMC005": { + "claims": [], + "successor": null + }, + "DREMC006": { + "claims": [ + "OrcaFilamentLibrary/DREMC PA6-CF" + ], + "successor": "OFsoykbm" + }, + "DREMC007": { + "claims": [], + "successor": null + }, + "DREMC008": { + "claims": [], + "successor": null + }, + "DREMC009": { + "claims": [ + "OrcaFilamentLibrary/DREMC ABS-GF" + ], + "successor": "OFCidU7j" + }, + "DREMC010": { + "claims": [ + "OrcaFilamentLibrary/DREMC PPA-CF" + ], + "successor": "OFiWaoqD" + }, + "DREMC011": { + "claims": [], + "successor": null + }, + "DREMC012": { + "claims": [], + "successor": null + }, + "DREMC013": { + "claims": [], + "successor": null + }, + "ESN02": { + "claims": [ + "OrcaFilamentLibrary/eSUN ePLA-LW" + ], + "successor": "OFRzR5mi" + }, + "ESN03": { + "claims": [ + "OrcaFilamentLibrary/eSUN PETG" + ], + "successor": "OF3kBrdA" + }, + "FDPLAST01": { + "claims": [ + "OrcaFilamentLibrary/FDplast ABS" + ], + "successor": "OFjorDcx" + }, + "FDPLAST02": { + "claims": [ + "OrcaFilamentLibrary/FDplast HIPS" + ], + "successor": "OFmJAd3A" + }, + "FDPLAST03": { + "claims": [ + "OrcaFilamentLibrary/FDplast PETG" + ], + "successor": "OFfJSCzm" + }, + "FDPLAST04": { + "claims": [ + "OrcaFilamentLibrary/FDplast PLA" + ], + "successor": "OFtr8eZw" + }, + "FDPLAST05": { + "claims": [ + "OrcaFilamentLibrary/FDplast SBS" + ], + "successor": "OFtRn8X8" + }, + "FDPLAST06": { + "claims": [ + "OrcaFilamentLibrary/FDplast TPU" + ], + "successor": "OFfmZrI3" + }, + "FILAR0001": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Bronce" + ], + "successor": "OFWTRJ1K" + }, + "FILAR0002": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Gris Plata" + ], + "successor": "OFKKajh6" + }, + "FILAR0003": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Cobre" + ], + "successor": "OFNemJM6" + }, + "FILAR0004": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Titanio" + ], + "successor": "OFQWIKbV" + }, + "FILAR0005": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Tabaco" + ], + "successor": "OFjT9PkZ" + }, + "FILAR0006": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" + ], + "successor": "OFWwF7K7" + }, + "FILAR0007": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Manteca" + ], + "successor": "OFexaZU2" + }, + "FILAR0008": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Marron Oxido" + ], + "successor": "OFAt6ec0" + }, + "FILAR0009": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Carpincho" + ], + "successor": "OFKWWgyp" + }, + "FILAR0010": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" + ], + "successor": "OFPqX3x2" + }, + "FILAR0011": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" + ], + "successor": "OFZ4QbfK" + }, + "FILAR0012": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Piel" + ], + "successor": "OFsDXRpS" + }, + "FILAR0013": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Verde FilAr" + ], + "successor": "OFvPPMxL" + }, + "FILAR0014": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Verde Manzana" + ], + "successor": "OFdb8YNz" + }, + "FILAR0015": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Verde Pixel" + ], + "successor": "OFkGvN4d" + }, + "FILAR0016": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Verde Oliva" + ], + "successor": "OFkoLUtR" + }, + "FILAR0017": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" + ], + "successor": "OFHAccHz" + }, + "FILAR0018": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Calido" + ], + "successor": "OFKTSiYF" + }, + "FILAR0019": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Negro Azabache" + ], + "successor": "OFgMWJ8T" + }, + "FILAR0020": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" + ], + "successor": "OFKZ9skj" + }, + "FILAR0021": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" + ], + "successor": "OFaEesXQ" + }, + "FILAR0022": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" + ], + "successor": "OF8aFWfQ" + }, + "FILAR0023": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" + ], + "successor": "OFP26zNb" + }, + "FILAR0024": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" + ], + "successor": "OFTlRzpe" + }, + "FILAR0025": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" + ], + "successor": "OFIamQnD" + }, + "FILAR0026": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Azul Francia" + ], + "successor": "OFnYVFk2" + }, + "FILAR0027": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" + ], + "successor": "OFaDOaNt" + }, + "FILAR0028": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Oro" + ], + "successor": "OF5nlfKY" + }, + "FILAR0029": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA Dorado" + ], + "successor": "OF5P4jgA" + }, + "FILAR0030": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" + ], + "successor": "OFj3bTjw" + }, + "FILAR0031": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Azul" + ], + "successor": "OF5vgi2G" + }, + "FILAR0032": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Beige" + ], + "successor": "OFGcLA5R" + }, + "FILAR0033": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Blanco" + ], + "successor": "OFtefokm" + }, + "FILAR0034": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Bordo" + ], + "successor": "OFiDpM1B" + }, + "FILAR0035": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" + ], + "successor": "OFqtx549" + }, + "FILAR0036": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" + ], + "successor": "OFdzlrhi" + }, + "FILAR0037": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Gris" + ], + "successor": "OFGVwfK0" + }, + "FILAR0038": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Marron" + ], + "successor": "OF8jh0Lk" + }, + "FILAR0039": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Naranja" + ], + "successor": "OFmaeU4a" + }, + "FILAR0040": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Negro" + ], + "successor": "OFufTAK9" + }, + "FILAR0041": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Piel" + ], + "successor": "OFfZcoKr" + }, + "FILAR0042": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rojo" + ], + "successor": "OFIBXa0k" + }, + "FILAR0043": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rosa" + ], + "successor": "OFausr3F" + }, + "FILAR0044": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Uva" + ], + "successor": "OFEZ449N" + }, + "FILAR0045": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Verde" + ], + "successor": "OFCjG251" + }, + "FILAR0046": { + "claims": [ + "OrcaFilamentLibrary/FilAr PLA-mate Violeta" + ], + "successor": "OF2EK9F1" + }, + "FILAR0047": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" + ], + "successor": "OFt6e0US" + }, + "FILAR0048": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" + ], + "successor": "OF0Vtzaw" + }, + "FILAR0049": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Azul Boreal" + ], + "successor": "OFNU9YIW" + }, + "FILAR0050": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Azul Francia" + ], + "successor": "OF44VYzK" + }, + "FILAR0051": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Azul Imperial" + ], + "successor": "OF2Z1nT5" + }, + "FILAR0052": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" + ], + "successor": "OFsXQXbs" + }, + "FILAR0053": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Cian" + ], + "successor": "OFnejEt4" + }, + "FILAR0054": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Coral" + ], + "successor": "OFysxCep" + }, + "FILAR0055": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Cristal" + ], + "successor": "OFJQDUk3" + }, + "FILAR0056": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" + ], + "successor": "OFybzvQN" + }, + "FILAR0057": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Gris Plata" + ], + "successor": "OFgpLTMR" + }, + "FILAR0058": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Magenta" + ], + "successor": "OFurdQxc" + }, + "FILAR0059": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Negro Azabache" + ], + "successor": "OFq8gfS4" + }, + "FILAR0060": { + "claims": [ + "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" + ], + "successor": "OFPbyOSk" + }, + "FILARB01": { + "claims": [], + "successor": null + }, + "FILARB02": { + "claims": [], + "successor": null + }, + "FILARB03": { + "claims": [], + "successor": null + }, + "FILL3D001": { + "claims": [ + "OrcaFilamentLibrary/FILL3D PLA Turbo" + ], + "successor": "OFoSknDB" + }, + "FILL3D002": { + "claims": [ + "OrcaFilamentLibrary/FILL3D PLA Basic" + ], + "successor": "OFDpW3J8" + }, + "FILL3D003": { + "claims": [ + "OrcaFilamentLibrary/FILL3D PETG" + ], + "successor": "OFQbjX3s" + }, + "FILL3D004": { + "claims": [ + "OrcaFilamentLibrary/FILL3D PP" + ], + "successor": "OFPWPlSC" + }, + "FILL3D005": { + "claims": [ + "OrcaFilamentLibrary/FILL3D PPCF" + ], + "successor": "OFg8hMzT" + }, + "FILL3D006": { + "claims": [ + "OrcaFilamentLibrary/FILL3D PA" + ], + "successor": "OFJNeELv" + }, + "FILL3D007": { + "claims": [ + "OrcaFilamentLibrary/FILL3D PETG CF" + ], + "successor": "OFOiJfLM" + }, "GFABS": { "claims": [ "Anycubic/Anycubic ABS" @@ -49,6 +728,709 @@ ], "successor": "OFgrGfPy" }, + "NIT01": { + "claims": [ + "OrcaFilamentLibrary/NIT ABS" + ], + "successor": "OFhWc5Bv" + }, + "NIT02": { + "claims": [ + "OrcaFilamentLibrary/NIT PLA" + ], + "successor": "OFwRJ4g0" + }, + "NIT03": { + "claims": [ + "OrcaFilamentLibrary/NIT PETG" + ], + "successor": "OFJu1XwK" + }, + "OEABSB00": { + "claims": [ + "OrcaFilamentLibrary/Elegoo ABS" + ], + "successor": "OFxOHhZw" + }, + "OEASAB00": { + "claims": [ + "OrcaFilamentLibrary/Elegoo ASA" + ], + "successor": "OFobDOW5" + }, + "OEPAHTB0": { + "claims": [ + "OrcaFilamentLibrary/Elegoo PAHT-CF" + ], + "successor": "OF0h7ERL" + }, + "OEPCB00": { + "claims": [ + "OrcaFilamentLibrary/Elegoo PC" + ], + "successor": "OFUyDDNv" + }, + "OEPETGB0": { + "claims": [ + "OrcaFilamentLibrary/Elegoo PETG" + ], + "successor": "OFLcd093" + }, + "OEPLAB00": { + "claims": [ + "OrcaFilamentLibrary/Elegoo PLA" + ], + "successor": "OFvgE0Zh" + }, + "OETPUB00": { + "claims": [ + "OrcaFilamentLibrary/Elegoo TPU 95A" + ], + "successor": "OFmhJs5V" + }, + "OFLSBS99": { + "claims": [ + "OrcaFilamentLibrary/Generic SBS" + ], + "successor": "OFhQfUQY" + }, + "OGFA00": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Basic" + ], + "successor": "OFoiVqVM" + }, + "OGFA01": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Matte" + ], + "successor": "OFXIbw5D" + }, + "OGFA02": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Metal" + ], + "successor": "OFrKLeE3" + }, + "OGFA03": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Impact" + ], + "successor": "OFTGHyNC" + }, + "OGFA05": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Silk" + ], + "successor": "OFEGNJD4" + }, + "OGFA06": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Silk+" + ], + "successor": "OFUanySo" + }, + "OGFA07": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Marble" + ], + "successor": "OF9OlTWH" + }, + "OGFA08": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Sparkle" + ], + "successor": "OFDxfPgH" + }, + "OGFA09": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Tough" + ], + "successor": "OFaQMgRH" + }, + "OGFA11": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Aero" + ], + "successor": "OFBSW57R" + }, + "OGFA12": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Glow" + ], + "successor": "OFEkPBwx" + }, + "OGFA13": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Dynamic" + ], + "successor": "OFDGigEI" + }, + "OGFA15": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Galaxy" + ], + "successor": "OFQ3e56w" + }, + "OGFA16": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA Wood" + ], + "successor": "OFMjtqTC" + }, + "OGFA50": { + "claims": [ + "OrcaFilamentLibrary/Bambu PLA-CF" + ], + "successor": "OFEswT5W" + }, + "OGFB00": { + "claims": [ + "OrcaFilamentLibrary/Bambu ABS" + ], + "successor": "OFhuaUQB" + }, + "OGFB01": { + "claims": [ + "OrcaFilamentLibrary/Bambu ASA" + ], + "successor": "OFfBpSRI" + }, + "OGFB02": { + "claims": [ + "OrcaFilamentLibrary/Bambu ASA-Aero" + ], + "successor": "OFXzQ4yL" + }, + "OGFB50": { + "claims": [ + "OrcaFilamentLibrary/Bambu ABS-GF" + ], + "successor": "OFknl9Iz" + }, + "OGFB51": { + "claims": [ + "OrcaFilamentLibrary/Bambu ASA-CF" + ], + "successor": "OF0wBGNx" + }, + "OGFB60": { + "claims": [ + "OrcaFilamentLibrary/PolyLite ABS" + ], + "successor": "OFOvv91M" + }, + "OGFB61": { + "claims": [ + "OrcaFilamentLibrary/PolyLite ASA" + ], + "successor": "OFvrXuV7" + }, + "OGFB98": { + "claims": [ + "Custom/Generic ASA", + "OrcaFilamentLibrary/Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OGFB99": { + "claims": [ + "Custom/Generic ABS", + "OrcaFilamentLibrary/Generic ABS", + "Sovol/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OGFC00": { + "claims": [ + "OrcaFilamentLibrary/Bambu PC" + ], + "successor": "OFKhMPeX" + }, + "OGFC01": { + "claims": [ + "OrcaFilamentLibrary/Bambu PC FR" + ], + "successor": "OFg57Nmc" + }, + "OGFG00": { + "claims": [ + "OrcaFilamentLibrary/Bambu PETG Basic" + ], + "successor": "OFFvzqcd" + }, + "OGFG01": { + "claims": [ + "OrcaFilamentLibrary/Bambu PETG Translucent" + ], + "successor": "OFwPrlCM" + }, + "OGFG02": { + "claims": [ + "OrcaFilamentLibrary/Bambu PETG HF" + ], + "successor": "OFovEIbw" + }, + "OGFG50": { + "claims": [ + "OrcaFilamentLibrary/Bambu PETG-CF" + ], + "successor": "OFTRZ8Y4" + }, + "OGFG60": { + "claims": [ + "OrcaFilamentLibrary/PolyLite PETG" + ], + "successor": "OF0UJcb6" + }, + "OGFG97": { + "claims": [ + "OrcaFilamentLibrary/Generic PCTG" + ], + "successor": "OFu1evlr" + }, + "OGFGG300": { + "claims": [ + "OrcaFilamentLibrary/GreenGate3D PETG" + ], + "successor": "OFhMO9Kh" + }, + "OGFL00": { + "claims": [ + "OrcaFilamentLibrary/PolyLite PLA" + ], + "successor": "OF5CgdDq" + }, + "OGFL00-1": { + "claims": [ + "OrcaFilamentLibrary/PolyTerra Dual PLA" + ], + "successor": "OFCccVrQ" + }, + "OGFL01": { + "claims": [ + "OrcaFilamentLibrary/PolyTerra PLA", + "Snapmaker/PolyTerra PLA" + ], + "successor": "OFW29a9R" + }, + "OGFL03": { + "claims": [ + "OrcaFilamentLibrary/eSUN PLA+" + ], + "successor": "OFqINlYj" + }, + "OGFL04": { + "claims": [ + "OrcaFilamentLibrary/Overture PLA" + ], + "successor": "OFc3xdm9" + }, + "OGFL05": { + "claims": [ + "OrcaFilamentLibrary/Overture Matte PLA" + ], + "successor": "OFBw6eEG" + }, + "OGFL06": { + "claims": [ + "OrcaFilamentLibrary/Fiberon PETG-ESD" + ], + "successor": "OFcytyoA" + }, + "OGFL50": { + "claims": [ + "OrcaFilamentLibrary/Fiberon PA6-CF" + ], + "successor": "OFkOviHk" + }, + "OGFL51": { + "claims": [ + "OrcaFilamentLibrary/Fiberon PA6-GF" + ], + "successor": "OFwaYjL6" + }, + "OGFL52": { + "claims": [ + "OrcaFilamentLibrary/Fiberon PA12-CF" + ], + "successor": "OFX0ycRQ" + }, + "OGFL53": { + "claims": [ + "OrcaFilamentLibrary/Fiberon PA612-CF" + ], + "successor": "OFS2tn6G" + }, + "OGFL54": { + "claims": [ + "OrcaFilamentLibrary/Fiberon PET-CF" + ], + "successor": "OFHWSM21" + }, + "OGFL55": { + "claims": [ + "OrcaFilamentLibrary/Fiberon PETG-rCF" + ], + "successor": "OFk8t9mz" + }, + "OGFL95": { + "claims": [ + "OrcaFilamentLibrary/Generic PLA High Speed" + ], + "successor": "OFmpMwxS" + }, + "OGFL98": { + "claims": [ + "OrcaFilamentLibrary/Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OGFL99": { + "claims": [ + "Flashforge/Generic PLA", + "OrcaFilamentLibrary/Generic PLA", + "Sovol/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OGFLC99": { + "claims": [ + "OrcaFilamentLibrary/Generic CoPE" + ], + "successor": "OFjt9en1" + }, + "OGFN03": { + "claims": [ + "OrcaFilamentLibrary/Bambu PA-CF" + ], + "successor": "OFFNYwWR" + }, + "OGFN04": { + "claims": [ + "OrcaFilamentLibrary/Bambu PAHT-CF" + ], + "successor": "OF2VFe4J" + }, + "OGFN05": { + "claims": [ + "OrcaFilamentLibrary/Bambu PA6-CF" + ], + "successor": "OFniMuTN" + }, + "OGFN06": { + "claims": [ + "OrcaFilamentLibrary/Bambu PPA-CF" + ], + "successor": "OF54B0S0" + }, + "OGFN08": { + "claims": [ + "OrcaFilamentLibrary/Bambu PA6-GF" + ], + "successor": "OFNk8bxk" + }, + "OGFN96": { + "claims": [ + "OrcaFilamentLibrary/Generic PPA-GF" + ], + "successor": "OF8Tlg47" + }, + "OGFN97": { + "claims": [ + "OrcaFilamentLibrary/Generic PPA-CF" + ], + "successor": "OF8tPByX" + }, + "OGFN98": { + "claims": [ + "Custom/Generic PA-CF", + "OrcaFilamentLibrary/Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OGFNMK00": { + "claims": [ + "OrcaFilamentLibrary/Numakers PLA+" + ], + "successor": "OFqGRZyH" + }, + "OGFP97": { + "claims": [ + "OrcaFilamentLibrary/Generic PP" + ], + "successor": "OF1UNk9P" + }, + "OGFP99": { + "claims": [ + "OrcaFilamentLibrary/Generic PE" + ], + "successor": "OFPklMI1" + }, + "OGFPM001": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA" + ], + "successor": "OFsRDvTM" + }, + "OGFPM002": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Matte" + ], + "successor": "OFrOh600" + }, + "OGFPM003": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Marble" + ], + "successor": "OFKiSMWR" + }, + "OGFPM004": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Silk" + ], + "successor": "OFS8lTQt" + }, + "OGFPM005": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Satin" + ], + "successor": "OFPkCJKE" + }, + "OGFPM006": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Translucent" + ], + "successor": "OFCIUsWh" + }, + "OGFPM007": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Galaxy" + ], + "successor": "OFFkCLBl" + }, + "OGFPM008": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Celestial" + ], + "successor": "OFRiYgMK" + }, + "OGFPM009": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Starlight" + ], + "successor": "OFC78WGQ" + }, + "OGFPM010": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Glow" + ], + "successor": "OF0gGRWk" + }, + "OGFPM011": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Luminous" + ], + "successor": "OF0kCNDK" + }, + "OGFPM012": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Metallic" + ], + "successor": "OFjb0wos" + }, + "OGFPM013": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Neon" + ], + "successor": "OFO1GEq6" + }, + "OGFPM014": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA UV Shift" + ], + "successor": "OF1N1qMK" + }, + "OGFPM015": { + "claims": [ + "OrcaFilamentLibrary/Panchroma PLA Temp Shift" + ], + "successor": "OFhASRWj" + }, + "OGFPM016": { + "claims": [ + "OrcaFilamentLibrary/Panchroma CoPE" + ], + "successor": "OFqw2PQA" + }, + "OGFPM017": { + "claims": [ + "OrcaFilamentLibrary/Polymaker HT-PLA" + ], + "successor": "OFPoyiFs" + }, + "OGFPM018": { + "claims": [ + "OrcaFilamentLibrary/Polymaker HT-PLA-GF" + ], + "successor": "OFlwmqrC" + }, + "OGFPM019": { + "claims": [ + "OrcaFilamentLibrary/PolyLite PLA Pro" + ], + "successor": "OFF9OKoY" + }, + "OGFR00": { + "claims": [ + "OrcaFilamentLibrary/FusRock ABS-GF" + ], + "successor": "OFmn9NZL" + }, + "OGFR98": { + "claims": [ + "OrcaFilamentLibrary/Generic PHA" + ], + "successor": "OF74KeQR" + }, + "OGFR99": { + "claims": [ + "OrcaFilamentLibrary/Generic EVA" + ], + "successor": "OFCD8qiU" + }, + "OGFS00": { + "claims": [ + "OrcaFilamentLibrary/Bambu Support W" + ], + "successor": "OFsHSVZc" + }, + "OGFS01": { + "claims": [ + "OrcaFilamentLibrary/Bambu Support G" + ], + "successor": "OFQHiNJs" + }, + "OGFS02": { + "claims": [ + "OrcaFilamentLibrary/Bambu Support For PLA" + ], + "successor": "OFAnyRUI" + }, + "OGFS03": { + "claims": [ + "OrcaFilamentLibrary/Bambu Support For PA/PET" + ], + "successor": "OFMTK0UC" + }, + "OGFS04": { + "claims": [ + "OrcaFilamentLibrary/Bambu PVA" + ], + "successor": "OFzyIxba" + }, + "OGFS05": { + "claims": [ + "OrcaFilamentLibrary/Bambu Support For PLA/PETG" + ], + "successor": "OFIfnzxC" + }, + "OGFS06": { + "claims": [ + "OrcaFilamentLibrary/Bambu Support for ABS" + ], + "successor": "OFf6mfQO" + }, + "OGFS97": { + "claims": [ + "Flashforge/Generic BVOH", + "OrcaFilamentLibrary/Generic BVOH" + ], + "successor": "OFo2UF2C" + }, + "OGFS98": { + "claims": [ + "OrcaFilamentLibrary/Generic HIPS" + ], + "successor": "OFsFon5l" + }, + "OGFS99": { + "claims": [ + "OrcaFilamentLibrary/Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OGFSNL02": { + "claims": [ + "OrcaFilamentLibrary/SUNLU PLA Matte" + ], + "successor": "OFpW4gdi" + }, + "OGFSNL03": { + "claims": [ + "OrcaFilamentLibrary/SUNLU PLA+" + ], + "successor": "OFMUWNkp" + }, + "OGFSNL04": { + "claims": [ + "OrcaFilamentLibrary/SUNLU PLA+ 2.0" + ], + "successor": "OFHmPYRy" + }, + "OGFSNL05": { + "claims": [ + "OrcaFilamentLibrary/SUNLU Silk PLA+" + ], + "successor": "OFpPGSKG" + }, + "OGFSNL06": { + "claims": [ + "OrcaFilamentLibrary/SUNLU PLA Marble" + ], + "successor": "OFxUwUeW" + }, + "OGFSNL07": { + "claims": [ + "OrcaFilamentLibrary/SUNLU Wood PLA" + ], + "successor": "OFLJ8S6I" + }, + "OGFT01": { + "claims": [ + "OrcaFilamentLibrary/Bambu PET-CF" + ], + "successor": "OFHa48An" + }, + "OGFT02": { + "claims": [], + "successor": null + }, + "OGFU00": { + "claims": [ + "OrcaFilamentLibrary/Bambu TPU 95A HF" + ], + "successor": "OFvKUnLh" + }, + "OGFU01": { + "claims": [ + "OrcaFilamentLibrary/Bambu TPU 95A" + ], + "successor": "OFVCkX5w" + }, + "OGFU99": { + "claims": [ + "OrcaFilamentLibrary/Generic TPU", + "Sovol/Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OVTABS08": { + "claims": [ + "OrcaFilamentLibrary/Overture ABS Basic" + ], + "successor": "OFDvqJ6n" + }, "P11851ba": { "claims": [ "Artillery/Artillery PET" @@ -85,6 +1467,30 @@ "Artillery/Artillery ASA" ], "successor": "OFtmT4Nd" + }, + "VLMNT01": { + "claims": [ + "OrcaFilamentLibrary/Valment PLA" + ], + "successor": "OFDe8uyM" + }, + "VLMNT02": { + "claims": [ + "OrcaFilamentLibrary/Valment PLA Silk" + ], + "successor": "OFpBlrvY" + }, + "VLMNT03": { + "claims": [ + "OrcaFilamentLibrary/Valment PLA-CF" + ], + "successor": "OFfq5YXA" + }, + "VLMNT04": { + "claims": [ + "OrcaFilamentLibrary/Valment PLA Galaxy" + ], + "successor": "OFB5SmWk" } } } diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index f3004c5077..69e671d74d 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1,33 +1,7 @@ { "alias_exceptions": [ - "Afinia/Afinia PLA", - "Afinia/Afinia PLA@HS", - "Afinia/Afinia Value PLA", - "Afinia/Afinia Value PLA@HS", - "Anker/Anker Generic PA @base", - "Anker/Anker Generic PA-CF @base", "Anker/Anker Generic PC @base", - "Anker/Anker Generic PETG @base", - "Anker/Anker Generic PETG-CF @base", - "Anker/Anker Generic PLA @base", - "Anker/Anker Generic PLA Silk @base", - "Anker/Anker Generic PLA+ @base", - "Anker/Anker Generic PLA-CF @base", - "Anycubic/Anycubic Generic PA", - "Anycubic/Anycubic Generic PA-CF", "Anycubic/Anycubic Generic PC", - "Anycubic/Anycubic Generic PETG", - "Anycubic/Anycubic Generic PLA", - "Anycubic/Anycubic Generic PLA-CF", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", @@ -37,560 +11,29 @@ "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", - "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Panchroma PLA @Anycubic Kobra S1", - "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", - "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", - "Artillery/Artillery Generic PETG", - "Artillery/Artillery Generic PLA", - "Artillery/Artillery Generic PLA-CF", - "BBL/BETA HIPS @base", - "BBL/BETA PAHT-CF @base", - "BBL/BETA PETG @base", - "BBL/BETA PETG Fluorescence @base", - "BBL/BETA PETG Glitter @base", - "BBL/BETA PETG Glow @base", - "BBL/BETA PETG Gradient @base", - "BBL/BETA PETG HF @base", - "BBL/BETA PETG Heat Color Change @base", - "BBL/BETA PETG Marble @base", - "BBL/BETA PETG Matte @base", - "BBL/BETA PETG Metallic @base", - "BBL/BETA PETG Transparent @base", - "BBL/BETA PETG UV Color Change @base", - "BBL/BETA PETG-CF @base", - "BBL/BETA PETG-GF @base", - "BBL/BETA PLA Basic @base", - "BBL/BETA PLA Chameleon @base", - "BBL/BETA PLA Fluorescence @base", - "BBL/BETA PLA Glitter @base", - "BBL/BETA PLA Glow @base", - "BBL/BETA PLA Gradient @base", - "BBL/BETA PLA Heat Color Change @base", - "BBL/BETA PLA High Speed @base", - "BBL/BETA PLA High Temp @base", - "BBL/BETA PLA Marble @base", - "BBL/BETA PLA Matte @base", - "BBL/BETA PLA Metal @base", - "BBL/BETA PLA Metallic @base", - "BBL/BETA PLA PRO @base", - "BBL/BETA PLA Silk @base", - "BBL/BETA PLA Silk+ @base", - "BBL/BETA PLA Transparent @base", - "BBL/BETA PLA UV Color Change @base", - "BBL/BETA PLA Wood @base", - "BBL/BETA PLA Youth @base", - "BBL/BETA PLA-CF @base", - "BBL/Bambu PA-CF @base", - "BBL/Bambu PA6-CF @base", - "BBL/Bambu PA6-GF @base", - "BBL/Bambu PAHT-CF @base", "BBL/Bambu PC @base", "BBL/Bambu PC FR @base", - "BBL/Bambu PET-CF @base", - "BBL/Bambu PETG Basic @base", - "BBL/Bambu PETG HF @base", - "BBL/Bambu PETG Translucent @base", - "BBL/Bambu PETG-CF @base", - "BBL/Bambu PLA Aero @base", - "BBL/Bambu PLA Basic @base", - "BBL/Bambu PLA Dynamic @base", - "BBL/Bambu PLA Galaxy @base", - "BBL/Bambu PLA Glow @base", - "BBL/Bambu PLA Lite @base", - "BBL/Bambu PLA Marble @base", - "BBL/Bambu PLA Matte @base", - "BBL/Bambu PLA Metal @base", - "BBL/Bambu PLA Silk @base", - "BBL/Bambu PLA Silk+ @base", - "BBL/Bambu PLA Sparkle @base", - "BBL/Bambu PLA Tough @base", - "BBL/Bambu PLA Tough+ @base", - "BBL/Bambu PLA Translucent @base", - "BBL/Bambu PLA Wood @base", - "BBL/Bambu PLA-CF @base", - "BBL/Bambu PPA-CF @base", - "BBL/Bambu Support For PA/PET @base", - "BBL/Bambu Support For PLA @base", - "BBL/Bambu Support For PLA/PETG @base", - "BBL/Bambu Support G @base", - "BBL/Bambu Support W @base", "BBL/COEX NYLEX UNFILLED @BBL X1C", - "BBL/Fiberon PA12-CF @base", - "BBL/Fiberon PA12-CF10 @base", - "BBL/Fiberon PA6-CF @base", - "BBL/Fiberon PA6-CF20 @base", - "BBL/Fiberon PA6-GF @base", - "BBL/Fiberon PA6-GF25 @base", - "BBL/Fiberon PA612-CF @base", - "BBL/Fiberon PA612-CF15 @base", - "BBL/Fiberon PET-CF @base", - "BBL/Fiberon PET-CF17 @base", - "BBL/Fiberon PETG-ESD @base", - "BBL/Fiberon PETG-rCF @base", - "BBL/Fiberon PETG-rCF08 @base", - "BBL/Generic BVOH @base", - "BBL/Generic EVA @base", - "BBL/Generic HIPS @base", - "BBL/Generic PA @base", - "BBL/Generic PA-CF @base", "BBL/Generic PC @base", - "BBL/Generic PCTG @base", - "BBL/Generic PE @base", - "BBL/Generic PE-CF @base", - "BBL/Generic PETG @base", - "BBL/Generic PETG HF @base", - "BBL/Generic PETG-CF @base", - "BBL/Generic PHA @base", - "BBL/Generic PLA @base", - "BBL/Generic PLA High Speed @base", - "BBL/Generic PLA Silk @base", - "BBL/Generic PLA-CF @base", - "BBL/Generic PP @base", - "BBL/Generic PP-CF @base", - "BBL/Generic PP-GF @base", - "BBL/Generic PPA-CF @base", - "BBL/Generic PPA-GF @base", - "BBL/Generic SBS @base", - "BBL/Numakers PLA+ @base", - "BBL/Overture Matte PLA @base", - "BBL/Overture PLA @base", - "BBL/Overture PLA Pro @base", - "BBL/Panchroma CoPE @base", - "BBL/Panchroma PLA @base", - "BBL/Panchroma PLA Celestial @base", - "BBL/Panchroma PLA Galaxy @base", - "BBL/Panchroma PLA Glow @base", - "BBL/Panchroma PLA Luminous @base", - "BBL/Panchroma PLA Marble @base", - "BBL/Panchroma PLA Matte @base", - "BBL/Panchroma PLA Metallic @base", - "BBL/Panchroma PLA Neon @base", - "BBL/Panchroma PLA Satin @base", - "BBL/Panchroma PLA Silk @base", - "BBL/Panchroma PLA Starlight @base", - "BBL/Panchroma PLA Temp Shift @base", - "BBL/Panchroma PLA Translucent @base", - "BBL/Panchroma PLA UV Shift @base", - "BBL/PolyLite CosPLA @base", - "BBL/PolyLite PETG @base", - "BBL/PolyLite PLA @base", - "BBL/PolyLite PLA Galaxy @base", - "BBL/PolyLite PLA Glow @base", - "BBL/PolyLite PLA Luminous @base", - "BBL/PolyLite PLA Neon @base", - "BBL/PolyLite PLA Pro @base", - "BBL/PolyLite PLA Starlight @base", - "BBL/PolyLite PLA Translucent @base", - "BBL/PolyTerra PLA @base", - "BBL/PolyTerra PLA Marble @base", - "BBL/PolyTerra PLA+ @base", - "BBL/Polymaker HT-PLA @base", - "BBL/Polymaker HT-PLA-GF @base", - "BBL/SUNLU PETG @base", - "BBL/SUNLU PLA Marble @base", - "BBL/SUNLU PLA Matte @base", - "BBL/SUNLU PLA+ 2.0 @base", - "BBL/SUNLU PLA+ @base", - "BBL/SUNLU Silk PLA+ @base", - "BBL/SUNLU Wood PLA @base", - "BBL/eSUN PLA+ @base", - "Blocks/Blocks Generic PA", - "Blocks/Blocks Generic PA-CF", "Blocks/Blocks Generic PC", - "Blocks/Blocks Generic PLA", - "Blocks/Blocks Generic PLA-CF", - "CONSTRUCT3D/C1 Generic High Flow PETG", - "CONSTRUCT3D/C1 Generic PETG", - "CONSTRUCT3D/C1 Generic PLA", - "Chuanying/Chuanying Generic HS PLA", - "Chuanying/Chuanying Generic PETG", - "Chuanying/Chuanying Generic PETG-CF10", - "Chuanying/Chuanying Generic PLA", - "Chuanying/Chuanying Generic PLA-CF10", - "Chuanying/Chuanying Generic PLA-Silk", - "Co Print/CoPrint Generic PLA", - "CoLiDo/CoLiDo Generic PETG @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic PETG @CoLiDo X16", - "CoLiDo/CoLiDo Generic PLA @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic PLA @CoLiDo X16", - "CoLiDo/CoLiDo PETG @CoLiDo SR1", - "CoLiDo/CoLiDo PLA @CoLiDo SR1", - "CoLiDo/CoLiDo PLA Silk @CoLiDo SR1", - "CoLiDo/CoLiDo PLA+ @CoLiDo DIY 4.0 V2", - "Comgrow/Comgrow Generic PETG", - "Comgrow/Comgrow Generic PLA", - "Creality/CR-Nylon @K1 Max_CFS-C-all", - "Creality/CR-Nylon @K1C-all", - "Creality/CR-Nylon @K1C_CFS-C-all", - "Creality/CR-Nylon @K1_CFS-C-all", - "Creality/CR-Nylon @K2 Plus-all", - "Creality/CR-PLA @Ender-3 V4-all", - "Creality/CR-PLA @Hi-all", - "Creality/CR-PLA @K1 Max_CFS-C-all", - "Creality/CR-PLA @K1 SE-all", - "Creality/CR-PLA @K1 SE_CFS-C-all", - "Creality/CR-PLA @K1C-all", - "Creality/CR-PLA @K1C_CFS-C-all", - "Creality/CR-PLA @K1_CFS-C-all", - "Creality/CR-PLA @K2 Plus-all", - "Creality/CR-PLA @K2 Pro-all", - "Creality/CR-PLA @K2 SE-all", - "Creality/CR-PLA @K2-all", - "Creality/CR-PLA @SPARKX i7-all", - "Creality/CR-PLA Carbon @K1 Max_CFS-C-all", - "Creality/CR-PLA Carbon @K1C-all", - "Creality/CR-PLA Carbon @K1C_CFS-C-all", - "Creality/CR-PLA Carbon @K1_CFS-C-all", - "Creality/CR-PLA Carbon @K2 Plus-all", - "Creality/CR-PLA Fluo @K1 Max_CFS-C-all", - "Creality/CR-PLA Fluo @K1C-all", - "Creality/CR-PLA Fluo @K1C_CFS-C-all", - "Creality/CR-PLA Fluo @K1_CFS-C-all", - "Creality/CR-PLA Fluo @K2 Plus-all", - "Creality/CR-PLA Fluo @K2 Pro-all", - "Creality/CR-PLA Fluo @K2-all", - "Creality/CR-PLA Fluo @SPARKX i7-all", - "Creality/CR-PLA Matte @Ender-3 V4-all", - "Creality/CR-PLA Matte @K1 Max_CFS-C-all", - "Creality/CR-PLA Matte @K1C-all", - "Creality/CR-PLA Matte @K1C_CFS-C-all", - "Creality/CR-PLA Matte @K1_CFS-C-all", - "Creality/CR-PLA Matte @K2 Plus-all", - "Creality/CR-PLA Matte @K2 Pro-all", - "Creality/CR-PLA Matte @K2-all", - "Creality/CR-PLA Matte @SPARKX i7-all", - "Creality/CR-Silk @Ender-3 V4-all", - "Creality/CR-Silk @Hi-all", - "Creality/CR-Silk @K1 Max_CFS-C-all", - "Creality/CR-Silk @K1 SE-all", - "Creality/CR-Silk @K1 SE_CFS-C-all", - "Creality/CR-Silk @K1C-all", - "Creality/CR-Silk @K1C_CFS-C-all", - "Creality/CR-Silk @K1_CFS-C-all", - "Creality/CR-Silk @K2 Plus-all", - "Creality/CR-Silk @K2 Pro-all", - "Creality/CR-Silk @K2 SE-all", - "Creality/CR-Silk @K2-all", - "Creality/CR-Silk @SPARKX i7-all", - "Creality/CR-Wood @K1 Max_CFS-C-all", - "Creality/CR-Wood @K1C-all", - "Creality/CR-Wood @K1C_CFS-C-all", - "Creality/CR-Wood @K1_CFS-C-all", - "Creality/CR-Wood @K2 Plus-all", - "Creality/Creality Generic PA-CF", "Creality/Creality Generic PC", - "Creality/Creality Generic PETG", - "Creality/Creality Generic PLA", - "Creality/Creality Generic PLA-CF", - "Creality/Creality HF Generic PLA", - "Creality/Creality HF Generic Speed PLA", - "Creality/EN-PLA+ @K1 Max_CFS-C-all", - "Creality/EN-PLA+ @K1C-all", - "Creality/EN-PLA+ @K1C_CFS-C-all", - "Creality/EN-PLA+ @K1_CFS-C-all", - "Creality/EN-PLA+ @K2 Plus-all", - "Creality/EN-PLA+ @K2 Pro-all", - "Creality/EN-PLA+ @K2-all", - "Creality/EN-PLA+ @SPARKX i7-all", - "Creality/ENDER FAST PLA @Hi-all", - "Creality/ENDER FAST PLA @K2 Plus-all", - "Creality/ENDER FAST PLA @K2 Pro-all", - "Creality/ENDER FAST PLA @K2-all", - "Creality/ENDER FAST PLA @SPARKX i7-all", - "Creality/Ender-PLA @Ender-3 V4-all", - "Creality/Ender-PLA @Hi-all", - "Creality/Ender-PLA @K1 Max_CFS-C-all", - "Creality/Ender-PLA @K1C-all", - "Creality/Ender-PLA @K1C_CFS-C-all", - "Creality/Ender-PLA @K1_CFS-C-all", - "Creality/Ender-PLA @K2 Plus-all", - "Creality/Ender-PLA @K2 Pro-all", - "Creality/Ender-PLA @K2-all", - "Creality/Ender-PLA @SPARKX i7-all", - "Creality/Generic HIPS @K1 Max_CFS-C-all", - "Creality/Generic HIPS @K1C-all", - "Creality/Generic HIPS @K1C_CFS-C-all", - "Creality/Generic HIPS @K1_CFS-C-all", - "Creality/Generic HIPS @K2 Plus-all", - "Creality/Generic PA @K1 Max_CFS-C-all", - "Creality/Generic PA @K1C-all", - "Creality/Generic PA @K1C_CFS-C-all", - "Creality/Generic PA @K1_CFS-C-all", - "Creality/Generic PA @K2 Plus-all", - "Creality/Generic PA @K2 Pro-all", - "Creality/Generic PA @K2-all", - "Creality/Generic PA-CF @K1 Max_CFS-C-all", - "Creality/Generic PA-CF @K1C-all", - "Creality/Generic PA-CF @K1C_CFS-C-all", - "Creality/Generic PA-CF @K1_CFS-C-all", - "Creality/Generic PA-CF @K2 Plus-all", - "Creality/Generic PA12-CF @K2 Plus-all", - "Creality/Generic PA6-CF @K1 Max_CFS-C-all", - "Creality/Generic PA6-CF @K1C-all", - "Creality/Generic PA6-CF @K1C_CFS-C-all", - "Creality/Generic PA6-CF @K1_CFS-C-all", - "Creality/Generic PA6-CF @K2 Plus-all", - "Creality/Generic PA6-CF @K2 Pro-all", - "Creality/Generic PA612-CF @K2 Plus-all", - "Creality/Generic PA612-CF @K2 Pro-all", - "Creality/Generic PAHT-CF @K1 Max_CFS-C-all", - "Creality/Generic PAHT-CF @K1C-all", - "Creality/Generic PAHT-CF @K1C_CFS-C-all", - "Creality/Generic PAHT-CF @K1_CFS-C-all", - "Creality/Generic PAHT-CF @K2 Plus-all", - "Creality/Generic PAHT-CF @K2 Pro-all", - "Creality/Generic PAHT-CF @K2-all", "Creality/Generic PC @K1 Max_CFS-C-all", "Creality/Generic PC @K1C-all", "Creality/Generic PC @K1C_CFS-C-all", "Creality/Generic PC @K1_CFS-C-all", "Creality/Generic PC @K2 Plus-all", "Creality/Generic PC @K2 Pro-all", - "Creality/Generic PET @K1 Max_CFS-C-all", - "Creality/Generic PET @K1C-all", - "Creality/Generic PET @K1C_CFS-C-all", - "Creality/Generic PET @K1_CFS-C-all", - "Creality/Generic PET @K2 Plus-all", - "Creality/Generic PET @K2 Pro-all", - "Creality/Generic PET @K2-all", - "Creality/Generic PET-CF @K1 Max_CFS-C-all", - "Creality/Generic PET-CF @K1C-all", - "Creality/Generic PET-CF @K1C_CFS-C-all", - "Creality/Generic PET-CF @K1_CFS-C-all", - "Creality/Generic PET-CF @K2 Plus-all", - "Creality/Generic PET-CF @K2 Pro-all", - "Creality/Generic PLA @Ender-3 V4-all", - "Creality/Generic PLA @Hi-all", - "Creality/Generic PLA @K1 Max_CFS-C-all", - "Creality/Generic PLA @K1 SE-all", - "Creality/Generic PLA @K1 SE_CFS-C-all", - "Creality/Generic PLA @K1C-all", - "Creality/Generic PLA @K1C_CFS-C-all", - "Creality/Generic PLA @K1_CFS-C-all", - "Creality/Generic PLA @K2 Plus-all", - "Creality/Generic PLA @K2 Pro-all", - "Creality/Generic PLA @K2 SE-all", - "Creality/Generic PLA @K2-all", - "Creality/Generic PLA @SPARKX i7-all", - "Creality/Generic PLA-CF @Ender-3 V4-all", - "Creality/Generic PLA-CF @K1 Max_CFS-C-all", - "Creality/Generic PLA-CF @K1 SE-all", - "Creality/Generic PLA-CF @K1 SE_CFS-C-all", - "Creality/Generic PLA-CF @K1C-all", - "Creality/Generic PLA-CF @K1C_CFS-C-all", - "Creality/Generic PLA-CF @K1_CFS-C-all", - "Creality/Generic PLA-CF @K2 Plus-all", - "Creality/Generic PLA-CF @K2 Pro-all", - "Creality/Generic PLA-CF @K2 SE-all", - "Creality/Generic PLA-CF @K2-all", - "Creality/Generic PLA-CF @SPARKX i7-all", - "Creality/Generic PLA-Silk @Ender-3 V4-all", - "Creality/Generic PLA-Silk @Hi-all", - "Creality/Generic PLA-Silk @K1 Max_CFS-C-all", - "Creality/Generic PLA-Silk @K1 SE-all", - "Creality/Generic PLA-Silk @K1 SE_CFS-C-all", - "Creality/Generic PLA-Silk @K1C-all", - "Creality/Generic PLA-Silk @K1C_CFS-C-all", - "Creality/Generic PLA-Silk @K1_CFS-C-all", - "Creality/Generic PLA-Silk @K2 Plus-all", - "Creality/Generic PLA-Silk @K2 Pro-all", - "Creality/Generic PLA-Silk @K2 SE-all", - "Creality/Generic PLA-Silk @K2-all", - "Creality/Generic PLA-Silk @SPARKX i7-all", - "Creality/Generic PP @K1 Max_CFS-C-all", - "Creality/Generic PP @K1C-all", - "Creality/Generic PP @K1C_CFS-C-all", - "Creality/Generic PP @K1_CFS-C-all", - "Creality/Generic PP @K2 Plus-all", - "Creality/Generic PP @K2 Pro-all", - "Creality/Generic PP @K2-all", - "Creality/Generic Support for PA @K2 Plus-all", - "Creality/Generic Support for PLA @K2 Plus-all", - "Creality/HP Ultra PLA @K1 Max_CFS-C-all", - "Creality/HP Ultra PLA @K1C-all", - "Creality/HP Ultra PLA @K1C_CFS-C-all", - "Creality/HP Ultra PLA @K1_CFS-C-all", - "Creality/HP Ultra PLA @K2 Plus-all", - "Creality/Hyper L-W PLA @Hi-all", - "Creality/Hyper L-W PLA @K1 Max_CFS-C-all", - "Creality/Hyper L-W PLA @K1 SE-all", - "Creality/Hyper L-W PLA @K1 SE_CFS-C-all", - "Creality/Hyper L-W PLA @K1C-all", - "Creality/Hyper L-W PLA @K1C_CFS-C-all", - "Creality/Hyper L-W PLA @K1_CFS-C-all", - "Creality/Hyper L-W PLA @K2 Plus-all", - "Creality/Hyper L-W PLA @K2 Pro-all", - "Creality/Hyper L-W PLA @K2-all", - "Creality/Hyper Luminous @Hi-all", - "Creality/Hyper Luminous @K1C-all", - "Creality/Hyper Luminous @K2 Plus-all", - "Creality/Hyper Luminous @K2 Pro-all", - "Creality/Hyper Luminous @K2-all", - "Creality/Hyper Luminous @SPARKX i7-all", - "Creality/Hyper Marble @Hi-all", - "Creality/Hyper Marble @K1 Max_CFS-C-all", - "Creality/Hyper Marble @K1C-all", - "Creality/Hyper Marble @K1C_CFS-C-all", - "Creality/Hyper Marble @K1_CFS-C-all", - "Creality/Hyper Marble @K2 Plus-all", - "Creality/Hyper Marble @K2 Pro-all", - "Creality/Hyper Marble @K2 SE-all", - "Creality/Hyper Marble @K2-all", - "Creality/Hyper Marble @SPARKX i7-all", - "Creality/Hyper PA6-CF @K2 Plus-all", - "Creality/Hyper PA6-CF @K2 Pro-all", - "Creality/Hyper PA612-CF @K2 Plus-all", - "Creality/Hyper PA612-CF @K2 Pro-all", - "Creality/Hyper PAHT-CF @K1 Max_CFS-C-all", - "Creality/Hyper PAHT-CF @K1C-all", - "Creality/Hyper PAHT-CF @K1C_CFS-C-all", - "Creality/Hyper PAHT-CF @K1_CFS-C-all", - "Creality/Hyper PAHT-CF @K2 Plus-all", - "Creality/Hyper PAHT-CF @K2 Pro-all", - "Creality/Hyper PAHT-CF @K2-all", "Creality/Hyper PC @K2 Plus-all", "Creality/Hyper PC @K2 Pro-all", - "Creality/Hyper PLA @Ender-3 V4-all", - "Creality/Hyper PLA @Hi-all", - "Creality/Hyper PLA @K1 Max_CFS-C-all", - "Creality/Hyper PLA @K1 SE-all", - "Creality/Hyper PLA @K1 SE_CFS-C-all", - "Creality/Hyper PLA @K1C-all", - "Creality/Hyper PLA @K1C_CFS-C-all", - "Creality/Hyper PLA @K1_CFS-C-all", - "Creality/Hyper PLA @K2 Plus-all", - "Creality/Hyper PLA @K2 Pro-all", - "Creality/Hyper PLA @K2 SE-all", - "Creality/Hyper PLA @K2-all", - "Creality/Hyper PLA @SPARKX i7-all", - "Creality/Hyper PLA-CF @Ender-3 V4-all", - "Creality/Hyper PLA-CF @Hi-all", - "Creality/Hyper PLA-CF @K1 Max_CFS-C-all", - "Creality/Hyper PLA-CF @K1 SE-all", - "Creality/Hyper PLA-CF @K1 SE_CFS-C-all", - "Creality/Hyper PLA-CF @K1C-all", - "Creality/Hyper PLA-CF @K1C_CFS-C-all", - "Creality/Hyper PLA-CF @K1_CFS-C-all", - "Creality/Hyper PLA-CF @K2 Plus-all", - "Creality/Hyper PLA-CF @K2 Pro-all", - "Creality/Hyper PLA-CF @K2 SE-all", - "Creality/Hyper PLA-CF @K2-all", - "Creality/Hyper PLA-CF @SPARKX i7-all", - "Creality/Hyper PPA-CF @K2 Plus-all", - "Creality/Hyper PPA-CF @K2 Pro-all", - "Creality/Hyper Stardust @Hi-all", - "Creality/Hyper Stardust @K1 Max_CFS-C-all", - "Creality/Hyper Stardust @K1C-all", - "Creality/Hyper Stardust @K1C_CFS-C-all", - "Creality/Hyper Stardust @K1_CFS-C-all", - "Creality/Hyper Stardust @K2 Plus-all", - "Creality/Hyper Stardust @K2 Pro-all", - "Creality/Hyper Stardust @K2 SE-all", - "Creality/Hyper Stardust @K2-all", - "Creality/Hyper Stardust @SPARKX i7-all", - "Creality/Panchroma PLA Matte @K2 Plus-all", - "Creality/Panchroma PLA Satin @K2 Plus-all", - "Creality/PolySonic PLA @K2 Plus-all", - "Creality/PolySonic PLA Pro @K2 Plus-all", - "Creality/Soleyin Ultra PLA @Ender-3 V4-all", - "Creality/Soleyin Ultra PLA @Hi-all", - "Creality/Soleyin Ultra PLA @K1 Max_CFS-C-all", - "Creality/Soleyin Ultra PLA @K1C-all", - "Creality/Soleyin Ultra PLA @K1C_CFS-C-all", - "Creality/Soleyin Ultra PLA @K1_CFS-C-all", - "Creality/Soleyin Ultra PLA @K2 Plus-all", - "Creality/Soleyin Ultra PLA @K2 Pro-all", - "Creality/Soleyin Ultra PLA @K2 SE-all", - "Creality/Soleyin Ultra PLA @K2-all", - "Creality/Soleyin Ultra PLA @SPARKX i7-all", - "Creality/eSUN PET-Basic @K2 Plus-all", - "Creality/eSUN PLA+ @K2 Plus-all", - "Creality/eSUN PLA-CF @K2 Plus-all", - "Creality/eSUN PLA-HS @K2 Plus-all", - "Creality/eSUN PLA-LW @K2 Plus-all", - "Creality/eSUN PLA-Lite @K2 Plus-all", - "Creality/eSUN PLA-Matte @K2 Plus-all", - "Creality/eSUN PLA-Silk @K2 Plus-all", - "Cubicon/Cubicon PLA @base", "Custom/Generic PC @MyToolChanger", "Custom/Generic PETG @MyToolChanger", "Custom/Generic PLA @MyToolChanger", "Custom/Generic PLA-CF @MyToolChanger", "Custom/Generic PVA @MyToolChanger", "Custom/Generic TPU @MyToolChanger", - "DeltaMaker/DeltaMaker Brand PLA", - "DeltaMaker/DeltaMaker Generic PETG", - "DeltaMaker/DeltaMaker Generic PLA", - "Dremel/Dremel Generic PLA", - "Elegoo/Elegoo PAHT @base", "Elegoo/Elegoo PC @base", - "Elegoo/Elegoo PETG @base", - "Elegoo/Elegoo PLA @base", - "Elegoo/Generic PA @base", "Elegoo/Generic PC @base", - "Elegoo/Generic PET @base", - "Elegoo/Generic PETG @base", - "Elegoo/Generic PLA @base", - "FLSun/FLSun Generic PA", - "FLSun/FLSun Generic PA-CF", "FLSun/FLSun Generic PC", - "FLSun/FLSun Generic PETG", - "FLSun/FLSun Generic PLA", - "FLSun/FLSun Generic PLA-CF", "Flashforge/Flashforge ABS Basic @FF C5", "Flashforge/Flashforge ABS Basic @FF C5P", "Flashforge/Flashforge ABS-GF @FF C5", @@ -601,12 +44,6 @@ "Flashforge/Flashforge ASA-CF @FF C5P", "Flashforge/Flashforge ASA-GF @FF C5", "Flashforge/Flashforge ASA-GF @FF C5P", - "Flashforge/Flashforge Generic HS PLA", - "Flashforge/Flashforge Generic PETG", - "Flashforge/Flashforge Generic PETG-CF10", - "Flashforge/Flashforge Generic PLA", - "Flashforge/Flashforge Generic PLA-CF10", - "Flashforge/Flashforge Generic PLA-Silk", "Flashforge/Flashforge HIPS @FF C5", "Flashforge/Flashforge HIPS @FF C5P", "Flashforge/Flashforge HS PETG @FF C5", @@ -619,14 +56,12 @@ "Flashforge/Flashforge PAHT-CF @FF C5P", "Flashforge/Flashforge PET-CF @FF C5", "Flashforge/Flashforge PET-CF @FF C5P", - "Flashforge/Flashforge PETG", "Flashforge/Flashforge PETG Pro @FF C5", "Flashforge/Flashforge PETG Pro @FF C5P", "Flashforge/Flashforge PETG Transparent @FF C5", "Flashforge/Flashforge PETG Transparent @FF C5P", "Flashforge/Flashforge PETG-CF @FF C5", "Flashforge/Flashforge PETG-CF @FF C5P", - "Flashforge/Flashforge PLA", "Flashforge/Flashforge PLA Matte @FF C5", "Flashforge/Flashforge PLA Matte @FF C5P", "Flashforge/Flashforge PLA Metal @FF C5", @@ -663,243 +98,25 @@ "Flashforge/FusRock S-Multi @FF C5P", "Flashforge/FusRock S-PAHT @FF C5", "Flashforge/FusRock S-PAHT @FF C5P", - "Flashforge/Generic PETG @Flashforge Artemis", "Flashforge/Generic TPU-64D @FF C5", "Flashforge/Generic TPU-64D @FF C5P", "Flashforge/Generic TPU-90A @FF C5", "Flashforge/Generic TPU-90A @FF C5P", "Flashforge/Generic TPU-95A @FF C5", "Flashforge/Generic TPU-95A @FF C5P", - "Flashforge/SUNLU PETG @base", - "Flashforge/SUNLU PLA Marble @base", - "Flashforge/SUNLU PLA Matte @base", - "Flashforge/SUNLU PLA+ 2.0 @base", - "Flashforge/SUNLU PLA+ @base", - "Flashforge/SUNLU Silk PLA+ @base", - "Flashforge/SUNLU Wood PLA @base", - "FlyingBear/FlyingBear Generic PA-CF", "FlyingBear/FlyingBear Generic PC", - "FlyingBear/FlyingBear Generic PETG", - "FlyingBear/FlyingBear Generic PLA", - "InfiMech/InfiMech Generic PA-CF", "InfiMech/InfiMech Generic PC", - "InfiMech/InfiMech Generic PETG", - "InfiMech/InfiMech Generic PLA", - "LH/LHS PC CF", - "LH/LHS PCTG", - "LH/LHS PETG", - "LH/LHS PLA", - "LONGER/Generic PETG @LONGER LK10", - "LONGER/Generic PETG @LONGER LK10 Plus", - "LONGER/Generic PLA @LONGER LK10", - "LONGER/Generic PLA @LONGER LK10 Plus", "Lulzbot/Lulzbot 2.85mm ABS", "Lulzbot/Lulzbot 2.85mm PETG", "Lulzbot/Lulzbot 2.85mm PLA", - "OrcaArena/Arena PA-CF @base", - "OrcaArena/Arena PAHT-CF @base", "OrcaArena/Arena PC @base", - "OrcaArena/Arena PET-CF @base", - "OrcaArena/Arena PETG Basic @base", - "OrcaArena/Arena PETG-CF @base", - "OrcaArena/Arena PLA Basic @base", - "OrcaArena/Arena PLA Impact @base", - "OrcaArena/Arena PLA Marble @base", - "OrcaArena/Arena PLA Matte @base", - "OrcaArena/Arena PLA Metal @base", - "OrcaArena/Arena PLA Silk @base", - "OrcaArena/Arena PLA Sparkle @base", - "OrcaArena/Arena PLA Tough @base", - "OrcaArena/Arena PLA-CF @base", - "OrcaArena/Arena Support G @base", - "OrcaArena/Arena Support W @base", - "OrcaArena/OrcaArena Generic PA", - "OrcaArena/OrcaArena Generic PA-CF", "OrcaArena/OrcaArena Generic PC @base", - "OrcaArena/OrcaArena Generic PETG @base", - "OrcaArena/OrcaArena Generic PETG-CF @base", - "OrcaArena/OrcaArena Generic PLA @base", - "OrcaArena/OrcaArena Generic PLA Silk @base", - "OrcaArena/OrcaArena Generic PLA-CF @base", - "OrcaArena/PolyLite PLA @base", - "OrcaArena/PolyTerra PLA @base", - "Peopoly/Peopoly Generic PLA", - "Peopoly/Peopoly Lancer PLA-C", - "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", - "Prusa/Prusa Generic PA @MK3.5", - "Prusa/Prusa Generic PA @MK3.5 0.25", - "Prusa/Prusa Generic PA @MK3.5 0.6", - "Prusa/Prusa Generic PA @MK3.5 0.8", - "Prusa/Prusa Generic PA @base", - "Prusa/Prusa Generic PA-CF @MK3.5", - "Prusa/Prusa Generic PA-CF @MK3.5 0.25", - "Prusa/Prusa Generic PA-CF @MK3.5 0.6", - "Prusa/Prusa Generic PA-CF @MK3.5 0.8", - "Prusa/Prusa Generic PA-CF @base", - "Prusa/Prusa Generic PETG @CORE One", - "Prusa/Prusa Generic PETG @MK3.5", - "Prusa/Prusa Generic PETG @MK3.5 0.25", - "Prusa/Prusa Generic PETG @MK3.5 0.6", - "Prusa/Prusa Generic PETG @MK3.5 0.8", - "Prusa/Prusa Generic PETG @MK4S", - "Prusa/Prusa Generic PETG @base", - "Prusa/Prusa Generic PETG HF @MK3.5", - "Prusa/Prusa Generic PETG HF @MK3.5 0.6", - "Prusa/Prusa Generic PETG HF @MK3.5 0.8", - "Prusa/Prusa Generic PETG HF @base", - "Prusa/Prusa Generic PLA @CORE One", - "Prusa/Prusa Generic PLA @MK3.5", - "Prusa/Prusa Generic PLA @MK3.5 0.25", - "Prusa/Prusa Generic PLA @MK3.5 0.6", - "Prusa/Prusa Generic PLA @MK3.5 0.8", - "Prusa/Prusa Generic PLA @MK4S", - "Prusa/Prusa Generic PLA @base", - "Prusa/Prusa Generic PLA HF @MK3.5", - "Prusa/Prusa Generic PLA HF @MK3.5 0.6", - "Prusa/Prusa Generic PLA HF @MK3.5 0.8", - "Prusa/Prusa Generic PLA HF @base", - "Prusa/Prusa Generic PLA Silk @CORE One", - "Prusa/Prusa Generic PLA-CF @MK3.5", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.25", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.6", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.8", - "Prusa/Prusa Generic PLA-CF @base", - "Prusa/Prusament PA-CF @CORE One", - "Prusa/Prusament PETG @CORE One", - "Prusa/Prusament PETG @base", - "Prusa/Prusament PLA @CORE One", - "Prusa/Prusament PLA @base", - "Prusa/Prusament rPLA @CORE One", - "Prusa/Prusament rPLA @base", - "Qidi/Bambu PETG", - "Qidi/Bambu PLA", - "Qidi/HATCHBOX PETG @Qidi", - "Qidi/HATCHBOX PLA @Qidi", - "Qidi/Overture PLA @Qidi", - "Qidi/PolyLite PLA @Qidi", - "Qidi/QIDI PA-Ultra", - "Qidi/QIDI PA12-CF", - "Qidi/QIDI PAHT-CF", - "Qidi/QIDI PAHT-GF", - "Qidi/QIDI PET-CF", - "Qidi/QIDI PET-GF", - "Qidi/QIDI PETG Basic", - "Qidi/QIDI PETG Rapido", - "Qidi/QIDI PETG Tough", - "Qidi/QIDI PETG Translucent", - "Qidi/QIDI PETG-CF", - "Qidi/QIDI PETG-GF", - "Qidi/QIDI PLA Basic", - "Qidi/QIDI PLA Matte Basic", - "Qidi/QIDI PLA Rapido", - "Qidi/QIDI PLA Rapido Matte", - "Qidi/QIDI PLA Rapido Metal", - "Qidi/QIDI PLA Rapido Silk", - "Qidi/QIDI PPS-CF", - "Qidi/QIDI PPS-GF", - "Qidi/QIDI Support For PAHT", - "Qidi/QIDI Support For PET/PA", - "Qidi/QIDI UltraPA-CF25", - "Qidi/QIDI WOOD Rapido", - "Qidi/Qidi Generic PA", - "Qidi/Qidi Generic PA-CF", "Qidi/Qidi Generic PC", - "Qidi/Qidi Generic PETG", - "Qidi/Qidi Generic PETG-CF", - "Qidi/Qidi Generic PLA", - "Qidi/Qidi Generic PLA Silk", - "Qidi/Qidi Generic PLA+", - "Qidi/Qidi Generic PLA-CF", - "Qidi/Qidi PLA-CF", - "Qidi/Tinmorry PETG-ECO", - "Ratrig/RatRig BigNozzle PCTG", - "Ratrig/RatRig BigNozzle PETG", - "Ratrig/RatRig BigNozzle PLA", - "Ratrig/RatRig Generic PA", - "Ratrig/RatRig Generic PA-CF", "Ratrig/RatRig Generic PC", - "Ratrig/RatRig Generic PCTG", - "Ratrig/RatRig Generic PETG", - "Ratrig/RatRig Generic PLA", - "Ratrig/RatRig Generic PLA-CF", - "Ratrig/RatRig PunkFil PETG", - "Ratrig/RatRig PunkFil PETG CF", - "SecKit/SecKit Generic PA", - "SecKit/SecKit Generic PA-CF", "SecKit/SecKit Generic PC", - "SecKit/SecKit Generic PETG", - "SecKit/SecKit Generic PLA", - "SecKit/SecKit Generic PLA-CF", - "Snapmaker/Fiberon PA12-CF10 @Snapmaker U1 base", - "Snapmaker/Fiberon PA6-CF20 @Snapmaker U1 base", - "Snapmaker/Fiberon PA612-ESD @Snapmaker U1 base", - "Snapmaker/Panchroma CoPE @Snapmaker U1 base", - "Snapmaker/Panchroma PLA @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Celestial @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Galaxy @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Glow @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Luminous @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Marble @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Matte @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Metallic @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Neon @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Satin @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Silk @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Starlight @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Temp Shift @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Translucent @Snapmaker U1 base", - "Snapmaker/Panchroma PLA UV Shift @Snapmaker U1 base", - "Snapmaker/PolyLite CosPLA @Snapmaker U1 base", - "Snapmaker/PolyLite PLA @Snapmaker U1 base", - "Snapmaker/PolyLite PLA @base", - "Snapmaker/PolyLite PLA Galaxy @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Glow @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Luminous @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Neon @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Pro @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Pro Metallic @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Starlight @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Translucent @Snapmaker U1 base", "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", - "Snapmaker/PolyTerra PLA @Snapmaker U1 base", - "Snapmaker/PolyTerra PLA Marble @Snapmaker U1 base", - "Snapmaker/PolyTerra PLA+ @Snapmaker U1 base", - "Snapmaker/Polymaker HT-PLA @Snapmaker U1 base", - "Snapmaker/Polymaker HT-PLA-GF @Snapmaker U1 base", - "Snapmaker/Polymaker PLA @Snapmaker U1 base", - "Snapmaker/Polymaker PLA Pro @Snapmaker U1 base", - "Snapmaker/Polymaker PLA Pro Metallic @Snapmaker U1 base", - "Snapmaker/Snapmaker Dual PA-CF @base", - "Snapmaker/Snapmaker Dual PET @base", - "Snapmaker/Snapmaker Dual PLA @base", - "Snapmaker/Snapmaker Dual PLA Eco @base", - "Snapmaker/Snapmaker Dual PLA Matte @base", - "Snapmaker/Snapmaker Dual PLA Metal @base", - "Snapmaker/Snapmaker Dual PLA Silk @base", - "Snapmaker/Snapmaker Dual PLA-CF @base", - "Snapmaker/Snapmaker J1 PA-CF @base", - "Snapmaker/Snapmaker J1 PET @base", - "Snapmaker/Snapmaker J1 PLA @base", - "Snapmaker/Snapmaker J1 PLA Eco @base", - "Snapmaker/Snapmaker J1 PLA Matte @base", - "Snapmaker/Snapmaker J1 PLA Metal @base", - "Snapmaker/Snapmaker J1 PLA Silk @base", - "Snapmaker/Snapmaker J1 PLA-CF @base", - "Snapmaker/Snapmaker PA-CF @U1 base", - "Snapmaker/Snapmaker PA-CF @base", - "Snapmaker/Snapmaker PET @U1 base", - "Snapmaker/Snapmaker PET @base", - "Snapmaker/Snapmaker PLA @U1 base", - "Snapmaker/Snapmaker PLA @base", - "Snapmaker/Snapmaker PLA Eco @U1 base", - "Snapmaker/Snapmaker PLA Eco @base", - "Snapmaker/Snapmaker PLA Metal @U1 base", - "Snapmaker/Snapmaker PLA Silk @U1 base", - "Snapmaker/Snapmaker PLA Silk @base", - "Snapmaker/Snapmaker PLA-CF @U1 base", - "Snapmaker/Snapmaker PLA-CF @base", "Sovol/Generic PLA Silk @Sovol SV08 MAX", "Sovol/Polymaker PETG @Sovol SV08 MAX", "Sovol/SUNLU PETG @Sovol SV08 MAX", @@ -926,147 +143,21 @@ "Sovol/Sovol Zero PLA Silk", "Sovol/Sovol Zero PLA Silk HS Nozzle", "Sovol/Sovol Zero TPU", - "Tiertime/Tiertime Generic BVOH", - "Tiertime/Tiertime Generic BVOH@300HS", - "Tiertime/Tiertime Generic EVA", - "Tiertime/Tiertime Generic EVA@300HS", - "Tiertime/Tiertime Generic HIPS", - "Tiertime/Tiertime Generic HIPS@300HS", - "Tiertime/Tiertime Generic PA", - "Tiertime/Tiertime Generic PA-CF", - "Tiertime/Tiertime Generic PA-CF@300HS", - "Tiertime/Tiertime Generic PA@300HS", "Tiertime/Tiertime Generic PC", "Tiertime/Tiertime Generic PC@300HS", - "Tiertime/Tiertime Generic PCTG", - "Tiertime/Tiertime Generic PCTG@300HS", - "Tiertime/Tiertime Generic PE", - "Tiertime/Tiertime Generic PE-CF", - "Tiertime/Tiertime Generic PE-CF@300HS", - "Tiertime/Tiertime Generic PE@300HS", - "Tiertime/Tiertime Generic PETG", - "Tiertime/Tiertime Generic PETG-CF", - "Tiertime/Tiertime Generic PETG-CF@300HS", - "Tiertime/Tiertime Generic PETG@300HS", - "Tiertime/Tiertime Generic PHA", - "Tiertime/Tiertime Generic PHA@300HS", - "Tiertime/Tiertime Generic PLA", - "Tiertime/Tiertime Generic PLA High Speed", - "Tiertime/Tiertime Generic PLA High Speed@300HS", - "Tiertime/Tiertime Generic PLA Silk", - "Tiertime/Tiertime Generic PLA Silk@300HS", - "Tiertime/Tiertime Generic PLA-CF", - "Tiertime/Tiertime Generic PLA-CF@300HS", - "Tiertime/Tiertime Generic PLA@300HS", - "Tiertime/Tiertime Generic PP", - "Tiertime/Tiertime Generic PP-CF", - "Tiertime/Tiertime Generic PP-CF@300HS", - "Tiertime/Tiertime Generic PP-GF", - "Tiertime/Tiertime Generic PP-GF@300HS", - "Tiertime/Tiertime Generic PP@300HS", - "Tiertime/Tiertime Generic PPA-CF", - "Tiertime/Tiertime Generic PPA-CF@300HS", - "Tiertime/Tiertime Generic PPA-GF", - "Tiertime/Tiertime Generic PPA-GF@300HS", - "Tiertime/Tiertime Generic SBS", - "Tiertime/Tiertime Generic SBS@300HS", - "Tiertime/Tiertime PA6-CF", - "Tiertime/Tiertime PA6-CF@300HS", "Tiertime/Tiertime PC", "Tiertime/Tiertime PC@300HS", - "Tiertime/Tiertime PET-CF", - "Tiertime/Tiertime PET-CF@300HS", - "Tiertime/Tiertime PETG", - "Tiertime/Tiertime PETG@300HS", - "Tiertime/Tiertime PLA", - "Tiertime/Tiertime PLA-CF", - "Tiertime/Tiertime PLA-CF@300HS", - "Tiertime/Tiertime PLA@300HS", - "TwoTrees/TwoTrees Generic HS PLA @SK1", - "Volumic/Désactivé", - "Volumic/PA6 CF20 (Performance)", - "Volumic/PETG ESD (Performance)", - "Volumic/PPS Carbone (Performance)", - "Volumic/Volumic NYLON Ultra", - "Volumic/Volumic NYLON Ultra (Performance)", "Volumic/Volumic PC", "Volumic/Volumic PC (Performance)", - "Volumic/Volumic PCTG Ultra (Performance)", - "Volumic/Volumic PETG Ultra", - "Volumic/Volumic PETG Ultra (Performance)", - "Volumic/Volumic PETG Ultra carbone", - "Volumic/Volumic PETG Ultra carbone (Performance)", - "Volumic/Volumic PLA Ultra", - "Volumic/Volumic PLA Ultra (Performance)", - "Volumic/Volumic PP Ultra", - "Volumic/Volumic PP Ultra (Performance)", - "Volumic/Volumic UNIVERSAL Ultra", - "Volumic/Volumic UNIVERSAL Ultra (Performance)", - "Vzbot/Vzbot Generic PA", - "Vzbot/Vzbot Generic PA-CF", "Vzbot/Vzbot Generic PC", - "Vzbot/Vzbot Generic PETG", - "Vzbot/Vzbot Generic PLA", - "Vzbot/Vzbot Generic PLA-CF", - "Wanhao France/Yumi Generic PETG", - "Wanhao France/Yumi Generic PLA", - "WonderMaker/WonderMaker PET-CF", - "WonderMaker/WonderMaker PETG Basic", - "WonderMaker/WonderMaker PLA Basic", - "WonderMaker/WonderMaker PLA Marble", - "WonderMaker/WonderMaker PLA Matte", - "WonderMaker/WonderMaker PLA Metal", - "WonderMaker/WonderMaker PLA Silk", - "WonderMaker/WonderMaker PLA Wood", - "Z-Bolt/Generic PA @Z-Bolt Base", - "Z-Bolt/Generic PETG @Z-Bolt Base", - "Z-Bolt/Generic PLA @Z-Bolt Base", - "re3D/re3D Greengate rPETG", - "re3D/re3D Greengate rPETG @0.8 nozzle", - "re3D/re3D Greengate rPETG @1.75 nozzle", "re3D/re3D PC", "re3D/re3D PC @0.4 nozzle", - "re3D/re3D PC @0.8 nozzle", - "re3D/re3D PETG", - "re3D/re3D PETG @0.4 nozzle", - "re3D/re3D PETG @0.8 nozzle", - "re3D/re3D PLA", - "re3D/re3D PLA @0.4 nozzle", - "re3D/re3D PLA @0.8 nozzle", - "re3D/re3D rPP", - "re3D/re3D rPP @0.8 nozzle", - "re3D/re3D rPP @1.75 nozzle" + "re3D/re3D PC @0.8 nozzle" ], "id_overrides": [ - "Afinia/Afinia PLA", - "Afinia/Afinia PLA@HS", - "Afinia/Afinia Value PLA", - "Afinia/Afinia Value PLA@HS", - "Anker/Anker Generic PA @base", - "Anker/Anker Generic PA-CF @base", "Anker/Anker Generic PC @base", - "Anker/Anker Generic PETG @base", - "Anker/Anker Generic PETG-CF @base", - "Anker/Anker Generic PLA @base", - "Anker/Anker Generic PLA Silk @base", - "Anker/Anker Generic PLA+ @base", - "Anker/Anker Generic PLA-CF @base", "Anycubic/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic Generic PA", - "Anycubic/Anycubic Generic PA-CF", "Anycubic/Anycubic Generic PC", - "Anycubic/Anycubic Generic PETG", - "Anycubic/Anycubic Generic PLA", - "Anycubic/Anycubic Generic PLA-CF", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", @@ -1076,22 +167,7 @@ "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", @@ -1100,69 +176,24 @@ "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra X 0.4 nozzle", "Anycubic/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", "Anycubic/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", "Anycubic/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", "Anycubic/Generic ABS @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", "Anycubic/Generic TPU @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Panchroma PLA @Anycubic Kobra S1", - "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", - "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", "Artillery/Artillery ABS", "Artillery/Artillery ABS @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery ASA @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery Generic PETG", - "Artillery/Artillery Generic PLA", - "Artillery/Artillery Generic PLA-CF", "Artillery/Artillery PA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PC @Artillery M1 Pro 0.4 nozzle", @@ -1192,251 +223,19 @@ "Artillery/Artillery PVA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery TPU", "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "BBL/BETA HIPS @base", - "BBL/BETA PAHT-CF @base", - "BBL/BETA PETG @base", - "BBL/BETA PETG Fluorescence @base", - "BBL/BETA PETG Glitter @base", - "BBL/BETA PETG Glow @base", - "BBL/BETA PETG Gradient @base", - "BBL/BETA PETG HF @base", - "BBL/BETA PETG Heat Color Change @base", - "BBL/BETA PETG Marble @base", - "BBL/BETA PETG Matte @base", - "BBL/BETA PETG Metallic @base", - "BBL/BETA PETG Transparent @base", - "BBL/BETA PETG UV Color Change @base", - "BBL/BETA PETG-CF @base", - "BBL/BETA PETG-GF @base", - "BBL/BETA PLA Basic @base", - "BBL/BETA PLA Chameleon @base", - "BBL/BETA PLA Fluorescence @base", - "BBL/BETA PLA Glitter @base", - "BBL/BETA PLA Glow @base", - "BBL/BETA PLA Gradient @base", - "BBL/BETA PLA Heat Color Change @base", - "BBL/BETA PLA High Speed @base", - "BBL/BETA PLA High Temp @base", - "BBL/BETA PLA Marble @base", - "BBL/BETA PLA Matte @base", - "BBL/BETA PLA Metal @base", - "BBL/BETA PLA Metallic @base", - "BBL/BETA PLA PRO @base", - "BBL/BETA PLA Silk @base", - "BBL/BETA PLA Silk+ @base", - "BBL/BETA PLA Transparent @base", - "BBL/BETA PLA UV Color Change @base", - "BBL/BETA PLA Wood @base", - "BBL/BETA PLA Youth @base", - "BBL/BETA PLA-CF @base", - "BBL/Bambu PA-CF @base", - "BBL/Bambu PA6-CF @base", - "BBL/Bambu PA6-GF @base", - "BBL/Bambu PAHT-CF @base", "BBL/Bambu PC @base", "BBL/Bambu PC FR @base", - "BBL/Bambu PET-CF @base", - "BBL/Bambu PETG Basic @base", - "BBL/Bambu PETG HF @base", - "BBL/Bambu PETG Translucent @base", - "BBL/Bambu PETG-CF @base", - "BBL/Bambu PLA Aero @base", - "BBL/Bambu PLA Basic @base", - "BBL/Bambu PLA Dynamic @base", - "BBL/Bambu PLA Galaxy @base", - "BBL/Bambu PLA Glow @base", - "BBL/Bambu PLA Lite @base", - "BBL/Bambu PLA Marble @base", - "BBL/Bambu PLA Matte @base", - "BBL/Bambu PLA Metal @base", - "BBL/Bambu PLA Silk @base", - "BBL/Bambu PLA Silk+ @base", - "BBL/Bambu PLA Sparkle @base", - "BBL/Bambu PLA Tough @base", - "BBL/Bambu PLA Tough+ @base", - "BBL/Bambu PLA Translucent @base", - "BBL/Bambu PLA Wood @base", - "BBL/Bambu PLA-CF @base", - "BBL/Bambu PPA-CF @base", - "BBL/Bambu Support For PA/PET @base", - "BBL/Bambu Support For PLA @base", - "BBL/Bambu Support For PLA/PETG @base", - "BBL/Bambu Support G @base", - "BBL/Bambu Support W @base", - "BBL/Fiberon PA12-CF @base", - "BBL/Fiberon PA12-CF10 @base", - "BBL/Fiberon PA6-CF @base", - "BBL/Fiberon PA6-CF20 @base", - "BBL/Fiberon PA6-GF @base", - "BBL/Fiberon PA6-GF25 @base", - "BBL/Fiberon PA612-CF @base", - "BBL/Fiberon PA612-CF15 @base", - "BBL/Fiberon PET-CF @base", - "BBL/Fiberon PET-CF17 @base", - "BBL/Fiberon PETG-ESD @base", - "BBL/Fiberon PETG-rCF @base", - "BBL/Fiberon PETG-rCF08 @base", - "BBL/Generic BVOH @base", - "BBL/Generic EVA @base", - "BBL/Generic HIPS @base", - "BBL/Generic PA @base", - "BBL/Generic PA-CF @base", "BBL/Generic PC @base", - "BBL/Generic PCTG @base", - "BBL/Generic PE @base", - "BBL/Generic PE-CF @base", - "BBL/Generic PETG @base", - "BBL/Generic PETG HF @base", - "BBL/Generic PETG-CF @base", - "BBL/Generic PHA @base", - "BBL/Generic PLA @base", - "BBL/Generic PLA High Speed @base", - "BBL/Generic PLA Silk @base", - "BBL/Generic PLA-CF @base", - "BBL/Generic PP @base", - "BBL/Generic PP-CF @base", - "BBL/Generic PP-GF @base", - "BBL/Generic PPA-CF @base", - "BBL/Generic PPA-GF @base", "BBL/Generic SBS", - "BBL/Generic SBS @base", - "BBL/Numakers PLA+ @base", - "BBL/Overture Matte PLA @base", - "BBL/Overture PLA @base", - "BBL/Overture PLA Pro @base", - "BBL/Panchroma CoPE @base", - "BBL/Panchroma PLA @base", - "BBL/Panchroma PLA Celestial @base", - "BBL/Panchroma PLA Galaxy @base", - "BBL/Panchroma PLA Glow @base", - "BBL/Panchroma PLA Luminous @base", - "BBL/Panchroma PLA Marble @base", - "BBL/Panchroma PLA Matte @base", - "BBL/Panchroma PLA Metallic @base", - "BBL/Panchroma PLA Neon @base", - "BBL/Panchroma PLA Satin @base", - "BBL/Panchroma PLA Silk @base", - "BBL/Panchroma PLA Starlight @base", - "BBL/Panchroma PLA Temp Shift @base", - "BBL/Panchroma PLA Translucent @base", - "BBL/Panchroma PLA UV Shift @base", - "BBL/PolyLite CosPLA @base", - "BBL/PolyLite PETG @base", - "BBL/PolyLite PLA @base", - "BBL/PolyLite PLA Galaxy @base", - "BBL/PolyLite PLA Glow @base", - "BBL/PolyLite PLA Luminous @base", - "BBL/PolyLite PLA Neon @base", - "BBL/PolyLite PLA Pro @base", - "BBL/PolyLite PLA Starlight @base", - "BBL/PolyLite PLA Translucent @base", - "BBL/PolyTerra PLA @base", - "BBL/PolyTerra PLA Marble @base", - "BBL/PolyTerra PLA+ @base", - "BBL/Polymaker HT-PLA @base", - "BBL/Polymaker HT-PLA-GF @base", - "BBL/SUNLU PETG @base", - "BBL/SUNLU PLA Marble @base", - "BBL/SUNLU PLA Matte @base", - "BBL/SUNLU PLA+ 2.0 @base", - "BBL/SUNLU PLA+ @base", - "BBL/SUNLU Silk PLA+ @base", - "BBL/SUNLU Wood PLA @base", - "BBL/eSUN PLA+ @base", - "Blocks/Blocks Generic PA", - "Blocks/Blocks Generic PA-CF", "Blocks/Blocks Generic PC", - "Blocks/Blocks Generic PLA", - "Blocks/Blocks Generic PLA-CF", - "CONSTRUCT3D/C1 Generic High Flow PETG", - "CONSTRUCT3D/C1 Generic PETG", - "CONSTRUCT3D/C1 Generic PLA", "Chuanying/Chuanying Generic HIPS", - "Chuanying/Chuanying Generic HS PLA", - "Chuanying/Chuanying Generic PETG", - "Chuanying/Chuanying Generic PETG-CF10", - "Chuanying/Chuanying Generic PLA", - "Chuanying/Chuanying Generic PLA-CF10", - "Chuanying/Chuanying Generic PLA-Silk", "Chuanying/Chuanying Generic PVA", "Co Print/CoPrint Generic ABS", "Co Print/CoPrint Generic PETG", - "Co Print/CoPrint Generic PLA", "Co Print/CoPrint Generic TPU", - "CoLiDo/CoLiDo Generic PETG @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic PETG @CoLiDo X16", - "CoLiDo/CoLiDo Generic PLA @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic PLA @CoLiDo X16", - "CoLiDo/CoLiDo PETG @CoLiDo SR1", - "CoLiDo/CoLiDo PLA @CoLiDo SR1", - "CoLiDo/CoLiDo PLA Silk @CoLiDo SR1", - "CoLiDo/CoLiDo PLA+ @CoLiDo DIY 4.0 V2", - "Comgrow/Comgrow Generic PETG", - "Comgrow/Comgrow Generic PLA", - "Creality/CR-Nylon @K1 Max_CFS-C-all", - "Creality/CR-Nylon @K1C-all", - "Creality/CR-Nylon @K1C_CFS-C-all", - "Creality/CR-Nylon @K1_CFS-C-all", - "Creality/CR-Nylon @K2 Plus-all", - "Creality/CR-PLA @Ender-3 V4-all", - "Creality/CR-PLA @Hi-all", - "Creality/CR-PLA @K1 Max_CFS-C-all", - "Creality/CR-PLA @K1 SE-all", - "Creality/CR-PLA @K1 SE_CFS-C-all", - "Creality/CR-PLA @K1C-all", - "Creality/CR-PLA @K1C_CFS-C-all", - "Creality/CR-PLA @K1_CFS-C-all", - "Creality/CR-PLA @K2 Plus-all", - "Creality/CR-PLA @K2 Pro-all", - "Creality/CR-PLA @K2 SE-all", - "Creality/CR-PLA @K2-all", - "Creality/CR-PLA @SPARKX i7-all", - "Creality/CR-PLA Carbon @K1 Max_CFS-C-all", - "Creality/CR-PLA Carbon @K1C-all", - "Creality/CR-PLA Carbon @K1C_CFS-C-all", - "Creality/CR-PLA Carbon @K1_CFS-C-all", - "Creality/CR-PLA Carbon @K2 Plus-all", - "Creality/CR-PLA Fluo @K1 Max_CFS-C-all", - "Creality/CR-PLA Fluo @K1C-all", - "Creality/CR-PLA Fluo @K1C_CFS-C-all", - "Creality/CR-PLA Fluo @K1_CFS-C-all", - "Creality/CR-PLA Fluo @K2 Plus-all", - "Creality/CR-PLA Fluo @K2 Pro-all", - "Creality/CR-PLA Fluo @K2-all", - "Creality/CR-PLA Fluo @SPARKX i7-all", - "Creality/CR-PLA Matte @Ender-3 V4-all", - "Creality/CR-PLA Matte @K1 Max_CFS-C-all", - "Creality/CR-PLA Matte @K1C-all", - "Creality/CR-PLA Matte @K1C_CFS-C-all", - "Creality/CR-PLA Matte @K1_CFS-C-all", - "Creality/CR-PLA Matte @K2 Plus-all", - "Creality/CR-PLA Matte @K2 Pro-all", - "Creality/CR-PLA Matte @K2-all", - "Creality/CR-PLA Matte @SPARKX i7-all", - "Creality/CR-Silk @Ender-3 V4-all", - "Creality/CR-Silk @Hi-all", - "Creality/CR-Silk @K1 Max_CFS-C-all", - "Creality/CR-Silk @K1 SE-all", - "Creality/CR-Silk @K1 SE_CFS-C-all", - "Creality/CR-Silk @K1C-all", - "Creality/CR-Silk @K1C_CFS-C-all", - "Creality/CR-Silk @K1_CFS-C-all", - "Creality/CR-Silk @K2 Plus-all", - "Creality/CR-Silk @K2 Pro-all", - "Creality/CR-Silk @K2 SE-all", - "Creality/CR-Silk @K2-all", - "Creality/CR-Silk @SPARKX i7-all", - "Creality/CR-Wood @K1 Max_CFS-C-all", - "Creality/CR-Wood @K1C-all", - "Creality/CR-Wood @K1C_CFS-C-all", - "Creality/CR-Wood @K1_CFS-C-all", - "Creality/CR-Wood @K2 Plus-all", "Creality/Creality Generic ASA-CF @Hi-all", - "Creality/Creality Generic PA-CF", "Creality/Creality Generic PC", - "Creality/Creality Generic PETG", "Creality/Creality Generic PETG-CF @Hi-all", - "Creality/Creality Generic PLA", "Creality/Creality Generic PLA High Speed @Ender-3V3-all", "Creality/Creality Generic PLA High Speed @Hi-all", "Creality/Creality Generic PLA High Speed @K1-all", @@ -1450,236 +249,14 @@ "Creality/Creality Generic PLA Silk @K1-all", "Creality/Creality Generic PLA Silk @K2-all", "Creality/Creality Generic PLA Wood @Hi-all", - "Creality/Creality Generic PLA-CF", - "Creality/Creality HF Generic PLA", - "Creality/Creality HF Generic Speed PLA", - "Creality/EN-PLA+ @K1 Max_CFS-C-all", - "Creality/EN-PLA+ @K1C-all", - "Creality/EN-PLA+ @K1C_CFS-C-all", - "Creality/EN-PLA+ @K1_CFS-C-all", - "Creality/EN-PLA+ @K2 Plus-all", - "Creality/EN-PLA+ @K2 Pro-all", - "Creality/EN-PLA+ @K2-all", - "Creality/EN-PLA+ @SPARKX i7-all", - "Creality/ENDER FAST PLA @Hi-all", - "Creality/ENDER FAST PLA @K2 Plus-all", - "Creality/ENDER FAST PLA @K2 Pro-all", - "Creality/ENDER FAST PLA @K2-all", - "Creality/ENDER FAST PLA @SPARKX i7-all", - "Creality/Ender-PLA @Ender-3 V4-all", - "Creality/Ender-PLA @Hi-all", - "Creality/Ender-PLA @K1 Max_CFS-C-all", - "Creality/Ender-PLA @K1C-all", - "Creality/Ender-PLA @K1C_CFS-C-all", - "Creality/Ender-PLA @K1_CFS-C-all", - "Creality/Ender-PLA @K2 Plus-all", - "Creality/Ender-PLA @K2 Pro-all", - "Creality/Ender-PLA @K2-all", - "Creality/Ender-PLA @SPARKX i7-all", - "Creality/Generic HIPS @K1 Max_CFS-C-all", - "Creality/Generic HIPS @K1C-all", - "Creality/Generic HIPS @K1C_CFS-C-all", - "Creality/Generic HIPS @K1_CFS-C-all", - "Creality/Generic HIPS @K2 Plus-all", - "Creality/Generic PA @K1 Max_CFS-C-all", - "Creality/Generic PA @K1C-all", - "Creality/Generic PA @K1C_CFS-C-all", - "Creality/Generic PA @K1_CFS-C-all", - "Creality/Generic PA @K2 Plus-all", - "Creality/Generic PA @K2 Pro-all", - "Creality/Generic PA @K2-all", - "Creality/Generic PA-CF @K1 Max_CFS-C-all", - "Creality/Generic PA-CF @K1C-all", - "Creality/Generic PA-CF @K1C_CFS-C-all", - "Creality/Generic PA-CF @K1_CFS-C-all", - "Creality/Generic PA-CF @K2 Plus-all", - "Creality/Generic PA12-CF @K2 Plus-all", - "Creality/Generic PA6-CF @K1 Max_CFS-C-all", - "Creality/Generic PA6-CF @K1C-all", - "Creality/Generic PA6-CF @K1C_CFS-C-all", - "Creality/Generic PA6-CF @K1_CFS-C-all", - "Creality/Generic PA6-CF @K2 Plus-all", - "Creality/Generic PA6-CF @K2 Pro-all", - "Creality/Generic PA612-CF @K2 Plus-all", - "Creality/Generic PA612-CF @K2 Pro-all", - "Creality/Generic PAHT-CF @K1 Max_CFS-C-all", - "Creality/Generic PAHT-CF @K1C-all", - "Creality/Generic PAHT-CF @K1C_CFS-C-all", - "Creality/Generic PAHT-CF @K1_CFS-C-all", - "Creality/Generic PAHT-CF @K2 Plus-all", - "Creality/Generic PAHT-CF @K2 Pro-all", - "Creality/Generic PAHT-CF @K2-all", "Creality/Generic PC @K1 Max_CFS-C-all", "Creality/Generic PC @K1C-all", "Creality/Generic PC @K1C_CFS-C-all", "Creality/Generic PC @K1_CFS-C-all", "Creality/Generic PC @K2 Plus-all", "Creality/Generic PC @K2 Pro-all", - "Creality/Generic PET @K1 Max_CFS-C-all", - "Creality/Generic PET @K1C-all", - "Creality/Generic PET @K1C_CFS-C-all", - "Creality/Generic PET @K1_CFS-C-all", - "Creality/Generic PET @K2 Plus-all", - "Creality/Generic PET @K2 Pro-all", - "Creality/Generic PET @K2-all", - "Creality/Generic PET-CF @K1 Max_CFS-C-all", - "Creality/Generic PET-CF @K1C-all", - "Creality/Generic PET-CF @K1C_CFS-C-all", - "Creality/Generic PET-CF @K1_CFS-C-all", - "Creality/Generic PET-CF @K2 Plus-all", - "Creality/Generic PET-CF @K2 Pro-all", - "Creality/Generic PLA @Ender-3 V4-all", - "Creality/Generic PLA @Hi-all", - "Creality/Generic PLA @K1 Max_CFS-C-all", - "Creality/Generic PLA @K1 SE-all", - "Creality/Generic PLA @K1 SE_CFS-C-all", - "Creality/Generic PLA @K1C-all", - "Creality/Generic PLA @K1C_CFS-C-all", - "Creality/Generic PLA @K1_CFS-C-all", - "Creality/Generic PLA @K2 Plus-all", - "Creality/Generic PLA @K2 Pro-all", - "Creality/Generic PLA @K2 SE-all", - "Creality/Generic PLA @K2-all", - "Creality/Generic PLA @SPARKX i7-all", - "Creality/Generic PLA-CF @Ender-3 V4-all", - "Creality/Generic PLA-CF @K1 Max_CFS-C-all", - "Creality/Generic PLA-CF @K1 SE-all", - "Creality/Generic PLA-CF @K1 SE_CFS-C-all", - "Creality/Generic PLA-CF @K1C-all", - "Creality/Generic PLA-CF @K1C_CFS-C-all", - "Creality/Generic PLA-CF @K1_CFS-C-all", - "Creality/Generic PLA-CF @K2 Plus-all", - "Creality/Generic PLA-CF @K2 Pro-all", - "Creality/Generic PLA-CF @K2 SE-all", - "Creality/Generic PLA-CF @K2-all", - "Creality/Generic PLA-CF @SPARKX i7-all", - "Creality/Generic PLA-Silk @Ender-3 V4-all", - "Creality/Generic PLA-Silk @Hi-all", - "Creality/Generic PLA-Silk @K1 Max_CFS-C-all", - "Creality/Generic PLA-Silk @K1 SE-all", - "Creality/Generic PLA-Silk @K1 SE_CFS-C-all", - "Creality/Generic PLA-Silk @K1C-all", - "Creality/Generic PLA-Silk @K1C_CFS-C-all", - "Creality/Generic PLA-Silk @K1_CFS-C-all", - "Creality/Generic PLA-Silk @K2 Plus-all", - "Creality/Generic PLA-Silk @K2 Pro-all", - "Creality/Generic PLA-Silk @K2 SE-all", - "Creality/Generic PLA-Silk @K2-all", - "Creality/Generic PLA-Silk @SPARKX i7-all", - "Creality/Generic PP @K1 Max_CFS-C-all", - "Creality/Generic PP @K1C-all", - "Creality/Generic PP @K1C_CFS-C-all", - "Creality/Generic PP @K1_CFS-C-all", - "Creality/Generic PP @K2 Plus-all", - "Creality/Generic PP @K2 Pro-all", - "Creality/Generic PP @K2-all", - "Creality/Generic Support for PA @K2 Plus-all", - "Creality/Generic Support for PLA @K2 Plus-all", - "Creality/HP Ultra PLA @K1 Max_CFS-C-all", - "Creality/HP Ultra PLA @K1C-all", - "Creality/HP Ultra PLA @K1C_CFS-C-all", - "Creality/HP Ultra PLA @K1_CFS-C-all", - "Creality/HP Ultra PLA @K2 Plus-all", - "Creality/Hyper L-W PLA @Hi-all", - "Creality/Hyper L-W PLA @K1 Max_CFS-C-all", - "Creality/Hyper L-W PLA @K1 SE-all", - "Creality/Hyper L-W PLA @K1 SE_CFS-C-all", - "Creality/Hyper L-W PLA @K1C-all", - "Creality/Hyper L-W PLA @K1C_CFS-C-all", - "Creality/Hyper L-W PLA @K1_CFS-C-all", - "Creality/Hyper L-W PLA @K2 Plus-all", - "Creality/Hyper L-W PLA @K2 Pro-all", - "Creality/Hyper L-W PLA @K2-all", - "Creality/Hyper Luminous @Hi-all", - "Creality/Hyper Luminous @K1C-all", - "Creality/Hyper Luminous @K2 Plus-all", - "Creality/Hyper Luminous @K2 Pro-all", - "Creality/Hyper Luminous @K2-all", - "Creality/Hyper Luminous @SPARKX i7-all", - "Creality/Hyper Marble @Hi-all", - "Creality/Hyper Marble @K1 Max_CFS-C-all", - "Creality/Hyper Marble @K1C-all", - "Creality/Hyper Marble @K1C_CFS-C-all", - "Creality/Hyper Marble @K1_CFS-C-all", - "Creality/Hyper Marble @K2 Plus-all", - "Creality/Hyper Marble @K2 Pro-all", - "Creality/Hyper Marble @K2 SE-all", - "Creality/Hyper Marble @K2-all", - "Creality/Hyper Marble @SPARKX i7-all", - "Creality/Hyper PA6-CF @K2 Plus-all", - "Creality/Hyper PA6-CF @K2 Pro-all", - "Creality/Hyper PA612-CF @K2 Plus-all", - "Creality/Hyper PA612-CF @K2 Pro-all", - "Creality/Hyper PAHT-CF @K1 Max_CFS-C-all", - "Creality/Hyper PAHT-CF @K1C-all", - "Creality/Hyper PAHT-CF @K1C_CFS-C-all", - "Creality/Hyper PAHT-CF @K1_CFS-C-all", - "Creality/Hyper PAHT-CF @K2 Plus-all", - "Creality/Hyper PAHT-CF @K2 Pro-all", - "Creality/Hyper PAHT-CF @K2-all", "Creality/Hyper PC @K2 Plus-all", "Creality/Hyper PC @K2 Pro-all", - "Creality/Hyper PLA @Ender-3 V4-all", - "Creality/Hyper PLA @Hi-all", - "Creality/Hyper PLA @K1 Max_CFS-C-all", - "Creality/Hyper PLA @K1 SE-all", - "Creality/Hyper PLA @K1 SE_CFS-C-all", - "Creality/Hyper PLA @K1C-all", - "Creality/Hyper PLA @K1C_CFS-C-all", - "Creality/Hyper PLA @K1_CFS-C-all", - "Creality/Hyper PLA @K2 Plus-all", - "Creality/Hyper PLA @K2 Pro-all", - "Creality/Hyper PLA @K2 SE-all", - "Creality/Hyper PLA @K2-all", - "Creality/Hyper PLA @SPARKX i7-all", - "Creality/Hyper PLA-CF @Ender-3 V4-all", - "Creality/Hyper PLA-CF @Hi-all", - "Creality/Hyper PLA-CF @K1 Max_CFS-C-all", - "Creality/Hyper PLA-CF @K1 SE-all", - "Creality/Hyper PLA-CF @K1 SE_CFS-C-all", - "Creality/Hyper PLA-CF @K1C-all", - "Creality/Hyper PLA-CF @K1C_CFS-C-all", - "Creality/Hyper PLA-CF @K1_CFS-C-all", - "Creality/Hyper PLA-CF @K2 Plus-all", - "Creality/Hyper PLA-CF @K2 Pro-all", - "Creality/Hyper PLA-CF @K2 SE-all", - "Creality/Hyper PLA-CF @K2-all", - "Creality/Hyper PLA-CF @SPARKX i7-all", - "Creality/Hyper PPA-CF @K2 Plus-all", - "Creality/Hyper PPA-CF @K2 Pro-all", - "Creality/Hyper Stardust @Hi-all", - "Creality/Hyper Stardust @K1 Max_CFS-C-all", - "Creality/Hyper Stardust @K1C-all", - "Creality/Hyper Stardust @K1C_CFS-C-all", - "Creality/Hyper Stardust @K1_CFS-C-all", - "Creality/Hyper Stardust @K2 Plus-all", - "Creality/Hyper Stardust @K2 Pro-all", - "Creality/Hyper Stardust @K2 SE-all", - "Creality/Hyper Stardust @K2-all", - "Creality/Hyper Stardust @SPARKX i7-all", - "Creality/Panchroma PLA Matte @K2 Plus-all", - "Creality/Panchroma PLA Satin @K2 Plus-all", - "Creality/PolySonic PLA @K2 Plus-all", - "Creality/PolySonic PLA Pro @K2 Plus-all", - "Creality/Soleyin Ultra PLA @Ender-3 V4-all", - "Creality/Soleyin Ultra PLA @Hi-all", - "Creality/Soleyin Ultra PLA @K1 Max_CFS-C-all", - "Creality/Soleyin Ultra PLA @K1C-all", - "Creality/Soleyin Ultra PLA @K1C_CFS-C-all", - "Creality/Soleyin Ultra PLA @K1_CFS-C-all", - "Creality/Soleyin Ultra PLA @K2 Plus-all", - "Creality/Soleyin Ultra PLA @K2 Pro-all", - "Creality/Soleyin Ultra PLA @K2 SE-all", - "Creality/Soleyin Ultra PLA @K2-all", - "Creality/Soleyin Ultra PLA @SPARKX i7-all", - "Creality/eSUN PET-Basic @K2 Plus-all", - "Creality/eSUN PLA+ @K2 Plus-all", - "Creality/eSUN PLA-CF @K2 Plus-all", - "Creality/eSUN PLA-HS @K2 Plus-all", - "Creality/eSUN PLA-LW @K2 Plus-all", - "Creality/eSUN PLA-Lite @K2 Plus-all", - "Creality/eSUN PLA-Matte @K2 Plus-all", - "Creality/eSUN PLA-Silk @K2 Plus-all", "Cubicon/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", @@ -1706,7 +283,6 @@ "Cubicon/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLA @base", "Cubicon/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle", @@ -1721,25 +297,18 @@ "Custom/Generic PLA-CF @MyToolChanger", "Custom/Generic PVA @MyToolChanger", "Custom/Generic TPU @MyToolChanger", - "DeltaMaker/DeltaMaker Brand PLA", - "DeltaMaker/DeltaMaker Generic PETG", - "DeltaMaker/DeltaMaker Generic PLA", - "Dremel/Dremel Generic PLA", "Dremel/Dremel Generic PLA @3D20 all", "Dremel/Dremel Generic PLA @3D40 all", "Dremel/Dremel Generic PLA @3D45 all", "Elegoo/Elegoo ASA-CF @base", - "Elegoo/Elegoo PAHT @base", "Elegoo/Elegoo PC @base", "Elegoo/Elegoo PC-FR @base", "Elegoo/Elegoo PET-CF @base", - "Elegoo/Elegoo PETG @base", "Elegoo/Elegoo PETG HF @base", "Elegoo/Elegoo PETG PRO @base", "Elegoo/Elegoo PETG Translucent @base", "Elegoo/Elegoo PETG-CF @base", "Elegoo/Elegoo PETG-GF @base", - "Elegoo/Elegoo PLA @base", "Elegoo/Elegoo PLA Basic @base", "Elegoo/Elegoo PLA Galaxy @base", "Elegoo/Elegoo PLA Glow @base", @@ -1756,22 +325,13 @@ "Elegoo/Elegoo Rapid PLA+ @base", "Elegoo/Elegoo Rapid TPU 95A @base", "Elegoo/Generic ABS-CF @Elegoo Centauri", - "Elegoo/Generic PA @base", "Elegoo/Generic PA6-CF @Elegoo", "Elegoo/Generic PC @base", "Elegoo/Generic PC-CF @Elegoo", - "Elegoo/Generic PET @base", "Elegoo/Generic PET-CF @Elegoo Centauri", - "Elegoo/Generic PETG @base", "Elegoo/Generic PETG PRO @Elegoo", - "Elegoo/Generic PLA @base", "Elegoo/Generic PLA Matte @Elegoo", - "FLSun/FLSun Generic PA", - "FLSun/FLSun Generic PA-CF", "FLSun/FLSun Generic PC", - "FLSun/FLSun Generic PETG", - "FLSun/FLSun Generic PLA", - "FLSun/FLSun Generic PLA-CF", "FLSun/FLSun S1 PLA High Speed", "FLSun/FLSun S1 PLA Silk", "FLSun/FLSun T1 PLA High Speed", @@ -1847,19 +407,13 @@ "Flashforge/Flashforge Generic ASA @G3U", "Flashforge/Flashforge Generic HIPS", "Flashforge/Flashforge Generic HIPS @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic HS PLA", - "Flashforge/Flashforge Generic PETG", "Flashforge/Flashforge Generic PETG-CF @G3U", "Flashforge/Flashforge Generic PETG-CF @G3U 0.6 Nozzle", "Flashforge/Flashforge Generic PETG-CF @G3U 0.8 Nozzle", - "Flashforge/Flashforge Generic PETG-CF10", - "Flashforge/Flashforge Generic PLA", "Flashforge/Flashforge Generic PLA-CF @G3U", "Flashforge/Flashforge Generic PLA-CF @G3U 0.6 Nozzle", "Flashforge/Flashforge Generic PLA-CF @G3U 0.8 Nozzle", - "Flashforge/Flashforge Generic PLA-CF10", "Flashforge/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge Generic PLA-Silk", "Flashforge/Flashforge Generic PVA", "Flashforge/Flashforge HIPS @FF C5", "Flashforge/Flashforge HIPS @FF C5P", @@ -1941,7 +495,6 @@ "Flashforge/Flashforge PET-CF", "Flashforge/Flashforge PET-CF @FF C5", "Flashforge/Flashforge PET-CF @FF C5P", - "Flashforge/Flashforge PETG", "Flashforge/Flashforge PETG Basic", "Flashforge/Flashforge PETG Basic @FF AD5M 0.25 nozzle", "Flashforge/Flashforge PETG Pro", @@ -1994,7 +547,6 @@ "Flashforge/Flashforge PETG-CF @FF G4 0.6 nozzle", "Flashforge/Flashforge PETG-CF @FF G4P", "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA", "Flashforge/Flashforge PLA Matte @FF C5", "Flashforge/Flashforge PLA Matte @FF C5P", "Flashforge/Flashforge PLA Metal @FF C5", @@ -2260,7 +812,6 @@ "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", "Flashforge/Generic PET @FF G4P 0.6 nozzle", "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", - "Flashforge/Generic PETG @Flashforge Artemis", "Flashforge/Generic PETG-CF10 @Flashforge AD4", "Flashforge/Generic PLA @Flashforge AD4", "Flashforge/Generic PLA High Speed @Flashforge AD4", @@ -2284,125 +835,26 @@ "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", "Flashforge/Polymaker Generic CoPA", "Flashforge/Polymaker Generic S1", - "Flashforge/SUNLU PETG @base", - "Flashforge/SUNLU PLA Marble @base", - "Flashforge/SUNLU PLA Matte @base", - "Flashforge/SUNLU PLA+ 2.0 @base", - "Flashforge/SUNLU PLA+ @base", - "Flashforge/SUNLU Silk PLA+ @base", - "Flashforge/SUNLU Wood PLA @base", - "FlyingBear/FlyingBear Generic PA-CF", "FlyingBear/FlyingBear Generic PC", - "FlyingBear/FlyingBear Generic PETG", - "FlyingBear/FlyingBear Generic PLA", - "InfiMech/InfiMech Generic PA-CF", "InfiMech/InfiMech Generic PC", - "InfiMech/InfiMech Generic PETG", - "InfiMech/InfiMech Generic PLA", - "LH/LHS PC CF", - "LH/LHS PCTG", - "LH/LHS PETG", - "LH/LHS PLA", - "LONGER/Generic PETG @LONGER LK10", - "LONGER/Generic PETG @LONGER LK10 Plus", - "LONGER/Generic PLA @LONGER LK10", - "LONGER/Generic PLA @LONGER LK10 Plus", "Lulzbot/Lulzbot 2.85mm ABS", "Lulzbot/Lulzbot 2.85mm PETG", "Lulzbot/Lulzbot 2.85mm PLA", - "OrcaArena/Arena PA-CF @base", - "OrcaArena/Arena PAHT-CF @base", "OrcaArena/Arena PC @base", - "OrcaArena/Arena PET-CF @base", - "OrcaArena/Arena PETG Basic @base", - "OrcaArena/Arena PETG-CF @base", - "OrcaArena/Arena PLA Basic @base", - "OrcaArena/Arena PLA Impact @base", - "OrcaArena/Arena PLA Marble @base", - "OrcaArena/Arena PLA Matte @base", - "OrcaArena/Arena PLA Metal @base", - "OrcaArena/Arena PLA Silk @base", - "OrcaArena/Arena PLA Sparkle @base", - "OrcaArena/Arena PLA Tough @base", - "OrcaArena/Arena PLA-CF @base", - "OrcaArena/Arena Support G @base", - "OrcaArena/Arena Support W @base", - "OrcaArena/OrcaArena Generic PA", - "OrcaArena/OrcaArena Generic PA-CF", "OrcaArena/OrcaArena Generic PC @base", - "OrcaArena/OrcaArena Generic PETG @base", - "OrcaArena/OrcaArena Generic PETG-CF @base", - "OrcaArena/OrcaArena Generic PLA @base", - "OrcaArena/OrcaArena Generic PLA Silk @base", - "OrcaArena/OrcaArena Generic PLA-CF @base", - "OrcaArena/PolyLite PLA @base", - "OrcaArena/PolyTerra PLA @base", - "OrcaFilamentLibrary/AliZ PA-CF @base", - "OrcaFilamentLibrary/AliZ PETG @base", "OrcaFilamentLibrary/AliZ PETG-CF @base", "OrcaFilamentLibrary/AliZ PETG-Metal @base", - "OrcaFilamentLibrary/AliZ PLA @base", - "OrcaFilamentLibrary/Bambu PA-CF @base", - "OrcaFilamentLibrary/Bambu PA6-CF @base", - "OrcaFilamentLibrary/Bambu PA6-GF @base", - "OrcaFilamentLibrary/Bambu PAHT-CF @base", "OrcaFilamentLibrary/Bambu PC @base", "OrcaFilamentLibrary/Bambu PC FR @base", - "OrcaFilamentLibrary/Bambu PET-CF @base", - "OrcaFilamentLibrary/Bambu PETG Basic @base", - "OrcaFilamentLibrary/Bambu PETG HF @base", - "OrcaFilamentLibrary/Bambu PETG Translucent @base", - "OrcaFilamentLibrary/Bambu PETG-CF @base", - "OrcaFilamentLibrary/Bambu PLA Aero @base", - "OrcaFilamentLibrary/Bambu PLA Basic @base", - "OrcaFilamentLibrary/Bambu PLA Dynamic @base", - "OrcaFilamentLibrary/Bambu PLA Galaxy @base", - "OrcaFilamentLibrary/Bambu PLA Glow @base", - "OrcaFilamentLibrary/Bambu PLA Impact @base", - "OrcaFilamentLibrary/Bambu PLA Marble @base", - "OrcaFilamentLibrary/Bambu PLA Matte @base", - "OrcaFilamentLibrary/Bambu PLA Metal @base", - "OrcaFilamentLibrary/Bambu PLA Silk @base", - "OrcaFilamentLibrary/Bambu PLA Silk+ @base", - "OrcaFilamentLibrary/Bambu PLA Sparkle @base", - "OrcaFilamentLibrary/Bambu PLA Tough @base", - "OrcaFilamentLibrary/Bambu PLA Wood @base", - "OrcaFilamentLibrary/Bambu PLA-CF @base", - "OrcaFilamentLibrary/Bambu PPA-CF @base", - "OrcaFilamentLibrary/Bambu Support For PA/PET @base", - "OrcaFilamentLibrary/Bambu Support For PLA @base", - "OrcaFilamentLibrary/Bambu Support For PLA/PETG @base", - "OrcaFilamentLibrary/Bambu Support G @base", - "OrcaFilamentLibrary/Bambu Support W @base", - "OrcaFilamentLibrary/COEX NYLEX PA6-CF @base", - "OrcaFilamentLibrary/COEX NYLEX UNFILLED @base", - "OrcaFilamentLibrary/COEX PCTG PRIME @base", - "OrcaFilamentLibrary/COEX PETG @base", - "OrcaFilamentLibrary/COEX PLA @base", - "OrcaFilamentLibrary/COEX PLA PRIME @base", - "OrcaFilamentLibrary/COEX PLA+Silk @base", - "OrcaFilamentLibrary/DREMC PA12-CF @base", - "OrcaFilamentLibrary/DREMC PA6-CF @base", - "OrcaFilamentLibrary/DREMC PET-CF @base", - "OrcaFilamentLibrary/DREMC PETG @base", - "OrcaFilamentLibrary/DREMC PLA+ @base", - "OrcaFilamentLibrary/DREMC PLA+ HS @base", - "OrcaFilamentLibrary/DREMC PPA-CF @base", - "OrcaFilamentLibrary/Elas PETG Basic @base", - "OrcaFilamentLibrary/Elas PLA Basic @base", - "OrcaFilamentLibrary/Elas PLA Pro @base", "OrcaFilamentLibrary/Elegoo ASA-CF @base", - "OrcaFilamentLibrary/Elegoo PAHT @base", "OrcaFilamentLibrary/Elegoo PC @base", "OrcaFilamentLibrary/Elegoo PC-FR @base", "OrcaFilamentLibrary/Elegoo PET-CF @base", - "OrcaFilamentLibrary/Elegoo PETG @base", "OrcaFilamentLibrary/Elegoo PETG HF @base", "OrcaFilamentLibrary/Elegoo PETG PRO @base", "OrcaFilamentLibrary/Elegoo PETG Translucent @base", "OrcaFilamentLibrary/Elegoo PETG-CF @base", "OrcaFilamentLibrary/Elegoo PETG-GF @base", - "OrcaFilamentLibrary/Elegoo PLA @base", "OrcaFilamentLibrary/Elegoo PLA Basic @base", "OrcaFilamentLibrary/Elegoo PLA Galaxy @base", "OrcaFilamentLibrary/Elegoo PLA Glow @base", @@ -2418,37 +870,6 @@ "OrcaFilamentLibrary/Elegoo Rapid PETG @base", "OrcaFilamentLibrary/Elegoo Rapid PLA+ @base", "OrcaFilamentLibrary/Elegoo Rapid TPU 95A @base", - "OrcaFilamentLibrary/Eolas Prints PETG @System", - "OrcaFilamentLibrary/Eolas Prints PETG Transition @System", - "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant @System", - "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial @System", - "OrcaFilamentLibrary/Eolas Prints PLA High Speed @System", - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850 @System", - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870 @System", - "OrcaFilamentLibrary/Eolas Prints PLA Matte @System", - "OrcaFilamentLibrary/Eolas Prints PLA Neon @System", - "OrcaFilamentLibrary/Eolas Prints PLA Premium @System", - "OrcaFilamentLibrary/Eolas Prints PLA Silk @System", - "OrcaFilamentLibrary/Eolas Prints PLA Transition @System", - "OrcaFilamentLibrary/FDplast HIPS @base", - "OrcaFilamentLibrary/FDplast PETG @base", - "OrcaFilamentLibrary/FDplast PLA @base", - "OrcaFilamentLibrary/FDplast SBS @base", - "OrcaFilamentLibrary/FILL3D PA @base", - "OrcaFilamentLibrary/FILL3D PETG @base", - "OrcaFilamentLibrary/FILL3D PETG CF @base", - "OrcaFilamentLibrary/FILL3D PLA Basic @base", - "OrcaFilamentLibrary/FILL3D PLA Turbo @base", - "OrcaFilamentLibrary/FILL3D PP @base", - "OrcaFilamentLibrary/FILL3D PPCF @base", - "OrcaFilamentLibrary/Fiberon PA12-CF @base", - "OrcaFilamentLibrary/Fiberon PA6-CF @base", - "OrcaFilamentLibrary/Fiberon PA6-GF @base", - "OrcaFilamentLibrary/Fiberon PA612-CF @base", - "OrcaFilamentLibrary/Fiberon PET-CF @base", - "OrcaFilamentLibrary/Fiberon PETG-ESD @base", - "OrcaFilamentLibrary/Fiberon PETG-rCF @base", - "OrcaFilamentLibrary/FilAr PETG @base", "OrcaFilamentLibrary/FilAr PETG Amarillo Lima", "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante", "OrcaFilamentLibrary/FilAr PETG Azul Boreal", @@ -2463,7 +884,6 @@ "OrcaFilamentLibrary/FilAr PETG Magenta", "OrcaFilamentLibrary/FilAr PETG Negro Azabache", "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi", - "OrcaFilamentLibrary/FilAr PLA @base", "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio", "OrcaFilamentLibrary/FilAr PLA Azul Francia", "OrcaFilamentLibrary/FilAr PLA Blanco Antartida", @@ -2493,7 +913,6 @@ "OrcaFilamentLibrary/FilAr PLA Verde Oliva", "OrcaFilamentLibrary/FilAr PLA Verde Pixel", "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda", - "OrcaFilamentLibrary/FilAr PLA-mate @base", "OrcaFilamentLibrary/FilAr PLA-mate Amarillo", "OrcaFilamentLibrary/FilAr PLA-mate Azul", "OrcaFilamentLibrary/FilAr PLA-mate Beige", @@ -2511,73 +930,9 @@ "OrcaFilamentLibrary/FilAr PLA-mate Uva", "OrcaFilamentLibrary/FilAr PLA-mate Verde", "OrcaFilamentLibrary/FilAr PLA-mate Violeta", - "OrcaFilamentLibrary/Generic PA-CF @System", - "OrcaFilamentLibrary/Generic PE-CF @base", - "OrcaFilamentLibrary/Generic PETG HF @base", - "OrcaFilamentLibrary/Generic PETG-CF @base", - "OrcaFilamentLibrary/Generic PLA High Speed @System", - "OrcaFilamentLibrary/Generic PLA Matte @base", - "OrcaFilamentLibrary/Generic PLA-CF @System", - "OrcaFilamentLibrary/Generic PP-CF @base", - "OrcaFilamentLibrary/Generic PP-GF @base", - "OrcaFilamentLibrary/Generic PPA-GF @System", - "OrcaFilamentLibrary/GreenGate3D PETG @base", - "OrcaFilamentLibrary/NIT PETG @base", - "OrcaFilamentLibrary/NIT PLA @base", - "OrcaFilamentLibrary/Numakers PLA+ @base", - "OrcaFilamentLibrary/Overture Air PLA @base", - "OrcaFilamentLibrary/Overture Easy PLA @base", - "OrcaFilamentLibrary/Overture Matte PLA @base", - "OrcaFilamentLibrary/Overture PLA @base", - "OrcaFilamentLibrary/Overture PLA Pro @base", - "OrcaFilamentLibrary/Overture Rock PLA @base", - "OrcaFilamentLibrary/Overture Silk PLA @base", - "OrcaFilamentLibrary/Overture Super PLA+ @base", - "OrcaFilamentLibrary/Panchroma CoPE @base", - "OrcaFilamentLibrary/Panchroma PLA @base", - "OrcaFilamentLibrary/Panchroma PLA Celestial @base", - "OrcaFilamentLibrary/Panchroma PLA Galaxy @base", - "OrcaFilamentLibrary/Panchroma PLA Glow @base", - "OrcaFilamentLibrary/Panchroma PLA Luminous @base", - "OrcaFilamentLibrary/Panchroma PLA Marble @base", - "OrcaFilamentLibrary/Panchroma PLA Matte @base", - "OrcaFilamentLibrary/Panchroma PLA Metallic @base", - "OrcaFilamentLibrary/Panchroma PLA Neon @base", - "OrcaFilamentLibrary/Panchroma PLA Satin @base", - "OrcaFilamentLibrary/Panchroma PLA Silk @base", - "OrcaFilamentLibrary/Panchroma PLA Starlight @base", - "OrcaFilamentLibrary/Panchroma PLA Temp Shift @base", - "OrcaFilamentLibrary/Panchroma PLA Translucent @base", - "OrcaFilamentLibrary/Panchroma PLA UV Shift @base", + "OrcaFilamentLibrary/Generic PC @System", "OrcaFilamentLibrary/PolyLite Dual PLA @base", - "OrcaFilamentLibrary/PolyLite PETG @base", - "OrcaFilamentLibrary/PolyLite PLA @base", - "OrcaFilamentLibrary/PolyLite PLA Pro @base", "OrcaFilamentLibrary/PolyTerra Dual PLA @System", - "OrcaFilamentLibrary/PolyTerra PLA @base", - "OrcaFilamentLibrary/Polymaker HT-PLA @base", - "OrcaFilamentLibrary/Polymaker HT-PLA-GF @base", - "OrcaFilamentLibrary/SUNLU PETG @base", - "OrcaFilamentLibrary/SUNLU PLA Marble @base", - "OrcaFilamentLibrary/SUNLU PLA Matte @base", - "OrcaFilamentLibrary/SUNLU PLA+ 2.0 @base", - "OrcaFilamentLibrary/SUNLU PLA+ @base", - "OrcaFilamentLibrary/SUNLU Silk PLA+ @base", - "OrcaFilamentLibrary/SUNLU Wood PLA @base", - "OrcaFilamentLibrary/Valment PLA @base", - "OrcaFilamentLibrary/Valment PLA Galaxy @base", - "OrcaFilamentLibrary/Valment PLA Silk @base", - "OrcaFilamentLibrary/Valment PLA-CF @base", - "OrcaFilamentLibrary/eSUN PETG @base", - "OrcaFilamentLibrary/eSUN PLA+ @base", - "OrcaFilamentLibrary/eSUN PLA-Basic @base", - "OrcaFilamentLibrary/eSUN PLA-Marble @base", - "OrcaFilamentLibrary/eSUN PLA-Matte @base", - "OrcaFilamentLibrary/eSUN ePLA-LW @System", - "OrcaFilamentLibrary/fdm_filament_pla_silk", - "Peopoly/Peopoly Generic PLA", - "Peopoly/Peopoly Lancer PLA-C", - "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", "Prusa/Prusa Generic ABS @CORE One 0.6", "Prusa/Prusa Generic ABS @CORE One 0.8", "Prusa/Prusa Generic ABS @CORE One HF 0.4", @@ -2612,16 +967,6 @@ "Prusa/Prusa Generic ASA HF @MK3.5 0.6", "Prusa/Prusa Generic ASA HF @MK3.5 0.8", "Prusa/Prusa Generic ASA HF @base", - "Prusa/Prusa Generic PA @MK3.5", - "Prusa/Prusa Generic PA @MK3.5 0.25", - "Prusa/Prusa Generic PA @MK3.5 0.6", - "Prusa/Prusa Generic PA @MK3.5 0.8", - "Prusa/Prusa Generic PA @base", - "Prusa/Prusa Generic PA-CF @MK3.5", - "Prusa/Prusa Generic PA-CF @MK3.5 0.25", - "Prusa/Prusa Generic PA-CF @MK3.5 0.6", - "Prusa/Prusa Generic PA-CF @MK3.5 0.8", - "Prusa/Prusa Generic PA-CF @base", "Prusa/Prusa Generic PC @MK3.5", "Prusa/Prusa Generic PC @MK3.5 0.25", "Prusa/Prusa Generic PC @MK3.5 0.6", @@ -2630,63 +975,35 @@ "Prusa/Prusa Generic PC HF @MK3.5 0.6", "Prusa/Prusa Generic PC HF @MK3.5 0.8", "Prusa/Prusa Generic PC HF @base", - "Prusa/Prusa Generic PETG @CORE One", "Prusa/Prusa Generic PETG @CORE One 0.6", "Prusa/Prusa Generic PETG @CORE One 0.8", "Prusa/Prusa Generic PETG @CORE One HF 0.4", "Prusa/Prusa Generic PETG @CORE One HF 0.5", "Prusa/Prusa Generic PETG @CORE One HF 0.6", "Prusa/Prusa Generic PETG @CORE One HF 0.8", - "Prusa/Prusa Generic PETG @MK3.5", - "Prusa/Prusa Generic PETG @MK3.5 0.25", - "Prusa/Prusa Generic PETG @MK3.5 0.6", - "Prusa/Prusa Generic PETG @MK3.5 0.8", - "Prusa/Prusa Generic PETG @MK4S", "Prusa/Prusa Generic PETG @MK4S 0.6", "Prusa/Prusa Generic PETG @MK4S 0.8", "Prusa/Prusa Generic PETG @MK4S HF0.4", "Prusa/Prusa Generic PETG @MK4S HF0.5", "Prusa/Prusa Generic PETG @MK4S HF0.6", "Prusa/Prusa Generic PETG @MK4S HF0.8", - "Prusa/Prusa Generic PETG @base", - "Prusa/Prusa Generic PETG HF @MK3.5", - "Prusa/Prusa Generic PETG HF @MK3.5 0.6", - "Prusa/Prusa Generic PETG HF @MK3.5 0.8", - "Prusa/Prusa Generic PETG HF @base", - "Prusa/Prusa Generic PLA @CORE One", "Prusa/Prusa Generic PLA @CORE One 0.6", "Prusa/Prusa Generic PLA @CORE One 0.8", "Prusa/Prusa Generic PLA @CORE One HF 0.4", "Prusa/Prusa Generic PLA @CORE One HF 0.5", "Prusa/Prusa Generic PLA @CORE One HF 0.6", "Prusa/Prusa Generic PLA @CORE One HF 0.8", - "Prusa/Prusa Generic PLA @MK3.5", - "Prusa/Prusa Generic PLA @MK3.5 0.25", - "Prusa/Prusa Generic PLA @MK3.5 0.6", - "Prusa/Prusa Generic PLA @MK3.5 0.8", - "Prusa/Prusa Generic PLA @MK4S", "Prusa/Prusa Generic PLA @MK4S 0.6", "Prusa/Prusa Generic PLA @MK4S 0.8", "Prusa/Prusa Generic PLA @MK4S HF0.4", "Prusa/Prusa Generic PLA @MK4S HF0.5", "Prusa/Prusa Generic PLA @MK4S HF0.6", "Prusa/Prusa Generic PLA @MK4S HF0.8", - "Prusa/Prusa Generic PLA @base", - "Prusa/Prusa Generic PLA HF @MK3.5", - "Prusa/Prusa Generic PLA HF @MK3.5 0.6", - "Prusa/Prusa Generic PLA HF @MK3.5 0.8", - "Prusa/Prusa Generic PLA HF @base", - "Prusa/Prusa Generic PLA Silk @CORE One", "Prusa/Prusa Generic PLA Silk @CORE One 0.6", "Prusa/Prusa Generic PLA Silk @CORE One 0.8", "Prusa/Prusa Generic PLA Silk @MK4S", "Prusa/Prusa Generic PLA Silk @MK4S 0.6", "Prusa/Prusa Generic PLA Silk @MK4S 0.8", - "Prusa/Prusa Generic PLA-CF @MK3.5", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.25", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.6", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.8", - "Prusa/Prusa Generic PLA-CF @base", "Prusa/Prusa Generic TPU @CORE One", "Prusa/Prusa Generic TPU @CORE One 0.6", "Prusa/Prusa Generic TPU @CORE One 0.8", @@ -2699,7 +1016,6 @@ "Prusa/Prusament ASA @CORE One HF 0.5", "Prusa/Prusament ASA @CORE One HF 0.6", "Prusa/Prusament ASA @CORE One HF 0.8", - "Prusa/Prusament PA-CF @CORE One", "Prusa/Prusament PA-CF @CORE One 0.6", "Prusa/Prusament PA-CF @CORE One 0.8", "Prusa/Prusament PC Blend @CORE One", @@ -2712,35 +1028,23 @@ "Prusa/Prusament PC-CF @CORE One", "Prusa/Prusament PC-CF @CORE One 0.6", "Prusa/Prusament PC-CF @CORE One 0.8", - "Prusa/Prusament PETG @CORE One", "Prusa/Prusament PETG @CORE One 0.6", "Prusa/Prusament PETG @CORE One 0.8", "Prusa/Prusament PETG @CORE One HF 0.4", "Prusa/Prusament PETG @CORE One HF 0.5", "Prusa/Prusament PETG @CORE One HF 0.6", "Prusa/Prusament PETG @CORE One HF 0.8", - "Prusa/Prusament PETG @base", - "Prusa/Prusament PLA @CORE One", "Prusa/Prusament PLA @CORE One 0.6", "Prusa/Prusament PLA @CORE One 0.8", "Prusa/Prusament PLA @CORE One HF 0.4", "Prusa/Prusament PLA @CORE One HF 0.5", "Prusa/Prusament PLA @CORE One HF 0.6", "Prusa/Prusament PLA @CORE One HF 0.8", - "Prusa/Prusament PLA @base", "Prusa/Prusament PVB @CORE One", "Prusa/Prusament PVB @CORE One 0.6", "Prusa/Prusament PVB @CORE One 0.8", - "Prusa/Prusament rPLA @CORE One", "Prusa/Prusament rPLA @CORE One 0.6", "Prusa/Prusament rPLA @CORE One 0.8", - "Prusa/Prusament rPLA @base", - "Qidi/Bambu PETG", - "Qidi/Bambu PLA", - "Qidi/HATCHBOX PETG @Qidi", - "Qidi/HATCHBOX PLA @Qidi", - "Qidi/Overture PLA @Qidi", - "Qidi/PolyLite PLA @Qidi", "Qidi/QIDI ABS Rapido 0.2 nozzle", "Qidi/QIDI ABS Rapido 0.6 nozzle", "Qidi/QIDI ABS Rapido 0.8 nozzle", @@ -2756,43 +1060,34 @@ "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle", "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle", "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle", - "Qidi/QIDI PA-Ultra", "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PA12-CF", "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PAHT-CF", "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PAHT-GF", "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PET-CF", "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PET-GF", "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Basic", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Rapido", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Tough", "Qidi/QIDI PETG Tough 0.2 nozzle", "Qidi/QIDI PETG Tough 0.6 nozzle", "Qidi/QIDI PETG Tough 0.8 nozzle", @@ -2800,47 +1095,38 @@ "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Translucent", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG-CF", "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG-GF", "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Basic", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Matte Basic", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido", "Qidi/QIDI PLA Rapido 0.2 nozzle", "Qidi/QIDI PLA Rapido 0.8 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Matte", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Metal", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Silk", "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA-CF @0.6 nozzle", @@ -2851,19 +1137,15 @@ "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PPS-CF", "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PPS-GF", "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle", "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle", "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI Support For PAHT", "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI Support For PET/PA", "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.8 nozzle", @@ -2872,137 +1154,42 @@ "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI UltraPA-CF25", "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI WOOD Rapido", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PA", - "Qidi/Qidi Generic PA-CF", "Qidi/Qidi Generic PC", - "Qidi/Qidi Generic PETG", - "Qidi/Qidi Generic PETG-CF", - "Qidi/Qidi Generic PLA", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PLA Silk", - "Qidi/Qidi Generic PLA+", - "Qidi/Qidi Generic PLA-CF", "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle", "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi PLA-CF", "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Tinmorry PETG-ECO", "RH3D/Generic ABS @E3NG v1.2S", "RH3D/Generic ASA @E3NG v1.2S", "RH3D/Generic PCCF @E3NG v1.2S", "RH3D/Generic PETG @E3NG v1.2S", "RH3D/Generic PLA @E3NG v1.2S", "RH3D/Generic TPU @E3NG v1.2S", - "Ratrig/RatRig BigNozzle PCTG", - "Ratrig/RatRig BigNozzle PETG", - "Ratrig/RatRig BigNozzle PLA", - "Ratrig/RatRig Generic PA", - "Ratrig/RatRig Generic PA-CF", "Ratrig/RatRig Generic PC", - "Ratrig/RatRig Generic PCTG", - "Ratrig/RatRig Generic PETG", - "Ratrig/RatRig Generic PLA", - "Ratrig/RatRig Generic PLA-CF", - "Ratrig/RatRig PunkFil PETG", - "Ratrig/RatRig PunkFil PETG CF", - "SecKit/SecKit Generic PA", - "SecKit/SecKit Generic PA-CF", "SecKit/SecKit Generic PC", - "SecKit/SecKit Generic PETG", - "SecKit/SecKit Generic PLA", - "SecKit/SecKit Generic PLA-CF", - "Snapmaker/Fiberon PA12-CF10 @Snapmaker U1 base", - "Snapmaker/Fiberon PA6-CF20 @Snapmaker U1 base", - "Snapmaker/Fiberon PA612-ESD @Snapmaker U1 base", - "Snapmaker/Panchroma CoPE @Snapmaker U1 base", - "Snapmaker/Panchroma PLA @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Celestial @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Galaxy @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Glow @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Luminous @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Marble @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Matte @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Metallic @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Neon @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Satin @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Silk @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Starlight @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Temp Shift @Snapmaker U1 base", - "Snapmaker/Panchroma PLA Translucent @Snapmaker U1 base", - "Snapmaker/Panchroma PLA UV Shift @Snapmaker U1 base", - "Snapmaker/PolyLite CosPLA @Snapmaker U1 base", - "Snapmaker/PolyLite PLA @Snapmaker U1 base", - "Snapmaker/PolyLite PLA @base", - "Snapmaker/PolyLite PLA Galaxy @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Glow @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Luminous @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Neon @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Pro @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Pro Metallic @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Starlight @Snapmaker U1 base", - "Snapmaker/PolyLite PLA Translucent @Snapmaker U1 base", "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", - "Snapmaker/PolyTerra PLA @Snapmaker U1 base", - "Snapmaker/PolyTerra PLA Marble @Snapmaker U1 base", - "Snapmaker/PolyTerra PLA+ @Snapmaker U1 base", - "Snapmaker/Polymaker HT-PLA @Snapmaker U1 base", - "Snapmaker/Polymaker HT-PLA-GF @Snapmaker U1 base", - "Snapmaker/Polymaker PLA @Snapmaker U1 base", - "Snapmaker/Polymaker PLA Pro @Snapmaker U1 base", - "Snapmaker/Polymaker PLA Pro Metallic @Snapmaker U1 base", "Snapmaker/Snapmaker ABS Benchy @U1", "Snapmaker/Snapmaker Dual ABS Benchy", - "Snapmaker/Snapmaker Dual PA-CF @base", - "Snapmaker/Snapmaker Dual PET @base", - "Snapmaker/Snapmaker Dual PLA @base", - "Snapmaker/Snapmaker Dual PLA Eco @base", - "Snapmaker/Snapmaker Dual PLA Matte @base", - "Snapmaker/Snapmaker Dual PLA Metal @base", - "Snapmaker/Snapmaker Dual PLA Silk @base", - "Snapmaker/Snapmaker Dual PLA-CF @base", "Snapmaker/Snapmaker Dual TPE", "Snapmaker/Snapmaker Dual TPU High-Flow", "Snapmaker/Snapmaker J1 ABS Benchy", - "Snapmaker/Snapmaker J1 PA-CF @base", - "Snapmaker/Snapmaker J1 PET @base", - "Snapmaker/Snapmaker J1 PLA @base", - "Snapmaker/Snapmaker J1 PLA Eco @base", - "Snapmaker/Snapmaker J1 PLA Matte @base", - "Snapmaker/Snapmaker J1 PLA Metal @base", - "Snapmaker/Snapmaker J1 PLA Silk @base", - "Snapmaker/Snapmaker J1 PLA-CF @base", "Snapmaker/Snapmaker J1 TPE", "Snapmaker/Snapmaker J1 TPU High-Flow", - "Snapmaker/Snapmaker PA-CF @U1 base", - "Snapmaker/Snapmaker PA-CF @base", "Snapmaker/Snapmaker PET @Dual", - "Snapmaker/Snapmaker PET @U1 base", - "Snapmaker/Snapmaker PET @base", - "Snapmaker/Snapmaker PLA @U1 base", - "Snapmaker/Snapmaker PLA @base", - "Snapmaker/Snapmaker PLA Eco @U1 base", - "Snapmaker/Snapmaker PLA Eco @base", "Snapmaker/Snapmaker PLA Matte @U1", - "Snapmaker/Snapmaker PLA Metal @U1 base", - "Snapmaker/Snapmaker PLA Silk @U1 base", - "Snapmaker/Snapmaker PLA Silk @base", - "Snapmaker/Snapmaker PLA-CF @U1 base", - "Snapmaker/Snapmaker PLA-CF @base", "Snapmaker/Snapmaker TPE", "Snapmaker/Snapmaker TPE @U1", "Snapmaker/Snapmaker TPU High-Flow @U1", @@ -3032,100 +1219,15 @@ "Sovol/Sovol Zero PLA Silk", "Sovol/Sovol Zero PLA Silk HS Nozzle", "Sovol/Sovol Zero TPU", - "Tiertime/Tiertime Generic BVOH", - "Tiertime/Tiertime Generic BVOH@300HS", - "Tiertime/Tiertime Generic EVA", - "Tiertime/Tiertime Generic EVA@300HS", - "Tiertime/Tiertime Generic HIPS", - "Tiertime/Tiertime Generic HIPS@300HS", - "Tiertime/Tiertime Generic PA", - "Tiertime/Tiertime Generic PA-CF", - "Tiertime/Tiertime Generic PA-CF@300HS", - "Tiertime/Tiertime Generic PA@300HS", "Tiertime/Tiertime Generic PC", "Tiertime/Tiertime Generic PC@300HS", - "Tiertime/Tiertime Generic PCTG", - "Tiertime/Tiertime Generic PCTG@300HS", - "Tiertime/Tiertime Generic PE", - "Tiertime/Tiertime Generic PE-CF", - "Tiertime/Tiertime Generic PE-CF@300HS", - "Tiertime/Tiertime Generic PE@300HS", - "Tiertime/Tiertime Generic PETG", - "Tiertime/Tiertime Generic PETG-CF", - "Tiertime/Tiertime Generic PETG-CF@300HS", - "Tiertime/Tiertime Generic PETG@300HS", - "Tiertime/Tiertime Generic PHA", - "Tiertime/Tiertime Generic PHA@300HS", - "Tiertime/Tiertime Generic PLA", - "Tiertime/Tiertime Generic PLA High Speed", - "Tiertime/Tiertime Generic PLA High Speed@300HS", - "Tiertime/Tiertime Generic PLA Silk", - "Tiertime/Tiertime Generic PLA Silk@300HS", - "Tiertime/Tiertime Generic PLA-CF", - "Tiertime/Tiertime Generic PLA-CF@300HS", - "Tiertime/Tiertime Generic PLA@300HS", - "Tiertime/Tiertime Generic PP", - "Tiertime/Tiertime Generic PP-CF", - "Tiertime/Tiertime Generic PP-CF@300HS", - "Tiertime/Tiertime Generic PP-GF", - "Tiertime/Tiertime Generic PP-GF@300HS", - "Tiertime/Tiertime Generic PP@300HS", - "Tiertime/Tiertime Generic PPA-CF", - "Tiertime/Tiertime Generic PPA-CF@300HS", - "Tiertime/Tiertime Generic PPA-GF", - "Tiertime/Tiertime Generic PPA-GF@300HS", - "Tiertime/Tiertime Generic SBS", - "Tiertime/Tiertime Generic SBS@300HS", - "Tiertime/Tiertime PA6-CF", - "Tiertime/Tiertime PA6-CF@300HS", "Tiertime/Tiertime PC", "Tiertime/Tiertime PC@300HS", - "Tiertime/Tiertime PET-CF", - "Tiertime/Tiertime PET-CF@300HS", - "Tiertime/Tiertime PETG", - "Tiertime/Tiertime PETG@300HS", - "Tiertime/Tiertime PLA", - "Tiertime/Tiertime PLA-CF", - "Tiertime/Tiertime PLA-CF@300HS", - "Tiertime/Tiertime PLA@300HS", - "TwoTrees/TwoTrees Generic HS PLA @SK1", - "Volumic/Désactivé", - "Volumic/PA6 CF20 (Performance)", - "Volumic/PETG ESD (Performance)", - "Volumic/PPS Carbone (Performance)", - "Volumic/Volumic NYLON Ultra", - "Volumic/Volumic NYLON Ultra (Performance)", "Volumic/Volumic PC", "Volumic/Volumic PC (Performance)", - "Volumic/Volumic PCTG Ultra (Performance)", - "Volumic/Volumic PETG Ultra", - "Volumic/Volumic PETG Ultra (Performance)", - "Volumic/Volumic PETG Ultra carbone", - "Volumic/Volumic PETG Ultra carbone (Performance)", - "Volumic/Volumic PLA Ultra", - "Volumic/Volumic PLA Ultra (Performance)", - "Volumic/Volumic PP Ultra", - "Volumic/Volumic PP Ultra (Performance)", - "Volumic/Volumic UNIVERSAL Ultra", - "Volumic/Volumic UNIVERSAL Ultra (Performance)", - "Vzbot/Vzbot Generic PA", - "Vzbot/Vzbot Generic PA-CF", "Vzbot/Vzbot Generic PC", - "Vzbot/Vzbot Generic PETG", - "Vzbot/Vzbot Generic PLA", - "Vzbot/Vzbot Generic PLA-CF", "Wanhao France/YUMI PLA Bowden", "Wanhao France/YUMI PLA Direct Drive", - "Wanhao France/Yumi Generic PETG", - "Wanhao France/Yumi Generic PLA", - "WonderMaker/WonderMaker PET-CF", - "WonderMaker/WonderMaker PETG Basic", - "WonderMaker/WonderMaker PLA Basic", - "WonderMaker/WonderMaker PLA Marble", - "WonderMaker/WonderMaker PLA Matte", - "WonderMaker/WonderMaker PLA Metal", - "WonderMaker/WonderMaker PLA Silk", - "WonderMaker/WonderMaker PLA Wood", "Z-Bolt/Generic ABS @Z-Bolt 0.4 nozzle", "Z-Bolt/Generic ABS @Z-Bolt 0.6 nozzle", "Z-Bolt/Generic ABS @Z-Bolt 0.8 nozzle", @@ -3136,29 +1238,14 @@ "Z-Bolt/Generic PA @Z-Bolt 0.4 nozzle", "Z-Bolt/Generic PA @Z-Bolt 0.6 nozzle", "Z-Bolt/Generic PA @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PA @Z-Bolt Base", "Z-Bolt/Generic PETG @Z-Bolt 0.4 nozzle", "Z-Bolt/Generic PETG @Z-Bolt 0.6 nozzle", "Z-Bolt/Generic PETG @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PETG @Z-Bolt Base", "Z-Bolt/Generic PLA @Z-Bolt 0.6 nozzle", "Z-Bolt/Generic PLA @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PLA @Z-Bolt Base", - "re3D/re3D Greengate rPETG", - "re3D/re3D Greengate rPETG @0.8 nozzle", - "re3D/re3D Greengate rPETG @1.75 nozzle", "re3D/re3D PC", "re3D/re3D PC @0.4 nozzle", - "re3D/re3D PC @0.8 nozzle", - "re3D/re3D PETG", - "re3D/re3D PETG @0.4 nozzle", - "re3D/re3D PETG @0.8 nozzle", - "re3D/re3D PLA", - "re3D/re3D PLA @0.4 nozzle", - "re3D/re3D PLA @0.8 nozzle", - "re3D/re3D rPP", - "re3D/re3D rPP @0.8 nozzle", - "re3D/re3D rPP @1.75 nozzle" + "re3D/re3D PC @0.8 nozzle" ], "ids": { "00001": [ @@ -3546,26 +1633,6 @@ "581236806": [ "Snapmaker/Snapmaker PA-CF" ], - "AZ01-1": [ - "BBL/AliZ PETG-CF", - "OrcaFilamentLibrary/AliZ PETG-CF" - ], - "AZ01-2": [ - "BBL/AliZ PETG-Metal", - "OrcaFilamentLibrary/AliZ PETG-Metal" - ], - "AliZ001": [ - "BBL/AliZ PETG", - "OrcaFilamentLibrary/AliZ PETG" - ], - "AliZ002": [ - "BBL/AliZ PLA", - "OrcaFilamentLibrary/AliZ PLA" - ], - "AliZ003": [ - "BBL/AliZ PA-CF", - "OrcaFilamentLibrary/AliZ PA-CF" - ], "BABB00": [ "BBL/BETA ABS" ], @@ -3731,83 +1798,9 @@ "BTUB03": [ "BBL/BETA TPU 98A" ], - "CX30DB20": [ - "BBL/COEX TPE 30D", - "OrcaFilamentLibrary/COEX TPE 30D" - ], - "CX40DB20": [ - "BBL/COEX TPE 40D", - "OrcaFilamentLibrary/COEX TPE 40D" - ], - "CX60AB17": [ - "BBL/COEX TPU 60A", - "OrcaFilamentLibrary/COEX TPU 60A" - ], - "CX60DB19": [ - "BBL/COEX TPE 60D", - "OrcaFilamentLibrary/COEX TPE 60D" - ], - "CXABPB09": [ - "BBL/COEX ABS PRIME", - "OrcaFilamentLibrary/COEX ABS PRIME" - ], - "CXABSB01": [ - "BBL/COEX ABS", - "OrcaFilamentLibrary/COEX ABS" - ], - "CXASAB04": [ - "BBL/COEX ASA PRIME", - "OrcaFilamentLibrary/COEX ASA PRIME" - ], - "CXPACB23": [ - "BBL/COEX NYLEX PA6-CF", - "OrcaFilamentLibrary/COEX NYLEX PA6-CF" - ], - "CXPAUB21": [ - "BBL/COEX NYLEX UNFILLED " - ], - "CXPCTB15": [ - "BBL/COEX PCTG PRIME", - "OrcaFilamentLibrary/COEX PCTG PRIME" - ], - "CXPETB13": [ - "BBL/COEX PETG", - "OrcaFilamentLibrary/COEX PETG" - ], - "CXPLAB02": [ - "BBL/COEX PLA", - "OrcaFilamentLibrary/COEX PLA" - ], - "CXPLAB08": [ - "BBL/COEX PLA PRIME", - "OrcaFilamentLibrary/COEX PLA PRIME" - ], - "CXPLSB03": [ - "BBL/COEX PLA+Silk", - "OrcaFilamentLibrary/COEX PLA+Silk" - ], "DFL99": [ "Volumic/Désactivé" ], - "DREMC001": [], - "DREMC002": [], - "DREMC003": [], - "DREMC004": [], - "DREMC005": [], - "DREMC006": [ - "OrcaFilamentLibrary/DREMC PA6-CF" - ], - "DREMC007": [], - "DREMC008": [], - "DREMC009": [ - "OrcaFilamentLibrary/DREMC ABS-GF" - ], - "DREMC010": [ - "OrcaFilamentLibrary/DREMC PPA-CF" - ], - "DREMC011": [], - "DREMC012": [], - "DREMC013": [], "E1001": [ "Creality/eSUN PLA+" ], @@ -3904,33 +1897,9 @@ "EPLAB00": [ "Elegoo/Elegoo PLA" ], - "ESN02": [ - "OrcaFilamentLibrary/eSUN ePLA-LW" - ], - "ESN03": [ - "OrcaFilamentLibrary/eSUN PETG" - ], "ETPUB00": [ "Elegoo/Elegoo TPU 95A" ], - "FDPLAST01": [ - "OrcaFilamentLibrary/FDplast ABS" - ], - "FDPLAST02": [ - "OrcaFilamentLibrary/FDplast HIPS" - ], - "FDPLAST03": [ - "OrcaFilamentLibrary/FDplast PETG" - ], - "FDPLAST04": [ - "OrcaFilamentLibrary/FDplast PLA" - ], - "FDPLAST05": [ - "OrcaFilamentLibrary/FDplast SBS" - ], - "FDPLAST06": [ - "OrcaFilamentLibrary/FDplast TPU" - ], "FFF01": [ "Flashforge/Flashforge PLA" ], @@ -3944,210 +1913,6 @@ "FFG01": [ "Flashforge/Flashforge Generic PLA" ], - "FILAR0001": [ - "OrcaFilamentLibrary/FilAr PLA Bronce" - ], - "FILAR0002": [ - "OrcaFilamentLibrary/FilAr PLA Gris Plata" - ], - "FILAR0003": [ - "OrcaFilamentLibrary/FilAr PLA Cobre" - ], - "FILAR0004": [ - "OrcaFilamentLibrary/FilAr PLA Titanio" - ], - "FILAR0005": [ - "OrcaFilamentLibrary/FilAr PLA Tabaco" - ], - "FILAR0006": [ - "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" - ], - "FILAR0007": [ - "OrcaFilamentLibrary/FilAr PLA Manteca" - ], - "FILAR0008": [ - "OrcaFilamentLibrary/FilAr PLA Marron Oxido" - ], - "FILAR0009": [ - "OrcaFilamentLibrary/FilAr PLA Carpincho" - ], - "FILAR0010": [ - "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" - ], - "FILAR0011": [ - "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" - ], - "FILAR0012": [ - "OrcaFilamentLibrary/FilAr PLA Piel" - ], - "FILAR0013": [ - "OrcaFilamentLibrary/FilAr PLA Verde FilAr" - ], - "FILAR0014": [ - "OrcaFilamentLibrary/FilAr PLA Verde Manzana" - ], - "FILAR0015": [ - "OrcaFilamentLibrary/FilAr PLA Verde Pixel" - ], - "FILAR0016": [ - "OrcaFilamentLibrary/FilAr PLA Verde Oliva" - ], - "FILAR0017": [ - "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" - ], - "FILAR0018": [ - "OrcaFilamentLibrary/FilAr PLA Blanco Calido" - ], - "FILAR0019": [ - "OrcaFilamentLibrary/FilAr PLA Negro Azabache" - ], - "FILAR0020": [ - "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" - ], - "FILAR0021": [ - "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" - ], - "FILAR0022": [ - "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" - ], - "FILAR0023": [ - "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" - ], - "FILAR0024": [ - "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" - ], - "FILAR0025": [ - "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" - ], - "FILAR0026": [ - "OrcaFilamentLibrary/FilAr PLA Azul Francia" - ], - "FILAR0027": [ - "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" - ], - "FILAR0028": [ - "OrcaFilamentLibrary/FilAr PLA Oro" - ], - "FILAR0029": [ - "OrcaFilamentLibrary/FilAr PLA Dorado" - ], - "FILAR0030": [ - "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" - ], - "FILAR0031": [ - "OrcaFilamentLibrary/FilAr PLA-mate Azul" - ], - "FILAR0032": [ - "OrcaFilamentLibrary/FilAr PLA-mate Beige" - ], - "FILAR0033": [ - "OrcaFilamentLibrary/FilAr PLA-mate Blanco" - ], - "FILAR0034": [ - "OrcaFilamentLibrary/FilAr PLA-mate Bordo" - ], - "FILAR0035": [ - "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" - ], - "FILAR0036": [ - "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" - ], - "FILAR0037": [ - "OrcaFilamentLibrary/FilAr PLA-mate Gris" - ], - "FILAR0038": [ - "OrcaFilamentLibrary/FilAr PLA-mate Marron" - ], - "FILAR0039": [ - "OrcaFilamentLibrary/FilAr PLA-mate Naranja" - ], - "FILAR0040": [ - "OrcaFilamentLibrary/FilAr PLA-mate Negro" - ], - "FILAR0041": [ - "OrcaFilamentLibrary/FilAr PLA-mate Piel" - ], - "FILAR0042": [ - "OrcaFilamentLibrary/FilAr PLA-mate Rojo" - ], - "FILAR0043": [ - "OrcaFilamentLibrary/FilAr PLA-mate Rosa" - ], - "FILAR0044": [ - "OrcaFilamentLibrary/FilAr PLA-mate Uva" - ], - "FILAR0045": [ - "OrcaFilamentLibrary/FilAr PLA-mate Verde" - ], - "FILAR0046": [ - "OrcaFilamentLibrary/FilAr PLA-mate Violeta" - ], - "FILAR0047": [ - "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" - ], - "FILAR0048": [ - "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" - ], - "FILAR0049": [ - "OrcaFilamentLibrary/FilAr PETG Azul Boreal" - ], - "FILAR0050": [ - "OrcaFilamentLibrary/FilAr PETG Azul Francia" - ], - "FILAR0051": [ - "OrcaFilamentLibrary/FilAr PETG Azul Imperial" - ], - "FILAR0052": [ - "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" - ], - "FILAR0053": [ - "OrcaFilamentLibrary/FilAr PETG Cian" - ], - "FILAR0054": [ - "OrcaFilamentLibrary/FilAr PETG Coral" - ], - "FILAR0055": [ - "OrcaFilamentLibrary/FilAr PETG Cristal" - ], - "FILAR0056": [ - "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" - ], - "FILAR0057": [ - "OrcaFilamentLibrary/FilAr PETG Gris Plata" - ], - "FILAR0058": [ - "OrcaFilamentLibrary/FilAr PETG Magenta" - ], - "FILAR0059": [ - "OrcaFilamentLibrary/FilAr PETG Negro Azabache" - ], - "FILAR0060": [ - "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" - ], - "FILARB01": [], - "FILARB02": [], - "FILARB03": [], - "FILL3D001": [ - "OrcaFilamentLibrary/FILL3D PLA Turbo" - ], - "FILL3D002": [ - "OrcaFilamentLibrary/FILL3D PLA Basic" - ], - "FILL3D003": [ - "OrcaFilamentLibrary/FILL3D PETG" - ], - "FILL3D004": [ - "OrcaFilamentLibrary/FILL3D PP" - ], - "FILL3D005": [ - "OrcaFilamentLibrary/FILL3D PPCF" - ], - "FILL3D006": [ - "OrcaFilamentLibrary/FILL3D PA" - ], - "FILL3D007": [ - "OrcaFilamentLibrary/FILL3D PETG CF" - ], "GABSB00": [ "Elegoo/Generic ABS" ], @@ -4954,36 +2719,7 @@ "BBL/Numakers PLA+" ], "GFOT001": [ - "BBL/Overture PLA Pro", - "OrcaFilamentLibrary/Overture PLA Pro" - ], - "GFOT002": [ - "BBL/Overture Silk PLA", - "OrcaFilamentLibrary/Overture Silk PLA" - ], - "GFOT003": [ - "BBL/Overture Easy PLA", - "OrcaFilamentLibrary/Overture Easy PLA" - ], - "GFOT004": [ - "BBL/Overture Rock PLA", - "OrcaFilamentLibrary/Overture Rock PLA" - ], - "GFOT005": [ - "BBL/Overture Super PLA+", - "OrcaFilamentLibrary/Overture Super PLA+" - ], - "GFOT006": [ - "BBL/Overture Air PLA", - "OrcaFilamentLibrary/Overture Air PLA" - ], - "GFOT008": [ - "BBL/Overture TPU", - "OrcaFilamentLibrary/Overture TPU" - ], - "GFOT009": [ - "BBL/Overture ASA", - "OrcaFilamentLibrary/Overture ASA" + "BBL/Overture PLA Pro" ], "GFP95": [ "BBL/Generic PP-GF", @@ -5246,60 +2982,6 @@ "GFS99_6": [ "Prusa/Prusa Generic PVA HF" ], - "GFSEP001": [ - "OrcaFilamentLibrary/Eolas Prints PLA Premium" - ], - "GFSEP002": [ - "OrcaFilamentLibrary/Eolas Prints PLA Matte" - ], - "GFSEP003": [ - "OrcaFilamentLibrary/Eolas Prints PLA Silk" - ], - "GFSEP004": [ - "OrcaFilamentLibrary/Eolas Prints PLA Neon" - ], - "GFSEP005": [ - "OrcaFilamentLibrary/Eolas Prints PLA High Speed" - ], - "GFSEP006": [ - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" - ], - "GFSEP007": [ - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" - ], - "GFSEP008": [ - "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" - ], - "GFSEP009": [ - "OrcaFilamentLibrary/Eolas Prints PLA Transition" - ], - "GFSEP010": [ - "OrcaFilamentLibrary/Eolas Prints PETG" - ], - "GFSEP011": [ - "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" - ], - "GFSEP012": [ - "OrcaFilamentLibrary/Eolas Prints PETG Transition" - ], - "GFSEP013": [ - "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A" - ], - "GFSEP014": [ - "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" - ], - "GFSEP015": [ - "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant" - ], - "GFSEP016": [ - "OrcaFilamentLibrary/Eolas Prints TPU Transition" - ], - "GFSEP017": [ - "OrcaFilamentLibrary/Eolas Prints ABS" - ], - "GFSEP018": [ - "OrcaFilamentLibrary/Eolas Prints ASA" - ], "GFSL99": [ "Peopoly/Peopoly Generic ABS" ], @@ -5582,44 +3264,15 @@ "LHF_ptpu_pl": [ "LH/LHS TPU" ], - "NIT01": [ - "OrcaFilamentLibrary/NIT ABS" - ], - "NIT02": [ - "OrcaFilamentLibrary/NIT PLA" - ], - "NIT03": [ - "OrcaFilamentLibrary/NIT PETG" - ], - "OEABSB00": [ - "OrcaFilamentLibrary/Elegoo ABS" - ], - "OEASAB00": [ - "OrcaFilamentLibrary/Elegoo ASA" - ], - "OEPAHTB0": [ - "OrcaFilamentLibrary/Elegoo PAHT-CF" - ], - "OEPCB00": [ - "OrcaFilamentLibrary/Elegoo PC" - ], - "OEPETGB0": [ - "OrcaFilamentLibrary/Elegoo PETG" - ], - "OEPLAB00": [ - "OrcaFilamentLibrary/Elegoo PLA" - ], - "OETPUB00": [ - "OrcaFilamentLibrary/Elegoo TPU 95A" - ], "OF09vOcG": [ "Elegoo/Elegoo PLA Galaxy" ], "OF0Ee2jQ": [ "Snapmaker/Snapmaker Dual TPU High-Flow" ], - "OF0M6QAQ": [ - "OrcaFilamentLibrary/Elegoo PLA Galaxy" + "OF0NgY1y": [ + "BBL/COEX NYLEX PA6-CF", + "OrcaFilamentLibrary/COEX NYLEX PA6-CF" ], "OF0SyJhk": [ "Flashforge/Flashforge PA6-CF" @@ -5630,33 +3283,71 @@ "OF0TjJ0G": [ "Qidi/Qidi ASA-Aero" ], + "OF0UJcb6": [ + "OrcaFilamentLibrary/PolyLite PETG" + ], "OF0UbONm": [ "Flashforge/FusRock S-PAHT" ], "OF0VEdLB": [ "Cubicon/Cubicon PETG" ], + "OF0Vtzaw": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" + ], "OF0Y5MLd": [ "Qidi/QIDI PETG-GF" ], + "OF0gGRWk": [ + "OrcaFilamentLibrary/Panchroma PLA Glow" + ], + "OF0h7ERL": [ + "OrcaFilamentLibrary/Elegoo PAHT-CF" + ], + "OF0kCNDK": [ + "OrcaFilamentLibrary/Panchroma PLA Luminous" + ], + "OF0pzFLc": [ + "BBL/COEX PLA+Silk", + "OrcaFilamentLibrary/COEX PLA+Silk" + ], + "OF0wBGNx": [ + "OrcaFilamentLibrary/Bambu ASA-CF" + ], "OF0wk0Pk": [ "Flashforge/Flashforge PLA Pro" ], "OF0z1XpN": [ "Qidi/QIDI PLA Rapido Silk" ], - "OF102WKM": [ - "OrcaFilamentLibrary/Elegoo PETG PRO" - ], "OF17cONC": [ "Snapmaker/PolyTerra Dual PLA" ], + "OF1N1qMK": [ + "OrcaFilamentLibrary/Panchroma PLA UV Shift" + ], + "OF1Pke8t": [ + "BBL/Overture Easy PLA", + "OrcaFilamentLibrary/Overture Easy PLA" + ], + "OF1UNk9P": [ + "OrcaFilamentLibrary/Generic PP" + ], "OF1Zypyy": [ "Qidi/QIDI PETG Tough" ], + "OF1hznGB": [ + "OrcaFilamentLibrary/Elegoo PLA PRO" + ], "OF22AxCm": [ "Sovol/Polymaker PETG" ], + "OF2EK9F1": [ + "OrcaFilamentLibrary/FilAr PLA-mate Violeta" + ], + "OF2GCW1l": [ + "OrcaFilamentLibrary/SUNLU PETG" + ], "OF2HQqTC": [ "Cubicon/Cubicon PLA+" ], @@ -5666,15 +3357,26 @@ "OF2UFmOo": [ "Qidi/Bambu PLA" ], + "OF2VFe4J": [ + "OrcaFilamentLibrary/Bambu PAHT-CF" + ], + "OF2Z1nT5": [ + "OrcaFilamentLibrary/FilAr PETG Azul Imperial" + ], + "OF2pj5l5": [ + "BBL/Overture Super PLA+", + "OrcaFilamentLibrary/Overture Super PLA+" + ], "OF2tvNYA": [ "Sovol/Sovol Zero PLA Silk" ], + "OF2xccEe": [], + "OF30Ftju": [ + "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" + ], "OF38Hyk4": [ "Flashforge/Flashforge PETG Pro" ], - "OF3GKs2i": [ - "OrcaFilamentLibrary/eSUN PLA-Matte" - ], "OF3XeEuV": [ "Qidi/QIDI PET-GF" ], @@ -5684,21 +3386,26 @@ "OF3arl18": [ "Elegoo/Elegoo Rapid PETG" ], + "OF3kBrdA": [ + "OrcaFilamentLibrary/eSUN PETG" + ], "OF41QVDH": [ "Flashforge/Flashforge Generic PLA-Silk" ], "OF43idK2": [ "Creality/Creality Generic PLA Matte" ], + "OF44VYzK": [ + "OrcaFilamentLibrary/FilAr PETG Azul Francia" + ], "OF48G7He": [ "Qidi/QIDI PETG Tough 0.8 nozzle" ], + "OF4KsW72": [], "OF4RKeng": [ "Flashforge/Flashforge Generic ASA" ], - "OF4fgpse": [ - "OrcaFilamentLibrary/Elegoo PLA Marble" - ], + "OF4RvVuU": [], "OF4gzzE4": [ "Qidi/QIDI PET-CF" ], @@ -5711,15 +3418,24 @@ "OF50NUZI": [ "FlyingBear/FlyingBear PLA Basic" ], + "OF54B0S0": [ + "OrcaFilamentLibrary/Bambu PPA-CF" + ], "OF57IbZT": [ "Artillery/Artillery PLA Basic" ], "OF5Bmdtg": [ "Sovol/Sovol SV06 Plus ACE ABS" ], + "OF5CgdDq": [ + "OrcaFilamentLibrary/PolyLite PLA" + ], "OF5J2axC": [ "Sovol/Sovol Zero PLA Basic" ], + "OF5P4jgA": [ + "OrcaFilamentLibrary/FilAr PLA Dorado" + ], "OF5T1Y9R": [ "Flashforge/Flashforge ABS Basic" ], @@ -5732,6 +3448,13 @@ "OF5kwfZu": [ "Flashforge/FusRock Generic NexPA-CF25" ], + "OF5nlfKY": [ + "OrcaFilamentLibrary/FilAr PLA Oro" + ], + "OF5rnhjh": [], + "OF5vgi2G": [ + "OrcaFilamentLibrary/FilAr PLA-mate Azul" + ], "OF60Lmeq": [ "Flashforge/Flashforge PLA Matte" ], @@ -5741,6 +3464,9 @@ "OF6FM5F7": [ "Flashforge/FusRock PAHT" ], + "OF6Ll8lK": [ + "OrcaFilamentLibrary/Elegoo PETG Translucent" + ], "OF6Mxzsg": [ "Flashforge/Generic TPU" ], @@ -5756,8 +3482,11 @@ "OF70DKqH": [ "Snapmaker/Snapmaker TPE" ], - "OF79FFkO": [ - "OrcaFilamentLibrary/Elegoo PC-FR" + "OF74KeQR": [ + "OrcaFilamentLibrary/Generic PHA" + ], + "OF7H3VJM": [ + "OrcaFilamentLibrary/eSUN PLA-Marble" ], "OF7M9vy4": [ "Ratrig/RatRig BigNozzle PLA" @@ -5768,22 +3497,39 @@ "OF7f0eUZ": [ "Volumic/Volumic ASA Ultra" ], + "OF7lOgYF": [ + "OrcaFilamentLibrary/Generic PETG HF" + ], "OF7tgL9c": [ "Chuanying/Chuanying ASA", "Chuanying/Chuanying Generic ASA" ], - "OF8HQmJD": [ - "OrcaFilamentLibrary/Elegoo PLA Sparkle" + "OF8Tlg47": [ + "OrcaFilamentLibrary/Generic PPA-GF" ], "OF8WvPVL": [ "Qidi/QIDI ABS Rapido 0.8 nozzle" ], + "OF8aFWfQ": [ + "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" + ], + "OF8jh0Lk": [ + "OrcaFilamentLibrary/FilAr PLA-mate Marron" + ], + "OF8tPByX": [ + "OrcaFilamentLibrary/Generic PPA-CF" + ], + "OF99UMPq": [ + "BBL/COEX ABS", + "OrcaFilamentLibrary/COEX ABS" + ], + "OF99vXPs": [], + "OF9OlTWH": [ + "OrcaFilamentLibrary/Bambu PLA Marble" + ], "OF9RZyBz": [ "Flashforge/Polymaker Generic S1" ], - "OF9qvJxV": [ - "OrcaFilamentLibrary/Elegoo PLA Translucent2" - ], "OF9sr3Vn": [ "Flashforge/Flashforge PLA Sparkle" ], @@ -5826,90 +3572,191 @@ "OFAiqi5v": [ "Elegoo/Elegoo ASA-CF" ], + "OFAnyRUI": [ + "OrcaFilamentLibrary/Bambu Support For PLA" + ], "OFAnyzjN": [ "Qidi/HATCHBOX PETG" ], + "OFAt6ec0": [ + "OrcaFilamentLibrary/FilAr PLA Marron Oxido" + ], "OFAtydxE": [ "Flashforge/FusRock S-Multi" ], + "OFB5SmWk": [ + "OrcaFilamentLibrary/Valment PLA Galaxy" + ], "OFBGxHgT": [ "FlyingBear/FlyingBear PLA" ], "OFBRSZom": [ "Volumic/PPS Carbone (Performance)" ], + "OFBSW57R": [ + "OrcaFilamentLibrary/Bambu PLA Aero" + ], + "OFBUIlZ7": [ + "OrcaFilamentLibrary/Elegoo PLA+" + ], "OFBvxnjM": [ "Elegoo/Elegoo PETG-GF" ], + "OFBw6eEG": [ + "OrcaFilamentLibrary/Overture Matte PLA" + ], "OFC2FSsV": [ "Qidi/Overture PLA" ], "OFC5CCeo": [ "Flashforge/Flashforge Generic PETG-CF" ], + "OFC78WGQ": [ + "OrcaFilamentLibrary/Panchroma PLA Starlight" + ], + "OFCD8qiU": [ + "OrcaFilamentLibrary/Generic EVA" + ], + "OFCIUsWh": [ + "OrcaFilamentLibrary/Panchroma PLA Translucent" + ], "OFCJaXZS": [ "Flashforge/Flashforge PPS" ], "OFCKK3u9": [ "FlyingBear/FlyingBear PA-CF" ], + "OFCccVrQ": [ + "OrcaFilamentLibrary/PolyTerra Dual PLA" + ], "OFCgpxn2": [ "Prusa/Prusa Generic ABS HF" ], "OFChH9xu": [ "Snapmaker/Snapmaker J1 TPE" ], - "OFD5e0sH": [ - "OrcaFilamentLibrary/Elegoo Rapid PLA+" + "OFCidU7j": [ + "OrcaFilamentLibrary/DREMC ABS-GF" ], - "OFDCk0cz": [ - "OrcaFilamentLibrary/Generic PETG-CF" + "OFCjG251": [ + "OrcaFilamentLibrary/FilAr PLA-mate Verde" + ], + "OFCoRobU": [ + "OrcaFilamentLibrary/Elas ASA" + ], + "OFDETOM6": [ + "OrcaFilamentLibrary/eSUN PLA-Matte" + ], + "OFDGigEI": [ + "OrcaFilamentLibrary/Bambu PLA Dynamic" ], "OFDMWB6t": [ "Elegoo/Elegoo PLA+" ], - "OFDNiRTx": [ - "OrcaFilamentLibrary/Elegoo PLA+" + "OFDSrzZ8": [ + "Flashforge/Generic PLA", + "OrcaFilamentLibrary/Generic PLA", + "Sovol/Generic PLA" + ], + "OFDe8uyM": [ + "OrcaFilamentLibrary/Valment PLA" ], "OFDkABjZ": [ "Flashforge/Generic TPU-90A" ], + "OFDpW3J8": [ + "OrcaFilamentLibrary/FILL3D PLA Basic" + ], "OFDramZ2": [ "Co Print/CoPrint Generic PETG" ], + "OFDvXujf": [ + "OrcaFilamentLibrary/Generic PVA" + ], + "OFDvqJ6n": [ + "OrcaFilamentLibrary/Overture ABS Basic" + ], + "OFDxfPgH": [ + "OrcaFilamentLibrary/Bambu PLA Sparkle" + ], + "OFE0NFRh": [ + "BBL/COEX TPU 60A", + "OrcaFilamentLibrary/COEX TPU 60A" + ], "OFE22Uba": [ "Flashforge/Flashforge TPU-90A" ], + "OFEGNJD4": [ + "OrcaFilamentLibrary/Bambu PLA Silk" + ], "OFEYKrjb": [ "Artillery/Artillery PETG" ], + "OFEZ449N": [ + "OrcaFilamentLibrary/FilAr PLA-mate Uva" + ], "OFEdyZqS": [ "Anycubic/Anycubic PLA Luminous" ], + "OFEhuUNq": [], + "OFEkPBwx": [ + "OrcaFilamentLibrary/Bambu PLA Glow" + ], + "OFEswT5W": [ + "OrcaFilamentLibrary/Bambu PLA-CF" + ], + "OFF9OKoY": [ + "OrcaFilamentLibrary/PolyLite PLA Pro" + ], "OFFIL5pD": [ "Qidi/QIDI PA12-CF" ], + "OFFNYwWR": [ + "OrcaFilamentLibrary/Bambu PA-CF" + ], "OFFenwbU": [ "FLSun/FLSun S1 PLA Silk" ], + "OFFkCLBl": [ + "OrcaFilamentLibrary/Panchroma PLA Galaxy" + ], "OFFmJ8aR": [ "FlyingBear/Other PLA Hyper" ], "OFFrbsvQ": [ "InfiMech/Other TPU" ], + "OFFvzqcd": [ + "OrcaFilamentLibrary/Bambu PETG Basic" + ], "OFG8vHw8": [ "Qidi/Qidi Generic ASA" ], "OFGFZhWu": [ "Sovol/Sovol SV06 ACE PETG" ], + "OFGVwfK0": [ + "OrcaFilamentLibrary/FilAr PLA-mate Gris" + ], "OFGb4hPY": [ "Anycubic/Anycubic PEBA 95A" ], + "OFGcLA5R": [ + "OrcaFilamentLibrary/FilAr PLA-mate Beige" + ], "OFGfdP6J": [ "Flashforge/FusRock Generic S-Multi" ], + "OFGkyftV": [ + "BBL/Overture Silk PLA", + "OrcaFilamentLibrary/Overture Silk PLA" + ], + "OFH2nN08": [ + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" + ], + "OFHAccHz": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" + ], "OFHBTqyD": [ "Flashforge/Flashforge PLA Basic" ], @@ -5919,14 +3766,32 @@ "OFHL32M0": [ "Anycubic/Anycubic TPU" ], + "OFHWSM21": [ + "OrcaFilamentLibrary/Fiberon PET-CF" + ], + "OFHa48An": [ + "OrcaFilamentLibrary/Bambu PET-CF" + ], + "OFHfzQXo": [ + "OrcaFilamentLibrary/Eolas Prints PLA Transition" + ], + "OFHmPYRy": [ + "OrcaFilamentLibrary/SUNLU PLA+ 2.0" + ], "OFHtQDC9": [ "Elegoo/Elegoo PLA Basic" ], - "OFICPchn": [ - "OrcaFilamentLibrary/Elegoo PLA Basic" + "OFIBXa0k": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rojo" ], - "OFIGHU7W": [ - "OrcaFilamentLibrary/Elegoo PETG-CF" + "OFIamQnD": [ + "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" + ], + "OFIegjmD": [ + "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" + ], + "OFIfnzxC": [ + "OrcaFilamentLibrary/Bambu Support For PLA/PETG" ], "OFIl3ar9": [ "Sovol/Sovol SV08 PETG" @@ -5934,14 +3799,22 @@ "OFIzguhB": [ "Volumic/Volumic UNIVERSAL Ultra" ], - "OFJIImD5": [ - "OrcaFilamentLibrary/Elegoo PET-CF" + "OFJHBEGD": [], + "OFJNeELv": [ + "OrcaFilamentLibrary/FILL3D PA" ], - "OFJfx0Cl": [ - "OrcaFilamentLibrary/Generic PE-CF" + "OFJOFnOZ": [ + "BBL/AliZ PETG-CF", + "OrcaFilamentLibrary/AliZ PETG-CF" ], - "OFJsqMzx": [ - "OrcaFilamentLibrary/Generic PLA Matte" + "OFJQDUk3": [ + "OrcaFilamentLibrary/FilAr PETG Cristal" + ], + "OFJs1ToM": [ + "BBL/COEX NYLEX UNFILLED " + ], + "OFJu1XwK": [ + "OrcaFilamentLibrary/NIT PETG" ], "OFK39W9u": [ "Flashforge/Flashforge Generic PETG-CF10" @@ -5955,15 +3828,33 @@ "OFKH15Hd": [ "Sovol/Sovol SV08 ABS" ], + "OFKKajh6": [ + "OrcaFilamentLibrary/FilAr PLA Gris Plata" + ], + "OFKTSiYF": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Calido" + ], "OFKWVi10": [ "Flashforge/Flashforge Generic PLA-CF10" ], + "OFKWWgyp": [ + "OrcaFilamentLibrary/FilAr PLA Carpincho" + ], + "OFKZ9skj": [ + "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" + ], "OFKZH00L": [ "Flashforge/FusRock Generic PET-CF" ], + "OFKhMPeX": [ + "OrcaFilamentLibrary/Bambu PC" + ], "OFKhtNBx": [ "Snapmaker/Snapmaker J1 TPU High-Flow" ], + "OFKiSMWR": [ + "OrcaFilamentLibrary/Panchroma PLA Marble" + ], "OFKjlAbC": [ "Qidi/QIDI UltraPA-CF25" ], @@ -5982,8 +3873,23 @@ "OFL7vEML": [ "Flashforge/FlashForge PC" ], - "OFLSBS99": [ - "OrcaFilamentLibrary/Generic SBS" + "OFLJ8S6I": [ + "OrcaFilamentLibrary/SUNLU Wood PLA" + ], + "OFLNgV3C": [], + "OFLPAxz3": [ + "Custom/Generic ASA", + "OrcaFilamentLibrary/Generic ASA" + ], + "OFLXvuMr": [ + "OrcaFilamentLibrary/Elegoo Rapid PETG" + ], + "OFLakOUI": [ + "OrcaFilamentLibrary/Generic PC", + "Sovol/Generic PC" + ], + "OFLcd093": [ + "OrcaFilamentLibrary/Elegoo PETG" ], "OFLeFaUO": [ "Flashforge/Flashforge Generic PVA" @@ -6003,14 +3909,28 @@ "OFM3PeVe": [ "Flashforge/Flashforge ASA-CF" ], - "OFMCMXSG": [ - "OrcaFilamentLibrary/Generic PP-GF" + "OFM91vZs": [ + "BBL/Overture ASA", + "OrcaFilamentLibrary/Overture ASA" ], "OFMHTnPP": [ "Flashforge/Flashforge PA12-CF" ], - "OFMQJToc": [ - "OrcaFilamentLibrary/Elegoo PETG-GF" + "OFMTK0UC": [ + "OrcaFilamentLibrary/Bambu Support For PA/PET" + ], + "OFMUWNkp": [ + "OrcaFilamentLibrary/SUNLU PLA+" + ], + "OFMZvH0z": [ + "BBL/Overture Rock PLA", + "OrcaFilamentLibrary/Overture Rock PLA" + ], + "OFMjtqTC": [ + "OrcaFilamentLibrary/Bambu PLA Wood" + ], + "OFMuXBmO": [ + "OrcaFilamentLibrary/Elas PLA Basic" ], "OFN0X7oN": [ "Qidi/QIDI PLA Basic" @@ -6024,24 +3944,43 @@ "OFNRgSch": [ "Artillery/Artillery PC" ], + "OFNU9YIW": [ + "OrcaFilamentLibrary/FilAr PETG Azul Boreal" + ], "OFNX5uRT": [ "Qidi/QIDI TPU-Aero" ], "OFNbajj9": [ "Creality/Creality Generic ASA-CF" ], + "OFNemJM6": [ + "OrcaFilamentLibrary/FilAr PLA Cobre" + ], + "OFNiSLfL": [ + "OrcaFilamentLibrary/Generic PP-GF" + ], + "OFNk8bxk": [ + "OrcaFilamentLibrary/Bambu PA6-GF" + ], "OFNvrbnf": [ "Co Print/CoPrint Generic ABS" ], "OFNz8rrn": [ "FlyingBear/FlyingBear PLA Hyper" ], + "OFO1GEq6": [ + "OrcaFilamentLibrary/Panchroma PLA Neon" + ], "OFO3IOWM": [ "Volumic/PETG ESD (Performance)" ], "OFO5R9KJ": [ "Sovol/Sovol Zero TPU" ], + "OFOABq7t": [ + "BBL/AliZ PETG-Metal", + "OrcaFilamentLibrary/AliZ PETG-Metal" + ], "OFOJUJAS": [ "Cubicon/Cubicon PA-CF" ], @@ -6051,15 +3990,27 @@ "OFOW9K96": [ "Qidi/Qidi TPU 95A-HF" ], + "OFOiJfLM": [ + "OrcaFilamentLibrary/FILL3D PETG CF" + ], "OFOkTA0C": [ "Elegoo/Elegoo PETG Translucent" ], "OFOp3Oef": [ "Anycubic/Generic ABS" ], + "OFOsHDnB": [ + "OrcaFilamentLibrary/Elegoo PETG PRO" + ], + "OFOvv91M": [ + "OrcaFilamentLibrary/PolyLite ABS" + ], "OFOysPuE": [ "Qidi/QIDI TPU-GF" ], + "OFP26zNb": [ + "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" + ], "OFP4poIv": [ "Sovol/Sovol Zero PLA Silk HS Nozzle" ], @@ -6072,15 +4023,39 @@ "OFPJrlC3": [ "Flashforge/Flashforge PLA-CF" ], + "OFPWPlSC": [ + "OrcaFilamentLibrary/FILL3D PP" + ], + "OFPbyOSk": [ + "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" + ], + "OFPc4zVY": [ + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" + ], "OFPeGtB1": [ "Volumic/Volumic UNIVERSAL Ultra (Performance)" ], + "OFPkCJKE": [ + "OrcaFilamentLibrary/Panchroma PLA Satin" + ], + "OFPklMI1": [ + "OrcaFilamentLibrary/Generic PE" + ], "OFPokkKe": [ "Qidi/QIDI PETG-CF" ], + "OFPoyiFs": [ + "OrcaFilamentLibrary/Polymaker HT-PLA" + ], + "OFPqX3x2": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" + ], "OFPwi9X0": [ "Qidi/HATCHBOX ABS" ], + "OFQ3e56w": [ + "OrcaFilamentLibrary/Bambu PLA Galaxy" + ], "OFQ5xAKf": [ "Chuanying/Chuanying Generic PVA" ], @@ -6090,14 +4065,21 @@ "OFQCAYAt": [ "Flashforge/Flashforge PPA-CF" ], + "OFQHiNJs": [ + "OrcaFilamentLibrary/Bambu Support G" + ], + "OFQLcbps": [ + "Custom/Generic PA-CF", + "OrcaFilamentLibrary/Generic PA-CF" + ], + "OFQWIKbV": [ + "OrcaFilamentLibrary/FilAr PLA Titanio" + ], "OFQZINrX": [ "Qidi/QIDI ABS-GF10" ], - "OFQhLoxN": [ - "OrcaFilamentLibrary/Elegoo PLA Wood" - ], - "OFQkWxJy": [ - "OrcaFilamentLibrary/Elegoo PLA Matte" + "OFQbjX3s": [ + "OrcaFilamentLibrary/FILL3D PETG" ], "OFR8dTVW": [ "FLSun/FLSun S1 PLA High Speed" @@ -6108,18 +4090,30 @@ "OFRR8LUh": [ "Flashforge/Generic ASA" ], - "OFRS2Ggt": [ - "OrcaFilamentLibrary/Generic PP-CF" - ], "OFRgDMDJ": [ "Flashforge/Flashforge PETG Transparent" ], + "OFRiFnfQ": [ + "OrcaFilamentLibrary/Eolas Prints PETG Transition" + ], + "OFRiYgMK": [ + "OrcaFilamentLibrary/Panchroma PLA Celestial" + ], + "OFRzR5mi": [ + "OrcaFilamentLibrary/eSUN ePLA-LW" + ], "OFS1ekCg": [ "Ratrig/RatRig BigNozzle PCTG" ], + "OFS2tn6G": [ + "OrcaFilamentLibrary/Fiberon PA612-CF" + ], "OFS3HrR1": [ "InfiMech/Other PLA" ], + "OFS8lTQt": [ + "OrcaFilamentLibrary/Panchroma PLA Silk" + ], "OFSCm6pJ": [ "Elegoo/Elegoo PET-CF" ], @@ -6138,8 +4132,15 @@ "OFSpTWdv": [ "InfiMech/Other PA-CF" ], - "OFT3TqB6": [ - "OrcaFilamentLibrary/Elas ASA" + "OFSwbBWS": [], + "OFTGHyNC": [ + "OrcaFilamentLibrary/Bambu PLA Impact" + ], + "OFTOPcx0": [ + "OrcaFilamentLibrary/Eolas Prints TPU Transition" + ], + "OFTRZ8Y4": [ + "OrcaFilamentLibrary/Bambu PETG-CF" ], "OFTa6gPH": [ "Flashforge/Flashforge PLA Pro" @@ -6150,6 +4151,12 @@ "OFTbsWVg": [ "Artillery/Artillery TPU" ], + "OFTcE0nA": [ + "OrcaFilamentLibrary/eSUN PLA-Basic" + ], + "OFTlRzpe": [ + "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" + ], "OFToBodi": [ "Qidi/QIDI ABS Rapido Metal" ], @@ -6159,39 +4166,69 @@ "OFTszIHE": [ "Creality/Creality Generic PLA Silk" ], + "OFU1zPxE": [ + "OrcaFilamentLibrary/Elegoo PLA Galaxy" + ], "OFUJw3Lx": [ "Qidi/QIDI PEBA 95A" ], "OFUYjPc4": [ "Dremel/Dremel Generic PLA" ], + "OFUanySo": [ + "OrcaFilamentLibrary/Bambu PLA Silk+" + ], "OFUkpobY": [ "Qidi/QIDI PAHT-CF" ], "OFUqBrgf": [ "Chuanying/Chuanying Generic TPU" ], + "OFUyDDNv": [ + "OrcaFilamentLibrary/Elegoo PC" + ], "OFV1szQh": [ "Peopoly/Peopoly Lancer PETG-C" ], "OFV4hD1o": [ "Qidi/QIDI PLA Rapido Metal" ], + "OFV5tNw6": [ + "OrcaFilamentLibrary/Elegoo PET-CF" + ], "OFVBNoov": [ "InfiMech/InfiMech ABS" ], + "OFVBlUFH": [], + "OFVCkX5w": [ + "OrcaFilamentLibrary/Bambu TPU 95A" + ], "OFVJXE4n": [ "FlyingBear/Other ABS" ], - "OFVLuVmD": [ - "OrcaFilamentLibrary/Elegoo Rapid PETG" - ], "OFVhG0yM": [ "Qidi/QIDI ABS Odorless" ], + "OFVptRxp": [ + "BBL/COEX TPE 30D", + "OrcaFilamentLibrary/COEX TPE 30D" + ], + "OFW29a9R": [ + "OrcaFilamentLibrary/PolyTerra PLA", + "Snapmaker/PolyTerra PLA" + ], "OFW8UdlP": [ "Qidi/QIDI ABS Rapido" ], + "OFWTRJ1K": [ + "OrcaFilamentLibrary/FilAr PLA Bronce" + ], + "OFWYtgCa": [ + "OrcaFilamentLibrary/Elegoo PLA Wood" + ], + "OFWbdGsC": [ + "OrcaFilamentLibrary/Generic PLA-CF" + ], "OFWkCAdc": [ "Qidi/QIDI PETG Tough 0.2 nozzle" ], @@ -6201,57 +4238,94 @@ "OFWv6JYn": [ "Flashforge/Flashforge PLA Metal" ], + "OFWwF7K7": [ + "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" + ], "OFWyCd0Y": [ "Qidi/QIDI Support For PET/PA" ], + "OFX0ycRQ": [ + "OrcaFilamentLibrary/Fiberon PA12-CF" + ], "OFXA8vy9": [ "Artillery/Artillery PLA Basic+" ], + "OFXCBZTA": [ + "OrcaFilamentLibrary/Eolas Prints ABS" + ], + "OFXIbw5D": [ + "OrcaFilamentLibrary/Bambu PLA Matte" + ], "OFXNO5Of": [ "Qidi/QIDI PLA Rapido 0.2 nozzle" ], "OFXQX0tr": [ "Ratrig/RatRig PunkFil PETG CF" ], + "OFXTPuqV": [ + "OrcaFilamentLibrary/Elas PETG Basic" + ], "OFXcfTEb": [ "Qidi/Tinmorry PETG-ECO" ], "OFXfgh61": [ "Prusa/Prusa Generic PA-CF" ], + "OFXkm8q1": [ + "OrcaFilamentLibrary/Generic PP-CF" + ], "OFXkwkn6": [ "Qidi/QIDI PA-Ultra" ], - "OFXmQgno": [ - "OrcaFilamentLibrary/eSUN PLA-Marble" - ], "OFXv4FUi": [ "Flashforge/Flashforge PLA Galaxy" ], + "OFXz7Mwx": [ + "OrcaFilamentLibrary/Elegoo PLA Silk" + ], + "OFXzQ4yL": [ + "OrcaFilamentLibrary/Bambu ASA-Aero" + ], "OFY1U4uM": [ "Sovol/Sovol SV08 TPU" ], + "OFY9muEs": [ + "Custom/Generic ABS", + "OrcaFilamentLibrary/Generic ABS", + "Sovol/Generic ABS" + ], "OFYG2Gfy": [ "Afinia/Afinia ABS+" ], + "OFYGbPHX": [ + "OrcaFilamentLibrary/PolyLite Dual PLA" + ], "OFYH00jV": [ "Qidi/QIDI ABS-GF" ], "OFYICbI4": [ "Flashforge/FusRock Generic PAHT-CF" ], + "OFYPdQJh": [ + "OrcaFilamentLibrary/Generic PETG", + "Sovol/Generic PETG" + ], "OFYRS7GZ": [ "Flashforge/Generic TPU-95A" ], "OFYZs7dN": [ "Flashforge/Flashforge Generic HS PLA" ], + "OFYd5uS3": [], "OFYehFGr": [ "Ratrig/RatRig BigNozzle TPU" ], "OFYfZgxU": [ "FlyingBear/FlyingBear TPU" ], + "OFZ4QbfK": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" + ], "OFZAkPHG": [ "Qidi/QIDI PPS-GF" ], @@ -6261,9 +4335,6 @@ "OFZcrV9c": [ "Flashforge/Flashforge PPS-CF" ], - "OFZhdVnP": [ - "OrcaFilamentLibrary/eSUN PLA-Basic" - ], "OFZjZ1k7": [ "Creality/Creality HF Generic PLA" ], @@ -6273,12 +4344,27 @@ "OFa6L3Of": [ "Qidi/Qidi PC-ABS-FR" ], + "OFaDOaNt": [ + "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" + ], + "OFaEesXQ": [ + "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" + ], "OFaKIoH2": [ "Elegoo/Elegoo PLA Sparkle" ], "OFaKZ6JI": [ "Anycubic/Generic PETG Basic" ], + "OFaQMgRH": [ + "OrcaFilamentLibrary/Bambu PLA Tough" + ], + "OFaYz8iE": [ + "OrcaFilamentLibrary/Elas PLA Pro" + ], + "OFausr3F": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rosa" + ], "OFaxQnfz": [ "Cubicon/Cubicon PC" ], @@ -6288,33 +4374,59 @@ "OFbK5wve": [ "Prusa/Prusa Generic TPU HF" ], + "OFbP8zEO": [ + "OrcaFilamentLibrary/Eolas Prints PLA Silk" + ], "OFbS9rjH": [ "Qidi/QIDI PETG Rapido" ], "OFbYP6Wb": [ "Elegoo/Elegoo PLA Marble" ], - "OFbgt3u3": [ - "OrcaFilamentLibrary/Elas PLA Basic" - ], "OFc2SnEp": [ "Artillery/Artillery PVA" ], + "OFc3xdm9": [ + "OrcaFilamentLibrary/Overture PLA" + ], "OFcZZWnB": [ "Cubicon/Cubicon ABS-A100" ], "OFceJcLf": [ "Qidi/PolyLite PLA" ], + "OFcfQk4h": [ + "BBL/Overture Air PLA", + "OrcaFilamentLibrary/Overture Air PLA" + ], "OFcqs5g7": [ "Elegoo/Elegoo PLA Translucent2" ], "OFcsHCy4": [ "Sovol/Sovol SV08 PLA" ], + "OFcvKkrs": [ + "BBL/Overture TPU", + "OrcaFilamentLibrary/Overture TPU" + ], "OFcy60o4": [ "Flashforge/Flashforge ASA Basic" ], + "OFcytyoA": [ + "OrcaFilamentLibrary/Fiberon PETG-ESD" + ], + "OFd0Fv0k": [ + "OrcaFilamentLibrary/Generic PE-CF" + ], + "OFd2vX0G": [ + "BBL/COEX PLA PRIME", + "OrcaFilamentLibrary/COEX PLA PRIME" + ], + "OFd4zw5l": [ + "BBL/AliZ PA-CF", + "OrcaFilamentLibrary/AliZ PA-CF" + ], + "OFdI4zMo": [], "OFdLGn0R": [ "Creality/Creality Generic PLA Wood" ], @@ -6324,9 +4436,15 @@ "OFdSGkUG": [ "Anycubic/Anycubic PETG" ], + "OFdb8YNz": [ + "OrcaFilamentLibrary/FilAr PLA Verde Manzana" + ], "OFdhVJql": [ "Flashforge/Flashforge PLA Buint Ti" ], + "OFdzlrhi": [ + "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" + ], "OFeFRwST": [ "Flashforge/Flashforge PVA" ], @@ -6339,8 +4457,12 @@ "OFefhSuj": [ "InfiMech/InfiMech PLA Hyper" ], - "OFenGPBR": [ - "OrcaFilamentLibrary/Elegoo PETG Translucent" + "OFesA6rF": [ + "Flashforge/Generic PLA Silk", + "OrcaFilamentLibrary/Generic PLA Silk" + ], + "OFexaZU2": [ + "OrcaFilamentLibrary/FilAr PLA Manteca" ], "OFeybQvK": [ "Qidi/QIDI ABS Rapido 0.2 nozzle" @@ -6351,12 +4473,24 @@ "OFf2b9wu": [ "Anycubic/Anycubic ABS" ], - "OFfB1QKi": [ - "OrcaFilamentLibrary/Generic PETG HF" + "OFf5awy4": [ + "OrcaFilamentLibrary/Eolas Prints PLA Matte" + ], + "OFf6mfQO": [ + "OrcaFilamentLibrary/Bambu Support for ABS" + ], + "OFfBpSRI": [ + "OrcaFilamentLibrary/Bambu ASA" + ], + "OFfJSCzm": [ + "OrcaFilamentLibrary/FDplast PETG" ], "OFfJoIgg": [ "Qidi/QIDI PAHT-GF" ], + "OFfZcoKr": [ + "OrcaFilamentLibrary/FilAr PLA-mate Piel" + ], "OFfdxQok": [ "Qidi/Generic PLA+" ], @@ -6367,15 +4501,42 @@ "OFfkPhrJ": [ "Creality/Creality HF Generic Speed PLA" ], + "OFfmZrI3": [ + "OrcaFilamentLibrary/FDplast TPU" + ], + "OFfnXFie": [ + "BBL/COEX TPE 40D", + "OrcaFilamentLibrary/COEX TPE 40D" + ], "OFfoA8kJ": [ "CoLiDo/CoLiDo PLA" ], + "OFfq5YXA": [ + "OrcaFilamentLibrary/Valment PLA-CF" + ], + "OFfr4XNO": [ + "BBL/COEX TPE 60D", + "OrcaFilamentLibrary/COEX TPE 60D" + ], "OFftQOek": [ "Flashforge/Flashforge PLA Matte" ], + "OFfuhviw": [ + "OrcaFilamentLibrary/Elegoo PLA Marble" + ], "OFg4N6ZL": [ "FlyingBear/FlyingBear PETG" ], + "OFg57Nmc": [ + "OrcaFilamentLibrary/Bambu PC FR" + ], + "OFg8hMzT": [ + "OrcaFilamentLibrary/FILL3D PPCF" + ], + "OFg8ndtj": [ + "Custom/Generic PA", + "OrcaFilamentLibrary/Generic PA" + ], "OFgJX0Fc": [ "Flashforge/FlashForge PPS" ], @@ -6385,15 +4546,25 @@ "OFgMGSpF": [ "Sovol/Sovol SV06 Plus ACE PETG" ], + "OFgMWJ8T": [ + "OrcaFilamentLibrary/FilAr PLA Negro Azabache" + ], "OFgNzLVh": [ "Sovol/Sovol Zero ABS" ], "OFgSK1hL": [ "Anycubic/Anycubic PLA High Speed" ], + "OFgbpcy9": [ + "OrcaFilamentLibrary/Generic TPU", + "Sovol/Generic TPU" + ], "OFglpvEE": [ "Sovol/Sovol SV06 ACE TPU" ], + "OFgpLTMR": [ + "OrcaFilamentLibrary/FilAr PETG Gris Plata" + ], "OFgrGfPy": [ "Anycubic/Anycubic PLA+" ], @@ -6403,18 +4574,52 @@ "OFh5GUhZ": [ "Elegoo/Elegoo PLA Wood" ], + "OFhASRWj": [ + "OrcaFilamentLibrary/Panchroma PLA Temp Shift" + ], "OFhKNHC8": [ "Elegoo/Generic PETG PRO" ], + "OFhMO9Kh": [ + "OrcaFilamentLibrary/GreenGate3D PETG" + ], + "OFhQfUQY": [ + "OrcaFilamentLibrary/Generic SBS" + ], + "OFhWc5Bv": [ + "OrcaFilamentLibrary/NIT ABS" + ], + "OFhWhL1i": [ + "OrcaFilamentLibrary/Eolas Prints PETG" + ], + "OFhcYzR8": [ + "OrcaFilamentLibrary/Elegoo PLA Sparkle" + ], + "OFhfd722": [ + "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A" + ], + "OFhlCNqq": [ + "BBL/COEX PLA", + "OrcaFilamentLibrary/COEX PLA" + ], + "OFhuaUQB": [ + "OrcaFilamentLibrary/Bambu ABS" + ], "OFhzHd2Y": [ "Flashforge/Flashforge HIPS" ], "OFi1ocNv": [ "Flashforge/Flashforge PA" ], + "OFiDpM1B": [ + "OrcaFilamentLibrary/FilAr PLA-mate Bordo" + ], "OFiJYDPC": [ "Qidi/HATCHBOX PLA" ], + "OFiWaoqD": [ + "OrcaFilamentLibrary/DREMC PPA-CF" + ], "OFic2uNr": [ "Sovol/Sovol SV06 ACE PLA" ], @@ -6427,12 +4632,24 @@ "OFiyGNbI": [ "Elegoo/Elegoo PETG-CF" ], + "OFj3bTjw": [ + "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" + ], "OFjFPhUC": [ "Prusa/Prusament rPLA" ], + "OFjPXrXO": [ + "OrcaFilamentLibrary/Elegoo PLA Glow" + ], + "OFjT9PkZ": [ + "OrcaFilamentLibrary/FilAr PLA Tabaco" + ], "OFjZw7k1": [ "Snapmaker/PolyTerra J1 PLA" ], + "OFjb0wos": [ + "OrcaFilamentLibrary/Panchroma PLA Metallic" + ], "OFjdTQd6": [ "Anycubic/Anycubic PLA Silk" ], @@ -6445,9 +4662,15 @@ "OFjohFkg": [ "Qidi/QIDI PETG Translucent" ], + "OFjorDcx": [ + "OrcaFilamentLibrary/FDplast ABS" + ], "OFjqPjjl": [ "Flashforge/Generic PET" ], + "OFjt9en1": [ + "OrcaFilamentLibrary/Generic CoPE" + ], "OFjurQ3I": [ "Sovol/Sovol Zero PETG" ], @@ -6457,6 +4680,15 @@ "OFk6T5YH": [ "Sovol/Sovol Zero PETG HS Nozzle" ], + "OFk8t9mz": [ + "OrcaFilamentLibrary/Fiberon PETG-rCF" + ], + "OFkGvN4d": [ + "OrcaFilamentLibrary/FilAr PLA Verde Pixel" + ], + "OFkOviHk": [ + "OrcaFilamentLibrary/Fiberon PA6-CF" + ], "OFkaDtKx": [ "Flashforge/Flashforge PA66-CF" ], @@ -6466,12 +4698,24 @@ "OFkfK62J": [ "Elegoo/Elegoo PLA Silk" ], + "OFkhhUS0": [ + "OrcaFilamentLibrary/Elegoo Rapid PLA+" + ], "OFklg4aM": [ "Elegoo/Elegoo PLA PRO" ], + "OFknl9Iz": [ + "OrcaFilamentLibrary/Bambu ABS-GF" + ], + "OFkoLUtR": [ + "OrcaFilamentLibrary/FilAr PLA Verde Oliva" + ], "OFkoT6jl": [ "Prusa/Prusament PLA" ], + "OFkzr35f": [ + "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" + ], "OFlN56xW": [ "Chuanying/Chuanying Generic PLA-Silk", "Chuanying/Chuanying PLA-SILK" @@ -6479,39 +4723,78 @@ "OFlNKZLP": [ "Flashforge/Flashforge PLA Metal" ], + "OFlP3KWq": [ + "OrcaFilamentLibrary/Elegoo PETG HF" + ], + "OFlSNkhc": [ + "OrcaFilamentLibrary/Eolas Prints ASA" + ], "OFlbn4FY": [ "Snapmaker/Snapmaker PLA Matte" ], + "OFln72PT": [ + "OrcaFilamentLibrary/Elegoo PLA-CF" + ], + "OFlsTpJG": [ + "OrcaFilamentLibrary/Elegoo PC-FR" + ], + "OFlwmqrC": [ + "OrcaFilamentLibrary/Polymaker HT-PLA-GF" + ], "OFlxnxDx": [ "Tiertime/Tiertime Generic SBS" ], "OFlzQ0IS": [ "Peopoly/Peopoly Lancer PET-CF" ], + "OFm06H6V": [ + "OrcaFilamentLibrary/Elegoo PLA Basic" + ], "OFm1VZed": [ "Flashforge/Flashforge Generic PLA-CF" ], "OFmF1xL9": [ "Qidi/QIDI ASA-CF" ], + "OFmJAd3A": [ + "OrcaFilamentLibrary/FDplast HIPS" + ], "OFmKNi3f": [ "Qidi/QIDI PLA Rapido" ], "OFmOWC74": [ "Elegoo/Elegoo PETG PRO" ], + "OFmY0l6t": [ + "OrcaFilamentLibrary/Generic PLA Matte" + ], + "OFmaeU4a": [ + "OrcaFilamentLibrary/FilAr PLA-mate Naranja" + ], "OFmcJsqt": [ "InfiMech/InfiMech TPU" ], "OFmduKVr": [ "Flashforge/FlashForge PPS-CF" ], - "OFmeQjRP": [ - "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" - ], "OFmgesco": [ "Flashforge/Flashforge TPU 65D" ], + "OFmhJs5V": [ + "OrcaFilamentLibrary/Elegoo TPU 95A" + ], + "OFmn9NZL": [ + "OrcaFilamentLibrary/FusRock ABS-GF" + ], + "OFmpMwxS": [ + "OrcaFilamentLibrary/Generic PLA High Speed" + ], + "OFmveLWz": [ + "OrcaFilamentLibrary/Elegoo PETG-GF" + ], + "OFn1QaY3": [ + "OrcaFilamentLibrary/Elegoo PLA Translucent2" + ], "OFnLnZQo": [ "Cubicon/Cubicon PC" ], @@ -6524,6 +4807,15 @@ "OFnY9ovF": [ "Artillery/Artillery PA-CF" ], + "OFnYVFk2": [ + "OrcaFilamentLibrary/FilAr PLA Azul Francia" + ], + "OFnejEt4": [ + "OrcaFilamentLibrary/FilAr PETG Cian" + ], + "OFniMuTN": [ + "OrcaFilamentLibrary/Bambu PA6-CF" + ], "OFnj7bPm": [ "Qidi/QIDI ABS Rapido 0.6 nozzle" ], @@ -6533,6 +4825,10 @@ "OFnyirh9": [ "Artillery/Artillery PLA Silk" ], + "OFo2UF2C": [ + "Flashforge/Generic BVOH", + "OrcaFilamentLibrary/Generic BVOH" + ], "OFo4VB3w": [ "Elegoo/Generic ABS-CF" ], @@ -6545,27 +4841,61 @@ "OFoJUGj6": [ "Flashforge/Flashforge HS PLA" ], + "OFoSknDB": [ + "OrcaFilamentLibrary/FILL3D PLA Turbo" + ], + "OFoYSJKi": [ + "OrcaFilamentLibrary/Generic PETG-CF" + ], + "OFobDOW5": [ + "OrcaFilamentLibrary/Elegoo ASA" + ], + "OFocyw69": [ + "BBL/AliZ PETG", + "OrcaFilamentLibrary/AliZ PETG" + ], + "OFoiVqVM": [ + "OrcaFilamentLibrary/Bambu PLA Basic" + ], "OFoimrpo": [ "Flashforge/Flashforge PETG-CF" ], + "OFovEIbw": [ + "OrcaFilamentLibrary/Bambu PETG HF" + ], "OFp8lkYD": [ "Flashforge/Flashforge PPA-GF" ], "OFp90N8a": [ "Artillery/Artillery PA" ], + "OFpBlrvY": [ + "OrcaFilamentLibrary/Valment PLA Silk" + ], "OFpHq9gJ": [ "Prusa/Prusament PETG" ], + "OFpPGSKG": [ + "OrcaFilamentLibrary/SUNLU Silk PLA+" + ], + "OFpW4gdi": [ + "OrcaFilamentLibrary/SUNLU PLA Matte" + ], "OFphFSUJ": [ "Prusa/Prusa Generic PETG HF" ], - "OFpwg2Qh": [ - "OrcaFilamentLibrary/Elegoo ASA-CF" - ], "OFq6IhFg": [ "Cubicon/Cubicon PLA" ], + "OFq8gfS4": [ + "OrcaFilamentLibrary/FilAr PETG Negro Azabache" + ], + "OFqGRZyH": [ + "OrcaFilamentLibrary/Numakers PLA+" + ], + "OFqINlYj": [ + "OrcaFilamentLibrary/eSUN PLA+" + ], "OFqPp2yL": [ "Qidi/QIDI PETG Tough 0.6 nozzle" ], @@ -6575,38 +4905,59 @@ "OFqSTJ3I": [ "OrcaArena/OrcaArena Generic PLA Silk" ], - "OFqh1Ngp": [ - "OrcaFilamentLibrary/Elegoo PLA-CF" - ], "OFqkcvDI": [ "Peopoly/Peopoly Lancer ABS-GF" ], + "OFqtx549": [ + "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" + ], + "OFqw2PQA": [ + "OrcaFilamentLibrary/Panchroma CoPE" + ], "OFqyIUDi": [ "Qidi/Qidi PLA-CF" ], + "OFrFBEfd": [ + "OrcaFilamentLibrary/Eolas Prints PLA Neon" + ], + "OFrKLeE3": [ + "OrcaFilamentLibrary/Bambu PLA Metal" + ], + "OFrOh600": [ + "OrcaFilamentLibrary/Panchroma PLA Matte" + ], "OFrbbq6E": [ "InfiMech/Other PLA Hyper" ], - "OFrgQ1Ns": [ - "OrcaFilamentLibrary/Elas PLA Pro" + "OFryjl35": [ + "OrcaFilamentLibrary/Elegoo ASA-CF" ], "OFs1CbB1": [ "Qidi/QIDI PLA Rapido 0.8 nozzle" ], - "OFs6lLH7": [ - "OrcaFilamentLibrary/Elegoo PLA Silk" + "OFsB2lxm": [ + "OrcaFilamentLibrary/Elegoo PLA Matte" ], "OFsCOJv7": [ "Anycubic/Generic TPU" ], - "OFsKqcQW": [ - "OrcaFilamentLibrary/Elegoo PLA PRO" + "OFsDXRpS": [ + "OrcaFilamentLibrary/FilAr PLA Piel" + ], + "OFsFon5l": [ + "OrcaFilamentLibrary/Generic HIPS" + ], + "OFsHSVZc": [ + "OrcaFilamentLibrary/Bambu Support W" ], "OFsLkLw6": [ "Elegoo/Generic PLA Matte" ], - "OFsNZcid": [ - "OrcaFilamentLibrary/PolyLite Dual PLA" + "OFsRDvTM": [ + "OrcaFilamentLibrary/Panchroma PLA" + ], + "OFsXQXbs": [ + "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" ], "OFsgANe3": [ "Flashforge/Flashforge PAHT-CF" @@ -6614,12 +4965,18 @@ "OFsmPFwh": [ "Sovol/Sovol SV06 Plus ACE TPU" ], + "OFsoykbm": [ + "OrcaFilamentLibrary/DREMC PA6-CF" + ], "OFt1YdX8": [ "FLSun/FLSun T1 PLA Silk" ], "OFt5bvKK": [ "Artillery/Artillery PETG Basic" ], + "OFt6e0US": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" + ], "OFt9AiN5": [ "Flashforge/Polymaker CoPA" ], @@ -6632,12 +4989,20 @@ "OFtL05hE": [ "Sovol/Sovol Zero PLA Basic HS Nozzle" ], + "OFtOoWIj": [], + "OFtRn8X8": [ + "OrcaFilamentLibrary/FDplast SBS" + ], "OFtXBjvb": [ "Artillery/Artillery PLA Tough" ], + "OFtcKVgP": [], "OFtcTs1o": [ "Ratrig/RatRig BigNozzle ABS" ], + "OFtefokm": [ + "OrcaFilamentLibrary/FilAr PLA-mate Blanco" + ], "OFtemzzw": [ "Sovol/Sovol SV06 ACE ABS" ], @@ -6650,9 +5015,22 @@ "OFtmT4Nd": [ "Artillery/Artillery ASA" ], + "OFtpXCCv": [ + "BBL/COEX ASA PRIME", + "OrcaFilamentLibrary/COEX ASA PRIME" + ], + "OFtr8eZw": [ + "OrcaFilamentLibrary/FDplast PLA" + ], + "OFtudokz": [ + "OrcaFilamentLibrary/Eolas Prints PLA Premium" + ], "OFtwA91m": [ "Sovol/Sovol Zero PC" ], + "OFu1evlr": [ + "OrcaFilamentLibrary/Generic PCTG" + ], "OFuPC4S8": [ "Elegoo/Elegoo PLA-CF" ], @@ -6662,24 +5040,34 @@ "OFuTFxVP": [ "Qidi/Overture ABS" ], + "OFuUuIhR": [ + "OrcaFilamentLibrary/Elegoo PETG-CF" + ], + "OFuWCQXN": [ + "BBL/COEX ABS PRIME", + "OrcaFilamentLibrary/COEX ABS PRIME" + ], "OFuXkYly": [ "Elegoo/Elegoo PLA Glow" ], "OFuYvNS3": [ "Afinia/Afinia Value ABS" ], + "OFufTAK9": [ + "OrcaFilamentLibrary/FilAr PLA-mate Negro" + ], "OFuidAEg": [ "Qidi/Bambu ABS" ], "OFuq9tqb": [ "InfiMech/InfiMech PLA Basic" ], + "OFurdQxc": [ + "OrcaFilamentLibrary/FilAr PETG Magenta" + ], "OFuswXlp": [ "Flashforge/Generic TPU 85A" ], - "OFutwD6f": [ - "OrcaFilamentLibrary/Elegoo PLA Glow" - ], "OFuyJhLF": [ "Flashforge/Flashforge PETG Basic" ], @@ -6692,21 +5080,40 @@ "OFvGSn0l": [ "Creality/Creality Generic PETG-CF" ], + "OFvKUnLh": [ + "OrcaFilamentLibrary/Bambu TPU 95A HF" + ], "OFvN3117": [ "Qidi/QIDI PLA Matte Basic" ], "OFvOhSjO": [ "FlyingBear/Other TPU" ], + "OFvPPMxL": [ + "OrcaFilamentLibrary/FilAr PLA Verde FilAr" + ], + "OFvTVZc3": [ + "BBL/COEX PETG", + "OrcaFilamentLibrary/COEX PETG" + ], + "OFvVy7yo": [ + "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant" + ], "OFvYfHPB": [ "Anycubic/Anycubic PLA Matte" ], "OFvaXhYD": [ "InfiMech/InfiMech PETG" ], + "OFvgE0Zh": [ + "OrcaFilamentLibrary/Elegoo PLA" + ], "OFviQ9lH": [ "Flashforge/Flashforge Generic TPU" ], + "OFvrXuV7": [ + "OrcaFilamentLibrary/PolyLite ASA" + ], "OFvsS7Fb": [ "Flashforge/Generic TPU-64D" ], @@ -6716,6 +5123,9 @@ "OFvxvkAd": [ "Artillery/Artillery PLA-CF" ], + "OFvzvwCu": [ + "OrcaFilamentLibrary/Eolas Prints PLA High Speed" + ], "OFw05rkF": [ "InfiMech/Other PETG" ], @@ -6725,21 +5135,44 @@ "OFw1S8lL": [ "Artillery/Artillery ABS" ], - "OFw4OHWE": [ - "OrcaFilamentLibrary/Elas PETG Basic" - ], "OFwHPTvy": [ "Qidi/Qidi Generic PLA+" ], + "OFwJ0qu2": [], + "OFwPrlCM": [ + "OrcaFilamentLibrary/Bambu PETG Translucent" + ], + "OFwRJ4g0": [ + "OrcaFilamentLibrary/NIT PLA" + ], + "OFwaYjL6": [ + "OrcaFilamentLibrary/Fiberon PA6-GF" + ], "OFwf0oWp": [ "Flashforge/Flashforge PLA Luminous" ], + "OFwu7IAG": [ + "BBL/COEX PCTG PRIME", + "OrcaFilamentLibrary/COEX PCTG PRIME" + ], "OFwyqcGn": [ "Elegoo/Elegoo PLA Matte" ], + "OFx8Lmsd": [ + "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" + ], + "OFxA1p01": [ + "OrcaFilamentLibrary/Overture PLA Pro" + ], "OFxLeRyT": [ "Prusa/Prusa Generic PVA HF" ], + "OFxOHhZw": [ + "OrcaFilamentLibrary/Elegoo ABS" + ], + "OFxUwUeW": [ + "OrcaFilamentLibrary/SUNLU PLA Marble" + ], "OFxVzzn4": [ "Chuanying/Chuanying Generic PLA-CF10" ], @@ -6764,18 +5197,28 @@ "OFyD1Zo8": [ "InfiMech/Other PC" ], + "OFybzvQN": [ + "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" + ], "OFyoW5W2": [ "Flashforge/Flashforge PLA Color Change" ], "OFypQeKR": [ "Elegoo/Generic PC-CF" ], + "OFysxCep": [ + "OrcaFilamentLibrary/FilAr PETG Coral" + ], "OFyt23xJ": [ "FLSun/FLSun T1 PLA High Speed" ], "OFyxAbO4": [ "Flashforge/Flashforge TPU-95A" ], + "OFyxayW4": [ + "BBL/AliZ PLA", + "OrcaFilamentLibrary/AliZ PLA" + ], "OFzFbFcl": [ "Elegoo/Elegoo PC-FR" ], @@ -6788,352 +5231,20 @@ "OFziUL2X": [ "Ginger Additive/Ginger Generic PLA" ], - "OFzrWlH5": [ - "OrcaFilamentLibrary/Elegoo PETG HF" - ], - "OGFA00": [ - "OrcaFilamentLibrary/Bambu PLA Basic" - ], - "OGFA01": [ - "OrcaFilamentLibrary/Bambu PLA Matte" - ], - "OGFA02": [ - "OrcaFilamentLibrary/Bambu PLA Metal" - ], - "OGFA03": [ - "OrcaFilamentLibrary/Bambu PLA Impact" - ], - "OGFA05": [ - "OrcaFilamentLibrary/Bambu PLA Silk" - ], - "OGFA06": [ - "OrcaFilamentLibrary/Bambu PLA Silk+" - ], - "OGFA07": [ - "OrcaFilamentLibrary/Bambu PLA Marble" - ], - "OGFA08": [ - "OrcaFilamentLibrary/Bambu PLA Sparkle" - ], - "OGFA09": [ - "OrcaFilamentLibrary/Bambu PLA Tough" - ], - "OGFA11": [ - "OrcaFilamentLibrary/Bambu PLA Aero" - ], - "OGFA12": [ - "OrcaFilamentLibrary/Bambu PLA Glow" - ], - "OGFA13": [ - "OrcaFilamentLibrary/Bambu PLA Dynamic" - ], - "OGFA15": [ - "OrcaFilamentLibrary/Bambu PLA Galaxy" - ], - "OGFA16": [ - "OrcaFilamentLibrary/Bambu PLA Wood" - ], - "OGFA50": [ - "OrcaFilamentLibrary/Bambu PLA-CF" - ], - "OGFB00": [ - "OrcaFilamentLibrary/Bambu ABS" - ], - "OGFB01": [ - "OrcaFilamentLibrary/Bambu ASA" - ], - "OGFB02": [ - "OrcaFilamentLibrary/Bambu ASA-Aero" - ], - "OGFB50": [ - "OrcaFilamentLibrary/Bambu ABS-GF" - ], - "OGFB51": [ - "OrcaFilamentLibrary/Bambu ASA-CF" - ], - "OGFB60": [ - "OrcaFilamentLibrary/PolyLite ABS" - ], - "OGFB61": [ - "OrcaFilamentLibrary/PolyLite ASA" - ], - "OGFB98": [ - "Custom/Generic ASA", - "OrcaFilamentLibrary/Generic ASA" - ], - "OGFB99": [ - "Custom/Generic ABS", - "OrcaFilamentLibrary/Generic ABS", - "Sovol/Generic ABS" - ], - "OGFC00": [ - "OrcaFilamentLibrary/Bambu PC" - ], - "OGFC01": [ - "OrcaFilamentLibrary/Bambu PC FR" - ], - "OGFC99": [ - "OrcaFilamentLibrary/Generic PC", - "Sovol/Generic PC" - ], - "OGFG00": [ - "OrcaFilamentLibrary/Bambu PETG Basic" - ], - "OGFG01": [ - "OrcaFilamentLibrary/Bambu PETG Translucent" - ], - "OGFG02": [ - "OrcaFilamentLibrary/Bambu PETG HF" - ], - "OGFG50": [ - "OrcaFilamentLibrary/Bambu PETG-CF" - ], - "OGFG60": [ - "OrcaFilamentLibrary/PolyLite PETG" - ], - "OGFG97": [ - "OrcaFilamentLibrary/Generic PCTG" - ], - "OGFG99": [ - "OrcaFilamentLibrary/Generic PETG", - "Sovol/Generic PETG" - ], - "OGFGG300": [ - "OrcaFilamentLibrary/GreenGate3D PETG" - ], - "OGFL00": [ - "OrcaFilamentLibrary/PolyLite PLA" - ], - "OGFL00-1": [ - "OrcaFilamentLibrary/PolyTerra Dual PLA" - ], - "OGFL01": [ - "OrcaFilamentLibrary/PolyTerra PLA", - "Snapmaker/PolyTerra PLA" - ], - "OGFL03": [ - "OrcaFilamentLibrary/eSUN PLA+" - ], - "OGFL04": [ - "OrcaFilamentLibrary/Overture PLA" - ], - "OGFL05": [ - "OrcaFilamentLibrary/Overture Matte PLA" - ], - "OGFL06": [ - "OrcaFilamentLibrary/Fiberon PETG-ESD" - ], - "OGFL50": [ - "OrcaFilamentLibrary/Fiberon PA6-CF" - ], - "OGFL51": [ - "OrcaFilamentLibrary/Fiberon PA6-GF" - ], - "OGFL52": [ - "OrcaFilamentLibrary/Fiberon PA12-CF" - ], - "OGFL53": [ - "OrcaFilamentLibrary/Fiberon PA612-CF" - ], - "OGFL54": [ - "OrcaFilamentLibrary/Fiberon PET-CF" - ], - "OGFL55": [ - "OrcaFilamentLibrary/Fiberon PETG-rCF" - ], - "OGFL95": [ - "OrcaFilamentLibrary/Generic PLA High Speed" - ], - "OGFL96": [ - "Flashforge/Generic PLA Silk", - "OrcaFilamentLibrary/Generic PLA Silk", - "Sovol/Generic PLA Silk" - ], - "OGFL98": [ - "OrcaFilamentLibrary/Generic PLA-CF" - ], - "OGFL99": [ - "Flashforge/Generic PLA", - "OrcaFilamentLibrary/Generic PLA", - "Sovol/Generic PLA" - ], - "OGFLC99": [ - "OrcaFilamentLibrary/Generic CoPE" - ], - "OGFN03": [ - "OrcaFilamentLibrary/Bambu PA-CF" - ], - "OGFN04": [ - "OrcaFilamentLibrary/Bambu PAHT-CF" - ], - "OGFN05": [ - "OrcaFilamentLibrary/Bambu PA6-CF" - ], - "OGFN06": [ - "OrcaFilamentLibrary/Bambu PPA-CF" - ], - "OGFN08": [ - "OrcaFilamentLibrary/Bambu PA6-GF" - ], - "OGFN96": [ - "OrcaFilamentLibrary/Generic PPA-GF" - ], - "OGFN97": [ - "OrcaFilamentLibrary/Generic PPA-CF" - ], - "OGFN98": [ - "Custom/Generic PA-CF", - "OrcaFilamentLibrary/Generic PA-CF" - ], - "OGFN99": [ - "Custom/Generic PA", - "OrcaFilamentLibrary/Generic PA" - ], - "OGFNMK00": [ - "OrcaFilamentLibrary/Numakers PLA+" - ], - "OGFP97": [ - "OrcaFilamentLibrary/Generic PP" - ], - "OGFP99": [ - "OrcaFilamentLibrary/Generic PE" - ], - "OGFPM001": [ - "OrcaFilamentLibrary/Panchroma PLA" - ], - "OGFPM002": [ - "OrcaFilamentLibrary/Panchroma PLA Matte" - ], - "OGFPM003": [ - "OrcaFilamentLibrary/Panchroma PLA Marble" - ], - "OGFPM004": [ - "OrcaFilamentLibrary/Panchroma PLA Silk" - ], - "OGFPM005": [ - "OrcaFilamentLibrary/Panchroma PLA Satin" - ], - "OGFPM006": [ - "OrcaFilamentLibrary/Panchroma PLA Translucent" - ], - "OGFPM007": [ - "OrcaFilamentLibrary/Panchroma PLA Galaxy" - ], - "OGFPM008": [ - "OrcaFilamentLibrary/Panchroma PLA Celestial" - ], - "OGFPM009": [ - "OrcaFilamentLibrary/Panchroma PLA Starlight" - ], - "OGFPM010": [ - "OrcaFilamentLibrary/Panchroma PLA Glow" - ], - "OGFPM011": [ - "OrcaFilamentLibrary/Panchroma PLA Luminous" - ], - "OGFPM012": [ - "OrcaFilamentLibrary/Panchroma PLA Metallic" - ], - "OGFPM013": [ - "OrcaFilamentLibrary/Panchroma PLA Neon" - ], - "OGFPM014": [ - "OrcaFilamentLibrary/Panchroma PLA UV Shift" - ], - "OGFPM015": [ - "OrcaFilamentLibrary/Panchroma PLA Temp Shift" - ], - "OGFPM016": [ - "OrcaFilamentLibrary/Panchroma CoPE" - ], - "OGFPM017": [ - "OrcaFilamentLibrary/Polymaker HT-PLA" - ], - "OGFPM018": [ - "OrcaFilamentLibrary/Polymaker HT-PLA-GF" - ], - "OGFPM019": [ - "OrcaFilamentLibrary/PolyLite PLA Pro" - ], - "OGFR00": [ - "OrcaFilamentLibrary/FusRock ABS-GF" - ], - "OGFR98": [ - "OrcaFilamentLibrary/Generic PHA" - ], - "OGFR99": [ - "OrcaFilamentLibrary/Generic EVA" - ], - "OGFS00": [ - "OrcaFilamentLibrary/Bambu Support W" - ], - "OGFS01": [ - "OrcaFilamentLibrary/Bambu Support G" - ], - "OGFS02": [ - "OrcaFilamentLibrary/Bambu Support For PLA" - ], - "OGFS03": [ - "OrcaFilamentLibrary/Bambu Support For PA/PET" - ], - "OGFS04": [ + "OFzrUUxc": [], + "OFzyIxba": [ "OrcaFilamentLibrary/Bambu PVA" ], - "OGFS05": [ - "OrcaFilamentLibrary/Bambu Support For PLA/PETG" - ], - "OGFS06": [ - "OrcaFilamentLibrary/Bambu Support for ABS" - ], - "OGFS97": [ - "Flashforge/Generic BVOH", - "OrcaFilamentLibrary/Generic BVOH" - ], - "OGFS98": [ - "OrcaFilamentLibrary/Generic HIPS" - ], - "OGFS99": [ - "OrcaFilamentLibrary/Generic PVA" - ], - "OGFSNL02": [ - "OrcaFilamentLibrary/SUNLU PLA Matte" - ], - "OGFSNL03": [ - "OrcaFilamentLibrary/SUNLU PLA+" - ], - "OGFSNL04": [ - "OrcaFilamentLibrary/SUNLU PLA+ 2.0" - ], - "OGFSNL05": [ - "OrcaFilamentLibrary/SUNLU Silk PLA+" - ], - "OGFSNL06": [ - "OrcaFilamentLibrary/SUNLU PLA Marble" - ], - "OGFSNL07": [ - "OrcaFilamentLibrary/SUNLU Wood PLA" + "OGFC99": [], + "OGFG99": [], + "OGFL96": [ + "Flashforge/Generic PLA Silk", + "Sovol/Generic PLA Silk" ], + "OGFN99": [], "OGFSNL08": [ - "OrcaFilamentLibrary/SUNLU PETG", "Sovol/SUNLU PETG" ], - "OGFT01": [ - "OrcaFilamentLibrary/Bambu PET-CF" - ], - "OGFT02": [], - "OGFU00": [ - "OrcaFilamentLibrary/Bambu TPU 95A HF" - ], - "OGFU01": [ - "OrcaFilamentLibrary/Bambu TPU 95A" - ], - "OGFU99": [ - "OrcaFilamentLibrary/Generic TPU", - "Sovol/Generic TPU" - ], - "OVTABS08": [ - "OrcaFilamentLibrary/Overture ABS Basic" - ], "P1001": [ "Creality/Panchroma PLA Satin" ], @@ -7916,18 +6027,6 @@ ], "SMCFU001": [ "SeeMeCNC/SeeMeCNC TPU" - ], - "VLMNT01": [ - "OrcaFilamentLibrary/Valment PLA" - ], - "VLMNT02": [ - "OrcaFilamentLibrary/Valment PLA Silk" - ], - "VLMNT03": [ - "OrcaFilamentLibrary/Valment PLA-CF" - ], - "VLMNT04": [ - "OrcaFilamentLibrary/Valment PLA Galaxy" ] }, "instantiated_with_id": [ @@ -9500,14 +7599,26 @@ "OrcaFilamentLibrary/FilAr PLA-mate Violeta", "OrcaFilamentLibrary/Generic ABS @System", "OrcaFilamentLibrary/Generic ASA @System", + "OrcaFilamentLibrary/Generic BVOH @System", + "OrcaFilamentLibrary/Generic CoPE @System", + "OrcaFilamentLibrary/Generic EVA @System", + "OrcaFilamentLibrary/Generic HIPS @System", "OrcaFilamentLibrary/Generic PA @System", "OrcaFilamentLibrary/Generic PA-CF @System", "OrcaFilamentLibrary/Generic PC @System", + "OrcaFilamentLibrary/Generic PCTG @System", + "OrcaFilamentLibrary/Generic PE @System", "OrcaFilamentLibrary/Generic PETG @System", + "OrcaFilamentLibrary/Generic PHA @System", + "OrcaFilamentLibrary/Generic PLA @System", "OrcaFilamentLibrary/Generic PLA High Speed @System", + "OrcaFilamentLibrary/Generic PLA Silk @System", "OrcaFilamentLibrary/Generic PLA-CF @System", + "OrcaFilamentLibrary/Generic PP @System", + "OrcaFilamentLibrary/Generic PPA-CF @System", "OrcaFilamentLibrary/Generic PPA-GF @System", "OrcaFilamentLibrary/Generic PVA @System", + "OrcaFilamentLibrary/Generic SBS @System", "OrcaFilamentLibrary/Generic TPU @System", "OrcaFilamentLibrary/PolyLite PLA @System", "OrcaFilamentLibrary/PolyTerra Dual PLA @System", @@ -11442,41 +9553,6 @@ "Snapmaker PA-CF" ] ], - "AZ01-1": [ - [ - "Aliz", - "PETG-CF", - "AliZ PETG-CF" - ] - ], - "AZ01-2": [ - [ - "Aliz", - "PETG", - "AliZ PETG-Metal" - ] - ], - "AliZ001": [ - [ - "Aliz", - "PETG", - "AliZ PETG" - ] - ], - "AliZ002": [ - [ - "Aliz", - "PLA", - "AliZ PLA" - ] - ], - "AliZ003": [ - [ - "Aliz", - "PA-CF", - "AliZ PA-CF" - ] - ], "BSFI001": [ [ "Generic", @@ -11547,104 +9623,6 @@ "Blocks Generic PLA-CF" ] ], - "CX30DB20": [ - [ - "COEX 3D", - "TPU", - "COEX TPE 30D" - ] - ], - "CX40DB20": [ - [ - "COEX 3D", - "TPU", - "COEX TPE 40D" - ] - ], - "CX60AB17": [ - [ - "COEX 3D", - "TPU", - "COEX TPU 60A" - ] - ], - "CX60DB19": [ - [ - "COEX 3D", - "TPU", - "COEX TPE 60D" - ] - ], - "CXABPB09": [ - [ - "COEX 3D", - "ABS", - "COEX ABS PRIME" - ] - ], - "CXABSB01": [ - [ - "COEX 3D", - "ABS", - "COEX ABS" - ] - ], - "CXASAB04": [ - [ - "COEX 3D", - "ASA", - "COEX ASA PRIME" - ] - ], - "CXPACB23": [ - [ - "COEX 3D", - "PA-CF", - "COEX NYLEX PA6-CF" - ] - ], - "CXPAUB21": [ - [ - "COEX 3D", - "PA", - "COEX NYLEX UNFILLED" - ] - ], - "CXPCTB15": [ - [ - "COEX 3D", - "PCTG", - "COEX PCTG PRIME" - ] - ], - "CXPETB13": [ - [ - "COEX 3D", - "PETG", - "COEX PETG" - ] - ], - "CXPLAB02": [ - [ - "COEX 3D", - "PLA", - "COEX PLA" - ] - ], - "CXPLAB08": [ - [ - "COEX 3D", - "PLA", - "COEX PLA PRIME" - ] - ], - "CXPLSB03": [ - [ - "COEX 3D", - "PLA", - "COEX PLA+Silk" - ] - ], "DFL99": [ [ "Volumic", @@ -11652,102 +9630,6 @@ "Désactivé" ] ], - "DREMC001": [ - [ - "DREMC", - "PLA", - "DREMC PLA+" - ] - ], - "DREMC002": [ - [ - "DREMC", - "PETG", - "DREMC PETG" - ] - ], - "DREMC003": [ - [ - "DREMC", - "ABS", - "DREMC ABS" - ] - ], - "DREMC004": [ - [ - "DREMC", - "ABS", - "DREMC ABS+" - ] - ], - "DREMC005": [ - [ - "DREMC", - "ASA", - "DREMC ASA" - ] - ], - "DREMC006": [ - [ - "DREMC", - "PA6-CF", - "DREMC PA6-CF" - ] - ], - "DREMC007": [ - [ - "DREMC", - "PA-CF", - "DREMC PA12-CF" - ] - ], - "DREMC008": [ - [ - "DREMC", - "PET-CF", - "DREMC PET-CF" - ] - ], - "DREMC009": [ - [ - "DREMC", - "ABS-GF", - "DREMC ABS-GF" - ] - ], - "DREMC010": [ - [ - "DREMC", - "PPA-CF", - "DREMC PPA-CF" - ], - [ - "DREMC", - "TPU", - "DREMC TPU 95A" - ] - ], - "DREMC011": [ - [ - "DREMC", - "PLA", - "DREMC PLA+ HS" - ] - ], - "DREMC012": [ - [ - "DREMC", - "ASA", - "DREMC ASA CF" - ] - ], - "DREMC013": [ - [ - "DREMC", - "ASA", - "DREMC ASA GF" - ] - ], "E1001": [ [ "eSUN", @@ -11972,20 +9854,6 @@ "Elegoo PLA" ] ], - "ESN02": [ - [ - "eSUN", - "PLA-AERO", - "eSUN ePLA-LW" - ] - ], - "ESN03": [ - [ - "eSUN", - "PETG", - "eSUN PETG" - ] - ], "ETPUB00": [ [ "Elegoo", @@ -11993,48 +9861,6 @@ "Elegoo TPU" ] ], - "FDPLAST01": [ - [ - "FDplast", - "ABS", - "FDplast ABS" - ] - ], - "FDPLAST02": [ - [ - "FDplast", - "HIPS", - "FDplast HIPS" - ] - ], - "FDPLAST03": [ - [ - "FDplast", - "PETG", - "FDplast PETG" - ] - ], - "FDPLAST04": [ - [ - "FDplast", - "PLA", - "FDplast PLA" - ] - ], - "FDPLAST05": [ - [ - "FDplast", - "SBS", - "FDplast SBS" - ] - ], - "FDPLAST06": [ - [ - "FDplast", - "TPU", - "FDplast TPU" - ] - ], "FFF01": [ [ "Flashforge", @@ -12068,496 +9894,6 @@ "Flashforge Generic PLA" ] ], - "FILAR0001": [ - [ - "FilAr", - "PLA", - "FilAr PLA Bronce" - ] - ], - "FILAR0002": [ - [ - "FilAr", - "PLA", - "FilAr PLA Gris Plata" - ] - ], - "FILAR0003": [ - [ - "FilAr", - "PLA", - "FilAr PLA Cobre" - ] - ], - "FILAR0004": [ - [ - "FilAr", - "PLA", - "FilAr PLA Titanio" - ] - ], - "FILAR0005": [ - [ - "FilAr", - "PLA", - "FilAr PLA Tabaco" - ] - ], - "FILAR0006": [ - [ - "FilAr", - "PLA", - "FilAr PLA Cafe con Leche" - ] - ], - "FILAR0007": [ - [ - "FilAr", - "PLA", - "FilAr PLA Manteca" - ] - ], - "FILAR0008": [ - [ - "FilAr", - "PLA", - "FilAr PLA Marron Oxido" - ] - ], - "FILAR0009": [ - [ - "FilAr", - "PLA", - "FilAr PLA Carpincho" - ] - ], - "FILAR0010": [ - [ - "FilAr", - "PLA", - "FilAr PLA Rosa Amaranto" - ] - ], - "FILAR0011": [ - [ - "FilAr", - "PLA", - "FilAr PLA Rosa Flamenco" - ] - ], - "FILAR0012": [ - [ - "FilAr", - "PLA", - "FilAr PLA Piel" - ] - ], - "FILAR0013": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde FilAr" - ] - ], - "FILAR0014": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde Manzana" - ] - ], - "FILAR0015": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde Pixel" - ] - ], - "FILAR0016": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde Oliva" - ] - ], - "FILAR0017": [ - [ - "FilAr", - "PLA", - "FilAr PLA Blanco Antartida" - ] - ], - "FILAR0018": [ - [ - "FilAr", - "PLA", - "FilAr PLA Blanco Calido" - ] - ], - "FILAR0019": [ - [ - "FilAr", - "PLA", - "FilAr PLA Negro Azabache" - ] - ], - "FILAR0020": [ - [ - "FilAr", - "PLA", - "FilAr PLA Naranja Tigre" - ] - ], - "FILAR0021": [ - [ - "FilAr", - "PLA", - "FilAr PLA Rojo de Carreras" - ] - ], - "FILAR0022": [ - [ - "FilAr", - "PLA", - "FilAr PLA Amarillo Lirio" - ] - ], - "FILAR0023": [ - [ - "FilAr", - "PLA", - "FilAr PLA Violeta Jacaranda" - ] - ], - "FILAR0024": [ - [ - "FilAr", - "PLA", - "FilAr PLA Gris Pizarra" - ] - ], - "FILAR0025": [ - [ - "FilAr", - "PLA", - "FilAr PLA Gris Ceniza" - ] - ], - "FILAR0026": [ - [ - "FilAr", - "PLA", - "FilAr PLA Azul Francia" - ] - ], - "FILAR0027": [ - [ - "FilAr", - "PLA", - "FilAr PLA Celeste Cielo" - ] - ], - "FILAR0028": [ - [ - "FilAr", - "PLA", - "FilAr PLA Oro" - ] - ], - "FILAR0029": [ - [ - "FilAr", - "PLA", - "FilAr PLA Dorado" - ] - ], - "FILAR0030": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Amarillo" - ] - ], - "FILAR0031": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Azul" - ] - ], - "FILAR0032": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Beige" - ] - ], - "FILAR0033": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Blanco" - ] - ], - "FILAR0034": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Bordo" - ] - ], - "FILAR0035": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Celeste Cielo" - ] - ], - "FILAR0036": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Chocolate" - ] - ], - "FILAR0037": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Gris" - ] - ], - "FILAR0038": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Marron" - ] - ], - "FILAR0039": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Naranja" - ] - ], - "FILAR0040": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Negro" - ] - ], - "FILAR0041": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Piel" - ] - ], - "FILAR0042": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Rojo" - ] - ], - "FILAR0043": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Rosa" - ] - ], - "FILAR0044": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Uva" - ] - ], - "FILAR0045": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Verde" - ] - ], - "FILAR0046": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Violeta" - ] - ], - "FILAR0047": [ - [ - "FilAr", - "PETG", - "FilAr PETG Amarillo Lima" - ] - ], - "FILAR0048": [ - [ - "FilAr", - "PETG", - "FilAr PETG Amarillo Radiante" - ] - ], - "FILAR0049": [ - [ - "FilAr", - "PETG", - "FilAr PETG Azul Boreal" - ] - ], - "FILAR0050": [ - [ - "FilAr", - "PETG", - "FilAr PETG Azul Francia" - ] - ], - "FILAR0051": [ - [ - "FilAr", - "PETG", - "FilAr PETG Azul Imperial" - ] - ], - "FILAR0052": [ - [ - "FilAr", - "PETG", - "FilAr PETG Blanco Antartida" - ] - ], - "FILAR0053": [ - [ - "FilAr", - "PETG", - "FilAr PETG Cian" - ] - ], - "FILAR0054": [ - [ - "FilAr", - "PETG", - "FilAr PETG Coral" - ] - ], - "FILAR0055": [ - [ - "FilAr", - "PETG", - "FilAr PETG Cristal" - ] - ], - "FILAR0056": [ - [ - "FilAr", - "PETG", - "FilAr PETG Gris Ceniza" - ] - ], - "FILAR0057": [ - [ - "FilAr", - "PETG", - "FilAr PETG Gris Plata" - ] - ], - "FILAR0058": [ - [ - "FilAr", - "PETG", - "FilAr PETG Magenta" - ] - ], - "FILAR0059": [ - [ - "FilAr", - "PETG", - "FilAr PETG Negro Azabache" - ] - ], - "FILAR0060": [ - [ - "FilAr", - "PETG", - "FilAr PETG Rojo Carmesi" - ] - ], - "FILARB01": [ - [ - "FilAr", - "PLA", - "FilAr PLA" - ] - ], - "FILARB02": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate" - ] - ], - "FILARB03": [ - [ - "FilAr", - "PETG", - "FilAr PETG" - ] - ], - "FILL3D001": [ - [ - "FILL3D", - "PLA", - "FILL3D PLA Turbo" - ] - ], - "FILL3D002": [ - [ - "FILL3D", - "PLA", - "FILL3D PLA Basic" - ] - ], - "FILL3D003": [ - [ - "FILL3D", - "PETG", - "FILL3D PETG" - ] - ], - "FILL3D004": [ - [ - "FILL3D", - "PP", - "FILL3D PP" - ] - ], - "FILL3D005": [ - [ - "FILL3D", - "PP", - "FILL3D PPCF" - ] - ], - "FILL3D006": [ - [ - "FILL3D", - "PA", - "FILL3D PA" - ] - ], - "FILL3D007": [ - [ - "FILL3D", - "PETG-CF", - "FILL3D PETG CF" - ] - ], "GABSB00": [ [ "Generic", @@ -14599,62 +11935,6 @@ "Prusa Generic PA" ] ], - "GFOT001": [ - [ - "Overture", - "PLA", - "Overture PLA Pro" - ] - ], - "GFOT002": [ - [ - "Overture", - "PLA", - "Overture Silk PLA" - ] - ], - "GFOT003": [ - [ - "Overture", - "PLA", - "Overture Easy PLA" - ] - ], - "GFOT004": [ - [ - "Overture", - "PLA", - "Overture Rock PLA" - ] - ], - "GFOT005": [ - [ - "Overture", - "PLA", - "Overture Super PLA+" - ] - ], - "GFOT006": [ - [ - "Overture", - "PLA", - "Overture Air PLA" - ] - ], - "GFOT008": [ - [ - "Overture", - "TPU", - "Overture TPU" - ] - ], - "GFOT009": [ - [ - "Overture", - "ASA", - "Overture ASA" - ] - ], "GFP95": [ [ "Generic", @@ -15225,132 +12505,6 @@ "Prusa Generic PVA HF" ] ], - "GFSEP001": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Premium" - ] - ], - "GFSEP002": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Matte" - ] - ], - "GFSEP003": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Silk" - ] - ], - "GFSEP004": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Neon" - ] - ], - "GFSEP005": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA High Speed" - ] - ], - "GFSEP006": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA INGEO 850" - ] - ], - "GFSEP007": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA INGEO 870" - ] - ], - "GFSEP008": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Antibacterial" - ] - ], - "GFSEP009": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Transition" - ] - ], - "GFSEP010": [ - [ - "Eolas Prints", - "PETG", - "Eolas Prints PETG" - ] - ], - "GFSEP011": [ - [ - "Eolas Prints", - "PETG", - "Eolas Prints PETG UV Resistant" - ] - ], - "GFSEP012": [ - [ - "Eolas Prints", - "PETG", - "Eolas Prints PETG Transition" - ] - ], - "GFSEP013": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU Flex 93A" - ] - ], - "GFSEP014": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU Flex D53" - ] - ], - "GFSEP015": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU D60 UV Resistant" - ] - ], - "GFSEP016": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU Transition" - ] - ], - "GFSEP017": [ - [ - "Eolas Prints", - "ABS", - "Eolas Prints ABS" - ] - ], - "GFSEP018": [ - [ - "Eolas Prints", - "ASA", - "Eolas Prints ASA" - ] - ], "GFSL99": [ [ "Generic", @@ -16024,76 +13178,6 @@ "LHS TPU" ] ], - "NIT01": [ - [ - "NIT", - "ABS", - "NIT ABS" - ] - ], - "NIT02": [ - [ - "NIT", - "PLA", - "NIT PLA" - ] - ], - "NIT03": [ - [ - "NIT", - "PETG", - "NIT PETG" - ] - ], - "OEABSB00": [ - [ - "Elegoo", - "ABS", - "Elegoo ABS" - ] - ], - "OEASAB00": [ - [ - "Elegoo", - "ASA", - "Elegoo ASA" - ] - ], - "OEPAHTB0": [ - [ - "Elegoo", - "PA", - "Elegoo PAHT" - ] - ], - "OEPCB00": [ - [ - "Elegoo", - "PC", - "Elegoo PC" - ] - ], - "OEPETGB0": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG" - ] - ], - "OEPLAB00": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA" - ] - ], - "OETPUB00": [ - [ - "Elegoo", - "TPU", - "Elegoo TPU" - ] - ], "OF09vOcG": [ [ "Elegoo", @@ -16108,11 +13192,11 @@ "Snapmaker Dual TPU High-Flow" ] ], - "OF0M6QAQ": [ + "OF0NgY1y": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Galaxy" + "COEX 3D", + "PA-CF", + "COEX NYLEX PA6-CF" ] ], "OF0SyJhk": [ @@ -16136,6 +13220,13 @@ "Qidi ASA-Aero" ] ], + "OF0UJcb6": [ + [ + "Polymaker", + "PETG", + "PolyLite PETG" + ] + ], "OF0UbONm": [ [ "Generic", @@ -16150,6 +13241,13 @@ "Cubicon PETG" ] ], + "OF0Vtzaw": [ + [ + "FilAr", + "PETG", + "FilAr PETG Amarillo Radiante" + ] + ], "OF0Y5MLd": [ [ "QIDI", @@ -16157,6 +13255,41 @@ "QIDI PETG-GF" ] ], + "OF0gGRWk": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Glow" + ] + ], + "OF0h7ERL": [ + [ + "Elegoo", + "PA", + "Elegoo PAHT" + ] + ], + "OF0kCNDK": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Luminous" + ] + ], + "OF0pzFLc": [ + [ + "COEX 3D", + "PLA", + "COEX PLA+Silk" + ] + ], + "OF0wBGNx": [ + [ + "Bambu Lab", + "ASA-CF", + "Bambu ASA-CF" + ] + ], "OF0wk0Pk": [ [ "Generic", @@ -16171,13 +13304,6 @@ "QIDI PLA Rapido Silk" ] ], - "OF102WKM": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG PRO" - ] - ], "OF17cONC": [ [ "Polymaker", @@ -16185,6 +13311,27 @@ "PolyTerra Dual PLA" ] ], + "OF1N1qMK": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA UV Shift" + ] + ], + "OF1Pke8t": [ + [ + "Overture", + "PLA", + "Overture Easy PLA" + ] + ], + "OF1UNk9P": [ + [ + "Generic", + "PP", + "Generic PP" + ] + ], "OF1Zypyy": [ [ "QIDI", @@ -16192,6 +13339,13 @@ "QIDI PETG Tough" ] ], + "OF1hznGB": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA PRO" + ] + ], "OF22AxCm": [ [ "Generic", @@ -16199,6 +13353,20 @@ "Polymaker PETG" ] ], + "OF2EK9F1": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Violeta" + ] + ], + "OF2GCW1l": [ + [ + "SUNLU", + "PETG", + "SUNLU PETG" + ] + ], "OF2HQqTC": [ [ "Cubicon", @@ -16220,6 +13388,27 @@ "Bambu PLA" ] ], + "OF2VFe4J": [ + [ + "Bambu Lab", + "PA-CF", + "Bambu PAHT-CF" + ] + ], + "OF2Z1nT5": [ + [ + "FilAr", + "PETG", + "FilAr PETG Azul Imperial" + ] + ], + "OF2pj5l5": [ + [ + "Overture", + "PLA", + "Overture Super PLA+" + ] + ], "OF2tvNYA": [ [ "Generic", @@ -16227,6 +13416,20 @@ "Sovol Zero PLA Silk" ] ], + "OF2xccEe": [ + [ + "DREMC", + "ASA", + "DREMC ASA GF" + ] + ], + "OF30Ftju": [ + [ + "Elegoo", + "TPU", + "Elegoo Rapid TPU 95A" + ] + ], "OF38Hyk4": [ [ "Generic", @@ -16234,13 +13437,6 @@ "Flashforge PETG Pro" ] ], - "OF3GKs2i": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Matte" - ] - ], "OF3XeEuV": [ [ "QIDI", @@ -16262,6 +13458,13 @@ "Elegoo Rapid PETG" ] ], + "OF3kBrdA": [ + [ + "eSUN", + "PETG", + "eSUN PETG" + ] + ], "OF41QVDH": [ [ "Generic", @@ -16276,6 +13479,13 @@ "Creality Generic PLA Matte" ] ], + "OF44VYzK": [ + [ + "FilAr", + "PETG", + "FilAr PETG Azul Francia" + ] + ], "OF48G7He": [ [ "QIDI", @@ -16283,6 +13493,13 @@ "QIDI PETG Tough 0.8 nozzle" ] ], + "OF4KsW72": [ + [ + "FilAr", + "PLA", + "FilAr PLA" + ] + ], "OF4RKeng": [ [ "Generic", @@ -16290,11 +13507,11 @@ "Flashforge Generic ASA" ] ], - "OF4fgpse": [ + "OF4RvVuU": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Marble" + "Bambu Lab", + "PPS-CF", + "Bambu PPS-CF" ] ], "OF4gzzE4": [ @@ -16325,6 +13542,13 @@ "FlyingBear PLA Basic" ] ], + "OF54B0S0": [ + [ + "Bambu Lab", + "PPA-CF", + "Bambu PPA-CF" + ] + ], "OF57IbZT": [ [ "Artillery", @@ -16339,6 +13563,13 @@ "Sovol SV06 Plus ACE ABS" ] ], + "OF5CgdDq": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA" + ] + ], "OF5J2axC": [ [ "Generic", @@ -16346,6 +13577,13 @@ "Sovol Zero PLA Basic" ] ], + "OF5P4jgA": [ + [ + "FilAr", + "PLA", + "FilAr PLA Dorado" + ] + ], "OF5T1Y9R": [ [ "Generic", @@ -16374,6 +13612,27 @@ "FusRock Generic NexPA-CF25" ] ], + "OF5nlfKY": [ + [ + "FilAr", + "PLA", + "FilAr PLA Oro" + ] + ], + "OF5rnhjh": [ + [ + "FilAr", + "PETG", + "FilAr PETG" + ] + ], + "OF5vgi2G": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Azul" + ] + ], "OF60Lmeq": [ [ "Generic", @@ -16395,6 +13654,13 @@ "FusRock PAHT" ] ], + "OF6Ll8lK": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG Translucent" + ] + ], "OF6Mxzsg": [ [ "Generic", @@ -16430,11 +13696,18 @@ "Snapmaker TPE" ] ], - "OF79FFkO": [ + "OF74KeQR": [ [ - "Elegoo", - "PC", - "Elegoo PC-FR" + "Generic", + "PHA", + "Generic PHA" + ] + ], + "OF7H3VJM": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Marble" ] ], "OF7M9vy4": [ @@ -16458,6 +13731,13 @@ "Volumic ASA Ultra" ] ], + "OF7lOgYF": [ + [ + "Generic", + "PETG", + "Generic PETG HF" + ] + ], "OF7tgL9c": [ [ "Generic", @@ -16465,11 +13745,11 @@ "Chuanying Generic ASA" ] ], - "OF8HQmJD": [ + "OF8Tlg47": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Sparkle" + "Generic", + "PPA-GF", + "Generic PPA-GF" ] ], "OF8WvPVL": [ @@ -16479,6 +13759,48 @@ "QIDI ABS Rapido 0.8 nozzle" ] ], + "OF8aFWfQ": [ + [ + "FilAr", + "PLA", + "FilAr PLA Amarillo Lirio" + ] + ], + "OF8jh0Lk": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Marron" + ] + ], + "OF8tPByX": [ + [ + "Generic", + "PPA-CF", + "Generic PPA-CF" + ] + ], + "OF99UMPq": [ + [ + "COEX 3D", + "ABS", + "COEX ABS" + ] + ], + "OF99vXPs": [ + [ + "DREMC", + "ABS", + "DREMC ABS+" + ] + ], + "OF9OlTWH": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Marble" + ] + ], "OF9RZyBz": [ [ "Polymaker", @@ -16486,13 +13808,6 @@ "Polymaker Generic S1" ] ], - "OF9qvJxV": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Translucent2" - ] - ], "OF9sr3Vn": [ [ "Generic", @@ -16591,6 +13906,13 @@ "Elegoo ASA-CF" ] ], + "OFAnyRUI": [ + [ + "Bambu Lab", + "PLA", + "Bambu Support For PLA" + ] + ], "OFAnyzjN": [ [ "HATCHBOX", @@ -16598,6 +13920,13 @@ "HATCHBOX PETG" ] ], + "OFAt6ec0": [ + [ + "FilAr", + "PLA", + "FilAr PLA Marron Oxido" + ] + ], "OFAtydxE": [ [ "Generic", @@ -16605,6 +13934,13 @@ "FusRock S-Multi" ] ], + "OFB5SmWk": [ + [ + "Valment", + "PLA", + "Valment PLA Galaxy" + ] + ], "OFBGxHgT": [ [ "FlyingBear", @@ -16619,6 +13955,20 @@ "PPS Carbone (Performance)" ] ], + "OFBSW57R": [ + [ + "Bambu Lab", + "PLA-AERO", + "Bambu PLA Aero" + ] + ], + "OFBUIlZ7": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA+" + ] + ], "OFBvxnjM": [ [ "Elegoo", @@ -16626,6 +13976,13 @@ "Elegoo PETG-GF" ] ], + "OFBw6eEG": [ + [ + "Overture", + "PLA", + "Overture Matte PLA" + ] + ], "OFC2FSsV": [ [ "Overture", @@ -16640,6 +13997,27 @@ "Flashforge Generic PETG-CF" ] ], + "OFC78WGQ": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Starlight" + ] + ], + "OFCD8qiU": [ + [ + "Generic", + "EVA", + "Generic EVA" + ] + ], + "OFCIUsWh": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Translucent" + ] + ], "OFCJaXZS": [ [ "Generic", @@ -16654,6 +14032,13 @@ "FlyingBear PA-CF" ] ], + "OFCccVrQ": [ + [ + "Polymaker", + "PLA", + "PolyTerra Dual PLA" + ] + ], "OFCgpxn2": [ [ "Generic", @@ -16668,18 +14053,39 @@ "Snapmaker J1 TPE" ] ], - "OFD5e0sH": [ + "OFCidU7j": [ [ - "Elegoo", - "PLA", - "Elegoo Rapid PLA+" + "DREMC", + "ABS-GF", + "DREMC ABS-GF" ] ], - "OFDCk0cz": [ + "OFCjG251": [ [ - "Generic", - "PETG-CF", - "Generic PETG-CF" + "FilAr", + "PLA", + "FilAr PLA-mate Verde" + ] + ], + "OFCoRobU": [ + [ + "Elas", + "ASA", + "Elas ASA" + ] + ], + "OFDETOM6": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Matte" + ] + ], + "OFDGigEI": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Dynamic" ] ], "OFDMWB6t": [ @@ -16689,11 +14095,18 @@ "Elegoo PLA+" ] ], - "OFDNiRTx": [ + "OFDSrzZ8": [ [ - "Elegoo", + "Generic", "PLA", - "Elegoo PLA+" + "Generic PLA" + ] + ], + "OFDe8uyM": [ + [ + "Valment", + "PLA", + "Valment PLA" ] ], "OFDkABjZ": [ @@ -16703,6 +14116,13 @@ "Generic TPU-90A" ] ], + "OFDpW3J8": [ + [ + "FILL3D", + "PLA", + "FILL3D PLA Basic" + ] + ], "OFDramZ2": [ [ "Co Print", @@ -16710,6 +14130,34 @@ "CoPrint Generic PETG" ] ], + "OFDvXujf": [ + [ + "Generic", + "PVA", + "Generic PVA" + ] + ], + "OFDvqJ6n": [ + [ + "Overture", + "ABS", + "Overture ABS Basic" + ] + ], + "OFDxfPgH": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Sparkle" + ] + ], + "OFE0NFRh": [ + [ + "COEX 3D", + "TPU", + "COEX TPU 60A" + ] + ], "OFE22Uba": [ [ "Generic", @@ -16717,6 +14165,13 @@ "Flashforge TPU-90A" ] ], + "OFEGNJD4": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Silk" + ] + ], "OFEYKrjb": [ [ "Artillery", @@ -16724,6 +14179,13 @@ "Artillery PETG" ] ], + "OFEZ449N": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Uva" + ] + ], "OFEdyZqS": [ [ "Anycubic", @@ -16731,6 +14193,34 @@ "Anycubic PLA Luminous" ] ], + "OFEhuUNq": [ + [ + "DREMC", + "PA-CF", + "DREMC PA12-CF" + ] + ], + "OFEkPBwx": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Glow" + ] + ], + "OFEswT5W": [ + [ + "Bambu Lab", + "PLA-CF", + "Bambu PLA-CF" + ] + ], + "OFF9OKoY": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Pro" + ] + ], "OFFIL5pD": [ [ "QIDI", @@ -16738,6 +14228,13 @@ "QIDI PA12-CF" ] ], + "OFFNYwWR": [ + [ + "Bambu Lab", + "PA-CF", + "Bambu PA-CF" + ] + ], "OFFenwbU": [ [ "Generic", @@ -16745,6 +14242,13 @@ "FLSun S1 PLA Silk" ] ], + "OFFkCLBl": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Galaxy" + ] + ], "OFFmJ8aR": [ [ "Other", @@ -16759,6 +14263,13 @@ "Other TPU" ] ], + "OFFvzqcd": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG Basic" + ] + ], "OFG8vHw8": [ [ "Generic", @@ -16773,6 +14284,13 @@ "Sovol SV06 ACE PETG" ] ], + "OFGVwfK0": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Gris" + ] + ], "OFGb4hPY": [ [ "Anycubic", @@ -16780,6 +14298,13 @@ "Anycubic PEBA 95A" ] ], + "OFGcLA5R": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Beige" + ] + ], "OFGfdP6J": [ [ "FusRock", @@ -16792,6 +14317,27 @@ "FusRock Generic S-Multi" ] ], + "OFGkyftV": [ + [ + "Overture", + "PLA", + "Overture Silk PLA" + ] + ], + "OFH2nN08": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA INGEO 850" + ] + ], + "OFHAccHz": [ + [ + "FilAr", + "PLA", + "FilAr PLA Blanco Antartida" + ] + ], "OFHBTqyD": [ [ "Generic", @@ -16818,6 +14364,34 @@ "Anycubic TPU" ] ], + "OFHWSM21": [ + [ + "Polymaker", + "PET-CF", + "Fiberon PET-CF" + ] + ], + "OFHa48An": [ + [ + "Bambu Lab", + "PET-CF", + "Bambu PET-CF" + ] + ], + "OFHfzQXo": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Transition" + ] + ], + "OFHmPYRy": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA+ 2.0" + ] + ], "OFHtQDC9": [ [ "Elegoo", @@ -16825,18 +14399,32 @@ "Elegoo PLA Basic" ] ], - "OFICPchn": [ + "OFIBXa0k": [ [ - "Elegoo", + "FilAr", "PLA", - "Elegoo PLA Basic" + "FilAr PLA-mate Rojo" ] ], - "OFIGHU7W": [ + "OFIamQnD": [ [ - "Elegoo", - "PETG", - "Elegoo PETG-CF" + "FilAr", + "PLA", + "FilAr PLA Gris Ceniza" + ] + ], + "OFIegjmD": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU Flex D53" + ] + ], + "OFIfnzxC": [ + [ + "Bambu Lab", + "PLA", + "Bambu Support For PLA/PETG" ] ], "OFIl3ar9": [ @@ -16853,25 +14441,46 @@ "Volumic UNIVERSAL Ultra" ] ], - "OFJIImD5": [ + "OFJHBEGD": [ [ - "Elegoo", - "PETG", - "Elegoo PET-CF" - ] - ], - "OFJfx0Cl": [ - [ - "Generic", - "PE-CF", - "Generic PE-CF" - ] - ], - "OFJsqMzx": [ - [ - "Generic", + "DREMC", "PLA", - "Generic PLA Matte" + "DREMC PLA+ HS" + ] + ], + "OFJNeELv": [ + [ + "FILL3D", + "PA", + "FILL3D PA" + ] + ], + "OFJOFnOZ": [ + [ + "Aliz", + "PETG-CF", + "AliZ PETG-CF" + ] + ], + "OFJQDUk3": [ + [ + "FilAr", + "PETG", + "FilAr PETG Cristal" + ] + ], + "OFJs1ToM": [ + [ + "COEX 3D", + "PA", + "COEX NYLEX UNFILLED" + ] + ], + "OFJu1XwK": [ + [ + "NIT", + "PETG", + "NIT PETG" ] ], "OFK39W9u": [ @@ -16902,6 +14511,20 @@ "Sovol SV08 ABS" ] ], + "OFKKajh6": [ + [ + "FilAr", + "PLA", + "FilAr PLA Gris Plata" + ] + ], + "OFKTSiYF": [ + [ + "FilAr", + "PLA", + "FilAr PLA Blanco Calido" + ] + ], "OFKWVi10": [ [ "Generic", @@ -16909,6 +14532,20 @@ "Flashforge Generic PLA-CF10" ] ], + "OFKWWgyp": [ + [ + "FilAr", + "PLA", + "FilAr PLA Carpincho" + ] + ], + "OFKZ9skj": [ + [ + "FilAr", + "PLA", + "FilAr PLA Naranja Tigre" + ] + ], "OFKZH00L": [ [ "FusRock", @@ -16921,6 +14558,13 @@ "FusRock Generic PET-CF" ] ], + "OFKhMPeX": [ + [ + "Bambu Lab", + "PC", + "Bambu PC" + ] + ], "OFKhtNBx": [ [ "Snapmaker", @@ -16928,6 +14572,13 @@ "Snapmaker J1 TPU High-Flow" ] ], + "OFKiSMWR": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Marble" + ] + ], "OFKjlAbC": [ [ "QIDI", @@ -16970,11 +14621,46 @@ "FlashForge PC" ] ], - "OFLSBS99": [ + "OFLJ8S6I": [ + [ + "SUNLU", + "PLA", + "SUNLU Wood PLA" + ] + ], + "OFLNgV3C": [ + [ + "DREMC", + "ASA", + "DREMC ASA" + ] + ], + "OFLPAxz3": [ [ "Generic", - "SBS", - "fdm_filament_sbs" + "ASA", + "Generic ASA" + ] + ], + "OFLXvuMr": [ + [ + "Elegoo", + "PETG", + "Elegoo Rapid PETG" + ] + ], + "OFLakOUI": [ + [ + "Generic", + "PC", + "Generic PC" + ] + ], + "OFLcd093": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG" ] ], "OFLeFaUO": [ @@ -17024,11 +14710,11 @@ "Flashforge ASA-CF" ] ], - "OFMCMXSG": [ + "OFM91vZs": [ [ - "Generic", - "PP", - "Generic PP-GF" + "Overture", + "ASA", + "Overture ASA" ] ], "OFMHTnPP": [ @@ -17038,11 +14724,39 @@ "Flashforge PA12-CF" ] ], - "OFMQJToc": [ + "OFMTK0UC": [ [ - "Elegoo", - "PETG", - "Elegoo PETG-GF" + "Bambu Lab", + "PA", + "Bambu Support For PA/PET" + ] + ], + "OFMUWNkp": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA+" + ] + ], + "OFMZvH0z": [ + [ + "Overture", + "PLA", + "Overture Rock PLA" + ] + ], + "OFMjtqTC": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Wood" + ] + ], + "OFMuXBmO": [ + [ + "Elas", + "PLA", + "Elas PLA Basic" ] ], "OFN0X7oN": [ @@ -17073,6 +14787,13 @@ "Artillery PC" ] ], + "OFNU9YIW": [ + [ + "FilAr", + "PETG", + "FilAr PETG Azul Boreal" + ] + ], "OFNX5uRT": [ [ "QIDI", @@ -17087,6 +14808,27 @@ "Creality Generic ASA-CF" ] ], + "OFNemJM6": [ + [ + "FilAr", + "PLA", + "FilAr PLA Cobre" + ] + ], + "OFNiSLfL": [ + [ + "Generic", + "PP", + "Generic PP-GF" + ] + ], + "OFNk8bxk": [ + [ + "Bambu Lab", + "PA-GF", + "Bambu PA6-GF" + ] + ], "OFNvrbnf": [ [ "Co Print", @@ -17101,6 +14843,13 @@ "FlyingBear PLA Hyper" ] ], + "OFO1GEq6": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Neon" + ] + ], "OFO3IOWM": [ [ "Volumic", @@ -17115,6 +14864,13 @@ "Sovol Zero TPU" ] ], + "OFOABq7t": [ + [ + "Aliz", + "PETG", + "AliZ PETG-Metal" + ] + ], "OFOJUJAS": [ [ "Cubicon", @@ -17136,6 +14892,13 @@ "Qidi TPU 95A-HF" ] ], + "OFOiJfLM": [ + [ + "FILL3D", + "PETG-CF", + "FILL3D PETG CF" + ] + ], "OFOkTA0C": [ [ "Elegoo", @@ -17150,6 +14913,20 @@ "Generic ABS" ] ], + "OFOsHDnB": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG PRO" + ] + ], + "OFOvv91M": [ + [ + "Polymaker", + "ABS", + "PolyLite ABS" + ] + ], "OFOysPuE": [ [ "QIDI", @@ -17157,6 +14934,13 @@ "QIDI TPU-GF" ] ], + "OFP26zNb": [ + [ + "FilAr", + "PLA", + "FilAr PLA Violeta Jacaranda" + ] + ], "OFP4poIv": [ [ "Generic", @@ -17190,6 +14974,27 @@ "Flashforge PLA-CF" ] ], + "OFPWPlSC": [ + [ + "FILL3D", + "PP", + "FILL3D PP" + ] + ], + "OFPbyOSk": [ + [ + "FilAr", + "PETG", + "FilAr PETG Rojo Carmesi" + ] + ], + "OFPc4zVY": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA INGEO 870" + ] + ], "OFPeGtB1": [ [ "Volumic", @@ -17197,6 +15002,20 @@ "Volumic UNIVERSAL Ultra (Performance)" ] ], + "OFPkCJKE": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Satin" + ] + ], + "OFPklMI1": [ + [ + "Generic", + "PE", + "Generic PE" + ] + ], "OFPokkKe": [ [ "QIDI", @@ -17204,6 +15023,20 @@ "QIDI PETG-CF" ] ], + "OFPoyiFs": [ + [ + "Polymaker", + "PLA", + "Polymaker HT-PLA" + ] + ], + "OFPqX3x2": [ + [ + "FilAr", + "PLA", + "FilAr PLA Rosa Amaranto" + ] + ], "OFPwi9X0": [ [ "HATCHBOX", @@ -17211,6 +15044,13 @@ "HATCHBOX ABS" ] ], + "OFQ3e56w": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Galaxy" + ] + ], "OFQ5xAKf": [ [ "Generic", @@ -17237,6 +15077,27 @@ "Flashforge PPA-CF" ] ], + "OFQHiNJs": [ + [ + "Bambu Lab", + "PA", + "Bambu Support G" + ] + ], + "OFQLcbps": [ + [ + "Generic", + "PA-CF", + "Generic PA-CF" + ] + ], + "OFQWIKbV": [ + [ + "FilAr", + "PLA", + "FilAr PLA Titanio" + ] + ], "OFQZINrX": [ [ "QIDI", @@ -17244,18 +15105,11 @@ "QIDI ABS-GF10" ] ], - "OFQhLoxN": [ + "OFQbjX3s": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Wood" - ] - ], - "OFQkWxJy": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Matte" + "FILL3D", + "PETG", + "FILL3D PETG" ] ], "OFR8dTVW": [ @@ -17279,13 +15133,6 @@ "Generic ASA" ] ], - "OFRS2Ggt": [ - [ - "Generic", - "PP-CF", - "Generic PP-CF" - ] - ], "OFRgDMDJ": [ [ "Generic", @@ -17293,6 +15140,27 @@ "Flashforge PETG Transparent" ] ], + "OFRiFnfQ": [ + [ + "Eolas Prints", + "PETG", + "Eolas Prints PETG Transition" + ] + ], + "OFRiYgMK": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Celestial" + ] + ], + "OFRzR5mi": [ + [ + "eSUN", + "PLA-AERO", + "eSUN ePLA-LW" + ] + ], "OFS1ekCg": [ [ "Generic", @@ -17300,6 +15168,13 @@ "RatRig BigNozzle PCTG" ] ], + "OFS2tn6G": [ + [ + "Polymaker", + "PA", + "Fiberon PA612-CF" + ] + ], "OFS3HrR1": [ [ "Other", @@ -17307,6 +15182,13 @@ "Other PLA" ] ], + "OFS8lTQt": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Silk" + ] + ], "OFSCm6pJ": [ [ "Elegoo", @@ -17349,11 +15231,32 @@ "Other PA-CF" ] ], - "OFT3TqB6": [ + "OFSwbBWS": [ [ - "Elas", - "ASA", - "Elas ASA" + "DREMC", + "PLA", + "DREMC PLA+" + ] + ], + "OFTGHyNC": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Impact" + ] + ], + "OFTOPcx0": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU Transition" + ] + ], + "OFTRZ8Y4": [ + [ + "Bambu Lab", + "PETG-CF", + "Bambu PETG-CF" ] ], "OFTa6gPH": [ @@ -17377,6 +15280,20 @@ "Artillery TPU" ] ], + "OFTcE0nA": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Basic" + ] + ], + "OFTlRzpe": [ + [ + "FilAr", + "PLA", + "FilAr PLA Gris Pizarra" + ] + ], "OFToBodi": [ [ "QIDI", @@ -17398,6 +15315,13 @@ "Creality Generic PLA Silk" ] ], + "OFU1zPxE": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Galaxy" + ] + ], "OFUJw3Lx": [ [ "QIDI", @@ -17412,6 +15336,13 @@ "Dremel Generic PLA" ] ], + "OFUanySo": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Silk+" + ] + ], "OFUkpobY": [ [ "QIDI", @@ -17426,6 +15357,13 @@ "Chuanying Generic TPU" ] ], + "OFUyDDNv": [ + [ + "Elegoo", + "PC", + "Elegoo PC" + ] + ], "OFV1szQh": [ [ "Peopoly", @@ -17440,6 +15378,13 @@ "QIDI PLA Rapido Metal" ] ], + "OFV5tNw6": [ + [ + "Elegoo", + "PETG", + "Elegoo PET-CF" + ] + ], "OFVBNoov": [ [ "InfiMech", @@ -17447,6 +15392,20 @@ "InfiMech ABS" ] ], + "OFVBlUFH": [ + [ + "DREMC", + "PETG", + "DREMC PETG" + ] + ], + "OFVCkX5w": [ + [ + "Bambu Lab", + "TPU", + "Bambu TPU 95A" + ] + ], "OFVJXE4n": [ [ "Other", @@ -17454,13 +15413,6 @@ "Other ABS" ] ], - "OFVLuVmD": [ - [ - "Elegoo", - "PETG", - "Elegoo Rapid PETG" - ] - ], "OFVhG0yM": [ [ "QIDI", @@ -17468,6 +15420,20 @@ "QIDI ABS Odorless" ] ], + "OFVptRxp": [ + [ + "COEX 3D", + "TPU", + "COEX TPE 30D" + ] + ], + "OFW29a9R": [ + [ + "Polymaker", + "PLA", + "PolyTerra PLA" + ] + ], "OFW8UdlP": [ [ "QIDI", @@ -17475,6 +15441,27 @@ "QIDI ABS Rapido" ] ], + "OFWTRJ1K": [ + [ + "FilAr", + "PLA", + "FilAr PLA Bronce" + ] + ], + "OFWYtgCa": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Wood" + ] + ], + "OFWbdGsC": [ + [ + "Generic", + "PLA-CF", + "Generic PLA-CF" + ] + ], "OFWkCAdc": [ [ "QIDI", @@ -17496,6 +15483,13 @@ "Flashforge PLA Metal" ] ], + "OFWwF7K7": [ + [ + "FilAr", + "PLA", + "FilAr PLA Cafe con Leche" + ] + ], "OFWyCd0Y": [ [ "QIDI", @@ -17503,6 +15497,13 @@ "QIDI Support For PET/PA" ] ], + "OFX0ycRQ": [ + [ + "Polymaker", + "PA-CF", + "Fiberon PA12-CF" + ] + ], "OFXA8vy9": [ [ "Artillery", @@ -17510,6 +15511,20 @@ "Artillery PLA Basic+" ] ], + "OFXCBZTA": [ + [ + "Eolas Prints", + "ABS", + "Eolas Prints ABS" + ] + ], + "OFXIbw5D": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Matte" + ] + ], "OFXNO5Of": [ [ "QIDI", @@ -17524,6 +15539,13 @@ "RatRig PunkFil PETG CF" ] ], + "OFXTPuqV": [ + [ + "Elas", + "PETG", + "Elas PETG Basic" + ] + ], "OFXcfTEb": [ [ "Generic", @@ -17538,6 +15560,13 @@ "Prusa Generic PA-CF" ] ], + "OFXkm8q1": [ + [ + "Generic", + "PP-CF", + "Generic PP-CF" + ] + ], "OFXkwkn6": [ [ "QIDI", @@ -17545,13 +15574,6 @@ "QIDI PA-Ultra" ] ], - "OFXmQgno": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Marble" - ] - ], "OFXv4FUi": [ [ "Generic", @@ -17559,6 +15581,20 @@ "Flashforge PLA Galaxy" ] ], + "OFXz7Mwx": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Silk" + ] + ], + "OFXzQ4yL": [ + [ + "Bambu Lab", + "ASA-AERO", + "Bambu ASA-Aero" + ] + ], "OFY1U4uM": [ [ "Generic", @@ -17566,6 +15602,13 @@ "Sovol SV08 TPU" ] ], + "OFY9muEs": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], "OFYG2Gfy": [ [ "Afinia", @@ -17573,6 +15616,13 @@ "Afinia ABS+" ] ], + "OFYGbPHX": [ + [ + "Polymaker", + "PLA", + "PolyLite Dual PLA" + ] + ], "OFYH00jV": [ [ "QIDI", @@ -17592,6 +15642,13 @@ "FusRock Generic PAHT-CF" ] ], + "OFYPdQJh": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], "OFYRS7GZ": [ [ "Generic", @@ -17606,6 +15663,13 @@ "Flashforge Generic HS PLA" ] ], + "OFYd5uS3": [ + [ + "DREMC", + "TPU", + "DREMC TPU 95A" + ] + ], "OFYehFGr": [ [ "Generic", @@ -17620,6 +15684,13 @@ "FlyingBear TPU" ] ], + "OFZ4QbfK": [ + [ + "FilAr", + "PLA", + "FilAr PLA Rosa Flamenco" + ] + ], "OFZAkPHG": [ [ "QIDI", @@ -17646,13 +15717,6 @@ "Flashforge PPS-CF" ] ], - "OFZhdVnP": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Basic" - ] - ], "OFZjZ1k7": [ [ "Generic", @@ -17674,6 +15738,20 @@ "Qidi PC-ABS-FR" ] ], + "OFaDOaNt": [ + [ + "FilAr", + "PLA", + "FilAr PLA Celeste Cielo" + ] + ], + "OFaEesXQ": [ + [ + "FilAr", + "PLA", + "FilAr PLA Rojo de Carreras" + ] + ], "OFaKIoH2": [ [ "Elegoo", @@ -17688,6 +15766,27 @@ "Generic PETG Basic" ] ], + "OFaQMgRH": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Tough" + ] + ], + "OFaYz8iE": [ + [ + "Elas", + "PLA", + "Elas PLA Pro" + ] + ], + "OFausr3F": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Rosa" + ] + ], "OFaxQnfz": [ [ "Cubicon", @@ -17709,6 +15808,13 @@ "Prusa Generic TPU HF" ] ], + "OFbP8zEO": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Silk" + ] + ], "OFbS9rjH": [ [ "QIDI", @@ -17723,13 +15829,6 @@ "Elegoo PLA Marble" ] ], - "OFbgt3u3": [ - [ - "Elas", - "PLA", - "Elas PLA Basic" - ] - ], "OFc2SnEp": [ [ "Artillery", @@ -17737,6 +15836,13 @@ "Artillery PVA" ] ], + "OFc3xdm9": [ + [ + "Overture", + "PLA", + "Overture PLA" + ] + ], "OFcZZWnB": [ [ "Cubicon", @@ -17751,6 +15857,13 @@ "PolyLite PLA" ] ], + "OFcfQk4h": [ + [ + "Overture", + "PLA", + "Overture Air PLA" + ] + ], "OFcqs5g7": [ [ "Elegoo", @@ -17765,6 +15878,13 @@ "Sovol SV08 PLA" ] ], + "OFcvKkrs": [ + [ + "Overture", + "TPU", + "Overture TPU" + ] + ], "OFcy60o4": [ [ "Generic", @@ -17772,6 +15892,41 @@ "Flashforge ASA Basic" ] ], + "OFcytyoA": [ + [ + "Polymaker", + "PETG", + "Fiberon PETG-ESD" + ] + ], + "OFd0Fv0k": [ + [ + "Generic", + "PE-CF", + "Generic PE-CF" + ] + ], + "OFd2vX0G": [ + [ + "COEX 3D", + "PLA", + "COEX PLA PRIME" + ] + ], + "OFd4zw5l": [ + [ + "Aliz", + "PA-CF", + "AliZ PA-CF" + ] + ], + "OFdI4zMo": [ + [ + "DREMC", + "ASA", + "DREMC ASA CF" + ] + ], "OFdLGn0R": [ [ "Generic", @@ -17798,6 +15953,13 @@ "Anycubic PETG" ] ], + "OFdb8YNz": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde Manzana" + ] + ], "OFdhVJql": [ [ "Generic", @@ -17805,6 +15967,13 @@ "Flashforge PLA Buint Ti" ] ], + "OFdzlrhi": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Chocolate" + ] + ], "OFeFRwST": [ [ "Generic", @@ -17833,11 +16002,18 @@ "InfiMech PLA Hyper" ] ], - "OFenGPBR": [ + "OFesA6rF": [ [ - "Elegoo", - "PETG", - "Elegoo PETG Translucent" + "Generic", + "PLA", + "Generic PLA Silk" + ] + ], + "OFexaZU2": [ + [ + "FilAr", + "PLA", + "FilAr PLA Manteca" ] ], "OFeybQvK": [ @@ -17866,11 +16042,32 @@ "Anycubic ABS" ] ], - "OFfB1QKi": [ + "OFf5awy4": [ [ - "Generic", + "Eolas Prints", + "PLA", + "Eolas Prints PLA Matte" + ] + ], + "OFf6mfQO": [ + [ + "Bambu Lab", + "ABS", + "Bambu Support for ABS" + ] + ], + "OFfBpSRI": [ + [ + "Bambu Lab", + "ASA", + "Bambu ASA" + ] + ], + "OFfJSCzm": [ + [ + "FDplast", "PETG", - "Generic PETG HF" + "FDplast PETG" ] ], "OFfJoIgg": [ @@ -17880,6 +16077,13 @@ "QIDI PAHT-GF" ] ], + "OFfZcoKr": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Piel" + ] + ], "OFfdxQok": [ [ "Generic", @@ -17901,6 +16105,20 @@ "Creality HF Generic Speed PLA" ] ], + "OFfmZrI3": [ + [ + "FDplast", + "TPU", + "FDplast TPU" + ] + ], + "OFfnXFie": [ + [ + "COEX 3D", + "TPU", + "COEX TPE 40D" + ] + ], "OFfoA8kJ": [ [ "CoLiDo", @@ -17908,6 +16126,20 @@ "CoLiDo PLA" ] ], + "OFfq5YXA": [ + [ + "Valment", + "PLA-CF", + "Valment PLA-CF" + ] + ], + "OFfr4XNO": [ + [ + "COEX 3D", + "TPU", + "COEX TPE 60D" + ] + ], "OFftQOek": [ [ "Generic", @@ -17915,6 +16147,13 @@ "Flashforge PLA Matte" ] ], + "OFfuhviw": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Marble" + ] + ], "OFg4N6ZL": [ [ "FlyingBear", @@ -17922,6 +16161,27 @@ "FlyingBear PETG" ] ], + "OFg57Nmc": [ + [ + "Bambu Lab", + "PC", + "Bambu PC FR" + ] + ], + "OFg8hMzT": [ + [ + "FILL3D", + "PP", + "FILL3D PPCF" + ] + ], + "OFg8ndtj": [ + [ + "Generic", + "PA", + "Generic PA" + ] + ], "OFgJX0Fc": [ [ "Generic", @@ -17948,6 +16208,13 @@ "Sovol SV06 Plus ACE PETG" ] ], + "OFgMWJ8T": [ + [ + "FilAr", + "PLA", + "FilAr PLA Negro Azabache" + ] + ], "OFgNzLVh": [ [ "Generic", @@ -17967,6 +16234,13 @@ "Anycubic PLA High Speed" ] ], + "OFgbpcy9": [ + [ + "Generic", + "TPU", + "Generic TPU" + ] + ], "OFglpvEE": [ [ "Generic", @@ -17974,6 +16248,13 @@ "Sovol SV06 ACE TPU" ] ], + "OFgpLTMR": [ + [ + "FilAr", + "PETG", + "FilAr PETG Gris Plata" + ] + ], "OFgrGfPy": [ [ "Anycubic", @@ -18000,6 +16281,13 @@ "Elegoo PLA Wood" ] ], + "OFhASRWj": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Temp Shift" + ] + ], "OFhKNHC8": [ [ "Generic", @@ -18007,6 +16295,62 @@ "Generic PETG PRO" ] ], + "OFhMO9Kh": [ + [ + "GreenGate3D", + "PETG", + "GreenGate3D PETG" + ] + ], + "OFhQfUQY": [ + [ + "Generic", + "SBS", + "Generic SBS" + ] + ], + "OFhWc5Bv": [ + [ + "NIT", + "ABS", + "NIT ABS" + ] + ], + "OFhWhL1i": [ + [ + "Eolas Prints", + "PETG", + "Eolas Prints PETG" + ] + ], + "OFhcYzR8": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Sparkle" + ] + ], + "OFhfd722": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU Flex 93A" + ] + ], + "OFhlCNqq": [ + [ + "COEX 3D", + "PLA", + "COEX PLA" + ] + ], + "OFhuaUQB": [ + [ + "Bambu Lab", + "ABS", + "Bambu ABS" + ] + ], "OFhzHd2Y": [ [ "Generic", @@ -18021,6 +16365,13 @@ "Flashforge PA" ] ], + "OFiDpM1B": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Bordo" + ] + ], "OFiJYDPC": [ [ "HATCHBOX", @@ -18028,6 +16379,13 @@ "HATCHBOX PLA" ] ], + "OFiWaoqD": [ + [ + "DREMC", + "PPA-CF", + "DREMC PPA-CF" + ] + ], "OFic2uNr": [ [ "Generic", @@ -18056,6 +16414,13 @@ "Elegoo PETG-CF" ] ], + "OFj3bTjw": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Amarillo" + ] + ], "OFjFPhUC": [ [ "Generic", @@ -18063,6 +16428,20 @@ "Prusament rPLA" ] ], + "OFjPXrXO": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Glow" + ] + ], + "OFjT9PkZ": [ + [ + "FilAr", + "PLA", + "FilAr PLA Tabaco" + ] + ], "OFjZw7k1": [ [ "Polymaker", @@ -18070,6 +16449,13 @@ "PolyTerra J1 PLA" ] ], + "OFjb0wos": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Metallic" + ] + ], "OFjdTQd6": [ [ "Anycubic", @@ -18108,6 +16494,13 @@ "QIDI PETG Translucent" ] ], + "OFjorDcx": [ + [ + "FDplast", + "ABS", + "FDplast ABS" + ] + ], "OFjqPjjl": [ [ "Generic", @@ -18115,6 +16508,13 @@ "Generic PET" ] ], + "OFjt9en1": [ + [ + "Generic", + "CoPE", + "Generic CoPE" + ] + ], "OFjurQ3I": [ [ "Generic", @@ -18136,6 +16536,27 @@ "Sovol Zero PETG HS Nozzle" ] ], + "OFk8t9mz": [ + [ + "Polymaker", + "PETG-CF", + "Fiberon PETG-rCF" + ] + ], + "OFkGvN4d": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde Pixel" + ] + ], + "OFkOviHk": [ + [ + "Polymaker", + "PA6-CF", + "Fiberon PA6-CF" + ] + ], "OFkaDtKx": [ [ "FusRock", @@ -18157,6 +16578,13 @@ "Elegoo PLA Silk" ] ], + "OFkhhUS0": [ + [ + "Elegoo", + "PLA", + "Elegoo Rapid PLA+" + ] + ], "OFklg4aM": [ [ "Elegoo", @@ -18164,6 +16592,20 @@ "Elegoo PLA PRO" ] ], + "OFknl9Iz": [ + [ + "Bambu Lab", + "ABS-GF", + "Bambu ABS-GF" + ] + ], + "OFkoLUtR": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde Oliva" + ] + ], "OFkoT6jl": [ [ "Generic", @@ -18171,6 +16613,13 @@ "Prusament PLA" ] ], + "OFkzr35f": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Antibacterial" + ] + ], "OFlN56xW": [ [ "Generic", @@ -18185,6 +16634,20 @@ "Flashforge PLA Metal" ] ], + "OFlP3KWq": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG HF" + ] + ], + "OFlSNkhc": [ + [ + "Eolas Prints", + "ASA", + "Eolas Prints ASA" + ] + ], "OFlbn4FY": [ [ "Snapmaker", @@ -18192,6 +16655,27 @@ "Snapmaker PLA Matte" ] ], + "OFln72PT": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA-CF" + ] + ], + "OFlsTpJG": [ + [ + "Elegoo", + "PC", + "Elegoo PC-FR" + ] + ], + "OFlwmqrC": [ + [ + "Polymaker", + "PLA", + "Polymaker HT-PLA-GF" + ] + ], "OFlxnxDx": [ [ "Generic", @@ -18206,6 +16690,13 @@ "Peopoly Lancer PET-CF" ] ], + "OFm06H6V": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Basic" + ] + ], "OFm1VZed": [ [ "Generic", @@ -18220,6 +16711,13 @@ "QIDI ASA-CF" ] ], + "OFmJAd3A": [ + [ + "FDplast", + "HIPS", + "FDplast HIPS" + ] + ], "OFmKNi3f": [ [ "QIDI", @@ -18234,6 +16732,20 @@ "Elegoo PETG PRO" ] ], + "OFmY0l6t": [ + [ + "Generic", + "PLA", + "Generic PLA Matte" + ] + ], + "OFmaeU4a": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Naranja" + ] + ], "OFmcJsqt": [ [ "InfiMech", @@ -18248,13 +16760,6 @@ "FlashForge PPS-CF" ] ], - "OFmeQjRP": [ - [ - "Elegoo", - "TPU", - "Elegoo Rapid TPU 95A" - ] - ], "OFmgesco": [ [ "Generic", @@ -18262,6 +16767,41 @@ "Flashforge TPU 65D" ] ], + "OFmhJs5V": [ + [ + "Elegoo", + "TPU", + "Elegoo TPU" + ] + ], + "OFmn9NZL": [ + [ + "FusRock", + "ABS-GF", + "FusRock ABS-GF" + ] + ], + "OFmpMwxS": [ + [ + "Generic", + "PLA", + "Generic PLA High Speed" + ] + ], + "OFmveLWz": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG-GF" + ] + ], + "OFn1QaY3": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA Translucent2" + ] + ], "OFnLnZQo": [ [ "Cubicon", @@ -18290,6 +16830,27 @@ "Artillery PA-CF" ] ], + "OFnYVFk2": [ + [ + "FilAr", + "PLA", + "FilAr PLA Azul Francia" + ] + ], + "OFnejEt4": [ + [ + "FilAr", + "PETG", + "FilAr PETG Cian" + ] + ], + "OFniMuTN": [ + [ + "Bambu Lab", + "PA6-CF", + "Bambu PA6-CF" + ] + ], "OFnj7bPm": [ [ "QIDI", @@ -18311,6 +16872,13 @@ "Artillery PLA Silk" ] ], + "OFo2UF2C": [ + [ + "Generic", + "BVOH", + "Generic BVOH" + ] + ], "OFo4VB3w": [ [ "Generic", @@ -18339,6 +16907,41 @@ "Flashforge HS PLA" ] ], + "OFoSknDB": [ + [ + "FILL3D", + "PLA", + "FILL3D PLA Turbo" + ] + ], + "OFoYSJKi": [ + [ + "Generic", + "PETG-CF", + "Generic PETG-CF" + ] + ], + "OFobDOW5": [ + [ + "Elegoo", + "ASA", + "Elegoo ASA" + ] + ], + "OFocyw69": [ + [ + "Aliz", + "PETG", + "AliZ PETG" + ] + ], + "OFoiVqVM": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Basic" + ] + ], "OFoimrpo": [ [ "Generic", @@ -18346,6 +16949,13 @@ "Flashforge PETG-CF" ] ], + "OFovEIbw": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG HF" + ] + ], "OFp8lkYD": [ [ "FusRock", @@ -18360,6 +16970,13 @@ "Artillery PA" ] ], + "OFpBlrvY": [ + [ + "Valment", + "PLA", + "Valment PLA Silk" + ] + ], "OFpHq9gJ": [ [ "Generic", @@ -18367,6 +16984,20 @@ "Prusament PETG" ] ], + "OFpPGSKG": [ + [ + "SUNLU", + "PLA", + "SUNLU Silk PLA+" + ] + ], + "OFpW4gdi": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA Matte" + ] + ], "OFphFSUJ": [ [ "Generic", @@ -18374,13 +17005,6 @@ "Prusa Generic PETG HF" ] ], - "OFpwg2Qh": [ - [ - "Elegoo", - "ASA", - "Elegoo ASA-CF" - ] - ], "OFq6IhFg": [ [ "Cubicon", @@ -18388,6 +17012,27 @@ "Cubicon PLA" ] ], + "OFq8gfS4": [ + [ + "FilAr", + "PETG", + "FilAr PETG Negro Azabache" + ] + ], + "OFqGRZyH": [ + [ + "Numakers", + "PLA", + "Numakers PLA+" + ] + ], + "OFqINlYj": [ + [ + "eSUN", + "PLA", + "eSUN PLA+" + ] + ], "OFqPp2yL": [ [ "QIDI", @@ -18409,13 +17054,6 @@ "OrcaArena Generic PLA Silk" ] ], - "OFqh1Ngp": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA-CF" - ] - ], "OFqkcvDI": [ [ "Peopoly", @@ -18423,6 +17061,20 @@ "Peopoly Lancer ABS-GF" ] ], + "OFqtx549": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Celeste Cielo" + ] + ], + "OFqw2PQA": [ + [ + "Polymaker", + "PLA", + "Panchroma CoPE" + ] + ], "OFqyIUDi": [ [ "QIDI", @@ -18430,6 +17082,27 @@ "Qidi PLA-CF" ] ], + "OFrFBEfd": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Neon" + ] + ], + "OFrKLeE3": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Metal" + ] + ], + "OFrOh600": [ + [ + "Polymaker", + "PLA", + "Panchroma PLA Matte" + ] + ], "OFrbbq6E": [ [ "Other", @@ -18437,11 +17110,11 @@ "Other PLA Hyper" ] ], - "OFrgQ1Ns": [ + "OFryjl35": [ [ - "Elas", - "PLA", - "Elas PLA Pro" + "Elegoo", + "ASA", + "Elegoo ASA-CF" ] ], "OFs1CbB1": [ @@ -18451,11 +17124,11 @@ "QIDI PLA Rapido 0.8 nozzle" ] ], - "OFs6lLH7": [ + "OFsB2lxm": [ [ "Elegoo", "PLA", - "Elegoo PLA Silk" + "Elegoo PLA Matte" ] ], "OFsCOJv7": [ @@ -18465,11 +17138,25 @@ "Generic TPU" ] ], - "OFsKqcQW": [ + "OFsDXRpS": [ [ - "Elegoo", + "FilAr", "PLA", - "Elegoo PLA PRO" + "FilAr PLA Piel" + ] + ], + "OFsFon5l": [ + [ + "Generic", + "HIPS", + "Generic HIPS" + ] + ], + "OFsHSVZc": [ + [ + "Bambu Lab", + "PLA", + "Bambu Support W" ] ], "OFsLkLw6": [ @@ -18479,11 +17166,18 @@ "Generic PLA Matte" ] ], - "OFsNZcid": [ + "OFsRDvTM": [ [ "Polymaker", "PLA", - "PolyLite Dual PLA" + "Panchroma PLA" + ] + ], + "OFsXQXbs": [ + [ + "FilAr", + "PETG", + "FilAr PETG Blanco Antartida" ] ], "OFsgANe3": [ @@ -18500,6 +17194,13 @@ "Sovol SV06 Plus ACE TPU" ] ], + "OFsoykbm": [ + [ + "DREMC", + "PA6-CF", + "DREMC PA6-CF" + ] + ], "OFt1YdX8": [ [ "Generic", @@ -18514,6 +17215,13 @@ "Artillery PETG Basic" ] ], + "OFt6e0US": [ + [ + "FilAr", + "PETG", + "FilAr PETG Amarillo Lima" + ] + ], "OFt9AiN5": [ [ "Generic", @@ -18542,6 +17250,20 @@ "Sovol Zero PLA Basic HS Nozzle" ] ], + "OFtOoWIj": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate" + ] + ], + "OFtRn8X8": [ + [ + "FDplast", + "SBS", + "FDplast SBS" + ] + ], "OFtXBjvb": [ [ "Artillery", @@ -18549,6 +17271,13 @@ "Artillery PLA Tough" ] ], + "OFtcKVgP": [ + [ + "Generic", + "PC", + "fdm_filament_pc" + ] + ], "OFtcTs1o": [ [ "Generic", @@ -18556,6 +17285,13 @@ "RatRig BigNozzle ABS" ] ], + "OFtefokm": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Blanco" + ] + ], "OFtemzzw": [ [ "Generic", @@ -18584,6 +17320,27 @@ "Artillery ASA" ] ], + "OFtpXCCv": [ + [ + "COEX 3D", + "ASA", + "COEX ASA PRIME" + ] + ], + "OFtr8eZw": [ + [ + "FDplast", + "PLA", + "FDplast PLA" + ] + ], + "OFtudokz": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA Premium" + ] + ], "OFtwA91m": [ [ "Generic", @@ -18591,6 +17348,13 @@ "Sovol Zero PC" ] ], + "OFu1evlr": [ + [ + "Generic", + "PCTG", + "Generic PCTG" + ] + ], "OFuPC4S8": [ [ "Elegoo", @@ -18612,6 +17376,20 @@ "Overture ABS" ] ], + "OFuUuIhR": [ + [ + "Elegoo", + "PETG", + "Elegoo PETG-CF" + ] + ], + "OFuWCQXN": [ + [ + "COEX 3D", + "ABS", + "COEX ABS PRIME" + ] + ], "OFuXkYly": [ [ "Elegoo", @@ -18626,6 +17404,13 @@ "Afinia Value ABS" ] ], + "OFufTAK9": [ + [ + "FilAr", + "PLA", + "FilAr PLA-mate Negro" + ] + ], "OFuidAEg": [ [ "Bambu Lab", @@ -18640,6 +17425,13 @@ "InfiMech PLA Basic" ] ], + "OFurdQxc": [ + [ + "FilAr", + "PETG", + "FilAr PETG Magenta" + ] + ], "OFuswXlp": [ [ "Generic", @@ -18647,13 +17439,6 @@ "Generic TPU 85A" ] ], - "OFutwD6f": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Glow" - ] - ], "OFuyJhLF": [ [ "Generic", @@ -18682,6 +17467,13 @@ "Creality Generic PETG-CF" ] ], + "OFvKUnLh": [ + [ + "Bambu Lab", + "TPU", + "Bambu TPU 95A HF" + ] + ], "OFvN3117": [ [ "QIDI", @@ -18696,6 +17488,27 @@ "Other TPU" ] ], + "OFvPPMxL": [ + [ + "FilAr", + "PLA", + "FilAr PLA Verde FilAr" + ] + ], + "OFvTVZc3": [ + [ + "COEX 3D", + "PETG", + "COEX PETG" + ] + ], + "OFvVy7yo": [ + [ + "Eolas Prints", + "TPU", + "Eolas Prints TPU D60 UV Resistant" + ] + ], "OFvYfHPB": [ [ "Anycubic", @@ -18710,6 +17523,13 @@ "InfiMech PETG" ] ], + "OFvgE0Zh": [ + [ + "Elegoo", + "PLA", + "Elegoo PLA" + ] + ], "OFviQ9lH": [ [ "Generic", @@ -18717,6 +17537,13 @@ "Flashforge Generic TPU" ] ], + "OFvrXuV7": [ + [ + "Polymaker", + "ASA", + "PolyLite ASA" + ] + ], "OFvsS7Fb": [ [ "Generic", @@ -18738,6 +17565,13 @@ "Artillery PLA-CF" ] ], + "OFvzvwCu": [ + [ + "Eolas Prints", + "PLA", + "Eolas Prints PLA High Speed" + ] + ], "OFw05rkF": [ [ "Other", @@ -18759,13 +17593,6 @@ "Artillery ABS" ] ], - "OFw4OHWE": [ - [ - "Elas", - "PETG", - "Elas PETG Basic" - ] - ], "OFwHPTvy": [ [ "Generic", @@ -18773,6 +17600,34 @@ "Qidi Generic PLA+" ] ], + "OFwJ0qu2": [ + [ + "DREMC", + "PET-CF", + "DREMC PET-CF" + ] + ], + "OFwPrlCM": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG Translucent" + ] + ], + "OFwRJ4g0": [ + [ + "NIT", + "PLA", + "NIT PLA" + ] + ], + "OFwaYjL6": [ + [ + "Polymaker", + "PA-GF", + "Fiberon PA6-GF" + ] + ], "OFwf0oWp": [ [ "Generic", @@ -18780,6 +17635,13 @@ "Flashforge PLA Luminous" ] ], + "OFwu7IAG": [ + [ + "COEX 3D", + "PCTG", + "COEX PCTG PRIME" + ] + ], "OFwyqcGn": [ [ "Elegoo", @@ -18787,6 +17649,20 @@ "Elegoo PLA Matte" ] ], + "OFx8Lmsd": [ + [ + "Eolas Prints", + "PETG", + "Eolas Prints PETG UV Resistant" + ] + ], + "OFxA1p01": [ + [ + "Overture", + "PLA", + "Overture PLA Pro" + ] + ], "OFxLeRyT": [ [ "Generic", @@ -18794,6 +17670,20 @@ "Prusa Generic PVA HF" ] ], + "OFxOHhZw": [ + [ + "Elegoo", + "ABS", + "Elegoo ABS" + ] + ], + "OFxUwUeW": [ + [ + "SUNLU", + "PLA", + "SUNLU PLA Marble" + ] + ], "OFxVzzn4": [ [ "Generic", @@ -18850,6 +17740,13 @@ "Other PC" ] ], + "OFybzvQN": [ + [ + "FilAr", + "PETG", + "FilAr PETG Gris Ceniza" + ] + ], "OFyoW5W2": [ [ "Generic", @@ -18864,6 +17761,13 @@ "Generic PC-CF" ] ], + "OFysxCep": [ + [ + "FilAr", + "PETG", + "FilAr PETG Coral" + ] + ], "OFyt23xJ": [ [ "Generic", @@ -18878,6 +17782,13 @@ "Flashforge TPU-95A" ] ], + "OFyxayW4": [ + [ + "Aliz", + "PLA", + "AliZ PLA" + ] + ], "OFzFbFcl": [ [ "Elegoo", @@ -18906,806 +17817,53 @@ "Ginger Generic PLA" ] ], - "OFzrWlH5": [ + "OFzrUUxc": [ [ - "Elegoo", - "PETG", - "Elegoo PETG HF" - ] - ], - "OGFA00": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Basic" - ] - ], - "OGFA01": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Matte" - ] - ], - "OGFA02": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Metal" - ] - ], - "OGFA03": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Impact" - ] - ], - "OGFA05": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Silk" - ] - ], - "OGFA06": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Silk+" - ] - ], - "OGFA07": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Marble" - ] - ], - "OGFA08": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Sparkle" - ] - ], - "OGFA09": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Tough" - ] - ], - "OGFA11": [ - [ - "Bambu Lab", - "PLA-AERO", - "Bambu PLA Aero" - ] - ], - "OGFA12": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Glow" - ] - ], - "OGFA13": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Dynamic" - ] - ], - "OGFA15": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Galaxy" - ] - ], - "OGFA16": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Wood" - ] - ], - "OGFA50": [ - [ - "Bambu Lab", - "PLA-CF", - "Bambu PLA-CF" - ] - ], - "OGFB00": [ - [ - "Bambu Lab", + "DREMC", "ABS", - "Bambu ABS" + "DREMC ABS" ] ], - "OGFB01": [ + "OFzyIxba": [ [ "Bambu Lab", - "ASA", - "Bambu ASA" - ] - ], - "OGFB02": [ - [ - "Bambu Lab", - "ASA-AERO", - "Bambu ASA-Aero" - ] - ], - "OGFB50": [ - [ - "Bambu Lab", - "ABS-GF", - "Bambu ABS-GF" - ] - ], - "OGFB51": [ - [ - "Bambu Lab", - "ASA-CF", - "Bambu ASA-CF" - ] - ], - "OGFB60": [ - [ - "Polymaker", - "ABS", - "PolyLite ABS" - ] - ], - "OGFB61": [ - [ - "Polymaker", - "ASA", - "PolyLite ASA" - ] - ], - "OGFB98": [ - [ - "Generic", - "ASA", - "Generic ASA" - ] - ], - "OGFB99": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "OGFC00": [ - [ - "Bambu Lab", - "PC", - "Bambu PC" - ] - ], - "OGFC01": [ - [ - "Bambu Lab", - "PC", - "Bambu PC FR" + "PVA", + "Bambu PVA" ] ], "OGFC99": [ - [ - "Generic", - "PC", - "Generic PC" - ], [ "Generic", "PC", "fdm_filament_pc" ] ], - "OGFG00": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG Basic" - ] - ], - "OGFG01": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG Translucent" - ] - ], - "OGFG02": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG HF" - ] - ], - "OGFG50": [ - [ - "Bambu Lab", - "PETG-CF", - "Bambu PETG-CF" - ] - ], - "OGFG60": [ - [ - "Polymaker", - "PETG", - "PolyLite PETG" - ] - ], - "OGFG97": [ - [ - "Generic", - "PCTG", - "fdm_filament_pctg" - ] - ], "OGFG99": [ - [ - "Generic", - "PETG", - "Generic PETG" - ], [ "Generic", "PETG", "fdm_filament_pet" ] ], - "OGFGG300": [ - [ - "GreenGate3D", - "PETG", - "GreenGate3D PETG" - ] - ], - "OGFL00": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA" - ] - ], - "OGFL00-1": [ - [ - "Polymaker", - "PLA", - "PolyTerra Dual PLA" - ] - ], - "OGFL01": [ - [ - "Polymaker", - "PLA", - "PolyTerra PLA" - ] - ], - "OGFL03": [ - [ - "eSUN", - "PLA", - "eSUN PLA+" - ] - ], - "OGFL04": [ - [ - "Overture", - "PLA", - "Overture PLA" - ] - ], - "OGFL05": [ - [ - "Overture", - "PLA", - "Overture Matte PLA" - ] - ], - "OGFL06": [ - [ - "Polymaker", - "PETG", - "Fiberon PETG-ESD" - ] - ], - "OGFL50": [ - [ - "Polymaker", - "PA6-CF", - "Fiberon PA6-CF" - ] - ], - "OGFL51": [ - [ - "Polymaker", - "PA-GF", - "Fiberon PA6-GF" - ] - ], - "OGFL52": [ - [ - "Polymaker", - "PA-CF", - "Fiberon PA12-CF" - ] - ], - "OGFL53": [ - [ - "Polymaker", - "PA", - "Fiberon PA612-CF" - ] - ], - "OGFL54": [ - [ - "Polymaker", - "PET-CF", - "Fiberon PET-CF" - ] - ], - "OGFL55": [ - [ - "Polymaker", - "PETG-CF", - "Fiberon PETG-rCF" - ] - ], - "OGFL95": [ - [ - "Generic", - "PLA", - "Generic PLA High Speed" - ] - ], "OGFL96": [ [ "Generic", "PLA", "Generic PLA Silk" - ], - [ - "Generic", - "PLA", - "fdm_filament_pla_silk" - ] - ], - "OGFL98": [ - [ - "Generic", - "PLA-CF", - "Generic PLA-CF" - ] - ], - "OGFL99": [ - [ - "Generic", - "PLA", - "fdm_filament_pla" - ] - ], - "OGFLC99": [ - [ - "Generic", - "CoPE", - "fdm_filament_cope" - ] - ], - "OGFN03": [ - [ - "Bambu Lab", - "PA-CF", - "Bambu PA-CF" - ] - ], - "OGFN04": [ - [ - "Bambu Lab", - "PA-CF", - "Bambu PAHT-CF" - ] - ], - "OGFN05": [ - [ - "Bambu Lab", - "PA6-CF", - "Bambu PA6-CF" - ] - ], - "OGFN06": [ - [ - "Bambu Lab", - "PPA-CF", - "Bambu PPA-CF" - ] - ], - "OGFN08": [ - [ - "Bambu Lab", - "PA-GF", - "Bambu PA6-GF" - ] - ], - "OGFN96": [ - [ - "Generic", - "PPA-GF", - "Generic PPA-GF" - ] - ], - "OGFN97": [ - [ - "Generic", - "PPA-CF", - "fdm_filament_ppa" - ] - ], - "OGFN98": [ - [ - "Generic", - "PA-CF", - "Generic PA-CF" ] ], "OGFN99": [ - [ - "Generic", - "PA", - "Generic PA" - ], [ "Generic", "PA", "fdm_filament_pa" ] ], - "OGFNMK00": [ - [ - "Numakers", - "PLA", - "Numakers PLA+" - ] - ], - "OGFP97": [ - [ - "Generic", - "PP", - "fdm_filament_pp" - ] - ], - "OGFP99": [ - [ - "Generic", - "PE", - "fdm_filament_pe" - ] - ], - "OGFPM001": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA" - ] - ], - "OGFPM002": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Matte" - ] - ], - "OGFPM003": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Marble" - ] - ], - "OGFPM004": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Silk" - ] - ], - "OGFPM005": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Satin" - ] - ], - "OGFPM006": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Translucent" - ] - ], - "OGFPM007": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Galaxy" - ] - ], - "OGFPM008": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Celestial" - ] - ], - "OGFPM009": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Starlight" - ] - ], - "OGFPM010": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Glow" - ] - ], - "OGFPM011": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Luminous" - ] - ], - "OGFPM012": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Metallic" - ] - ], - "OGFPM013": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Neon" - ] - ], - "OGFPM014": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA UV Shift" - ] - ], - "OGFPM015": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Temp Shift" - ] - ], - "OGFPM016": [ - [ - "Polymaker", - "PLA", - "Panchroma CoPE" - ] - ], - "OGFPM017": [ - [ - "Polymaker", - "PLA", - "Polymaker HT-PLA" - ] - ], - "OGFPM018": [ - [ - "Polymaker", - "PLA", - "Polymaker HT-PLA-GF" - ] - ], - "OGFPM019": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Pro" - ] - ], - "OGFR00": [ - [ - "FusRock", - "ABS-GF", - "FusRock ABS-GF" - ] - ], - "OGFR98": [ - [ - "Generic", - "PHA", - "fdm_filament_pha" - ] - ], - "OGFR99": [ - [ - "Generic", - "EVA", - "fdm_filament_eva" - ] - ], - "OGFS00": [ - [ - "Bambu Lab", - "PLA", - "Bambu Support W" - ] - ], - "OGFS01": [ - [ - "Bambu Lab", - "PA", - "Bambu Support G" - ] - ], - "OGFS02": [ - [ - "Bambu Lab", - "PLA", - "Bambu Support For PLA" - ] - ], - "OGFS03": [ - [ - "Bambu Lab", - "PA", - "Bambu Support For PA/PET" - ] - ], - "OGFS04": [ - [ - "Bambu Lab", - "PVA", - "Bambu PVA" - ] - ], - "OGFS05": [ - [ - "Bambu Lab", - "PLA", - "Bambu Support For PLA/PETG" - ] - ], - "OGFS06": [ - [ - "Bambu Lab", - "ABS", - "Bambu Support for ABS" - ] - ], - "OGFS97": [ - [ - "Generic", - "BVOH", - "fdm_filament_bvoh" - ] - ], - "OGFS98": [ - [ - "Generic", - "HIPS", - "fdm_filament_hips" - ] - ], - "OGFS99": [ - [ - "Generic", - "PVA", - "Generic PVA" - ] - ], - "OGFSNL02": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA Matte" - ] - ], - "OGFSNL03": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA+" - ] - ], - "OGFSNL04": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA+ 2.0" - ] - ], - "OGFSNL05": [ - [ - "SUNLU", - "PLA", - "SUNLU Silk PLA+" - ] - ], - "OGFSNL06": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA Marble" - ] - ], - "OGFSNL07": [ - [ - "SUNLU", - "PLA", - "SUNLU Wood PLA" - ] - ], "OGFSNL08": [ [ "Generic", "PETG", "SUNLU PETG" - ], - [ - "SUNLU", - "PETG", - "SUNLU PETG" - ] - ], - "OGFT01": [ - [ - "Bambu Lab", - "PET-CF", - "Bambu PET-CF" - ] - ], - "OGFT02": [ - [ - "Bambu Lab", - "PPS-CF", - "Bambu PPS-CF" - ] - ], - "OGFU00": [ - [ - "Bambu Lab", - "TPU", - "Bambu TPU 95A HF" - ] - ], - "OGFU01": [ - [ - "Bambu Lab", - "TPU", - "Bambu TPU 95A" - ] - ], - "OGFU99": [ - [ - "Generic", - "TPU", - "Generic TPU" - ] - ], - "OVTABS08": [ - [ - "Overture", - "ABS", - "Overture ABS Basic" ] ], "P1001": [ @@ -20414,34 +18572,6 @@ "TPU", "SeeMeCNC TPU" ] - ], - "VLMNT01": [ - [ - "Valment", - "PLA", - "Valment PLA" - ] - ], - "VLMNT02": [ - [ - "Valment", - "PLA", - "Valment PLA Silk" - ] - ], - "VLMNT03": [ - [ - "Valment", - "PLA-CF", - "Valment PLA-CF" - ] - ], - "VLMNT04": [ - [ - "Valment", - "PLA", - "Valment PLA Galaxy" - ] ] } } From 3ccc58a9fc6d35483cc0796fb835d1c2496f3a0b Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 4 Jul 2026 19:21:19 +0800 Subject: [PATCH 17/52] fix --- .../filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ .../filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ .../Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json | 3 +++ .../Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ .../filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ ...nycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ .../Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ .../Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ .../filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json | 3 +++ .../Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- .../filament/Creality Generic ABS @Ender-5Max-all.json | 2 +- .../filament/Creality Generic ASA @Ender-5Max-all.json | 2 +- .../filament/Creality Generic PA @Ender-5Max-all.json | 2 +- .../filament/Creality Generic PETG @Ender-5Max-all.json | 2 +- .../filament/Creality Generic TPU @Ender-5Max-all.json | 2 +- .../profiles/Creality/filament/Generic PETG-GF @K2-all.json | 2 +- .../profiles/Prusa/filament/Prusa Generic ASA @CORE One.json | 2 +- .../Prusa/filament/Prusa Generic PC @MINIIS 0.25.json | 1 + .../Prusa/filament/Prusa Generic PC @MINIIS 0.6.json | 1 + .../Prusa/filament/Prusa Generic PC @MINIIS 0.8.json | 1 + .../profiles/Prusa/filament/Prusa Generic PC @MINIIS.json | 1 + resources/profiles/Prusa/filament/Prusa Generic PC.json | 1 + .../profiles/Prusa/filament/Prusa Generic TPU @CORE One.json | 2 +- .../profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json | 2 +- .../profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json | 2 +- .../profiles/Prusa/filament/Prusa Generic TPU @MK4S.json | 2 +- .../Prusa/filament/Prusa Generic TPU HF @MINIIS.json | 2 +- .../profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json | 2 +- resources/profiles/Prusa/filament/Prusament PETG @base.json | 5 ++++- resources/profiles/Prusa/filament/Prusament PLA @base.json | 5 ++++- resources/profiles/Prusa/filament/Prusament rPLA @base.json | 5 ++++- .../Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json | 3 +++ .../profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json | 3 +++ .../re3D/filament/re3D Greengate rPETG @0.8 nozzle.json | 3 +++ .../re3D/filament/re3D Greengate rPETG @1.75 nozzle.json | 3 +++ resources/profiles/re3D/filament/re3D Greengate rPETG.json | 2 +- 36 files changed, 71 insertions(+), 18 deletions(-) diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json index 20d5e6463c..904b9cf13e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json index 7395073bce..64ca075800 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json index 59113ee018..7829e37710 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_type": [ "ASA" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json index 52f8ed3f9c..a9340e6553 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "0.96" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json index 4c1cba8e20..3a9a24a8e4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json index 0e975dc8d6..cef58f9461 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "0.96" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json index 18a8f258ec..6709f9bbd7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "0.96" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json index 85f0e8a993..5570f249d9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "0.96" ], diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json index 645f098e04..68f8367ed9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json @@ -9,6 +9,9 @@ "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra S1 0.4 nozzle" ], + "filament_vendor": [ + "Anycubic" + ], "filament_flow_ratio": [ "1" ], diff --git a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json index 0c49ed86e1..852b56e0e0 100644 --- a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -10,7 +10,7 @@ "Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle" ], "filament_vendor": [ - "Anycubic" + "Generic" ], "filament_type": [ "PETG" diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json index 2e7d34794d..1c3034cd80 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json @@ -77,7 +77,7 @@ "filament_unloading_speed": "90", "filament_unloading_speed_start": "100", "filament_vendor": [ - "Creality" + "Generic" ], "filament_wipe": "nil", "filament_wipe_distance": "nil", diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json index d93db9edb5..d2e8d0d5b5 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json @@ -77,7 +77,7 @@ "filament_unloading_speed": "90", "filament_unloading_speed_start": "100", "filament_vendor": [ - "Creality" + "Generic" ], "filament_wipe": "nil", "filament_wipe_distance": "nil", diff --git a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json index f72b006d9b..3b37837a4c 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json @@ -77,7 +77,7 @@ "filament_unloading_speed": "90", "filament_unloading_speed_start": "100", "filament_vendor": [ - "Creality" + "Generic" ], "filament_wipe": "nil", "filament_wipe_distance": "nil", diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json index 63700d9207..6dd5926993 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json @@ -77,7 +77,7 @@ "filament_unloading_speed": "90", "filament_unloading_speed_start": "100", "filament_vendor": [ - "Creality" + "Generic" ], "filament_wipe": "nil", "filament_wipe_distance": "nil", diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json index 20b4033ed4..437e0875bf 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json @@ -77,7 +77,7 @@ "filament_unloading_speed": "90", "filament_unloading_speed_start": "100", "filament_vendor": [ - "Creality" + "Generic" ], "filament_wipe": "nil", "filament_wipe_distance": "nil", diff --git a/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json b/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json index 2505b3ccc8..c2a9b7cc5c 100644 --- a/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json @@ -60,7 +60,7 @@ "PETG-GF" ], "filament_vendor": [ - "Creality" + "Generic" ], "hot_plate_temp": [ "70" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json index 2cffdfabe5..c2c39822d7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json @@ -61,7 +61,7 @@ "ASA" ], "filament_vendor": [ - "Prusa Polymers" + "Generic" ], "hot_plate_temp": [ "110" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.25.json index cb00cb55ac..37520ad405 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.25.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "P9dO2M6dPICX7rhQ", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.6.json index f747f7e54f..2642930cc1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.6.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "uAzPBVsMr6eS1XXS", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.8.json index 0a59345eef..2a3fe6485b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.8.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "MZd6zhq1pvhDj6yz", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS.json index 8cbe33d5b7..4a3bb29282 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "H7HoG0RfPLMTnCEo", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC.json b/resources/profiles/Prusa/filament/Prusa Generic PC.json index 3cb8ec5c0d..fed8a0bb7b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "51vavWbGjxnBwH7e", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json index 9cba165705..71fe4f21c5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json @@ -72,7 +72,7 @@ "M900 K0 ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" ], "filament_type": [ - "FLEX" + "TPU" ], "filament_vendor": [ "Generic" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json index 6108984ad1..e6d596aa4e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json @@ -18,7 +18,7 @@ "50" ], "filament_type": [ - "FLEX" + "TPU" ], "nozzle_temperature_initial_layer": [ "220" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json index bc6d7ad126..c0e8ca4577 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json @@ -19,7 +19,7 @@ "50" ], "filament_type": [ - "FLEX" + "TPU" ], "nozzle_temperature_initial_layer": [ "220" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json index 3fec5776ec..a7b5d1fcf6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json @@ -41,7 +41,7 @@ "M900 K0 ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" ], "filament_type": [ - "FLEX" + "TPU" ], "filament_wipe": "0", "filament_z_hop": "0", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json index 954e880fa6..2295816502 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json @@ -18,7 +18,7 @@ "50" ], "filament_type": [ - "FLEX" + "TPU" ], "nozzle_temperature_initial_layer": [ "220" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json index 91e97c5324..611c693da1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json @@ -19,7 +19,7 @@ "50" ], "filament_type": [ - "FLEX" + "TPU" ], "nozzle_temperature_initial_layer": [ "220" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @base.json b/resources/profiles/Prusa/filament/Prusament PETG @base.json index eee47346ca..9077aad91c 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @base.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pet", "from": "system", "filament_id": "OFpHq9gJ", - "instantiation": "false" + "instantiation": "false", + "filament_vendor": [ + "Prusa Polymers" + ] } diff --git a/resources/profiles/Prusa/filament/Prusament PLA @base.json b/resources/profiles/Prusa/filament/Prusament PLA @base.json index 707640da25..acba999339 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @base.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFkoT6jl", - "instantiation": "false" + "instantiation": "false", + "filament_vendor": [ + "Prusa Polymers" + ] } diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @base.json b/resources/profiles/Prusa/filament/Prusament rPLA @base.json index bdacf0cc19..c9b731d04c 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @base.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFjFPhUC", - "instantiation": "false" + "instantiation": "false", + "filament_vendor": [ + "Prusa Polymers" + ] } 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 2d9196c316..5926d0155d 100644 --- a/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json @@ -6,6 +6,9 @@ "from": "system", "instantiation": "true", "inherits": "Generic PETG @System", + "filament_vendor": [ + "Polymaker" + ], "filament_flow_ratio": [ "0.98" ], 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 9df001b6c9..384be40590 100644 --- a/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json @@ -6,6 +6,9 @@ "from": "system", "instantiation": "true", "inherits": "Generic PETG @System", + "filament_vendor": [ + "SUNLU" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json index 028bf042bb..42abbeb819 100644 --- a/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json @@ -6,6 +6,9 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", + "filament_vendor": [ + "GreenGate3D" + ], "nozzle_temperature_initial_layer": [ "0" ], diff --git a/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json b/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json index 5ae3d832ff..43de0b8685 100644 --- a/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json +++ b/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json @@ -6,6 +6,9 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", + "filament_vendor": [ + "GreenGate3D" + ], "nozzle_temperature_initial_layer": [ "0" ], diff --git a/resources/profiles/re3D/filament/re3D Greengate rPETG.json b/resources/profiles/re3D/filament/re3D Greengate rPETG.json index 5111e5b951..fe0ff8f81b 100644 --- a/resources/profiles/re3D/filament/re3D Greengate rPETG.json +++ b/resources/profiles/re3D/filament/re3D Greengate rPETG.json @@ -15,6 +15,6 @@ "re3D TerabotX 2" ], "filament_vendor": [ - "re3D" + "GreenGate3D" ] } \ No newline at end of file From e3ac835cc3bce79b7471fffbe5a74534e239983a Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 4 Jul 2026 20:19:49 +0800 Subject: [PATCH 18/52] v3.2 data fixes: per-vendor (filament_vendor, filament_type) reconciliation Reconcile every same-family triple divergence ahead of the v3.2 re-mint, per the pinned decision rule (spool brand; "Generic"-named -> Generic; brand-named -> that brand in every bundle; first-party lines -> printer brand; web evidence beats names). All 32 grandfathered triple_exceptions resolved plus swept same-class finds; every bundle re-verified split-free by loader-faithful re-resolution and adversarially reviewed. - Flashforge: 10 exceptions + swept Flashforge PLA; FusRock S-Multi/S-PAHT illegal types decided with product evidence (PA / PAHT); FusRock Generic roots -> Generic; 57 explicit Generic pins keep 14 uninvolved 0.25-nozzle families triple-identical. - Prusa: Prusament vendor -> "Prusa Polymers"; Generic ASA -> Generic; Generic TPU/TPU HF type FLEX -> TPU; fdm_filament_pc re-home (sanctioned): Prusa Generic PC family = OF97ru74, Prusament PC Blend = OFvDbkFq on the @XL pair; transitional ids deleted from OFL and Prusa fdm_filament_pc. - Anycubic: 8 first-party families -> Anycubic on fdm_filament_common leakers; Generic PETG outlier -> Generic. - Creality: 5 Ender-5Max/K2 generics + swept Creality Generic PA -> Generic. - Snapmaker: PolyLite PLA -> Polymaker; PLA Lite child aligned to root per Snapmaker/Orca_Presets evidence. - Sovol/re3D: Polymaker PETG / SUNLU PETG -> brand; Greengate rPETG -> GreenGate3D per manufacturer evidence. Snapshot/ledger intentionally untouched here: the central mechanical commit regenerates them; --check is expected red between the two. --- .../filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json | 3 +++ .../filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json | 3 +++ .../Flashforge/filament/Flashforge ASA-CF @FF C5.json | 3 +++ .../Flashforge/filament/Flashforge ASA-CF @FF C5P.json | 3 +++ .../Flashforge/filament/Flashforge ASA-CF @FF G4.json | 3 +++ .../Flashforge/filament/Flashforge ASA-CF @FF G4P.json | 3 +++ resources/profiles/Flashforge/filament/Flashforge ASA-CF.json | 3 +++ .../filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge HS PETG @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge HS PLA @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json | 3 +++ .../profiles/Flashforge/filament/Flashforge PA12-CF.json | 3 +++ resources/profiles/Flashforge/filament/Flashforge PA6-CF.json | 3 +++ .../profiles/Flashforge/filament/Flashforge PA66-CF.json | 3 +++ .../Flashforge/filament/Flashforge PET-CF @FF C5.json | 3 +++ .../Flashforge/filament/Flashforge PET-CF @FF C5P.json | 3 +++ resources/profiles/Flashforge/filament/Flashforge PET-CF.json | 3 +++ .../filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json | 3 +++ .../filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json | 3 +++ .../Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json | 3 +++ .../Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json | 3 +++ .../Flashforge PETG Transparent @FF G4 0.25 nozzle.json | 3 +++ .../Flashforge PETG Transparent @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json | 3 +++ .../filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json | 3 +++ .../Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json | 3 +++ .../Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json | 3 +++ .../Flashforge PLA Color Change @FF G4 0.25 nozzle.json | 3 +++ .../Flashforge PLA Color Change @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json | 3 +++ .../Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json | 3 +++ .../Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json | 3 +++ .../filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json | 3 +++ .../Flashforge/filament/Flashforge PPA-CF @FF C5.json | 3 +++ .../Flashforge/filament/Flashforge PPA-CF @FF C5P.json | 3 +++ resources/profiles/Flashforge/filament/Flashforge PPA-CF.json | 3 +++ resources/profiles/Flashforge/filament/Flashforge PPA-GF.json | 3 +++ .../Flashforge/filament/Flashforge PPS-CF @FF C5.json | 3 +++ .../Flashforge/filament/Flashforge PPS-CF @FF C5P.json | 3 +++ .../Flashforge/filament/Flashforge PPS-CF @FF G4.json | 3 +++ .../Flashforge/filament/Flashforge PPS-CF @FF G4P.json | 3 +++ resources/profiles/Flashforge/filament/Flashforge PPS-CF.json | 3 +++ .../Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json | 2 +- .../Flashforge/filament/FusRock/FusRock Generic PET-CF.json | 2 +- .../FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json | 2 +- .../Flashforge/filament/FusRock/FusRock Generic S-Multi.json | 4 ++-- .../FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json | 2 +- .../Flashforge/filament/FusRock/FusRock Generic S-PAHT.json | 4 ++-- .../OrcaFilamentLibrary/filament/base/fdm_filament_pc.json | 1 - .../profiles/Prusa/filament/Prusament PC Blend @XL 5T.json | 4 ++++ resources/profiles/Prusa/filament/Prusament PC Blend @XL.json | 4 ++++ resources/profiles/Prusa/filament/fdm_filament_pc.json | 1 - .../Snapmaker/filament/Polymaker/PolyLite PLA @base.json | 3 +++ .../profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json | 2 +- 92 files changed, 260 insertions(+), 11 deletions(-) diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json index 97970235e4..6f8cf9429f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json @@ -5,6 +5,9 @@ "from": "system", "filament_id": "GFB99", "instantiation": "false", + "filament_vendor": [ + "Flashforge" + ], "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", "Flashforge Adventurer 5M Pro 0.25 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json index 97f3d5f8fd..1abb4f5e51 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "SuEfcE6AYK8N1FI4", "filament_id": "OF5T1Y9R", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge ABS Basic @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json index e37450d400..523d9d05dd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "gmkc6fRLMI73Iut8", "filament_id": "OF5T1Y9R", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json index 09a01dd503..825a80c96d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "CuckX5MsN69806ow", "filament_id": "OF5T1Y9R", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json index 0d556da17d..3488e5bec6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "MBo02hFXn0ebDRdb", "filament_id": "OF5T1Y9R", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json index a852169f49..0ce215f69a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "XWta5jJFsCxBdEPd", "filament_id": "OFcy60o4", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "50" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json index 9d39413ec7..cd5b00cfe6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "quOwRRLcNfOy0sYf", "filament_id": "OFcy60o4", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "50" ], 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 575f408c5f..e465ad0da8 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": "OFM3PeVe", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", 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 fbad5b186b..ec34e23dcb 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": "OFM3PeVe", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json index 62f2f92006..2a33b88234 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json @@ -6,6 +6,9 @@ "setting_id": "ap7X4nWKfFR53NT0", "filament_id": "OFM3PeVe", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json index 8d88edb2ad..f07085eb07 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json @@ -6,6 +6,9 @@ "setting_id": "kZXg6odPm5iW79Qn", "filament_id": "OFM3PeVe", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json index b400c7d253..b124ce423d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json @@ -6,6 +6,9 @@ "setting_id": "CI5dvVrCNk2XTU82", "filament_id": "OFM3PeVe", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "filament_flow_ratio": [ "0.99" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json index b48169a92a..8a267c6548 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "1NFhtEvvvgZiHcto", "filament_id": "OFZQFvHQ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge HS PETG @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json index 62f46f554c..4ae4f02769 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "eNOkWn5PT8rDpA0g", "filament_id": "OFZQFvHQ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "cool_plate_temp": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json index f98635dba8..2764a938da 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "uXGuyvVxfdQW22vu", "filament_id": "OFZQFvHQ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json index 5df6b09e97..b0ddaf5825 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "bFVYSPkynBBapFjq", "filament_id": "OFZQFvHQ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json index aaac58ce66..56f8ff9792 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "bfPaqPGaR5zpTsLk", "filament_id": "OFoJUGj6", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json index 89eed340d5..25eab9bb09 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "JCQtuv8Abfz4jVRV", "filament_id": "OFoJUGj6", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json index e204e3e522..54be3be396 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "jFUS6233aq4XPgrn", "filament_id": "OFoJUGj6", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json index 78961a532c..3733afd3b6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json @@ -6,6 +6,9 @@ "setting_id": "1CevPV960sQWT3NF", "filament_id": "OFMHTnPP", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "filament_density": [ "1.1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json index 9b3764431d..bf2d34204a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json @@ -6,6 +6,9 @@ "setting_id": "NGbZ8pQVTRKw28kp", "filament_id": "OF0SyJhk", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "filament_density": [ "1.1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json index 7c2384dad6..988e26f75f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json @@ -6,6 +6,9 @@ "setting_id": "5pVoGBvbiUlrJSwR", "filament_id": "OFkaDtKx", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "filament_density": [ "1.1" ], 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 a993eeeae0..2077dc5243 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": "OFPJJxkF", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", 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 af92eaae0a..48c08e910b 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": "OFPJJxkF", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json index e5e005fd48..d74582ed08 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json @@ -6,6 +6,9 @@ "setting_id": "vflpXTS9GwnODQDH", "filament_id": "OFPJJxkF", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "filament_density": [ "1.1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json index 568a8f3adb..2df9381429 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json @@ -5,6 +5,9 @@ "from": "system", "filament_id": "GFG99", "instantiation": "false", + "filament_vendor": [ + "Flashforge" + ], "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", "Flashforge Adventurer 5M Pro 0.25 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json index 339ae66b90..ee093e88fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "xOZQvdZa1YCcnjor", "filament_id": "OFuyJhLF", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PETG Basic @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json index 97e6a20e7c..d66f57eb00 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "8EUg1hTLfsyDPbnG", "filament_id": "OF38Hyk4", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PETG Pro @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json index 2d32a805ff..56b1f382f0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "UKhV8A2DBc1xyNWc", "filament_id": "OF38Hyk4", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json index 182617e5aa..105b1cee65 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "XFSgx95whLw5FD08", "filament_id": "OF38Hyk4", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json index 80971691dd..8b3169ba94 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "8Jc4eedkknqNB87s", "filament_id": "OF38Hyk4", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json index 656e6cfa51..c6cca24dde 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "W59yTyPnVv4LYiah", "filament_id": "OFRgDMDJ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PETG Transparent @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json index 996ed62e1d..e29546069a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "NRY4fsPNtnqs0kyH", "filament_id": "OFRgDMDJ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json index 452cabe424..90e1a598de 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "p5c6XJ1VD8cn2Meh", "filament_id": "OFRgDMDJ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json index a25a050f9f..4a05c795b2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "C0VV5Uzsl4icRgKa", "filament_id": "OFRgDMDJ", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json index f799be321a..5fe939a7b7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json @@ -4,6 +4,9 @@ "inherits": "Flashforge Generic PLA", "from": "system", "instantiation": "false", + "filament_vendor": [ + "Flashforge" + ], "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", "Flashforge Adventurer 5M Pro 0.25 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json index 8043805bec..155f7ddcb1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "3fuVuyVcn8U0bRJQ", "filament_id": "OFHBTqyD", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Basic @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json index 53165d7174..86153a46df 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "FrRRUl5OT773uCju", "filament_id": "OFHBTqyD", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json index cb49ae9309..fd7393e08c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "QXJgY8OPyaoYUI1D", "filament_id": "OFHBTqyD", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json index 7d438c66c4..3199072e84 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "GrwiA2dArUGV9x2g", "filament_id": "OFHBTqyD", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json index 1b0b0ba477..cfb8df6c5c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "KXy0WyQp06VC2ICh", "filament_id": "OFyoW5W2", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Color Change @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json index 26c2f00a33..0ef7325644 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "9cGw7tXD8YJHEi1H", "filament_id": "OFyoW5W2", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json index 974b8eef26..653af0cdfa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "k1OiugasUs7baG1f", "filament_id": "OFyoW5W2", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json index f9e5526878..33a309150b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "HXVX4mDeUSfW2RgL", "filament_id": "OFyoW5W2", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json index c052d94ea4..70eb17ba53 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "a1jTbQsflD7SDFih", "filament_id": "OFXv4FUi", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Galaxy @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json index c0d94ddeeb..6f3447e0b0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "zyCRsy0mHRgyuQqt", "filament_id": "OFXv4FUi", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json index abf30fd1f3..de910c8202 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "DL7lxDI35YErCTWX", "filament_id": "OFXv4FUi", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json index 7e1caa26a0..58cd97fed5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "ZQYrljZtu3es26hB", "filament_id": "OFXv4FUi", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json index 3b29dee372..1f58b7ce9d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "k8iibCO2EnlTSRyi", "filament_id": "OFwf0oWp", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Luminous @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json index ac148b7b66..316f797d5b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "pACct3L7duMh3hfx", "filament_id": "OFwf0oWp", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json index 3b6dbd321e..99d6e50b42 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "qZ6kKjRCMfe4Ql3F", "filament_id": "OFwf0oWp", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json index bb909dbaaf..f7a674246f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "zJFUJKDJRYi1pRL7", "filament_id": "OFwf0oWp", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json index 8c31d9b88c..21fb7bfe80 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "DcbISTLvKNMZRzKx", "filament_id": "OF60Lmeq", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Matte @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json index 72fa362c28..b6fc07dc4b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "4fwlIrzy6O2EsyBZ", "filament_id": "OF60Lmeq", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json index 921d2dea18..8050f544ff 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "cnPwhLyBq6JL8gEA", "filament_id": "OF60Lmeq", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json index 03bcc21993..a32fbb2952 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "g1gnICJ3u6hpGazQ", "filament_id": "OF60Lmeq", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json index 7aff3d8593..439527a780 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "vwwb5nfO63U1ErCn", "filament_id": "OFWv6JYn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Metal @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json index 4a0cc3727c..3d67e7a928 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "ekq4MRPyzlYxRhbX", "filament_id": "OFWv6JYn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json index c1ecd24405..184a2ed052 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "VvMaIJwFk4Q6KX4p", "filament_id": "OFWv6JYn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json index b488812551..ec32a91e56 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "vVKalJViJuBvlHkK", "filament_id": "OFWv6JYn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json index 0c9008df95..5cb8fcea1a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "DIMoIGOGedN17WbO", "filament_id": "OFTa6gPH", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Pro @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json index 81bb6aa26f..1e838feabd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "SC5LJcecBaEG5by3", "filament_id": "OFTa6gPH", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json index 15ff802ebb..c29e57868b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "ZENqqRqvEOeloAgs", "filament_id": "OFTa6gPH", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json index 86ac22cb22..d839e8b67f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "wV01bqvZ6MRaEibZ", "filament_id": "OFTa6gPH", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json index e3d9c57369..7ef705723e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "mx6NWRkqyo2U12XQ", "filament_id": "OFAGrVjP", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json index ceef2f32d5..50440528c4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "x5m17Z5UpqpTtwgF", "filament_id": "OFAGrVjP", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json index 1521adad6b..dbd9678eb4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "hnWRLUwnfXiwnqBM", "filament_id": "OFAGrVjP", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json index d4227c010a..3202d660c4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "ojYsAanAPqYhgFoe", "filament_id": "OF9sr3Vn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_settings_id": [ "Flashforge PLA Sparkle @FF AD5M 0.25 nozzle" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json index 027aad1ae3..5156491cfe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "xVYaNvQwM2chTkPe", "filament_id": "OF9sr3Vn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "complete_print_exhaust_fan_speed": [ "80" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json index 8b79997f28..f722c56cbf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "jmVmKMUCcowszvVp", "filament_id": "OF9sr3Vn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json index 7a88f501a1..6817de3a60 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json @@ -6,6 +6,9 @@ "setting_id": "4L3Zm1YIxs8J8dp9", "filament_id": "OF9sr3Vn", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "additional_cooling_fan_speed": [ "40" ], 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 4cbd30ea72..6bdea5bcd0 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": "OFQCAYAt", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", 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 de09f3ee20..daa6fb18ea 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": "OFQCAYAt", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json index 0b5e6a712c..883ee5c3ac 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json @@ -6,6 +6,9 @@ "setting_id": "MFItX51zZO0KYjdk", "filament_id": "OFQCAYAt", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "filament_flow_ratio": [ "0.99" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json index 54cfd76a33..e4a3581fe4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json @@ -6,6 +6,9 @@ "setting_id": "KITjZXcyM4N8cVyu", "filament_id": "OFp8lkYD", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "fan_max_speed": [ "40" ], 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 5080890de1..54faf072f3 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": "OFZcrV9c", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", 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 d28c9de034..7cb88b5960 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": "OFZcrV9c", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json index 67150ba1b4..309fb174e7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json @@ -6,6 +6,9 @@ "setting_id": "oSGlx5mtGh07BnOz", "filament_id": "OFZcrV9c", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json index c9b3f231e5..67c51aa68e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json @@ -6,6 +6,9 @@ "setting_id": "i5DllSvYjVPO04Su", "filament_id": "OFZcrV9c", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json index db7b6c956b..97ff645bb1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json @@ -6,6 +6,9 @@ "setting_id": "l3dYtVM52X0UMRix", "filament_id": "OFZcrV9c", "instantiation": "true", + "filament_vendor": [ + "Flashforge" + ], "filament_flow_ratio": [ "0.99" ], diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json index 16ce25c253..37b5e26001 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json @@ -180,7 +180,7 @@ "40" ], "filament_vendor": [ - "FusRock" + "Generic" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json index 3deed3be44..b87e15f2df 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json @@ -180,7 +180,7 @@ "40" ], "filament_vendor": [ - "FusRock" + "Generic" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json index d259f1a1ef..24c8414b2e 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json @@ -37,7 +37,7 @@ "; filament start gcode" ], "filament_type": [ - "PET-CF" + "PA" ], "filament_unloading_speed": [ "35" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json index d12baa2e6b..66b94a8bc0 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json @@ -167,7 +167,7 @@ "0" ], "filament_type": [ - "S-Multi" + "PA" ], "filament_unload_time": [ "0" @@ -179,7 +179,7 @@ "40" ], "filament_vendor": [ - "FusRock" + "Generic" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json index 6b2ec8baa0..5fa539c9d8 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json @@ -37,7 +37,7 @@ "; filament start gcode" ], "filament_type": [ - "PA-CF" + "PAHT" ], "filament_unloading_speed": [ "35" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json index ca207c1219..6c09203af8 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json @@ -167,7 +167,7 @@ "0" ], "filament_type": [ - "S-PAHT" + "PAHT" ], "filament_unload_time": [ "0" @@ -179,7 +179,7 @@ "40" ], "filament_vendor": [ - "FusRock" + "Generic" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json index b33b21cdab..120689c074 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pc", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OFtcKVgP", "instantiation": "false", "supertack_plate_temp": [ "0" diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PC Blend @XL 5T.json index 9e715f9e52..922492ce7c 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @XL 5T.json @@ -4,7 +4,11 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "FOgpd4BtawBtmjPB", + "filament_id": "OFvDbkFq", "instantiation": "true", + "filament_vendor": [ + "Prusa Polymers" + ], "nozzle_temperature_intial_layer": "275", "nozzle_temperature": "275", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json b/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json index 8494169720..2ea273902c 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json @@ -4,7 +4,11 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "DLTlxt04GREtOiec", + "filament_id": "OFvDbkFq", "instantiation": "true", + "filament_vendor": [ + "Prusa Polymers" + ], "nozzle_temperature_intial_layer": "275", "nozzle_temperature": "275", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/fdm_filament_pc.json b/resources/profiles/Prusa/filament/fdm_filament_pc.json index 01a376d817..bc1b6a3a3a 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pc.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pc.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pc", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFC99", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json index 4173572637..fcdcf7b003 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json @@ -5,6 +5,9 @@ "name": "PolyLite PLA @base", "filament_id": "1393866034", "inherits": "fdm_filament_pla", + "filament_vendor": [ + "Polymaker" + ], "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json index fab081d5d7..d2c9dddefb 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json @@ -198,7 +198,7 @@ "100" ], "filament_vendor": [ - "Polymaker" + "Snapmaker" ], "filament_wipe": [ "nil" From f7c1b290fd07c50f77443400552452d2e975e7e5 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 4 Jul 2026 21:09:29 +0800 Subject: [PATCH 19/52] v3.2: vendor-bundle re-mint under the product-triple rule Every remaining legacy filament_id outside the BBL/QD_* islands re-derives from its product triple (filament_vendor / filament_type / family name), completing the content-addressed id model of filament_id_plan_v3.md: - Relocation pre-step: 14 fdm_filament_* template forks (Cubicon x3, Prusa x6, RH3D x6 minus the pc fork already re-homed) stop declaring ids; the 16 presets that rode Prusa's forks now declare the id they already resolved (verified zero effective-id drift over all 5892 instantiated presets). - --drop-redundant-ids: 6 Custom/MyToolChanger generics drop copied GF ids and ride their OFL families. - --remint over all 62 non-island vendors: 2647 declarations re-derived; identical products converge cross-bundle (showcase: PolyLite PLA is now OF5CgdDq in OrcaFilamentLibrary, Qidi, OrcaArena and Snapmaker). - Prusament @XL completions surfaced by the relocation: filament_vendor ["Prusa Polymers"] on the 8 @XL declarers; Prusament PA-CF typed PA11-CF (the product is Prusament PA11CF) and PC-CF typed PC-CF (-CF family typed as base polymer); each family converges on one id. - Succession: 331 ids retired with mode-rule successors, 355 never-shipped v1 mints forgotten with chain splicing, 151 GF-shaped ids released to the island space with hints, 27 curated BBL-generic -> OFL-generic hints (GFL99 -> OFDSrzZ8 class). New --retire "OLD=NEW" maintenance mode records lineage for OGFC99/OGFG99/OGFN99 (the shipped ids of OFL's Generic PC/PETG/PA in released versions, whose claims migrated in v3.1 while Cubicon's inert fork declarations kept them alive). - Retiring the P-hex system ids removes the last system ids from check_ams_filament_valid's destructive P-gate. - AMS-ambiguity fixes surfaced by convergence (validator -f): 4 presets riding another family's id through inherits now declare their true family id (Elegoo Generic ASA-CF/PETG-CF, Snapmaker PolyLite Dual PLA / PolyLite J1 PLA); 9 Cubicon @base presets and Dremel Generic PLA, which duplicate their per-printer variants on the same printers, split onto the salt-1 iteration of their triple (sanctioned by the mint-conformance check; --remint now leaves salt-conformant declarations alone). Gates: assign_filament_ids --check 0; orca_extra_profile_check 0; 116 python unit tests; config-equivalence over all 5892 instantiated presets (byte-identical configs except the 14 sanctioned Prusament vendor/type corrections; setting_id and compatible_printers unchanged; per-family convergence and ledger conservation verified); profile validator base/-f/-r(BBL)/-r(Qidi) all green; libslic3r_tests 48610 assertions; Moonraker OFL generic map check; custom-preset fixture archives v1.9.0-v2.4.1. --- doc/developer-reference/filament_id.md | 14 +- .../profiles/Afinia/filament/Afinia ABS+.json | 2 +- .../Afinia/filament/Afinia ABS+@HS.json | 2 +- .../profiles/Afinia/filament/Afinia ABS.json | 2 +- .../Afinia/filament/Afinia ABS@HS.json | 2 +- .../profiles/Afinia/filament/Afinia PLA.json | 2 +- .../Afinia/filament/Afinia PLA@HS.json | 2 +- .../profiles/Afinia/filament/Afinia TPU.json | 2 +- .../Afinia/filament/Afinia TPU@HS.json | 2 +- .../Afinia/filament/Afinia Value ABS.json | 2 +- .../Afinia/filament/Afinia Value ABS@HS.json | 2 +- .../Afinia/filament/Afinia Value PLA.json | 2 +- .../Afinia/filament/Afinia Value PLA@HS.json | 2 +- .../filament/Anker Generic ABS @base.json | 2 +- .../filament/Anker Generic ASA @base.json | 2 +- .../filament/Anker Generic PA @base.json | 2 +- .../filament/Anker Generic PA-CF @base.json | 2 +- .../filament/Anker Generic PC @base.json | 2 +- .../filament/Anker Generic PETG @base.json | 2 +- .../filament/Anker Generic PETG-CF @base.json | 2 +- .../filament/Anker Generic PLA @base.json | 2 +- .../Anker Generic PLA Silk @base.json | 2 +- .../filament/Anker Generic PLA+ @base.json | 2 +- .../filament/Anker Generic PLA-CF @base.json | 2 +- .../filament/Anker Generic PVA @base.json | 2 +- .../filament/Anker Generic TPU @base.json | 2 +- ... ABS @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ... ABS @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ... ABS @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...bic ABS @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...BS @Anycubic Kobra S1 Max 0.25 nozzle.json | 2 +- ...ABS @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ABS @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ABS @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...ubic ABS @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...ubic ASA @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ... ASA @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ... ASA @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...bic ASA @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...SA @Anycubic Kobra S1 Max 0.25 nozzle.json | 2 +- ...ASA @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ASA @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ASA @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...ubic ASA @Anycubic Kobra X 0.4 nozzle.json | 2 +- .../filament/Anycubic Generic ABS.json | 2 +- .../filament/Anycubic Generic ASA.json | 2 +- .../filament/Anycubic Generic PA-CF.json | 2 +- .../filament/Anycubic Generic PA.json | 2 +- .../filament/Anycubic Generic PC.json | 2 +- .../filament/Anycubic Generic PETG.json | 2 +- .../filament/Anycubic Generic PLA-CF.json | 2 +- .../filament/Anycubic Generic PLA.json | 2 +- .../filament/Anycubic Generic PVA.json | 2 +- .../filament/Anycubic Generic TPU.json | 2 +- ... PA @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ... PA @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ... PA @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ... PC @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ... PC @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ... PC @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...-GF @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...-GF @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...-GF @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ... 95A @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...EBA @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...EBA @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...EBA @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...bic PETG @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...PETG @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...PETG @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ...PETG @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...ic PETG @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...TG @Anycubic Kobra S1 Max 0.25 nozzle.json | 2 +- ...ETG @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ETG @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ETG @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...bic PETG @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Max 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json | 2 +- ...PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.2 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.6 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.8 nozzle.json | 2 +- ... PLA @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ... PLA @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...ic PLA @Anycubic Kobra Neo 0.4 nozzle.json | 2 +- ...bic PLA @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...LA @Anycubic Kobra S1 Max 0.25 nozzle.json | 2 +- ...PLA @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...PLA @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...PLA @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...PLA Glow @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...low @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...low @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...low @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...PLA Glow @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...gh Speed @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...peed @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...h Speed @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...eed @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...eed @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...eed @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...gh Speed @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...nous @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...LA Matte @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...atte @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...tte @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...tte @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...tte @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...LA Matte @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...c PLA SE @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...Silk @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...LA Silk @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...ilk @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ilk @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ilk @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...PLA Silk @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...PLA Slik @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...ent @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...bic PLA+ @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...ic PLA+ @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...LA+ @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...LA+ @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...LA+ @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...bic PLA+ @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...PVA @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...PVA @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...PVA @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ...ubic PVA @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...95A @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...95A @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...95A @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ... TPU 95A @Anycubic Kobra X 0.4 nozzle.json | 2 +- ... TPU @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ... TPU @Anycubic Kobra 3 Max 0.6 nozzle.json | 2 +- ... TPU @Anycubic Kobra 3 Max 0.8 nozzle.json | 2 +- ...bic TPU @Anycubic Kobra S1 0.4 nozzle.json | 2 +- ...ACE @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ACE @Anycubic Kobra S1 Max 0.6 nozzle.json | 2 +- ...ACE @Anycubic Kobra S1 Max 0.8 nozzle.json | 2 +- ... for ACE @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...eric ABS @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...ETG @Anycubic Kobra S1 Max 0.4 nozzle.json | 2 +- ...ric PETG @Anycubic Kobra X 0.4 nozzle.json | 2 +- ...asic @Anycubic Kobra 3 Max 0.4 nozzle.json | 2 +- ...eric TPU @Anycubic Kobra 3 0.4 nozzle.json | 2 +- .../Fiberon PA6-CF20 @Anycubic Kobra S1.json | 2 +- .../Panchroma PLA @Anycubic Kobra S1.json | 2 +- .../Polymaker PLA Pro @Anycubic Kobra S1.json | 2 +- ...r PLA Pro Metallic @Anycubic Kobra S1.json | 2 +- ...lery ABS @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery ABS @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery ABS @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery ABS @Artillery M1 Pro 0.8 nozzle.json | 2 +- .../Artillery/filament/Artillery ABS.json | 2 +- ...lery ASA @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery ASA @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery ASA @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery ASA @Artillery M1 Pro 0.8 nozzle.json | 2 +- .../filament/Artillery Generic ABS.json | 2 +- .../filament/Artillery Generic ASA.json | 2 +- .../filament/Artillery Generic PETG.json | 2 +- .../filament/Artillery Generic PLA-CF.json | 2 +- .../filament/Artillery Generic PLA.json | 2 +- .../filament/Artillery Generic TPU.json | 2 +- ...llery PA @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...ry PA-CF @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...llery PC @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery PET @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery PET @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery PET @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery PET @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.8 nozzle.json | 2 +- ... PETG-CF @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../Artillery/filament/Artillery PETG.json | 2 +- ...lery PLA @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery PLA @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery PLA @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...LA Basic @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...LA Basic @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...LA Basic @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...LA Basic @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...A Basic+ @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../filament/Artillery PLA Basic.json | 2 +- ...LA Matte @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...LA Matte @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...LA Matte @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...LA Matte @Artillery M1 Pro 0.8 nozzle.json | 2 +- .../filament/Artillery PLA Matte.json | 2 +- ...PLA Silk @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...PLA Silk @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...PLA Silk @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...PLA Silk @Artillery M1 Pro 0.8 nozzle.json | 2 +- .../filament/Artillery PLA Silk.json | 2 +- .../filament/Artillery PLA Tough.json | 2 +- ...y PLA-CF @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery PVA @Artillery M1 Pro 0.2 nozzle.json | 2 +- ...lery PVA @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery PVA @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery PVA @Artillery M1 Pro 0.8 nozzle.json | 2 +- ...lery TPU @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery TPU @Artillery M1 Pro 0.6 nozzle.json | 2 +- ...lery TPU @Artillery M1 Pro 0.8 nozzle.json | 2 +- .../Artillery/filament/Artillery TPU.json | 2 +- .../Blocks/filament/Blocks Generic ABS.json | 2 +- .../filament/Blocks Generic ASA-CF.json | 2 +- .../Blocks/filament/Blocks Generic ASA.json | 2 +- .../Blocks/filament/Blocks Generic PA-CF.json | 2 +- .../Blocks/filament/Blocks Generic PA.json | 2 +- .../Blocks/filament/Blocks Generic PC.json | 2 +- .../Blocks/filament/Blocks Generic PETG.json | 2 +- .../filament/Blocks Generic PLA-CF.json | 2 +- .../Blocks/filament/Blocks Generic PLA.json | 2 +- .../Blocks/filament/Blocks Generic PVA.json | 2 +- .../Blocks/filament/Blocks Generic TPU.json | 2 +- .../filament/C1 Generic High Flow PETG.json | 2 +- .../CONSTRUCT3D/filament/C1 Generic PETG.json | 2 +- .../CONSTRUCT3D/filament/C1 Generic PLA.json | 2 +- ...uanying ABS @Chuanying X1 0.25 Nozzle.json | 2 +- .../filament/Chuanying Generic ABS.json | 2 +- .../filament/Chuanying Generic ASA.json | 2 +- .../filament/Chuanying Generic HIPS.json | 2 +- .../filament/Chuanying Generic HS PLA.json | 2 +- .../filament/Chuanying Generic PETG-CF10.json | 2 +- .../filament/Chuanying Generic PETG.json | 2 +- .../filament/Chuanying Generic PLA-CF10.json | 2 +- .../filament/Chuanying Generic PLA-Silk.json | 2 +- .../filament/Chuanying Generic PLA.json | 2 +- .../filament/Chuanying Generic PVA.json | 2 +- .../filament/Chuanying Generic TPU.json | 2 +- ...anying PETG @Chuanying X1 0.25 Nozzle.json | 2 +- .../filament/CoPrint Generic ABS.json | 2 +- .../filament/CoPrint Generic PETG.json | 2 +- .../filament/CoPrint Generic PLA.json | 2 +- .../filament/CoPrint Generic TPU.json | 2 +- .../filament/CoLiDo ABS @CoLiDo SR1.json | 2 +- .../CoLiDo Generic ABS @CoLiDo DIY 4.0.json | 2 +- .../CoLiDo Generic ABS @CoLiDo X16.json | 2 +- .../CoLiDo Generic PETG @CoLiDo DIY 4.0.json | 2 +- .../CoLiDo Generic PETG @CoLiDo X16.json | 2 +- .../CoLiDo Generic PLA @CoLiDo DIY 4.0.json | 2 +- .../CoLiDo Generic PLA @CoLiDo X16.json | 2 +- .../CoLiDo Generic TPU @CoLiDo DIY 4.0.json | 2 +- .../CoLiDo Generic TPU @CoLiDo X16.json | 2 +- .../filament/CoLiDo PETG @CoLiDo SR1.json | 2 +- .../filament/CoLiDo PLA @CoLiDo SR1.json | 2 +- .../filament/CoLiDo PLA Silk @CoLiDo SR1.json | 2 +- .../CoLiDo PLA+ @CoLiDo DIY 4.0 V2.json | 2 +- .../Comgrow/filament/Comgrow Generic ABS.json | 2 +- .../filament/Comgrow Generic PETG.json | 2 +- .../Comgrow/filament/Comgrow Generic PLA.json | 2 +- .../Comgrow/filament/Comgrow T300 PLA.json | 2 +- .../filament/CR-ABS @Ender-3 V4-all.json | 2 +- .../Creality/filament/CR-ABS @Hi-all.json | 2 +- .../filament/CR-ABS @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/CR-ABS @K1 SE-all.json | 2 +- .../filament/CR-ABS @K1 SE_CFS-C-all.json | 2 +- .../Creality/filament/CR-ABS @K1C-all.json | 2 +- .../filament/CR-ABS @K1C_CFS-C-all.json | 2 +- .../filament/CR-ABS @K1_CFS-C-all.json | 2 +- .../filament/CR-ABS @K2 Plus-all.json | 2 +- .../Creality/filament/CR-ABS @K2 Pro-all.json | 2 +- .../Creality/filament/CR-ABS @K2 SE-all.json | 2 +- .../Creality/filament/CR-ABS @K2-all.json | 2 +- .../filament/CR-Nylon @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/CR-Nylon @K1C-all.json | 2 +- .../filament/CR-Nylon @K1C_CFS-C-all.json | 2 +- .../filament/CR-Nylon @K1_CFS-C-all.json | 2 +- .../filament/CR-Nylon @K2 Plus-all.json | 2 +- .../filament/CR-PETG @Ender-3 V4-all.json | 2 +- .../Creality/filament/CR-PETG @Hi-all.json | 2 +- .../filament/CR-PETG @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/CR-PETG @K1 SE-all.json | 2 +- .../filament/CR-PETG @K1 SE_CFS-C-all.json | 2 +- .../Creality/filament/CR-PETG @K1C-all.json | 2 +- .../filament/CR-PETG @K1C_CFS-C-all.json | 2 +- .../filament/CR-PETG @K1_CFS-C-all.json | 2 +- .../filament/CR-PETG @K2 Plus-all.json | 2 +- .../filament/CR-PETG @K2 Pro-all.json | 2 +- .../Creality/filament/CR-PETG @K2 SE-all.json | 2 +- .../Creality/filament/CR-PETG @K2-all.json | 2 +- .../filament/CR-PETG @SPARKX i7-all.json | 2 +- .../filament/CR-PLA @Ender-3 V4-all.json | 2 +- .../Creality/filament/CR-PLA @Hi-all.json | 2 +- .../filament/CR-PLA @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/CR-PLA @K1 SE-all.json | 2 +- .../filament/CR-PLA @K1 SE_CFS-C-all.json | 2 +- .../Creality/filament/CR-PLA @K1C-all.json | 2 +- .../filament/CR-PLA @K1C_CFS-C-all.json | 2 +- .../filament/CR-PLA @K1_CFS-C-all.json | 2 +- .../filament/CR-PLA @K2 Plus-all.json | 2 +- .../Creality/filament/CR-PLA @K2 Pro-all.json | 2 +- .../Creality/filament/CR-PLA @K2 SE-all.json | 2 +- .../Creality/filament/CR-PLA @K2-all.json | 2 +- .../filament/CR-PLA @SPARKX i7-all.json | 2 +- .../CR-PLA Carbon @K1 Max_CFS-C-all.json | 2 +- .../filament/CR-PLA Carbon @K1C-all.json | 2 +- .../CR-PLA Carbon @K1C_CFS-C-all.json | 2 +- .../filament/CR-PLA Carbon @K1_CFS-C-all.json | 2 +- .../filament/CR-PLA Carbon @K2 Plus-all.json | 2 +- .../CR-PLA Fluo @K1 Max_CFS-C-all.json | 2 +- .../filament/CR-PLA Fluo @K1C-all.json | 2 +- .../filament/CR-PLA Fluo @K1C_CFS-C-all.json | 2 +- .../filament/CR-PLA Fluo @K1_CFS-C-all.json | 2 +- .../filament/CR-PLA Fluo @K2 Plus-all.json | 2 +- .../filament/CR-PLA Fluo @K2 Pro-all.json | 2 +- .../filament/CR-PLA Fluo @K2-all.json | 2 +- .../filament/CR-PLA Fluo @SPARKX i7-all.json | 2 +- .../CR-PLA Matte @Ender-3 V4-all.json | 2 +- .../CR-PLA Matte @K1 Max_CFS-C-all.json | 2 +- .../filament/CR-PLA Matte @K1C-all.json | 2 +- .../filament/CR-PLA Matte @K1C_CFS-C-all.json | 2 +- .../filament/CR-PLA Matte @K1_CFS-C-all.json | 2 +- .../filament/CR-PLA Matte @K2 Plus-all.json | 2 +- .../filament/CR-PLA Matte @K2 Pro-all.json | 2 +- .../filament/CR-PLA Matte @K2-all.json | 2 +- .../filament/CR-PLA Matte @SPARKX i7-all.json | 2 +- .../filament/CR-Silk @Ender-3 V4-all.json | 2 +- .../Creality/filament/CR-Silk @Hi-all.json | 2 +- .../filament/CR-Silk @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/CR-Silk @K1 SE-all.json | 2 +- .../filament/CR-Silk @K1 SE_CFS-C-all.json | 2 +- .../Creality/filament/CR-Silk @K1C-all.json | 2 +- .../filament/CR-Silk @K1C_CFS-C-all.json | 2 +- .../filament/CR-Silk @K1_CFS-C-all.json | 2 +- .../filament/CR-Silk @K2 Plus-all.json | 2 +- .../filament/CR-Silk @K2 Pro-all.json | 2 +- .../Creality/filament/CR-Silk @K2 SE-all.json | 2 +- .../Creality/filament/CR-Silk @K2-all.json | 2 +- .../filament/CR-Silk @SPARKX i7-all.json | 2 +- .../filament/CR-TPU @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/CR-TPU @K1C-all.json | 2 +- .../filament/CR-TPU @K1C_CFS-C-all.json | 2 +- .../filament/CR-TPU @K1_CFS-C-all.json | 2 +- .../filament/CR-TPU @K2 Plus-all.json | 2 +- .../Creality/filament/CR-TPU @K2 Pro-all.json | 2 +- .../Creality/filament/CR-TPU @K2-all.json | 2 +- .../filament/CR-TPU @SPARKX i7-all.json | 2 +- .../filament/CR-Wood @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/CR-Wood @K1C-all.json | 2 +- .../filament/CR-Wood @K1C_CFS-C-all.json | 2 +- .../filament/CR-Wood @K1_CFS-C-all.json | 2 +- .../filament/CR-Wood @K2 Plus-all.json | 2 +- .../Creality Generic ABS @Ender-5Max-all.json | 2 +- .../filament/Creality Generic ABS.json | 2 +- .../Creality Generic ASA @Ender-5Max-all.json | 2 +- .../Creality Generic ASA-CF @Hi-all.json | 2 +- .../filament/Creality Generic ASA.json | 2 +- .../Creality Generic PA @Ender-5Max-all.json | 2 +- .../filament/Creality Generic PA-CF.json | 2 +- .../filament/Creality Generic PC.json | 2 +- ...Creality Generic PETG @Ender-5Max-all.json | 2 +- .../Creality Generic PETG-CF @Hi-all.json | 2 +- .../filament/Creality Generic PETG.json | 2 +- .../Creality Generic PLA @Ender-5Max-all.json | 2 +- ...Generic PLA High Speed @Ender-3V3-all.json | 2 +- ...eality Generic PLA High Speed @Hi-all.json | 2 +- ...eality Generic PLA High Speed @K1-all.json | 2 +- ...eality Generic PLA High Speed @K2-all.json | 2 +- ...lity Generic PLA Matte @Ender-3V3-all.json | 2 +- .../Creality Generic PLA Matte @Hi-all.json | 2 +- .../Creality Generic PLA Matte @K1-all.json | 2 +- .../Creality Generic PLA Matte @K2-all.json | 2 +- ...ality Generic PLA Silk @Ender-3V3-all.json | 2 +- .../Creality Generic PLA Silk @Hi-all.json | 2 +- .../Creality Generic PLA Silk @K1-all.json | 2 +- .../Creality Generic PLA Silk @K2-all.json | 2 +- .../Creality Generic PLA Wood @Hi-all.json | 2 +- .../filament/Creality Generic PLA-CF.json | 2 +- .../filament/Creality Generic PLA.json | 2 +- .../Creality Generic TPU @Ender-5Max-all.json | 2 +- .../filament/Creality Generic TPU.json | 2 +- .../filament/Creality HF Generic PLA.json | 2 +- .../Creality HF Generic Speed PLA.json | 2 +- .../Creality Hyper ABS @Ender-5Max-all.json | 2 +- .../Creality Hyper PLA @Ender-5Max-all.json | 2 +- ...Creality Hyper PLA-CF @Ender-5Max-all.json | 2 +- .../Creality Silk PLA @Ender-5Max-all.json | 2 +- .../filament/EN-PLA+ @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/EN-PLA+ @K1C-all.json | 2 +- .../filament/EN-PLA+ @K1C_CFS-C-all.json | 2 +- .../filament/EN-PLA+ @K1_CFS-C-all.json | 2 +- .../filament/EN-PLA+ @K2 Plus-all.json | 2 +- .../filament/EN-PLA+ @K2 Pro-all.json | 2 +- .../Creality/filament/EN-PLA+ @K2-all.json | 2 +- .../filament/EN-PLA+ @SPARKX i7-all.json | 2 +- .../filament/ENDER FAST PLA @Hi-all.json | 2 +- .../filament/ENDER FAST PLA @K2 Plus-all.json | 2 +- .../filament/ENDER FAST PLA @K2 Pro-all.json | 2 +- .../filament/ENDER FAST PLA @K2-all.json | 2 +- .../ENDER FAST PLA @SPARKX i7-all.json | 2 +- .../filament/Ender-PLA @Ender-3 V4-all.json | 2 +- .../Creality/filament/Ender-PLA @Hi-all.json | 2 +- .../filament/Ender-PLA @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/Ender-PLA @K1C-all.json | 2 +- .../filament/Ender-PLA @K1C_CFS-C-all.json | 2 +- .../filament/Ender-PLA @K1_CFS-C-all.json | 2 +- .../filament/Ender-PLA @K2 Plus-all.json | 2 +- .../filament/Ender-PLA @K2 Pro-all.json | 2 +- .../Creality/filament/Ender-PLA @K2-all.json | 2 +- .../filament/Ender-PLA @SPARKX i7-all.json | 2 +- .../filament/Generic ABS @Ender-3 V4-all.json | 2 +- .../filament/Generic ABS @Hi-all.json | 2 +- .../Generic ABS @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic ABS @K1 SE-all.json | 2 +- .../Generic ABS @K1 SE_CFS-C-all.json | 2 +- .../filament/Generic ABS @K1C-all.json | 2 +- .../filament/Generic ABS @K1C_CFS-C-all.json | 2 +- .../filament/Generic ABS @K1_CFS-C-all.json | 2 +- .../filament/Generic ABS @K2 Plus-all.json | 2 +- .../filament/Generic ABS @K2 Pro-all.json | 2 +- .../filament/Generic ABS @K2 SE-all.json | 2 +- .../filament/Generic ABS @K2-all.json | 2 +- .../Generic ASA @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic ASA @K1 SE-all.json | 2 +- .../Generic ASA @K1 SE_CFS-C-all.json | 2 +- .../filament/Generic ASA @K1C-all.json | 2 +- .../filament/Generic ASA @K1C_CFS-C-all.json | 2 +- .../filament/Generic ASA @K1_CFS-C-all.json | 2 +- .../filament/Generic ASA @K2 Plus-all.json | 2 +- .../filament/Generic ASA @K2 Pro-all.json | 2 +- .../filament/Generic ASA @K2 SE-all.json | 2 +- .../filament/Generic ASA @K2-all.json | 2 +- .../filament/Generic ASA-CF @K2 Plus-all.json | 2 +- .../filament/Generic BVOH @Hi-all.json | 2 +- .../Generic BVOH @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic BVOH @K1C-all.json | 2 +- .../filament/Generic BVOH @K1C_CFS-C-all.json | 2 +- .../filament/Generic BVOH @K1_CFS-C-all.json | 2 +- .../filament/Generic BVOH @K2 Plus-all.json | 2 +- .../filament/Generic BVOH @K2 Pro-all.json | 2 +- .../filament/Generic BVOH @K2-all.json | 2 +- .../Generic HIPS @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic HIPS @K1C-all.json | 2 +- .../filament/Generic HIPS @K1C_CFS-C-all.json | 2 +- .../filament/Generic HIPS @K1_CFS-C-all.json | 2 +- .../filament/Generic HIPS @K2 Plus-all.json | 2 +- .../Generic PA @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PA @K1C-all.json | 2 +- .../filament/Generic PA @K1C_CFS-C-all.json | 2 +- .../filament/Generic PA @K1_CFS-C-all.json | 2 +- .../filament/Generic PA @K2 Plus-all.json | 2 +- .../filament/Generic PA @K2 Pro-all.json | 2 +- .../Creality/filament/Generic PA @K2-all.json | 2 +- .../Generic PA-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PA-CF @K1C-all.json | 2 +- .../Generic PA-CF @K1C_CFS-C-all.json | 2 +- .../filament/Generic PA-CF @K1_CFS-C-all.json | 2 +- .../filament/Generic PA-CF @K2 Plus-all.json | 2 +- .../Generic PA12-CF @K2 Plus-all.json | 2 +- .../Generic PA6-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PA6-CF @K1C-all.json | 2 +- .../Generic PA6-CF @K1C_CFS-C-all.json | 2 +- .../Generic PA6-CF @K1_CFS-C-all.json | 2 +- .../filament/Generic PA6-CF @K2 Plus-all.json | 2 +- .../filament/Generic PA6-CF @K2 Pro-all.json | 2 +- .../filament/Generic PA6-GF @K2 Plus-all.json | 2 +- .../Generic PA612-CF @K2 Plus-all.json | 2 +- .../Generic PA612-CF @K2 Pro-all.json | 2 +- .../Generic PAHT-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PAHT-CF @K1C-all.json | 2 +- .../Generic PAHT-CF @K1C_CFS-C-all.json | 2 +- .../Generic PAHT-CF @K1_CFS-C-all.json | 2 +- .../Generic PAHT-CF @K2 Plus-all.json | 2 +- .../filament/Generic PAHT-CF @K2 Pro-all.json | 2 +- .../filament/Generic PAHT-CF @K2-all.json | 2 +- .../Generic PC @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PC @K1C-all.json | 2 +- .../filament/Generic PC @K1C_CFS-C-all.json | 2 +- .../filament/Generic PC @K1_CFS-C-all.json | 2 +- .../filament/Generic PC @K2 Plus-all.json | 2 +- .../filament/Generic PC @K2 Pro-all.json | 2 +- .../filament/Generic PCTG @K2 Plus-all.json | 2 +- .../Generic PET @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PET @K1C-all.json | 2 +- .../filament/Generic PET @K1C_CFS-C-all.json | 2 +- .../filament/Generic PET @K1_CFS-C-all.json | 2 +- .../filament/Generic PET @K2 Plus-all.json | 2 +- .../filament/Generic PET @K2 Pro-all.json | 2 +- .../filament/Generic PET @K2-all.json | 2 +- .../Generic PET-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PET-CF @K1C-all.json | 2 +- .../Generic PET-CF @K1C_CFS-C-all.json | 2 +- .../Generic PET-CF @K1_CFS-C-all.json | 2 +- .../filament/Generic PET-CF @K2 Plus-all.json | 2 +- .../filament/Generic PET-CF @K2 Pro-all.json | 2 +- .../Generic PETG @Ender-3 V4-all.json | 2 +- .../filament/Generic PETG @Hi-all.json | 2 +- .../Generic PETG @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PETG @K1 SE-all.json | 2 +- .../Generic PETG @K1 SE_CFS-C-all.json | 2 +- .../filament/Generic PETG @K1C-all.json | 2 +- .../filament/Generic PETG @K1C_CFS-C-all.json | 2 +- .../filament/Generic PETG @K1_CFS-C-all.json | 2 +- .../filament/Generic PETG @K2 Plus-all.json | 2 +- .../filament/Generic PETG @K2 Pro-all.json | 2 +- .../filament/Generic PETG @K2 SE-all.json | 2 +- .../filament/Generic PETG @K2-all.json | 2 +- .../filament/Generic PETG @SPARKX i7-all.json | 2 +- .../Generic PETG-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PETG-CF @K1C-all.json | 2 +- .../Generic PETG-CF @K1C_CFS-C-all.json | 2 +- .../Generic PETG-CF @K1_CFS-C-all.json | 2 +- .../Generic PETG-CF @K2 Plus-all.json | 2 +- .../filament/Generic PETG-CF @K2 Pro-all.json | 2 +- .../filament/Generic PETG-CF @K2-all.json | 2 +- .../Generic PETG-CF @SPARKX i7-all.json | 2 +- .../Generic PETG-GF @K2 Plus-all.json | 2 +- .../filament/Generic PETG-GF @K2 Pro-all.json | 2 +- .../filament/Generic PETG-GF @K2-all.json | 2 +- .../filament/Generic PLA @Ender-3 V4-all.json | 2 +- .../filament/Generic PLA @Hi-all.json | 2 +- .../Generic PLA @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PLA @K1 SE-all.json | 2 +- .../Generic PLA @K1 SE_CFS-C-all.json | 2 +- .../filament/Generic PLA @K1C-all.json | 2 +- .../filament/Generic PLA @K1C_CFS-C-all.json | 2 +- .../filament/Generic PLA @K1_CFS-C-all.json | 2 +- .../filament/Generic PLA @K2 Plus-all.json | 2 +- .../filament/Generic PLA @K2 Pro-all.json | 2 +- .../filament/Generic PLA @K2 SE-all.json | 2 +- .../filament/Generic PLA @K2-all.json | 2 +- .../filament/Generic PLA @SPARKX i7-all.json | 2 +- .../Generic PLA-CF @Ender-3 V4-all.json | 2 +- .../Generic PLA-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PLA-CF @K1 SE-all.json | 2 +- .../Generic PLA-CF @K1 SE_CFS-C-all.json | 2 +- .../filament/Generic PLA-CF @K1C-all.json | 2 +- .../Generic PLA-CF @K1C_CFS-C-all.json | 2 +- .../Generic PLA-CF @K1_CFS-C-all.json | 2 +- .../filament/Generic PLA-CF @K2 Plus-all.json | 2 +- .../filament/Generic PLA-CF @K2 Pro-all.json | 2 +- .../filament/Generic PLA-CF @K2 SE-all.json | 2 +- .../filament/Generic PLA-CF @K2-all.json | 2 +- .../Generic PLA-CF @SPARKX i7-all.json | 2 +- .../Generic PLA-Silk @Ender-3 V4-all.json | 2 +- .../filament/Generic PLA-Silk @Hi-all.json | 2 +- .../Generic PLA-Silk @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PLA-Silk @K1 SE-all.json | 2 +- .../Generic PLA-Silk @K1 SE_CFS-C-all.json | 2 +- .../filament/Generic PLA-Silk @K1C-all.json | 2 +- .../Generic PLA-Silk @K1C_CFS-C-all.json | 2 +- .../Generic PLA-Silk @K1_CFS-C-all.json | 2 +- .../Generic PLA-Silk @K2 Plus-all.json | 2 +- .../Generic PLA-Silk @K2 Pro-all.json | 2 +- .../filament/Generic PLA-Silk @K2 SE-all.json | 2 +- .../filament/Generic PLA-Silk @K2-all.json | 2 +- .../Generic PLA-Silk @SPARKX i7-all.json | 2 +- .../Generic PP @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PP @K1C-all.json | 2 +- .../filament/Generic PP @K1C_CFS-C-all.json | 2 +- .../filament/Generic PP @K1_CFS-C-all.json | 2 +- .../filament/Generic PP @K2 Plus-all.json | 2 +- .../filament/Generic PP @K2 Pro-all.json | 2 +- .../Creality/filament/Generic PP @K2-all.json | 2 +- .../filament/Generic PP-CF @K2 Plus-all.json | 2 +- .../Generic PPS @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PPS @K1C-all.json | 2 +- .../filament/Generic PPS @K1C_CFS-C-all.json | 2 +- .../filament/Generic PPS @K1_CFS-C-all.json | 2 +- .../filament/Generic PPS @K2 Plus-all.json | 2 +- .../Generic PPS-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PPS-CF @K1C-all.json | 2 +- .../Generic PPS-CF @K1C_CFS-C-all.json | 2 +- .../Generic PPS-CF @K1_CFS-C-all.json | 2 +- .../filament/Generic PPS-CF @K2 Plus-all.json | 2 +- .../filament/Generic PVA @Hi-all.json | 2 +- .../Generic PVA @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic PVA @K1C-all.json | 2 +- .../filament/Generic PVA @K1C_CFS-C-all.json | 2 +- .../filament/Generic PVA @K1_CFS-C-all.json | 2 +- .../filament/Generic PVA @K2 Plus-all.json | 2 +- .../filament/Generic PVA @K2 Pro-all.json | 2 +- .../filament/Generic PVA @K2-all.json | 2 +- .../Generic Support for PA @K2 Plus-all.json | 2 +- .../Generic Support for PLA @K2 Plus-all.json | 2 +- .../Generic TPU 64D @K2 Plus-all.json | 2 +- .../Generic TPU 64D @SPARKX i7-all.json | 2 +- .../filament/Generic TPU @Ender-3 V4-all.json | 2 +- .../Generic TPU @K1 Max_CFS-C-all.json | 2 +- .../filament/Generic TPU @K1 SE-all.json | 2 +- .../Generic TPU @K1 SE_CFS-C-all.json | 2 +- .../filament/Generic TPU @K1C-all.json | 2 +- .../filament/Generic TPU @K1C_CFS-C-all.json | 2 +- .../filament/Generic TPU @K1_CFS-C-all.json | 2 +- .../filament/Generic TPU @K2 Plus-all.json | 2 +- .../filament/Generic TPU @K2 Pro-all.json | 2 +- .../filament/Generic TPU @K2 SE-all.json | 2 +- .../filament/Generic TPU @K2-all.json | 2 +- .../filament/Generic TPU @SPARKX i7-all.json | 2 +- .../HP Ultra PLA @K1 Max_CFS-C-all.json | 2 +- .../filament/HP Ultra PLA @K1C-all.json | 2 +- .../filament/HP Ultra PLA @K1C_CFS-C-all.json | 2 +- .../filament/HP Ultra PLA @K1_CFS-C-all.json | 2 +- .../filament/HP Ultra PLA @K2 Plus-all.json | 2 +- .../filament/HP-ASA @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/HP-ASA @K1C-all.json | 2 +- .../filament/HP-ASA @K1C_CFS-C-all.json | 2 +- .../filament/HP-ASA @K1_CFS-C-all.json | 2 +- .../filament/HP-ASA @K2 Plus-all.json | 2 +- .../Creality/filament/HP-ASA @K2 Pro-all.json | 2 +- .../Creality/filament/HP-ASA @K2 SE-all.json | 2 +- .../Creality/filament/HP-ASA @K2-all.json | 2 +- .../filament/HP-TPU @Ender-3 V4-all.json | 2 +- .../Creality/filament/HP-TPU @Hi-all.json | 2 +- .../filament/HP-TPU @K1 Max_CFS-C-all.json | 2 +- .../Creality/filament/HP-TPU @K1 SE-all.json | 2 +- .../filament/HP-TPU @K1 SE_CFS-C-all.json | 2 +- .../Creality/filament/HP-TPU @K1C-all.json | 2 +- .../filament/HP-TPU @K1C_CFS-C-all.json | 2 +- .../filament/HP-TPU @K1_CFS-C-all.json | 2 +- .../filament/HP-TPU @K2 Plus-all.json | 2 +- .../Creality/filament/HP-TPU @K2 Pro-all.json | 2 +- .../Creality/filament/HP-TPU @K2 SE-all.json | 2 +- .../Creality/filament/HP-TPU @K2-all.json | 2 +- .../filament/HP-TPU @SPARKX i7-all.json | 2 +- .../filament/Hyper ABS @Ender-3 V4-all.json | 2 +- .../Creality/filament/Hyper ABS @Hi-all.json | 2 +- .../filament/Hyper ABS @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper ABS @K1 SE-all.json | 2 +- .../filament/Hyper ABS @K1 SE_CFS-C-all.json | 2 +- .../Creality/filament/Hyper ABS @K1C-all.json | 2 +- .../filament/Hyper ABS @K1C_CFS-C-all.json | 2 +- .../filament/Hyper ABS @K1_CFS-C-all.json | 2 +- .../filament/Hyper ABS @K2 Plus-all.json | 2 +- .../filament/Hyper ABS @K2 Pro-all.json | 2 +- .../filament/Hyper ABS @K2 SE-all.json | 2 +- .../Creality/filament/Hyper ABS @K2-all.json | 2 +- .../filament/Hyper L-W PLA @Hi-all.json | 2 +- .../Hyper L-W PLA @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper L-W PLA @K1 SE-all.json | 2 +- .../Hyper L-W PLA @K1 SE_CFS-C-all.json | 2 +- .../filament/Hyper L-W PLA @K1C-all.json | 2 +- .../Hyper L-W PLA @K1C_CFS-C-all.json | 2 +- .../filament/Hyper L-W PLA @K1_CFS-C-all.json | 2 +- .../filament/Hyper L-W PLA @K2 Plus-all.json | 2 +- .../filament/Hyper L-W PLA @K2 Pro-all.json | 2 +- .../filament/Hyper L-W PLA @K2-all.json | 2 +- .../filament/Hyper Luminous @Hi-all.json | 2 +- .../filament/Hyper Luminous @K1C-all.json | 2 +- .../filament/Hyper Luminous @K2 Plus-all.json | 2 +- .../filament/Hyper Luminous @K2 Pro-all.json | 2 +- .../filament/Hyper Luminous @K2-all.json | 2 +- .../Hyper Luminous @SPARKX i7-all.json | 2 +- .../filament/Hyper Marble @Hi-all.json | 2 +- .../Hyper Marble @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper Marble @K1C-all.json | 2 +- .../filament/Hyper Marble @K1C_CFS-C-all.json | 2 +- .../filament/Hyper Marble @K1_CFS-C-all.json | 2 +- .../filament/Hyper Marble @K2 Plus-all.json | 2 +- .../filament/Hyper Marble @K2 Pro-all.json | 2 +- .../filament/Hyper Marble @K2 SE-all.json | 2 +- .../filament/Hyper Marble @K2-all.json | 2 +- .../filament/Hyper Marble @SPARKX i7-all.json | 2 +- .../filament/Hyper PA6-CF @K2 Plus-all.json | 2 +- .../filament/Hyper PA6-CF @K2 Pro-all.json | 2 +- .../filament/Hyper PA612-CF @K2 Plus-all.json | 2 +- .../filament/Hyper PA612-CF @K2 Pro-all.json | 2 +- .../Hyper PAHT-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper PAHT-CF @K1C-all.json | 2 +- .../Hyper PAHT-CF @K1C_CFS-C-all.json | 2 +- .../filament/Hyper PAHT-CF @K1_CFS-C-all.json | 2 +- .../filament/Hyper PAHT-CF @K2 Plus-all.json | 2 +- .../filament/Hyper PAHT-CF @K2 Pro-all.json | 2 +- .../filament/Hyper PAHT-CF @K2-all.json | 2 +- .../filament/Hyper PC @K2 Plus-all.json | 2 +- .../filament/Hyper PC @K2 Pro-all.json | 2 +- .../filament/Hyper PETG @Ender-3 V4-all.json | 2 +- .../Creality/filament/Hyper PETG @Hi-all.json | 2 +- .../Hyper PETG @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper PETG @K1 SE-all.json | 2 +- .../filament/Hyper PETG @K1 SE_CFS-C-all.json | 2 +- .../filament/Hyper PETG @K1C-all.json | 2 +- .../filament/Hyper PETG @K1C_CFS-C-all.json | 2 +- .../filament/Hyper PETG @K1_CFS-C-all.json | 2 +- .../filament/Hyper PETG @K2 Plus-all.json | 2 +- .../filament/Hyper PETG @K2 Pro-all.json | 2 +- .../filament/Hyper PETG @K2 SE-all.json | 2 +- .../Creality/filament/Hyper PETG @K2-all.json | 2 +- .../filament/Hyper PETG @SPARKX i7-all.json | 2 +- .../Hyper PETG-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper PETG-CF @K1C-all.json | 2 +- .../Hyper PETG-CF @K1C_CFS-C-all.json | 2 +- .../filament/Hyper PETG-CF @K1_CFS-C-all.json | 2 +- .../filament/Hyper PETG-CF @K2 Plus-all.json | 2 +- .../filament/Hyper PETG-CF @K2 Pro-all.json | 2 +- .../filament/Hyper PETG-CF @K2-all.json | 2 +- .../Hyper PETG-CF @SPARKX i7-all.json | 2 +- .../filament/Hyper PETG-GF @K1C-all.json | 2 +- .../filament/Hyper PETG-GF @K2 Plus-all.json | 2 +- .../filament/Hyper PETG-GF @K2 Pro-all.json | 2 +- .../filament/Hyper PETG-GF @K2-all.json | 2 +- .../filament/Hyper PLA @Ender-3 V4-all.json | 2 +- .../Creality/filament/Hyper PLA @Hi-all.json | 2 +- .../filament/Hyper PLA @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper PLA @K1 SE-all.json | 2 +- .../filament/Hyper PLA @K1 SE_CFS-C-all.json | 2 +- .../Creality/filament/Hyper PLA @K1C-all.json | 2 +- .../filament/Hyper PLA @K1C_CFS-C-all.json | 2 +- .../filament/Hyper PLA @K1_CFS-C-all.json | 2 +- .../filament/Hyper PLA @K2 Plus-all.json | 2 +- .../filament/Hyper PLA @K2 Pro-all.json | 2 +- .../filament/Hyper PLA @K2 SE-all.json | 2 +- .../Creality/filament/Hyper PLA @K2-all.json | 2 +- .../filament/Hyper PLA @SPARKX i7-all.json | 2 +- .../Hyper PLA-CF @Ender-3 V4-all.json | 2 +- .../filament/Hyper PLA-CF @Hi-all.json | 2 +- .../Hyper PLA-CF @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper PLA-CF @K1 SE-all.json | 2 +- .../Hyper PLA-CF @K1 SE_CFS-C-all.json | 2 +- .../filament/Hyper PLA-CF @K1C-all.json | 2 +- .../filament/Hyper PLA-CF @K1C_CFS-C-all.json | 2 +- .../filament/Hyper PLA-CF @K1_CFS-C-all.json | 2 +- .../filament/Hyper PLA-CF @K2 Plus-all.json | 2 +- .../filament/Hyper PLA-CF @K2 Pro-all.json | 2 +- .../filament/Hyper PLA-CF @K2 SE-all.json | 2 +- .../filament/Hyper PLA-CF @K2-all.json | 2 +- .../filament/Hyper PLA-CF @SPARKX i7-all.json | 2 +- .../filament/Hyper PPA-CF @K2 Plus-all.json | 2 +- .../filament/Hyper PPA-CF @K2 Pro-all.json | 2 +- .../filament/Hyper Stardust @Hi-all.json | 2 +- .../Hyper Stardust @K1 Max_CFS-C-all.json | 2 +- .../filament/Hyper Stardust @K1C-all.json | 2 +- .../Hyper Stardust @K1C_CFS-C-all.json | 2 +- .../Hyper Stardust @K1_CFS-C-all.json | 2 +- .../filament/Hyper Stardust @K2 Plus-all.json | 2 +- .../filament/Hyper Stardust @K2 Pro-all.json | 2 +- .../filament/Hyper Stardust @K2 SE-all.json | 2 +- .../filament/Hyper Stardust @K2-all.json | 2 +- .../Hyper Stardust @SPARKX i7-all.json | 2 +- .../Panchroma PLA Matte @K2 Plus-all.json | 2 +- .../Panchroma PLA Satin @K2 Plus-all.json | 2 +- .../filament/PolySonic PLA @K2 Plus-all.json | 2 +- .../PolySonic PLA Pro @K2 Plus-all.json | 2 +- .../filament/Soleyin Basic PETG @Hi-all.json | 2 +- .../filament/Soleyin Basic PETG @K1C-all.json | 2 +- .../Soleyin Basic PETG @K2 Plus-all.json | 2 +- .../Soleyin Basic PETG @K2 Pro-all.json | 2 +- .../filament/Soleyin Basic PETG @K2-all.json | 2 +- .../Soleyin Basic PETG @SPARKX i7-all.json | 2 +- .../Soleyin Ultra PLA @Ender-3 V4-all.json | 2 +- .../filament/Soleyin Ultra PLA @Hi-all.json | 2 +- .../Soleyin Ultra PLA @K1 Max_CFS-C-all.json | 2 +- .../filament/Soleyin Ultra PLA @K1C-all.json | 2 +- .../Soleyin Ultra PLA @K1C_CFS-C-all.json | 2 +- .../Soleyin Ultra PLA @K1_CFS-C-all.json | 2 +- .../Soleyin Ultra PLA @K2 Plus-all.json | 2 +- .../Soleyin Ultra PLA @K2 Pro-all.json | 2 +- .../Soleyin Ultra PLA @K2 SE-all.json | 2 +- .../filament/Soleyin Ultra PLA @K2-all.json | 2 +- .../Soleyin Ultra PLA @SPARKX i7-all.json | 2 +- .../filament/eSUN ABS+ @K2 Plus-all.json | 2 +- .../filament/eSUN ASA+ @K2 Plus-all.json | 2 +- .../filament/eSUN PET-Basic @K2 Plus-all.json | 2 +- .../filament/eSUN PETG @K2 Plus-all.json | 2 +- .../filament/eSUN PETG+HS @K2 Plus-all.json | 2 +- .../eSUN PETG-Basic @K2 Plus-all.json | 2 +- .../filament/eSUN PLA+ @K2 Plus-all.json | 2 +- .../filament/eSUN PLA-CF @K2 Plus-all.json | 2 +- .../filament/eSUN PLA-HS @K2 Plus-all.json | 2 +- .../filament/eSUN PLA-LW @K2 Plus-all.json | 2 +- .../filament/eSUN PLA-Lite @K2 Plus-all.json | 2 +- .../filament/eSUN PLA-Matte @K2 Plus-all.json | 2 +- .../filament/eSUN PLA-Silk @K2 Plus-all.json | 2 +- ...icon ABS @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ...n ABS @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ...n ABS @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/filament/Cubicon ABS @base.json | 2 +- ...ABS-A100 @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ...-A100 @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ...-A100 @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../filament/Cubicon ABS-A100 @base.json | 2 +- ...con ABSk @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ... ABSk @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ... ABSk @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/filament/Cubicon ABSk @base.json | 2 +- ...on PA-CF @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ...PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ...PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/filament/Cubicon PA-CF @base.json | 2 +- ...bicon PC @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ...on PC @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ...on PC @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/filament/Cubicon PC @base.json | 2 +- ...con PETG @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ... PETG @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ... PETG @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/filament/Cubicon PETG @base.json | 2 +- ...icon PLA @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ...n PLA @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ...n PLA @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/filament/Cubicon PLA @base.json | 2 +- ...con PLA+ @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ... PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ... PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/filament/Cubicon PLA+ @base.json | 2 +- ...n PLAi21 @Cubicon xCeler-I 0.4 nozzle.json | 2 +- ...LAi21 @Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- ...LAi21 @Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../filament/Cubicon PLAi21 @base.json | 2 +- .../Cubicon/filament/fdm_filament_pa.json | 1 - .../Cubicon/filament/fdm_filament_pc.json | 1 - .../Cubicon/filament/fdm_filament_pet.json | 1 - .../filament/Generic PC @MyToolChanger.json | 1 - .../filament/Generic PETG @MyToolChanger.json | 1 - .../filament/Generic PLA @MyToolChanger.json | 1 - .../Generic PLA-CF @MyToolChanger.json | 1 - .../filament/Generic PVA @MyToolChanger.json | 1 - .../filament/Generic TPU @MyToolChanger.json | 1 - .../filament/DeltaMaker Brand PLA.json | 2 +- .../filament/DeltaMaker Generic PETG.json | 2 +- .../filament/DeltaMaker Generic PLA.json | 2 +- .../filament/DeltaMaker Generic TPU.json | 2 +- .../Dremel Generic PLA @3D20 all.json | 2 +- .../Dremel Generic PLA @3D40 all.json | 2 +- .../Dremel Generic PLA @3D45 all.json | 2 +- .../Dremel/filament/Dremel Generic PLA.json | 2 +- .../filament/BASE/Elegoo ABS @base.json | 2 +- .../filament/BASE/Elegoo ASA @base.json | 2 +- .../filament/BASE/Elegoo ASA-CF @base.json | 2 +- .../filament/BASE/Elegoo PAHT @base.json | 2 +- .../Elegoo/filament/BASE/Elegoo PC @base.json | 2 +- .../filament/BASE/Elegoo PC-FR @base.json | 2 +- .../filament/BASE/Elegoo PET-CF @base.json | 2 +- .../filament/BASE/Elegoo PETG @base.json | 2 +- .../filament/BASE/Elegoo PETG HF @base.json | 2 +- .../filament/BASE/Elegoo PETG PRO @base.json | 2 +- .../BASE/Elegoo PETG Translucent @base.json | 2 +- .../filament/BASE/Elegoo PETG-CF @base.json | 2 +- .../filament/BASE/Elegoo PETG-GF @base.json | 2 +- .../filament/BASE/Elegoo PLA @base.json | 2 +- .../filament/BASE/Elegoo PLA Basic @base.json | 2 +- .../BASE/Elegoo PLA Galaxy @base.json | 2 +- .../filament/BASE/Elegoo PLA Glow @base.json | 2 +- .../BASE/Elegoo PLA Marble @base.json | 2 +- .../filament/BASE/Elegoo PLA Matte @base.json | 2 +- .../filament/BASE/Elegoo PLA PRO @base.json | 2 +- .../filament/BASE/Elegoo PLA Silk @base.json | 2 +- .../BASE/Elegoo PLA Sparkle @base.json | 2 +- .../BASE/Elegoo PLA Translucent2 @base.json | 2 +- .../filament/BASE/Elegoo PLA Wood @base.json | 2 +- .../filament/BASE/Elegoo PLA+ @base.json | 2 +- .../filament/BASE/Elegoo PLA-CF @base.json | 2 +- .../BASE/Elegoo Rapid PETG @base.json | 2 +- .../BASE/Elegoo Rapid PLA+ @base.json | 2 +- .../BASE/Elegoo Rapid TPU 95A @base.json | 2 +- .../filament/BASE/Elegoo TPU @base.json | 2 +- .../filament/BASE/Generic ABS @base.json | 2 +- .../filament/BASE/Generic ASA @base.json | 2 +- .../filament/BASE/Generic PA @base.json | 2 +- .../filament/BASE/Generic PC @base.json | 2 +- .../filament/BASE/Generic PET @base.json | 2 +- .../filament/BASE/Generic PETG @base.json | 2 +- .../filament/BASE/Generic PLA @base.json | 2 +- .../Generic ABS-CF @Elegoo Centauri.json | 2 +- .../Generic ASA-CF @Elegoo Centauri.json | 1 + .../Generic/Generic PA6-CF @Elegoo.json | 2 +- .../Generic/Generic PC-CF @Elegoo.json | 2 +- .../Generic PET-CF @Elegoo Centauri.json | 2 +- .../Generic/Generic PETG PRO @Elegoo.json | 2 +- .../Generic PETG-CF @Elegoo Centauri.json | 1 + .../Generic/Generic PLA Matte @Elegoo.json | 2 +- .../Eryone/filament/Eryone ABS-CF.json | 2 +- .../profiles/Eryone/filament/Eryone ABS.json | 2 +- .../Eryone/filament/Eryone ASA-CF.json | 2 +- .../profiles/Eryone/filament/Eryone ASA.json | 2 +- .../Eryone/filament/Eryone PA-CF.json | 2 +- .../Eryone/filament/Eryone PA-GF.json | 2 +- .../profiles/Eryone/filament/Eryone PA.json | 2 +- .../Eryone/filament/Eryone PETG-CF.json | 2 +- .../profiles/Eryone/filament/Eryone PETG.json | 2 +- .../Eryone/filament/Eryone PLA-CF.json | 2 +- .../profiles/Eryone/filament/Eryone PLA.json | 2 +- .../Eryone/filament/Eryone PP-CF.json | 2 +- .../profiles/Eryone/filament/Eryone PP.json | 2 +- .../Eryone/filament/Eryone Silk PLA.json | 2 +- .../profiles/Eryone/filament/Eryone TPU.json | 2 +- .../FLSun/filament/FLSun Generic ABS.json | 2 +- .../FLSun/filament/FLSun Generic ASA.json | 2 +- .../FLSun/filament/FLSun Generic PA-CF.json | 2 +- .../FLSun/filament/FLSun Generic PA.json | 2 +- .../FLSun/filament/FLSun Generic PC.json | 2 +- .../FLSun/filament/FLSun Generic PETG.json | 2 +- .../FLSun/filament/FLSun Generic PLA-CF.json | 2 +- .../FLSun/filament/FLSun Generic PLA.json | 2 +- .../FLSun/filament/FLSun Generic PVA.json | 2 +- .../FLSun/filament/FLSun Generic TPU.json | 2 +- .../profiles/FLSun/filament/FLSun S1 ABS.json | 2 +- .../profiles/FLSun/filament/FLSun S1 ASA.json | 2 +- .../FLSun/filament/FLSun S1 PETG.json | 2 +- .../FLSun/filament/FLSun S1 PLA Generic.json | 2 +- .../filament/FLSun S1 PLA High Speed.json | 2 +- .../FLSun/filament/FLSun S1 PLA Silk.json | 2 +- .../profiles/FLSun/filament/FLSun S1 TPU.json | 2 +- .../profiles/FLSun/filament/FLSun T1 ABS.json | 2 +- .../profiles/FLSun/filament/FLSun T1 ASA.json | 2 +- .../FLSun/filament/FLSun T1 PETG.json | 2 +- .../FLSun/filament/FLSun T1 PLA Generic.json | 2 +- .../filament/FLSun T1 PLA High Speed.json | 2 +- .../FLSun/filament/FLSun T1 PLA Silk.json | 2 +- .../profiles/FLSun/filament/FLSun T1 TPU.json | 2 +- .../FlashForge PC @FF G4 0.6 HF nozzle.json | 2 +- .../FlashForge PC @FF G4 0.6 nozzle.json | 2 +- .../FlashForge PC @FF G4 0.8 HF nozzle.json | 2 +- .../FlashForge PC @FF G4P 0.6 HF nozzle.json | 2 +- .../FlashForge PC @FF G4P 0.6 nozzle.json | 2 +- .../FlashForge PC @FF G4P 0.8 HF nozzle.json | 2 +- .../FlashForge PPS @FF G4 0.6 HF nozzle.json | 2 +- .../FlashForge PPS @FF G4 0.6 nozzle.json | 2 +- .../FlashForge PPS @FF G4 0.8 HF nozzle.json | 2 +- .../FlashForge PPS @FF G4P 0.6 HF nozzle.json | 2 +- .../FlashForge PPS @FF G4P 0.6 nozzle.json | 2 +- .../FlashForge PPS @FF G4P 0.8 HF nozzle.json | 2 +- .../FlashForge PPS-CF @FF G4 0.6 nozzle.json | 2 +- .../FlashForge PPS-CF @FF G4P 0.6 nozzle.json | 2 +- .../Flashforge ABS @FF AD5M 0.25 Nozzle.json | 2 +- ...hforge ABS Basic @FF AD5M 0.25 nozzle.json | 2 +- ...hforge ABS Basic @FF AD5X 0.25 nozzle.json | 2 +- ...shforge ABS Basic @FF AD5X 0.6 nozzle.json | 2 +- ...shforge ABS Basic @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge ABS Basic @FF AD5X.json | 2 +- .../filament/Flashforge ABS Basic @FF C5.json | 2 +- .../Flashforge ABS Basic @FF C5P.json | 2 +- ...ashforge ABS Basic @FF G4 0.25 nozzle.json | 2 +- ...hforge ABS Basic @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge ABS Basic @FF G4 0.6 nozzle.json | 2 +- ...hforge ABS Basic @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge ABS Basic @FF G4 HF.json | 2 +- .../filament/Flashforge ABS Basic @FF G4.json | 2 +- ...shforge ABS Basic @FF G4P 0.25 nozzle.json | 2 +- ...forge ABS Basic @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge ABS Basic @FF G4P 0.6 nozzle.json | 2 +- ...forge ABS Basic @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge ABS Basic @FF G4P HF.json | 2 +- .../Flashforge ABS Basic @FF G4P.json | 2 +- .../filament/Flashforge ABS Basic.json | 2 +- .../Flashforge ABS-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/Flashforge ABS-CF @FF G4.json | 2 +- .../Flashforge ABS-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/Flashforge ABS-CF @FF G4P.json | 2 +- .../filament/Flashforge ABS-GF @FF C5.json | 2 +- .../filament/Flashforge ABS-GF @FF C5P.json | 2 +- .../Flashforge ASA @FF AD5M 0.25 Nozzle.json | 2 +- ...hforge ASA Basic @FF AD5M 0.25 nozzle.json | 2 +- ...hforge ASA Basic @FF AD5X 0.25 nozzle.json | 2 +- ...shforge ASA Basic @FF AD5X 0.6 nozzle.json | 2 +- ...shforge ASA Basic @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge ASA Basic @FF AD5X.json | 2 +- .../filament/Flashforge ASA Basic @FF C5.json | 2 +- .../Flashforge ASA Basic @FF C5P.json | 2 +- ...ashforge ASA Basic @FF G4 0.25 nozzle.json | 2 +- ...hforge ASA Basic @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge ASA Basic @FF G4 0.6 nozzle.json | 2 +- ...hforge ASA Basic @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge ASA Basic @FF G4 HF.json | 2 +- .../filament/Flashforge ASA Basic @FF G4.json | 2 +- ...shforge ASA Basic @FF G4P 0.25 nozzle.json | 2 +- ...forge ASA Basic @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge ASA Basic @FF G4P 0.6 nozzle.json | 2 +- ...forge ASA Basic @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge ASA Basic @FF G4P HF.json | 2 +- .../Flashforge ASA Basic @FF G4P.json | 2 +- .../filament/Flashforge ASA Basic.json | 2 +- .../filament/Flashforge ASA-CF @FF C5.json | 2 +- .../filament/Flashforge ASA-CF @FF C5P.json | 2 +- .../filament/Flashforge ASA-CF @FF G4.json | 2 +- .../filament/Flashforge ASA-CF @FF G4P.json | 2 +- .../filament/Flashforge ASA-CF.json | 2 +- .../filament/Flashforge ASA-GF @FF C5.json | 2 +- .../filament/Flashforge ASA-GF @FF C5P.json | 2 +- ...orge Generic ABS @FF AD5M 0.25 Nozzle.json | 2 +- ...lashforge Generic ABS @G3U 0.6 Nozzle.json | 2 +- .../filament/Flashforge Generic ABS @G3U.json | 2 +- .../filament/Flashforge Generic ABS.json | 2 +- ...orge Generic ASA @FF AD5M 0.25 Nozzle.json | 2 +- ...lashforge Generic ASA @G3U 0.6 Nozzle.json | 2 +- .../filament/Flashforge Generic ASA @G3U.json | 2 +- .../filament/Flashforge Generic ASA.json | 2 +- ...ashforge Generic HIPS @G3U 0.6 Nozzle.json | 2 +- .../filament/Flashforge Generic HIPS.json | 2 +- ...e Generic HS PLA @FF AD5M 0.25 Nozzle.json | 2 +- .../filament/Flashforge Generic HS PLA.json | 2 +- ...rge Generic PETG @FF AD5M 0.25 Nozzle.json | 2 +- ...orge Generic PETG @Flashforge Artemis.json | 2 +- ...ashforge Generic PETG @G3U 0.6 Nozzle.json | 2 +- ...ashforge Generic PETG @G3U 0.8 Nozzle.json | 2 +- .../Flashforge Generic PETG @G3U.json | 2 +- ...forge Generic PETG-CF @G3U 0.6 Nozzle.json | 2 +- ...forge Generic PETG-CF @G3U 0.8 Nozzle.json | 2 +- .../Flashforge Generic PETG-CF @G3U.json | 2 +- .../Flashforge Generic PETG-CF10.json | 2 +- .../filament/Flashforge Generic PETG.json | 2 +- .../filament/Flashforge Generic PLA @G3U.json | 2 +- ...hforge Generic PLA-CF @G3U 0.6 Nozzle.json | 2 +- ...hforge Generic PLA-CF @G3U 0.8 Nozzle.json | 2 +- .../Flashforge Generic PLA-CF @G3U.json | 2 +- .../filament/Flashforge Generic PLA-CF10.json | 2 +- ...Generic PLA-SILK @FF AD5M 0.25 Nozzle.json | 2 +- .../filament/Flashforge Generic PLA-Silk.json | 2 +- .../filament/Flashforge Generic PLA.json | 2 +- .../filament/Flashforge Generic PVA.json | 2 +- .../filament/Flashforge Generic TPU.json | 2 +- .../filament/Flashforge HIPS @FF C5.json | 2 +- .../filament/Flashforge HIPS @FF C5P.json | 2 +- .../Flashforge HIPS @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HIPS @FF G4 0.6 nozzle.json | 2 +- .../Flashforge HIPS @FF G4 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HIPS @FF G4 HF.json | 2 +- .../filament/Flashforge HIPS @FF G4.json | 2 +- ...Flashforge HIPS @FF G4P 0.6 HF nozzle.json | 2 +- .../Flashforge HIPS @FF G4P 0.6 nozzle.json | 2 +- ...Flashforge HIPS @FF G4P 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HIPS @FF G4P HF.json | 2 +- .../filament/Flashforge HIPS @FF G4P.json | 2 +- ...ashforge HS PETG @FF AD5M 0.25 nozzle.json | 2 +- ...ashforge HS PETG @FF AD5X 0.25 nozzle.json | 2 +- ...lashforge HS PETG @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge HS PETG @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge HS PETG @FF AD5X.json | 2 +- .../filament/Flashforge HS PETG @FF C5.json | 2 +- .../filament/Flashforge HS PETG @FF C5P.json | 2 +- ...Flashforge HS PETG @FF G4 0.25 nozzle.json | 2 +- ...ashforge HS PETG @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HS PETG @FF G4 0.6 nozzle.json | 2 +- ...ashforge HS PETG @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge HS PETG @FF G4 HF.json | 2 +- .../filament/Flashforge HS PETG @FF G4.json | 2 +- ...lashforge HS PETG @FF G4P 0.25 nozzle.json | 2 +- ...shforge HS PETG @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge HS PETG @FF G4P 0.6 nozzle.json | 2 +- ...shforge HS PETG @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge HS PETG @FF G4P HF.json | 2 +- .../filament/Flashforge HS PETG @FF G4P.json | 2 +- .../filament/Flashforge HS PETG.json | 2 +- ...lashforge HS PLA @FF AD5M 0.25 Nozzle.json | 2 +- ...lashforge HS PLA @FF AD5X 0.25 nozzle.json | 2 +- ...Flashforge HS PLA @FF AD5X 0.6 nozzle.json | 2 +- ...Flashforge HS PLA @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge HS PLA @FF AD5X.json | 2 +- .../filament/Flashforge HS PLA @FF C5.json | 2 +- .../filament/Flashforge HS PLA @FF C5P.json | 2 +- .../Flashforge HS PLA @FF G4 0.25 nozzle.json | 2 +- ...lashforge HS PLA @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HS PLA @FF G4 0.6 nozzle.json | 2 +- ...lashforge HS PLA @FF G4 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HS PLA @FF G4 HF.json | 2 +- .../filament/Flashforge HS PLA @FF G4.json | 2 +- ...Flashforge HS PLA @FF G4P 0.25 nozzle.json | 2 +- ...ashforge HS PLA @FF G4P 0.6 HF nozzle.json | 2 +- .../Flashforge HS PLA @FF G4P 0.6 nozzle.json | 2 +- ...ashforge HS PLA @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge HS PLA @FF G4P HF.json | 2 +- .../filament/Flashforge HS PLA @FF G4P.json | 2 +- ... HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HS PLA Burnt Ti @FF G4 HF.json | 2 +- ...HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge HS PLA Burnt Ti @FF G4P HF.json | 2 +- ...orge HS PLA Burnt Ti@FF G4 0.6 nozzle.json | 2 +- ...e HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json | 2 +- ...rge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json | 2 +- ... HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HS PLA.json | 2 +- .../Flashforge PA @FF G4 0.6 HF nozzle.json | 2 +- .../filament/Flashforge PA @FF G4 HF.json | 2 +- .../filament/Flashforge PA @FF G4.json | 2 +- .../Flashforge PA @FF G4P 0.6 HF nozzle.json | 2 +- .../filament/Flashforge PA @FF G4P HF.json | 2 +- .../filament/Flashforge PA @FF G4P.json | 2 +- .../filament/Flashforge PA-CF @FF C5.json | 2 +- .../filament/Flashforge PA-CF @FF C5P.json | 2 +- .../filament/Flashforge PA-CF @FF G4.json | 2 +- .../filament/Flashforge PA-CF @FF G4P.json | 2 +- .../filament/Flashforge PA12-CF.json | 2 +- .../filament/Flashforge PA6-CF.json | 2 +- .../filament/Flashforge PA66-CF.json | 2 +- .../filament/Flashforge PAHT-CF @FF C5.json | 2 +- .../filament/Flashforge PAHT-CF @FF C5P.json | 2 +- .../filament/Flashforge PAHT-CF @FF G4.json | 2 +- .../filament/Flashforge PAHT-CF @FF G4P.json | 2 +- .../filament/Flashforge PET-CF @FF C5.json | 2 +- .../filament/Flashforge PET-CF @FF C5P.json | 2 +- .../filament/Flashforge PET-CF.json | 2 +- .../Flashforge PETG @FF AD5M 0.25 Nozzle.json | 2 +- ...forge PETG Basic @FF AD5M 0.25 nozzle.json | 2 +- .../filament/Flashforge PETG Basic.json | 2 +- ...shforge PETG Pro @FF AD5M 0.25 nozzle.json | 2 +- ...shforge PETG Pro @FF AD5X 0.25 nozzle.json | 2 +- ...ashforge PETG Pro @FF AD5X 0.6 nozzle.json | 2 +- ...ashforge PETG Pro @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PETG Pro @FF AD5X.json | 2 +- .../filament/Flashforge PETG Pro @FF C5.json | 2 +- .../filament/Flashforge PETG Pro @FF C5P.json | 2 +- ...lashforge PETG Pro @FF G4 0.25 nozzle.json | 2 +- ...shforge PETG Pro @FF G4 0.6 HF nozzle.json | 2 +- ...Flashforge PETG Pro @FF G4 0.6 nozzle.json | 2 +- ...shforge PETG Pro @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PETG Pro @FF G4 HF.json | 2 +- .../filament/Flashforge PETG Pro @FF G4.json | 2 +- ...ashforge PETG Pro @FF G4P 0.25 nozzle.json | 2 +- ...hforge PETG Pro @FF G4P 0.6 HF nozzle.json | 2 +- ...lashforge PETG Pro @FF G4P 0.6 nozzle.json | 2 +- ...hforge PETG Pro @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PETG Pro @FF G4P HF.json | 2 +- .../filament/Flashforge PETG Pro @FF G4P.json | 2 +- .../filament/Flashforge PETG Pro.json | 2 +- ...PETG Transparent @FF AD5M 0.25 nozzle.json | 2 +- ...PETG Transparent @FF AD5X 0.25 nozzle.json | 2 +- ... PETG Transparent @FF AD5X 0.6 nozzle.json | 2 +- ... PETG Transparent @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PETG Transparent @FF AD5X.json | 2 +- .../Flashforge PETG Transparent @FF C5.json | 2 +- .../Flashforge PETG Transparent @FF C5P.json | 2 +- ...e PETG Transparent @FF G4 0.25 nozzle.json | 2 +- ...PETG Transparent @FF G4 0.6 HF nozzle.json | 2 +- ...ge PETG Transparent @FF G4 0.6 nozzle.json | 2 +- ...PETG Transparent @FF G4 0.8 HF nozzle.json | 2 +- ...Flashforge PETG Transparent @FF G4 HF.json | 2 +- .../Flashforge PETG Transparent @FF G4.json | 2 +- ... PETG Transparent @FF G4P 0.25 nozzle.json | 2 +- ...ETG Transparent @FF G4P 0.6 HF nozzle.json | 2 +- ...e PETG Transparent @FF G4P 0.6 nozzle.json | 2 +- ...ETG Transparent @FF G4P 0.8 HF nozzle.json | 2 +- ...lashforge PETG Transparent @FF G4P HF.json | 2 +- .../Flashforge PETG Transparent @FF G4P.json | 2 +- .../filament/Flashforge PETG Transparent.json | 2 +- ...lashforge PETG-CF @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge PETG-CF @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge PETG-CF @FF AD5X.json | 2 +- .../filament/Flashforge PETG-CF @FF C5.json | 2 +- .../filament/Flashforge PETG-CF @FF C5P.json | 2 +- .../Flashforge PETG-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/Flashforge PETG-CF @FF G4.json | 2 +- ...Flashforge PETG-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/Flashforge PETG-CF @FF G4P.json | 2 +- .../filament/Flashforge PETG-CF.json | 2 +- .../Flashforge PLA Matte @FF C5.json | 2 +- .../Flashforge PLA Matte @FF C5P.json | 2 +- .../Flashforge PLA Metal @FF C5.json | 2 +- .../Flashforge PLA Metal @FF C5P.json | 2 +- .../filament/Flashforge PLA Pro @FF C5.json | 2 +- .../filament/Flashforge PLA Pro @FF C5P.json | 2 +- ...hforge PLA Basic @FF AD5M 0.25 nozzle.json | 2 +- ...hforge PLA Basic @FF AD5X 0.25 nozzle.json | 2 +- ...shforge PLA Basic @FF AD5X 0.6 nozzle.json | 2 +- ...shforge PLA Basic @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Basic @FF AD5X.json | 2 +- .../filament/Flashforge PLA Basic @FF C5.json | 2 +- .../Flashforge PLA Basic @FF C5P.json | 2 +- ...ashforge PLA Basic @FF G4 0.25 nozzle.json | 2 +- ...hforge PLA Basic @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge PLA Basic @FF G4 0.6 nozzle.json | 2 +- ...hforge PLA Basic @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Basic @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Basic @FF G4.json | 2 +- ...shforge PLA Basic @FF G4P 0.25 nozzle.json | 2 +- ...forge PLA Basic @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge PLA Basic @FF G4P 0.6 nozzle.json | 2 +- ...forge PLA Basic @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Basic @FF G4P HF.json | 2 +- .../Flashforge PLA Basic @FF G4P.json | 2 +- .../filament/Flashforge PLA Basic.json | 2 +- ...hforge PLA Buint Ti @FF G4 0.8 nozzle.json | 2 +- ...forge PLA Buint Ti @FF G4P 0.8 nozzle.json | 2 +- ...PLA Color Change @FF AD5M 0.25 nozzle.json | 2 +- ...PLA Color Change @FF AD5X 0.25 nozzle.json | 2 +- ... PLA Color Change @FF AD5X 0.6 nozzle.json | 2 +- ... PLA Color Change @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Color Change @FF AD5X.json | 2 +- .../Flashforge PLA Color Change @FF C5.json | 2 +- .../Flashforge PLA Color Change @FF C5P.json | 2 +- ...e PLA Color Change @FF G4 0.25 nozzle.json | 2 +- ...PLA Color Change @FF G4 0.6 HF nozzle.json | 2 +- ...ge PLA Color Change @FF G4 0.6 nozzle.json | 2 +- ...PLA Color Change @FF G4 0.8 HF nozzle.json | 2 +- ...Flashforge PLA Color Change @FF G4 HF.json | 2 +- .../Flashforge PLA Color Change @FF G4.json | 2 +- ... PLA Color Change @FF G4P 0.25 nozzle.json | 2 +- ...LA Color Change @FF G4P 0.6 HF nozzle.json | 2 +- ...e PLA Color Change @FF G4P 0.6 nozzle.json | 2 +- ...LA Color Change @FF G4P 0.8 HF nozzle.json | 2 +- ...lashforge PLA Color Change @FF G4P HF.json | 2 +- .../Flashforge PLA Color Change @FF G4P.json | 2 +- .../filament/Flashforge PLA Color Change.json | 2 +- ...forge PLA Galaxy @FF AD5M 0.25 nozzle.json | 2 +- ...forge PLA Galaxy @FF AD5X 0.25 nozzle.json | 2 +- ...hforge PLA Galaxy @FF AD5X 0.6 nozzle.json | 2 +- ...hforge PLA Galaxy @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Galaxy @FF AD5X.json | 2 +- .../Flashforge PLA Galaxy @FF C5.json | 2 +- .../Flashforge PLA Galaxy @FF C5P.json | 2 +- ...shforge PLA Galaxy @FF G4 0.25 nozzle.json | 2 +- ...forge PLA Galaxy @FF G4 0.6 HF nozzle.json | 2 +- ...ashforge PLA Galaxy @FF G4 0.6 nozzle.json | 2 +- ...forge PLA Galaxy @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Galaxy @FF G4 HF.json | 2 +- .../Flashforge PLA Galaxy @FF G4.json | 2 +- ...hforge PLA Galaxy @FF G4P 0.25 nozzle.json | 2 +- ...orge PLA Galaxy @FF G4P 0.6 HF nozzle.json | 2 +- ...shforge PLA Galaxy @FF G4P 0.6 nozzle.json | 2 +- ...orge PLA Galaxy @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Galaxy @FF G4P HF.json | 2 +- .../Flashforge PLA Galaxy @FF G4P.json | 2 +- .../filament/Flashforge PLA Galaxy.json | 2 +- ...rge PLA Luminous @FF AD5M 0.25 nozzle.json | 2 +- ...rge PLA Luminous @FF AD5X 0.25 nozzle.json | 2 +- ...orge PLA Luminous @FF AD5X 0.6 nozzle.json | 2 +- ...orge PLA Luminous @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Luminous @FF AD5X.json | 2 +- .../Flashforge PLA Luminous @FF C5.json | 2 +- .../Flashforge PLA Luminous @FF C5P.json | 2 +- ...forge PLA Luminous @FF G4 0.25 nozzle.json | 2 +- ...rge PLA Luminous @FF G4 0.6 HF nozzle.json | 2 +- ...rge PLA Luminous @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Luminous @FF G4 HF.json | 2 +- .../Flashforge PLA Luminous @FF G4.json | 2 +- ...orge PLA Luminous @FF G4P 0.25 nozzle.json | 2 +- ...ge PLA Luminous @FF G4P 0.6 HF nozzle.json | 2 +- ...ge PLA Luminous @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Luminous @FF G4P HF.json | 2 +- .../Flashforge PLA Luminous @FF G4P.json | 2 +- .../filament/Flashforge PLA Luminous.json | 2 +- ...hforge PLA Matte @FF AD5M 0.25 nozzle.json | 2 +- ...hforge PLA Matte @FF AD5X 0.25 nozzle.json | 2 +- ...shforge PLA Matte @FF AD5X 0.6 nozzle.json | 2 +- ...shforge PLA Matte @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Matte @FF AD5X.json | 2 +- ...ashforge PLA Matte @FF G4 0.25 nozzle.json | 2 +- ...hforge PLA Matte @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge PLA Matte @FF G4 0.6 nozzle.json | 2 +- ...hforge PLA Matte @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Matte @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Matte @FF G4.json | 2 +- ...shforge PLA Matte @FF G4P 0.25 nozzle.json | 2 +- ...forge PLA Matte @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge PLA Matte @FF G4P 0.6 nozzle.json | 2 +- ...forge PLA Matte @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Matte @FF G4P HF.json | 2 +- .../Flashforge PLA Matte @FF G4P.json | 2 +- .../filament/Flashforge PLA Matte.json | 2 +- ...hforge PLA Metal @FF AD5M 0.25 nozzle.json | 2 +- ...hforge PLA Metal @FF AD5X 0.25 nozzle.json | 2 +- ...shforge PLA Metal @FF AD5X 0.6 nozzle.json | 2 +- ...shforge PLA Metal @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Metal @FF AD5X.json | 2 +- ...ashforge PLA Metal @FF G4 0.25 nozzle.json | 2 +- ...hforge PLA Metal @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge PLA Metal @FF G4 0.6 nozzle.json | 2 +- ...hforge PLA Metal @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Metal @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Metal @FF G4.json | 2 +- ...shforge PLA Metal @FF G4P 0.25 nozzle.json | 2 +- ...forge PLA Metal @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge PLA Metal @FF G4P 0.6 nozzle.json | 2 +- ...forge PLA Metal @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Metal @FF G4P HF.json | 2 +- .../Flashforge PLA Metal @FF G4P.json | 2 +- .../filament/Flashforge PLA Metal.json | 2 +- ...ashforge PLA Pro @FF AD5M 0.25 nozzle.json | 2 +- ...ashforge PLA Pro @FF AD5X 0.25 nozzle.json | 2 +- ...lashforge PLA Pro @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge PLA Pro @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge PLA Pro @FF AD5X.json | 2 +- ...Flashforge PLA Pro @FF G4 0.25 nozzle.json | 2 +- ...ashforge PLA Pro @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge PLA Pro @FF G4 0.6 nozzle.json | 2 +- ...ashforge PLA Pro @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Pro @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Pro @FF G4.json | 2 +- ...lashforge PLA Pro @FF G4P 0.25 nozzle.json | 2 +- ...shforge PLA Pro @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge PLA Pro @FF G4P 0.6 nozzle.json | 2 +- ...shforge PLA Pro @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Pro @FF G4P HF.json | 2 +- .../filament/Flashforge PLA Pro @FF G4P.json | 2 +- .../filament/Flashforge PLA Pro.json | 2 +- ...shforge PLA Silk @FF AD5M 0.25 nozzle.json | 2 +- ...shforge PLA Silk @FF AD5X 0.25 nozzle.json | 2 +- ...ashforge PLA Silk @FF AD5X 0.6 nozzle.json | 2 +- ...ashforge PLA Silk @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Silk @FF AD5X.json | 2 +- .../filament/Flashforge PLA Silk @FF C5.json | 2 +- .../filament/Flashforge PLA Silk @FF C5P.json | 2 +- ...lashforge PLA Silk @FF G4 0.25 nozzle.json | 2 +- ...shforge PLA Silk @FF G4 0.6 HF nozzle.json | 2 +- ...Flashforge PLA Silk @FF G4 0.6 nozzle.json | 2 +- ...shforge PLA Silk @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Silk @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Silk @FF G4.json | 2 +- ...ashforge PLA Silk @FF G4P 0.25 nozzle.json | 2 +- ...hforge PLA Silk @FF G4P 0.6 HF nozzle.json | 2 +- ...lashforge PLA Silk @FF G4P 0.6 nozzle.json | 2 +- ...hforge PLA Silk @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Silk @FF G4P HF.json | 2 +- .../filament/Flashforge PLA Silk @FF G4P.json | 2 +- .../filament/Flashforge PLA Silk.json | 2 +- ...orge PLA Sparkle @FF AD5M 0.25 nozzle.json | 2 +- ...orge PLA Sparkle @FF AD5X 0.25 nozzle.json | 2 +- ...forge PLA Sparkle @FF AD5X 0.6 nozzle.json | 2 +- ...forge PLA Sparkle @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Sparkle @FF AD5X.json | 2 +- ...hforge PLA Sparkle @FF G4 0.25 nozzle.json | 2 +- ...orge PLA Sparkle @FF G4 0.6 HF nozzle.json | 2 +- ...shforge PLA Sparkle @FF G4 0.6 nozzle.json | 2 +- .../Flashforge PLA Sparkle @FF G4 HF.json | 2 +- .../Flashforge PLA Sparkle @FF G4.json | 2 +- ...forge PLA Sparkle @FF G4P 0.25 nozzle.json | 2 +- ...rge PLA Sparkle @FF G4P 0.6 HF nozzle.json | 2 +- ...hforge PLA Sparkle @FF G4P 0.6 nozzle.json | 2 +- .../Flashforge PLA Sparkle @FF G4P HF.json | 2 +- .../Flashforge PLA Sparkle @FF G4P.json | 2 +- .../filament/Flashforge PLA Sparkle.json | 2 +- ...Flashforge PLA-CF @FF AD5X 0.6 nozzle.json | 2 +- ...Flashforge PLA-CF @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge PLA-CF @FF AD5X.json | 2 +- .../filament/Flashforge PLA-CF @FF C5.json | 2 +- .../filament/Flashforge PLA-CF @FF C5P.json | 2 +- .../Flashforge PLA-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/Flashforge PLA-CF @FF G4.json | 2 +- .../Flashforge PLA-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/Flashforge PLA-CF @FF G4P.json | 2 +- .../filament/Flashforge PLA-CF.json | 2 +- ...shforge PLA-SILK @FF AD5M 0.25 Nozzle.json | 2 +- .../filament/Flashforge PPA-CF @FF C5.json | 2 +- .../filament/Flashforge PPA-CF @FF C5P.json | 2 +- .../filament/Flashforge PPA-CF.json | 2 +- .../filament/Flashforge PPA-GF.json | 2 +- .../filament/Flashforge PPS @FF G4.json | 2 +- .../filament/Flashforge PPS @FF G4P.json | 2 +- .../filament/Flashforge PPS-CF @FF C5.json | 2 +- .../filament/Flashforge PPS-CF @FF C5P.json | 2 +- .../filament/Flashforge PPS-CF @FF G4.json | 2 +- .../filament/Flashforge PPS-CF @FF G4P.json | 2 +- .../filament/Flashforge PPS-CF.json | 2 +- .../filament/Flashforge PVA @FF C5.json | 2 +- .../filament/Flashforge PVA @FF C5P.json | 2 +- ...ashforge TPU 65D @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge TPU 65D @FF G4 0.6 nozzle.json | 2 +- ...ashforge TPU 65D @FF G4 0.8 HF nozzle.json | 2 +- ...shforge TPU 65D @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge TPU 65D @FF G4P 0.6 nozzle.json | 2 +- ...shforge TPU 65D @FF G4P 0.8 HF nozzle.json | 2 +- ...lashforge TPU 95A @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge TPU 95A @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge TPU 95A @FF AD5X.json | 2 +- ...ashforge TPU 95A @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge TPU 95A @FF G4 0.6 nozzle.json | 2 +- ...ashforge TPU 95A @FF G4 0.8 HF nozzle.json | 2 +- .../filament/Flashforge TPU 95A @FF G4.json | 2 +- ...shforge TPU 95A @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge TPU 95A @FF G4P 0.6 nozzle.json | 2 +- ...shforge TPU 95A @FF G4P 0.8 HF nozzle.json | 2 +- .../filament/Flashforge TPU 95A @FF G4P.json | 2 +- .../filament/Flashforge TPU 95A.json | 2 +- .../filament/Flashforge TPU-64D @FF C5.json | 2 +- .../filament/Flashforge TPU-64D @FF C5P.json | 2 +- .../filament/Flashforge TPU-90A @FF C5.json | 2 +- .../filament/Flashforge TPU-90A @FF C5P.json | 2 +- .../filament/Flashforge TPU-95A @FF C5.json | 2 +- .../filament/Flashforge TPU-95A @FF C5P.json | 2 +- .../Flashforge/Flashforge ABS @FF AD3.json | 2 +- .../Flashforge/Flashforge PETG @FF AD3.json | 2 +- .../Flashforge/Flashforge PLA @FF AD3.json | 2 +- .../FusRock PAHT @FF G4 0.6 HF nozzle.json | 2 +- .../FusRock PAHT @FF G4 0.6 nozzle.json | 2 +- .../FusRock PAHT @FF G4 0.8 HF nozzle.json | 2 +- .../FusRock PAHT @FF G4P 0.6 HF nozzle.json | 2 +- .../FusRock PAHT @FF G4P 0.6 nozzle.json | 2 +- .../FusRock PAHT @FF G4P 0.8 HF nozzle.json | 2 +- .../filament/FusRock PAHT-CF @FF C5.json | 2 +- .../filament/FusRock PAHT-CF @FF C5P.json | 2 +- .../FusRock PAHT-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/FusRock PAHT-CF @FF G4.json | 2 +- .../FusRock PAHT-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/FusRock PAHT-CF @FF G4P.json | 2 +- .../FusRock PET @FF G4P 0.8 HF nozzle.json | 2 +- .../FusRock PET-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/FusRock PET-CF @FF G4.json | 2 +- .../FusRock PET-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/FusRock PET-CF @FF G4P.json | 2 +- .../filament/FusRock S-Multi @FF C5.json | 2 +- .../filament/FusRock S-Multi @FF C5P.json | 2 +- .../filament/FusRock S-PAHT @FF C5.json | 2 +- .../filament/FusRock S-PAHT @FF C5P.json | 2 +- .../FusRock/FusRock Generic NexPA-CF25.json | 2 +- ...sRock Generic PAHT-CF @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic PAHT-CF.json | 2 +- .../FusRock/FusRock Generic PAHT-GF.json | 2 +- ...usRock Generic PET-CF @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic PET-CF.json | 2 +- .../FusRock/FusRock Generic PET-GF.json | 2 +- ...sRock Generic S-Multi @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic S-Multi.json | 2 +- ...usRock Generic S-PAHT @G3U 0.6 Nozzle.json | 2 +- .../FusRock/FusRock Generic S-PAHT.json | 2 +- .../filament/Generic ABS @Flashforge AD4.json | 2 +- .../filament/Generic ASA @Flashforge AD4.json | 2 +- .../Generic PET @FF G4 0.6 HF nozzle.json | 2 +- .../Generic PET @FF G4 0.6 nozzle.json | 2 +- .../Generic PET @FF G4 0.8 HF nozzle.json | 2 +- .../filament/Generic PET @FF G4.json | 2 +- .../Generic PET @FF G4P 0.6 HF nozzle.json | 2 +- .../Generic PET @FF G4P 0.6 nozzle.json | 2 +- .../Generic PET @FF G4P 0.8 HF nozzle.json | 2 +- .../filament/Generic PET @FF G4P.json | 2 +- .../Generic PETG @Flashforge AD4.json | 2 +- .../Generic PETG-CF10 @Flashforge AD4.json | 2 +- .../filament/Generic PLA @Flashforge AD4.json | 2 +- ...eneric PLA High Speed @Flashforge AD4.json | 2 +- .../Generic PLA Silk @Flashforge AD4.json | 2 +- .../Generic PLA-CF10 @Flashforge AD4.json | 2 +- .../Generic TPU 85A @FF AD5X 0.6 nozzle.json | 2 +- .../Generic TPU 85A @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Generic TPU 85A @FF AD5X.json | 2 +- .../filament/Generic TPU @Flashforge AD4.json | 2 +- .../filament/Generic TPU-64D @FF C5.json | 2 +- .../filament/Generic TPU-64D @FF C5P.json | 2 +- .../filament/Generic TPU-90A @FF C5.json | 2 +- .../filament/Generic TPU-90A @FF C5P.json | 2 +- .../filament/Generic TPU-95A @FF C5.json | 2 +- .../filament/Generic TPU-95A @FF C5P.json | 2 +- .../Polymaker CoPA @FF G4 0.6 HF nozzle.json | 2 +- .../Polymaker CoPA @FF G4 0.6 nozzle.json | 2 +- .../Polymaker CoPA @FF G4 0.8 HF nozzle.json | 2 +- .../Polymaker CoPA @FF G4P 0.6 HF nozzle.json | 2 +- .../Polymaker CoPA @FF G4P 0.6 nozzle.json | 2 +- .../Polymaker CoPA @FF G4P 0.8 HF nozzle.json | 2 +- .../Polymaker/Polymaker Generic CoPA.json | 2 +- .../Polymaker/Polymaker Generic S1.json | 2 +- .../filament/SUNLU/SUNLU PETG @base.json | 2 +- .../SUNLU/SUNLU PLA Marble @base.json | 2 +- .../filament/SUNLU/SUNLU PLA Matte @base.json | 2 +- .../filament/SUNLU/SUNLU PLA+ 2.0 @base.json | 2 +- .../filament/SUNLU/SUNLU PLA+ @base.json | 2 +- .../filament/SUNLU/SUNLU Silk PLA+ @base.json | 2 +- .../filament/SUNLU/SUNLU Wood PLA @base.json | 2 +- .../filament/FlyingBear Generic ABS.json | 2 +- .../filament/FlyingBear Generic PA-CF.json | 2 +- .../filament/FlyingBear Generic PC.json | 2 +- .../filament/FlyingBear Generic PETG.json | 2 +- .../filament/FlyingBear Generic PLA.json | 2 +- .../filament/FlyingBear Generic TPU.json | 2 +- .../filament/FlyingBear PLA Hyper.json | 2 +- .../Ghost7/FlyingBear ABS @Ghost7.json | 2 +- .../Ghost7/FlyingBear PA-CF @Ghost7.json | 2 +- .../Ghost7/FlyingBear PC @Ghost7.json | 2 +- .../Ghost7/FlyingBear PETG Basic @Ghost7.json | 2 +- .../Ghost7/FlyingBear PLA Basic @Ghost7.json | 2 +- .../Ghost7/FlyingBear PLA Hyper @Ghost7.json | 2 +- .../Ghost7/FlyingBear TPU Basic @Ghost7.json | 2 +- .../filament/S1/FlyingBear ABS @S1.json | 2 +- .../filament/S1/FlyingBear PA-CF @S1.json | 2 +- .../filament/S1/FlyingBear PC @S1.json | 2 +- .../filament/S1/FlyingBear PETG @S1.json | 2 +- .../filament/S1/FlyingBear PLA @S1.json | 2 +- .../filament/S1/FlyingBear PLA Hyper @S1.json | 2 +- .../filament/S1/FlyingBear TPU @S1.json | 2 +- .../FlyingBear/filament/S1/Other ABS @S1.json | 2 +- .../filament/S1/Other PA-CF @S1.json | 2 +- .../FlyingBear/filament/S1/Other PC @S1.json | 2 +- .../filament/S1/Other PETG @S1.json | 2 +- .../FlyingBear/filament/S1/Other PLA @S1.json | 2 +- .../filament/S1/Other PLA Hyper @S1.json | 2 +- .../FlyingBear/filament/S1/Other TPU @S1.json | 2 +- .../filament/Ginger Generic PETG.json | 2 +- .../filament/Ginger Generic PLA.json | 2 +- .../filament/EX+APS/InfiMech ABS @EX+APS.json | 2 +- .../EX+APS/InfiMech PA-CF @EX+APS.json | 2 +- .../filament/EX+APS/InfiMech PC @EX+APS.json | 2 +- .../EX+APS/InfiMech PETG @EX+APS.json | 2 +- .../EX+APS/InfiMech PLA Basic @EX+APS.json | 2 +- .../EX+APS/InfiMech PLA Hyper @EX+APS.json | 2 +- .../EX+APS/InfiMech TPU Basic @EX+APS.json | 2 +- .../filament/EX/InfiMech ABS @EX.json | 2 +- .../filament/EX/InfiMech PA-CF @EX.json | 2 +- .../InfiMech/filament/EX/InfiMech PC @EX.json | 2 +- .../filament/EX/InfiMech PETG @EX.json | 2 +- .../filament/EX/InfiMech PLA Basic @EX.json | 2 +- .../filament/EX/InfiMech PLA Hyper @EX.json | 2 +- .../filament/EX/InfiMech TPU Basic @EX.json | 2 +- .../filament/HSN/InfiMech ABS @HSN.json | 2 +- .../filament/HSN/InfiMech PA-CF @HSN.json | 2 +- .../filament/HSN/InfiMech PC @HSN.json | 2 +- .../filament/HSN/InfiMech PETG @HSN.json | 2 +- .../filament/HSN/InfiMech PLA @HSN.json | 2 +- .../filament/HSN/InfiMech PLA Hyper @HSN.json | 2 +- .../filament/HSN/InfiMech TPU @HSN.json | 2 +- .../InfiMech/filament/HSN/Other ABS @HSN.json | 2 +- .../filament/HSN/Other PA-CF @HSN.json | 2 +- .../InfiMech/filament/HSN/Other PC @HSN.json | 2 +- .../filament/HSN/Other PETG @HSN.json | 2 +- .../InfiMech/filament/HSN/Other PLA @HSN.json | 2 +- .../filament/HSN/Other PLA Hyper @HSN.json | 2 +- .../InfiMech/filament/HSN/Other TPU @HSN.json | 2 +- .../filament/InfiMech Generic ABS.json | 2 +- .../filament/InfiMech Generic PA-CF.json | 2 +- .../filament/InfiMech Generic PC.json | 2 +- .../filament/InfiMech Generic PETG.json | 2 +- .../filament/InfiMech Generic PLA.json | 2 +- .../filament/InfiMech Generic TPU.json | 2 +- .../InfiMech/filament/InfiMech PLA Hyper.json | 2 +- .../profiles/InfiMech/filament/Other ABS.json | 2 +- .../InfiMech/filament/Other PA-CF.json | 2 +- .../profiles/InfiMech/filament/Other PC.json | 2 +- .../InfiMech/filament/Other PETG.json | 2 +- .../InfiMech/filament/Other PLA Hyper.json | 2 +- .../profiles/InfiMech/filament/Other PLA.json | 2 +- .../profiles/InfiMech/filament/Other TPU.json | 2 +- resources/profiles/LH/filament/LHS ABS.json | 2 +- resources/profiles/LH/filament/LHS ASA.json | 2 +- resources/profiles/LH/filament/LHS PC CF.json | 2 +- resources/profiles/LH/filament/LHS PCTG.json | 2 +- resources/profiles/LH/filament/LHS PETG.json | 2 +- resources/profiles/LH/filament/LHS PLA.json | 2 +- .../LH/filament/LHS TPU Foamy 78A.json | 2 +- resources/profiles/LH/filament/LHS TPU.json | 2 +- .../Generic PETG @LONGER LK10 Plus.json | 2 +- .../filament/Generic PETG @LONGER LK10.json | 2 +- .../Generic PLA @LONGER LK10 Plus.json | 2 +- .../filament/Generic PLA @LONGER LK10.json | 2 +- .../Lulzbot/filament/Lulzbot 2.85mm ABS.json | 2 +- .../Lulzbot/filament/Lulzbot 2.85mm PETG.json | 2 +- .../Lulzbot/filament/Lulzbot 2.85mm PLA.json | 2 +- .../MagicMaker/filament/MM Generic PEEK.json | 2 +- .../OrcaArena/filament/Arena ABS @base.json | 2 +- .../OrcaArena/filament/Arena PA-CF @base.json | 2 +- .../filament/Arena PAHT-CF @base.json | 2 +- .../OrcaArena/filament/Arena PC @base.json | 2 +- .../filament/Arena PET-CF @base.json | 2 +- .../filament/Arena PETG Basic @base.json | 2 +- .../filament/Arena PETG-CF @base.json | 2 +- .../filament/Arena PLA Basic @base.json | 2 +- .../filament/Arena PLA Impact @base.json | 2 +- .../filament/Arena PLA Marble @base.json | 2 +- .../filament/Arena PLA Matte @base.json | 2 +- .../filament/Arena PLA Metal @base.json | 2 +- .../filament/Arena PLA Silk @base.json | 2 +- .../filament/Arena PLA Sparkle @base.json | 2 +- .../filament/Arena PLA Tough @base.json | 2 +- .../filament/Arena PLA-CF @base.json | 2 +- .../filament/Arena Support G @base.json | 2 +- .../filament/Arena Support W @base.json | 2 +- .../filament/Arena TPU 95A @base.json | 2 +- .../filament/OrcaArena Generic ABS @base.json | 2 +- .../filament/OrcaArena Generic ASA @base.json | 2 +- .../filament/OrcaArena Generic PA-CF.json | 2 +- .../filament/OrcaArena Generic PA.json | 2 +- .../filament/OrcaArena Generic PC @base.json | 2 +- .../OrcaArena Generic PETG @base.json | 2 +- .../OrcaArena Generic PETG-CF @base.json | 2 +- .../filament/OrcaArena Generic PLA @base.json | 2 +- .../OrcaArena Generic PLA Silk @base.json | 2 +- .../OrcaArena Generic PLA-CF @base.json | 2 +- .../filament/OrcaArena Generic PVA @base.json | 2 +- .../filament/OrcaArena Generic TPU.json | 2 +- .../filament/PolyLite PLA @base.json | 2 +- .../filament/PolyTerra PLA @base.json | 2 +- .../Peopoly/filament/Peopoly Generic ABS.json | 2 +- .../filament/Peopoly Generic PETG.json | 2 +- .../Peopoly/filament/Peopoly Generic PLA.json | 2 +- .../filament/Peopoly Lancer ABS-GF.json | 2 +- .../filament/Peopoly Lancer PET-CF.json | 2 +- .../filament/Peopoly Lancer PETG-C.json | 2 +- .../filament/Peopoly Lancer PLA-C.json | 2 +- .../Phrozen PLA @Phrozen Arco 0.4 nozzle.json | 2 +- .../Prusa Generic ABS @CORE One 0.6.json | 2 +- .../Prusa Generic ABS @CORE One 0.8.json | 2 +- .../Prusa Generic ABS @CORE One HF 0.4.json | 2 +- .../Prusa Generic ABS @CORE One HF 0.5.json | 2 +- .../Prusa Generic ABS @CORE One HF 0.6.json | 2 +- .../Prusa Generic ABS @CORE One HF 0.8.json | 2 +- .../filament/Prusa Generic ABS @CORE One.json | 2 +- .../Prusa Generic ABS @MK3.5 0.25.json | 2 +- .../Prusa Generic ABS @MK3.5 0.6.json | 2 +- .../Prusa Generic ABS @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic ABS @MK3.5.json | 2 +- .../filament/Prusa Generic ABS @MK4S 0.6.json | 2 +- .../filament/Prusa Generic ABS @MK4S 0.8.json | 2 +- .../Prusa Generic ABS @MK4S HF0.4.json | 2 +- .../Prusa Generic ABS @MK4S HF0.5.json | 2 +- .../Prusa Generic ABS @MK4S HF0.6.json | 2 +- .../Prusa Generic ABS @MK4S HF0.8.json | 2 +- .../filament/Prusa Generic ABS @MK4S.json | 2 +- .../filament/Prusa Generic ABS @base.json | 2 +- .../Prusa Generic ABS HF @MK3.5 0.6.json | 2 +- .../Prusa Generic ABS HF @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic ABS HF @MK3.5.json | 2 +- .../filament/Prusa Generic ABS HF @base.json | 2 +- .../Prusa Generic ASA @CORE One 0.6.json | 2 +- .../Prusa Generic ASA @CORE One 0.8.json | 2 +- .../Prusa Generic ASA @CORE One HF 0.4.json | 2 +- .../Prusa Generic ASA @CORE One HF 0.5.json | 2 +- .../Prusa Generic ASA @CORE One HF 0.6.json | 2 +- .../Prusa Generic ASA @CORE One HF 0.8.json | 2 +- .../filament/Prusa Generic ASA @CORE One.json | 2 +- .../Prusa Generic ASA @MINIIS 0.25.json | 1 + .../Prusa Generic ASA @MINIIS 0.6.json | 1 + .../Prusa Generic ASA @MINIIS 0.8.json | 1 + .../filament/Prusa Generic ASA @MINIIS.json | 1 + .../Prusa Generic ASA @MK3.5 0.25.json | 2 +- .../Prusa Generic ASA @MK3.5 0.6.json | 2 +- .../Prusa Generic ASA @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic ASA @MK3.5.json | 2 +- .../filament/Prusa Generic ASA @MK4.json | 1 + .../filament/Prusa Generic ASA @MK4S 0.6.json | 2 +- .../filament/Prusa Generic ASA @MK4S 0.8.json | 2 +- .../Prusa Generic ASA @MK4S HF0.4.json | 2 +- .../Prusa Generic ASA @MK4S HF0.5.json | 2 +- .../Prusa Generic ASA @MK4S HF0.6.json | 2 +- .../Prusa Generic ASA @MK4S HF0.8.json | 2 +- .../filament/Prusa Generic ASA @MK4S.json | 2 +- .../Prusa Generic ASA HF @MK3.5 0.6.json | 2 +- .../Prusa Generic ASA HF @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic ASA HF @MK3.5.json | 2 +- .../filament/Prusa Generic ASA HF @base.json | 2 +- .../Prusa/filament/Prusa Generic ASA.json | 1 + .../filament/Prusa Generic FLEX @XL 5T.json | 1 + .../filament/Prusa Generic FLEX @XL.json | 1 + .../Prusa Generic PA @MK3.5 0.25.json | 2 +- .../filament/Prusa Generic PA @MK3.5 0.6.json | 2 +- .../filament/Prusa Generic PA @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PA @MK3.5.json | 2 +- .../filament/Prusa Generic PA @base.json | 2 +- .../Prusa Generic PA-CF @MK3.5 0.25.json | 2 +- .../Prusa Generic PA-CF @MK3.5 0.6.json | 2 +- .../Prusa Generic PA-CF @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PA-CF @MK3.5.json | 2 +- .../filament/Prusa Generic PA-CF @base.json | 2 +- .../Prusa Generic PC @MK3.5 0.25.json | 2 +- .../filament/Prusa Generic PC @MK3.5 0.6.json | 2 +- .../filament/Prusa Generic PC @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PC @MK3.5.json | 2 +- .../Prusa Generic PC HF @MK3.5 0.6.json | 2 +- .../Prusa Generic PC HF @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PC HF @MK3.5.json | 2 +- .../filament/Prusa Generic PC HF @base.json | 2 +- .../Prusa Generic PETG @CORE One 0.6.json | 2 +- .../Prusa Generic PETG @CORE One 0.8.json | 2 +- .../Prusa Generic PETG @CORE One HF 0.4.json | 2 +- .../Prusa Generic PETG @CORE One HF 0.5.json | 2 +- .../Prusa Generic PETG @CORE One HF 0.6.json | 2 +- .../Prusa Generic PETG @CORE One HF 0.8.json | 2 +- .../Prusa Generic PETG @CORE One.json | 2 +- .../Prusa Generic PETG @MK3.5 0.25.json | 2 +- .../Prusa Generic PETG @MK3.5 0.6.json | 2 +- .../Prusa Generic PETG @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PETG @MK3.5.json | 2 +- .../Prusa Generic PETG @MK4S 0.6.json | 2 +- .../Prusa Generic PETG @MK4S 0.8.json | 2 +- .../Prusa Generic PETG @MK4S HF0.4.json | 2 +- .../Prusa Generic PETG @MK4S HF0.5.json | 2 +- .../Prusa Generic PETG @MK4S HF0.6.json | 2 +- .../Prusa Generic PETG @MK4S HF0.8.json | 2 +- .../filament/Prusa Generic PETG @MK4S.json | 2 +- .../filament/Prusa Generic PETG @base.json | 2 +- .../Prusa Generic PETG HF @MK3.5 0.6.json | 2 +- .../Prusa Generic PETG HF @MK3.5 0.8.json | 2 +- .../Prusa Generic PETG HF @MK3.5.json | 2 +- .../filament/Prusa Generic PETG HF @base.json | 2 +- .../Prusa Generic PLA @CORE One 0.6.json | 2 +- .../Prusa Generic PLA @CORE One 0.8.json | 2 +- .../Prusa Generic PLA @CORE One HF 0.4.json | 2 +- .../Prusa Generic PLA @CORE One HF 0.5.json | 2 +- .../Prusa Generic PLA @CORE One HF 0.6.json | 2 +- .../Prusa Generic PLA @CORE One HF 0.8.json | 2 +- .../filament/Prusa Generic PLA @CORE One.json | 2 +- .../Prusa Generic PLA @MK3.5 0.25.json | 2 +- .../Prusa Generic PLA @MK3.5 0.6.json | 2 +- .../Prusa Generic PLA @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PLA @MK3.5.json | 2 +- .../filament/Prusa Generic PLA @MK4S 0.6.json | 2 +- .../filament/Prusa Generic PLA @MK4S 0.8.json | 2 +- .../Prusa Generic PLA @MK4S HF0.4.json | 2 +- .../Prusa Generic PLA @MK4S HF0.5.json | 2 +- .../Prusa Generic PLA @MK4S HF0.6.json | 2 +- .../Prusa Generic PLA @MK4S HF0.8.json | 2 +- .../filament/Prusa Generic PLA @MK4S.json | 2 +- .../filament/Prusa Generic PLA @base.json | 2 +- .../Prusa Generic PLA HF @MK3.5 0.6.json | 2 +- .../Prusa Generic PLA HF @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PLA HF @MK3.5.json | 2 +- .../filament/Prusa Generic PLA HF @base.json | 2 +- .../Prusa Generic PLA Silk @CORE One 0.6.json | 2 +- .../Prusa Generic PLA Silk @CORE One 0.8.json | 2 +- .../Prusa Generic PLA Silk @CORE One.json | 2 +- .../Prusa Generic PLA Silk @MK4S 0.6.json | 2 +- .../Prusa Generic PLA Silk @MK4S 0.8.json | 2 +- .../Prusa Generic PLA Silk @MK4S.json | 2 +- .../Prusa Generic PLA-CF @MK3.5 0.25.json | 2 +- .../Prusa Generic PLA-CF @MK3.5 0.6.json | 2 +- .../Prusa Generic PLA-CF @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PLA-CF @MK3.5.json | 2 +- .../filament/Prusa Generic PLA-CF @base.json | 2 +- .../Prusa Generic PVA @MK3.5 0.25.json | 2 +- .../Prusa Generic PVA @MK3.5 0.6.json | 2 +- .../Prusa Generic PVA @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PVA @MK3.5.json | 2 +- .../filament/Prusa Generic PVA @base.json | 2 +- .../Prusa Generic PVA HF @MK3.5 0.6.json | 2 +- .../Prusa Generic PVA HF @MK3.5 0.8.json | 2 +- .../filament/Prusa Generic PVA HF @MK3.5.json | 2 +- .../filament/Prusa Generic PVA HF @base.json | 2 +- .../Prusa Generic TPU @CORE One 0.6.json | 2 +- .../Prusa Generic TPU @CORE One 0.8.json | 2 +- .../filament/Prusa Generic TPU @CORE One.json | 2 +- .../filament/Prusa Generic TPU @MK3.5.json | 2 +- .../filament/Prusa Generic TPU @MK4S 0.6.json | 2 +- .../filament/Prusa Generic TPU @MK4S 0.8.json | 2 +- .../filament/Prusa Generic TPU @MK4S.json | 2 +- .../filament/Prusa Generic TPU @base.json | 2 +- .../filament/Prusa Generic TPU HF @MK3.5.json | 2 +- .../filament/Prusa Generic TPU HF @base.json | 2 +- .../filament/Prusament ASA @CORE One 0.6.json | 2 +- .../filament/Prusament ASA @CORE One 0.8.json | 2 +- .../Prusament ASA @CORE One HF 0.4.json | 2 +- .../Prusament ASA @CORE One HF 0.5.json | 2 +- .../Prusament ASA @CORE One HF 0.6.json | 2 +- .../Prusament ASA @CORE One HF 0.8.json | 2 +- .../filament/Prusament ASA @CORE One.json | 2 +- .../Prusa/filament/Prusament ASA @XL 5T.json | 2 + .../Prusa/filament/Prusament ASA @XL.json | 2 + .../Prusament PA-CF @CORE One 0.6.json | 2 +- .../Prusament PA-CF @CORE One 0.8.json | 2 +- .../filament/Prusament PA-CF @CORE One.json | 4 +- .../filament/Prusament PA-CF @XL 5T.json | 2 + .../Prusa/filament/Prusament PA-CF @XL.json | 2 + .../Prusament PC Blend @CORE One 0.6.json | 2 +- .../Prusament PC Blend @CORE One 0.8.json | 2 +- .../Prusament PC Blend @CORE One HF 0.4.json | 2 +- .../Prusament PC Blend @CORE One HF 0.5.json | 2 +- .../Prusament PC Blend @CORE One HF 0.6.json | 2 +- .../Prusament PC Blend @CORE One HF 0.8.json | 2 +- .../Prusament PC Blend @CORE One.json | 2 +- .../Prusament PC-CF @CORE One 0.6.json | 2 +- .../Prusament PC-CF @CORE One 0.8.json | 2 +- .../filament/Prusament PC-CF @CORE One.json | 4 +- .../filament/Prusament PC-CF @XL 5T.json | 2 + .../Prusa/filament/Prusament PC-CF @XL.json | 2 + .../Prusament PETG @CORE One 0.6.json | 2 +- .../Prusament PETG @CORE One 0.8.json | 2 +- .../Prusament PETG @CORE One HF 0.4.json | 2 +- .../Prusament PETG @CORE One HF 0.5.json | 2 +- .../Prusament PETG @CORE One HF 0.6.json | 2 +- .../Prusament PETG @CORE One HF 0.8.json | 2 +- .../filament/Prusament PETG @CORE One.json | 2 +- .../Prusa/filament/Prusament PETG @base.json | 2 +- .../filament/Prusament PLA @CORE One 0.6.json | 2 +- .../filament/Prusament PLA @CORE One 0.8.json | 2 +- .../Prusament PLA @CORE One HF 0.4.json | 2 +- .../Prusament PLA @CORE One HF 0.5.json | 2 +- .../Prusament PLA @CORE One HF 0.6.json | 2 +- .../Prusament PLA @CORE One HF 0.8.json | 2 +- .../filament/Prusament PLA @CORE One.json | 2 +- .../Prusa/filament/Prusament PLA @base.json | 2 +- .../filament/Prusament PVB @CORE One 0.6.json | 2 +- .../filament/Prusament PVB @CORE One 0.8.json | 2 +- .../filament/Prusament PVB @CORE One.json | 2 +- .../Prusa/filament/Prusament PVB @XL 5T.json | 2 + .../Prusa/filament/Prusament PVB @XL.json | 2 + .../Prusament rPLA @CORE One 0.6.json | 2 +- .../Prusament rPLA @CORE One 0.8.json | 2 +- .../filament/Prusament rPLA @CORE One.json | 2 +- .../Prusa/filament/Prusament rPLA @base.json | 2 +- .../Prusa/filament/fdm_filament_asa.json | 1 - .../Prusa/filament/fdm_filament_flex.json | 1 - .../Prusa/filament/fdm_filament_pa11cf.json | 1 - .../Prusa/filament/fdm_filament_pccf.json | 1 - .../Prusa/filament/fdm_filament_pvb.json | 1 - .../Qidi/filament/Bambu ABS @0.2 nozzle.json | 2 +- .../Qidi/filament/Bambu ABS @0.6 nozzle.json | 2 +- .../Qidi/filament/Bambu ABS @0.8 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/Bambu ABS.json | 2 +- .../Qidi/filament/Bambu PETG @0.2 nozzle.json | 2 +- .../Qidi/filament/Bambu PETG @0.6 nozzle.json | 2 +- .../Qidi/filament/Bambu PETG @0.8 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/Bambu PETG.json | 2 +- .../Qidi/filament/Bambu PLA @0.2 nozzle.json | 2 +- .../Qidi/filament/Bambu PLA @0.6 nozzle.json | 2 +- .../Qidi/filament/Bambu PLA @0.8 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/Bambu PLA.json | 2 +- .../HATCHBOX ABS @Qidi 0.2 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi 0.6 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi 0.8 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...ATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/HATCHBOX ABS @Qidi.json | 2 +- .../HATCHBOX PETG @Qidi 0.2 nozzle.json | 2 +- .../HATCHBOX PETG @Qidi 0.6 nozzle.json | 2 +- .../HATCHBOX PETG @Qidi 0.8 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...TCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/HATCHBOX PETG @Qidi.json | 2 +- .../HATCHBOX PLA @Qidi 0.2 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi 0.6 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi 0.8 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...ATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/HATCHBOX PLA @Qidi.json | 2 +- .../Overture ABS @Qidi 0.2 nozzle.json | 2 +- .../Overture ABS @Qidi 0.6 nozzle.json | 2 +- .../Overture ABS @Qidi 0.8 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Overture ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...verture ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/Overture ABS @Qidi.json | 2 +- .../Overture PLA @Qidi 0.2 nozzle.json | 2 +- .../Overture PLA @Qidi 0.6 nozzle.json | 2 +- .../Overture PLA @Qidi 0.8 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Overture PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...verture PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/Overture PLA @Qidi.json | 2 +- .../PolyLite ABS @Qidi 0.2 nozzle.json | 2 +- .../PolyLite ABS @Qidi 0.6 nozzle.json | 2 +- .../PolyLite ABS @Qidi 0.8 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...olyLite ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/PolyLite ABS @Qidi.json | 2 +- .../PolyLite PLA @Qidi 0.2 nozzle.json | 2 +- .../PolyLite PLA @Qidi 0.6 nozzle.json | 2 +- .../PolyLite PLA @Qidi 0.8 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...olyLite PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/PolyLite PLA @Qidi.json | 2 +- .../Qidi/filament/Q2/Bambu ABS @Q2.json | 2 +- .../Qidi/filament/Q2/Bambu ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/Bambu PETG @Q2.json | 2 +- .../Qidi/filament/Q2/Bambu PETG @Q2C.json | 2 +- .../Qidi/filament/Q2/Bambu PLA @Q2.json | 2 +- .../Qidi/filament/Q2/Bambu PLA @Q2C.json | 2 +- .../Qidi/filament/Q2/Generic PLA+ @Q2.json | 2 +- .../Qidi/filament/Q2/Generic PLA+ @Q2C.json | 2 +- .../Qidi/filament/Q2/HATCHBOX ABS @Q2.json | 2 +- .../Qidi/filament/Q2/HATCHBOX ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PETG @Q2.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PETG @Q2C.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PLA @Q2.json | 2 +- .../Qidi/filament/Q2/HATCHBOX PLA @Q2C.json | 2 +- .../Qidi/filament/Q2/Overture ABS @Q2.json | 2 +- .../Qidi/filament/Q2/Overture ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/Overture PLA @Q2.json | 2 +- .../Qidi/filament/Q2/Overture PLA @Q2C.json | 2 +- .../Qidi/filament/Q2/PolyLite ABS @Q2.json | 2 +- .../Qidi/filament/Q2/PolyLite ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/PolyLite PLA @Q2.json | 2 +- .../Qidi/filament/Q2/PolyLite PLA @Q2C.json | 2 +- .../QIDI ABS Odorless @0.2 nozzle.json | 2 +- .../QIDI ABS Odorless @0.6 nozzle.json | 2 +- .../QIDI ABS Odorless @0.8 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...BS Odorless @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI ABS Odorless.json | 2 +- .../filament/QIDI ABS Rapido 0.2 nozzle.json | 2 +- .../filament/QIDI ABS Rapido 0.6 nozzle.json | 2 +- .../filament/QIDI ABS Rapido 0.8 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../QIDI ABS Rapido Metal @0.2 nozzle.json | 2 +- .../QIDI ABS Rapido Metal @0.6 nozzle.json | 2 +- .../QIDI ABS Rapido Metal @0.8 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI ABS Rapido Metal.json | 2 +- .../Qidi/filament/QIDI ABS Rapido.json | 2 +- .../QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ABS-GF.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...DI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...DI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...DI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ABS-GF10.json | 2 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...DI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...DI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...DI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ABS-GF25.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Max 3 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json | 2 +- .../QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json | 2 +- ...QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json | 2 +- ...QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json | 2 +- ...QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json | 2 +- ...IDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json | 2 +- ...IDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json | 2 +- ...IDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI ASA.json | 2 +- ...QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PA-Ultra.json | 2 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PA12-CF.json | 2 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PAHT-CF.json | 2 +- .../filament/QIDI PAHT-GF @0.6 nozzle.json | 2 +- .../filament/QIDI PAHT-GF @0.8 nozzle.json | 2 +- .../QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PAHT-GF.json | 2 +- ...QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PET-CF.json | 2 +- .../filament/QIDI PET-GF @0.6 nozzle.json | 2 +- .../filament/QIDI PET-GF @0.8 nozzle.json | 2 +- .../QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PET-GF.json | 2 +- .../filament/QIDI PETG Basic @0.2 nozzle.json | 2 +- .../filament/QIDI PETG Basic @0.6 nozzle.json | 2 +- .../filament/QIDI PETG Basic @0.8 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Basic.json | 2 +- .../QIDI PETG Rapido @0.2 nozzle.json | 2 +- .../QIDI PETG Rapido @0.6 nozzle.json | 2 +- .../QIDI PETG Rapido @0.8 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...I PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Rapido.json | 2 +- .../filament/QIDI PETG Tough 0.2 nozzle.json | 2 +- .../filament/QIDI PETG Tough 0.6 nozzle.json | 2 +- .../filament/QIDI PETG Tough 0.8 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Tough.json | 2 +- .../QIDI PETG Translucent @0.2 nozzle.json | 2 +- .../QIDI PETG Translucent @0.6 nozzle.json | 2 +- .../QIDI PETG Translucent @0.8 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...G Translucent @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PETG Translucent.json | 2 +- .../QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PETG-CF.json | 2 +- .../QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PETG-GF.json | 2 +- .../filament/QIDI PLA Basic @0.2 nozzle.json | 2 +- .../filament/QIDI PLA Basic @0.6 nozzle.json | 2 +- .../filament/QIDI PLA Basic @0.8 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...IDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Basic.json | 2 +- .../QIDI PLA Matte Basic @0.2 nozzle.json | 2 +- .../QIDI PLA Matte Basic @0.6 nozzle.json | 2 +- .../QIDI PLA Matte Basic @0.8 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...A Matte Basic @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Matte Basic.json | 2 +- .../filament/QIDI PLA Rapido 0.2 nozzle.json | 2 +- .../filament/QIDI PLA Rapido 0.8 nozzle.json | 2 +- .../filament/QIDI PLA Rapido @0.6 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...DI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../QIDI PLA Rapido Matte @0.2 nozzle.json | 2 +- .../QIDI PLA Rapido Matte @0.6 nozzle.json | 2 +- .../QIDI PLA Rapido Matte @0.8 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Rapido Matte.json | 2 +- .../QIDI PLA Rapido Metal @0.2 nozzle.json | 2 +- .../QIDI PLA Rapido Metal @0.6 nozzle.json | 2 +- .../QIDI PLA Rapido Metal @0.8 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Rapido Metal.json | 2 +- .../QIDI PLA Rapido Silk @0.6 nozzle.json | 2 +- ...A Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...A Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Qidi/filament/QIDI PLA Rapido Silk.json | 2 +- .../Qidi/filament/QIDI PLA Rapido.json | 2 +- .../filament/QIDI PLA-CF @0.6 nozzle.json | 2 +- .../filament/QIDI PLA-CF @0.8 nozzle.json | 2 +- .../QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../filament/QIDI PPS-CF @0.6 nozzle.json | 2 +- .../filament/QIDI PPS-CF @0.8 nozzle.json | 2 +- .../QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PPS-CF.json | 2 +- .../QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI Support For PAHT.json | 2 +- .../filament/QIDI Support For PET-PA.json | 2 +- ...QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI TPU-Aero.json | 2 +- .../QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI UltraPA-CF25.json | 2 +- .../QIDI WOOD Rapido @0.6 nozzle.json | 2 +- .../QIDI WOOD Rapido @0.8 nozzle.json | 2 +- ...I WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...I WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...I WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/QIDI WOOD Rapido.json | 2 +- ...Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...di ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../profiles/Qidi/filament/Qidi ASA-Aero.json | 2 +- ...i Generic ABS @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...i Generic ABS @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...i Generic ABS @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...i Generic ABS @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... Generic ABS @Qidi X-Max 3 0.2 nozzle.json | 2 +- ...Generic ABS @Qidi X-Plus 3 0.2 nozzle.json | 2 +- ...Generic ABS @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...Generic ABS @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...Generic ABS @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...Generic ABS @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...eneric ABS @Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic ABS.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...i Generic ASA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... Generic ASA @Qidi X-Max 3 0.2 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 3 0.2 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...Generic ASA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...eneric ASA @Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic ASA.json | 2 +- .../Qidi/filament/Qidi Generic PA-CF.json | 2 +- .../Qidi/filament/Qidi Generic PA.json | 2 +- .../filament/Qidi Generic PC @0.2 nozzle.json | 2 +- .../filament/Qidi Generic PC @0.8 nozzle.json | 2 +- ...di Generic PC @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...di Generic PC @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...di Generic PC @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...di Generic PC @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... Generic PC @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... Generic PC @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... Generic PC @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... Generic PC @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic PC.json | 2 +- ... Generic PETG @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Generic PETG @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Generic PETG @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Generic PETG @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...Generic PETG @Qidi X-Max 3 0.2 nozzle.json | 2 +- ...eneric PETG @Qidi X-Plus 3 0.2 nozzle.json | 2 +- ...eneric PETG @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...eneric PETG @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...eneric PETG @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...eneric PETG @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...neric PETG @Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic PETG-CF.json | 2 +- .../Qidi/filament/Qidi Generic PETG.json | 2 +- ...i Generic PLA @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ...i Generic PLA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...i Generic PLA @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...i Generic PLA @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ... Generic PLA @Qidi X-Max 3 0.2 nozzle.json | 2 +- ... Generic PLA @Qidi X-Max 3 0.6 nozzle.json | 2 +- ... Generic PLA @Qidi X-Max 3 0.8 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 3 0.2 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 3 0.6 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 3 0.8 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...Generic PLA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...eneric PLA @Qidi X-Smart 3 0.2 nozzle.json | 2 +- ...eneric PLA @Qidi X-Smart 3 0.6 nozzle.json | 2 +- ...eneric PLA @Qidi X-Smart 3 0.8 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... High Speed @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...eric PLA Silk @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...ic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic PLA Silk.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ... Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json | 2 +- ...Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json | 2 +- ...Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 3 0.2 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 3 0.6 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 3 0.8 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...eneric PLA+ @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...neric PLA+ @Qidi X-Smart 3 0.2 nozzle.json | 2 +- ...neric PLA+ @Qidi X-Smart 3 0.6 nozzle.json | 2 +- ...neric PLA+ @Qidi X-Smart 3 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic PLA+.json | 2 +- .../Qidi/filament/Qidi Generic PLA-CF.json | 2 +- .../Qidi/filament/Qidi Generic PLA.json | 2 +- .../Qidi/filament/Qidi Generic PVA.json | 2 +- ...neric TPU 95A @Qidi Q1 Pro 0.8 nozzle.json | 2 +- ...ric TPU 95A @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic TPU 95A.json | 2 +- ...i Generic TPU @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...Generic TPU @Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../Qidi/filament/Qidi Generic TPU.json | 2 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json | 2 +- ...idi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi PC-ABS-FR.json | 2 +- .../profiles/Qidi/filament/Qidi PLA-CF.json | 2 +- ...di TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json | 2 +- ...di TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../Qidi/filament/Qidi TPU 95A-HF.json | 2 +- .../Qidi/filament/Tinmorry PETG-ECO.json | 2 +- .../Qidi/filament/X4/Bambu ABS @X-Max 4.json | 2 +- .../Qidi/filament/X4/Bambu PETG @X-Max 4.json | 2 +- .../Qidi/filament/X4/Bambu PLA @X-Max 4.json | 2 +- .../filament/X4/Generic PLA+ @X-Max 4.json | 2 +- .../filament/X4/HATCHBOX ABS @X-Max 4.json | 2 +- .../filament/X4/HATCHBOX PETG @X-Max 4.json | 2 +- .../filament/X4/HATCHBOX PLA @X-Max 4.json | 2 +- .../filament/X4/Overture ABS @X-Max 4.json | 2 +- .../filament/X4/Overture PLA @X-Max 4.json | 2 +- .../filament/X4/PolyLite ABS @X-Max 4.json | 2 +- .../filament/X4/PolyLite PLA @X-Max 4.json | 2 +- .../filament/Generic ABS @E3NG v1.2S.json | 2 +- .../filament/Generic ASA @E3NG v1.2S.json | 2 +- .../filament/Generic PCCF @E3NG v1.2S.json | 2 +- .../filament/Generic PETG @E3NG v1.2S.json | 2 +- .../filament/Generic PLA @E3NG v1.2S.json | 2 +- .../filament/Generic TPU @E3NG v1.2S.json | 2 +- .../RH3D/filament/fdm_filament_abs.json | 1 - .../RH3D/filament/fdm_filament_asa.json | 1 - .../RH3D/filament/fdm_filament_pccf.json | 1 - .../RH3D/filament/fdm_filament_petg.json | 1 - .../RH3D/filament/fdm_filament_pla.json | 1 - .../RH3D/filament/fdm_filament_tpu.json | 1 - .../Ratrig/filament/RatRig BigNozzle ABS.json | 2 +- .../Ratrig/filament/RatRig BigNozzle ASA.json | 2 +- .../filament/RatRig BigNozzle PCTG.json | 2 +- .../filament/RatRig BigNozzle PETG.json | 2 +- .../Ratrig/filament/RatRig BigNozzle PLA.json | 2 +- .../Ratrig/filament/RatRig BigNozzle TPU.json | 2 +- .../Ratrig/filament/RatRig Generic ABS.json | 2 +- .../Ratrig/filament/RatRig Generic ASA.json | 2 +- .../Ratrig/filament/RatRig Generic PA-CF.json | 2 +- .../Ratrig/filament/RatRig Generic PA.json | 2 +- .../Ratrig/filament/RatRig Generic PC.json | 2 +- .../Ratrig/filament/RatRig Generic PCTG.json | 2 +- .../Ratrig/filament/RatRig Generic PETG.json | 2 +- .../filament/RatRig Generic PLA-CF.json | 2 +- .../Ratrig/filament/RatRig Generic PLA.json | 2 +- .../Ratrig/filament/RatRig Generic PVA.json | 2 +- .../Ratrig/filament/RatRig Generic TPU.json | 2 +- .../Ratrig/filament/RatRig PunkFil ABS.json | 2 +- .../filament/RatRig PunkFil PETG CF.json | 2 +- .../Ratrig/filament/RatRig PunkFil PETG.json | 2 +- .../SecKit/filament/SecKit Generic ABS.json | 2 +- .../SecKit/filament/SecKit Generic ASA.json | 2 +- .../SecKit/filament/SecKit Generic PA-CF.json | 2 +- .../SecKit/filament/SecKit Generic PA.json | 2 +- .../SecKit/filament/SecKit Generic PC.json | 2 +- .../SecKit/filament/SecKit Generic PETG.json | 2 +- .../filament/SecKit Generic PLA-CF.json | 2 +- .../SecKit/filament/SecKit Generic PLA.json | 2 +- .../SecKit/filament/SecKit Generic PVA.json | 2 +- .../SecKit/filament/SecKit Generic TPU.json | 2 +- .../SeeMeCNC/filament/SeeMeCNC_ABS.json | 2 +- .../SeeMeCNC/filament/SeeMeCNC_PA-CF.json | 2 +- .../SeeMeCNC/filament/SeeMeCNC_PETG-CF.json | 2 +- .../SeeMeCNC/filament/SeeMeCNC_PETG.json | 2 +- .../SeeMeCNC/filament/SeeMeCNC_PLA.json | 2 +- .../SeeMeCNC/filament/SeeMeCNC_TPU.json | 2 +- .../Fiberon ASA-CF08 @Snapmaker U1 base.json | 2 +- .../Fiberon PA12-CF10 @Snapmaker U1 base.json | 2 +- .../Fiberon PA6-CF20 @Snapmaker U1 base.json | 2 +- .../Fiberon PA612-ESD @Snapmaker U1 base.json | 2 +- .../Fiberon PETG-ESD @Snapmaker U1 base.json | 2 +- .../Fiberon PPS-GF20 @Snapmaker U1 base.json | 2 +- .../Panchroma CoPE @Snapmaker U1 base.json | 2 +- .../Panchroma PLA @Snapmaker U1 base.json | 2 +- ...roma PLA Celestial @Snapmaker U1 base.json | 2 +- ...nchroma PLA Galaxy @Snapmaker U1 base.json | 2 +- ...Panchroma PLA Glow @Snapmaker U1 base.json | 2 +- ...hroma PLA Luminous @Snapmaker U1 base.json | 2 +- ...nchroma PLA Marble @Snapmaker U1 base.json | 2 +- ...anchroma PLA Matte @Snapmaker U1 base.json | 2 +- ...hroma PLA Metallic @Snapmaker U1 base.json | 2 +- ...Panchroma PLA Neon @Snapmaker U1 base.json | 2 +- ...anchroma PLA Satin @Snapmaker U1 base.json | 2 +- ...Panchroma PLA Silk @Snapmaker U1 base.json | 2 +- ...roma PLA Starlight @Snapmaker U1 base.json | 2 +- ...oma PLA Temp Shift @Snapmaker U1 base.json | 2 +- ...ma PLA Translucent @Snapmaker U1 base.json | 2 +- ...hroma PLA UV Shift @Snapmaker U1 base.json | 2 +- .../PolyLite CosPLA @Snapmaker U1 base.json | 2 +- .../PolyLite Dual PLA @0.2 nozzle.json | 1 + .../PolyLite J1 PLA @0.2 nozzle.json | 1 + .../filament/Polymaker/PolyLite J1 PLA.json | 1 + .../PolyLite PETG @Snapmaker U1 base.json | 2 +- ...e PETG Translucent @Snapmaker U1 base.json | 2 +- .../PolyLite PLA @Snapmaker U1 base.json | 2 +- .../Polymaker/PolyLite PLA @base.json | 2 +- ...olyLite PLA Galaxy @Snapmaker U1 base.json | 2 +- .../PolyLite PLA Glow @Snapmaker U1 base.json | 2 +- ...yLite PLA Luminous @Snapmaker U1 base.json | 2 +- .../PolyLite PLA Neon @Snapmaker U1 base.json | 2 +- .../PolyLite PLA Pro @Snapmaker U1 base.json | 2 +- ...e PLA Pro Metallic @Snapmaker U1 base.json | 2 +- ...Lite PLA Starlight @Snapmaker U1 base.json | 2 +- ...te PLA Translucent @Snapmaker U1 base.json | 2 +- .../PolyTerra Dual PLA @0.2 nozzle.json | 2 +- .../PolyTerra J1 PLA @0.2 nozzle.json | 2 +- .../filament/Polymaker/PolyTerra J1 PLA.json | 2 +- .../PolyTerra PLA @Snapmaker U1 base.json | 2 +- ...lyTerra PLA Marble @Snapmaker U1 base.json | 2 +- .../PolyTerra PLA+ @Snapmaker U1 base.json | 2 +- .../Polymaker HT-PLA @Snapmaker U1 base.json | 2 +- ...olymaker HT-PLA-GF @Snapmaker U1 base.json | 2 +- .../Polymaker PETG @Snapmaker U1 base.json | 2 +- ...ymaker PETG Galaxy @Snapmaker U1 base.json | 2 +- .../Polymaker PLA @Snapmaker U1 base.json | 2 +- .../Polymaker PLA Pro @Snapmaker U1 base.json | 2 +- ...r PLA Pro Metallic @Snapmaker U1 base.json | 2 +- .../filament/Snapmaker ABS @U1 base.json | 2 +- .../filament/Snapmaker ABS @base.json | 2 +- .../filament/Snapmaker ABS Benchy @U1.json | 2 +- .../filament/Snapmaker ASA @U1 base.json | 2 +- .../filament/Snapmaker ASA @base.json | 2 +- .../filament/Snapmaker Dual ABS @base.json | 2 +- .../filament/Snapmaker Dual ABS Benchy.json | 2 +- .../filament/Snapmaker Dual ASA @base.json | 2 +- .../Snapmaker Dual Breakaway @base.json | 2 +- .../filament/Snapmaker Dual PA-CF @base.json | 2 +- .../filament/Snapmaker Dual PET @base.json | 2 +- .../filament/Snapmaker Dual PETG @base.json | 2 +- .../Snapmaker Dual PETG-CF @base.json | 2 +- .../filament/Snapmaker Dual PLA @base.json | 2 +- .../Snapmaker Dual PLA Eco @base.json | 2 +- .../Snapmaker Dual PLA Matte @base.json | 2 +- .../Snapmaker Dual PLA Metal @base.json | 2 +- .../Snapmaker Dual PLA Silk @base.json | 2 +- .../filament/Snapmaker Dual PLA-CF @base.json | 2 +- .../filament/Snapmaker Dual PVA @base.json | 2 +- .../filament/Snapmaker Dual TPE.json | 2 +- .../filament/Snapmaker Dual TPU @base.json | 2 +- .../Snapmaker Dual TPU High-Flow.json | 2 +- .../filament/Snapmaker J1 ABS @base.json | 2 +- .../filament/Snapmaker J1 ABS Benchy.json | 2 +- .../filament/Snapmaker J1 ASA @base.json | 2 +- .../Snapmaker J1 Breakaway @base.json | 2 +- .../filament/Snapmaker J1 PA-CF @base.json | 2 +- .../filament/Snapmaker J1 PET @base.json | 2 +- .../filament/Snapmaker J1 PETG @base.json | 2 +- .../filament/Snapmaker J1 PETG-CF @base.json | 2 +- .../filament/Snapmaker J1 PLA @base.json | 2 +- .../filament/Snapmaker J1 PLA Eco @base.json | 2 +- .../Snapmaker J1 PLA Matte @base.json | 2 +- .../Snapmaker J1 PLA Metal @base.json | 2 +- .../filament/Snapmaker J1 PLA Silk @base.json | 2 +- .../filament/Snapmaker J1 PLA-CF @base.json | 2 +- .../filament/Snapmaker J1 PVA @base.json | 2 +- .../Snapmaker/filament/Snapmaker J1 TPE.json | 2 +- .../filament/Snapmaker J1 TPU @base.json | 2 +- .../filament/Snapmaker J1 TPU High-Flow.json | 2 +- .../filament/Snapmaker PA-CF @U1 base.json | 2 +- .../filament/Snapmaker PA-CF @base.json | 2 +- .../filament/Snapmaker PET @Dual.json | 2 +- .../filament/Snapmaker PET @U1 base.json | 2 +- .../filament/Snapmaker PET @base.json | 2 +- .../filament/Snapmaker PETG @U1 base.json | 2 +- .../filament/Snapmaker PETG @base.json | 2 +- .../filament/Snapmaker PETG-CF @U1 base.json | 2 +- .../filament/Snapmaker PETG-CF @base.json | 2 +- .../filament/Snapmaker PLA @U1 base.json | 2 +- .../filament/Snapmaker PLA @base.json | 2 +- .../filament/Snapmaker PLA Eco @U1 base.json | 2 +- .../filament/Snapmaker PLA Eco @base.json | 2 +- .../filament/Snapmaker PLA Lite @U1 base.json | 2 +- .../Snapmaker PLA Matte @U1 base.json | 2 +- .../filament/Snapmaker PLA Matte @U1.json | 2 +- .../Snapmaker PLA Metal @U1 base.json | 2 +- .../filament/Snapmaker PLA Silk @U1 base.json | 2 +- .../filament/Snapmaker PLA Silk @base.json | 2 +- .../Snapmaker PLA SnapSpeed @U1 base.json | 2 +- .../filament/Snapmaker PLA-CF @U1 base.json | 2 +- .../filament/Snapmaker PLA-CF @base.json | 2 +- .../filament/Snapmaker PVA @U1 base.json | 2 +- .../filament/Snapmaker PVA @base.json | 2 +- .../Snapmaker/filament/Snapmaker TPE @U1.json | 2 +- .../Snapmaker/filament/Snapmaker TPE.json | 2 +- .../filament/Snapmaker TPU 95A @U1 base.json | 2 +- .../filament/Snapmaker TPU @U1 base.json | 2 +- .../filament/Snapmaker TPU @base.json | 2 +- .../filament/Snapmaker TPU High-Flow @U1.json | 2 +- .../Generic PLA Silk @Sovol SV08 MAX.json | 2 +- .../Polymaker PETG @Sovol SV08 MAX.json | 2 +- .../filament/SUNLU PETG @Sovol SV08 MAX.json | 2 +- .../Sovol/filament/Sovol SV06 ACE ABS.json | 2 +- .../Sovol/filament/Sovol SV06 ACE PETG.json | 2 +- .../Sovol/filament/Sovol SV06 ACE PLA.json | 2 +- .../Sovol/filament/Sovol SV06 ACE TPU.json | 2 +- .../filament/Sovol SV06 Plus ACE ABS.json | 2 +- .../filament/Sovol SV06 Plus ACE PETG.json | 2 +- .../filament/Sovol SV06 Plus ACE PLA.json | 2 +- .../filament/Sovol SV06 Plus ACE TPU.json | 2 +- .../Sovol/filament/Sovol SV07 PLA.json | 2 +- .../Sovol/filament/Sovol SV08 ABS.json | 2 +- .../Sovol/filament/Sovol SV08 PETG.json | 2 +- .../Sovol SV08 PLA @SV08 0.2 nozzle.json | 2 +- .../Sovol/filament/Sovol SV08 PLA.json | 2 +- .../Sovol/filament/Sovol SV08 TPU.json | 2 +- .../Sovol/filament/Sovol Zero ABS.json | 2 +- .../Sovol/filament/Sovol Zero PC.json | 2 +- .../filament/Sovol Zero PETG HS Nozzle.json | 2 +- .../Sovol/filament/Sovol Zero PETG.json | 2 +- .../Sovol Zero PLA Basic HS Nozzle.json | 2 +- .../Sovol/filament/Sovol Zero PLA Basic.json | 2 +- .../Sovol Zero PLA Silk HS Nozzle.json | 2 +- .../Sovol/filament/Sovol Zero PLA Silk.json | 2 +- .../Sovol/filament/Sovol Zero TPU.json | 2 +- .../Tiertime/filament/Tiertime ABS.json | 2 +- .../Tiertime/filament/Tiertime ABS@300HS.json | 2 +- .../Tiertime/filament/Tiertime ASA.json | 2 +- .../Tiertime/filament/Tiertime ASA@300HS.json | 2 +- .../filament/Tiertime Generic ABS.json | 2 +- .../filament/Tiertime Generic ABS@300HS.json | 2 +- .../filament/Tiertime Generic ASA.json | 2 +- .../filament/Tiertime Generic ASA@300HS.json | 2 +- .../filament/Tiertime Generic BVOH.json | 2 +- .../filament/Tiertime Generic BVOH@300HS.json | 2 +- .../filament/Tiertime Generic EVA.json | 2 +- .../filament/Tiertime Generic EVA@300HS.json | 2 +- .../filament/Tiertime Generic HIPS.json | 2 +- .../filament/Tiertime Generic HIPS@300HS.json | 2 +- .../filament/Tiertime Generic PA-CF.json | 2 +- .../Tiertime Generic PA-CF@300HS.json | 2 +- .../filament/Tiertime Generic PA.json | 2 +- .../filament/Tiertime Generic PA@300HS.json | 2 +- .../filament/Tiertime Generic PC.json | 2 +- .../filament/Tiertime Generic PC@300HS.json | 2 +- .../filament/Tiertime Generic PCTG.json | 2 +- .../filament/Tiertime Generic PCTG@300HS.json | 2 +- .../filament/Tiertime Generic PE-CF.json | 2 +- .../Tiertime Generic PE-CF@300HS.json | 2 +- .../filament/Tiertime Generic PE.json | 2 +- .../filament/Tiertime Generic PE@300HS.json | 2 +- .../filament/Tiertime Generic PETG-CF.json | 2 +- .../Tiertime Generic PETG-CF@300HS.json | 2 +- .../filament/Tiertime Generic PETG.json | 2 +- .../filament/Tiertime Generic PETG@300HS.json | 2 +- .../filament/Tiertime Generic PHA.json | 2 +- .../filament/Tiertime Generic PHA@300HS.json | 2 +- .../Tiertime Generic PLA High Speed.json | 2 +- ...Tiertime Generic PLA High Speed@300HS.json | 2 +- .../filament/Tiertime Generic PLA Silk.json | 2 +- .../Tiertime Generic PLA Silk@300HS.json | 2 +- .../filament/Tiertime Generic PLA-CF.json | 2 +- .../Tiertime Generic PLA-CF@300HS.json | 2 +- .../filament/Tiertime Generic PLA.json | 2 +- .../filament/Tiertime Generic PLA@300HS.json | 2 +- .../filament/Tiertime Generic PP-CF.json | 2 +- .../Tiertime Generic PP-CF@300HS.json | 2 +- .../filament/Tiertime Generic PP-GF.json | 2 +- .../Tiertime Generic PP-GF@300HS.json | 2 +- .../filament/Tiertime Generic PP.json | 2 +- .../filament/Tiertime Generic PP@300HS.json | 2 +- .../filament/Tiertime Generic PPA-CF.json | 2 +- .../Tiertime Generic PPA-CF@300HS.json | 2 +- .../filament/Tiertime Generic PPA-GF.json | 2 +- .../Tiertime Generic PPA-GF@300HS.json | 2 +- .../filament/Tiertime Generic PPS-CF.json | 2 +- .../Tiertime Generic PPS-CF@300HS.json | 2 +- .../filament/Tiertime Generic PPS.json | 2 +- .../filament/Tiertime Generic PPS@300HS.json | 2 +- .../filament/Tiertime Generic PVA.json | 2 +- .../filament/Tiertime Generic PVA@300HS.json | 2 +- .../filament/Tiertime Generic SBS.json | 2 +- .../filament/Tiertime Generic SBS@300HS.json | 2 +- .../filament/Tiertime Generic TPU.json | 2 +- .../filament/Tiertime Generic TPU@300HS.json | 2 +- .../Tiertime/filament/Tiertime PA6-CF.json | 2 +- .../filament/Tiertime PA6-CF@300HS.json | 2 +- .../Tiertime/filament/Tiertime PC.json | 2 +- .../Tiertime/filament/Tiertime PC@300HS.json | 2 +- .../Tiertime/filament/Tiertime PET-CF.json | 2 +- .../filament/Tiertime PET-CF@300HS.json | 2 +- .../Tiertime/filament/Tiertime PETG.json | 2 +- .../filament/Tiertime PETG@300HS.json | 2 +- .../Tiertime/filament/Tiertime PLA-CF.json | 2 +- .../filament/Tiertime PLA-CF@300HS.json | 2 +- .../Tiertime/filament/Tiertime PLA.json | 2 +- .../Tiertime/filament/Tiertime PLA@300HS.json | 2 +- .../Tiertime/filament/Tiertime PVA.json | 2 +- .../Tiertime/filament/Tiertime PVA@300HS.json | 2 +- .../Tiertime/filament/Tiertime TPU 95A.json | 2 +- .../filament/Tiertime TPU 95A@300HS.json | 2 +- .../TwoTrees Generic 95A TPU @SK1.json | 2 +- .../TwoTrees Generic HS PLA @SK1.json | 2 +- .../filament/PA6 CF20 (Performance).json | 2 +- .../filament/PETG ESD (Performance).json | 2 +- .../filament/PPS Carbone (Performance).json | 2 +- .../Volumic ABS Ultra Performance.json | 2 +- .../Volumic/filament/Volumic ABS Ultra.json | 2 +- .../Volumic ASA Ultra Performance.json | 2 +- .../Volumic/filament/Volumic ASA Ultra.json | 2 +- .../Volumic FLEX93 Ultra Performance.json | 2 +- .../filament/Volumic FLEX93 Ultra.json | 2 +- .../Volumic NYLON Ultra Performance.json | 2 +- .../Volumic/filament/Volumic NYLON Ultra.json | 2 +- .../filament/Volumic PC Performance.json | 2 +- .../profiles/Volumic/filament/Volumic PC.json | 2 +- .../Volumic PCTG Ultra (Performance).json | 2 +- .../Volumic PETG Ultra Performance.json | 2 +- ...olumic PETG Ultra carbone Performance.json | 2 +- .../filament/Volumic PETG Ultra carbone.json | 2 +- .../Volumic/filament/Volumic PETG Ultra.json | 2 +- .../Volumic PLA Ultra Performance.json | 2 +- .../Volumic/filament/Volumic PLA Ultra.json | 2 +- .../Volumic PP Ultra Performance.json | 2 +- .../Volumic/filament/Volumic PP Ultra.json | 2 +- .../filament/Volumic PVA Performance.json | 2 +- .../Volumic/filament/Volumic PVA.json | 2 +- .../Volumic UNIVERSAL Ultra Performance.json | 2 +- .../filament/Volumic UNIVERSAL Ultra.json | 2 +- .../profiles/Volumic/filament/desactive.json | 2 +- .../Vzbot/filament/Vzbot Generic ABS.json | 2 +- .../Vzbot/filament/Vzbot Generic ASA.json | 2 +- .../Vzbot/filament/Vzbot Generic PA-CF.json | 2 +- .../Vzbot/filament/Vzbot Generic PA.json | 2 +- .../Vzbot/filament/Vzbot Generic PC.json | 2 +- .../Vzbot/filament/Vzbot Generic PETG.json | 2 +- .../Vzbot/filament/Vzbot Generic PLA-CF.json | 2 +- .../Vzbot/filament/Vzbot Generic PLA.json | 2 +- .../Vzbot/filament/Vzbot Generic PVA.json | 2 +- .../Vzbot/filament/Vzbot Generic TPU.json | 2 +- .../Wanhao France/filament/YUMI PETG.json | 2 +- .../filament/YUMI PLA Bowden.json | 2 +- .../filament/YUMI PLA Direct Drive.json | 2 +- .../filament/Yumi Generic PETG.json | 2 +- .../filament/Yumi Generic PLA.json | 2 +- .../WonderMaker/filament/WonderMaker ABS.json | 2 +- .../WonderMaker/filament/WonderMaker ASA.json | 2 +- .../filament/WonderMaker PET-CF.json | 2 +- .../filament/WonderMaker PETG Basic.json | 2 +- .../filament/WonderMaker PLA Basic.json | 2 +- .../filament/WonderMaker PLA Marble.json | 2 +- .../filament/WonderMaker PLA Matte.json | 2 +- .../filament/WonderMaker PLA Metal.json | 2 +- .../filament/WonderMaker PLA Silk.json | 2 +- .../filament/WonderMaker PLA Wood.json | 2 +- .../WonderMaker/filament/WonderMaker PVA.json | 2 +- .../filament/WonderMaker TPU 95A.json | 2 +- .../Generic ABS @Z-Bolt 0.4 nozzle.json | 2 +- .../Generic ABS @Z-Bolt 0.6 nozzle.json | 2 +- .../Generic ABS @Z-Bolt 0.8 nozzle.json | 2 +- .../filament/Generic ABS @Z-Bolt Base.json | 2 +- .../Generic ABS HT @Z-Bolt 0.4 nozzle.json | 2 +- .../Generic ABS HT @Z-Bolt 0.6 nozzle.json | 2 +- .../Generic ABS HT @Z-Bolt 0.8 nozzle.json | 2 +- .../filament/Generic ABS HT @Z-Bolt Base.json | 2 +- .../Generic PA @Z-Bolt 0.4 nozzle.json | 2 +- .../Generic PA @Z-Bolt 0.6 nozzle.json | 2 +- .../Generic PA @Z-Bolt 0.8 nozzle.json | 2 +- .../filament/Generic PA @Z-Bolt Base.json | 2 +- .../Generic PETG @Z-Bolt 0.4 nozzle.json | 2 +- .../Generic PETG @Z-Bolt 0.6 nozzle.json | 2 +- .../Generic PETG @Z-Bolt 0.8 nozzle.json | 2 +- .../filament/Generic PETG @Z-Bolt Base.json | 2 +- .../Generic PLA @Z-Bolt 0.4 nozzle.json | 2 +- .../Generic PLA @Z-Bolt 0.6 nozzle.json | 2 +- .../Generic PLA @Z-Bolt 0.8 nozzle.json | 2 +- .../filament/Generic PLA @Z-Bolt Base.json | 2 +- ...three PACF Pro P1 @iQ TiQ2 0.4 Nozzle.json | 2 +- ...three PACF Pro P2 @iQ TiQ2 0.4 Nozzle.json | 2 +- ...rauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json | 2 +- ...rint ABS Natur P1 @iQ TiQ8 0.4 Nozzle.json | 2 +- ... Polymax black P1 @iQ TiQ2 0.4 Nozzle.json | 2 +- .../VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle.json | 2 +- .../re3D Greengate rPETG @0.8 nozzle.json | 2 +- .../re3D Greengate rPETG @1.75 nozzle.json | 2 +- .../re3D/filament/re3D Greengate rPETG.json | 2 +- .../re3D/filament/re3D PC @0.4 nozzle.json | 2 +- .../re3D/filament/re3D PC @0.8 nozzle.json | 2 +- resources/profiles/re3D/filament/re3D PC.json | 2 +- .../re3D/filament/re3D PETG @0.4 nozzle.json | 2 +- .../re3D/filament/re3D PETG @0.8 nozzle.json | 2 +- .../profiles/re3D/filament/re3D PETG.json | 2 +- .../re3D/filament/re3D PLA @0.4 nozzle.json | 2 +- .../re3D/filament/re3D PLA @0.8 nozzle.json | 2 +- .../profiles/re3D/filament/re3D PLA.json | 2 +- .../re3D/filament/re3D rPP @0.8 nozzle.json | 2 +- .../re3D/filament/re3D rPP @1.75 nozzle.json | 2 +- .../profiles/re3D/filament/re3D rPP.json | 2 +- resources/profiles/retired_filament_ids.json | 2195 +- scripts/assign_filament_ids.py | 90 +- scripts/filament_id_snapshot.json | 16851 +++++++--------- scripts/tests/test_filament_id.py | 80 + 2663 files changed, 12019 insertions(+), 12498 deletions(-) diff --git a/doc/developer-reference/filament_id.md b/doc/developer-reference/filament_id.md index 377c390422..c17e4e44e4 100644 --- a/doc/developer-reference/filament_id.md +++ b/doc/developer-reference/filament_id.md @@ -112,9 +112,14 @@ python scripts/assign_filament_ids.py --check # 4. verify — the sam `--mint "filament_vendor/filament_type/family_name"` prints the id a triple would mint without touching anything. The default run is idempotent and never rewrites a valid existing id. Maintenance modes (normally only used by id migrations): `--remint VENDOR` re-derives a -vendor's declared ids from their triples, `--drop-redundant-ids VENDOR` deletes declarations -that merely re-declare an inherited OFL id, and `--add-hint "OLD=NEW"` records a cross-island -succession hint. +vendor's declared ids from their triples (a declaration already equal to a salt iteration +of its own triple is conformant and left alone — deliberate salt splits keeping two +presets of one product apart for per-printer AMS matching survive), +`--drop-redundant-ids VENDOR` deletes declarations +that merely re-declare an inherited OFL id, `--add-hint "OLD=NEW"` records a cross-island +succession hint, and `--retire "OLD=NEW"` records succession for a shipped non-island id +that vanished while another declarer kept it alive (lineage the automatic claim vote can no +longer see). If you skip the tooling, CI fails and prints the remedy: the expected id for your family, and the instruction to run `python scripts/assign_filament_ids.py --update-snapshot` and commit @@ -141,7 +146,8 @@ calibration history, filament-id preset lookup): a live preset always wins first installs resolve `GF*` natively and behavior is unchanged wherever the raw id still exists. This is what makes identity-driven re-mints (structure rule 5) safe: the old id keeps resolving to the family's current preset instead of degrading to a `Generic ` fallback. -The file is append-only and maintained exclusively by `--update-snapshot` / `--add-hint`. +The file is append-only and maintained exclusively by `--update-snapshot` / `--add-hint` / +`--retire`. ## How CI enforces this diff --git a/resources/profiles/Afinia/filament/Afinia ABS+.json b/resources/profiles/Afinia/filament/Afinia ABS+.json index 74308bad42..ab908a0583 100644 --- a/resources/profiles/Afinia/filament/Afinia ABS+.json +++ b/resources/profiles/Afinia/filament/Afinia ABS+.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00", + "filament_id": "OFLfywkp", "setting_id": "i5tf9foHnTVNmA2r", "name": "Afinia ABS+", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json index d480c574c0..77fc0deee9 100644 --- a/resources/profiles/Afinia/filament/Afinia ABS+@HS.json +++ b/resources/profiles/Afinia/filament/Afinia ABS+@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFYG2Gfy", + "filament_id": "OFLfywkp", "setting_id": "wAJTMxtCY7EoavRi", "name": "Afinia ABS+@HS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia ABS.json b/resources/profiles/Afinia/filament/Afinia ABS.json index d51254c1b9..31ad94602c 100644 --- a/resources/profiles/Afinia/filament/Afinia ABS.json +++ b/resources/profiles/Afinia/filament/Afinia ABS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00", + "filament_id": "OFV5wEMe", "setting_id": "LhDHvMepbh8ecfQT", "name": "Afinia ABS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia ABS@HS.json b/resources/profiles/Afinia/filament/Afinia ABS@HS.json index 90c4f9610a..e905e002bd 100644 --- a/resources/profiles/Afinia/filament/Afinia ABS@HS.json +++ b/resources/profiles/Afinia/filament/Afinia ABS@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00_01", + "filament_id": "OFV5wEMe", "setting_id": "qCDnb2iBaz4hd4vX", "name": "Afinia ABS@HS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia PLA.json b/resources/profiles/Afinia/filament/Afinia PLA.json index c04d368e42..bca3dd518f 100644 --- a/resources/profiles/Afinia/filament/Afinia PLA.json +++ b/resources/profiles/Afinia/filament/Afinia PLA.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFA00", + "filament_id": "OF9HCdyQ", "setting_id": "1qEFsay7kjYIUkpG", "name": "Afinia PLA", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia PLA@HS.json b/resources/profiles/Afinia/filament/Afinia PLA@HS.json index 6f37a09ac3..cfd15a574b 100644 --- a/resources/profiles/Afinia/filament/Afinia PLA@HS.json +++ b/resources/profiles/Afinia/filament/Afinia PLA@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFA00_01", + "filament_id": "OF9HCdyQ", "setting_id": "N3sCgjdjvp6FTtw9", "name": "Afinia PLA@HS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia TPU.json b/resources/profiles/Afinia/filament/Afinia TPU.json index d4310612b3..f407976459 100644 --- a/resources/profiles/Afinia/filament/Afinia TPU.json +++ b/resources/profiles/Afinia/filament/Afinia TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "E7WBTARZ971LaDMj", - "filament_id": "GFU01", + "filament_id": "OFDJU6R3", "instantiation": "true", "filament_vendor": [ "Afinia" diff --git a/resources/profiles/Afinia/filament/Afinia TPU@HS.json b/resources/profiles/Afinia/filament/Afinia TPU@HS.json index c2590ff9ef..56992bf983 100644 --- a/resources/profiles/Afinia/filament/Afinia TPU@HS.json +++ b/resources/profiles/Afinia/filament/Afinia TPU@HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "zUqTgAEbqTN1EdRl", - "filament_id": "GFU01_01", + "filament_id": "OFDJU6R3", "instantiation": "true", "filament_vendor": [ "Afinia" diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS.json b/resources/profiles/Afinia/filament/Afinia Value ABS.json index 0036bea580..8a4f2bec1b 100644 --- a/resources/profiles/Afinia/filament/Afinia Value ABS.json +++ b/resources/profiles/Afinia/filament/Afinia Value ABS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00", + "filament_id": "OFXi59OX", "setting_id": "jEYVpOPBjFtQ0DXn", "name": "Afinia Value ABS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json index 37daf620a9..f98da8225d 100644 --- a/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json +++ b/resources/profiles/Afinia/filament/Afinia Value ABS@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFuYvNS3", + "filament_id": "OFXi59OX", "setting_id": "OxIiEYjbhEvSykaQ", "name": "Afinia Value ABS@HS", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA.json b/resources/profiles/Afinia/filament/Afinia Value PLA.json index 52d27a1f8c..1df7bd969f 100644 --- a/resources/profiles/Afinia/filament/Afinia Value PLA.json +++ b/resources/profiles/Afinia/filament/Afinia Value PLA.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFA00", + "filament_id": "OFgHh8ly", "setting_id": "oNBk0IxmW7C99WI3", "name": "Afinia Value PLA", "from": "system", diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json index da0a1ecb8c..1d9f669bd0 100644 --- a/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json +++ b/resources/profiles/Afinia/filament/Afinia Value PLA@HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFvw0owy", + "filament_id": "OFgHh8ly", "setting_id": "BASsUdyvElEVJ9AA", "name": "Afinia Value PLA@HS", "from": "system", diff --git a/resources/profiles/Anker/filament/Anker Generic ABS @base.json b/resources/profiles/Anker/filament/Anker Generic ABS @base.json index 1f6ad45f63..c4982fcfb4 100644 --- a/resources/profiles/Anker/filament/Anker Generic ABS @base.json +++ b/resources/profiles/Anker/filament/Anker Generic ABS @base.json @@ -3,6 +3,6 @@ "name": "Anker Generic ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB99", + "filament_id": "OF3P0BQA", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic ASA @base.json b/resources/profiles/Anker/filament/Anker Generic ASA @base.json index fb0ef78ee7..585c1d0079 100644 --- a/resources/profiles/Anker/filament/Anker Generic ASA @base.json +++ b/resources/profiles/Anker/filament/Anker Generic ASA @base.json @@ -3,6 +3,6 @@ "name": "Anker Generic ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFB98", + "filament_id": "OFRiyes1", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PA @base.json b/resources/profiles/Anker/filament/Anker Generic PA @base.json index 9215733825..f95b038b25 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PA @base.json @@ -3,6 +3,6 @@ "name": "Anker Generic PA @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN99", + "filament_id": "OFMgJQCZ", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json b/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json index 7f23645d43..ef1343cd5a 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Anker Generic PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN98", + "filament_id": "OF7uE5KB", "instantiation": "false", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Anker/filament/Anker Generic PC @base.json b/resources/profiles/Anker/filament/Anker Generic PC @base.json index 1947ecdd35..85eb21469c 100644 --- a/resources/profiles/Anker/filament/Anker Generic PC @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PC @base.json @@ -3,6 +3,6 @@ "name": "Anker Generic PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GFC99", + "filament_id": "OFGPJxnt", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PETG @base.json b/resources/profiles/Anker/filament/Anker Generic PETG @base.json index c7b85e701a..8bd93439b8 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PETG @base.json @@ -3,7 +3,7 @@ "name": "Anker Generic PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFgvOmM2", "instantiation": "false", "filament_type": [ "PETG" diff --git a/resources/profiles/Anker/filament/Anker Generic PETG-CF @base.json b/resources/profiles/Anker/filament/Anker Generic PETG-CF @base.json index 4a36c58a86..c39b36f841 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG-CF @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Anker Generic PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG98", + "filament_id": "OF1daEUW", "instantiation": "false", "filament_type": [ "PETG-CF" diff --git a/resources/profiles/Anker/filament/Anker Generic PLA @base.json b/resources/profiles/Anker/filament/Anker Generic PLA @base.json index 4dbfca4e28..bfe79d7ec5 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PLA @base.json @@ -3,6 +3,6 @@ "name": "Anker Generic PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFndmfJ1", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PLA Silk @base.json b/resources/profiles/Anker/filament/Anker Generic PLA Silk @base.json index aac1e8e86b..aa3c69e034 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA Silk @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Anker Generic PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL96", + "filament_id": "OFXyyfX6", "instantiation": "false", "filament_cost": [ "20" diff --git a/resources/profiles/Anker/filament/Anker Generic PLA+ @base.json b/resources/profiles/Anker/filament/Anker Generic PLA+ @base.json index 39b4ecdfee..23906759c9 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA+ @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PLA+ @base.json @@ -3,7 +3,7 @@ "name": "Anker Generic PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL95", + "filament_id": "OFIYTy8S", "instantiation": "false", "filament_cost": [ "25" diff --git a/resources/profiles/Anker/filament/Anker Generic PLA-CF @base.json b/resources/profiles/Anker/filament/Anker Generic PLA-CF @base.json index d8eb0f56d9..cd7b72c3af 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA-CF @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Anker Generic PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL98", + "filament_id": "OFB0a3hT", "instantiation": "false", "filament_type": [ "PLA-CF" diff --git a/resources/profiles/Anker/filament/Anker Generic PVA @base.json b/resources/profiles/Anker/filament/Anker Generic PVA @base.json index 5c7775c2d2..68c9fce25b 100644 --- a/resources/profiles/Anker/filament/Anker Generic PVA @base.json +++ b/resources/profiles/Anker/filament/Anker Generic PVA @base.json @@ -3,6 +3,6 @@ "name": "Anker Generic PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "GFS99", + "filament_id": "OFsCbVbN", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic TPU @base.json b/resources/profiles/Anker/filament/Anker Generic TPU @base.json index 3ca7c49029..1399cfa459 100644 --- a/resources/profiles/Anker/filament/Anker Generic TPU @base.json +++ b/resources/profiles/Anker/filament/Anker Generic TPU @base.json @@ -3,7 +3,7 @@ "name": "Anker Generic TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU99", + "filament_id": "OF6tKa1Z", "instantiation": "false", "filament_retraction_speed": "90", "filament_deretraction_speed": "50", diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json index 35ea99a5fa..99d8da0f4b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "RDI26qeSRSTe0PDg", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json index 6cbc0b1dca..95d5884132 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "Moc1cylP6mmSQjlb", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json index bc96d4e812..3a6e2c9073 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "2xgfnUKyOUQwYWPa", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json index 904b9cf13e..f49664c14b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "NOiAgxA0BbvLhR1v", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json index eb92f6134e..10b81c21b9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "MDWaiSjl89E6Edsn", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json index 2176e2e94b..ea9295b1e5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "wZjVYc7dBDSKRusJ", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json index f6cbd13546..db2517faac 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "AbB6JtoPRsNgmxyy", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json index 85f03c921e..841d07300a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "exX565xnrLPkYkvu", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json index 0d16ce5f5d..c37ebcb971 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "KeEk3yQZrKmJY9Q0", - "filament_id": "OFf2b9wu", + "filament_id": "OF223rZv", "instantiation": "true", "filament_settings_id": [ "Anycubic ABS @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json index 56f4d8957a..c726bbcca0 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic ASA", "from": "system", "setting_id": "U66DGcpZeZ24VfPe", - "filament_id": "GFA99", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle.json index af221cecff..05d943ece7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "06j8OTuYw3Sh9BxL", - "filament_id": "GFA99", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle.json index 0c2d38c349..2a43e7b355 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "s2XJm0JghCSUDzhh", - "filament_id": "GFA99", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json index 64ca075800..1b038f7ba0 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "rf792xZNR7tRGKNg", - "filament_id": "GFA99", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json index 7829e37710..fff937f65e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "wqK6AVf1mNkIOmnt", - "filament_id": "GFASA", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle.json index 6ee5e7d750..b682258829 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "aMgpooFosBBvlKKR", - "filament_id": "GFASA", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle.json index 8dc0f96a2c..af3076163a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Isk7NkdH7GxsEZkS", - "filament_id": "GFASA", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle.json index 3ca00083f5..f2c2c816d8 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Ew0Lg6u3e5Xj19Bz", - "filament_id": "GFASA", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra X 0.4 nozzle.json index cf04fda679..36c2d4a7da 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "PEg6aLXcyUc70p9F", - "filament_id": "GFASA", + "filament_id": "OF0yFLkY", "instantiation": "true", "filament_settings_id": [ "Anycubic ASA @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json b/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json index c2863fd513..d4495f172c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "az6wmXeWSCKcUEsK", - "filament_id": "GFB99", + "filament_id": "OF5Zk4e1", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json b/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json index 6bddb8f194..d352fde30a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "qKcef8t7nj8nBjPu", - "filament_id": "GFB98", + "filament_id": "OFI80Hct", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json b/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json index ed1cf5e236..44984af3bf 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "j2PXsJyI9YyoE8lc", - "filament_id": "GFN98", + "filament_id": "OFPdhDlK", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json b/resources/profiles/Anycubic/filament/Anycubic Generic PA.json index 5c93bd4a56..761cfb146b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "xzI6EgoKa3DFYyoZ", - "filament_id": "GFN99", + "filament_id": "OFB1Tv1E", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json b/resources/profiles/Anycubic/filament/Anycubic Generic PC.json index 20d83e1d1f..766455b1ad 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "3zgBtEkj1fQpDkxO", - "filament_id": "GFC99", + "filament_id": "OFWY6vBh", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json b/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json index cfda82354d..1ca3b27d9c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "CEd987NP90bPdkW7", - "filament_id": "GFG99", + "filament_id": "OFWzr7m0", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json b/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json index 8246ddafb0..ff449f9c86 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "9gFgyEJelaCIVwAH", - "filament_id": "GFL98", + "filament_id": "OFNcdCrm", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json b/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json index 3fb18f36a3..76852ec8aa 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "2MiX54GMiZjFzwBI", - "filament_id": "GFL99", + "filament_id": "OFKyCgaK", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json b/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json index 5cc9abce40..f583d7776a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "I1GMbOsMYktU7EbM", - "filament_id": "GFS99", + "filament_id": "OFSGbf2I", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json b/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json index 25d961c5e8..0cd40e9b50 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json +++ b/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "xrbLc7y1AInpumtv", - "filament_id": "GFU99", + "filament_id": "OFGKLoUm", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle.json index 66428b6c93..ad40090b9e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "hcL5OHthGzApICTk", - "filament_id": "GFPA", + "filament_id": "OFzS7zt4", "instantiation": "true", "filament_settings_id": [ "Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle.json index be313bf621..27b3bba016 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "OJbFCKoG5DtVGT9J", - "filament_id": "GFPA", + "filament_id": "OFzS7zt4", "instantiation": "true", "filament_settings_id": [ "Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle.json index 077e222d49..55756b72f7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "6mMIVw8iheDn1OuV", - "filament_id": "GFPA", + "filament_id": "OFzS7zt4", "instantiation": "true", "filament_settings_id": [ "Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle.json index a67c82ac59..1484c7b6f9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "epl6B2WNjV1dxG5Z", - "filament_id": "GFPA6-CF", + "filament_id": "OFQe7sAx", "instantiation": "true", "filament_settings_id": [ "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle.json index 6a58147c35..c6a01fd874 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "eMUXd3PFKHl41TIq", - "filament_id": "GFPA6-CF", + "filament_id": "OFQe7sAx", "instantiation": "true", "filament_settings_id": [ "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle.json index 553f17901d..9fab6c40b9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "y9XYrUJrUYKcBhCI", - "filament_id": "GFPA6-CF", + "filament_id": "OFQe7sAx", "instantiation": "true", "filament_settings_id": [ "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle.json index bdc62ab11a..24ac67340d 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "nO6m8EaBKREWUi3f", - "filament_id": "GFPAHT-CF", + "filament_id": "OFaEuvNF", "instantiation": "true", "filament_settings_id": [ "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle.json index 04cd241a06..fcc33a27cf 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "ebKput7Vyn4IQez1", - "filament_id": "GFPAHT-CF", + "filament_id": "OFaEuvNF", "instantiation": "true", "filament_settings_id": [ "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle.json index 429647426e..a292502096 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "jzrflGdwy9U8kl1c", - "filament_id": "GFPAHT-CF", + "filament_id": "OFaEuvNF", "instantiation": "true", "filament_settings_id": [ "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle.json index cfe5743cb9..1fadd8ce20 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "7F0I28djSlDopbIp", - "filament_id": "GFPC", + "filament_id": "OFZtkHRq", "instantiation": "true", "filament_settings_id": [ "Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle.json index c8ed72562f..05523149be 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "wF10XxL2tNXh8C1p", - "filament_id": "GFPC", + "filament_id": "OFZtkHRq", "instantiation": "true", "filament_settings_id": [ "Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle.json index 76e21e1ed2..e1cdbd5d6d 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "t3VfcIKMk0ELiPP7", - "filament_id": "GFPC", + "filament_id": "OFZtkHRq", "instantiation": "true", "filament_settings_id": [ "Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle.json index 3321afd452..133f388fa1 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "dOOXRvGwMe3NeUj0", - "filament_id": "GFPC-CF", + "filament_id": "OFeIyhUx", "instantiation": "true", "filament_settings_id": [ "Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle.json index 73378f1ffd..fb7b6e3e98 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "H0IECyfsMaCMdefe", - "filament_id": "GFPC-CF", + "filament_id": "OFeIyhUx", "instantiation": "true", "filament_settings_id": [ "Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle.json index 11ac6e7bec..96792e69de 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "7nu7lbiAHMeFBIJc", - "filament_id": "GFPC-CF", + "filament_id": "OFeIyhUx", "instantiation": "true", "filament_settings_id": [ "Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle.json index 53e4aba120..9f60de8562 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "puSuSfNyKlYlmLjL", - "filament_id": "GFPC-GF", + "filament_id": "OFxJRuVF", "instantiation": "true", "filament_settings_id": [ "Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle.json index 183655a8a9..9a168b8331 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "1Qdmjm0MNJKU7aCD", - "filament_id": "GFPC-GF", + "filament_id": "OFxJRuVF", "instantiation": "true", "filament_settings_id": [ "Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle.json index 61de49c647..033135697d 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "Z0qp7SdwN9luxLFO", - "filament_id": "GFPC-GF", + "filament_id": "OFxJRuVF", "instantiation": "true", "filament_settings_id": [ "Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json index b7f6e07d05..2d5c70f60b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "gmni9H2Du5nxBqQu", - "filament_id": "OFGb4hPY", + "filament_id": "OFUaHEO9", "instantiation": "true", "filament_settings_id": [ "Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle.json index 93b2dd3423..ae51a2b31f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "zCqTTjac3ydSAw3q", - "filament_id": "GFPEBA", + "filament_id": "OFjLAYgO", "instantiation": "true", "filament_settings_id": [ "Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle.json index 1abbe033ae..171c1f085c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "1bCJcP2RcDlvIqEo", - "filament_id": "GFPEBA", + "filament_id": "OFjLAYgO", "instantiation": "true", "filament_settings_id": [ "Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle.json index 5f2fbc693c..65d1e762b4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "5v6coSKjAl220Cnq", - "filament_id": "GFPEBA", + "filament_id": "OFjLAYgO", "instantiation": "true", "filament_settings_id": [ "Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle.json index 852d9be237..b4ab737c8e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "saRQ24o8KHgc1YnM", - "filament_id": "GFPET-CF", + "filament_id": "OFRhCTUg", "instantiation": "true", "filament_settings_id": [ "Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle.json index 688d699495..b8bdfac90f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "hYFR2CtiXab9KZUp", - "filament_id": "GFPET-CF", + "filament_id": "OFRhCTUg", "instantiation": "true", "filament_settings_id": [ "Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle.json index 95fd9fd80e..1f21b4144f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "RCaf3c84JsWkuJzd", - "filament_id": "GFPET-CF", + "filament_id": "OFRhCTUg", "instantiation": "true", "filament_settings_id": [ "Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json index 64ec79a2f4..d44a266643 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PETG", "from": "system", "setting_id": "qe2wYLf7CEMjmfxj", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json index 68e4c4279c..fbab6ab82c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uNktFymJ3RbGa7k0", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json index 89ae50f686..5966ceb3dd 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "EaW663aw4torYXG8", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json index 11fc401b24..13c1aae54f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "lgVEMmBHMen0sWsI", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json index a9340e6553..85edb1eca9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uLRMTzyJIara4Hr2", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json index 6a2292c913..7fb1d1f66c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "FAyFkKpV5w6G5dU2", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json index e7cd08bc7e..64ec8774b0 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "duduwoswLHk9I9sY", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json index e8bd6e56ce..ea95c2b1c5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "b3GU7ytZPEYNNyne", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json index a48eb618db..a2cd9ecc5e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "SrHKJh6prBzMz4Se", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json index 5b5b0bbebe..b0c543cebf 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "HyTi93UGno6uAJEO", - "filament_id": "OFdSGkUG", + "filament_id": "OFo6n2pB", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle.json index 6263a4c033..bbe7575b49 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "ajFzrQq9AvGtZCui", - "filament_id": "GFPETG-CF", + "filament_id": "OF9UJOGF", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle.json index d374e345e0..d78fcc1d27 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "VOV59iBwqwMtmi48", - "filament_id": "GFPETG-CF", + "filament_id": "OF9UJOGF", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle.json index 1e4342272a..cc3e8a15fc 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "L6GIF36jbXf5NVOw", - "filament_id": "GFPETG-CF", + "filament_id": "OF9UJOGF", "instantiation": "true", "filament_settings_id": [ "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json index 70cdae2da4..30589ac8d1 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "XIq1GeZdHqOl9Gtr", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json index c078bb2d87..5b11a287e2 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "EaVdXQHAyocYUCez", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json index e26d8674f6..8dd7f867ec 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "UpC1Qut0kjYRD9po", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json index 04d4dc5e79..de37d66f03 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "ELCOJflyY3DfpPAH", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json index ba87ad3145..6110cf1fe4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "enkHPcq0yYHsRk7g", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json index 95ddd20b35..81f8dbb4dd 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "qw4uL96miCLTNE7b", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json index e61cdcd625..f03141136c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "KrlWgkC2kVdSRNUx", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json index c81db823c4..02b0a7f46b 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "gK0NhTnxz1VBNHbu", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json index 7159efba5c..504a4b382c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "4nCPU0WS74OXowyr", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json index 6473007901..df464f2fa9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "0Ae57Dt0KXnpQUJu", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json index edd899396c..4e60bf4527 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "otxG4N1WrXHUw8Z9", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json index 236dbc4cef..f63d778029 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "GblA3LvgCL63V7Qx", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json index 3a9a24a8e4..43ec857824 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "zYYM5Fznkiz0UgHN", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json index d1a975fb37..0f53f104b5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Z0T8Mul8Ta7zqRjS", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json index 5138470e26..cddede3f5a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "61KPHMw1fRcuaGHk", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json index 0c923b2fe0..398befabb4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "RQJLrGtzvbP2PksP", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json index 79439814b4..fd949e041a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "50Ailboxk7bEclVp", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json index 286464d8c3..f4e9e91f6f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "1hyHPSJZgUpLcW7u", - "filament_id": "OFgK2Xvv", + "filament_id": "OFmjN2bc", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json index 3df60b8a89..ca56418084 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "m7o0ek6sbOavVUpG", - "filament_id": "GFL98", + "filament_id": "OF5PtjTp", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json index 5bb37daa1f..d4805c6bde 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "NVrxrFGYkHRyzrFq", - "filament_id": "GFPLA Glow", + "filament_id": "OF5PtjTp", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json index 284a1f93fd..16034c2b27 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "swLSkqq7X3PhbRiQ", - "filament_id": "GFPLA Glow", + "filament_id": "OF5PtjTp", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json index 26d53a4f72..64832c85ab 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "rsOyKXt6G37Ze51l", - "filament_id": "GFPLA Glow", + "filament_id": "OF5PtjTp", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle.json index 0050079b0d..97c2eff0d6 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "7GISZDRG9YilzBXM", - "filament_id": "GFPLA Glow", + "filament_id": "OF5PtjTp", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json index cfb1f50c1d..725a9d3f90 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "Sio4qE22N2krNjx1", - "filament_id": "OFgSK1hL", + "filament_id": "OFjVOWfJ", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json index 6e5c967420..eb59d710e0 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "4FQaTeouNl9pL4Vl", - "filament_id": "OFgSK1hL", + "filament_id": "OFjVOWfJ", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json index cef58f9461..9b37a8911c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "AEKT5WgqOTAVYijs", - "filament_id": "OFgSK1hL", + "filament_id": "OFjVOWfJ", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json index 0e949bd4a6..1c5babfe87 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "xTuh6dk8MdeAovdB", - "filament_id": "OFgSK1hL", + "filament_id": "OFjVOWfJ", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json index 219a05057c..4db8e137e9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "BpBYwZqt4ik1XIFp", - "filament_id": "OFgSK1hL", + "filament_id": "OFjVOWfJ", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json index fe6757653c..0deb583eaa 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "2Rk0UA3rtW53ECqo", - "filament_id": "OFgSK1hL", + "filament_id": "OFjVOWfJ", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json index b2bc996730..75fb882984 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "hQ90rvCLS2rVEPVJ", - "filament_id": "OFgSK1hL", + "filament_id": "OFjVOWfJ", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json index 046b4c87a3..03ea837c0c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "wi26Yq5bX8oGt4CA", - "filament_id": "OFEdyZqS", + "filament_id": "OFIgbDHq", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json index 02945fa977..2c25648b80 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "kVOaVF3YyfGrXTdW", - "filament_id": "OFvYfHPB", + "filament_id": "OFIE3vOf", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json index b30450f8ac..7dad057149 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qSpZJ4cRcg3xb2b2", - "filament_id": "OFvYfHPB", + "filament_id": "OFIE3vOf", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json index a70d0629b5..6797adcb5d 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "WvmwXnXSDPPtXS8S", - "filament_id": "OFvYfHPB", + "filament_id": "OFIE3vOf", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json index 41f1c5f6a8..9580807a70 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "jFKsrMeqeUAcMAyf", - "filament_id": "OFvYfHPB", + "filament_id": "OFIE3vOf", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json index 2f2719cb19..3d87a20b63 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ueznw2fLdjN2EbIC", - "filament_id": "OFvYfHPB", + "filament_id": "OFIE3vOf", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json index 4f7d332aaa..ef72f06ca1 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "JxYmWTeCtw0VvUcC", - "filament_id": "OFvYfHPB", + "filament_id": "OFIE3vOf", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json index f7a73c748c..99b2c3672d 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "1EID0A7FceyLzja5", - "filament_id": "GFL97", + "filament_id": "OFCp3Bgo", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json index 60f18577e5..9aebb3860e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Fszb00FtQHFOcDmz", - "filament_id": "OFjdTQd6", + "filament_id": "OFFwJWea", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json index 6709f9bbd7..166e46e620 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "wnt68LydXcNxhGhN", - "filament_id": "OFjdTQd6", + "filament_id": "OFFwJWea", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json index 075d1e2afd..2998b7d2eb 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "AzEerDakdHs9Rj3I", - "filament_id": "OFjdTQd6", + "filament_id": "OFFwJWea", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json index 70e61016a5..2b685352b9 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "pUB5V3n7yAbPxFQC", - "filament_id": "OFjdTQd6", + "filament_id": "OFFwJWea", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json index 11ad26dcbf..a1ec3be6e4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "N96XNT6EoNVVFYz0", - "filament_id": "OFjdTQd6", + "filament_id": "OFFwJWea", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json index e80cdc8383..79a96e1143 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Yc1P4D9Z42Abjfut", - "filament_id": "OFjdTQd6", + "filament_id": "OFFwJWea", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json index f29c6e2674..8365eee514 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "zAUNjIY9cGOO3Np5", - "filament_id": "GFL94", + "filament_id": "OFrGJ4tR", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle.json index 74b39048ee..ea42c44729 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "DkuffHU9VM48p50f", - "filament_id": "GFPLA Translucent", + "filament_id": "OF7c9fln", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json index 56c46b1ca2..1733e1c10a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA", "from": "system", "setting_id": "1va1bLu3J0b5GQt3", - "filament_id": "OFgrGfPy", + "filament_id": "OFnmp6rt", "instantiation": "true", "filament_vendor": [ "Anycubic" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json index 33aa19252c..a80ab1d88f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "XN8zwImhwbZCkl6m", - "filament_id": "OFgrGfPy", + "filament_id": "OFnmp6rt", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json index 5570f249d9..d31d75f532 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Vs1ZyZJWHFue8Vc8", - "filament_id": "OFgrGfPy", + "filament_id": "OFnmp6rt", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json index 061215d818..ad437f2cab 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "CjXfeHJpdOaSEzN0", - "filament_id": "OFgrGfPy", + "filament_id": "OFnmp6rt", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json index 7f8105621a..7b8dd55359 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ol5UhwlAQy7yrXYU", - "filament_id": "OFgrGfPy", + "filament_id": "OFnmp6rt", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json index 2c8e3db0b7..3256b90dd3 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "u9nOmt30hBeZoN2w", - "filament_id": "OFgrGfPy", + "filament_id": "OFnmp6rt", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json index dd1ac32507..e5db637d98 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "lehlBFE2WVyi24s0", - "filament_id": "OFgrGfPy", + "filament_id": "OFnmp6rt", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json index ee6ea50ef1..149b3da021 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA-CF", "from": "system", "setting_id": "Y9mFng36B2vAnP19", - "filament_id": "GFPLA-CF", + "filament_id": "OFZ0mR5b", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json index 91927df4a8..26753fc994 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA-CF", "from": "system", "setting_id": "9XGVjrGzNa4Br8kB", - "filament_id": "GFPLA-CF", + "filament_id": "OFZ0mR5b", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json index 7619db9764..ee21e1359e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic PLA-CF", "from": "system", "setting_id": "vPSse40nqlQ0xBnp", - "filament_id": "GFPLA-CF", + "filament_id": "OFZ0mR5b", "instantiation": "true", "filament_settings_id": [ "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle.json index 30c1a36997..52a7741b59 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "RXGVKThses3TsFql", - "filament_id": "GFPVA", + "filament_id": "OFTkj6DR", "instantiation": "true", "filament_settings_id": [ "Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle.json index 388a395309..e24dff10cb 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "1QcMzxPPVVj8k9Zy", - "filament_id": "GFPVA", + "filament_id": "OFTkj6DR", "instantiation": "true", "filament_settings_id": [ "Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle.json index 9ffe3a4047..df978e5c9c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "70hdDTET074FJB0W", - "filament_id": "GFPVA", + "filament_id": "OFTkj6DR", "instantiation": "true", "filament_settings_id": [ "Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra X 0.4 nozzle.json index f166aa4a6f..7013b6e7d7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PVA @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "uZIHFQ0GxFemfZUN", - "filament_id": "GFPVA", + "filament_id": "OFTkj6DR", "instantiation": "true", "filament_settings_id": [ "Anycubic PVA @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle.json index 9579f701eb..d20d995486 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "V130y2Wie3uJtzho", - "filament_id": "GFTPU 95A", + "filament_id": "OFML2aVd", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json index 6b5699d6eb..77a2e2fbcc 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "BAYwaV7mcaLAo1uD", - "filament_id": "GFTPU 95A", + "filament_id": "OFML2aVd", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle.json index 70fc1e02d7..26f7745b9e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "FvdMeI7MlR1OEt0y", - "filament_id": "GFTPU 95A", + "filament_id": "OFML2aVd", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle.json index a7067cc8a7..c20722ad8e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "9zwUSJcKXHTuDM1i", - "filament_id": "GFTPU 95A", + "filament_id": "OFML2aVd", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json index 738fcbdc89..5141d90404 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "CdtZIoH8bvFOFU6l", - "filament_id": "OFHL32M0", + "filament_id": "OFMsDGbs", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json index a30e14503f..d6b5217879 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "F3l2tNcFwp9qG7W6", - "filament_id": "OFHL32M0", + "filament_id": "OFMsDGbs", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json index 55f7df2a50..a5f6e735b0 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "WkMd8rjotz7XNLDM", - "filament_id": "OFHL32M0", + "filament_id": "OFMsDGbs", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json index 68f8367ed9..d17fd1217a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "ias4IbNNwygyeow9", - "filament_id": "OFHL32M0", + "filament_id": "OFMsDGbs", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU @Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json index 7d4b5e30c3..a9d3339d48 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "9UgHz7Bgv8GpydSE", - "filament_id": "GFTPU for ACE", + "filament_id": "OF0FfcAG", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json index 7b820c0957..da5f869cdd 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "IcPG0rhSw4AuIcPl", - "filament_id": "GFTPU for ACE", + "filament_id": "OF0FfcAG", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle.json index d3b82264a5..64e303eda7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "fVVxpwKdzpOMntDc", - "filament_id": "GFTPU for ACE", + "filament_id": "OF0FfcAG", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle" diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle.json index 7ac3014639..65c41524b7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "Z6f3hM30bVcmttUo", - "filament_id": "GFTPU for ACE", + "filament_id": "OF0FfcAG", "instantiation": "true", "filament_settings_id": [ "Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json index 7904e7cc18..dcc4102b46 100644 --- a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic ABS", "from": "system", "setting_id": "W3GiC5YLzxbbjXLY", - "filament_id": "OFOp3Oef", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json index 852b56e0e0..e025d0587c 100644 --- a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "aFlpGq8eSJQEO1Ie", - "filament_id": "GFPETG", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_settings_id": [ "Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra X 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra X 0.4 nozzle.json index 36d7edc211..78925acad9 100644 --- a/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra X 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic Kobra X 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "9hdOsLCrVX3dkem2", - "filament_id": "GFPETG", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_settings_id": [ "Generic PETG @Anycubic Kobra X 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json index f533e62694..a81795f7c0 100644 --- a/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "tUSAvzLu6pVk37kn", - "filament_id": "OFaKZ6JI", + "filament_id": "OF112FvY", "instantiation": "true", "filament_settings_id": [ "Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json index 3edff90e15..d701c6243d 100644 --- a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Anycubic Generic TPU", "from": "system", "setting_id": "kHB2rrxkyz4Clu3N", - "filament_id": "OFsCOJv7", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Anycubic/filament/Polymaker/Fiberon PA6-CF20 @Anycubic Kobra S1.json b/resources/profiles/Anycubic/filament/Polymaker/Fiberon PA6-CF20 @Anycubic Kobra S1.json index 0400c26a1d..b359d010b2 100644 --- a/resources/profiles/Anycubic/filament/Polymaker/Fiberon PA6-CF20 @Anycubic Kobra S1.json +++ b/resources/profiles/Anycubic/filament/Polymaker/Fiberon PA6-CF20 @Anycubic Kobra S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "DmRzQzlSf2KdWwKu", - "filament_id": "GFL57", + "filament_id": "OFEabreg", "instantiation": "true", "compatible_printers": [ "Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Polymaker/Panchroma PLA @Anycubic Kobra S1.json b/resources/profiles/Anycubic/filament/Polymaker/Panchroma PLA @Anycubic Kobra S1.json index 21be878b04..b6c5123b8f 100644 --- a/resources/profiles/Anycubic/filament/Polymaker/Panchroma PLA @Anycubic Kobra S1.json +++ b/resources/profiles/Anycubic/filament/Polymaker/Panchroma PLA @Anycubic Kobra S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "gsXcm0Q6TdKW0GBx", - "filament_id": "GFPM001", + "filament_id": "OFsRDvTM", "instantiation": "true", "compatible_printers": [ "Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro @Anycubic Kobra S1.json b/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro @Anycubic Kobra S1.json index a594a3fe92..679c45f1c7 100644 --- a/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro @Anycubic Kobra S1.json +++ b/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro @Anycubic Kobra S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "R7XUcQ4LSZA2i4PG", - "filament_id": "GFL79", + "filament_id": "OF5oXk4M", "instantiation": "true", "compatible_printers": [ "Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro Metallic @Anycubic Kobra S1.json b/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro Metallic @Anycubic Kobra S1.json index 008247a00a..430ea6c816 100644 --- a/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro Metallic @Anycubic Kobra S1.json +++ b/resources/profiles/Anycubic/filament/Polymaker/Polymaker PLA Pro Metallic @Anycubic Kobra S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "iFJbVP8Ui0h5sv5X", - "filament_id": "GFL80", + "filament_id": "OFHknN4v", "instantiation": "true", "compatible_printers": [ "Anycubic Kobra S1 0.4 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json index 4b091e502a..115f53a962 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ABS @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "m023Z8IkkHMHxuag", - "filament_id": "OFw1S8lL", + "filament_id": "OFgXgt98", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json index f4a5d3f332..1a3a7e4834 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "QGbNWGw8rqvq025W", - "filament_id": "OFw1S8lL", + "filament_id": "OFgXgt98", "instantiation": "true", "chamber_temperature": [ "50" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json index 1edbbfc7f5..4443359064 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ABS @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "PxGFsoMcfFrTDqzL", - "filament_id": "OFw1S8lL", + "filament_id": "OFgXgt98", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json index 73a7118801..d3bdb2afe2 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ABS @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "o4JZKQmCdnO0hCXZ", - "filament_id": "OFw1S8lL", + "filament_id": "OFgXgt98", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ABS.json b/resources/profiles/Artillery/filament/Artillery ABS.json index b7d3189738..8ad00f3bde 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS.json +++ b/resources/profiles/Artillery/filament/Artillery ABS.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "fsbfMiamVemzRxkG", - "filament_id": "OFw1S8lL", + "filament_id": "OFgXgt98", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json index ebfb82fdf0..089e3d118a 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ASA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "AE7wKVIZXHXSXzL5", - "filament_id": "OFtmT4Nd", + "filament_id": "OF5YVJXH", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json index ab290c02b6..634a2f46c8 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "eSwM3ZfSBWqR8Gcf", - "filament_id": "OFtmT4Nd", + "filament_id": "OF5YVJXH", "instantiation": "true", "chamber_temperature": [ "55" diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json index 7a0228d38e..40db5fa796 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ASA @Artillery M1 Pro 0.6 nozzle", "from": "User", "setting_id": "znMfTFfxvJC7a732", - "filament_id": "OFtmT4Nd", + "filament_id": "OF5YVJXH", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json index a90093dbc5..9769f1d363 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery ASA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "y2DU36j0slaHzg04", - "filament_id": "OFtmT4Nd", + "filament_id": "OF5YVJXH", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery Generic ABS.json b/resources/profiles/Artillery/filament/Artillery Generic ABS.json index df06b7f844..6db4ca98bc 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ABS.json +++ b/resources/profiles/Artillery/filament/Artillery Generic ABS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFwMFLAm", "setting_id": "C4oiu2SBLwfTEcXu", "name": "Artillery Generic ABS", "from": "system", diff --git a/resources/profiles/Artillery/filament/Artillery Generic ASA.json b/resources/profiles/Artillery/filament/Artillery Generic ASA.json index e3b8cc1f93..5acf3d49f2 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ASA.json +++ b/resources/profiles/Artillery/filament/Artillery Generic ASA.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB98", + "filament_id": "OF6vKLaU", "setting_id": "1gls4zCclgN68Hlc", "name": "Artillery Generic ASA", "from": "system", diff --git a/resources/profiles/Artillery/filament/Artillery Generic PETG.json b/resources/profiles/Artillery/filament/Artillery Generic PETG.json index cc2f29e875..d1bafe2688 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PETG.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PETG.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "OFyK5Lt9", "setting_id": "Ou4NR5DVvalg5kCe", "name": "Artillery Generic PETG", "from": "system", diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json b/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json index 7c1a231dbc..2324bd6ae2 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL98", + "filament_id": "OFUtGagr", "setting_id": "h23GL00BFCliLh9N", "name": "Artillery Generic PLA-CF", "from": "system", diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA.json b/resources/profiles/Artillery/filament/Artillery Generic PLA.json index 1211c22b3c..4133075578 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA.json +++ b/resources/profiles/Artillery/filament/Artillery Generic PLA.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFnfBvn5", "setting_id": "Bpy4tAvspysDWosL", "name": "Artillery Generic PLA", "from": "system", diff --git a/resources/profiles/Artillery/filament/Artillery Generic TPU.json b/resources/profiles/Artillery/filament/Artillery Generic TPU.json index ff724d1925..522cc0fbfb 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic TPU.json +++ b/resources/profiles/Artillery/filament/Artillery Generic TPU.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFU99", + "filament_id": "OFEE1Dld", "setting_id": "u8YE6r4sGJ0jvqBn", "name": "Artillery Generic TPU", "from": "system", diff --git a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json index 662524238b..2910031a1d 100644 --- a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "lOsH1teHe8Pgzx2g", - "filament_id": "OFp90N8a", + "filament_id": "OFMSvS8z", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json index 3c2efc54ed..d12faf0b94 100644 --- a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "b4BKJMUxArvLuEOh", - "filament_id": "OFnY9ovF", + "filament_id": "OFtGC1ye", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json index d734ab4c40..8c726cb639 100644 --- a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "WawbnfhWn4MT6Hz7", - "filament_id": "OFNRgSch", + "filament_id": "OFfb10SK", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json index e4f3c78276..8e40f27f5b 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PET @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "a5jwQ6nyffW1Vqv1", - "filament_id": "OFw0qp7w", + "filament_id": "OFb5EEM3", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json index 9af913f87a..1c56ccb925 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "QeiSAakfMW7HyhJ7", - "filament_id": "OFw0qp7w", + "filament_id": "OFb5EEM3", "instantiation": "true", "chamber_temperature": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json index c9294a933d..426ec21706 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PET @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "VGu7C3uk8d6ibIg4", - "filament_id": "OFw0qp7w", + "filament_id": "OFb5EEM3", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json index b204a0b6a6..2a103c381a 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PET @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "Oj11BhU0QajmDrh3", - "filament_id": "OFw0qp7w", + "filament_id": "OFb5EEM3", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json index d29a639777..1ffe8a243e 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "kAlZ7nCYo53UVVx3", - "filament_id": "OFEYKrjb", + "filament_id": "OFilnglt", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json index 4620665cc8..cb62e565ee 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "g7UIfJTOPzMQzfrH", - "filament_id": "OFEYKrjb", + "filament_id": "OFilnglt", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json index 4ffe6eaa01..952e738ff8 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "uuPf0MfNTZ2lihtG", - "filament_id": "OFEYKrjb", + "filament_id": "OFilnglt", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json index 2ae4e8e114..b1f14d1aac 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG @Artillery M1 Pro 0.8 nozzle", "from": "User", "setting_id": "dQBp2T4ap90uAOYs", - "filament_id": "OFEYKrjb", + "filament_id": "OFilnglt", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json index b90df9567f..9af4f2eeef 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "GrdWgUGdXt23jnBu", - "filament_id": "OFt5bvKK", + "filament_id": "OF8wE5l7", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json index 5d14168c7b..470b5e89f1 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "RTQvSwJBWnut5aBo", - "filament_id": "OFt5bvKK", + "filament_id": "OF8wE5l7", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json index 7c7046e7b9..bcfb9cefb9 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "Wkt1IClO4nwH3Xa7", - "filament_id": "OFt5bvKK", + "filament_id": "OF8wE5l7", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json index 5152d65dd6..4231ec86d4 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle", "from": "User", "setting_id": "Zlvodz3cris0hmof", - "filament_id": "OFt5bvKK", + "filament_id": "OF8wE5l7", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json index 66416e969a..a917f9551b 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "JvmeW29kHCp7HiA6", - "filament_id": "OF9vnvM8", + "filament_id": "OFOnSNt3", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Artillery/filament/Artillery PETG.json b/resources/profiles/Artillery/filament/Artillery PETG.json index a4922a1f32..11bc5b0831 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG.json +++ b/resources/profiles/Artillery/filament/Artillery PETG.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "1MyhYGMxJCmZnJRP", - "filament_id": "OFEYKrjb", + "filament_id": "OFilnglt", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json index 258f94de1a..625dbdf8e6 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "sqlU8YRYqavJBap3", - "filament_id": "Pfcf9c4c", + "filament_id": "OFzY7N3Z", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json index 573a888662..a5270921bd 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "7V8Vj5ykHmTYtxcC", - "filament_id": "Pfcf9c4c", + "filament_id": "OFzY7N3Z", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json index 340947ce24..fddc6cd71b 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "J8rOxOcsB6HN00HI", - "filament_id": "Pfcf9c4c", + "filament_id": "OFzY7N3Z", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json index 4efb9507a5..936afae087 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "N3iYnDshA5ruihVE", - "filament_id": "OF57IbZT", + "filament_id": "OFXk1emJ", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json index 08e2927b0e..18c8c42d76 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "zBUD1JyuZF9MOncA", - "filament_id": "OF57IbZT", + "filament_id": "OFXk1emJ", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json index 4c009a344b..07ce00f7d6 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "NKkZjEtDjxOMLjoo", - "filament_id": "OF57IbZT", + "filament_id": "OFXk1emJ", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json index 7c08a8ffba..d7d64ef75b 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "c9BAMzt2w30nB2rC", - "filament_id": "OF57IbZT", + "filament_id": "OFXk1emJ", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json index b636c0f7d6..cb20dc9405 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "2VIrSoq3kufjHMXj", - "filament_id": "OFXA8vy9", + "filament_id": "OF4Nhggz", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "100" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic.json b/resources/profiles/Artillery/filament/Artillery PLA Basic.json index 5455de4a86..5e777a701b 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "DcGBMRjdcgLx6pWG", - "filament_id": "OF57IbZT", + "filament_id": "OFXk1emJ", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json index 5156b5e69f..398d8d6477 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "tgmFMdyhSX05kuxw", - "filament_id": "OFKDnrjL", + "filament_id": "OFAC7Wyu", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json index 6c2a47f771..77fbb84757 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "9zqAIfywiv9zm77X", - "filament_id": "OFKDnrjL", + "filament_id": "OFAC7Wyu", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json index 58702d5a69..97e72d2b39 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "W6ipHAoCgHIUIT3g", - "filament_id": "OFKDnrjL", + "filament_id": "OFAC7Wyu", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json index 3548bc52a6..8d5aa70714 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "HggSuUWe1zWOlQIK", - "filament_id": "OFKDnrjL", + "filament_id": "OFAC7Wyu", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte.json b/resources/profiles/Artillery/filament/Artillery PLA Matte.json index 04a2402b6f..4ef84538fb 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "kt8uKXpMqxrFrHaG", - "filament_id": "OFKDnrjL", + "filament_id": "OFAC7Wyu", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json index d86ce77a43..ac3b82dc53 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "TDwRIGXkpJIW38jG", - "filament_id": "OFnyirh9", + "filament_id": "OFLbXwoL", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json index f5c6f05245..ed36227a9e 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "BWMjPUWXwumQoY5H", - "filament_id": "OFnyirh9", + "filament_id": "OFLbXwoL", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json index 8743dd44bd..3ab80c6fe4 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "PpuiGWbDlVZwBIxb", - "filament_id": "OFnyirh9", + "filament_id": "OFLbXwoL", "instantiation": "true", "filament_settings_id": [ "Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json index 8df6dd1d13..00227f72e8 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery PLA @Artillery M1 Pro 0.8 nozzle", "from": "User", "setting_id": "dr2wlzDc1AC3tciI", - "filament_id": "OFnyirh9", + "filament_id": "OFLbXwoL", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk.json b/resources/profiles/Artillery/filament/Artillery PLA Silk.json index 9eb9ea142a..897e98f45c 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "rd0U4uP6mM8S8lDg", - "filament_id": "OFnyirh9", + "filament_id": "OFLbXwoL", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Tough.json b/resources/profiles/Artillery/filament/Artillery PLA Tough.json index bca655122d..cce5b7fc0a 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Tough.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Tough.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "hLFvQXsyyUrguGEp", - "filament_id": "OFtXBjvb", + "filament_id": "OF0R5Wc7", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json index 51433f69be..33aea1f4fc 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "oT12s9CEV1CTD6eB", - "filament_id": "OFvxvkAd", + "filament_id": "OFAZllAN", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json index ec64d0b506..7dec8693bf 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PVA @Artillery M1 Pro 0.2 nozzle", "from": "system", "setting_id": "FIcb3cOIanxmvHe2", - "filament_id": "OFc2SnEp", + "filament_id": "OFkx5MEe", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json index c3f230b487..00b7642e7c 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "r2q4QIlfTUCIz43f", - "filament_id": "OFc2SnEp", + "filament_id": "OFkx5MEe", "instantiation": "true", "chamber_temperature": [ "50" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json index 1759d32ad5..9f3dcbb2b8 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PVA @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "h5xquKMT9l0rwcTU", - "filament_id": "OFc2SnEp", + "filament_id": "OFkx5MEe", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json index 412d60e440..753f9c9dd9 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery PVA @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "cElJlbCAgAqSQiPZ", - "filament_id": "OFc2SnEp", + "filament_id": "OFkx5MEe", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json index 3925e8963d..09c0c766ad 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "p6vnCneuwtM0PzL7", - "filament_id": "OFTbsWVg", + "filament_id": "OFcJDtTx", "instantiation": "true", "close_fan_the_first_x_layers": [ "1" diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json index 0b0e495f7d..16b2485862 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery TPU @Artillery M1 Pro 0.6 nozzle", "from": "system", "setting_id": "QIgpIamYbSdI4DPW", - "filament_id": "OFTbsWVg", + "filament_id": "OFcJDtTx", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json index 83a7dbd0f6..f0b83d6e6f 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "Artillery TPU @Artillery M1 Pro 0.8 nozzle", "from": "system", "setting_id": "W22GbPPOgtH4NAAH", - "filament_id": "OFTbsWVg", + "filament_id": "OFcJDtTx", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Artillery/filament/Artillery TPU.json b/resources/profiles/Artillery/filament/Artillery TPU.json index f4ec63c166..5d71a93448 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU.json +++ b/resources/profiles/Artillery/filament/Artillery TPU.json @@ -4,7 +4,7 @@ "inherits": "Artillery Generic PLA", "from": "system", "setting_id": "IcV1jLJaS5rmdNOY", - "filament_id": "OFTbsWVg", + "filament_id": "OFcJDtTx", "instantiation": "true", "compatible_printers": [ "Artillery Sidewinder X3 Pro 0.4 nozzle", diff --git a/resources/profiles/Blocks/filament/Blocks Generic ABS.json b/resources/profiles/Blocks/filament/Blocks Generic ABS.json index abb5c988dc..d23b6ebb31 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic ABS.json +++ b/resources/profiles/Blocks/filament/Blocks Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "QhLaLEkxhvIMa3Ik", - "filament_id": "BSFI004", + "filament_id": "OFma52eS", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json b/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json index 5373b92b4c..5721335e8a 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json +++ b/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "FF6D7i492XTrb8AO", - "filament_id": "OFy7oQ1g", + "filament_id": "OFctbSkL", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic ASA.json b/resources/profiles/Blocks/filament/Blocks Generic ASA.json index a3fa2a86e8..1fc34c909b 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic ASA.json +++ b/resources/profiles/Blocks/filament/Blocks Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "DcgqA071S6MRVbKI", - "filament_id": "BSFI005", + "filament_id": "OFB9dx27", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json b/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json index 47732a6c9d..009afa1b6b 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json +++ b/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "B254XDRQzysz7YUd", - "filament_id": "BSFI007", + "filament_id": "OF8bLDu7", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PA.json b/resources/profiles/Blocks/filament/Blocks Generic PA.json index edaee826f4..b875eb13a4 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PA.json +++ b/resources/profiles/Blocks/filament/Blocks Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "3L5IYVTlkt8V0EiW", - "filament_id": "BSFI006", + "filament_id": "OFiUSDih", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PC.json b/resources/profiles/Blocks/filament/Blocks Generic PC.json index a6519b1c0d..295372a6d3 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PC.json +++ b/resources/profiles/Blocks/filament/Blocks Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "VUPeelf61TmTQrun", - "filament_id": "BSFI008", + "filament_id": "OFahE7HP", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PETG.json b/resources/profiles/Blocks/filament/Blocks Generic PETG.json index 0c38a3155d..d34b3ca904 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PETG.json +++ b/resources/profiles/Blocks/filament/Blocks Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_petg", "from": "system", "setting_id": "FKkbjL1V4ZEjXB0H", - "filament_id": "BSFI002", + "filament_id": "OFrgGex8", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json b/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json index 7568cdf5af..efa68921b7 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json +++ b/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "RHKPeXZiv4E2p4lP", - "filament_id": "BSFI010", + "filament_id": "OFupq0tY", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PLA.json b/resources/profiles/Blocks/filament/Blocks Generic PLA.json index 3f3838e22f..dd22e2c7a2 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PLA.json +++ b/resources/profiles/Blocks/filament/Blocks Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "N3wDUqmBETfelOoG", - "filament_id": "BSFI001", + "filament_id": "OFNYewRS", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PVA.json b/resources/profiles/Blocks/filament/Blocks Generic PVA.json index 2719cfe661..53de20761e 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PVA.json +++ b/resources/profiles/Blocks/filament/Blocks Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "J74KgdSzf503Tk9p", - "filament_id": "BSFI009", + "filament_id": "OFiorRtJ", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Blocks/filament/Blocks Generic TPU.json b/resources/profiles/Blocks/filament/Blocks Generic TPU.json index 5c04853ee8..271d4ec00f 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic TPU.json +++ b/resources/profiles/Blocks/filament/Blocks Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "xFRwN8ZEwEGlLFwo", - "filament_id": "BSFI003", + "filament_id": "OFMEbuBE", "instantiation": "true", "filament_max_volumetric_speed": [ "4" diff --git a/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json b/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json index 9e0a23abf9..1a1f01b3d9 100644 --- a/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json +++ b/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "3IxBZSWFfFGmKAQ7", - "filament_id": "OFAUX5fB", + "filament_id": "OFZ4fTO8", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.json b/resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.json index 7579260e16..fc011cc9bc 100644 --- a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.json +++ b/resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "jZBfhlf6VX5r3KHb", - "filament_id": "GFG99", + "filament_id": "OFz3q5Xz", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.json b/resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.json index dd50bdd607..4b2cd9bbea 100644 --- a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.json +++ b/resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Uv3kcMO5qNwkrMPV", - "filament_id": "GFL99", + "filament_id": "OF51XQar", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json index e8067f4945..f6df5c7924 100644 --- a/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Chuanying Generic ABS", "from": "system", "setting_id": "VkCgo0e4KR24DX28", - "filament_id": "GFB99", + "filament_id": "OFs1sNLz", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic ABS.json b/resources/profiles/Chuanying/filament/Chuanying Generic ABS.json index 201155e883..c98af61d3d 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic ABS.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "XslWGeEo1Okicu28", - "filament_id": "GFB99", + "filament_id": "OFZPlCck", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json b/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json index d48f96d7cc..6c3dd293d6 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "wBBQiy8JV2LrnIav", - "filament_id": "OF7tgL9c", + "filament_id": "OFBIadjM", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json b/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json index c919e8f921..f0dcbdaf77 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json @@ -4,7 +4,7 @@ "inherits": "Chuanying Generic ABS", "from": "system", "setting_id": "bBNozld07rP6mV3d", - "filament_id": "OFzQQeCi", + "filament_id": "OFDeTsJw", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json b/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json index d12453cdb1..a5d4cab7eb 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "YZT1Uv73b8ArVoX3", - "filament_id": "OFfiN1Lw", + "filament_id": "OFdXgp2K", "instantiation": "true", "bed_temperature_difference": [ "10" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json b/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json index 99304dfd88..42865bb8af 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "S2vCGI7sqN8FwodT", - "filament_id": "OF3YOOOs", + "filament_id": "OFXXUHSG", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PETG.json b/resources/profiles/Chuanying/filament/Chuanying Generic PETG.json index a3532b9e5b..c4dad7d095 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PETG.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "judDupafROrSnVv8", - "filament_id": "GFG99", + "filament_id": "OFfxFQf9", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json index 58b3a1d750..cf2993ee62 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "EZA59VPwew1cpyUJ", - "filament_id": "OFxVzzn4", + "filament_id": "OFFxZ7hZ", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json index 861b4d9721..90409c864e 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "M9wzNVOPRQlayQH1", - "filament_id": "OFlN56xW", + "filament_id": "OFeK2vkS", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA.json b/resources/profiles/Chuanying/filament/Chuanying Generic PLA.json index 831c14dafe..bf0db17fb4 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "nnyBm7dlrz3OsVQz", - "filament_id": "GFL99", + "filament_id": "OF5vzBhb", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json b/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json index d8650e8a97..3e89ad7c6b 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "Chuanying Generic PLA", "from": "system", "setting_id": "ePZFnkgBiyFuKvji", - "filament_id": "OFQ5xAKf", + "filament_id": "OFRusgEn", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json b/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json index a743d646e4..a1ff21f85d 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json +++ b/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "HYciEf4160uMYGnH", - "filament_id": "OFUqBrgf", + "filament_id": "OFYlZMmy", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json index f162434556..a1ca25e1a7 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Chuanying Generic PETG", "from": "system", "setting_id": "9xxP8YWj4hnWQoVZ", - "filament_id": "GFG99", + "filament_id": "OFlXJxX1", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic ABS.json b/resources/profiles/Co Print/filament/CoPrint Generic ABS.json index 6ec666e6f0..9b8e5c7995 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic ABS.json +++ b/resources/profiles/Co Print/filament/CoPrint Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "CoPrint Generic PLA", "from": "system", "setting_id": "xW2rHuxT9o7MG8qB", - "filament_id": "OFNvrbnf", + "filament_id": "OFU6fjbi", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic PETG.json b/resources/profiles/Co Print/filament/CoPrint Generic PETG.json index b2661a6c91..51dcfb2fff 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic PETG.json +++ b/resources/profiles/Co Print/filament/CoPrint Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "CoPrint Generic PLA", "from": "system", "setting_id": "k4m484S1samBGEVb", - "filament_id": "OFDramZ2", + "filament_id": "OFXuwtnq", "instantiation": "true", "fan_max_speed": [ "90" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic PLA.json b/resources/profiles/Co Print/filament/CoPrint Generic PLA.json index c6db574a42..265f8ba442 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic PLA.json +++ b/resources/profiles/Co Print/filament/CoPrint Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Hv40GsmNozxOJ38T", - "filament_id": "GFL99", + "filament_id": "OF6KELDx", "instantiation": "true", "filament_load_time": [ "9.75" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic TPU.json b/resources/profiles/Co Print/filament/CoPrint Generic TPU.json index 506acb77ff..fc2fc69008 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic TPU.json +++ b/resources/profiles/Co Print/filament/CoPrint Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "CoPrint Generic PLA", "from": "system", "setting_id": "2mWqeih012I5D2CK", - "filament_id": "OF2Psxdc", + "filament_id": "OF7g2vYQ", "instantiation": "true", "fan_max_speed": [ "80" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo ABS @CoLiDo SR1.json b/resources/profiles/CoLiDo/filament/CoLiDo ABS @CoLiDo SR1.json index 55259a5459..25b69d8c2d 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo ABS @CoLiDo SR1.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo ABS @CoLiDo SR1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "ZztaHKdQ4dmOgAXr", - "filament_id": "GFB99", + "filament_id": "OFneOFWe", "instantiation": "true", "filament_vendor": [ "CoLiDo" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json index 94c529c9fe..84469a0d15 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "acWqrAFyi2SIkNwa", - "filament_id": "GFB99", + "filament_id": "OFWIr7ZE", "instantiation": "true", "fan_max_speed": [ "80" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo X16.json index 5dc279ffe6..3ee0390bfd 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo X16.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "l44ioMidpUECbGYF", - "filament_id": "GFB99", + "filament_id": "OFWIr7ZE", "instantiation": "true", "fan_max_speed": [ "20" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json index 1c0751457e..1a3839374a 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "IBtIS8bwcIWhiCow", - "filament_id": "GFG99", + "filament_id": "OF3wxlw9", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo X16.json index e09df95679..7b532e7dfa 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo X16.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "AovAvrEzGiZqFRpc", - "filament_id": "GFG99", + "filament_id": "OF3wxlw9", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json index 1848216904..bb5c3d8dc7 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "foEeUk6PK78QXleQ", - "filament_id": "GFA99", + "filament_id": "OFeDfaCh", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo X16.json index 8d9877cfa3..d0e36e8146 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo X16.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "HY8RFWOKRptC2YVt", - "filament_id": "GFA99", + "filament_id": "OFeDfaCh", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json index 96912962de..e4fd40ea60 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "ZgbaHhRSK8AW38MB", - "filament_id": "GFU99", + "filament_id": "OFdlGycb", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo X16.json index 3bbea681d1..9fb7c570e9 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo X16.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "f6yTiUiYYLckJBTQ", - "filament_id": "GFU99", + "filament_id": "OFdlGycb", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo PETG @CoLiDo SR1.json b/resources/profiles/CoLiDo/filament/CoLiDo PETG @CoLiDo SR1.json index 5b93fc1460..0fd7c49f94 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo PETG @CoLiDo SR1.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo PETG @CoLiDo SR1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "z1ffOb3jPP1GVXnD", - "filament_id": "GFG99", + "filament_id": "OF7lwj52", "instantiation": "true", "filament_vendor": [ "CoLiDo" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json b/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json index 013aa09259..374321236c 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo PLA @CoLiDo SR1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Gj0o6Rmn4qWXDLov", - "filament_id": "OFfoA8kJ", + "filament_id": "OFm70lLt", "instantiation": "true", "filament_vendor": [ "CoLiDo" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json b/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json index 677ec930e3..6d3067d72a 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo PLA Silk @CoLiDo SR1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "mLgBNw0OzvJSS8IG", - "filament_id": "OFxlch4V", + "filament_id": "OFnSeLHk", "instantiation": "true", "filament_vendor": [ "CoLiDo" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo PLA+ @CoLiDo DIY 4.0 V2.json b/resources/profiles/CoLiDo/filament/CoLiDo PLA+ @CoLiDo DIY 4.0 V2.json index de34110826..c02f7be129 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo PLA+ @CoLiDo DIY 4.0 V2.json +++ b/resources/profiles/CoLiDo/filament/CoLiDo PLA+ @CoLiDo DIY 4.0 V2.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "IDGh5vNSqKSOVn3z", - "filament_id": "GFA99", + "filament_id": "OFctg8r1", "instantiation": "true", "filament_vendor": [ "CoLiDo" diff --git a/resources/profiles/Comgrow/filament/Comgrow Generic ABS.json b/resources/profiles/Comgrow/filament/Comgrow Generic ABS.json index 0dbfbdf5af..6a1ff9248e 100644 --- a/resources/profiles/Comgrow/filament/Comgrow Generic ABS.json +++ b/resources/profiles/Comgrow/filament/Comgrow Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "7xmGiJHgiD5KKTXt", - "filament_id": "GFB99", + "filament_id": "OFsoQ12i", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json b/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json index 18f1ea232a..44dad83ceb 100644 --- a/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json +++ b/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "FJjkU2RhAZD10Cw8", - "filament_id": "GFG99", + "filament_id": "OF6Fpw1E", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Comgrow/filament/Comgrow Generic PLA.json b/resources/profiles/Comgrow/filament/Comgrow Generic PLA.json index d3aed1e46d..4674b2b60a 100644 --- a/resources/profiles/Comgrow/filament/Comgrow Generic PLA.json +++ b/resources/profiles/Comgrow/filament/Comgrow Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "sGAn6RP69saYSqcY", - "filament_id": "GFL99", + "filament_id": "OFVKADz5", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json b/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json index e0785fd57f..a88573aa26 100644 --- a/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json +++ b/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json @@ -4,7 +4,7 @@ "inherits": "Comgrow Generic PLA", "from": "system", "setting_id": "TnHaf2TSHVfuwbVg", - "filament_id": "GFL99", + "filament_id": "OFNWcJsM", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/CR-ABS @Ender-3 V4-all.json b/resources/profiles/Creality/filament/CR-ABS @Ender-3 V4-all.json index 33b6514886..faa9404b3b 100644 --- a/resources/profiles/Creality/filament/CR-ABS @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @Ender-3 V4-all.json @@ -173,5 +173,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @Hi-all.json b/resources/profiles/Creality/filament/CR-ABS @Hi-all.json index e4620945d8..10c1cce09d 100644 --- a/resources/profiles/Creality/filament/CR-ABS @Hi-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @Hi-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-ABS @K1 Max_CFS-C-all.json index 070110cef4..12afdde3cd 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K1 Max_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K1 SE-all.json b/resources/profiles/Creality/filament/CR-ABS @K1 SE-all.json index 1d7cd3dade..00340895f4 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K1 SE-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K1 SE-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/CR-ABS @K1 SE_CFS-C-all.json index f6ea93b388..d80c98423f 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K1 SE_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K1C-all.json b/resources/profiles/Creality/filament/CR-ABS @K1C-all.json index d592d9d18f..f41b1bb940 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K1C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-ABS @K1C_CFS-C-all.json index a0451ea1ba..f91677ab31 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K1C_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-ABS @K1_CFS-C-all.json index 6f3bbe777e..b83d103747 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K1_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-ABS @K2 Plus-all.json index 55a2fe9a80..d807936bfc 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K2 Plus-all.json @@ -157,5 +157,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K2 Pro-all.json b/resources/profiles/Creality/filament/CR-ABS @K2 Pro-all.json index cea39dba0e..b6334a93b6 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K2 Pro-all.json @@ -161,5 +161,5 @@ "Creality K2 Pro 0.6 nozzle", "Creality K2 Pro 0.8 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K2 SE-all.json b/resources/profiles/Creality/filament/CR-ABS @K2 SE-all.json index 8edabb85be..f49bf5dd93 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K2 SE-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K2 SE-all.json @@ -175,5 +175,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-ABS @K2-all.json b/resources/profiles/Creality/filament/CR-ABS @K2-all.json index ec6591b352..d0f92634b1 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K2-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K2-all.json @@ -159,5 +159,5 @@ "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle" ], - "filament_id": "07001" + "filament_id": "OFGwZmgS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Nylon @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Nylon @K1 Max_CFS-C-all.json index cc25eecbca..bc9719ad07 100644 --- a/resources/profiles/Creality/filament/CR-Nylon @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Nylon @K1 Max_CFS-C-all.json @@ -187,5 +187,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "11001" + "filament_id": "OFvLppPU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Nylon @K1C-all.json b/resources/profiles/Creality/filament/CR-Nylon @K1C-all.json index 9782134aaf..bf9ce0c9e1 100644 --- a/resources/profiles/Creality/filament/CR-Nylon @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-Nylon @K1C-all.json @@ -188,5 +188,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "11001" + "filament_id": "OFvLppPU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Nylon @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Nylon @K1C_CFS-C-all.json index 8c1c7a27c6..e2a7ef32fa 100644 --- a/resources/profiles/Creality/filament/CR-Nylon @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Nylon @K1C_CFS-C-all.json @@ -188,5 +188,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "11001" + "filament_id": "OFvLppPU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Nylon @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Nylon @K1_CFS-C-all.json index 7be6522dd1..48747723f0 100644 --- a/resources/profiles/Creality/filament/CR-Nylon @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Nylon @K1_CFS-C-all.json @@ -188,5 +188,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "11001" + "filament_id": "OFvLppPU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Nylon @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-Nylon @K2 Plus-all.json index 7466949b1a..d665bb8d16 100644 --- a/resources/profiles/Creality/filament/CR-Nylon @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-Nylon @K2 Plus-all.json @@ -194,5 +194,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "11001" + "filament_id": "OFvLppPU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @Ender-3 V4-all.json b/resources/profiles/Creality/filament/CR-PETG @Ender-3 V4-all.json index ded5f2b093..bfa6bd0bc7 100644 --- a/resources/profiles/Creality/filament/CR-PETG @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @Ender-3 V4-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @Hi-all.json b/resources/profiles/Creality/filament/CR-PETG @Hi-all.json index 6e8dde0750..4b3ab33892 100644 --- a/resources/profiles/Creality/filament/CR-PETG @Hi-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @Hi-all.json @@ -148,5 +148,5 @@ "Creality Hi 0.6 nozzle", "Creality Hi 0.8 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PETG @K1 Max_CFS-C-all.json index 65165f30ea..bc597f92b3 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K1 Max_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K1 SE-all.json b/resources/profiles/Creality/filament/CR-PETG @K1 SE-all.json index fa3c9922d0..1c92de9916 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K1 SE-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K1 SE-all.json @@ -137,5 +137,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PETG @K1 SE_CFS-C-all.json index a388228d10..be3983b772 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K1 SE_CFS-C-all.json @@ -137,5 +137,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K1C-all.json b/resources/profiles/Creality/filament/CR-PETG @K1C-all.json index 57482693fa..2829598e5a 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K1C-all.json @@ -157,5 +157,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PETG @K1C_CFS-C-all.json index 222a850feb..a6ee2af473 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K1C_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PETG @K1_CFS-C-all.json index 38be118853..d05baf33af 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K1_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-PETG @K2 Plus-all.json index 0c9fcef567..ead310f41c 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K2 Plus-all.json @@ -142,5 +142,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K2 Pro-all.json b/resources/profiles/Creality/filament/CR-PETG @K2 Pro-all.json index ec8cb70475..b73011595f 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K2 Pro-all.json @@ -154,5 +154,5 @@ "Creality K2 Pro 0.6 nozzle", "Creality K2 Pro 0.8 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K2 SE-all.json b/resources/profiles/Creality/filament/CR-PETG @K2 SE-all.json index e03a34d210..2137f18ef6 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K2 SE-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K2 SE-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @K2-all.json b/resources/profiles/Creality/filament/CR-PETG @K2-all.json index 3c328bf7ef..16bd7c7053 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K2-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K2-all.json @@ -154,5 +154,5 @@ "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PETG @SPARKX i7-all.json b/resources/profiles/Creality/filament/CR-PETG @SPARKX i7-all.json index 6bbbc65e9f..befe270b95 100644 --- a/resources/profiles/Creality/filament/CR-PETG @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @SPARKX i7-all.json @@ -135,5 +135,5 @@ "Creality SPARKX i7 0.6 nozzle", "Creality SPARKX i7 0.8 nozzle" ], - "filament_id": "06001" + "filament_id": "OF3WQaKK" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @Ender-3 V4-all.json b/resources/profiles/Creality/filament/CR-PLA @Ender-3 V4-all.json index 175f304ef7..83548daafd 100644 --- a/resources/profiles/Creality/filament/CR-PLA @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @Ender-3 V4-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @Hi-all.json b/resources/profiles/Creality/filament/CR-PLA @Hi-all.json index dd543fda9a..0dc26b51ba 100644 --- a/resources/profiles/Creality/filament/CR-PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @Hi-all.json @@ -137,5 +137,5 @@ "Creality Hi 0.2 nozzle", "Creality Hi 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA @K1 Max_CFS-C-all.json index 6fd4e736e7..84fb331f5b 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K1 Max_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K1 SE-all.json b/resources/profiles/Creality/filament/CR-PLA @K1 SE-all.json index 0b31dd3075..1f5d2b746a 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K1 SE-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K1 SE-all.json @@ -137,5 +137,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA @K1 SE_CFS-C-all.json index 3abde8df57..f8517e48b5 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K1 SE_CFS-C-all.json @@ -137,5 +137,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K1C-all.json b/resources/profiles/Creality/filament/CR-PLA @K1C-all.json index d98582cf9c..092a18533d 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K1C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA @K1C_CFS-C-all.json index e8a7ab0ad6..e564114150 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K1C_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA @K1_CFS-C-all.json index 722c4978c2..2796306e7f 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K1_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-PLA @K2 Plus-all.json index 172d39a11b..a175fcdb46 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K2 Plus-all.json @@ -154,5 +154,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K2 Pro-all.json b/resources/profiles/Creality/filament/CR-PLA @K2 Pro-all.json index fff8741bec..b30c6e90fe 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K2 Pro-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K2 SE-all.json b/resources/profiles/Creality/filament/CR-PLA @K2 SE-all.json index cbb2931fbd..4de70e5062 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K2 SE-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K2 SE-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @K2-all.json b/resources/profiles/Creality/filament/CR-PLA @K2-all.json index 75c085137d..26a62766b0 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K2-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K2-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA @SPARKX i7-all.json b/resources/profiles/Creality/filament/CR-PLA @SPARKX i7-all.json index 4727ca270a..ad5aad1c66 100644 --- a/resources/profiles/Creality/filament/CR-PLA @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @SPARKX i7-all.json @@ -163,5 +163,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "04001" + "filament_id": "OFp4ETDP" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Carbon @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Carbon @K1 Max_CFS-C-all.json index 18f928308c..cfc58c9cf8 100644 --- a/resources/profiles/Creality/filament/CR-PLA Carbon @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Carbon @K1 Max_CFS-C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "13001" + "filament_id": "OFrM4hdm" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Carbon @K1C-all.json b/resources/profiles/Creality/filament/CR-PLA Carbon @K1C-all.json index 071cdb3945..e6eaf070f8 100644 --- a/resources/profiles/Creality/filament/CR-PLA Carbon @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Carbon @K1C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "13001" + "filament_id": "OFrM4hdm" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Carbon @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Carbon @K1C_CFS-C-all.json index 85bdd7bb41..2e369e8a3c 100644 --- a/resources/profiles/Creality/filament/CR-PLA Carbon @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Carbon @K1C_CFS-C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "13001" + "filament_id": "OFrM4hdm" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Carbon @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Carbon @K1_CFS-C-all.json index 5118f3b015..47bfd16093 100644 --- a/resources/profiles/Creality/filament/CR-PLA Carbon @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Carbon @K1_CFS-C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "13001" + "filament_id": "OFrM4hdm" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Carbon @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-PLA Carbon @K2 Plus-all.json index f3efa4d2ac..b7fb77695e 100644 --- a/resources/profiles/Creality/filament/CR-PLA Carbon @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Carbon @K2 Plus-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "13001" + "filament_id": "OFrM4hdm" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @K1 Max_CFS-C-all.json index b84b651e68..ee3510a9cc 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @K1 Max_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @K1C-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @K1C-all.json index 12834e2b63..22d113814a 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @K1C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @K1C_CFS-C-all.json index 4944e61627..59bf2e48e6 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @K1C_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @K1_CFS-C-all.json index 3c288db1e6..4a3a27bfb5 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @K1_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Plus-all.json index cb2e84fa5b..5b3aaccd1f 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Plus-all.json @@ -154,5 +154,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Pro-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Pro-all.json index c320654960..c2dbe07744 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @K2 Pro-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @K2-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @K2-all.json index f0d35f90da..98a41262c4 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @K2-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @K2-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Fluo @SPARKX i7-all.json b/resources/profiles/Creality/filament/CR-PLA Fluo @SPARKX i7-all.json index b2cf047a8a..759d5cbd88 100644 --- a/resources/profiles/Creality/filament/CR-PLA Fluo @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Fluo @SPARKX i7-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "15001" + "filament_id": "OFgpQwkk" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @Ender-3 V4-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @Ender-3 V4-all.json index f341ed0ee4..1ed05bed21 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @Ender-3 V4-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @K1 Max_CFS-C-all.json index 5f94d3a21b..80373199ad 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @K1 Max_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @K1C-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @K1C-all.json index 68c02594da..ac4a9fc0ff 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @K1C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @K1C_CFS-C-all.json index c19a940780..cd8ea92f5a 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @K1C_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @K1_CFS-C-all.json index 20477243e6..1779ce9a54 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @K1_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @K2 Plus-all.json index e62afb4ad3..ebfe70bac1 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @K2 Plus-all.json @@ -157,5 +157,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @K2 Pro-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @K2 Pro-all.json index 62ab04db20..90436b9e4b 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @K2 Pro-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @K2-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @K2-all.json index 0b5efb1f62..b2bc9f1bc4 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @K2-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @K2-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-PLA Matte @SPARKX i7-all.json b/resources/profiles/Creality/filament/CR-PLA Matte @SPARKX i7-all.json index 23fd3380c4..5cf37492a4 100644 --- a/resources/profiles/Creality/filament/CR-PLA Matte @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/CR-PLA Matte @SPARKX i7-all.json @@ -166,5 +166,5 @@ "Creality SPARKX i7 0.6 nozzle", "Creality SPARKX i7 0.8 nozzle" ], - "filament_id": "14001" + "filament_id": "OFM0xjBG" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @Ender-3 V4-all.json b/resources/profiles/Creality/filament/CR-Silk @Ender-3 V4-all.json index 0b6c2422b3..494d7245c9 100644 --- a/resources/profiles/Creality/filament/CR-Silk @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @Ender-3 V4-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @Hi-all.json b/resources/profiles/Creality/filament/CR-Silk @Hi-all.json index 838ffa205c..497ddcd169 100644 --- a/resources/profiles/Creality/filament/CR-Silk @Hi-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @Hi-all.json @@ -141,5 +141,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Silk @K1 Max_CFS-C-all.json index ef4503c7f0..bffe643c8c 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K1 Max_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K1 SE-all.json b/resources/profiles/Creality/filament/CR-Silk @K1 SE-all.json index 6261b0607b..39ba90b647 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K1 SE-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K1 SE-all.json @@ -143,5 +143,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Silk @K1 SE_CFS-C-all.json index a5e4bf6b40..33b0ddc999 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K1 SE_CFS-C-all.json @@ -143,5 +143,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K1C-all.json b/resources/profiles/Creality/filament/CR-Silk @K1C-all.json index ce4e3be3ee..7ba2624bae 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K1C-all.json @@ -158,5 +158,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Silk @K1C_CFS-C-all.json index c44216537a..ddbf57b5f2 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K1C_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Silk @K1_CFS-C-all.json index 164cadd6cd..3e0e45cd87 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K1_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-Silk @K2 Plus-all.json index 83927ba13b..a2320f3f4e 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K2 Plus-all.json @@ -163,5 +163,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K2 Pro-all.json b/resources/profiles/Creality/filament/CR-Silk @K2 Pro-all.json index 401753cdbd..4c1f433c61 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K2 Pro-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K2 SE-all.json b/resources/profiles/Creality/filament/CR-Silk @K2 SE-all.json index 2151efcec7..9c1415001b 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K2 SE-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K2 SE-all.json @@ -142,5 +142,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @K2-all.json b/resources/profiles/Creality/filament/CR-Silk @K2-all.json index dc5301be79..97e5d7da31 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K2-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K2-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Silk @SPARKX i7-all.json b/resources/profiles/Creality/filament/CR-Silk @SPARKX i7-all.json index 3e62f7680c..11a92b0357 100644 --- a/resources/profiles/Creality/filament/CR-Silk @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @SPARKX i7-all.json @@ -170,5 +170,5 @@ "Creality SPARKX i7 0.6 nozzle", "Creality SPARKX i7 0.8 nozzle" ], - "filament_id": "05001" + "filament_id": "OF3OMgrI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-TPU @K1 Max_CFS-C-all.json index d27ed62681..8ad140c757 100644 --- a/resources/profiles/Creality/filament/CR-TPU @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @K1 Max_CFS-C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @K1C-all.json b/resources/profiles/Creality/filament/CR-TPU @K1C-all.json index 490e293ab9..001f3c5e5c 100644 --- a/resources/profiles/Creality/filament/CR-TPU @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @K1C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-TPU @K1C_CFS-C-all.json index 8186e5a558..9d10ae7b5c 100644 --- a/resources/profiles/Creality/filament/CR-TPU @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @K1C_CFS-C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-TPU @K1_CFS-C-all.json index 34343ecff5..5be19a6852 100644 --- a/resources/profiles/Creality/filament/CR-TPU @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @K1_CFS-C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-TPU @K2 Plus-all.json index bcc65299d1..b79e38758b 100644 --- a/resources/profiles/Creality/filament/CR-TPU @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @K2 Plus-all.json @@ -166,5 +166,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @K2 Pro-all.json b/resources/profiles/Creality/filament/CR-TPU @K2 Pro-all.json index abd8207f32..e3ea591f17 100644 --- a/resources/profiles/Creality/filament/CR-TPU @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @K2 Pro-all.json @@ -171,5 +171,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @K2-all.json b/resources/profiles/Creality/filament/CR-TPU @K2-all.json index 9f0e96c015..a336ca1e66 100644 --- a/resources/profiles/Creality/filament/CR-TPU @K2-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @K2-all.json @@ -171,5 +171,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-TPU @SPARKX i7-all.json b/resources/profiles/Creality/filament/CR-TPU @SPARKX i7-all.json index 7181fce5e0..3b6e8923eb 100644 --- a/resources/profiles/Creality/filament/CR-TPU @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/CR-TPU @SPARKX i7-all.json @@ -175,5 +175,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "16001" + "filament_id": "OFG2RkhN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Wood @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Wood @K1 Max_CFS-C-all.json index 54c9f99ea0..2d59b01143 100644 --- a/resources/profiles/Creality/filament/CR-Wood @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Wood @K1 Max_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "17001" + "filament_id": "OFGxC8gB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Wood @K1C-all.json b/resources/profiles/Creality/filament/CR-Wood @K1C-all.json index 7def3b58f7..20477f04a9 100644 --- a/resources/profiles/Creality/filament/CR-Wood @K1C-all.json +++ b/resources/profiles/Creality/filament/CR-Wood @K1C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "17001" + "filament_id": "OFGxC8gB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Wood @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Wood @K1C_CFS-C-all.json index 59364bfce5..95dc4f4c95 100644 --- a/resources/profiles/Creality/filament/CR-Wood @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Wood @K1C_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "17001" + "filament_id": "OFGxC8gB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Wood @K1_CFS-C-all.json b/resources/profiles/Creality/filament/CR-Wood @K1_CFS-C-all.json index ce6631705f..e029b37f79 100644 --- a/resources/profiles/Creality/filament/CR-Wood @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/CR-Wood @K1_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "17001" + "filament_id": "OFGxC8gB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/CR-Wood @K2 Plus-all.json b/resources/profiles/Creality/filament/CR-Wood @K2 Plus-all.json index 9d5910633b..aa7a1f5eee 100644 --- a/resources/profiles/Creality/filament/CR-Wood @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-Wood @K2 Plus-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "17001" + "filament_id": "OFGxC8gB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json index 1c3034cd80..fb07f6a231 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "mriWPwWZUKmr7ws0", - "filament_id": "07001", + "filament_id": "OFYPdJ7t", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic ABS.json b/resources/profiles/Creality/filament/Creality Generic ABS.json index 5fc04c19ac..00bcd95e19 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS.json +++ b/resources/profiles/Creality/filament/Creality Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "fv5g33ofjgyjVexC", - "filament_id": "GFB99", + "filament_id": "OFYPdJ7t", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json index d2e8d0d5b5..fa85c2a3ec 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "4muzPKAzy8FJKM5D", - "filament_id": "19001", + "filament_id": "OFpAaY6w", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json index e46869feb9..ff2a1eb68c 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic ASA @Hi-all", "from": "system", "setting_id": "C7IB6HSJxW598zFA", - "filament_id": "OFNbajj9", + "filament_id": "OFLuczRG", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic ASA.json b/resources/profiles/Creality/filament/Creality Generic ASA.json index ddf812b5ce..53ca8f06df 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "jHgcISP1UXOPsGH0", - "filament_id": "GFB98", + "filament_id": "OFpAaY6w", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json index 3b37837a4c..53b1a95c72 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "8caHexyoeQW9p1NF", - "filament_id": "11001", + "filament_id": "OFMqYusc", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF.json b/resources/profiles/Creality/filament/Creality Generic PA-CF.json index 92a2c25893..c9aee7e056 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA-CF.json +++ b/resources/profiles/Creality/filament/Creality Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "hBNsuwMzm7ZZn15D", - "filament_id": "GFN98", + "filament_id": "OFUWRqwb", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Creality/filament/Creality Generic PC.json b/resources/profiles/Creality/filament/Creality Generic PC.json index 305de9f580..9297344a75 100644 --- a/resources/profiles/Creality/filament/Creality Generic PC.json +++ b/resources/profiles/Creality/filament/Creality Generic PC.json @@ -3,7 +3,7 @@ "name": "Creality Generic PC", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GFC99", + "filament_id": "OFe8UJXH", "instantiation": "false", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json index 6dd5926993..6aeba98a01 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "vRVsTatkrE46rzRB", - "filament_id": "06001", + "filament_id": "OF4Mf5Gz", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json index c1888475bb..d914f2eb4b 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PETG @Hi-all", "from": "system", "setting_id": "G4ZIJDNOpQvutOfs", - "filament_id": "OFvGSn0l", + "filament_id": "OFqKmLJe", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic PETG.json b/resources/profiles/Creality/filament/Creality Generic PETG.json index 28c70a1f6a..e09d44758c 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "ixhOwyMvBCpI8nQs", - "filament_id": "GFG99", + "filament_id": "OF4Mf5Gz", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json index 23b15169e9..8198b078e4 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "zQiwnlxGlX4pFOHR", - "filament_id": "04001", + "filament_id": "OFACSw9O", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json index c2f037e2b0..513d2bd088 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @Ender-3V3-all", "from": "system", "setting_id": "4F3dZWvsniH9QHtr", - "filament_id": "OFLriDvE", + "filament_id": "OFrO2zyn", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json index 92e419b26a..50305f2dd2 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "KzaopZGQPw5OJFFD", - "filament_id": "OFLriDvE", + "filament_id": "OFrO2zyn", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json index a30c1ec949..f5f509897a 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @K1-all", "from": "system", "setting_id": "ptxV78rC6wevH916", - "filament_id": "OFLriDvE", + "filament_id": "OFrO2zyn", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json index 3f6d5e5633..8a0f79495f 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @K2-all", "from": "system", "setting_id": "ozHstwkc3N5LGWLV", - "filament_id": "OFLriDvE", + "filament_id": "OFrO2zyn", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json index 88b5c57c1a..3aa8f60c48 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @Ender-3V3-all", "from": "system", "setting_id": "xF1B593frol5PWVw", - "filament_id": "OF43idK2", + "filament_id": "OFpSYJLI", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json index d5247b1d32..05b1d2afc7 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "R7Jo7NhjsR1iU2Fd", - "filament_id": "OF43idK2", + "filament_id": "OFpSYJLI", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json index f1b58bb091..3d3c0276dc 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @K1-all", "from": "system", "setting_id": "3hreTG3DjcgmwZC2", - "filament_id": "OF43idK2", + "filament_id": "OFpSYJLI", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json index a13e886b89..d1723b25ba 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @K2-all", "from": "system", "setting_id": "fxZf5E6IHWWq3dsu", - "filament_id": "OF43idK2", + "filament_id": "OFpSYJLI", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json index f3686b9edd..1942508586 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @Ender-3V3-all", "from": "system", "setting_id": "uPFnSMh7WoXmMAoy", - "filament_id": "OFTszIHE", + "filament_id": "OFp8gtPH", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json index 2762cdee53..c79ddb8933 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "RPDVqZcn8EZizd1U", - "filament_id": "OFTszIHE", + "filament_id": "OFp8gtPH", "instantiation": "true", "filament_flow_ratio": [ "0.97" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json index ff94adbabf..b9be0b8f93 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @K1-all", "from": "system", "setting_id": "pxvc0ICvqc0M3wYV", - "filament_id": "OFTszIHE", + "filament_id": "OFp8gtPH", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json index 5eba612ef7..ed5b560d12 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @K2-all", "from": "system", "setting_id": "qS0Mlt24iz1k4P7n", - "filament_id": "OFTszIHE", + "filament_id": "OFp8gtPH", "instantiation": "true", "filament_max_volumetric_speed": [ "10" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json index 3ac6f207f4..8381e376bb 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json @@ -4,7 +4,7 @@ "inherits": "Creality Generic PLA @Hi-all", "from": "system", "setting_id": "OEc7Bc7WG99tuO5D", - "filament_id": "OFdLGn0R", + "filament_id": "OFNW4ZTC", "instantiation": "true", "filament_flow_ratio": [ "0.88" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA-CF.json b/resources/profiles/Creality/filament/Creality Generic PLA-CF.json index 83fa21d7d6..7c09aa8e4e 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA-CF.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "DCCWPQGMsvDOucwx", - "filament_id": "GFL98", + "filament_id": "OFSDFYs4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA.json b/resources/profiles/Creality/filament/Creality Generic PLA.json index 6791ec64c4..fe82530a7c 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "rUYYpB3GkiNCVyfY", - "filament_id": "GFL99", + "filament_id": "OFACSw9O", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json index 437e0875bf..2787b4e7ea 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "aaiFHjbveXabDAMr", - "filament_id": "10001", + "filament_id": "OFhcrFw9", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic TPU.json b/resources/profiles/Creality/filament/Creality Generic TPU.json index 904768bb5e..13fc25d3a7 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU.json +++ b/resources/profiles/Creality/filament/Creality Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "mKCynAMC7cjY03c0", - "filament_id": "GFU99", + "filament_id": "OFhcrFw9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Creality/filament/Creality HF Generic PLA.json b/resources/profiles/Creality/filament/Creality HF Generic PLA.json index 2cad2fa504..7b2558d207 100644 --- a/resources/profiles/Creality/filament/Creality HF Generic PLA.json +++ b/resources/profiles/Creality/filament/Creality HF Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "p07b7w0HDxavGLdd", - "filament_id": "OFZjZ1k7", + "filament_id": "OFmhWhEf", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json b/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json index 64319441a4..9090224d19 100644 --- a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json +++ b/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Jp93uqYennsWVAKe", - "filament_id": "OFfkPhrJ", + "filament_id": "OFMIurFh", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json index 8dc6b98afb..cb50c6f7fb 100644 --- a/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Hyper ABS @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "9Ek7KtQF2kgJbeXg", - "filament_id": "03001", + "filament_id": "OFFP4ORR", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json index 7880478750..6a71e56fff 100644 --- a/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Hyper PLA @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "YUtnpJsC9o1D3NUR", - "filament_id": "01001", + "filament_id": "OFAIrQXu", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json index 9c5a06621b..d44e4d96bf 100644 --- a/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Hyper PLA-CF @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "fZvWZ9kfPN8MU6cX", - "filament_id": "02001", + "filament_id": "OFGwT5Av", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json index 8211036350..d8a060f9b5 100644 --- a/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Creality Silk PLA @Ender-5Max-all.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "S4nzxbjE4DmkoS7p", - "filament_id": "05001", + "filament_id": "OFfuih8e", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/EN-PLA+ @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/EN-PLA+ @K1 Max_CFS-C-all.json index bd67446620..a7c696718f 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @K1 Max_CFS-C-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/EN-PLA+ @K1C-all.json b/resources/profiles/Creality/filament/EN-PLA+ @K1C-all.json index 20e1c80d6c..c680265601 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @K1C-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @K1C-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/EN-PLA+ @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/EN-PLA+ @K1C_CFS-C-all.json index 36b97a2268..50816aed69 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @K1C_CFS-C-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/EN-PLA+ @K1_CFS-C-all.json b/resources/profiles/Creality/filament/EN-PLA+ @K1_CFS-C-all.json index eab3e35431..43728032ef 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @K1_CFS-C-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/EN-PLA+ @K2 Plus-all.json b/resources/profiles/Creality/filament/EN-PLA+ @K2 Plus-all.json index 10971264e8..25642697d9 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @K2 Plus-all.json @@ -151,5 +151,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/EN-PLA+ @K2 Pro-all.json b/resources/profiles/Creality/filament/EN-PLA+ @K2 Pro-all.json index 1b6b372fd5..16a318a1e0 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @K2 Pro-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/EN-PLA+ @K2-all.json b/resources/profiles/Creality/filament/EN-PLA+ @K2-all.json index e70da1c59e..e9693dabcc 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @K2-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @K2-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/EN-PLA+ @SPARKX i7-all.json b/resources/profiles/Creality/filament/EN-PLA+ @SPARKX i7-all.json index 415263d110..e19e06f40e 100644 --- a/resources/profiles/Creality/filament/EN-PLA+ @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/EN-PLA+ @SPARKX i7-all.json @@ -166,5 +166,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "09001" + "filament_id": "OFks6esg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/ENDER FAST PLA @Hi-all.json b/resources/profiles/Creality/filament/ENDER FAST PLA @Hi-all.json index 8b2802939b..3fd9b4ef24 100644 --- a/resources/profiles/Creality/filament/ENDER FAST PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/ENDER FAST PLA @Hi-all.json @@ -142,5 +142,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "09002" + "filament_id": "OFfSqS4R" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Plus-all.json index 0d353b5b00..a27a828dfb 100644 --- a/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Plus-all.json @@ -164,5 +164,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "09002" + "filament_id": "OFfSqS4R" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Pro-all.json b/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Pro-all.json index ce9f2f0186..4f831d47ab 100644 --- a/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/ENDER FAST PLA @K2 Pro-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "09002" + "filament_id": "OFfSqS4R" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/ENDER FAST PLA @K2-all.json b/resources/profiles/Creality/filament/ENDER FAST PLA @K2-all.json index b3178db08d..9c2fd90d30 100644 --- a/resources/profiles/Creality/filament/ENDER FAST PLA @K2-all.json +++ b/resources/profiles/Creality/filament/ENDER FAST PLA @K2-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "09002" + "filament_id": "OFfSqS4R" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/ENDER FAST PLA @SPARKX i7-all.json b/resources/profiles/Creality/filament/ENDER FAST PLA @SPARKX i7-all.json index 33d7a84e98..c96ff98d72 100644 --- a/resources/profiles/Creality/filament/ENDER FAST PLA @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/ENDER FAST PLA @SPARKX i7-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "09002" + "filament_id": "OFfSqS4R" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Ender-PLA @Ender-3 V4-all.json index 0c911f30cb..711b1b22a7 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @Ender-3 V4-all.json @@ -143,5 +143,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @Hi-all.json b/resources/profiles/Creality/filament/Ender-PLA @Hi-all.json index a7ff4e7247..27ea82bdd3 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @Hi-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Ender-PLA @K1 Max_CFS-C-all.json index 7a70d00077..ed995443e3 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @K1 Max_CFS-C-all.json @@ -151,5 +151,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @K1C-all.json b/resources/profiles/Creality/filament/Ender-PLA @K1C-all.json index a9bd4373e6..c220fa54ac 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @K1C-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @K1C-all.json @@ -151,5 +151,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Ender-PLA @K1C_CFS-C-all.json index 258c51c0d0..2471ec31bb 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @K1C_CFS-C-all.json @@ -151,5 +151,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Ender-PLA @K1_CFS-C-all.json index 98e13e5899..f10bf01177 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @K1_CFS-C-all.json @@ -151,5 +151,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/Ender-PLA @K2 Plus-all.json index 625795d82b..51b85450b3 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @K2 Plus-all.json @@ -148,5 +148,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @K2 Pro-all.json b/resources/profiles/Creality/filament/Ender-PLA @K2 Pro-all.json index 096baea484..8e04e8fee9 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @K2 Pro-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @K2-all.json b/resources/profiles/Creality/filament/Ender-PLA @K2-all.json index e7f978e6cb..b26145bea9 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @K2-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @K2-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Ender-PLA @SPARKX i7-all.json b/resources/profiles/Creality/filament/Ender-PLA @SPARKX i7-all.json index a4f9b7c7ce..11a85cc128 100644 --- a/resources/profiles/Creality/filament/Ender-PLA @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Ender-PLA @SPARKX i7-all.json @@ -163,5 +163,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "08001" + "filament_id": "OFWao3Ic" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Generic ABS @Ender-3 V4-all.json index 6690a03676..d1f8662025 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Ender-3 V4-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @Hi-all.json b/resources/profiles/Creality/filament/Generic ABS @Hi-all.json index e64f47d466..9f43259110 100644 --- a/resources/profiles/Creality/filament/Generic ABS @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Hi-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ABS @K1 Max_CFS-C-all.json index 4c78f3881a..4d1de77b9e 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K1 Max_CFS-C-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K1 SE-all.json b/resources/profiles/Creality/filament/Generic ABS @K1 SE-all.json index 0841cb593a..974ca3a49a 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K1 SE-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ABS @K1 SE_CFS-C-all.json index 8c297b397d..8fa83c2dbf 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K1 SE_CFS-C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K1C-all.json b/resources/profiles/Creality/filament/Generic ABS @K1C-all.json index 2f21834dc7..0d8c23a2e7 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K1C-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ABS @K1C_CFS-C-all.json index 4135ea39ac..888b283059 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K1C_CFS-C-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ABS @K1_CFS-C-all.json index eb71fa7e64..58d749dea3 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K1_CFS-C-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic ABS @K2 Plus-all.json index d6f73b5e64..425411f466 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K2 Plus-all.json @@ -154,5 +154,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic ABS @K2 Pro-all.json index e3c1674f0b..a03c0fbfcb 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K2 Pro-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K2 SE-all.json b/resources/profiles/Creality/filament/Generic ABS @K2 SE-all.json index e895bc8ab8..846dc3b748 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K2 SE-all.json @@ -175,5 +175,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ABS @K2-all.json b/resources/profiles/Creality/filament/Generic ABS @K2-all.json index f9949a0dc5..0eefa273a9 100644 --- a/resources/profiles/Creality/filament/Generic ABS @K2-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @K2-all.json @@ -159,5 +159,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00004" + "filament_id": "OFY9muEs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ASA @K1 Max_CFS-C-all.json index 1b8af0ce94..6f9ee6971e 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K1 Max_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K1 SE-all.json b/resources/profiles/Creality/filament/Generic ASA @K1 SE-all.json index 9ffdccc2f3..d5850749d2 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K1 SE-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ASA @K1 SE_CFS-C-all.json index 7e83bc3c50..8894ee7af1 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K1 SE_CFS-C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K1C-all.json b/resources/profiles/Creality/filament/Generic ASA @K1C-all.json index eaf1f69185..2669b08f43 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K1C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ASA @K1C_CFS-C-all.json index 338fc4981a..0a5dc5d18a 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K1C_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic ASA @K1_CFS-C-all.json index e2db7afa6e..33cf5b2860 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K1_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic ASA @K2 Plus-all.json index f9aa956e15..f1bdbc1310 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K2 Plus-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic ASA @K2 Pro-all.json index 2723557aa6..346f7bfec6 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K2 Pro-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K2 SE-all.json b/resources/profiles/Creality/filament/Generic ASA @K2 SE-all.json index 79cd23a4f4..758d45606e 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K2 SE-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA @K2-all.json b/resources/profiles/Creality/filament/Generic ASA @K2-all.json index cb18ef79a4..68b9b71b9e 100644 --- a/resources/profiles/Creality/filament/Generic ASA @K2-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @K2-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00007" + "filament_id": "OFLPAxz3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic ASA-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic ASA-CF @K2 Plus-all.json index 6736c660a2..f98421ad49 100644 --- a/resources/profiles/Creality/filament/Generic ASA-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic ASA-CF @K2 Plus-all.json @@ -144,5 +144,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00033" + "filament_id": "OF53eLVD" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @Hi-all.json b/resources/profiles/Creality/filament/Generic BVOH @Hi-all.json index decbb3e4a1..33ac63d296 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @Hi-all.json @@ -127,5 +127,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic BVOH @K1 Max_CFS-C-all.json index 81dc3b2ac4..e0cfdb7090 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @K1 Max_CFS-C-all.json @@ -158,5 +158,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @K1C-all.json b/resources/profiles/Creality/filament/Generic BVOH @K1C-all.json index ac52221e0e..9f2cbf4200 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @K1C-all.json @@ -159,5 +159,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic BVOH @K1C_CFS-C-all.json index 35d6581e85..e79e575992 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @K1C_CFS-C-all.json @@ -159,5 +159,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic BVOH @K1_CFS-C-all.json index db50bb2d68..9bd399cbf0 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @K1_CFS-C-all.json @@ -159,5 +159,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic BVOH @K2 Plus-all.json index 2dde38b996..c525c695d7 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @K2 Plus-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic BVOH @K2 Pro-all.json index c9e4552fed..4d3492a70f 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @K2 Pro-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic BVOH @K2-all.json b/resources/profiles/Creality/filament/Generic BVOH @K2-all.json index 6bb308253a..1f8bea7aef 100644 --- a/resources/profiles/Creality/filament/Generic BVOH @K2-all.json +++ b/resources/profiles/Creality/filament/Generic BVOH @K2-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00010" + "filament_id": "OFo2UF2C" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic HIPS @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic HIPS @K1 Max_CFS-C-all.json index b4b0fc15c4..9549195611 100644 --- a/resources/profiles/Creality/filament/Generic HIPS @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic HIPS @K1 Max_CFS-C-all.json @@ -169,5 +169,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00012" + "filament_id": "OFsFon5l" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic HIPS @K1C-all.json b/resources/profiles/Creality/filament/Generic HIPS @K1C-all.json index 78fde3f1ab..5016c1e5a5 100644 --- a/resources/profiles/Creality/filament/Generic HIPS @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic HIPS @K1C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00012" + "filament_id": "OFsFon5l" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic HIPS @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic HIPS @K1C_CFS-C-all.json index f63576c7cf..33950552d8 100644 --- a/resources/profiles/Creality/filament/Generic HIPS @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic HIPS @K1C_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00012" + "filament_id": "OFsFon5l" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic HIPS @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic HIPS @K1_CFS-C-all.json index 23a86958eb..7b1ab3190b 100644 --- a/resources/profiles/Creality/filament/Generic HIPS @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic HIPS @K1_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00012" + "filament_id": "OFsFon5l" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic HIPS @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic HIPS @K2 Plus-all.json index d004f30737..255e9e8b6e 100644 --- a/resources/profiles/Creality/filament/Generic HIPS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic HIPS @K2 Plus-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00012" + "filament_id": "OFsFon5l" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA @K1 Max_CFS-C-all.json index 9fd3eb7324..12c3698ca6 100644 --- a/resources/profiles/Creality/filament/Generic PA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA @K1 Max_CFS-C-all.json @@ -163,5 +163,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00008" + "filament_id": "OFg8ndtj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA @K1C-all.json b/resources/profiles/Creality/filament/Generic PA @K1C-all.json index ef8e035867..310dfb7abd 100644 --- a/resources/profiles/Creality/filament/Generic PA @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PA @K1C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00008" + "filament_id": "OFg8ndtj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA @K1C_CFS-C-all.json index 91bdcf21c7..0d134ae474 100644 --- a/resources/profiles/Creality/filament/Generic PA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA @K1C_CFS-C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00008" + "filament_id": "OFg8ndtj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA @K1_CFS-C-all.json index 7f077d59a8..1396769307 100644 --- a/resources/profiles/Creality/filament/Generic PA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA @K1_CFS-C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00008" + "filament_id": "OFg8ndtj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PA @K2 Plus-all.json index 59e941c60f..950b84e7f0 100644 --- a/resources/profiles/Creality/filament/Generic PA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PA @K2 Plus-all.json @@ -179,5 +179,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00008" + "filament_id": "OFg8ndtj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PA @K2 Pro-all.json index c9df3bc667..c8ddd05024 100644 --- a/resources/profiles/Creality/filament/Generic PA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PA @K2 Pro-all.json @@ -192,5 +192,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00008" + "filament_id": "OFg8ndtj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA @K2-all.json b/resources/profiles/Creality/filament/Generic PA @K2-all.json index 8579386858..b98aac22a0 100644 --- a/resources/profiles/Creality/filament/Generic PA @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PA @K2-all.json @@ -192,5 +192,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00008" + "filament_id": "OFg8ndtj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA-CF @K1 Max_CFS-C-all.json index b457a527a5..c047fb7774 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @K1 Max_CFS-C-all.json @@ -148,5 +148,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00009" + "filament_id": "OFQLcbps" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PA-CF @K1C-all.json index 2d4f9cb2bf..360ecbf35b 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @K1C-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00009" + "filament_id": "OFQLcbps" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA-CF @K1C_CFS-C-all.json index 8263c9d426..022474e6f1 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @K1C_CFS-C-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00009" + "filament_id": "OFQLcbps" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA-CF @K1_CFS-C-all.json index 49173fecd4..40586091b0 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @K1_CFS-C-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00009" + "filament_id": "OFQLcbps" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PA-CF @K2 Plus-all.json index 56c2aeed8a..0b0042c6c8 100644 --- a/resources/profiles/Creality/filament/Generic PA-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @K2 Plus-all.json @@ -178,5 +178,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "00009" + "filament_id": "OFQLcbps" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA12-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PA12-CF @K2 Plus-all.json index 3fc6fa4644..fb65088525 100644 --- a/resources/profiles/Creality/filament/Generic PA12-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PA12-CF @K2 Plus-all.json @@ -178,5 +178,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00025" + "filament_id": "OFM4iJlv" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json index 82cd2c4faa..04260f4d8e 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1 Max_CFS-C-all.json @@ -184,5 +184,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00015" + "filament_id": "OFhTPf6L" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json index 12f1662b2d..b141bc04ec 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1C-all.json @@ -185,5 +185,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00015" + "filament_id": "OFhTPf6L" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json index 9e3a508a5d..6dd6902397 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1C_CFS-C-all.json @@ -185,5 +185,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00015" + "filament_id": "OFhTPf6L" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json index ee75cdd734..9c70b899f0 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K1_CFS-C-all.json @@ -185,5 +185,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00015" + "filament_id": "OFhTPf6L" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json index 71c4ef7a31..75cd58773a 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Plus-all.json @@ -187,5 +187,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00015" + "filament_id": "OFhTPf6L" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json index 5c71b8ea97..6388151090 100644 --- a/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-CF @K2 Pro-all.json @@ -189,5 +189,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00015" + "filament_id": "OFhTPf6L" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA6-GF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PA6-GF @K2 Plus-all.json index d113edd116..5919945b58 100644 --- a/resources/profiles/Creality/filament/Generic PA6-GF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PA6-GF @K2 Plus-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00034" + "filament_id": "OFh9u9c0" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA612-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PA612-CF @K2 Plus-all.json index 25956f1c1c..d1decb74cc 100644 --- a/resources/profiles/Creality/filament/Generic PA612-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PA612-CF @K2 Plus-all.json @@ -178,5 +178,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00022" + "filament_id": "OF8eaY7j" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PA612-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PA612-CF @K2 Pro-all.json index 5a29d469ef..5ccb21724d 100644 --- a/resources/profiles/Creality/filament/Generic PA612-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PA612-CF @K2 Pro-all.json @@ -180,5 +180,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00022" + "filament_id": "OF8eaY7j" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PAHT-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PAHT-CF @K1 Max_CFS-C-all.json index 3fee83483f..3e007d79c6 100644 --- a/resources/profiles/Creality/filament/Generic PAHT-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PAHT-CF @K1 Max_CFS-C-all.json @@ -193,5 +193,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00016" + "filament_id": "OFH7b12v" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PAHT-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PAHT-CF @K1C-all.json index 100798cac6..dcc9738515 100644 --- a/resources/profiles/Creality/filament/Generic PAHT-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PAHT-CF @K1C-all.json @@ -194,5 +194,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00016" + "filament_id": "OFH7b12v" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PAHT-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PAHT-CF @K1C_CFS-C-all.json index 71dff576e2..2f5ae88e9d 100644 --- a/resources/profiles/Creality/filament/Generic PAHT-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PAHT-CF @K1C_CFS-C-all.json @@ -194,5 +194,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00016" + "filament_id": "OFH7b12v" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PAHT-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PAHT-CF @K1_CFS-C-all.json index 956496c6a1..e7ffe11efa 100644 --- a/resources/profiles/Creality/filament/Generic PAHT-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PAHT-CF @K1_CFS-C-all.json @@ -194,5 +194,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00016" + "filament_id": "OFH7b12v" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Plus-all.json index 2b21d3680c..8d4157e8cd 100644 --- a/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Plus-all.json @@ -193,5 +193,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "00016" + "filament_id": "OFH7b12v" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Pro-all.json index cd4b5491a9..a013abb416 100644 --- a/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PAHT-CF @K2 Pro-all.json @@ -180,5 +180,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00016" + "filament_id": "OFH7b12v" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PAHT-CF @K2-all.json b/resources/profiles/Creality/filament/Generic PAHT-CF @K2-all.json index 0c507bc83d..e8032a6b4c 100644 --- a/resources/profiles/Creality/filament/Generic PAHT-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PAHT-CF @K2-all.json @@ -180,5 +180,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00016" + "filament_id": "OFH7b12v" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PC @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PC @K1 Max_CFS-C-all.json index b2e4a4cc1a..67c0d17aa6 100644 --- a/resources/profiles/Creality/filament/Generic PC @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PC @K1 Max_CFS-C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00021" + "filament_id": "OFLakOUI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PC @K1C-all.json b/resources/profiles/Creality/filament/Generic PC @K1C-all.json index c23127714d..30bb957e88 100644 --- a/resources/profiles/Creality/filament/Generic PC @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PC @K1C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00021" + "filament_id": "OFLakOUI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PC @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PC @K1C_CFS-C-all.json index 5a775566d2..450b46b2af 100644 --- a/resources/profiles/Creality/filament/Generic PC @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PC @K1C_CFS-C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00021" + "filament_id": "OFLakOUI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PC @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PC @K1_CFS-C-all.json index 11d4aa54b0..353610592a 100644 --- a/resources/profiles/Creality/filament/Generic PC @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PC @K1_CFS-C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00021" + "filament_id": "OFLakOUI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PC @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PC @K2 Plus-all.json index a4fd7b8e17..e4a1d358f7 100644 --- a/resources/profiles/Creality/filament/Generic PC @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PC @K2 Plus-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00021" + "filament_id": "OFLakOUI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PC @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PC @K2 Pro-all.json index 17b8f5ba3c..99c3232a10 100644 --- a/resources/profiles/Creality/filament/Generic PC @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PC @K2 Pro-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00021" + "filament_id": "OFLakOUI" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PCTG @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PCTG @K2 Plus-all.json index 5e82819e32..c84c58a220 100644 --- a/resources/profiles/Creality/filament/Generic PCTG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PCTG @K2 Plus-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00032" + "filament_id": "OFu1evlr" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PET @K1 Max_CFS-C-all.json index f2bd3dde2b..047bacd756 100644 --- a/resources/profiles/Creality/filament/Generic PET @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PET @K1 Max_CFS-C-all.json @@ -184,5 +184,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00020" + "filament_id": "OF6MOPWx" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET @K1C-all.json b/resources/profiles/Creality/filament/Generic PET @K1C-all.json index b855b18446..ae435635dd 100644 --- a/resources/profiles/Creality/filament/Generic PET @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PET @K1C-all.json @@ -185,5 +185,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00020" + "filament_id": "OF6MOPWx" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PET @K1C_CFS-C-all.json index fef797ee4b..93e9cd11f0 100644 --- a/resources/profiles/Creality/filament/Generic PET @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PET @K1C_CFS-C-all.json @@ -185,5 +185,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00020" + "filament_id": "OF6MOPWx" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PET @K1_CFS-C-all.json index 6de2eb826d..4e860053d9 100644 --- a/resources/profiles/Creality/filament/Generic PET @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PET @K1_CFS-C-all.json @@ -185,5 +185,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00020" + "filament_id": "OF6MOPWx" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PET @K2 Plus-all.json index d23ec6c681..cf56f3c9af 100644 --- a/resources/profiles/Creality/filament/Generic PET @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PET @K2 Plus-all.json @@ -188,5 +188,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00020" + "filament_id": "OF6MOPWx" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PET @K2 Pro-all.json index ff35401f39..4da77efe33 100644 --- a/resources/profiles/Creality/filament/Generic PET @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PET @K2 Pro-all.json @@ -189,5 +189,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00020" + "filament_id": "OF6MOPWx" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET @K2-all.json b/resources/profiles/Creality/filament/Generic PET @K2-all.json index 52aaa6e18c..ef761807b0 100644 --- a/resources/profiles/Creality/filament/Generic PET @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PET @K2-all.json @@ -189,5 +189,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00020" + "filament_id": "OF6MOPWx" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PET-CF @K1 Max_CFS-C-all.json index c42769fe11..4c9fadfbc6 100644 --- a/resources/profiles/Creality/filament/Generic PET-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PET-CF @K1 Max_CFS-C-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00013" + "filament_id": "OFQdaVZS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PET-CF @K1C-all.json index a293723722..e98f8773a6 100644 --- a/resources/profiles/Creality/filament/Generic PET-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PET-CF @K1C-all.json @@ -173,5 +173,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00013" + "filament_id": "OFQdaVZS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PET-CF @K1C_CFS-C-all.json index 5e49cbdb77..36c9dc92a6 100644 --- a/resources/profiles/Creality/filament/Generic PET-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PET-CF @K1C_CFS-C-all.json @@ -173,5 +173,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00013" + "filament_id": "OFQdaVZS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PET-CF @K1_CFS-C-all.json index 72bec3d1ba..c1955e0667 100644 --- a/resources/profiles/Creality/filament/Generic PET-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PET-CF @K1_CFS-C-all.json @@ -173,5 +173,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00013" + "filament_id": "OFQdaVZS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PET-CF @K2 Plus-all.json index 627620e2e0..44eb974cdf 100644 --- a/resources/profiles/Creality/filament/Generic PET-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PET-CF @K2 Plus-all.json @@ -191,5 +191,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00013" + "filament_id": "OFQdaVZS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PET-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PET-CF @K2 Pro-all.json index ab8839dd7e..ddfb603d30 100644 --- a/resources/profiles/Creality/filament/Generic PET-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PET-CF @K2 Pro-all.json @@ -189,5 +189,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00013" + "filament_id": "OFQdaVZS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Generic PETG @Ender-3 V4-all.json index 74e49dfb40..cbdc915a23 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Ender-3 V4-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @Hi-all.json b/resources/profiles/Creality/filament/Generic PETG @Hi-all.json index f855fb8217..32b171416b 100644 --- a/resources/profiles/Creality/filament/Generic PETG @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Hi-all.json @@ -147,5 +147,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PETG @K1 Max_CFS-C-all.json index 2cba8d0911..40fecf5d33 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K1 Max_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K1 SE-all.json b/resources/profiles/Creality/filament/Generic PETG @K1 SE-all.json index 2626c596da..e82036ef1c 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K1 SE-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PETG @K1 SE_CFS-C-all.json index af8cb7d371..649d2057b3 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K1 SE_CFS-C-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K1C-all.json b/resources/profiles/Creality/filament/Generic PETG @K1C-all.json index 1122d81c46..5d05e2a977 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K1C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PETG @K1C_CFS-C-all.json index 48b6087734..7f7459382a 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K1C_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PETG @K1_CFS-C-all.json index 5d518fde42..568b5a1cf5 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K1_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PETG @K2 Plus-all.json index 1bb9217b84..6b10eac4c6 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K2 Plus-all.json @@ -138,5 +138,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PETG @K2 Pro-all.json index e50a03cb28..5d007dfff3 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K2 Pro-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K2 SE-all.json b/resources/profiles/Creality/filament/Generic PETG @K2 SE-all.json index 1b56e51679..69af8255c5 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K2 SE-all.json @@ -148,5 +148,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @K2-all.json b/resources/profiles/Creality/filament/Generic PETG @K2-all.json index 9df2e83d3d..a8e2308613 100644 --- a/resources/profiles/Creality/filament/Generic PETG @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @K2-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG @SPARKX i7-all.json b/resources/profiles/Creality/filament/Generic PETG @SPARKX i7-all.json index 2fee02a703..301fc96ef9 100644 --- a/resources/profiles/Creality/filament/Generic PETG @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @SPARKX i7-all.json @@ -159,5 +159,5 @@ "Creality SPARKX i7 0.6 nozzle", "Creality SPARKX i7 0.8 nozzle" ], - "filament_id": "00003" + "filament_id": "OFYPdQJh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @K1 Max_CFS-C-all.json index e4ab498063..5f03c5b211 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @K1 Max_CFS-C-all.json @@ -163,5 +163,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @K1C-all.json index 8bbacdd073..4044297ea9 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @K1C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @K1C_CFS-C-all.json index d5a0981341..5c22d3e902 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @K1C_CFS-C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @K1_CFS-C-all.json index 1414ef10c2..00f8180634 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @K1_CFS-C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @K2 Plus-all.json index 7114550576..5ed6aa15ea 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @K2 Plus-all.json @@ -145,5 +145,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @K2 Pro-all.json index d4f5068e4d..a801d09c9b 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @K2 Pro-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @K2-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @K2-all.json index d9c52ea4d4..a2b844f80f 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @K2-all.json @@ -136,5 +136,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-CF @SPARKX i7-all.json b/resources/profiles/Creality/filament/Generic PETG-CF @SPARKX i7-all.json index 349f5d2418..954782024a 100644 --- a/resources/profiles/Creality/filament/Generic PETG-CF @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-CF @SPARKX i7-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "00014" + "filament_id": "OFoYSJKi" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-GF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PETG-GF @K2 Plus-all.json index 09c26dc704..63dead723c 100644 --- a/resources/profiles/Creality/filament/Generic PETG-GF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-GF @K2 Plus-all.json @@ -148,5 +148,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00027" + "filament_id": "OFyLWVF3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-GF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PETG-GF @K2 Pro-all.json index dda8a48f06..5405f7dbcd 100644 --- a/resources/profiles/Creality/filament/Generic PETG-GF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-GF @K2 Pro-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00027" + "filament_id": "OFyLWVF3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json b/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json index c2a9b7cc5c..7d52685214 100644 --- a/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PETG-GF @K2-all.json @@ -142,5 +142,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00027" + "filament_id": "OFyLWVF3" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Generic PLA @Ender-3 V4-all.json index 6bb5cef8b2..ce8231d11a 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Ender-3 V4-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA @Hi-all.json index 831a63dc03..b79aa1d05f 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Hi-all.json @@ -140,5 +140,5 @@ "Creality Hi 0.6 nozzle", "Creality Hi 0.8 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA @K1 Max_CFS-C-all.json index a2757b6400..315347fc4f 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K1 Max_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K1 SE-all.json b/resources/profiles/Creality/filament/Generic PLA @K1 SE-all.json index fe66c9659f..11bd5fd68a 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K1 SE-all.json @@ -137,5 +137,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA @K1 SE_CFS-C-all.json index c4b6a70d4e..167ef73d00 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K1 SE_CFS-C-all.json @@ -137,5 +137,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K1C-all.json b/resources/profiles/Creality/filament/Generic PLA @K1C-all.json index 87b5d0554c..7cad23ed0e 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K1C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA @K1C_CFS-C-all.json index a8e2ea3433..50db3c5fb5 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K1C_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA @K1_CFS-C-all.json index 9ad9f4d172..ddbc57ab8d 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K1_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PLA @K2 Plus-all.json index 9b4f832744..6514b99d50 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K2 Plus-all.json @@ -162,5 +162,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PLA @K2 Pro-all.json index 97bfa85e57..96eafd022b 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K2 Pro-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K2 SE-all.json b/resources/profiles/Creality/filament/Generic PLA @K2 SE-all.json index 8c2f352b62..f8e0beaefe 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K2 SE-all.json @@ -136,5 +136,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @K2-all.json b/resources/profiles/Creality/filament/Generic PLA @K2-all.json index 5773b09d4a..ee71e52517 100644 --- a/resources/profiles/Creality/filament/Generic PLA @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @K2-all.json @@ -158,5 +158,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA @SPARKX i7-all.json b/resources/profiles/Creality/filament/Generic PLA @SPARKX i7-all.json index c0d5e84f04..07d9aa02e0 100644 --- a/resources/profiles/Creality/filament/Generic PLA @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @SPARKX i7-all.json @@ -162,5 +162,5 @@ "Creality SPARKX i7 0.6 nozzle", "Creality SPARKX i7 0.8 nozzle" ], - "filament_id": "00001" + "filament_id": "OFDSrzZ8" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @Ender-3 V4-all.json index c651861af8..3fd2827231 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Ender-3 V4-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K1 Max_CFS-C-all.json index 8721ebfd57..698bdc2927 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K1 Max_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE-all.json index 9b686f0f9a..57228d8b7f 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE_CFS-C-all.json index a606564c5d..647819f8ea 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K1 SE_CFS-C-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K1C-all.json index f0bd1b2659..ae3aa14a7a 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K1C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K1C_CFS-C-all.json index 9e1ed31ae4..7c1b681b1e 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K1C_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K1_CFS-C-all.json index aa6a91936f..ab73ebe1ba 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K1_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K2 Plus-all.json index be755fcebb..381f25f899 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K2 Plus-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K2 Pro-all.json index 2e54d39334..f1ce0ce42d 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K2 Pro-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K2 SE-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K2 SE-all.json index 64c621680e..4dab8f0c8a 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K2 SE-all.json @@ -142,5 +142,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @K2-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @K2-all.json index c754999f33..111ac7470a 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @K2-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-CF @SPARKX i7-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @SPARKX i7-all.json index 60fa4e2bee..4184a05737 100644 --- a/resources/profiles/Creality/filament/Generic PLA-CF @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @SPARKX i7-all.json @@ -179,5 +179,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "00006" + "filament_id": "OFWbdGsC" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @Ender-3 V4-all.json index 1cf6f9ecd9..da5c1ba172 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @Ender-3 V4-all.json @@ -143,5 +143,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @Hi-all.json index d2dab74d67..a3dfac28d1 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @Hi-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K1 Max_CFS-C-all.json index 53f97c21f1..c7ce2639ae 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K1 Max_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE-all.json index 92dc9c7f22..418248ed71 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE_CFS-C-all.json index 683eb16c4d..1ba33bf6dc 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K1 SE_CFS-C-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K1C-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K1C-all.json index 7210792495..f37ef16d31 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K1C-all.json @@ -159,5 +159,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K1C_CFS-C-all.json index 70e41a8078..1b4298f035 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K1C_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K1_CFS-C-all.json index 71b992c1fc..f81638a23f 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K1_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Plus-all.json index ba03b66ddd..50f7dac4eb 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Plus-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Pro-all.json index 9e03746797..2c18b858e8 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K2 Pro-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K2 SE-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K2 SE-all.json index 074fde8bfe..8b7030ff73 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K2 SE-all.json @@ -133,5 +133,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @K2-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @K2-all.json index 953edaba8b..5826a18ba9 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @K2-all.json @@ -158,5 +158,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PLA-Silk @SPARKX i7-all.json b/resources/profiles/Creality/filament/Generic PLA-Silk @SPARKX i7-all.json index 30e6a20ebd..e67d570ad4 100644 --- a/resources/profiles/Creality/filament/Generic PLA-Silk @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-Silk @SPARKX i7-all.json @@ -163,5 +163,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "00002" + "filament_id": "OFi6PfUM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PP @K1 Max_CFS-C-all.json index 59f53cbb9d..7aec44400e 100644 --- a/resources/profiles/Creality/filament/Generic PP @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PP @K1 Max_CFS-C-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00019" + "filament_id": "OF1UNk9P" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP @K1C-all.json b/resources/profiles/Creality/filament/Generic PP @K1C-all.json index 4c8ac4d0d0..ad01f49d51 100644 --- a/resources/profiles/Creality/filament/Generic PP @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PP @K1C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00019" + "filament_id": "OF1UNk9P" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PP @K1C_CFS-C-all.json index 1668dd04fa..fb56912bf1 100644 --- a/resources/profiles/Creality/filament/Generic PP @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PP @K1C_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00019" + "filament_id": "OF1UNk9P" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PP @K1_CFS-C-all.json index f82a464fe5..88acdf3d32 100644 --- a/resources/profiles/Creality/filament/Generic PP @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PP @K1_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00019" + "filament_id": "OF1UNk9P" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PP @K2 Plus-all.json index 9a5f2f3e53..e34d70a902 100644 --- a/resources/profiles/Creality/filament/Generic PP @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PP @K2 Plus-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00019" + "filament_id": "OF1UNk9P" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PP @K2 Pro-all.json index 38ba4abe64..e3167109d8 100644 --- a/resources/profiles/Creality/filament/Generic PP @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PP @K2 Pro-all.json @@ -138,5 +138,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00019" + "filament_id": "OF1UNk9P" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP @K2-all.json b/resources/profiles/Creality/filament/Generic PP @K2-all.json index 8f97f08d6b..8f0075422c 100644 --- a/resources/profiles/Creality/filament/Generic PP @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PP @K2-all.json @@ -138,5 +138,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00019" + "filament_id": "OF1UNk9P" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PP-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PP-CF @K2 Plus-all.json index 3f35f96343..e557ac36e4 100644 --- a/resources/profiles/Creality/filament/Generic PP-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PP-CF @K2 Plus-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00031" + "filament_id": "OFXkm8q1" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PPS @K1 Max_CFS-C-all.json index 37176e53e1..01f7c52bc9 100644 --- a/resources/profiles/Creality/filament/Generic PPS @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS @K1 Max_CFS-C-all.json @@ -169,5 +169,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00017" + "filament_id": "OFq9svOz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS @K1C-all.json b/resources/profiles/Creality/filament/Generic PPS @K1C-all.json index d15aeef469..39a3449351 100644 --- a/resources/profiles/Creality/filament/Generic PPS @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS @K1C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00017" + "filament_id": "OFq9svOz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PPS @K1C_CFS-C-all.json index d2af02918e..af12995572 100644 --- a/resources/profiles/Creality/filament/Generic PPS @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS @K1C_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00017" + "filament_id": "OFq9svOz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PPS @K1_CFS-C-all.json index 69f7f95046..dd22fcf107 100644 --- a/resources/profiles/Creality/filament/Generic PPS @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS @K1_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00017" + "filament_id": "OFq9svOz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PPS @K2 Plus-all.json index 964d010a97..deff12cad5 100644 --- a/resources/profiles/Creality/filament/Generic PPS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PPS @K2 Plus-all.json @@ -147,5 +147,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00017" + "filament_id": "OFq9svOz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PPS-CF @K1 Max_CFS-C-all.json index 47c8c9dc0e..f07eed6f9a 100644 --- a/resources/profiles/Creality/filament/Generic PPS-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS-CF @K1 Max_CFS-C-all.json @@ -169,5 +169,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00018" + "filament_id": "OF6rdQ6M" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS-CF @K1C-all.json b/resources/profiles/Creality/filament/Generic PPS-CF @K1C-all.json index c8e56eb45b..78f5a33e87 100644 --- a/resources/profiles/Creality/filament/Generic PPS-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS-CF @K1C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00018" + "filament_id": "OF6rdQ6M" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PPS-CF @K1C_CFS-C-all.json index 5a937397ac..8975f9792c 100644 --- a/resources/profiles/Creality/filament/Generic PPS-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS-CF @K1C_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00018" + "filament_id": "OF6rdQ6M" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PPS-CF @K1_CFS-C-all.json index ae80e3823a..11b1b3a155 100644 --- a/resources/profiles/Creality/filament/Generic PPS-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PPS-CF @K1_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00018" + "filament_id": "OF6rdQ6M" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PPS-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PPS-CF @K2 Plus-all.json index a538bfb7a1..3bbcf8f992 100644 --- a/resources/profiles/Creality/filament/Generic PPS-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PPS-CF @K2 Plus-all.json @@ -140,5 +140,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00018" + "filament_id": "OF6rdQ6M" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @Hi-all.json b/resources/profiles/Creality/filament/Generic PVA @Hi-all.json index a327524d0b..6fdad0ad0b 100644 --- a/resources/profiles/Creality/filament/Generic PVA @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @Hi-all.json @@ -132,5 +132,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PVA @K1 Max_CFS-C-all.json index 468d910190..ba02942df2 100644 --- a/resources/profiles/Creality/filament/Generic PVA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @K1 Max_CFS-C-all.json @@ -124,5 +124,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @K1C-all.json b/resources/profiles/Creality/filament/Generic PVA @K1C-all.json index 208b12d48e..34d0a7231d 100644 --- a/resources/profiles/Creality/filament/Generic PVA @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @K1C-all.json @@ -125,5 +125,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PVA @K1C_CFS-C-all.json index 5f2d2d535a..607cf3b0dd 100644 --- a/resources/profiles/Creality/filament/Generic PVA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @K1C_CFS-C-all.json @@ -125,5 +125,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic PVA @K1_CFS-C-all.json index e527dfaddf..e5eff7fb64 100644 --- a/resources/profiles/Creality/filament/Generic PVA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @K1_CFS-C-all.json @@ -125,5 +125,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic PVA @K2 Plus-all.json index 4e76a603d2..a4499aa85d 100644 --- a/resources/profiles/Creality/filament/Generic PVA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @K2 Plus-all.json @@ -142,5 +142,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic PVA @K2 Pro-all.json index 3902a813d5..9cf5bfd6bc 100644 --- a/resources/profiles/Creality/filament/Generic PVA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @K2 Pro-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic PVA @K2-all.json b/resources/profiles/Creality/filament/Generic PVA @K2-all.json index 9d6376abe7..d69eab7457 100644 --- a/resources/profiles/Creality/filament/Generic PVA @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PVA @K2-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00011" + "filament_id": "OFDvXujf" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic Support for PA @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic Support for PA @K2 Plus-all.json index 65431307ec..a59be37173 100644 --- a/resources/profiles/Creality/filament/Generic Support for PA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic Support for PA @K2 Plus-all.json @@ -175,5 +175,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00023" + "filament_id": "OFDtop41" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic Support for PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic Support for PLA @K2 Plus-all.json index 130d40baff..5135c5ee68 100644 --- a/resources/profiles/Creality/filament/Generic Support for PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic Support for PLA @K2 Plus-all.json @@ -158,5 +158,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00024" + "filament_id": "OFin64Qg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU 64D @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic TPU 64D @K2 Plus-all.json index 2d59a7a434..da1860ce3c 100644 --- a/resources/profiles/Creality/filament/Generic TPU 64D @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic TPU 64D @K2 Plus-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00026" + "filament_id": "OFF3cuzT" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU 64D @SPARKX i7-all.json b/resources/profiles/Creality/filament/Generic TPU 64D @SPARKX i7-all.json index 5b50b540bf..54d1fd6680 100644 --- a/resources/profiles/Creality/filament/Generic TPU 64D @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Generic TPU 64D @SPARKX i7-all.json @@ -181,5 +181,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "00026" + "filament_id": "OFF3cuzT" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Generic TPU @Ender-3 V4-all.json index d5582bb484..18e8caacda 100644 --- a/resources/profiles/Creality/filament/Generic TPU @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Ender-3 V4-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Generic TPU @K1 Max_CFS-C-all.json index cb08115e87..0e093087d3 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K1 Max_CFS-C-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K1 SE-all.json b/resources/profiles/Creality/filament/Generic TPU @K1 SE-all.json index 46e2de4629..12f548e797 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K1 SE-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Generic TPU @K1 SE_CFS-C-all.json index 45926b0b66..c7aa82e060 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K1 SE_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K1C-all.json b/resources/profiles/Creality/filament/Generic TPU @K1C-all.json index bcfcbd4836..4d77ed28a7 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K1C-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K1C-all.json @@ -147,5 +147,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Generic TPU @K1C_CFS-C-all.json index 7d929554a8..4c29062659 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K1C_CFS-C-all.json @@ -147,5 +147,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Generic TPU @K1_CFS-C-all.json index 56491b9100..88523dd930 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K1_CFS-C-all.json @@ -147,5 +147,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K2 Plus-all.json b/resources/profiles/Creality/filament/Generic TPU @K2 Plus-all.json index 46aee6149c..a06cdec298 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K2 Plus-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K2 Pro-all.json b/resources/profiles/Creality/filament/Generic TPU @K2 Pro-all.json index 62451e782a..07e97acb84 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K2 Pro-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K2 SE-all.json b/resources/profiles/Creality/filament/Generic TPU @K2 SE-all.json index 04348049b8..8793fc167e 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K2 SE-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @K2-all.json b/resources/profiles/Creality/filament/Generic TPU @K2-all.json index 4967c237e0..03d44388f5 100644 --- a/resources/profiles/Creality/filament/Generic TPU @K2-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @K2-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Generic TPU @SPARKX i7-all.json b/resources/profiles/Creality/filament/Generic TPU @SPARKX i7-all.json index cd8b519c2e..c1d0268024 100644 --- a/resources/profiles/Creality/filament/Generic TPU @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @SPARKX i7-all.json @@ -168,5 +168,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "00005" + "filament_id": "OFgbpcy9" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP Ultra PLA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/HP Ultra PLA @K1 Max_CFS-C-all.json index c7ae970179..e300daac38 100644 --- a/resources/profiles/Creality/filament/HP Ultra PLA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP Ultra PLA @K1 Max_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "18001" + "filament_id": "OFCJpR7a" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP Ultra PLA @K1C-all.json b/resources/profiles/Creality/filament/HP Ultra PLA @K1C-all.json index e02b477267..d437c91d60 100644 --- a/resources/profiles/Creality/filament/HP Ultra PLA @K1C-all.json +++ b/resources/profiles/Creality/filament/HP Ultra PLA @K1C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "18001" + "filament_id": "OFCJpR7a" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP Ultra PLA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/HP Ultra PLA @K1C_CFS-C-all.json index c6bb9bd547..2c354d95bc 100644 --- a/resources/profiles/Creality/filament/HP Ultra PLA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP Ultra PLA @K1C_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "18001" + "filament_id": "OFCJpR7a" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP Ultra PLA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/HP Ultra PLA @K1_CFS-C-all.json index 1eb74d0999..db920a7f56 100644 --- a/resources/profiles/Creality/filament/HP Ultra PLA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP Ultra PLA @K1_CFS-C-all.json @@ -156,5 +156,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "18001" + "filament_id": "OFCJpR7a" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP Ultra PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/HP Ultra PLA @K2 Plus-all.json index 399c357b29..8f912cf729 100644 --- a/resources/profiles/Creality/filament/HP Ultra PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/HP Ultra PLA @K2 Plus-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "18001" + "filament_id": "OFCJpR7a" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/HP-ASA @K1 Max_CFS-C-all.json index 3118bd2d96..16810d1886 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K1 Max_CFS-C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K1C-all.json b/resources/profiles/Creality/filament/HP-ASA @K1C-all.json index 95e31de6b3..c720b4d1b0 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K1C-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K1C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/HP-ASA @K1C_CFS-C-all.json index 6ea06b5eb7..01a49e2392 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K1C_CFS-C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/HP-ASA @K1_CFS-C-all.json index 30411e4028..d3a45386ad 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K1_CFS-C-all.json @@ -167,5 +167,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K2 Plus-all.json b/resources/profiles/Creality/filament/HP-ASA @K2 Plus-all.json index 3babd544ef..1b97d61b93 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K2 Plus-all.json @@ -175,5 +175,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K2 Pro-all.json b/resources/profiles/Creality/filament/HP-ASA @K2 Pro-all.json index a508566f74..33a4406fdd 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K2 Pro-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K2 SE-all.json b/resources/profiles/Creality/filament/HP-ASA @K2 SE-all.json index 68cbfb27d7..f29ffdd702 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K2 SE-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K2 SE-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-ASA @K2-all.json b/resources/profiles/Creality/filament/HP-ASA @K2-all.json index b7d3829cda..2d38575630 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K2-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K2-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "19001" + "filament_id": "OFPHLnoe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @Ender-3 V4-all.json b/resources/profiles/Creality/filament/HP-TPU @Ender-3 V4-all.json index e627f5c5e8..9d7767c4d8 100644 --- a/resources/profiles/Creality/filament/HP-TPU @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @Ender-3 V4-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @Hi-all.json b/resources/profiles/Creality/filament/HP-TPU @Hi-all.json index 244f173f41..c9b6766149 100644 --- a/resources/profiles/Creality/filament/HP-TPU @Hi-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @Hi-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/HP-TPU @K1 Max_CFS-C-all.json index 8ed2212fa9..079dfebfe2 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K1 Max_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K1 SE-all.json b/resources/profiles/Creality/filament/HP-TPU @K1 SE-all.json index 5c83cda993..7e5935cdf7 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K1 SE-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K1 SE-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/HP-TPU @K1 SE_CFS-C-all.json index f251c2e7db..62184e78e3 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K1 SE_CFS-C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K1C-all.json b/resources/profiles/Creality/filament/HP-TPU @K1C-all.json index 6559456723..6762f0d2d4 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K1C-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K1C-all.json @@ -164,5 +164,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/HP-TPU @K1C_CFS-C-all.json index 825d30d323..e7534ade92 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K1C_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K1_CFS-C-all.json b/resources/profiles/Creality/filament/HP-TPU @K1_CFS-C-all.json index 9a950cce1d..077936057a 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K1_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K2 Plus-all.json b/resources/profiles/Creality/filament/HP-TPU @K2 Plus-all.json index 19195696be..5b979963f0 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K2 Plus-all.json @@ -168,5 +168,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K2 Pro-all.json b/resources/profiles/Creality/filament/HP-TPU @K2 Pro-all.json index 07423945cb..90201f7dcf 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K2 Pro-all.json @@ -170,5 +170,5 @@ "Creality K2 Pro 0.6 nozzle", "Creality K2 Pro 0.8 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K2 SE-all.json b/resources/profiles/Creality/filament/HP-TPU @K2 SE-all.json index df44f03a65..b3779225c2 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K2 SE-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K2 SE-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @K2-all.json b/resources/profiles/Creality/filament/HP-TPU @K2-all.json index 4d1285f815..3768b17547 100644 --- a/resources/profiles/Creality/filament/HP-TPU @K2-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @K2-all.json @@ -165,5 +165,5 @@ "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/HP-TPU @SPARKX i7-all.json b/resources/profiles/Creality/filament/HP-TPU @SPARKX i7-all.json index 796ce1e78f..1d225ec253 100644 --- a/resources/profiles/Creality/filament/HP-TPU @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/HP-TPU @SPARKX i7-all.json @@ -179,5 +179,5 @@ "Creality SPARKX i7 0.6 nozzle", "Creality SPARKX i7 0.8 nozzle" ], - "filament_id": "10001" + "filament_id": "OFGcMkEB" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Hyper ABS @Ender-3 V4-all.json index 3f038190b1..e4a50b5fec 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @Ender-3 V4-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @Hi-all.json b/resources/profiles/Creality/filament/Hyper ABS @Hi-all.json index 5e3b9d7de7..bb93a96d02 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @Hi-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper ABS @K1 Max_CFS-C-all.json index f2a095c235..9749f95e35 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K1 Max_CFS-C-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K1 SE-all.json b/resources/profiles/Creality/filament/Hyper ABS @K1 SE-all.json index 35871f8ac5..a303e41640 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K1 SE-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper ABS @K1 SE_CFS-C-all.json index f160827598..b4780cb82d 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K1 SE_CFS-C-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K1C-all.json b/resources/profiles/Creality/filament/Hyper ABS @K1C-all.json index 0d57ad0380..1ae0bc6ddf 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K1C-all.json @@ -166,5 +166,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper ABS @K1C_CFS-C-all.json index 78b1d7d719..03f8fbc354 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K1C_CFS-C-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper ABS @K1_CFS-C-all.json index e6ef2cfb6c..d6c76e777f 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K1_CFS-C-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper ABS @K2 Plus-all.json index bbef4b2148..7ecce97627 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K2 Plus-all.json @@ -163,5 +163,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper ABS @K2 Pro-all.json index edd4f7a352..de032398b5 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K2 Pro-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K2 SE-all.json b/resources/profiles/Creality/filament/Hyper ABS @K2 SE-all.json index 4710c1f7b1..c3132a18b5 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K2 SE-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper ABS @K2-all.json b/resources/profiles/Creality/filament/Hyper ABS @K2-all.json index 6aa0b2f736..63bf93483d 100644 --- a/resources/profiles/Creality/filament/Hyper ABS @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper ABS @K2-all.json @@ -163,5 +163,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "03001" + "filament_id": "OF8GnyFU" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @Hi-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @Hi-all.json index efafa60017..d4deb0be89 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @Hi-all.json @@ -145,5 +145,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K1 Max_CFS-C-all.json index 4b8ed94936..182364977c 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K1 Max_CFS-C-all.json @@ -166,5 +166,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE-all.json index c07d9981db..2bc12a6918 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE-all.json @@ -144,5 +144,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE_CFS-C-all.json index 3d69f8e7ae..065b9ac77e 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K1 SE_CFS-C-all.json @@ -144,5 +144,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K1C-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K1C-all.json index 7193bf835b..872eeca4dc 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K1C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K1C_CFS-C-all.json index 0757ec1fc8..3685dbd854 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K1C_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K1_CFS-C-all.json index 387a549dbc..718112bd7b 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K1_CFS-C-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Plus-all.json index 2f3c64a6e1..df0df361ad 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Plus-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Pro-all.json index 902e373f86..cf2c873e77 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K2 Pro-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper L-W PLA @K2-all.json b/resources/profiles/Creality/filament/Hyper L-W PLA @K2-all.json index a0f31de0c4..9b06765831 100644 --- a/resources/profiles/Creality/filament/Hyper L-W PLA @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper L-W PLA @K2-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "01002" + "filament_id": "OF70zbGS" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Luminous @Hi-all.json b/resources/profiles/Creality/filament/Hyper Luminous @Hi-all.json index a6873b4dc2..4c39c1ac1a 100644 --- a/resources/profiles/Creality/filament/Hyper Luminous @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper Luminous @Hi-all.json @@ -136,5 +136,5 @@ "Creality Hi 0.6 nozzle", "Creality Hi 0.8 nozzle" ], - "filament_id": "01003" + "filament_id": "OFC1PzXz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Luminous @K1C-all.json b/resources/profiles/Creality/filament/Hyper Luminous @K1C-all.json index df72136acc..53ab1e078e 100644 --- a/resources/profiles/Creality/filament/Hyper Luminous @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper Luminous @K1C-all.json @@ -163,5 +163,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "01003" + "filament_id": "OFC1PzXz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Luminous @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper Luminous @K2 Plus-all.json index 13670be4d9..9e267d07cf 100644 --- a/resources/profiles/Creality/filament/Hyper Luminous @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper Luminous @K2 Plus-all.json @@ -160,5 +160,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "01003" + "filament_id": "OFC1PzXz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Luminous @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper Luminous @K2 Pro-all.json index eb7d7f3f03..67c567791c 100644 --- a/resources/profiles/Creality/filament/Hyper Luminous @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper Luminous @K2 Pro-all.json @@ -160,5 +160,5 @@ "Creality K2 Pro 0.6 nozzle", "Creality K2 Pro 0.8 nozzle" ], - "filament_id": "01003" + "filament_id": "OFC1PzXz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Luminous @K2-all.json b/resources/profiles/Creality/filament/Hyper Luminous @K2-all.json index 86a72078c6..b5182102e4 100644 --- a/resources/profiles/Creality/filament/Hyper Luminous @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper Luminous @K2-all.json @@ -160,5 +160,5 @@ "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle" ], - "filament_id": "01003" + "filament_id": "OFC1PzXz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Luminous @SPARKX i7-all.json b/resources/profiles/Creality/filament/Hyper Luminous @SPARKX i7-all.json index b4991bc3ff..9817bd9701 100644 --- a/resources/profiles/Creality/filament/Hyper Luminous @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Hyper Luminous @SPARKX i7-all.json @@ -179,5 +179,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "01003" + "filament_id": "OFC1PzXz" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @Hi-all.json b/resources/profiles/Creality/filament/Hyper Marble @Hi-all.json index 7576185076..614c8a9ac8 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @Hi-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper Marble @K1 Max_CFS-C-all.json index 3475d6f5aa..1fdeb7e4d3 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K1 Max_CFS-C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K1C-all.json b/resources/profiles/Creality/filament/Hyper Marble @K1C-all.json index fb9bc8c08c..3430271e86 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K1C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper Marble @K1C_CFS-C-all.json index 63ab61c68e..f92a629e09 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K1C_CFS-C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper Marble @K1_CFS-C-all.json index 0e3f217669..0443b606a1 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K1_CFS-C-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper Marble @K2 Plus-all.json index bce1cbb5f0..87c217d5db 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K2 Plus-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper Marble @K2 Pro-all.json index 4c77e3e4ab..90047e7778 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K2 Pro-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K2 SE-all.json b/resources/profiles/Creality/filament/Hyper Marble @K2 SE-all.json index 706230c0b9..a0bc0bbfbc 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K2 SE-all.json @@ -142,5 +142,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @K2-all.json b/resources/profiles/Creality/filament/Hyper Marble @K2-all.json index 527ec67332..09eb2487d3 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @K2-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Marble @SPARKX i7-all.json b/resources/profiles/Creality/filament/Hyper Marble @SPARKX i7-all.json index 0746b42880..746332ab6a 100644 --- a/resources/profiles/Creality/filament/Hyper Marble @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Hyper Marble @SPARKX i7-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "29001" + "filament_id": "OFLzx3J4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Plus-all.json index 01aeb86cdf..d5d494f3f4 100644 --- a/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Plus-all.json @@ -195,5 +195,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "12005" + "filament_id": "OFn2GlhY" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Pro-all.json index 40139cf279..97f41d5746 100644 --- a/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PA6-CF @K2 Pro-all.json @@ -195,5 +195,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "12005" + "filament_id": "OFn2GlhY" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Plus-all.json index 2f8bcbbacb..658908446c 100644 --- a/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Plus-all.json @@ -189,5 +189,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "12004" + "filament_id": "OFhkN0a7" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Pro-all.json index 3f4be12bf3..40870d5cd3 100644 --- a/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PA612-CF @K2 Pro-all.json @@ -189,5 +189,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "12004" + "filament_id": "OFhkN0a7" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1 Max_CFS-C-all.json index 3311a96082..915b8b67d9 100644 --- a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1 Max_CFS-C-all.json @@ -192,5 +192,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "12003" + "filament_id": "OF4APyxe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C-all.json b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C-all.json index b06066ce46..3529603ba6 100644 --- a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C-all.json @@ -193,5 +193,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "12003" + "filament_id": "OF4APyxe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C_CFS-C-all.json index 1e89fbaa08..a2c841f463 100644 --- a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1C_CFS-C-all.json @@ -193,5 +193,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "12003" + "filament_id": "OF4APyxe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1_CFS-C-all.json index bf05bb6310..c597cd9c95 100644 --- a/resources/profiles/Creality/filament/Hyper PAHT-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PAHT-CF @K1_CFS-C-all.json @@ -193,5 +193,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "12003" + "filament_id": "OF4APyxe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Plus-all.json index df43ebb973..67d0b403cc 100644 --- a/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Plus-all.json @@ -190,5 +190,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "12003" + "filament_id": "OF4APyxe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Pro-all.json index 60e6f6e84e..f7e37afe69 100644 --- a/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PAHT-CF @K2 Pro-all.json @@ -180,5 +180,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "12003" + "filament_id": "OF4APyxe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PAHT-CF @K2-all.json b/resources/profiles/Creality/filament/Hyper PAHT-CF @K2-all.json index 39fc5e217b..1f97108309 100644 --- a/resources/profiles/Creality/filament/Hyper PAHT-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper PAHT-CF @K2-all.json @@ -180,5 +180,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "12003" + "filament_id": "OF4APyxe" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PC @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PC @K2 Plus-all.json index 43f1d53cdc..85d5d66252 100644 --- a/resources/profiles/Creality/filament/Hyper PC @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PC @K2 Plus-all.json @@ -167,5 +167,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "07002" + "filament_id": "OFUF7oA4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PC @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PC @K2 Pro-all.json index 3668981c2b..7592b6dbcf 100644 --- a/resources/profiles/Creality/filament/Hyper PC @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PC @K2 Pro-all.json @@ -169,5 +169,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "07002" + "filament_id": "OFUF7oA4" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Hyper PETG @Ender-3 V4-all.json index aa4a1da8b8..a333d63f3d 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @Ender-3 V4-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @Hi-all.json b/resources/profiles/Creality/filament/Hyper PETG @Hi-all.json index fdc782abad..5998e1e8bd 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @Hi-all.json @@ -145,5 +145,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PETG @K1 Max_CFS-C-all.json index 89090724f4..6bd1f3afea 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K1 Max_CFS-C-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K1 SE-all.json b/resources/profiles/Creality/filament/Hyper PETG @K1 SE-all.json index 85d9b0fc2d..058dfe5bd6 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K1 SE-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PETG @K1 SE_CFS-C-all.json index afd34c32d2..f1ceb825e9 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K1 SE_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K1C-all.json b/resources/profiles/Creality/filament/Hyper PETG @K1C-all.json index b4f548e7d8..175aa8099c 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K1C-all.json @@ -151,5 +151,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PETG @K1C_CFS-C-all.json index a132ab6ba7..be8e2c58f5 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K1C_CFS-C-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PETG @K1_CFS-C-all.json index 1d4207f047..9bf2512abe 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K1_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PETG @K2 Plus-all.json index 2b65adafad..983556224b 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K2 Plus-all.json @@ -145,5 +145,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PETG @K2 Pro-all.json index 25acc10afb..32a8fae98b 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K2 Pro-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K2 SE-all.json b/resources/profiles/Creality/filament/Hyper PETG @K2 SE-all.json index f00003218e..cc058c4511 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K2 SE-all.json @@ -154,5 +154,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @K2-all.json b/resources/profiles/Creality/filament/Hyper PETG @K2-all.json index f0f86795ec..9bbf24c47f 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K2-all.json @@ -144,5 +144,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG @SPARKX i7-all.json b/resources/profiles/Creality/filament/Hyper PETG @SPARKX i7-all.json index 26b6def656..d8db7fd923 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @SPARKX i7-all.json @@ -160,5 +160,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "06002" + "filament_id": "OFujZSdh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @K1 Max_CFS-C-all.json index 459f8fcd55..69662a0296 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @K1 Max_CFS-C-all.json @@ -136,5 +136,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @K1C-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @K1C-all.json index 05fe909fb4..1005d22d7f 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @K1C-all.json @@ -135,5 +135,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @K1C_CFS-C-all.json index 9fa1a032be..e9008aede1 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @K1C_CFS-C-all.json @@ -135,5 +135,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @K1_CFS-C-all.json index 3f99330c5b..2358ec054e 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @K1_CFS-C-all.json @@ -136,5 +136,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Plus-all.json index 544ae5fb6f..252b6dad9c 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Plus-all.json @@ -138,5 +138,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Pro-all.json index ec260e76f3..1962c54912 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @K2 Pro-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @K2-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @K2-all.json index e178e47042..68ae2439d7 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @K2-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-CF @SPARKX i7-all.json b/resources/profiles/Creality/filament/Hyper PETG-CF @SPARKX i7-all.json index f88b59d4d7..a3ab600254 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-CF @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-CF @SPARKX i7-all.json @@ -163,5 +163,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "06003" + "filament_id": "OFusbWjj" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-GF @K1C-all.json b/resources/profiles/Creality/filament/Hyper PETG-GF @K1C-all.json index 0c1d8e5c2a..9fdfe1559b 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-GF @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-GF @K1C-all.json @@ -145,5 +145,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "06004" + "filament_id": "OFLgwqp2" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Plus-all.json index 4b719767d0..820b021b9e 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Plus-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "06004" + "filament_id": "OFLgwqp2" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Pro-all.json index 346247a4aa..3129330404 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-GF @K2 Pro-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "06004" + "filament_id": "OFLgwqp2" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PETG-GF @K2-all.json b/resources/profiles/Creality/filament/Hyper PETG-GF @K2-all.json index 9f28d154fb..eafa06d339 100644 --- a/resources/profiles/Creality/filament/Hyper PETG-GF @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG-GF @K2-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "06004" + "filament_id": "OFLgwqp2" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Hyper PLA @Ender-3 V4-all.json index aa981c3a30..8fbc885c07 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @Ender-3 V4-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @Hi-all.json b/resources/profiles/Creality/filament/Hyper PLA @Hi-all.json index 9b1ec357b7..c5297f78ed 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @Hi-all.json @@ -142,5 +142,5 @@ "Creality Hi 0.6 nozzle", "Creality Hi 0.8 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA @K1 Max_CFS-C-all.json index c3e7bed7f8..be08cd5bb4 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K1 Max_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K1 SE-all.json b/resources/profiles/Creality/filament/Hyper PLA @K1 SE-all.json index 717c0835dc..2d764065a5 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K1 SE-all.json @@ -136,5 +136,5 @@ "Creality K1 SE 0.6 nozzle", "Creality K1 SE 0.8 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA @K1 SE_CFS-C-all.json index 3679080841..0c80515aaa 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K1 SE_CFS-C-all.json @@ -134,5 +134,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K1C-all.json b/resources/profiles/Creality/filament/Hyper PLA @K1C-all.json index fa5a7a6ac2..4b3f6b5a60 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K1C-all.json @@ -157,5 +157,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA @K1C_CFS-C-all.json index 7626dae835..f0513b112b 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K1C_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA @K1_CFS-C-all.json index f95f80a5a4..c4175d3ead 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K1_CFS-C-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PLA @K2 Plus-all.json index 2d4608e32f..193bf2dee6 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K2 Plus-all.json @@ -155,5 +155,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PLA @K2 Pro-all.json index 973044ff35..3d8a1cbdd6 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K2 Pro-all.json @@ -157,5 +157,5 @@ "Creality K2 Pro 0.6 nozzle", "Creality K2 Pro 0.8 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K2 SE-all.json b/resources/profiles/Creality/filament/Hyper PLA @K2 SE-all.json index 6480fb0dad..34f98b70ae 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K2 SE-all.json @@ -136,5 +136,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @K2-all.json b/resources/profiles/Creality/filament/Hyper PLA @K2-all.json index 910f9888fe..f47ea8a5d8 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K2-all.json @@ -155,5 +155,5 @@ "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA @SPARKX i7-all.json b/resources/profiles/Creality/filament/Hyper PLA @SPARKX i7-all.json index 8e9b21749f..00afa33b11 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @SPARKX i7-all.json @@ -164,5 +164,5 @@ "Creality SPARKX i7 0.6 nozzle", "Creality SPARKX i7 0.8 nozzle" ], - "filament_id": "01001" + "filament_id": "OFCZsqXg" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @Ender-3 V4-all.json index f55de5ef56..fb92e57672 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @Ender-3 V4-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @Hi-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @Hi-all.json index ac7a413888..e63ee3717d 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @Hi-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K1 Max_CFS-C-all.json index f15929e486..d1a9cb3a38 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K1 Max_CFS-C-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE-all.json index af9c28e809..368b104901 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1 SE 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE_CFS-C-all.json index b44b0ceb3d..215a01e8a7 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K1 SE_CFS-C-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K1 SE_CFS-C 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K1C-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K1C-all.json index f4f4b2e536..d6d269db66 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K1C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K1C_CFS-C-all.json index 952822e040..5ed8fbe15f 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K1C_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K1_CFS-C-all.json index f65f1b5ec5..fe506e1147 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K1_CFS-C-all.json @@ -153,5 +153,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Plus-all.json index ebb185aabc..f9267d07e8 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Plus-all.json @@ -162,5 +162,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Pro-all.json index b32297ee79..9c465b0d30 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K2 Pro-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K2 SE-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K2 SE-all.json index 758086354d..94ac06f8bb 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K2 SE-all.json @@ -145,5 +145,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @K2-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @K2-all.json index b280582803..d0344132b6 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @K2-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PLA-CF @SPARKX i7-all.json b/resources/profiles/Creality/filament/Hyper PLA-CF @SPARKX i7-all.json index ccb1e5a690..53b640d939 100644 --- a/resources/profiles/Creality/filament/Hyper PLA-CF @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA-CF @SPARKX i7-all.json @@ -172,5 +172,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "02001" + "filament_id": "OFTnWzBs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Plus-all.json index e13b1c8420..c817224955 100644 --- a/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Plus-all.json @@ -181,5 +181,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "12002" + "filament_id": "OFNvBIL0" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Pro-all.json index 314b8641aa..4f7d4ddf2f 100644 --- a/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper PPA-CF @K2 Pro-all.json @@ -177,5 +177,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "12002" + "filament_id": "OFNvBIL0" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @Hi-all.json b/resources/profiles/Creality/filament/Hyper Stardust @Hi-all.json index fd0c47db8e..02756e4af3 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @Hi-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @Hi-all.json @@ -152,5 +152,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K1 Max_CFS-C-all.json index e822a0fa7a..0af9505f19 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K1 Max_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K1C-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K1C-all.json index 8e9d53c893..7afa71cd4c 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K1C-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K1C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K1C_CFS-C-all.json index 416ee437c0..058d4439ea 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K1C_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K1_CFS-C-all.json index d8dcb3862b..f90af90902 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K1_CFS-C-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K2 Plus-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K2 Plus-all.json index b74711cd62..7580e9f4e9 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K2 Plus-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K2 Pro-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K2 Pro-all.json index a0fdc30bab..1e307464b1 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K2 Pro-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K2 SE-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K2 SE-all.json index 84a8a22de5..9134285053 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K2 SE-all.json @@ -139,5 +139,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @K2-all.json b/resources/profiles/Creality/filament/Hyper Stardust @K2-all.json index 95f30eb149..154376069e 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @K2-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @K2-all.json @@ -157,5 +157,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Hyper Stardust @SPARKX i7-all.json b/resources/profiles/Creality/filament/Hyper Stardust @SPARKX i7-all.json index bc3de91594..43ccb7898c 100644 --- a/resources/profiles/Creality/filament/Hyper Stardust @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Hyper Stardust @SPARKX i7-all.json @@ -175,5 +175,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "01004" + "filament_id": "OFXnToSX" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Panchroma PLA Matte @K2 Plus-all.json b/resources/profiles/Creality/filament/Panchroma PLA Matte @K2 Plus-all.json index 05b64e3648..62f308a71b 100644 --- a/resources/profiles/Creality/filament/Panchroma PLA Matte @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Panchroma PLA Matte @K2 Plus-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "P1003" + "filament_id": "OFrOh600" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Panchroma PLA Satin @K2 Plus-all.json b/resources/profiles/Creality/filament/Panchroma PLA Satin @K2 Plus-all.json index c290ac0748..5d7f4818bd 100644 --- a/resources/profiles/Creality/filament/Panchroma PLA Satin @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Panchroma PLA Satin @K2 Plus-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "P1001" + "filament_id": "OFPkCJKE" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/PolySonic PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/PolySonic PLA @K2 Plus-all.json index bee02a0f14..20bd0700ab 100644 --- a/resources/profiles/Creality/filament/PolySonic PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/PolySonic PLA @K2 Plus-all.json @@ -168,5 +168,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "P1004" + "filament_id": "OF66KUAN" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/PolySonic PLA Pro @K2 Plus-all.json b/resources/profiles/Creality/filament/PolySonic PLA Pro @K2 Plus-all.json index 47e17257bd..acd8558abe 100644 --- a/resources/profiles/Creality/filament/PolySonic PLA Pro @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/PolySonic PLA Pro @K2 Plus-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "P1002" + "filament_id": "OFKbdiiJ" } \ No newline at end of file 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 66fb01a064..1e77a28ccf 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @Hi-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @Hi-all.json @@ -123,5 +123,5 @@ "Creality Hi 0.6 nozzle", "Creality Hi 0.8 nozzle" ], - "filament_id": "06005" + "filament_id": "OFBLktDy" } \ No newline at end of file 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 208583adff..626d34362d 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @K1C-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @K1C-all.json @@ -126,5 +126,5 @@ "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" ], - "filament_id": "06005" + "filament_id": "OFBLktDy" } \ No newline at end of file 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 f9d68e033a..8d1dc8a1c0 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 @@ -128,5 +128,5 @@ "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle" ], - "filament_id": "06005" + "filament_id": "OFBLktDy" } \ No newline at end of file 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 d88e732e2f..fca00e01ab 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 @@ -128,5 +128,5 @@ "Creality K2 Pro 0.6 nozzle", "Creality K2 Pro 0.8 nozzle" ], - "filament_id": "06005" + "filament_id": "OFBLktDy" } \ No newline at end of file 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 5c62188c93..da86d9e27e 100644 --- a/resources/profiles/Creality/filament/Soleyin Basic PETG @K2-all.json +++ b/resources/profiles/Creality/filament/Soleyin Basic PETG @K2-all.json @@ -128,5 +128,5 @@ "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle" ], - "filament_id": "06005" + "filament_id": "OFBLktDy" } \ No newline at end of file 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 5b73363f5d..79b83b8e69 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 @@ -118,5 +118,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "06005" + "filament_id": "OFBLktDy" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @Ender-3 V4-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @Ender-3 V4-all.json index 0abc37c050..b159f9141b 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @Ender-3 V4-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @Ender-3 V4-all.json @@ -149,5 +149,5 @@ "compatible_printers": [ "Creality Ender-3 V4 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @Hi-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @Hi-all.json index 8340313872..163ed96d8a 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @Hi-all.json @@ -142,5 +142,5 @@ "compatible_printers": [ "Creality Hi 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1 Max_CFS-C-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1 Max_CFS-C-all.json index b32740a47c..5612fad4d2 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1 Max_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1 Max_CFS-C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1 Max_CFS-C 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C-all.json index 2b0d1058cc..f975e2b6c4 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1C 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C_CFS-C-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C_CFS-C-all.json index 9cfa3eb9e9..9f4c2d9029 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1C_CFS-C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1C_CFS-C 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1_CFS-C-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1_CFS-C-all.json index 4cb9bfa4ff..0c7bd485be 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1_CFS-C-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K1_CFS-C-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K1_CFS-C 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Plus-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Plus-all.json index b4e93a4aea..06b1fc8729 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Plus-all.json @@ -161,5 +161,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Pro-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Pro-all.json index 63b6a48fa2..37702f76c0 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Pro-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 Pro-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K2 Pro 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 SE-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 SE-all.json index 590e345f39..7ff723f655 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 SE-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2 SE-all.json @@ -146,5 +146,5 @@ "compatible_printers": [ "Creality K2 SE 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2-all.json index 3e8753160b..2d68106751 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @K2-all.json @@ -164,5 +164,5 @@ "compatible_printers": [ "Creality K2 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Soleyin Ultra PLA @SPARKX i7-all.json b/resources/profiles/Creality/filament/Soleyin Ultra PLA @SPARKX i7-all.json index 3c15bcb7d0..9bad5351c2 100644 --- a/resources/profiles/Creality/filament/Soleyin Ultra PLA @SPARKX i7-all.json +++ b/resources/profiles/Creality/filament/Soleyin Ultra PLA @SPARKX i7-all.json @@ -170,5 +170,5 @@ "compatible_printers": [ "Creality SPARKX i7 0.4 nozzle" ], - "filament_id": "01601" + "filament_id": "OF02UAVh" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN ABS+ @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN ABS+ @K2 Plus-all.json index 449aed7663..77f2c6a6bf 100644 --- a/resources/profiles/Creality/filament/eSUN ABS+ @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN ABS+ @K2 Plus-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E3001" + "filament_id": "OFTXduCM" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN ASA+ @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN ASA+ @K2 Plus-all.json index d9e439ef2b..1afd5f1511 100644 --- a/resources/profiles/Creality/filament/eSUN ASA+ @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN ASA+ @K2 Plus-all.json @@ -155,5 +155,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E4001" + "filament_id": "OFUmS5z5" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN PET-Basic @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PET-Basic @K2 Plus-all.json index 0befedf49f..08ab12e2c9 100644 --- a/resources/profiles/Creality/filament/eSUN PET-Basic @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PET-Basic @K2 Plus-all.json @@ -185,5 +185,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E8001" + "filament_id": "OFHaYaB1" } \ No newline at end of file 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 abbc6f48cc..745ca87011 100644 --- a/resources/profiles/Creality/filament/eSUN PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PETG @K2 Plus-all.json @@ -83,5 +83,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E2001" + "filament_id": "OF3kBrdA" } \ No newline at end of file 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 2ac796d298..db95688083 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 @@ -80,5 +80,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E2002" + "filament_id": "OFrdZ0cK" } \ No newline at end of file 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 5803a71cef..4885eb89a0 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 @@ -83,5 +83,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E2003" + "filament_id": "OFFbQscs" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN PLA+ @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PLA+ @K2 Plus-all.json index a5bdfb25cd..d4f35de9be 100644 --- a/resources/profiles/Creality/filament/eSUN PLA+ @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PLA+ @K2 Plus-all.json @@ -159,5 +159,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E1001" + "filament_id": "OFqINlYj" } \ No newline at end of file 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 3712719e47..e76dc3d1fa 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 @@ -74,5 +74,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E1005" + "filament_id": "OFnHc3D6" } \ No newline at end of file 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 a5a1e52d46..0c540de90b 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 @@ -65,5 +65,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E1006" + "filament_id": "OFOHOf2F" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN PLA-LW @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PLA-LW @K2 Plus-all.json index 99550707a2..2e4b7703a0 100644 --- a/resources/profiles/Creality/filament/eSUN PLA-LW @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PLA-LW @K2 Plus-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "00035" + "filament_id": "OFi5RSve" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN PLA-Lite @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PLA-Lite @K2 Plus-all.json index 07fdbcd5b2..d5f4324da1 100644 --- a/resources/profiles/Creality/filament/eSUN PLA-Lite @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PLA-Lite @K2 Plus-all.json @@ -165,5 +165,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E1004" + "filament_id": "OFhbolij" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN PLA-Matte @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PLA-Matte @K2 Plus-all.json index 5a1f80d5de..bca728ae00 100644 --- a/resources/profiles/Creality/filament/eSUN PLA-Matte @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PLA-Matte @K2 Plus-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E1003" + "filament_id": "OFDETOM6" } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/eSUN PLA-Silk @K2 Plus-all.json b/resources/profiles/Creality/filament/eSUN PLA-Silk @K2 Plus-all.json index d09abc2625..fa57453069 100644 --- a/resources/profiles/Creality/filament/eSUN PLA-Silk @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/eSUN PLA-Silk @K2 Plus-all.json @@ -162,5 +162,5 @@ "compatible_printers": [ "Creality K2 Plus 0.4 nozzle" ], - "filament_id": "E1002" + "filament_id": "OFIRUqWi" } \ No newline at end of file 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 8446df4752..52deadf521 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 @@ -3,7 +3,7 @@ "name": "Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABS @base", "setting_id": "VJEyK87ZYvHmamB9", - "filament_id": "OF6XuVQE", + "filament_id": "OFpDo5Ix", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json index c7b34c9694..ea320b01e4 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon ABS @base", "from": "system", "setting_id": "Kz41mb2M9xLbEJ97", - "filament_id": "OF6XuVQE", + "filament_id": "OFpDo5Ix", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json index 3865f034fa..1f4da6c3f8 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon ABS @base", "setting_id": "A5FQdwh0Xo7aTRpq", - "filament_id": "OF6XuVQE", + "filament_id": "OFpDo5Ix", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json index 55fbd40ee4..998588dbac 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json @@ -3,7 +3,7 @@ "name": "Cubicon ABS @base", "inherits": "fdm_filament_abs", "setting_id": "aZRVIlDze62Bbw81", - "filament_id": "P510cfb0", + "filament_id": "OFafocjw", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 40cec441cc..cc34341ceb 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 @@ -3,7 +3,7 @@ "name": "Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABS-A100 @base", "setting_id": "OfiOryklf7FDVCz8", - "filament_id": "OFcZZWnB", + "filament_id": "OFy8tYJE", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json index 77205f02c2..5c85efa062 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon ABS-A100 @base", "from": "system", "setting_id": "pIyU9uXQ5V3hsg5F", - "filament_id": "OFcZZWnB", + "filament_id": "OFy8tYJE", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json index c78d3720df..765f1ce75c 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon ABS-A100 @base", "setting_id": "xhYh9x1vescinfbF", - "filament_id": "OFcZZWnB", + "filament_id": "OFy8tYJE", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json index dddc147ff2..a943b60a8b 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json @@ -3,7 +3,7 @@ "name": "Cubicon ABS-A100 @base", "inherits": "Cubicon ABS @base", "setting_id": "vGIT4KZvqojIh2up", - "filament_id": "P510cfb1", + "filament_id": "OFN9fefN", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 296268a3f0..0deea7e69f 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 @@ -3,7 +3,7 @@ "name": "Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABSk @base", "setting_id": "TXcodZkab4fofnEn", - "filament_id": "OFNQHqAV", + "filament_id": "OForhBi4", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json index afd798384f..1a2e21517c 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon ABSk @base", "from": "system", "setting_id": "CsthNnKn8WlBbkP4", - "filament_id": "OFNQHqAV", + "filament_id": "OForhBi4", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json index 6f60bb4c13..1295c2189e 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon ABSk @base", "setting_id": "UVitMFMxvdf34qZw", - "filament_id": "OFNQHqAV", + "filament_id": "OForhBi4", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json index e1546d3bae..a042ecbea3 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json @@ -3,7 +3,7 @@ "name": "Cubicon ABSk @base", "inherits": "Cubicon ABS @base", "setting_id": "UbOUO0K3Y2iRPBtf", - "filament_id": "P510cfb2", + "filament_id": "OFgVQkqW", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 8edf5f65e5..c8e56eaa13 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 @@ -3,7 +3,7 @@ "name": "Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PA-CF @base", "setting_id": "nupuIJggdc1EKDqG", - "filament_id": "OFOJUJAS", + "filament_id": "OFiEz2XI", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json index eda94acc49..7cb486c4e8 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PA-CF @base", "from": "system", "setting_id": "NPjuy4deP6Ly7u9s", - "filament_id": "OFOJUJAS", + "filament_id": "OFiEz2XI", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json index f67e32c8ac..4279540ac4 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon PA-CF @base", "setting_id": "ygB1Uf9Vbw9LJZc8", - "filament_id": "OFOJUJAS", + "filament_id": "OFiEz2XI", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json index 51c89949f6..daf2b62754 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Cubicon PA-CF @base", "inherits": "fdm_filament_pa", "setting_id": "55cJDyCoEudfOePY", - "filament_id": "P510cfd0", + "filament_id": "OFD21ije", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 aa761b7454..d115a6da70 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 @@ -3,7 +3,7 @@ "name": "Cubicon PC @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PC @base", "setting_id": "c0sUPS0SRYUNjEpB", - "filament_id": "OFaxQnfz", + "filament_id": "OFEj7sca", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json index e5c07509a4..9890ed585f 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PC @base", "from": "system", "setting_id": "XGXjHwuHUjtAJGl1", - "filament_id": "OFaxQnfz", + "filament_id": "OFEj7sca", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json index f565564c82..63be065b85 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon PC @base", "setting_id": "jbYKOK1A0Oxm9t0f", - "filament_id": "OFaxQnfz", + "filament_id": "OFEj7sca", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @base.json b/resources/profiles/Cubicon/filament/Cubicon PC @base.json index 5ecc4082c8..83e3afb15b 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @base.json @@ -3,7 +3,7 @@ "name": "Cubicon PC @base", "inherits": "fdm_filament_pc", "setting_id": "Mzg6jfwb2nqfGkdV", - "filament_id": "OFnLnZQo", + "filament_id": "OF79Fbo6", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 c9db611832..001b4ecf54 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 @@ -3,7 +3,7 @@ "name": "Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PETG @base", "setting_id": "dsX01tCkd2Usk104", - "filament_id": "OF0VEdLB", + "filament_id": "OFoBTKmn", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json index 653ca65758..b87bc4b3e5 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PETG @base", "from": "system", "setting_id": "2hYoCR5qUXCWIAxZ", - "filament_id": "OF0VEdLB", + "filament_id": "OFoBTKmn", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json index 919a262523..1b46fe6d64 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle", "inherits": "Cubicon PETG @base", "setting_id": "5pfiRdyNz9dvT4Q6", - "filament_id": "OF0VEdLB", + "filament_id": "OFoBTKmn", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json index 2242ba36ca..cf4ac7a4af 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json @@ -3,7 +3,7 @@ "name": "Cubicon PETG @base", "inherits": "fdm_filament_pet", "setting_id": "bGfz4phwIdqSz0Hx", - "filament_id": "P510cfc0", + "filament_id": "OF8Hx3Pi", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 fc5d62bdc5..5110547028 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 @@ -4,7 +4,7 @@ "inherits": "Cubicon PLA @base", "from": "system", "setting_id": "xXJgHAeNf1JdCitr", - "filament_id": "OFq6IhFg", + "filament_id": "OFEwRwmL", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json index 39d9a7835e..940152ae16 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PLA @base", "from": "system", "setting_id": "o2BQL6OKtxDmBkWV", - "filament_id": "OFq6IhFg", + "filament_id": "OFEwRwmL", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json index d94d38529c..ee5a5a1d3d 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PLA @base", "from": "system", "setting_id": "WkZrzDlGvb25OtrF", - "filament_id": "OFq6IhFg", + "filament_id": "OFEwRwmL", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json index 665ba58d59..7dd06c3498 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ypwdJAu0NlEsWpf4", - "filament_id": "P510cfa0", + "filament_id": "OFjcwUEm", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 c068eba680..3acad023d0 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 @@ -4,7 +4,7 @@ "inherits": "Cubicon PLA+ @base", "from": "system", "setting_id": "fNR2Bw3e4TGcWhq0", - "filament_id": "OF2HQqTC", + "filament_id": "OF7tt7DO", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json index f8c8331b31..32a6607377 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PLA+ @base", "from": "system", "setting_id": "wukhnaCJaOLUUdiU", - "filament_id": "OF2HQqTC", + "filament_id": "OF7tt7DO", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json index 0da1b35a44..823e0e51ca 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PLA+ @base", "from": "system", "setting_id": "JVShu8DKQ3euGHec", - "filament_id": "OF2HQqTC", + "filament_id": "OF7tt7DO", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json index cb916a9410..5b98d6fcf8 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json @@ -3,7 +3,7 @@ "name": "Cubicon PLA+ @base", "inherits": "Cubicon PLA @base", "setting_id": "ETnuhiOZRh1jxrVk", - "filament_id": "P510cfa1", + "filament_id": "OFRmGKVX", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", 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 b0a23bdd31..865d1af0c3 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 @@ -4,7 +4,7 @@ "inherits": "Cubicon PLAi21 @base", "from": "system", "setting_id": "vcLVF3cglagBfVAF", - "filament_id": "OFti31HS", + "filament_id": "OFRhBryT", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json index 43f571041e..999da52ede 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PLAi21 @base", "from": "system", "setting_id": "3TbOucKB5TGk8sXG", - "filament_id": "OFti31HS", + "filament_id": "OFRhBryT", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Mini 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json index e797ea0312..637cdb87f2 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Cubicon PLAi21 @base", "from": "system", "setting_id": "Vm1oDASHoFUfDrzQ", - "filament_id": "OFti31HS", + "filament_id": "OFRhBryT", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-Plus 0.4 nozzle" diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json index 831450deef..7c851e2a34 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json @@ -3,7 +3,7 @@ "name": "Cubicon PLAi21 @base", "inherits": "Cubicon PLA @base", "setting_id": "mnwC7ijXXV72lBOt", - "filament_id": "P510cfa2", + "filament_id": "OFdkWDiy", "instantiation": "true", "compatible_printers": [ "Cubicon xCeler-I 0.4 nozzle", diff --git a/resources/profiles/Cubicon/filament/fdm_filament_pa.json b/resources/profiles/Cubicon/filament/fdm_filament_pa.json index c2e4cf86df..b75ab9a8c9 100644 --- a/resources/profiles/Cubicon/filament/fdm_filament_pa.json +++ b/resources/profiles/Cubicon/filament/fdm_filament_pa.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pa", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFN99", "instantiation": "false", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Cubicon/filament/fdm_filament_pc.json b/resources/profiles/Cubicon/filament/fdm_filament_pc.json index 0f550063ad..120689c074 100644 --- a/resources/profiles/Cubicon/filament/fdm_filament_pc.json +++ b/resources/profiles/Cubicon/filament/fdm_filament_pc.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pc", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFC99", "instantiation": "false", "supertack_plate_temp": [ "0" diff --git a/resources/profiles/Cubicon/filament/fdm_filament_pet.json b/resources/profiles/Cubicon/filament/fdm_filament_pet.json index 250915a07b..63996fb69a 100644 --- a/resources/profiles/Cubicon/filament/fdm_filament_pet.json +++ b/resources/profiles/Cubicon/filament/fdm_filament_pet.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pet", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "OGFG99", "instantiation": "false", "eng_plate_temp": [ "0" diff --git a/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json b/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json index d80b197394..a22562e2b4 100644 --- a/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PC @MyToolChanger.json @@ -5,7 +5,6 @@ "inherits": "Generic PC @System", "from": "system", "setting_id": "HMOa2jbj19Xjipt5", - "filament_id": "GFC99", "instantiation": "true", "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 693551c428..d53c8ac746 100644 --- a/resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PETG @MyToolChanger.json @@ -5,7 +5,6 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "4qShNrl9EWAVBfeG", - "filament_id": "GFG99", "instantiation": "true", "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 cf1db6e225..a2a12da874 100644 --- a/resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PLA @MyToolChanger.json @@ -5,7 +5,6 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "WbAYFZdqFwEZnNAX", - "filament_id": "GFL99", "instantiation": "true", "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 6ae729d622..eca53185a9 100644 --- a/resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PLA-CF @MyToolChanger.json @@ -5,7 +5,6 @@ "inherits": "Generic PLA-CF @System", "from": "system", "setting_id": "53UFt3Q63NB0ztlP", - "filament_id": "GFL98", "instantiation": "true", "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 ccb6d16c73..2356b4a053 100644 --- a/resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic PVA @MyToolChanger.json @@ -5,7 +5,6 @@ "inherits": "Generic PVA @System", "from": "system", "setting_id": "dyOUyXNOKP1VmSal", - "filament_id": "GFS99", "instantiation": "true", "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 c88ee2da7d..2527ff824e 100644 --- a/resources/profiles/Custom/filament/Generic TPU @MyToolChanger.json +++ b/resources/profiles/Custom/filament/Generic TPU @MyToolChanger.json @@ -5,7 +5,6 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "H45dfn4BGdLAx9nN", - "filament_id": "GFU99", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json b/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json index e32baac8f9..713eac979d 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json +++ b/resources/profiles/DeltaMaker/filament/DeltaMaker Brand PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "bvZOHe5ejWqBALPQ", - "filament_id": "OFxodd2u", + "filament_id": "OFRpAZ1P", "instantiation": "true", "filament_flow_ratio": [ "0.987" diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PETG.json b/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PETG.json index 32980cb53e..94a2707c85 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PETG.json +++ b/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "qlQo6a93esZv2l9a", - "filament_id": "GFG99", + "filament_id": "OF4oCRKe", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PLA.json b/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PLA.json index d4b8ab071c..5a130f9040 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PLA.json +++ b/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "gfxr3MiE4uI2Xxy7", - "filament_id": "GFL99", + "filament_id": "OFifxPW1", "instantiation": "true", "filament_flow_ratio": [ "0.987" diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic TPU.json b/resources/profiles/DeltaMaker/filament/DeltaMaker Generic TPU.json index e971b6884c..3d02e90708 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic TPU.json +++ b/resources/profiles/DeltaMaker/filament/DeltaMaker Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "2L1U33wC0LofrMWs", - "filament_id": "GFB99", + "filament_id": "OFbt04e0", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json index 273eb70ec5..90d7a3e8af 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json +++ b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json @@ -4,7 +4,7 @@ "inherits": "Dremel Generic PLA", "from": "system", "setting_id": "weKWPiNIe3TmOXRn", - "filament_id": "OFUYjPc4", + "filament_id": "OFD2JNS1", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json index 822f95fe2c..3fbcaefaa1 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json +++ b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json @@ -4,7 +4,7 @@ "inherits": "Dremel Generic PLA", "from": "system", "setting_id": "kZAEjhLS29WQeyf1", - "filament_id": "OFUYjPc4", + "filament_id": "OFD2JNS1", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json index 62373995e2..0b0f6b155f 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json +++ b/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json @@ -4,7 +4,7 @@ "inherits": "Dremel Generic PLA", "from": "system", "setting_id": "pIlkZjNrXnHJDszp", - "filament_id": "OFUYjPc4", + "filament_id": "OFD2JNS1", "instantiation": "true", "slow_down_min_speed": "10", "close_fan_the_first_x_layers": "3", diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA.json b/resources/profiles/Dremel/filament/Dremel Generic PLA.json index b5263d20f3..d46a8cebfa 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA.json +++ b/resources/profiles/Dremel/filament/Dremel Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "blJERdJqaaRmRdD4", - "filament_id": "GFL99", + "filament_id": "OFaU2JxD", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo ABS @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo ABS @base.json index 86b533bba1..43c786705e 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo ABS @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo ABS @base.json @@ -3,7 +3,7 @@ "name": "Elegoo ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "EABSB00", + "filament_id": "OFxOHhZw", "instantiation": "false", "filament_vendor": [ "Elegoo" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo ASA @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo ASA @base.json index c48b5e5671..ea910dec86 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo ASA @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo ASA @base.json @@ -3,7 +3,7 @@ "name": "Elegoo ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "EASAB00", + "filament_id": "OFobDOW5", "instantiation": "false", "filament_vendor": [ "Elegoo" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json index bc100dfe2f..155d6f8290 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo ASA-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo ASA-CF @base", "inherits": "Elegoo ASA @base", "from": "system", - "filament_id": "OFAiqi5v", + "filament_id": "OFryjl35", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT @base.json index 87907a36f8..a05ee2347c 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PAHT @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "EPAHTB00", + "filament_id": "OF0h7ERL", "instantiation": "false", "filament_density": [ "1.25" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PC @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PC @base.json index d60048b30a..ecaac93aaf 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PC @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PC @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "EPCB00", + "filament_id": "OFUyDDNv", "instantiation": "false", "filament_density": [ "1.25" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json index 9aeb40e0a8..91034fda41 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PC-FR @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PC-FR @base", "inherits": "Elegoo PC @base", "from": "system", - "filament_id": "OFzFbFcl", + "filament_id": "OFlsTpJG", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json index 6290eba7f9..c1b9e78897 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PET-CF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFSCm6pJ", + "filament_id": "OFV5tNw6", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG @base.json index 29d83df77a..ec92793955 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "EPETGB00", + "filament_id": "OFLcd093", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json index ba3e4715a3..9645c4572f 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG HF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG HF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFxjFYxE", + "filament_id": "OFlP3KWq", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json index 4df7589911..ec604d722c 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG PRO @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG PRO @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFmOWC74", + "filament_id": "OFOsHDnB", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json index b75929e76a..2d7d0f9777 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG Translucent @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG Translucent @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFOkTA0C", + "filament_id": "OF6Ll8lK", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json index 3a3b837513..60a643b2a3 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG-CF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFiyGNbI", + "filament_id": "OFuUuIhR", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json index e7020a00bf..3ff4b96375 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PETG-GF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PETG-GF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFBvxnjM", + "filament_id": "OFmveLWz", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA @base.json index 40e594ee62..8965bae8e1 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA @base.json @@ -3,7 +3,7 @@ "name": "Elegoo PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "EPLAB00", + "filament_id": "OFvgE0Zh", "instantiation": "false", "filament_density": [ "1.25" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json index 42f77b0b2b..93c52a3382 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Basic @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Basic @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFHtQDC9", + "filament_id": "OFm06H6V", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json index ef7c46673d..a25fcf8daa 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Galaxy @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Galaxy @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OF09vOcG", + "filament_id": "OFU1zPxE", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json index cffd7b0185..a07012d83b 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Glow @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Glow @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFuXkYly", + "filament_id": "OFjPXrXO", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json index bda871cae8..b8990a7c1b 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Marble @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Marble @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFbYP6Wb", + "filament_id": "OFfuhviw", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json index a216c20e7c..0394308e99 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Matte @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Matte @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFwyqcGn", + "filament_id": "OFsB2lxm", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json index d6d1e30e6c..731f5c5ca4 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA PRO @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA PRO @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFklg4aM", + "filament_id": "OF1hznGB", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json index b0ba1af2d6..e708794eea 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Silk @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Silk @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFkfK62J", + "filament_id": "OFXz7Mwx", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json index 1120084d6a..cc292ac240 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Sparkle @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Sparkle @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFaKIoH2", + "filament_id": "OFhcYzR8", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json index d06d60e5cc..c0e2e23dfe 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Translucent2 @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Translucent2 @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFcqs5g7", + "filament_id": "OFn1QaY3", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json index ab43fb2bf2..4e3362a5d3 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA Wood @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA Wood @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFh5GUhZ", + "filament_id": "OFWYtgCa", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json index 028fd42383..f90355d85c 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA+ @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA+ @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFDMWB6t", + "filament_id": "OFBUIlZ7", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json index 706b60f0c9..4f4979d95f 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PLA-CF @base.json @@ -3,6 +3,6 @@ "name": "Elegoo PLA-CF @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFuPC4S8", + "filament_id": "OFln72PT", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json index 5eeb29bad3..e328cf0a75 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PETG @base.json @@ -3,6 +3,6 @@ "name": "Elegoo Rapid PETG @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OF3arl18", + "filament_id": "OFLXvuMr", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json index b83fe4b688..06fd489c41 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid PLA+ @base.json @@ -3,6 +3,6 @@ "name": "Elegoo Rapid PLA+ @base", "inherits": "Elegoo PLA @base", "from": "system", - "filament_id": "OFAHagT9", + "filament_id": "OFkhhUS0", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json index fe1bae90a0..58cec037c3 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json @@ -3,6 +3,6 @@ "name": "Elegoo Rapid TPU 95A @base", "inherits": "Elegoo TPU @base", "from": "system", - "filament_id": "OFL4KniM", + "filament_id": "OF30Ftju", "instantiation": "false" } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo TPU @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo TPU @base.json index 99ed8dc8e9..08bd3d93af 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo TPU @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo TPU @base.json @@ -3,7 +3,7 @@ "name": "Elegoo TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "ETPUB00", + "filament_id": "OFmhJs5V", "instantiation": "false", "filament_max_volumetric_speed": [ "3.6" diff --git a/resources/profiles/Elegoo/filament/BASE/Generic ABS @base.json b/resources/profiles/Elegoo/filament/BASE/Generic ABS @base.json index 5607709da7..1c6c0dffaf 100644 --- a/resources/profiles/Elegoo/filament/BASE/Generic ABS @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Generic ABS @base.json @@ -3,7 +3,7 @@ "name": "Generic ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GABSB00", + "filament_id": "OFY9muEs", "instantiation": "false", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Elegoo/filament/BASE/Generic ASA @base.json b/resources/profiles/Elegoo/filament/BASE/Generic ASA @base.json index d2f0c4672b..5c1ac04bd9 100644 --- a/resources/profiles/Elegoo/filament/BASE/Generic ASA @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Generic ASA @base.json @@ -3,7 +3,7 @@ "name": "Generic ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GASAB00", + "filament_id": "OFLPAxz3", "instantiation": "false", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Elegoo/filament/BASE/Generic PA @base.json b/resources/profiles/Elegoo/filament/BASE/Generic PA @base.json index e130cbf2e2..c9cae649dc 100644 --- a/resources/profiles/Elegoo/filament/BASE/Generic PA @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Generic PA @base.json @@ -3,7 +3,7 @@ "name": "Generic PA @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GPAB00", + "filament_id": "OFg8ndtj", "instantiation": "false", "chamber_temperatures": [ "60" diff --git a/resources/profiles/Elegoo/filament/BASE/Generic PC @base.json b/resources/profiles/Elegoo/filament/BASE/Generic PC @base.json index 71850f98a9..b07248a643 100644 --- a/resources/profiles/Elegoo/filament/BASE/Generic PC @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Generic PC @base.json @@ -3,7 +3,7 @@ "name": "Generic PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GPCB00", + "filament_id": "OFLakOUI", "instantiation": "false", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Elegoo/filament/BASE/Generic PET @base.json b/resources/profiles/Elegoo/filament/BASE/Generic PET @base.json index 61a6f03b96..e3af7115ae 100644 --- a/resources/profiles/Elegoo/filament/BASE/Generic PET @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Generic PET @base.json @@ -3,7 +3,7 @@ "name": "Generic PET @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GPETB00", + "filament_id": "OF6MOPWx", "instantiation": "false", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Elegoo/filament/BASE/Generic PETG @base.json b/resources/profiles/Elegoo/filament/BASE/Generic PETG @base.json index 046d0dab90..e22cd697f8 100644 --- a/resources/profiles/Elegoo/filament/BASE/Generic PETG @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Generic PETG @base.json @@ -3,7 +3,7 @@ "name": "Generic PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GPETGB00", + "filament_id": "OFYPdQJh", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Elegoo/filament/BASE/Generic PLA @base.json b/resources/profiles/Elegoo/filament/BASE/Generic PLA @base.json index b9b1b0299c..0116649a9b 100644 --- a/resources/profiles/Elegoo/filament/BASE/Generic PLA @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Generic PLA @base.json @@ -3,7 +3,7 @@ "name": "Generic PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GPLAB00", + "filament_id": "OFDSrzZ8", "instantiation": "false", "filament_density": [ "1.25" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json b/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json index 7931a6604e..4f1fd0d973 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic ABS-CF @Elegoo Centauri.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @base", "from": "system", "setting_id": "fRiriEvlcxDDO5tc", - "filament_id": "OFo4VB3w", + "filament_id": "OFAIBCLJ", "instantiation": "true", "nozzle_temperature": [ "260" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic ASA-CF @Elegoo Centauri.json b/resources/profiles/Elegoo/filament/Generic/Generic ASA-CF @Elegoo Centauri.json index 1fe2791869..b51663338a 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic ASA-CF @Elegoo Centauri.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic ASA-CF @Elegoo Centauri.json @@ -4,6 +4,7 @@ "inherits": "Generic ASA @base", "from": "system", "setting_id": "S5kHIMcORjlPRnVs", + "filament_id": "OF53eLVD", "instantiation": "true", "filament_type": [ "ASA-CF" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json index 5fa54d9eb4..a0a9f7705f 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PA6-CF @Elegoo.json @@ -4,7 +4,7 @@ "inherits": "Generic PA @base", "from": "system", "setting_id": "TPgpyakWZ7NjVnj5", - "filament_id": "OFk388hR", + "filament_id": "OFhTPf6L", "instantiation": "true", "fan_min_speed": [ "10" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json b/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json index 479ae9f275..a06d9fec40 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PC-CF @Elegoo.json @@ -4,7 +4,7 @@ "inherits": "Generic PC @base", "from": "system", "setting_id": "KMhdBJbiUeXxKgPS", - "filament_id": "OFypQeKR", + "filament_id": "OFafO6VM", "instantiation": "true", "filament_type": [ "PC-CF" diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json b/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json index b7542f46f7..a3b8082643 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PET-CF @Elegoo Centauri.json @@ -4,7 +4,7 @@ "inherits": "Generic PET @base", "from": "system", "setting_id": "Q6wiKjigmzkcMxFz", - "filament_id": "OF0TODnN", + "filament_id": "OFQdaVZS", "instantiation": "true", "filament_type": [ "PET-CF" 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 fc750fdcc6..f122066617 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PETG PRO @Elegoo.json @@ -4,7 +4,7 @@ "name": "Generic PETG PRO @Elegoo", "renamed_from": "Elegoo Generic PETG PRO", "from": "system", - "filament_id": "OFhKNHC8", + "filament_id": "OFllmFhT", "instantiation": "true", "inherits": "Generic PETG @base", "cool_plate_temp": [ diff --git a/resources/profiles/Elegoo/filament/Generic/Generic PETG-CF @Elegoo Centauri.json b/resources/profiles/Elegoo/filament/Generic/Generic PETG-CF @Elegoo Centauri.json index 5e5e84e3dd..a57b29cbb6 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PETG-CF @Elegoo Centauri.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PETG-CF @Elegoo Centauri.json @@ -4,6 +4,7 @@ "inherits": "Generic PETG @base", "from": "system", "setting_id": "bWUrg1tIttzhMYlr", + "filament_id": "OFoYSJKi", "instantiation": "true", "filament_type": [ "PETG-CF" 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 aee418bd18..33561c23bc 100644 --- a/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json +++ b/resources/profiles/Elegoo/filament/Generic/Generic PLA Matte @Elegoo.json @@ -3,7 +3,7 @@ "setting_id": "dH2Yf92iqsOj5XYo", "name": "Generic PLA Matte @Elegoo", "from": "system", - "filament_id": "OFsLkLw6", + "filament_id": "OFmY0l6t", "instantiation": "true", "inherits": "Generic PLA @base", "cool_plate_temp": [ diff --git a/resources/profiles/Eryone/filament/Eryone ABS-CF.json b/resources/profiles/Eryone/filament/Eryone ABS-CF.json index bb976dcd88..a6cc92c15d 100644 --- a/resources/profiles/Eryone/filament/Eryone ABS-CF.json +++ b/resources/profiles/Eryone/filament/Eryone ABS-CF.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "f4VPJtNcZOIIKyDz", - "filament_id": "EFL81", + "filament_id": "OFQ1zgm3", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone ABS.json b/resources/profiles/Eryone/filament/Eryone ABS.json index c09a35d34e..1d42db775b 100644 --- a/resources/profiles/Eryone/filament/Eryone ABS.json +++ b/resources/profiles/Eryone/filament/Eryone ABS.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "JfQiR5qK9Ue3JDt5", - "filament_id": "EFL91", + "filament_id": "OFOzwywz", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone ASA-CF.json b/resources/profiles/Eryone/filament/Eryone ASA-CF.json index afe2d3b33e..c95302c16a 100644 --- a/resources/profiles/Eryone/filament/Eryone ASA-CF.json +++ b/resources/profiles/Eryone/filament/Eryone ASA-CF.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "wSiMHM1kTIgJ2gCt", - "filament_id": "EFL82", + "filament_id": "OFwyt1xt", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone ASA.json b/resources/profiles/Eryone/filament/Eryone ASA.json index 88afccbe26..7c2b9d9c91 100644 --- a/resources/profiles/Eryone/filament/Eryone ASA.json +++ b/resources/profiles/Eryone/filament/Eryone ASA.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "hu9uQy9zFgemTBjQ", - "filament_id": "EFL92", + "filament_id": "OFVtIasg", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PA-CF.json b/resources/profiles/Eryone/filament/Eryone PA-CF.json index abaf44eb7d..d91ea8a490 100644 --- a/resources/profiles/Eryone/filament/Eryone PA-CF.json +++ b/resources/profiles/Eryone/filament/Eryone PA-CF.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "LIXTvjHAxtaHIO8s", - "filament_id": "EFL72", + "filament_id": "OFp9wdmf", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PA-GF.json b/resources/profiles/Eryone/filament/Eryone PA-GF.json index 15ae055010..657d86b291 100644 --- a/resources/profiles/Eryone/filament/Eryone PA-GF.json +++ b/resources/profiles/Eryone/filament/Eryone PA-GF.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "4srMOoPcAlQygIY8", - "filament_id": "EFL73", + "filament_id": "OFkq7rPy", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PA.json b/resources/profiles/Eryone/filament/Eryone PA.json index efcbc94393..b03dccd32f 100644 --- a/resources/profiles/Eryone/filament/Eryone PA.json +++ b/resources/profiles/Eryone/filament/Eryone PA.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "oqzAdvvf6jdQTb4M", - "filament_id": "EFL71", + "filament_id": "OFS4jbj3", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PETG-CF.json b/resources/profiles/Eryone/filament/Eryone PETG-CF.json index 76eca543b5..3dc02ddf00 100644 --- a/resources/profiles/Eryone/filament/Eryone PETG-CF.json +++ b/resources/profiles/Eryone/filament/Eryone PETG-CF.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "Xp95jFFK5QSP3OoR", - "filament_id": "EFL43", + "filament_id": "OFNstOna", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PETG.json b/resources/profiles/Eryone/filament/Eryone PETG.json index 3f0644565a..ee6b20423a 100644 --- a/resources/profiles/Eryone/filament/Eryone PETG.json +++ b/resources/profiles/Eryone/filament/Eryone PETG.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "rJCPgQiIXRsfQwWY", - "filament_id": "EFL93", + "filament_id": "OF8kJys9", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PLA-CF.json b/resources/profiles/Eryone/filament/Eryone PLA-CF.json index 3e7e8fa3d7..a3186cee9f 100644 --- a/resources/profiles/Eryone/filament/Eryone PLA-CF.json +++ b/resources/profiles/Eryone/filament/Eryone PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "t726eLsJ87OjqUYk", - "filament_id": "EFL40", + "filament_id": "OFilAA3b", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PLA.json b/resources/profiles/Eryone/filament/Eryone PLA.json index 6da685ff2f..8e23c19ade 100644 --- a/resources/profiles/Eryone/filament/Eryone PLA.json +++ b/resources/profiles/Eryone/filament/Eryone PLA.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "nTSleDxF7HWxBeK9", - "filament_id": "EFL90", + "filament_id": "OFmKU2Ha", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PP-CF.json b/resources/profiles/Eryone/filament/Eryone PP-CF.json index e2a9c492cf..1f5e155b55 100644 --- a/resources/profiles/Eryone/filament/Eryone PP-CF.json +++ b/resources/profiles/Eryone/filament/Eryone PP-CF.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "GuuXzP9ILCWG5cxt", - "filament_id": "EFL33", + "filament_id": "OFbh7HcA", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone PP.json b/resources/profiles/Eryone/filament/Eryone PP.json index ffca123024..abd35e11e3 100644 --- a/resources/profiles/Eryone/filament/Eryone PP.json +++ b/resources/profiles/Eryone/filament/Eryone PP.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "sZF6qOPqqu88Yu5e", - "filament_id": "OFf0JIqs", + "filament_id": "OF5oNRED", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone Silk PLA.json b/resources/profiles/Eryone/filament/Eryone Silk PLA.json index 2edfd832c1..40a6bd252b 100644 --- a/resources/profiles/Eryone/filament/Eryone Silk PLA.json +++ b/resources/profiles/Eryone/filament/Eryone Silk PLA.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "S3s3NQAoScvfyHh3", - "filament_id": "EFL941", + "filament_id": "OF7nBAd3", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/Eryone/filament/Eryone TPU.json b/resources/profiles/Eryone/filament/Eryone TPU.json index 6bfd555337..c44d357c84 100644 --- a/resources/profiles/Eryone/filament/Eryone TPU.json +++ b/resources/profiles/Eryone/filament/Eryone TPU.json @@ -4,7 +4,7 @@ "inherits": "Eryone Standard PLA", "from": "system", "setting_id": "ci6MWQPZNf09qrOJ", - "filament_id": "EFL95", + "filament_id": "OFhUjPA5", "instantiation": "true", "compatible_printers": [ "Thinker X400 0.4 nozzle" diff --git a/resources/profiles/FLSun/filament/FLSun Generic ABS.json b/resources/profiles/FLSun/filament/FLSun Generic ABS.json index 82d91d891c..848034b3e1 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic ABS.json +++ b/resources/profiles/FLSun/filament/FLSun Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "2f9nYaR0PUMkGvDD", - "filament_id": "GFB99", + "filament_id": "OFWof1Ap", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/FLSun/filament/FLSun Generic ASA.json b/resources/profiles/FLSun/filament/FLSun Generic ASA.json index 650953c7b0..bbea739d1d 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic ASA.json +++ b/resources/profiles/FLSun/filament/FLSun Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "9GPCRihSQTBRxkm3", - "filament_id": "GFB98", + "filament_id": "OFCcsYtf", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PA-CF.json b/resources/profiles/FLSun/filament/FLSun Generic PA-CF.json index 0b3441d866..65f3c06b99 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PA-CF.json +++ b/resources/profiles/FLSun/filament/FLSun Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "2JOA0YeYZHj0lFmA", - "filament_id": "GFN98", + "filament_id": "OFHQUAoZ", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PA.json b/resources/profiles/FLSun/filament/FLSun Generic PA.json index e24fbbd966..8f9908acbc 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PA.json +++ b/resources/profiles/FLSun/filament/FLSun Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "ek14AgskfJXeZ84u", - "filament_id": "GFN99", + "filament_id": "OFeJjoKF", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PC.json b/resources/profiles/FLSun/filament/FLSun Generic PC.json index 2d03d67063..4a111e609f 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PC.json +++ b/resources/profiles/FLSun/filament/FLSun Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "wluYSRtaCqajFCYT", - "filament_id": "GFC99", + "filament_id": "OFVqZ2H0", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PETG.json b/resources/profiles/FLSun/filament/FLSun Generic PETG.json index 6b81b49092..f0cf97956e 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PETG.json +++ b/resources/profiles/FLSun/filament/FLSun Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "FCjlzoLFYn3IVxxD", - "filament_id": "GFG99", + "filament_id": "OFJJpaLS", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json b/resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json index 690c4427f9..3aefb8ea4a 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json +++ b/resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "FEdplifUKOSUA4XX", - "filament_id": "GFL98", + "filament_id": "OFsF96Gt", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PLA.json b/resources/profiles/FLSun/filament/FLSun Generic PLA.json index 85233e1285..abc2303137 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PLA.json +++ b/resources/profiles/FLSun/filament/FLSun Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ltWBfkc84nszWS19", - "filament_id": "GFL99", + "filament_id": "OFJSksUs", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PVA.json b/resources/profiles/FLSun/filament/FLSun Generic PVA.json index 106aa001e0..30defb2258 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PVA.json +++ b/resources/profiles/FLSun/filament/FLSun Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "IohayLPyRIsZJ0GY", - "filament_id": "GFS99", + "filament_id": "OFtP1rqJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/FLSun/filament/FLSun Generic TPU.json b/resources/profiles/FLSun/filament/FLSun Generic TPU.json index 60b05b8134..63e0826eef 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic TPU.json +++ b/resources/profiles/FLSun/filament/FLSun Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "hewisceC8FmSwzF4", - "filament_id": "GFU99", + "filament_id": "OFMoLF46", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/FLSun/filament/FLSun S1 ABS.json b/resources/profiles/FLSun/filament/FLSun S1 ABS.json index d9a3922199..f796202c3e 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ABS.json +++ b/resources/profiles/FLSun/filament/FLSun S1 ABS.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic ABS", "from": "system", "setting_id": "tvpZ28Oe4Al7hlgj", - "filament_id": "GFB99", + "filament_id": "OFzzmK2Q", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun S1 ASA.json b/resources/profiles/FLSun/filament/FLSun S1 ASA.json index a82c9179a4..fed430ca63 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ASA.json +++ b/resources/profiles/FLSun/filament/FLSun S1 ASA.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic ASA", "from": "system", "setting_id": "C5oyaWw3YVEz0CgE", - "filament_id": "GFB98", + "filament_id": "OFIK0xFa", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PETG.json b/resources/profiles/FLSun/filament/FLSun S1 PETG.json index 3b477c6335..cf6a506da0 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PETG.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PETG.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PETG", "from": "system", "setting_id": "Ac6q0FtMFMLesFdU", - "filament_id": "GFG99", + "filament_id": "OF9z5LZ9", "instantiation": "true", "fan_max_speed": [ "60" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json b/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json index f6324b0bc3..8115a9cec6 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "z0Y9rQVZairHqwbi", - "filament_id": "GFL99", + "filament_id": "OFoDgVnY", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json b/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json index 91e22b993c..8d9d662dda 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "v2clpNXXo8m6dV33", - "filament_id": "OFR8dTVW", + "filament_id": "OFoqrHTw", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json index 9536db0750..70946da40c 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "164Bn4YchxJAaLsa", - "filament_id": "OFFenwbU", + "filament_id": "OFSStjay", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun S1 TPU.json b/resources/profiles/FLSun/filament/FLSun S1 TPU.json index 7a02ed84cf..0b3e6a00ee 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 TPU.json +++ b/resources/profiles/FLSun/filament/FLSun S1 TPU.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic TPU", "from": "system", "setting_id": "yzPvNqIo7mfWAwNS", - "filament_id": "GFU99", + "filament_id": "OF6ooviO", "instantiation": "true", "fan_max_speed": [ "100" diff --git a/resources/profiles/FLSun/filament/FLSun T1 ABS.json b/resources/profiles/FLSun/filament/FLSun T1 ABS.json index e7d8bea77a..fe7c8c15c8 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ABS.json +++ b/resources/profiles/FLSun/filament/FLSun T1 ABS.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic ABS", "from": "system", "setting_id": "GP8VqRfidKOdj0ZJ", - "filament_id": "GFB99", + "filament_id": "OFV0KrAG", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun T1 ASA.json b/resources/profiles/FLSun/filament/FLSun T1 ASA.json index c34c34a213..4633c41271 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ASA.json +++ b/resources/profiles/FLSun/filament/FLSun T1 ASA.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic ASA", "from": "system", "setting_id": "YmJbWfCQpNk9nxB7", - "filament_id": "GFB98", + "filament_id": "OFbjtPQy", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PETG.json b/resources/profiles/FLSun/filament/FLSun T1 PETG.json index 9b753af05b..869df6e538 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PETG.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PETG.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PETG", "from": "system", "setting_id": "A2aA7xcmqgz8ERyY", - "filament_id": "GFG99", + "filament_id": "OFJ80y1e", "instantiation": "true", "fan_max_speed": [ "60" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json b/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json index e266687037..16e048d536 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "aUMHmlsPMYDicnPp", - "filament_id": "GFL99", + "filament_id": "OFU0n0zW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json b/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json index a1316569c2..2d612ce865 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "E4lpSLLlAxUW04ik", - "filament_id": "OFyt23xJ", + "filament_id": "OFQ9qnkd", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json index b76f537a45..e2a7bbeca2 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic PLA", "from": "system", "setting_id": "gElUb4GnCoEfVlEd", - "filament_id": "OFt1YdX8", + "filament_id": "OFuUJyRx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 TPU.json b/resources/profiles/FLSun/filament/FLSun T1 TPU.json index feb8326a22..63813ae149 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 TPU.json +++ b/resources/profiles/FLSun/filament/FLSun T1 TPU.json @@ -4,7 +4,7 @@ "inherits": "FLSun Generic TPU", "from": "system", "setting_id": "34Ux18VB4d6R6G40", - "filament_id": "GFU99", + "filament_id": "OFENzGSm", "instantiation": "true", "fan_max_speed": [ "100" 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 3971dfdbe0..76629e1a35 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "M9HM8tihJzV4crs8", - "filament_id": "OFL7vEML", + "filament_id": "OFe6sfXS", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 ada99c3b7a..e9a09ff347 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "08VjBSha6gjhJYgk", - "filament_id": "OFL7vEML", + "filament_id": "OFe6sfXS", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 224f0bcecf..1572171a0b 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "JqgkmxnjlnQ3uw1u", - "filament_id": "OFL7vEML", + "filament_id": "OFe6sfXS", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 e712311eb7..5613453b3a 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "vvLLPvSeb5PYbT1R", - "filament_id": "OFL7vEML", + "filament_id": "OFe6sfXS", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 2e574b8dec..13e5f089fd 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "mPJMPfFCyfWdKzMO", - "filament_id": "OFL7vEML", + "filament_id": "OFe6sfXS", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 f3e61a04b2..35dc675173 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "HTgqTUTznOlfCRAd", - "filament_id": "OFL7vEML", + "filament_id": "OFe6sfXS", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" 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 cc05448a52..2dfa04cea8 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "3w8fnDjkoFaJ6Nhw", - "filament_id": "OFgJX0Fc", + "filament_id": "OFUCpLaL", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 0ba30d9ee6..2fbb2e4ceb 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "owHbDqY55rFtSegz", - "filament_id": "OFgJX0Fc", + "filament_id": "OFUCpLaL", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 29ffe9c98e..50e2e88ee4 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "eFK1zzT1JY9ZnEl9", - "filament_id": "OFgJX0Fc", + "filament_id": "OFUCpLaL", "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 ae67869d15..667e3e9b01 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "E8CcstoHzax78ZJY", - "filament_id": "OFgJX0Fc", + "filament_id": "OFUCpLaL", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 44ca312535..673304a79c 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "xa22FD8bRVGsLiPJ", - "filament_id": "OFgJX0Fc", + "filament_id": "OFUCpLaL", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 d6fe454c37..dd2d7b107b 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "bZ9dbA8dIu9mjWyN", - "filament_id": "OFgJX0Fc", + "filament_id": "OFUCpLaL", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 0e1dfd9b33..34d7bfb528 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "4w0oK3F50O1DUqsu", - "filament_id": "OFmduKVr", + "filament_id": "OFogbnCb", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 6133699c0b..14a76bbdae 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 @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "94vPnztRcpnbfAKx", - "filament_id": "OFmduKVr", + "filament_id": "OFogbnCb", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json index 6f8cf9429f..cd32fec949 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json @@ -3,7 +3,7 @@ "name": "Flashforge ABS @FF AD5M 0.25 Nozzle", "inherits": "Flashforge Generic ABS", "from": "system", - "filament_id": "GFB99", + "filament_id": "OF5SJ3jz", "instantiation": "false", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json index 1abb4f5e51..836cd00898 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "SuEfcE6AYK8N1FI4", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json index 523d9d05dd..39cbd2de77 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "gmkc6fRLMI73Iut8", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "instantiation": "true", "filament_vendor": [ "Generic" 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 bb30b1725b..dcf7ef2ea3 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "fgEYZ1Mgyp1AvtwU", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 a426566340..c77a70a68c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "cIxbQMVdG5K85rJr", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 bbfa73ccd4..421b590ffd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "9GXBeuCUrScJfmJB", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 b9251a5672..0e39fc998e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "ds0GgE1jssl4IbF3", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 0ab31a8276..4394ed643a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UTWbwTYuXYbBx3uw", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json index 825a80c96d..ec7afd1806 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "CuckX5MsN69806ow", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "instantiation": "true", "filament_vendor": [ "Generic" 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 f9a0433cae..9cb888633d 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "NttDJCrfB01uwMDl", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 171484abbb..37946c87cd 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "hJd6dG6OdEffEFC7", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 7143e0b03a..853695c79f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "8yFCuCnEuI3dUvQy", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 2734feeb55..40d28d88ed 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "np4fP5kghRlczOTT", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 a669c267b9..bfc919b8a4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "8o2maTFOXq0XR6Dm", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json index 3488e5bec6..dea33f9ccb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "MBo02hFXn0ebDRdb", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "instantiation": "true", "filament_vendor": [ "Generic" 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 bbf04ce6bd..108219a5e8 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "vCsjC0UnKenzIR0O", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 29fb16653b..b477796207 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "xhxVdlmh5r7meoHo", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 1ef697a83b..85bd777649 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "6dlQN4Xhd6kGZ0Qn", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 12d1a7c767..ae87f2228c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "r8WVFPozL8f5oLVJ", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 798bc592bb..4486a2e487 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "xw0pZNmhw1K4tPQ1", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 868e133f3e..d14e7a563f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "m6QLC2UaS3fW298i", - "filament_id": "OF5T1Y9R", + "filament_id": "OFShw1X8", "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 4ea4ae4577..e5c075681b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "Nx3Px0Zu356IKShT", - "filament_id": "OFWs8KIZ", + "filament_id": "OFi7Bf0F", "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 f1917abb9a..9fd47a1c35 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "d4EGsmMeEDCOUBF2", - "filament_id": "OFWs8KIZ", + "filament_id": "OFi7Bf0F", "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 b925f68e88..802dfebe5e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "9ziPFKsjESbw1pXL", - "filament_id": "OFWs8KIZ", + "filament_id": "OFi7Bf0F", "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 03194dd913..37f8d3d731 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "NzJJs6yrSik5xuyX", - "filament_id": "OFWs8KIZ", + "filament_id": "OFi7Bf0F", "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 1074c58061..dd285b07f6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UinlbuXNbad2kN0s", - "filament_id": "OFqRWRU6", + "filament_id": "OFH5UH6P", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 e4f1909d8a..0244b1fa25 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "ycgiXY41kqNgslE3", - "filament_id": "OFqRWRU6", + "filament_id": "OFH5UH6P", "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 0f80d06af9..dd3efcaef3 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 @@ -3,7 +3,7 @@ "name": "Flashforge ASA @FF AD5M 0.25 Nozzle", "inherits": "Flashforge Generic ASA", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFtTYl9Q", "instantiation": "false", "compatible_printers": [ "Flashforge Adventurer 5M 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 6a0253be4a..665b49d497 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "kjS4k8nrIdNNNoWw", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 618cfdea27..42c9955886 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "Y647IFVkk5JIXzte", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 eb123cc3ad..19b021358e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "vaOyXUcrJ97KE7ZW", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 2e7ff56b63..1f0bc87211 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "iLWq5pJ3ox9EAM1Z", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 a63e1c7dfe..37be38511c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "i7PUPYxy0Z9weyyA", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 3aef25a533..48e7c83322 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UUSDyOetXSOuBIUd", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 bcbd9d4721..886c3cf0c1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "2r0kwhklE24Hp94O", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json index 0ce215f69a..52420cb125 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "XWta5jJFsCxBdEPd", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "instantiation": "true", "filament_vendor": [ "Generic" 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 3bff670e7c..34a50c950e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "w8O6oenp0NymzCqf", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 8fcf3f85f7..1abb8bb623 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "thhmWRzNYLYJOeR2", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 664728993c..c75ee648aa 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "g5jiz6Q6or23BIo7", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 fb7e77b65a..fd012e0f33 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "7xmWlHHNMvXBKdYS", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 35e761b241..d6f71b0a72 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "r0B8KfZ1mNWMvGqE", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json index cd5b00cfe6..7a8035000c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "quOwRRLcNfOy0sYf", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "instantiation": "true", "filament_vendor": [ "Generic" 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 616e70bf34..82cbd340b7 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "CBLZqLhkwf5XKO12", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 75777b3205..ec26d6d236 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "Df3anJxiRXLVO9hw", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 401ffeabaa..016a57fd14 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "Nu4WvBWuEhazZfh5", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 9e6b37e48c..d24743172c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "hF0h4ye3hMDtEba1", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 761dd56a4c..a523291c0e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "3isZCWr4CBjFtGDX", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 b56e5b0453..5fb5d976eb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "SU6r879TbQMUFCij", - "filament_id": "OFcy60o4", + "filament_id": "OFaBwRvT", "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 e465ad0da8..5cd421f15c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "TqU1elqwuVr9EhTA", - "filament_id": "OFM3PeVe", + "filament_id": "OFq0TY7C", "instantiation": "true", "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 ec34e23dcb..c61eb8159b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "nMczAtoc5W0J2WkS", - "filament_id": "OFM3PeVe", + "filament_id": "OFq0TY7C", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json index 2a33b88234..3645546f16 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "ap7X4nWKfFR53NT0", - "filament_id": "OFM3PeVe", + "filament_id": "OFq0TY7C", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json index f07085eb07..f001e6d54c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "kZXg6odPm5iW79Qn", - "filament_id": "OFM3PeVe", + "filament_id": "OFq0TY7C", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json index b124ce423d..af262a6497 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "CI5dvVrCNk2XTU82", - "filament_id": "OFM3PeVe", + "filament_id": "OFq0TY7C", "instantiation": "true", "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 b3c448494f..e1bb924d28 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "941E5MaAyFY3iv4V", - "filament_id": "OFdNORGt", + "filament_id": "OFWnSvGu", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 e970fdff0a..0f1d63ca96 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "RdmsxyUGUX8Ot4oj", - "filament_id": "OFdNORGt", + "filament_id": "OFWnSvGu", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json index 0504844ed6..b290e46444 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "NWEY6ZxkUS8jqNU2", - "filament_id": "GFB99", + "filament_id": "OFLDSqqi", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json index ada3f13582..c49638eda5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "OaXiy7DI5bOAiaYb", - "filament_id": "GFB99", + "filament_id": "OFLDSqqi", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json index 5de9f959cc..7e53c24675 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "Cfd7Q1nGwqxI5Ngh", - "filament_id": "GFB99", + "filament_id": "OFLDSqqi", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json index 38d58ba346..e93a8a294d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "uygAzLWRQiCIJ8jh", - "filament_id": "GFB99", + "filament_id": "OFLDSqqi", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json index 510ad8c55d..a661419618 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "spSRbidSN2yeZLhD", - "filament_id": "OF4RKeng", + "filament_id": "OFRPEs5o", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json index ccae1871bc..dab6446048 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "gVLGkoCoyrWL4DQr", - "filament_id": "OF4RKeng", + "filament_id": "OFRPEs5o", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json index 1c7532543e..e1f8b58fcf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "c6IMgUyqOeS2HFWw", - "filament_id": "OF4RKeng", + "filament_id": "OFRPEs5o", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json index 9f6e882f68..0466c5af9a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "jMCunppmYOH5QIra", - "filament_id": "OF4RKeng", + "filament_id": "OFRPEs5o", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json index e6d8e037e3..c5097dca7c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "b3CFhGGnZLzpyAWa", - "filament_id": "OF4m9A5w", + "filament_id": "OFYl0c8v", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json index 56ac8dc465..31dbe0e60f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "n68nw5tzKZ0rq43O", - "filament_id": "OF4m9A5w", + "filament_id": "OFYl0c8v", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json index e95a14c2e5..4b4a6224bd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "1cvcaoBFNbg2GucE", - "filament_id": "OFYZs7dN", + "filament_id": "OFLrdHse", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json index 2989f84021..48b701953d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "foG37d7HZKgt6l43", - "filament_id": "OFYZs7dN", + "filament_id": "OFLrdHse", "instantiation": "true", "bed_temperature_difference": [ "10" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json index 4d02d458d0..9d4acd8d24 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "KerUxwPsSEKDO6jL", - "filament_id": "GFG99", + "filament_id": "OFZHgTVI", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @Flashforge Artemis.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @Flashforge Artemis.json index 20a08fe28e..4c4f2b43cc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @Flashforge Artemis.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @Flashforge Artemis.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "YflkaS7NfBE5XiSH", - "filament_id": "FFF03", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json index d9327f20f5..8b452d3759 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "W7pWKQ2EWAB5viV1", - "filament_id": "GFG99", + "filament_id": "OFZHgTVI", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json index 227d881f06..288f028eac 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "eDQb2WfDsUTvj2Nf", - "filament_id": "GFG99", + "filament_id": "OFZHgTVI", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json index ecf04bdd2b..85e54ec1a6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "yo4uc7TxQbqnlRUY", - "filament_id": "GFG99", + "filament_id": "OFZHgTVI", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json index 75a1d34349..5e5c8ebf79 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "u2OzNKIQIKUrOT9k", - "filament_id": "OFC5CCeo", + "filament_id": "OFQC8Vna", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json index d87f65a404..2a52b92e70 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "7Qq8eY1kcFHTgzW3", - "filament_id": "OFC5CCeo", + "filament_id": "OFQC8Vna", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json index b1013b2c99..3a6f44f5ff 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "gLrecba33jDI9PeI", - "filament_id": "OFC5CCeo", + "filament_id": "OFQC8Vna", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json index 7c5de370cb..c94cdfff56 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "PlC4Ek7d09ytYZqJ", - "filament_id": "OFK39W9u", + "filament_id": "OFlNWVr5", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json index 28ed60ccf7..916c392f08 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "YqiSgA018CdflfT9", - "filament_id": "GFG99", + "filament_id": "OFZHgTVI", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json index 4154eed45e..9f2a18971a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "gjIdhPTLOr17mz5B", - "filament_id": "FFG01", + "filament_id": "OFtTHNTj", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json index 34351c7dac..ad76d07bac 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "KR0LUSD7wd55oNI6", - "filament_id": "OFm1VZed", + "filament_id": "OFYlthXI", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json index 9b5972f97d..d0f628a2bb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "rQSFNxuuqUVzsSV2", - "filament_id": "OFm1VZed", + "filament_id": "OFYlthXI", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json index b6507fda5a..9ef92ee7ee 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "S1UTm2oMRoQ4yM4R", - "filament_id": "OFm1VZed", + "filament_id": "OFYlthXI", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json index 6ef0248721..9fe47dcd87 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qH3l3p0yvZHqHnwG", - "filament_id": "OFKWVi10", + "filament_id": "OFdEIwxy", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json index 61fcd364c3..a0317d1b97 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "WOl0JsKxAQFo2WnW", - "filament_id": "OFAEqlWa", + "filament_id": "OFrrMLDw", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json index f3b4f693c1..e9ac388665 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "NryK9oIg8wMDKVHW", - "filament_id": "OF41QVDH", + "filament_id": "OFYvSO1W", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json index 61b5276051..8e2d4c90c3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "DwAgYHepesazDUjN", - "filament_id": "FFG01", + "filament_id": "OFtTHNTj", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json b/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json index d94e75d3df..52bc8adcb9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "NA0PhaTNDvEH38lF", - "filament_id": "OFLeFaUO", + "filament_id": "OF1OZujR", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json index 57d88732de..4ffd4a3aee 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "zQEeIIKWSgsDqlpI", - "filament_id": "OFviQ9lH", + "filament_id": "OFC20UMj", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json index dbcf163dda..798fbc6583 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic HIPS @System", "from": "system", "setting_id": "ckwc7U0Q2eKHmCxY", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json index 38411b21ea..4abf262f2f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic HIPS @System", "from": "system", "setting_id": "AEQYrT7e4Q5J2G6C", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 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 9622514949..0370e2b2ce 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "jUNUZhE0BJyB64fC", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 1f6bec0997..44753a6a08 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "0qMEqo9YMDLSVafs", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 684f303f65..2a0a4d7898 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "ek749gIdUAPq6WxT", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 768677d41f..30704efe75 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "tEohTtyHofD6l6o3", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 f2de81ad74..cd95f618c3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "oLeLrIjFJzoZha3E", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 2468478e6a..a495959b82 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "HXGUlYY4X5IHhL3R", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 7b28d67e08..6e87c12697 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "g22Cv3zy3h5BhJYK", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 4356a46961..8c4e3c633a 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", "from": "system", "setting_id": "aDzBXuvN7IuSP5sa", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 a3cc583ed8..3349b2ec63 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "CIj24REX7BA8zPHQ", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "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 440cfd4f97..8afa83e8f4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "yAGyGjF6uDrjfjLn", - "filament_id": "OFhzHd2Y", + "filament_id": "OFaz8VoR", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json index 8a267c6548..5f34ca9901 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "1NFhtEvvvgZiHcto", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json index 4ae4f02769..a6229f92d8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "eNOkWn5PT8rDpA0g", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "instantiation": "true", "filament_vendor": [ "Generic" 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 72f4577557..52d7d0ee40 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "vOqAGzaYLz0XdRvC", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 682416a4eb..84d7492956 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "KSuxZ3fpQz0khDSz", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 7e32268d01..fc78000e54 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "o4B1kAToVny7jw0M", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "instantiation": "true", "cool_plate_temp": [ "0" 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 87b5639be7..3e26d15964 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG HF @System", "from": "system", "setting_id": "kpRved5M3NktqIYn", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 1e6c9b04dd..4cab6d97ae 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG HF @System", "from": "system", "setting_id": "ypxgjHl9uIMyZIce", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json index 2764a938da..21e54e38b4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "uXGuyvVxfdQW22vu", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "instantiation": "true", "filament_vendor": [ "Generic" 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 883143b259..2bd44a8bb0 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "q9UbakUmZPzG3xU0", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 f781edfdca..9bb1244b29 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "IL18Lu0qHx1RVqKD", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 3e1a003ac6..a1ca0f6985 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "2FQib7fZjcwfCnm2", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 b800e1566d..f21520aa0b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "CtwOm90WWD4S7U6j", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 c3d6594e7c..a76d35fb6d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "kvULpm0WhKiSPj8V", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json index b0ddaf5825..b161612d91 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "bFVYSPkynBBapFjq", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "instantiation": "true", "filament_vendor": [ "Generic" 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 ab726c53a1..4bb3402cb1 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "CUU7knzm4cbe1giE", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 b5dc6efb69..a847ff25f3 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "gcYvL572cumWZdnl", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 24fbd0279f..84c3e94acc 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "cx99AH0C575XxAj9", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 fdade2f06c..23a73b4ad5 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "RrrKoR7MVD8IFQlq", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 07c144a574..c331466dab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "7VEPGuR16wNukAX2", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 7ade77bb7c..5558ea98f9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "H9uwlPw6m6Nf7qH5", - "filament_id": "OFZQFvHQ", + "filament_id": "OF5w29Kq", "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 e209b455e4..dba18c4bed 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "OmDped3weZ4uHAtY", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json index 56f8ff9792..12e9fe913f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "bfPaqPGaR5zpTsLk", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "instantiation": "true", "filament_vendor": [ "Generic" 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 7be6dbc727..d10ef1e3e9 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "oD592bif4ra0ADco", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 c8f5744361..f83591bf3c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "ldhMY6F7v6nK8wwf", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 01b6e9deb1..619b9e8767 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "5vzOmbjHbkJXrgYM", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 b9e2ebeb4e..0d5e671f95 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xSJk7LFpYKmckPQh", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 681d576ed0..9aa4efc2e4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xdFZUsj1cNLXdvT6", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json index 25eab9bb09..43f1bbf068 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "JCQtuv8Abfz4jVRV", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "instantiation": "true", "filament_vendor": [ "Generic" 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 a9e238131c..e8200e41e2 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "hzxRPyH1fqarsMuN", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 b25007568d..0b46b5fa31 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "oJsLlIIpxwGSoJTv", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 06a4d1a82a..5940d7d272 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "hJbNZ381ERkZ0KUB", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 6dcedacb73..dddf486229 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "BqavrNpwhXDXcZ3r", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 bf84dbab17..598d3c6cab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "cgf4Qk4iHZh7zHN5", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json index 54be3be396..8e228a364e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "jFUS6233aq4XPgrn", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "instantiation": "true", "filament_vendor": [ "Generic" 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 eab85e45a4..2282b67e93 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "p31K69Srld6o4sQ2", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 e434c6b72c..137f78fcd6 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "MwbYvnRIzlNmH81h", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 0d1632b731..4506cf1d91 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "rKhHmkqXYD2xN4K9", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 d67d10a948..45e42ed61c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "Dshsi3O7NvYYjXJt", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 a3d4f51084..1ee62a8bd4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "mfnL6QEevCmTmOL0", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 0b2c003337..1731aafb85 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "AGLHrHKWye0YTtNK", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "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 00f8b13d72..986f32690e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "px8qzmB2yFLoNl83", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "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 8c10583b55..fc20600185 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "mwuIEsBz5bXEV68w", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "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 c32c16112f..17b706989a 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "TielygFT88owWg4J", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "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 154d526928..d4832e08ae 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "It2NI6OFhNEUvulz", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "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 710cae4899..bc73b031b3 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Qt3huWxoYpMEqEN6", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "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 3d753e4106..5737b18c7d 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Y3XuavnnOMoHLGHA", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "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 aae20613af..5316d2b8b4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "2HUxAWeolJIlxPs1", - "filament_id": "OFeWMAGH", + "filament_id": "OFmQkb3c", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json index c7e39f8682..fcba520ff6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "vdaZBnDsmUC1fhDp", - "filament_id": "OFoJUGj6", + "filament_id": "OFnMv3W5", "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 fdeac081b6..b108289976 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "u7rolQaTQz9U6veH", - "filament_id": "OFi1ocNv", + "filament_id": "OFgf4gZa", "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 cac1c966a2..44783f007a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "qTGTwiliWj3dSo9y", - "filament_id": "OFi1ocNv", + "filament_id": "OFgf4gZa", "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 5b052ff3ef..dba15949a2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "wAkuJRTLWxGyBU0b", - "filament_id": "OFi1ocNv", + "filament_id": "OFgf4gZa", "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 a469e9cae6..d2d2a93575 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "dbs29hQSQl9zuWis", - "filament_id": "OFi1ocNv", + "filament_id": "OFgf4gZa", "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 79da7aa9a1..ac63380352 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "XGNPvS2ps7Xn2fpx", - "filament_id": "OFi1ocNv", + "filament_id": "OFgf4gZa", "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 1339bfd17a..e88fbf5126 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "h33iEGZ7wPeBYKYQ", - "filament_id": "OFi1ocNv", + "filament_id": "OFgf4gZa", "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 9ca2ac4d29..687017cdba 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "e58C9MdOWikIbbVR", - "filament_id": "OFOSzSuh", + "filament_id": "OFuGRMNV", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 4c6085c781..4159a24737 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "RX2Tg8KpwQpCbkLI", - "filament_id": "OFOSzSuh", + "filament_id": "OFuGRMNV", "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 370f016030..b4a40e769a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "C4DfYuQgDXIgK7mk", - "filament_id": "OFOSzSuh", + "filament_id": "OFuGRMNV", "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 106dbf9dec..e2ab91aa24 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "Yu7hL4izNsgDVqMT", - "filament_id": "OFOSzSuh", + "filament_id": "OFuGRMNV", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json index 3733afd3b6..8f1f04ffdc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "1CevPV960sQWT3NF", - "filament_id": "OFMHTnPP", + "filament_id": "OFgeM7nD", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json index bf2d34204a..129ad8d648 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "NGbZ8pQVTRKw28kp", - "filament_id": "OF0SyJhk", + "filament_id": "OFZtOQtl", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json index 988e26f75f..6654b78212 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "5pVoGBvbiUlrJSwR", - "filament_id": "OFkaDtKx", + "filament_id": "OFuV79ru", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json index f4b7cac893..0491362ddf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "8ZR8o3MKYxXLd70k", - "filament_id": "OFsgANe3", + "filament_id": "OFuFqYyG", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json index 22ae3064bf..1c142f11b5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "FSfGFl7FCutxXN2l", - "filament_id": "OFsgANe3", + "filament_id": "OFuFqYyG", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json index 62f9c06854..addb373157 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "ZlpBAM9uaS01sWAJ", - "filament_id": "OFsgANe3", + "filament_id": "OFuFqYyG", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json index b7f3bc5386..764d274e76 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "9DaSYBA2OI7Jj5zS", - "filament_id": "OFsgANe3", + "filament_id": "OFuFqYyG", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 2077dc5243..7157336d3f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "3bguiaEtUsS8ULHW", - "filament_id": "OFPJJxkF", + "filament_id": "OFrjacXf", "instantiation": "true", "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 48c08e910b..b550ae743f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "W6i9E22BVo11TeCm", - "filament_id": "OFPJJxkF", + "filament_id": "OFrjacXf", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json index d74582ed08..f6899ad2e2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "vflpXTS9GwnODQDH", - "filament_id": "OFPJJxkF", + "filament_id": "OFrjacXf", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json index 2df9381429..6c5928993d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json @@ -3,7 +3,7 @@ "name": "Flashforge PETG @FF AD5M 0.25 Nozzle", "inherits": "Flashforge Generic PETG", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFMpxamb", "instantiation": "false", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json index ee093e88fe..6ea60b3214 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "xOZQvdZa1YCcnjor", - "filament_id": "OFuyJhLF", + "filament_id": "OFEMfQsX", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json index 3517994360..f3fed78ca0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "YLLJ4xZI704GReej", - "filament_id": "OFuyJhLF", + "filament_id": "OFEMfQsX", "instantiation": "true", "additional_cooling_fan_speed": [ "60" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json index d66f57eb00..a351fd284a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "8EUg1hTLfsyDPbnG", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json index 56b1f382f0..153daf20e9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "UKhV8A2DBc1xyNWc", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "filament_vendor": [ "Generic" 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 13c8b20ac5..7009c5a076 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "dFZ1MmHjj1AAIaMm", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 5484136b0c..d092644658 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "Ro3rt7IAJrA5aZD6", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 c25162b722..17626d81ba 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "cTxrnqzr2wVt4Nj7", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 fa691e2aee..bbf62043f7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "QA1KD03F0zj2zsVi", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 bd9d2e2c35..fae56d5e11 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "EU8Q0XLjED23MNer", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json index 105b1cee65..a22994d00b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "XFSgx95whLw5FD08", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "filament_vendor": [ "Generic" 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 661e69ffc5..9919a54140 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "8x6yU2U8d5f67N73", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 9243316595..30bbb96fab 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "4W0nfaSSZdg2HQkh", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 451eb9ca86..f66c490c96 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "AJcugKx4qHPJ3JAT", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 3816155365..cbebb6da3e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "R0nZuLXEo5qA6Mt8", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 5ea3f9aef1..1a3ee02fed 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "Ql2BBBymzqEG7GKk", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json index 8b3169ba94..295b0a313e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "8Jc4eedkknqNB87s", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "filament_vendor": [ "Generic" 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 6761b073c8..7d48ccda00 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "KU5tDHAKja1sCoHm", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 4f893a3514..a83ba63b92 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "sb6jD3UZmb0DNIsC", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 9dc63bc699..ab7bd22340 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "4BB1wJLtsXus5eyY", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 88104a14ab..ac25f05323 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "m7oJx47UMlFctMkX", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 f254e10c43..adc38f6d91 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "ozD2wU5UiORTtJsa", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "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 13537ce8a5..5940c47fe1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "IQfUoy7gTmVmBDL5", - "filament_id": "OF38Hyk4", + "filament_id": "OFPQfNAf", "instantiation": "true", "additional_cooling_fan_speed": [ "60" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json index c6cca24dde..b43b82c176 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "W59yTyPnVv4LYiah", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json index e29546069a..54596db508 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "NRY4fsPNtnqs0kyH", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "filament_vendor": [ "Generic" 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 2182a95ed7..03bb077a25 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "Ht7wzk8l0b1kv5tZ", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 ae05326e13..d799a1dc69 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "NJFHpa5HFHIyHSWu", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 df5fbfb1ec..1a64752952 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "UaObrRNSTwitC6jr", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 9071f16ddf..08e0076cb0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "TtXy042wtT6nF3WB", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 f39398a73f..4d40f2fbcb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "66OWHhGyuaFISu6v", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json index 90e1a598de..60bc613ad6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "p5c6XJ1VD8cn2Meh", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "filament_vendor": [ "Generic" 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 b9f665f3d0..df04fca6df 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "K8WkJmFy2V1zhYQO", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 ac3c87f8b1..31169455a5 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "LLK1hwKZhDU8SaGJ", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 32a964d155..776d9d1df4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "LaUF2HJtBnpZF7Cd", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 2336789ee8..1eda391a72 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "OUToXk8ddS1RPPUK", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 c0a189a297..df79bc8fdf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "ywff8rI39XKjcocY", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json index 4a05c795b2..347a845f06 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "C0VV5Uzsl4icRgKa", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "instantiation": "true", "filament_vendor": [ "Generic" 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 76504bd857..6dc5df0088 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "kuCvwo6Phr6Ywhm4", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 1b447ef7df..2ed7597e91 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "Z2E69w9AevYg15tl", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 98ca9782f1..22c2061b81 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "RkQaxwTjhJK0A3zr", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 f6e5ac3dc7..22b4912e99 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "YBQTMes2S9iJjKDf", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 adc9b3ef23..315afb5acc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "lCngVWG3q0FWsnrG", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 62e796f2cd..ac03de5fb2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "3Gv6MJ3RRja5pbOM", - "filament_id": "OFRgDMDJ", + "filament_id": "OFMyLYV8", "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 c59d59c97a..758901ff5a 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "bcqYod61blJRzhK2", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "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 e3dae3bbd7..6eb1aba29f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "CnFKOi7fFyS8QlKK", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "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 46641e0704..4143582646 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "eKWJW36I5fVHwjWD", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "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 452f3a0c9a..16c5cce80d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "RXRERfs2oQKewpPS", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 36fefc9926..2be54257d3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "8Ns75F5n2fdQ8sDk", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 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 e4dc5d17df..3d85ed39ac 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "4EgMPzlVo1rTeQ1e", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "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 d11d07fe15..f88e49c07a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "K9ME1F4oJkPi8jRu", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "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 fdf37f0ebe..cb8e888fb0 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "9jCp0gTjB3Mt95Mj", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "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 c109735df5..3341e1dd03 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "d5OleuNNZBJK9vxH", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "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 b9af31fcab..f8c30e4f18 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "MpG61mwVUtJ7t602", - "filament_id": "OFoimrpo", + "filament_id": "OFBK6zAi", "instantiation": "true", "filament_settings_id": [ "Flashforge PETG-CF" 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 48798f6b98..15b12ed8f9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "UQF0kAaXnZgJGK4o", - "filament_id": "OFftQOek", + "filament_id": "OFH6Pjxe", "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 45c5379b97..657898f301 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "FpLoe6QrPXnrH019", - "filament_id": "OFftQOek", + "filament_id": "OFH6Pjxe", "instantiation": "true", "activate_air_filtration": [ "1" 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 839a09c93b..e41c16e0cb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "YFbZ472BRNga6OpQ", - "filament_id": "OFlNKZLP", + "filament_id": "OFrnkURQ", "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 c0081e14d4..fb5ba4bbf6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "AtVxriSKOrFZzUun", - "filament_id": "OFlNKZLP", + "filament_id": "OFrnkURQ", "instantiation": "true", "activate_air_filtration": [ "1" 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 535d2b6b31..5aa386d441 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "47Q7YXoJ7rD7Vu21", - "filament_id": "OF0wk0Pk", + "filament_id": "OF6ueBwd", "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 c786b1643e..025ddbf305 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "v7vYsiPVka4c1CUW", - "filament_id": "OF0wk0Pk", + "filament_id": "OF6ueBwd", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json index 155f7ddcb1..65741b1860 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "3fuVuyVcn8U0bRJQ", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json index 86153a46df..64d564cfca 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "FrRRUl5OT773uCju", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "instantiation": "true", "filament_vendor": [ "Generic" 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 004d9992a1..e280847ff0 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "gMmhMDqjmJfAYcbV", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 b738bc9afb..a61f208b0f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "0OsrtqfIxrEJMwac", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 9d5819953e..949a7ab6a0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "fuzWVrfZqekMETLK", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 0228ff0de8..8963823c97 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "FmUnckQofjunAtwr", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 3fb9fc2585..6fc821a49a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "Q0RsVOPLuMByur9c", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json index fd7393e08c..6969ef6263 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "QXJgY8OPyaoYUI1D", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "instantiation": "true", "filament_vendor": [ "Generic" 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 05913a7f19..f7b96331ac 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "R54l7TcwsjdPHvNB", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 16a51fa761..b748b785aa 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "MELEwYupDkT2DPxL", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 84dcbd7a1f..0e01a20dcf 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "uGLvOoPAfksLO43M", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 63f3c30349..58b72386e8 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "gGpKvk3rnLuTjOwo", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 27cc6bac6a..f4c16daaf0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "Yopqnj4b5ZVwigGx", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json index 3199072e84..dcbfee57e3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "GrwiA2dArUGV9x2g", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "instantiation": "true", "filament_vendor": [ "Generic" 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 b9804e95e8..1af3c298cf 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "QEfQrqMwApuSMqih", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 9552e043db..c42a17fc29 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "BAPIn3eJAPGpscRJ", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 45d44e3491..7a7344c225 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "44BmRNRb6vlPq8qe", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 54b997bfc0..36a89b5dba 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "ltJbhoAeAec9gxrS", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 3715130d41..3d13adcc0c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "GxdZiXdqns72ibQl", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "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 85db7c8198..7640ec0834 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "5XKGaHUjxHECbnHO", - "filament_id": "OFHBTqyD", + "filament_id": "OFIxitiU", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Basic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json index 815c949ca6..b58b98fdd8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "H8IStdO8zEfSLYVE", - "filament_id": "OFdhVJql", + "filament_id": "OFQZeyZv", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json index 8dca7c3195..29dedf8f7a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "4wlkoKnU2bA7xhYO", - "filament_id": "OFdhVJql", + "filament_id": "OFQZeyZv", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json index cfb8df6c5c..6cf9156ada 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "KXy0WyQp06VC2ICh", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json index 0ef7325644..d5e1624903 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "9cGw7tXD8YJHEi1H", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "instantiation": "true", "filament_vendor": [ "Generic" 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 7109d34b4e..d0df8cd605 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "TF6BeOl0patjpPaa", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 f0d7531966..105291c048 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "nkYeEBo8NdkJulAP", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 ee9c9258e1..c8650a1a1c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "yEDfsOsogfZbNBVX", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 15c7b4c7a2..2fc09d1cc1 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 @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xZmQdh487UMtvBRu", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 b3f5fdc1a3..707eb4e042 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 @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "rc00SOyIg30uE3Da", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json index 653af0cdfa..5a35f8d82f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "k1OiugasUs7baG1f", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "instantiation": "true", "filament_vendor": [ "Generic" 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 b5fadd484a..99a720a226 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "G2Et7kPHptMESzQ0", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 41ee33d3f9..0fb2690255 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "zsOdmFGBSF9UySMN", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 4dd0097616..bceeaba05a 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "oxRMuvBMu9qdQWUQ", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 2aeddbf43c..3887ded589 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "5hwNJvvLtb75XBBg", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 a621f4ecde..d0fba1bec2 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "mGj8VEyOnnogpkmF", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json index 33a309150b..2542e59765 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "HXVX4mDeUSfW2RgL", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "instantiation": "true", "filament_vendor": [ "Generic" 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 53d86e2bd0..29ada76335 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "JDcRA6apekWLXPvH", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 f8a2b45aa3..dc01f07d81 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "b5GJpvKYktP4vZpj", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 68e5a905ba..6dbe02b473 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "RjUpQV6iQxTircwj", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 bacca455e7..0e2690d93c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "9DEZ6SmFdgfluhsR", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 593d88f497..a3696383cf 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "girTMkusNTfY04rz", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "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 b52b8e6cb3..030d4d1ff4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "pCQ2qmeXUyJzP7kS", - "filament_id": "OFyoW5W2", + "filament_id": "OFkwIWwc", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Color Change" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json index 70eb17ba53..aa9433b6a2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "a1jTbQsflD7SDFih", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json index 6f3447e0b0..979f2a51fd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "zyCRsy0mHRgyuQqt", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "instantiation": "true", "filament_vendor": [ "Generic" 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 36e4789905..4928bc3891 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "y8TNaRebTrmFem10", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 c543dcfb58..2a7e7616ba 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "qju0AMvvq0B5Glny", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 1829618f06..97cd5bb9be 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "o8gGBOEcNvlbZxGW", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 c6767072c2..929002ffac 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "0RkkIcIUFgwOFTBY", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 8cd892194d..487f05b211 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "9qVabnSl8xfKSIYX", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json index de910c8202..0d81c49ca3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DL7lxDI35YErCTWX", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "instantiation": "true", "filament_vendor": [ "Generic" 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 4753dd7e12..d3cc825ed6 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "koEC7DteUoXHUd2z", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 1115d57393..f684c8b47b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "D69fWcXioFcpoUjC", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 6cffd37021..5cb479f1a4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "rfiQUncdSExEaK0U", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 eac289b203..6018aad13d 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "WX8lK8efXIVcpjFf", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 8ad84a60f2..8588d194f0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "Tzvo3oILQJc4SQko", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json index 58cd97fed5..7491d8dc7c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ZQYrljZtu3es26hB", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "instantiation": "true", "filament_vendor": [ "Generic" 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 cf4e376d6e..c4785481f0 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Y5gm20O4yCCDIoC0", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 8c3d23f226..b2a142d9bd 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "80vSQxnHfd5ZUy5h", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 0bc3cee930..0137ac7348 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "UZi7T5VoasmXWyH5", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 a55bbd16c0..96aa6babdf 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "6UlSb4fqHIMdMxkO", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 aee57b55ae..bb1e1d9513 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "H2Cr4B5VUaxyYsN0", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "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 0ac191a749..99727f9217 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "NJrc0UZ54Fq8MaqF", - "filament_id": "OFXv4FUi", + "filament_id": "OF5NQFKI", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Galaxy" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json index 1f58b7ce9d..ec022f475c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "k8iibCO2EnlTSRyi", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json index 316f797d5b..a6bc399396 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "pACct3L7duMh3hfx", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "instantiation": "true", "filament_vendor": [ "Generic" 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 266461a8a5..58ef1320d5 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "GdvXL8SrKrYHxSgZ", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 964b280d46..a58b30c6fe 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "SLYD2YcQTQgbSjIF", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 e84eaca5e8..9f8bbf2127 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "kOobFSlqEG9Qe0d1", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 f04ba6e742..bb19b242a7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "4sE1LTVVuRglRbpD", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 efc9decd4f..f370433f16 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "jEUZyaEIBf2eXXeh", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json index 99d6e50b42..9e865d710f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "qZ6kKjRCMfe4Ql3F", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "instantiation": "true", "filament_vendor": [ "Generic" 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 4efdea0ca0..6be800cba6 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "xPPSRmadqfqCtRF2", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 d710da228d..7b49141fd8 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "aWVXIk1xVa9URR1D", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 bf4a43d0b6..1063943964 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "KhBF7hHHVPzqiAca", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 a3c7dfd439..34929db7ab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "sTplnj3gMAzwtLWE", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json index f7a674246f..3f409afcef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "zJFUJKDJRYi1pRL7", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "instantiation": "true", "filament_vendor": [ "Generic" 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 972b575cad..2944c6ba8e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "vXPXOKD8vNJlujM1", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 582d6e32c9..883241624e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "purqxjmWiflDrnik", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 17e7fe9b09..1daf6897b9 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "qraQ97uusigB63hv", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 bd4e81dbc6..d8735d275c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "Z1NCX8XMyIVlOlWn", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "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 59b52fad8c..f1ab00b390 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "s620OFLTgFT4Ds2A", - "filament_id": "OFwf0oWp", + "filament_id": "OFMIma8C", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Luminous" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json index 21fb7bfe80..d9c3ffe33a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DcbISTLvKNMZRzKx", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json index b6fc07dc4b..790c30cef0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "4fwlIrzy6O2EsyBZ", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "instantiation": "true", "filament_vendor": [ "Generic" 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 7037b54f2d..1f7bd2b1da 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "BVmVfNCuy8HDhcEI", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 b6772f5d1d..8b85ad1f7e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "WRMePGzDGdEGiqNv", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 bff289cda9..4f7b782d7f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "thnbuaLDDlGrkrdY", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json index 8050f544ff..548d627fa2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "cnPwhLyBq6JL8gEA", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "instantiation": "true", "filament_vendor": [ "Generic" 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 95f712248b..0a5772910a 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "8b9q1FfVljPmKoEt", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 cf8c573962..7ac6952363 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "o9dOrLgL6efF19O1", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 0c247e1b06..3154dfabc1 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "QoRmDvhoeGi6Z2xv", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 9c13d8bf85..ec55501821 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "dHyuoORAUGLtlGkJ", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 4e945b96df..892a8d513c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "OgqVyIHfy3U8Dc6d", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json index a32fbb2952..2716d0f9fa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "g1gnICJ3u6hpGazQ", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "instantiation": "true", "filament_vendor": [ "Generic" 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 b955699bcf..c5338f91fa 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "feXpVbDM5ON5mwg0", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 4816841106..589fc96f12 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "XMnZQ1AxXPJqpqRX", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 787af100e8..8a2cc0815b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Ke0bRKPNKSsVMO1Y", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 84d8d2f4d3..14ee3d9ad6 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "IRC2n4GaofxvvyTt", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 c753c54bb3..c19e58a5df 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "RN4wdTL0qccM4huZ", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "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 03a028841a..989bed63b3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "ipMevDMORKqZYdvD", - "filament_id": "OF60Lmeq", + "filament_id": "OF1bQyX2", "instantiation": "true", "filament_max_volumetric_speed": [ "22" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json index 439527a780..a788ef51f7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "vwwb5nfO63U1ErCn", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json index 3d67e7a928..b6a2c35983 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ekq4MRPyzlYxRhbX", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "instantiation": "true", "filament_vendor": [ "Generic" 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 4d538c35a2..45b9d0d7d4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "uusF7Vz94HOwoQF0", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 15a224163f..3f595ba93f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "sHZWzrZO8PP0QYZR", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 928b220017..4dc8a9d226 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "bxwjEFI8HmNY8JI6", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json index 184a2ed052..5f0dc7ac33 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "VvMaIJwFk4Q6KX4p", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "instantiation": "true", "filament_vendor": [ "Generic" 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 0c772343b9..1c40ec5691 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "5xqdqoj2l50FegPF", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 ab8e2a6e13..035d431419 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "R79SbWA9i2OAu2ee", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 8d1a7360f9..df92bc3004 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "zjIN4KzIOwI1VwOc", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 a0bdd7313a..7828b38822 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "UxMNNil2KnWvAJ4q", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 878fb7e83e..d9e6e0ec27 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "57i6iKrVYUS5UiBT", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json index ec32a91e56..712410e542 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "vVKalJViJuBvlHkK", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "instantiation": "true", "filament_vendor": [ "Generic" 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 cd872ad134..6b8014dff1 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "IYPw8a9tkpuf95uH", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 1652f423b9..84429816a4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "I0bULoVAbtVfQoCy", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 31fc158a78..057c05a51f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "DbPo3ay2e4a002AB", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 8c970ff1b5..d9f64c3634 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "uztv4hhm2O3T93zZ", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 6edb1d2d36..9323d094ef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "UFWWrhfgS7N36Y8W", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "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 c9a3884236..3a28540dbf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "UD5i0ijsirfieUvb", - "filament_id": "OFWv6JYn", + "filament_id": "OFvVxvzZ", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Metal" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json index 5cb8fcea1a..15a01f350a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DIMoIGOGedN17WbO", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json index 1e838feabd..9d4fb9f9a8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "SC5LJcecBaEG5by3", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "instantiation": "true", "filament_vendor": [ "Generic" 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 f51c80d063..6a24a22501 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "t9lPSFnwLDk0ARIp", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 76fff17909..14fcccf62b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "SBSlOEwZSvZHeX4r", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 9dbd0c5df8..d26813d36c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "DbWTm2H71izMWmpx", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json index c29e57868b..174584294f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ZENqqRqvEOeloAgs", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "instantiation": "true", "filament_vendor": [ "Generic" 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 7a776d89e3..c7913ee0a9 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "YcXuvz3qYHtVoWxv", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 32a582ed53..8747bf9e8f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "prItyXNphhuPCAce", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 2aa08cf968..63b0c9a162 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "83zDmjaAgxxIt7KU", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 88ee859e78..1b1a3c059c 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "px3O28Olb9LExqfT", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 bb5eb9a2dd..2d5f18b2c4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "QYgsCCHP3Khqrzh3", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json index d839e8b67f..6f675b36db 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "wV01bqvZ6MRaEibZ", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "instantiation": "true", "filament_vendor": [ "Generic" 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 c3a2de4dfc..730a9ee7d9 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "1ro9wHPYhuMHNiYe", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 d0a52dc129..24afad6fd5 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "4W4a7c9ugUVwvvmn", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 f6a0c4911f..c8dc7de4cb 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "CloRo3qxvzxHZuIP", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 924ed22202..e677dfe51b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "QgUbP07tIXmFysEb", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 d1383d50c1..3edd253b70 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "6mvGOtkPZT6ROboo", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 302bb89cea..880e0e1ff1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "vI875WYbMyQeMwlh", - "filament_id": "OFTa6gPH", + "filament_id": "OFK74HJD", "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 04b217d0c7..13d04ff82c 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,7 +4,7 @@ "inherits": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "gxl3i7jTwkzrKxF4", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json index 7ef705723e..c3ece049cf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "mx6NWRkqyo2U12XQ", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "instantiation": "true", "filament_vendor": [ "Generic" 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 058dce03c0..a5bdb3ae12 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "YH9IHXOFMKwcTLyA", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 c2f9796beb..6541cbefb5 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "IfAieG0OAG807xlu", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 6ebc636b10..a98c508f95 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "N6J7QqQ7TIgM3MyW", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "instantiation": "true", "cool_plate_temp": [ "50" 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 7aa85e29bf..3e65220aa5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "OIsfpi49wEoF0ekO", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 67ca938c59..5943d800f7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "xxeZ6VPjRFevxDnK", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json index 50440528c4..1db32c1b42 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "x5m17Z5UpqpTtwgF", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "instantiation": "true", "filament_vendor": [ "Generic" 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 933275ecf4..4e99c711c1 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "2GZp8yjrY1OioFDi", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 03c51a026b..1e92e0d029 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "U0XtCVUhIMnidhbR", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 127a7d57bf..cb7dc03904 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "8j9kaYy3ghkF81Cu", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 7a4b09647c..6eff5673c5 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "E0LeJwSxaniDkB0b", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 573bf70bf2..3f6a7428ea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "8rggqgJ9kg9yLE28", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json index dbd9678eb4..f8dbc1a5db 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "hnWRLUwnfXiwnqBM", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "instantiation": "true", "filament_vendor": [ "Generic" 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 9703b974e9..2cc8db6387 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "uY4OWhIytHMz4rWq", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 88c07e6495..d77fc03f37 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "YSkkXd9EhhEHvGpf", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 2d45c140ca..9f890d3ae4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "XlxXZj9Wi1D6IwCE", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 5e3cdced52..030ea7370f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "IPyXBSnMCAikjI9V", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 efb07ffb7b..16f980a35a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "f3gJsovSmDKoA7BP", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "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 ab60566b84..7be8b80605 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "vZb7BvbyVWkZv3rR", - "filament_id": "OFAGrVjP", + "filament_id": "OFLYDIb8", "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Silk" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json index 3202d660c4..b9621303fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ojYsAanAPqYhgFoe", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json index 5156491cfe..e1df09f3fb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "xVYaNvQwM2chTkPe", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "instantiation": "true", "filament_vendor": [ "Generic" 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 a8af698f32..4c0cf846e9 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "o8lsEnMIiHHorJhb", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 653b2f3e03..173557e7cd 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "oXlxQJY0K6Dnri7e", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 11cfe05454..0bed0a94ad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "XKpFulrvvrfE56va", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json index f722c56cbf..b0d52bf934 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "jmVmKMUCcowszvVp", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "instantiation": "true", "filament_vendor": [ "Generic" 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 641ab1da9a..94ef846a7e 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "yeh5cd0tAHtHzdoQ", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 e2402d34ed..1ce68966df 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "q2Zi0YluaYpG3Ktf", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 e03a5b575e..6d95754110 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "1qXV6AJqPpAwX1YK", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 b2e0f1590b..70c9c99c7a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "YsyGGOGqUVkEqkIr", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json index 6817de3a60..b333c92f94 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "4L3Zm1YIxs8J8dp9", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "instantiation": "true", "filament_vendor": [ "Generic" 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 0ecfc51591..685625a28b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "UVvd018dTbygqTgy", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 dec7c8275f..e9714994cc 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "F0k8kkgWM5FkLAzo", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 c11104155a..964a187d38 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS @G3U", "from": "system", "setting_id": "Oapl8InwbkwNSIDl", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 3513820454..34a5114484 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "NiB6Yb4b0auyn9KQ", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 0ad4ae9863..659909085f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "LYtdPgec1hBLhoQA", - "filament_id": "OF9sr3Vn", + "filament_id": "OFec7Qiw", "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 c61e191e80..8367f7e01b 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "QRyISvTy06kCwxKo", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 17a29fd4ad..60f17b2196 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "rmnF24E3SuwzRscH", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 4fcd8bf26d..f719c895cd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "BXPI5Pkp7a6pLrCh", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 4e5ab53a0a..b2b8bcf477 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA-CF @System", "from": "system", "setting_id": "rBm25DRY1PAkEJ4r", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 a3c206104c..f5e734c62b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA-CF @System", "from": "system", "setting_id": "xReo12oteZ4ECNJN", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 65b19268dd..3d493c1bf7 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "9PgjgxU7pLl2Dfpe", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 6f13da05c7..011065f34f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "RuNKzuIsw7F1ogmG", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 d2facc5b67..ee56dde5d4 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "YPuMCHNGDWh0FpIB", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 8a051eae74..3baeeccc60 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "3uC056Y171ZjnQE6", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 f0515b17da..85527a625a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "JxNlb64lTODaaQhU", - "filament_id": "OFPJrlC3", + "filament_id": "OF2bZtyg", "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 48ba8894c7..67c45b439d 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 @@ -3,7 +3,7 @@ "name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", "inherits": "Flashforge Generic PLA-Silk", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFGc282l", "instantiation": "false", "compatible_printers": [ "Flashforge Adventurer 5M 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 6bdea5bcd0..e559b22a88 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "DhC7iFgNKCAq4Zkt", - "filament_id": "OFQCAYAt", + "filament_id": "OFLC1oRH", "instantiation": "true", "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 daa6fb18ea..96fa32ad12 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "Jws2AaLWaNyZhqX4", - "filament_id": "OFQCAYAt", + "filament_id": "OFLC1oRH", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json index 883ee5c3ac..f05cbff817 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "MFItX51zZO0KYjdk", - "filament_id": "OFQCAYAt", + "filament_id": "OFLC1oRH", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json index e4a3581fe4..140f6c5dea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "KITjZXcyM4N8cVyu", - "filament_id": "OFp8lkYD", + "filament_id": "OF5BN24W", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json index bd330537e5..b543ea7215 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "6NjEQ6RJKUAOrSLw", - "filament_id": "OFCJaXZS", + "filament_id": "OFxMGIPt", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json index 85977c3bb7..10ebf9f302 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "vFMKqNjQjlNxwvDI", - "filament_id": "OFCJaXZS", + "filament_id": "OFxMGIPt", "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 54faf072f3..58b2d242a8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "ihXPnFERMjbBgrP5", - "filament_id": "OFZcrV9c", + "filament_id": "OFTSXxzE", "instantiation": "true", "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 7cb88b5960..5f261953b3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PPA-GF @System", "from": "system", "setting_id": "UWFjBmSpUkZLBvoO", - "filament_id": "OFZcrV9c", + "filament_id": "OFTSXxzE", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json index 309fb174e7..0b1139bf47 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "oSGlx5mtGh07BnOz", - "filament_id": "OFZcrV9c", + "filament_id": "OFTSXxzE", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json index 67c51aa68e..e7fac74763 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "i5DllSvYjVPO04Su", - "filament_id": "OFZcrV9c", + "filament_id": "OFTSXxzE", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json index 97ff645bb1..19630dac6a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "l3dYtVM52X0UMRix", - "filament_id": "OFZcrV9c", + "filament_id": "OFTSXxzE", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json index f92402ffaa..4f3cc891e3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PVA @System", "from": "system", "setting_id": "rSYGG2ni41NDVw6l", - "filament_id": "OFeFRwST", + "filament_id": "OFQiq4fb", "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 f9a335f2e7..206933a8fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PVA @System", "from": "system", "setting_id": "nwgbMjLRJLtJ04ri", - "filament_id": "OFeFRwST", + "filament_id": "OFQiq4fb", "instantiation": "true", "activate_air_filtration": [ "1" 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 624f2b05e8..4e2a345147 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "f75oElm4zB0hukIj", - "filament_id": "OFmgesco", + "filament_id": "OFKpQTJI", "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 456dea73d2..a90c599c43 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "o4KYTpJF6KksX2mg", - "filament_id": "OFmgesco", + "filament_id": "OFKpQTJI", "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 f4d18ac97c..8c9d19de43 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "HUSkDZL6rCpz0lRk", - "filament_id": "OFmgesco", + "filament_id": "OFKpQTJI", "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 da615cf496..43d235a9ba 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "8xgu0AnMuKbPWyVd", - "filament_id": "OFmgesco", + "filament_id": "OFKpQTJI", "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 f2d17b5a69..23e2cd0e23 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "Rgqt3MjxOye5EaFt", - "filament_id": "OFmgesco", + "filament_id": "OFKpQTJI", "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 3f0aea0926..6d8d7ce10d 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "PBFsW5qhVbQteYh5", - "filament_id": "OFmgesco", + "filament_id": "OFKpQTJI", "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 f91c527cac..952b10fa12 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "TPbHmcFyPyjvoERv", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 6b331b1a97..626c5891bc 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "zLMgsyDmdoXHhqFv", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 6f674a27e8..d084aa4b46 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "ThakVhjfpgnAlEVH", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 5a6b095651..262c9c9e47 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "M0ozqaD3jSKoD6fm", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 4d3d501620..649ef446ef 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "ob8IkvzNt9CWCzbk", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 c31e020d4d..8eb722c51f 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "NzxX1lyRJ7wLUihV", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 306930aabc..08a4033ee3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "4FIGiheSGvSJPw3s", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 a3ee98d0b8..9dc4916ba9 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", "from": "system", "setting_id": "1GNqSBaQitzhYSx7", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 eebe8e5b85..8a0c8edacd 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "eOhMygyxaccdov7o", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 e9823b8a1c..1e35a008af 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 @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", "from": "system", "setting_id": "LxooKiOkRncktNLf", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 b3aa3cfc55..bca2a33ba0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "HdoJfbQr0uwQ6Vwb", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 abe58bc211..6352a73829 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "J4EaFhnpkLDcl5wH", - "filament_id": "OFRNU58t", + "filament_id": "OFAf9pJF", "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 c5c992698e..1daa3b0189 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "fd5bACFa33J7aTdp", - "filament_id": "OFtJMczs", + "filament_id": "OF995YXg", "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 94aa1ead1c..3145267db2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "hrcELA2qEMkZ6Wvj", - "filament_id": "OFtJMczs", + "filament_id": "OF995YXg", "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 a4a27dceef..96c3798a71 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "Lis7BZ3lMkoX5KQt", - "filament_id": "OFE22Uba", + "filament_id": "OF41jaTh", "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 bd69da6ff2..18e401489e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "xY03Hiidu5YNSUyZ", - "filament_id": "OFE22Uba", + "filament_id": "OF41jaTh", "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 6066fbe98b..3fee2a98b2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "AHu6wNV3zcPBusOF", - "filament_id": "OFyxAbO4", + "filament_id": "OFNWnx2c", "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 5fe7151b78..d7625a7d8d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "8MBRqfLIRdhxk1dF", - "filament_id": "OFyxAbO4", + "filament_id": "OFNWnx2c", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge/Flashforge ABS @FF AD3.json b/resources/profiles/Flashforge/filament/Flashforge/Flashforge ABS @FF AD3.json index c4ebf2a360..0ac23a453d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge/Flashforge ABS @FF AD3.json +++ b/resources/profiles/Flashforge/filament/Flashforge/Flashforge ABS @FF AD3.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "9pxqGyfi52tuVmZ1", - "filament_id": "FFF02", + "filament_id": "OF5SJ3jz", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge/Flashforge PETG @FF AD3.json b/resources/profiles/Flashforge/filament/Flashforge/Flashforge PETG @FF AD3.json index ca504e0e95..7576c467af 100644 --- a/resources/profiles/Flashforge/filament/Flashforge/Flashforge PETG @FF AD3.json +++ b/resources/profiles/Flashforge/filament/Flashforge/Flashforge PETG @FF AD3.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "tYidxo83oreZoecT", - "filament_id": "FFF03", + "filament_id": "OFMpxamb", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/Flashforge/Flashforge PLA @FF AD3.json b/resources/profiles/Flashforge/filament/Flashforge/Flashforge PLA @FF AD3.json index 8234e6f07a..8f3483dce2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge/Flashforge PLA @FF AD3.json +++ b/resources/profiles/Flashforge/filament/Flashforge/Flashforge PLA @FF AD3.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "qnKvMRUvJ7tRJ4dX", - "filament_id": "FFF01", + "filament_id": "OFDKgoqx", "instantiation": "true", "filament_vendor": [ "Flashforge" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json index 646f8971b2..a9a3418254 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "2JQjReK012FHpHIt", - "filament_id": "OF6FM5F7", + "filament_id": "OF42ZDpN", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json index 7bb5e8906a..18df8ac124 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "3SCkpXXK8VcQBMQn", - "filament_id": "OF6FM5F7", + "filament_id": "OF42ZDpN", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json index b0cb4812c8..0f1754ae6c 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "dgpcOrf7282LTh1d", - "filament_id": "OF6FM5F7", + "filament_id": "OF42ZDpN", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json index dbccec4551..d6a0d3bd5d 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "e85SCr6SV9kQD2hm", - "filament_id": "OF6FM5F7", + "filament_id": "OF42ZDpN", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json index a780bd8dd8..c6970afe6a 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "eGXsHN5B9BZViVNe", - "filament_id": "OF6FM5F7", + "filament_id": "OF42ZDpN", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json index 07e8702da2..70d29c3c5d 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "8JSb4JqZ7zLi8uPI", - "filament_id": "OF6FM5F7", + "filament_id": "OF42ZDpN", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 c88d025a64..e7647aff3f 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "gZqAGVOlWR79n7hN", - "filament_id": "OFSdF3B1", + "filament_id": "OFYtS9zg", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 b1f762dd7a..a8dc9a771b 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "nJF1lCOavNNh4yHs", - "filament_id": "OFSdF3B1", + "filament_id": "OFYtS9zg", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json index dc949095de..4bb5bfff69 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "TZ0nKqxoIYk2mPh8", - "filament_id": "OFSdF3B1", + "filament_id": "OFYtS9zg", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 2e264e4b2f..4ae7d696a8 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "nH6pwFYsPyBzL1EB", - "filament_id": "OFSdF3B1", + "filament_id": "OFYtS9zg", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json index d5cb85c1bc..d359420582 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "yok12IOGZzGot5Ll", - "filament_id": "OFSdF3B1", + "filament_id": "OFYtS9zg", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 0aaa19dd68..8ef405d524 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "wmWMf3MfmbfZx2o8", - "filament_id": "OFSdF3B1", + "filament_id": "OFYtS9zg", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json index 2892bfac6a..4befc54c32 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Xqb0GQluin2jUQyL", - "filament_id": "OFLxO2Oc", + "filament_id": "OFBC32Wb", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json index 5f464b11cf..0d57937da9 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "A8PDgw1jZE2m3bem", - "filament_id": "OF6SEkeJ", + "filament_id": "OFB8wSps", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json index e2584bb9ed..c9eb3cafd7 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "Iy5lHY4ihEKPgJ5x", - "filament_id": "OF6SEkeJ", + "filament_id": "OFB8wSps", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json index a6fb057638..7f07f612f6 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Kdeg55RzLMYhqYMC", - "filament_id": "OF6SEkeJ", + "filament_id": "OFB8wSps", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json index a94efd16a0..a3c7a4372e 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "JXf7KCy4KY65xuzO", - "filament_id": "OF6SEkeJ", + "filament_id": "OFB8wSps", "instantiation": "true", "additional_cooling_fan_speed": [ "0" 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 e3652a2989..dfdd46fb57 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "O3tz36NNMoagELL0", - "filament_id": "OFAtydxE", + "filament_id": "OFUScM0D", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 b05cdc7517..d84fd5aeb0 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "Gg9H6I32fOqoLSqE", - "filament_id": "OFAtydxE", + "filament_id": "OFUScM0D", "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 700ebeea67..248fbb5ce1 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "pV5QERvRuROIZTOa", - "filament_id": "OF0UbONm", + "filament_id": "OF6WddJ1", "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", 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 e49b64860a..538d1e5c0f 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "0i7VkquM4n0uFaXH", - "filament_id": "OF0UbONm", + "filament_id": "OF6WddJ1", "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json index 54bedf7278..088e4ac1b7 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "TZDKsooodaGVkM4m", - "filament_id": "OF5kwfZu", + "filament_id": "OFZ1hANN", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json index 9201c77b22..ebd0a01ed4 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "NdNRNhmsHgHRnz1Z", - "filament_id": "OFYICbI4", + "filament_id": "OFPjOUtz", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json index 37b5e26001..5b959efeae 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "fR7maJwWmteJ7bWY", - "filament_id": "OFYICbI4", + "filament_id": "OFPjOUtz", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json index 1af16ac51a..c35726f024 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PAHT-CF", "from": "system", "setting_id": "gLG1R5gtdliSlnZJ", - "filament_id": "OFoAaHcF", + "filament_id": "OF2RjrWH", "instantiation": "true", "filament_max_volumetric_speed": [ "15" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json index b68ea0efb9..acb65a33dc 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "AaGdNgYaIIZyZBiW", - "filament_id": "OFKZH00L", + "filament_id": "OFRujL0v", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json index b87e15f2df..a526ad1e0c 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "jJVDAlGTt1QJlbn8", - "filament_id": "OFKZH00L", + "filament_id": "OFRujL0v", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json index 06760b4e08..e80c963649 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF", "from": "system", "setting_id": "IEpmsltdjoCu2txJ", - "filament_id": "OFAdZFD1", + "filament_id": "OF4zzGwp", "instantiation": "true", "filament_max_volumetric_speed": [ "15" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json index 24c8414b2e..963d3ab54d 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "foH2sa61cDy12TzH", - "filament_id": "OFGfdP6J", + "filament_id": "OF6rMr3U", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json index 66b94a8bc0..9ebf2fcdad 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "gQLoSJ7xGEdOd8kr", - "filament_id": "OFGfdP6J", + "filament_id": "OF6rMr3U", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json index 5fa539c9d8..b3b537bfb3 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "6Z5vce5YKlCGox8v", - "filament_id": "OFjepy6j", + "filament_id": "OFCaJHAA", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json index 6c09203af8..66c208d2d3 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "kMYDFSwivzTjFo2L", - "filament_id": "OFjepy6j", + "filament_id": "OFCaJHAA", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json index a526cc23ff..d4947b14fb 100644 --- a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic ABS", "from": "system", "setting_id": "lS237JRDRMQgJFzd", - "filament_id": "GFB99", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "1.093" diff --git a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json index fc6281092e..f823512bcf 100644 --- a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic ASA", "from": "system", "setting_id": "tq7YmJohYaNiPplE", - "filament_id": "OFRR8LUh", + "filament_id": "OFLPAxz3", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json index e43dda4e39..906b5af508 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "cvJIaPzb0uJLipX1", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json index 3575a60b49..83744365bd 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "wguPruY9M7GcMt6q", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json index 2fc765ea4a..0e279cd8cb 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "EhobwmFIEg5Cs5Ki", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4.json index 2e17832b77..77114b937f 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "JvdxJyy7xCm3F0xH", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json index ca87808d1f..68d26b5ff5 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "FtwGLcPMQqKw5uKW", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json index 22ed7da7df..9a6a079a2e 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "lrnsjoh8DtnTcT7g", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json index 3f30b9a2a5..222c3f3085 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Th8rzyWoINHBwgcw", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json index 6c797966fe..346c467bd6 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "1Lyq9gOfcZ5hPIdW", - "filament_id": "OFjqPjjl", + "filament_id": "OF6MOPWx", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json index 8122a7e3b5..d18f7bc5c4 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG", "from": "system", "setting_id": "6vtyYCWYY10OPMbz", - "filament_id": "GFG99", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_flow_ratio": [ "1.09" diff --git a/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json index 70b143a5e1..a405594914 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PETG-CF10", "from": "system", "setting_id": "fWM9WLGV9mUQOtHh", - "filament_id": "OFo9EwvK", + "filament_id": "OFO5djrM", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json index 39afe0a2c2..e8d34603f3 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "48NJ34G6Uo7VgzD4", - "filament_id": "GFL99", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "1.07" diff --git a/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json index 77e0ed35fd..73ed3cbbaa 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic HS PLA", "from": "system", "setting_id": "B4EWBUa9G36lZUd7", - "filament_id": "GFL99", + "filament_id": "OFmpMwxS", "instantiation": "true", "bed_temperature_difference": [ "10" diff --git a/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json index fc4a67290a..d10e6d527c 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json @@ -5,7 +5,7 @@ "inherits": "Flashforge Generic PLA-Silk", "from": "system", "setting_id": "9FrKIXABj3yedXri", - "filament_id": "OGFL96", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_flow_ratio": [ "1.07" diff --git a/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json index fe64023c22..1867ff0281 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA-CF10", "from": "system", "setting_id": "F8r0b3G228QEK53U", - "filament_id": "OF6XIeUW", + "filament_id": "OFX2zcrM", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json index 74bee8eab1..b46926fe5e 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "WQyJHZpkl9Dz6Yo3", - "filament_id": "OFuswXlp", + "filament_id": "OFulOdT2", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json index fa2c3bb233..01b1fbe328 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "qRqhbOYn5TMfccem", - "filament_id": "OFuswXlp", + "filament_id": "OFulOdT2", "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json index 591a5b2f40..f1d682cfca 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "LTZCFxkzkGCnUMAR", - "filament_id": "OFuswXlp", + "filament_id": "OFulOdT2", "instantiation": "true", "cool_plate_temp": [ "40" diff --git a/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json index a21b8c2c74..685e0dce0f 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic TPU", "from": "system", "setting_id": "DW9Ck6xMK00Ry2iE", - "filament_id": "OF6Mxzsg", + "filament_id": "OFgbpcy9", "instantiation": "true", "additional_cooling_fan_speed": [ "100" 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 2c196808cc..d34dc09ee4 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "i59KgPtnplOJ8ZBh", - "filament_id": "OFvsS7Fb", + "filament_id": "OF5c6nq3", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 bee067f8c4..7b90c39711 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-64D @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ERMhwufaef91KJ1d", - "filament_id": "OFvsS7Fb", + "filament_id": "OF5c6nq3", "instantiation": "true", "activate_air_filtration": [ "1" 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 c4d1a43829..de84158ff1 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ZGmi7NF6Rn4idKjT", - "filament_id": "OFDkABjZ", + "filament_id": "OFJYpVAQ", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 fb963cb267..dae60389c1 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-90A @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "3SRFjKR5ezAukLYW", - "filament_id": "OFDkABjZ", + "filament_id": "OFJYpVAQ", "instantiation": "true", "activate_air_filtration": [ "1" 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 3f08572fcf..66f0535b0b 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ULqB7JfqebS8d00l", - "filament_id": "OFYRS7GZ", + "filament_id": "OFy48TOp", "instantiation": "true", "additional_cooling_fan_speed": [ "40" 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 2092ddb4f8..f44c131661 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Generic TPU-95A @FF C5P.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "EQzyVOtOJjpKyRMM", - "filament_id": "OFYRS7GZ", + "filament_id": "OFy48TOp", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json index 7a7abe02eb..5b9131d949 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "lALS0WwvUo5AYOq3", - "filament_id": "OFt9AiN5", + "filament_id": "OFIieIka", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json index 171353a08d..e6267540fb 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "tgRrYwnp5nr1yr9w", - "filament_id": "OFt9AiN5", + "filament_id": "OFIieIka", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json index ff217ef2e3..9f844651fa 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "yom6iIUUwU1MsZwF", - "filament_id": "OFt9AiN5", + "filament_id": "OFIieIka", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json index c687db6030..5117416c0a 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "ysj5nD1op08U8rUT", - "filament_id": "OFt9AiN5", + "filament_id": "OFIieIka", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json index 4fc3dfba55..1d6ac1b4c2 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "HBtkC3BfEpBGEWc5", - "filament_id": "OFt9AiN5", + "filament_id": "OFIieIka", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json index ed34f84c3f..f284af6a29 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json @@ -4,7 +4,7 @@ "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "zsW4MCpeL5qfzNfg", - "filament_id": "OFt9AiN5", + "filament_id": "OFIieIka", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json index 4e1efc3f9e..352f419c5e 100644 --- a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json +++ b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "t6CWYU3ZSddIjwhS", - "filament_id": "OFtEFtsz", + "filament_id": "OFwxpmHM", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json index fd1ff2433e..d55ea01f1d 100644 --- a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json +++ b/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json @@ -4,7 +4,7 @@ "inherits": "Flashforge Generic PLA", "from": "system", "setting_id": "NXQtHvtO4tyQ1ueu", - "filament_id": "OF9RZyBz", + "filament_id": "OFfegVpA", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PETG @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PETG @base.json index a29d5448ae..7e75980d63 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PETG @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PETG @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFSNL08", + "filament_id": "OF2GCW1l", "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": [ diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json index 84d20b77c5..994468c54d 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json @@ -4,7 +4,7 @@ "renamed_from": "SUNLU Marble PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL06", + "filament_id": "OFxUwUeW", "instantiation": "false", "filament_cost": [ "31.99" diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Matte @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Matte @base.json index 542dda9c1f..4445f8007a 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Matte @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL02", + "filament_id": "OFpW4gdi", "instantiation": "false", "filament_cost": [ "25.99" diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ 2.0 @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ 2.0 @base.json index c631debf6c..f343841042 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ 2.0 @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ 2.0 @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA+ 2.0 @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL04", + "filament_id": "OFHmPYRy", "instantiation": "false", "filament_cost": [ "18.99" diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ @base.json index f9eb2fe68d..98a628daeb 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA+ @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL03", + "filament_id": "OFMUWNkp", "instantiation": "false", "filament_cost": [ "18.99" diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU Silk PLA+ @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU Silk PLA+ @base.json index d4d6e8d0cb..60fa90f91a 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU Silk PLA+ @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU Silk PLA+ @base.json @@ -3,7 +3,7 @@ "name": "SUNLU Silk PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL05", + "filament_id": "OFpPGSKG", "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": [ diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU Wood PLA @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU Wood PLA @base.json index f81d0dfdfb..5617754e9e 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU Wood PLA @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU Wood PLA @base.json @@ -3,7 +3,7 @@ "name": "SUNLU Wood PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL07", + "filament_id": "OFLJ8S6I", "instantiation": "false", "filament_cost": [ "26.99" diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic ABS.json b/resources/profiles/FlyingBear/filament/FlyingBear Generic ABS.json index 7a296fea35..1bccf6a208 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic ABS.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "TDBNmmGSexhJjBVm", - "filament_id": "GFB99", + "filament_id": "OFBtlI8M", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PA-CF.json b/resources/profiles/FlyingBear/filament/FlyingBear Generic PA-CF.json index 4fe521fcce..4ed339e5cc 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PA-CF.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "lpa58hsu9IB697v8", - "filament_id": "GFN98", + "filament_id": "OFjoIVZ6", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PC.json b/resources/profiles/FlyingBear/filament/FlyingBear Generic PC.json index 92227f4254..6dd3af11ba 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PC.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "MkIN95sonzI0vNXT", - "filament_id": "GFC99", + "filament_id": "OFxTMg1d", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PETG.json b/resources/profiles/FlyingBear/filament/FlyingBear Generic PETG.json index 2bd49d16a1..b8a96a8154 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PETG.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "id0y4kfJciWjOwh6", - "filament_id": "GFG99", + "filament_id": "OFzXURfo", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PLA.json b/resources/profiles/FlyingBear/filament/FlyingBear Generic PLA.json index d41a0cdaa6..87c72dc870 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PLA.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "yCGisctQQwASw8kc", - "filament_id": "GFL99", + "filament_id": "OFFZ0BBL", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic TPU.json b/resources/profiles/FlyingBear/filament/FlyingBear Generic TPU.json index 1ae309f9e9..5c97c06efb 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic TPU.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "84YwyW2C94NdN1zl", - "filament_id": "GFU99", + "filament_id": "OFRzsaDK", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json b/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json index eca01c7a14..a125ff3ad2 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json +++ b/resources/profiles/FlyingBear/filament/FlyingBear PLA Hyper.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper", "from": "system", "setting_id": "72RZHGo7eACm2tN5", - "filament_id": "OFNz8rrn", + "filament_id": "OFD9taow", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json index 5147461208..bfb316494f 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear ABS @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @Ghost7", "from": "system", "setting_id": "UyTzid0zVMCxSrgx", - "filament_id": "OFnMW5jr", + "filament_id": "OFm4ysMO", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json index 5f2f9522fb..f8c0bcde19 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PA-CF @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @Ghost7", "from": "system", "setting_id": "NZwDOWmMdBYEejNQ", - "filament_id": "OFCKK3u9", + "filament_id": "OFQEGL7z", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json index 96f7e5a026..6dd9a695bf 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PC @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @Ghost7", "from": "system", "setting_id": "QYOEUrnmNMUcVOVF", - "filament_id": "OF4jILJA", + "filament_id": "OFFX1DRD", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PETG Basic @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PETG Basic @Ghost7.json index 6c727db151..c03f7a09ee 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PETG Basic @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PETG Basic @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @Ghost7", "from": "system", "setting_id": "k2os2FPNl8K7vTZN", - "filament_id": "GFG99", + "filament_id": "OFf6ynfH", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" 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 c970880f0c..85a926f7e9 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Basic @Ghost7.json @@ -5,7 +5,7 @@ "renamed_from": "FlyingBear PLA @Ghost7", "from": "system", "setting_id": "3JBTG6IDrBCnvIhf", - "filament_id": "OF50NUZI", + "filament_id": "OF3fwO8b", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json index 6e44f41595..eb744fd971 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear PLA Hyper @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @Ghost7", "from": "system", "setting_id": "qQZUolZHgJxgLo17", - "filament_id": "OFNz8rrn", + "filament_id": "OFD9taow", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear TPU Basic @Ghost7.json b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear TPU Basic @Ghost7.json index 8b66f6d1ca..6c7ebbab2e 100644 --- a/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear TPU Basic @Ghost7.json +++ b/resources/profiles/FlyingBear/filament/Ghost7/FlyingBear TPU Basic @Ghost7.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu @Ghost7", "from": "system", "setting_id": "wQQncT0OCAktGyHr", - "filament_id": "GFU99", + "filament_id": "OFHf2lKK", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json index af609d3348..7c2a4dc745 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear ABS @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @S1", "from": "system", "setting_id": "7dtepGnoDDAdPtUh", - "filament_id": "OFnMW5jr", + "filament_id": "OFm4ysMO", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json index c94440b570..852af29fdd 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PA-CF @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @S1", "from": "system", "setting_id": "CLggyaDcebZSbqIH", - "filament_id": "OFCKK3u9", + "filament_id": "OFQEGL7z", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json index 41c4c28166..a546a5ed5b 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PC @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @S1", "from": "system", "setting_id": "bPeSARy9AGqM8Y32", - "filament_id": "OF4jILJA", + "filament_id": "OFFX1DRD", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json index 3145034b51..206929433a 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PETG @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @S1", "from": "system", "setting_id": "yKU5mMW0nKvNH98B", - "filament_id": "OFg4N6ZL", + "filament_id": "OFDgQaca", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json index 7ded765608..4f8637c29d 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @S1", "from": "system", "setting_id": "k58jL17n8cOla3Gd", - "filament_id": "OFBGxHgT", + "filament_id": "OFilD4bP", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json index f422d04c4e..82978a61be 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear PLA Hyper @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @S1", "from": "system", "setting_id": "h8XGgMBjEwxNkldf", - "filament_id": "OFNz8rrn", + "filament_id": "OFD9taow", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json b/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json index 57c0c169d3..27bc1a6ba5 100644 --- a/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/FlyingBear TPU @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu @S1", "from": "system", "setting_id": "IVFpAlGo8KButueJ", - "filament_id": "OFYfZgxU", + "filament_id": "OFYezc6s", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json b/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json index 9b28644704..7dedb1f5cf 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other ABS @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs_other @S1", "from": "system", "setting_id": "Nadd5NX7eDvEnlKO", - "filament_id": "OFVJXE4n", + "filament_id": "OFYuowge", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json index 074988bb61..0e4cace2f1 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PA-CF @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa_other @S1", "from": "system", "setting_id": "sSKkzXv1cn33fF7p", - "filament_id": "OFLiTjQK", + "filament_id": "OFkAltI8", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json index 47bc577217..a2dfa6158b 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PC @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc_other @S1", "from": "system", "setting_id": "mHuxaHppNFZbldHD", - "filament_id": "OFTbdJyT", + "filament_id": "OFyRCIMh", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json index bc460077c8..f2e5665dc4 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PETG @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet_other @S1", "from": "system", "setting_id": "Ko5q6BgADth36RJC", - "filament_id": "OFuPN3iW", + "filament_id": "OFDRpXLZ", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json index 79007e6e83..7b767cf298 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PLA @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_other @S1", "from": "system", "setting_id": "sayo3sMQKH4ZdhEk", - "filament_id": "OF5Ugv12", + "filament_id": "OFGJ1nxs", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json b/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json index 58243ad2bc..1104767ce9 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other PLA Hyper @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper_other @S1", "from": "system", "setting_id": "2QHCKH0yDmBzpQnY", - "filament_id": "OFFmJ8aR", + "filament_id": "OFklJcWK", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json b/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json index 2c3632740e..4202a54091 100644 --- a/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json +++ b/resources/profiles/FlyingBear/filament/S1/Other TPU @S1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu_other @S1", "from": "system", "setting_id": "wh8PHrEbFYKsQxo0", - "filament_id": "OFvOhSjO", + "filament_id": "OFwVVKEV", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json b/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json index 3437d6f571..e72d770f16 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json +++ b/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "ue95N2e65rdp5K6c", - "filament_id": "P510eff9", + "filament_id": "OFsGqI4y", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json b/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json index 4575f32060..3d8e746316 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json +++ b/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "Z1scjKDBFoDaTa2C", - "filament_id": "OFziUL2X", + "filament_id": "OFlLmUeV", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json index d0a6f7dc61..715649fabd 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech ABS @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @EX+APS", "from": "system", "setting_id": "3EdHfL9KE4oRVHB7", - "filament_id": "OFVBNoov", + "filament_id": "OF0c7mnL", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json index c2b0d8543f..677e39587e 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PA-CF @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @EX+APS", "from": "system", "setting_id": "6YMXdKicP2hGUUJn", - "filament_id": "OFb3UzMZ", + "filament_id": "OFnXrkhA", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json index df76f5ffe8..3ce073a006 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PC @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @EX+APS", "from": "system", "setting_id": "GsYpyooWb6ymAb36", - "filament_id": "OFTsGps3", + "filament_id": "OFf6ZEvu", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json index d04816c3f0..993574d86c 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PETG @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @EX+APS", "from": "system", "setting_id": "sNsRp3vHhcWAxp7d", - "filament_id": "OFvaXhYD", + "filament_id": "OFrLiqiM", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json index e1a7aaa359..12b79b7722 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Basic @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @EX+APS", "from": "system", "setting_id": "UTrjyqqetOSYNZxJ", - "filament_id": "OFuq9tqb", + "filament_id": "OFObG16Q", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json index aecb50b1a4..b857cabc2b 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech PLA Hyper @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @EX+APS", "from": "system", "setting_id": "p08bW50lbzMjwL5B", - "filament_id": "OFefhSuj", + "filament_id": "OF3ydJTT", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/EX+APS/InfiMech TPU Basic @EX+APS.json b/resources/profiles/InfiMech/filament/EX+APS/InfiMech TPU Basic @EX+APS.json index 9632d002fb..1396c07546 100644 --- a/resources/profiles/InfiMech/filament/EX+APS/InfiMech TPU Basic @EX+APS.json +++ b/resources/profiles/InfiMech/filament/EX+APS/InfiMech TPU Basic @EX+APS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu @EX+APS", "from": "system", "setting_id": "fy9sPlaVkaXHBxbH", - "filament_id": "GFU99", + "filament_id": "OFbSZBOi", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json index 080a6dfede..4aa2e82fd8 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech ABS @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @EX", "from": "system", "setting_id": "e6st01mMFr98LVEH", - "filament_id": "OFVBNoov", + "filament_id": "OF0c7mnL", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json index 3beb4794b3..e328da4f73 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PA-CF @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @EX", "from": "system", "setting_id": "qPCd5oTrCmZi63Ng", - "filament_id": "OFb3UzMZ", + "filament_id": "OFnXrkhA", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json index 2e0ecd34bd..438743bac4 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PC @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @EX", "from": "system", "setting_id": "Uc2o223YSyShp7EI", - "filament_id": "OFTsGps3", + "filament_id": "OFf6ZEvu", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json index 9f7230ea11..30c38c5a07 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PETG @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @EX", "from": "system", "setting_id": "5vqLJrKLKv40sT7y", - "filament_id": "OFvaXhYD", + "filament_id": "OFrLiqiM", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json index cb78703d14..f0ab2e094d 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Basic @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @EX", "from": "system", "setting_id": "bGOpriWvEFZOmqR4", - "filament_id": "OFuq9tqb", + "filament_id": "OFObG16Q", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json index 57ec47283d..3c88c1af03 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech PLA Hyper @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @EX", "from": "system", "setting_id": "y8A92Dw8EMplnZAM", - "filament_id": "OFefhSuj", + "filament_id": "OF3ydJTT", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/EX/InfiMech TPU Basic @EX.json b/resources/profiles/InfiMech/filament/EX/InfiMech TPU Basic @EX.json index b72767fc58..fc78851c8b 100644 --- a/resources/profiles/InfiMech/filament/EX/InfiMech TPU Basic @EX.json +++ b/resources/profiles/InfiMech/filament/EX/InfiMech TPU Basic @EX.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu @EX", "from": "system", "setting_id": "vAMeXNwHNVMKYWz3", - "filament_id": "GFU99", + "filament_id": "OFbSZBOi", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json index 2c6f0a1f18..fd57e1f375 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech ABS @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs @HSN", "from": "system", "setting_id": "QnEhnvxibr6g1nou", - "filament_id": "OFVBNoov", + "filament_id": "OF0c7mnL", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json index 0aa59d2664..d798d7803c 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PA-CF @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa @HSN", "from": "system", "setting_id": "L1j3mDKXjE2RKO1B", - "filament_id": "OFb3UzMZ", + "filament_id": "OFnXrkhA", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json index a8a0810980..41bf6e142f 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PC @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc @HSN", "from": "system", "setting_id": "HBNOABPFLninXsW6", - "filament_id": "OFTsGps3", + "filament_id": "OFf6ZEvu", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json index c4873f921e..7102e440cd 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PETG @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet @HSN", "from": "system", "setting_id": "DJyFBjQ5n9n1UHv0", - "filament_id": "OFvaXhYD", + "filament_id": "OFrLiqiM", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json index 8a5765eac9..d2803e44b4 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla @HSN", "from": "system", "setting_id": "NWKMG5q4ITfHcYOD", - "filament_id": "OFKzh9lx", + "filament_id": "OFUYCqtB", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json index 52cbdd6732..6f91f0f360 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech PLA Hyper @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper @HSN", "from": "system", "setting_id": "fAw5pB53L8ZT1Fkm", - "filament_id": "OFefhSuj", + "filament_id": "OF3ydJTT", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json b/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json index 4716c5ac9b..7ba202db61 100644 --- a/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/InfiMech TPU @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu @HSN", "from": "system", "setting_id": "CvTHZpKuTaGS186F", - "filament_id": "OFmcJsqt", + "filament_id": "OFIVWJPm", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json index 5bcb620e15..7ba69d8119 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other ABS @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs_other @HSN", "from": "system", "setting_id": "IuZcFrVQ2rJoMDLP", - "filament_id": "OFAK2XjZ", + "filament_id": "OFYuowge", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json index 354cd3d8e3..091152a3e2 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PA-CF @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa_other @HSN", "from": "system", "setting_id": "4I0FW5meyC53Xf8n", - "filament_id": "OFSpTWdv", + "filament_id": "OFkAltI8", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json index daeed5e540..d0319e1a8d 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PC @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc_other @HSN", "from": "system", "setting_id": "vUuSuioOUXsg2P3p", - "filament_id": "OFyD1Zo8", + "filament_id": "OFyRCIMh", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json index 8aef779240..f9adba5c1e 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PETG @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet_other @HSN", "from": "system", "setting_id": "lWYq9XssEyY3uWEe", - "filament_id": "OFw05rkF", + "filament_id": "OFDRpXLZ", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json index 2788d2639f..1bc6c1a439 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PLA @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_other @HSN", "from": "system", "setting_id": "wOExDniXvR7CcF1w", - "filament_id": "OFS3HrR1", + "filament_id": "OFGJ1nxs", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json index 26fe3ad6ff..53fa4de6e6 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other PLA Hyper @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper_other @HSN", "from": "system", "setting_id": "154azDg7YNNWCkNK", - "filament_id": "OFrbbq6E", + "filament_id": "OFklJcWK", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json b/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json index 83fb180e74..71c277b924 100644 --- a/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json +++ b/resources/profiles/InfiMech/filament/HSN/Other TPU @HSN.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu_other @HSN", "from": "system", "setting_id": "0bU2fl92vCQobYnt", - "filament_id": "OFFrbsvQ", + "filament_id": "OFwVVKEV", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic ABS.json b/resources/profiles/InfiMech/filament/InfiMech Generic ABS.json index 688f43673d..2b2223aec5 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic ABS.json +++ b/resources/profiles/InfiMech/filament/InfiMech Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "gtJ2ZoV8fxqqOXuv", - "filament_id": "GFB99", + "filament_id": "OFWbbuRY", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PA-CF.json b/resources/profiles/InfiMech/filament/InfiMech Generic PA-CF.json index 74be583957..cfd3b187ce 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PA-CF.json +++ b/resources/profiles/InfiMech/filament/InfiMech Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "k2NSIB3vVUoXGW9F", - "filament_id": "GFN98", + "filament_id": "OF6K467o", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PC.json b/resources/profiles/InfiMech/filament/InfiMech Generic PC.json index 2d2223271c..11d0153e01 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PC.json +++ b/resources/profiles/InfiMech/filament/InfiMech Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "emj9YLXtmKmeoYJa", - "filament_id": "GFC99", + "filament_id": "OF6xLvYg", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PETG.json b/resources/profiles/InfiMech/filament/InfiMech Generic PETG.json index 4837c0eb9e..7b5f094764 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PETG.json +++ b/resources/profiles/InfiMech/filament/InfiMech Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "rhXq50q3u2YxNRcE", - "filament_id": "GFG99", + "filament_id": "OFs2ReMr", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PLA.json b/resources/profiles/InfiMech/filament/InfiMech Generic PLA.json index 0fa96a3fca..cdb8dc6563 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PLA.json +++ b/resources/profiles/InfiMech/filament/InfiMech Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "BHNIPk7Nbl7hXZY1", - "filament_id": "GFL99", + "filament_id": "OFrQqCwL", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic TPU.json b/resources/profiles/InfiMech/filament/InfiMech Generic TPU.json index f942042dfd..be76c39b21 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic TPU.json +++ b/resources/profiles/InfiMech/filament/InfiMech Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "pHS9IcwvsPCnkpaO", - "filament_id": "GFU99", + "filament_id": "OFc0xiCz", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json b/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json index f7cc33ef70..d90023a4bf 100644 --- a/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json +++ b/resources/profiles/InfiMech/filament/InfiMech PLA Hyper.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper", "from": "system", "setting_id": "j86QMTif4fGujRbg", - "filament_id": "OFefhSuj", + "filament_id": "OF3ydJTT", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other ABS.json b/resources/profiles/InfiMech/filament/Other ABS.json index d2d4fc2a21..897962d0a1 100644 --- a/resources/profiles/InfiMech/filament/Other ABS.json +++ b/resources/profiles/InfiMech/filament/Other ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs_other", "from": "system", "setting_id": "nDLB3RZq23limiBn", - "filament_id": "OFAK2XjZ", + "filament_id": "OFYuowge", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other PA-CF.json b/resources/profiles/InfiMech/filament/Other PA-CF.json index 37a58115f9..43be7b9024 100644 --- a/resources/profiles/InfiMech/filament/Other PA-CF.json +++ b/resources/profiles/InfiMech/filament/Other PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa_other", "from": "system", "setting_id": "rgz4LjU9KyvbLhRQ", - "filament_id": "OFSpTWdv", + "filament_id": "OFkAltI8", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/InfiMech/filament/Other PC.json b/resources/profiles/InfiMech/filament/Other PC.json index 212ed3117e..be8f684ebf 100644 --- a/resources/profiles/InfiMech/filament/Other PC.json +++ b/resources/profiles/InfiMech/filament/Other PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc_other", "from": "system", "setting_id": "VXkW5oukQdBX6B6T", - "filament_id": "OFyD1Zo8", + "filament_id": "OFyRCIMh", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/InfiMech/filament/Other PETG.json b/resources/profiles/InfiMech/filament/Other PETG.json index 4d5ecee6c4..216c4a964c 100644 --- a/resources/profiles/InfiMech/filament/Other PETG.json +++ b/resources/profiles/InfiMech/filament/Other PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet_other", "from": "system", "setting_id": "onLEWi8GYK0avard", - "filament_id": "OFw05rkF", + "filament_id": "OFDRpXLZ", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/InfiMech/filament/Other PLA Hyper.json b/resources/profiles/InfiMech/filament/Other PLA Hyper.json index 44ec23e383..9ddd68581a 100644 --- a/resources/profiles/InfiMech/filament/Other PLA Hyper.json +++ b/resources/profiles/InfiMech/filament/Other PLA Hyper.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_Hyper_other", "from": "system", "setting_id": "Iop52BLp5ou8u4QG", - "filament_id": "OFrbbq6E", + "filament_id": "OFklJcWK", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other PLA.json b/resources/profiles/InfiMech/filament/Other PLA.json index 5e4a3eddd6..62c32ee9ef 100644 --- a/resources/profiles/InfiMech/filament/Other PLA.json +++ b/resources/profiles/InfiMech/filament/Other PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla_other", "from": "system", "setting_id": "2Bl4sfgGJBjNMk37", - "filament_id": "OFS3HrR1", + "filament_id": "OFGJ1nxs", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/InfiMech/filament/Other TPU.json b/resources/profiles/InfiMech/filament/Other TPU.json index 656c5a9e81..1af02b2659 100644 --- a/resources/profiles/InfiMech/filament/Other TPU.json +++ b/resources/profiles/InfiMech/filament/Other TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu_other", "from": "system", "setting_id": "nqDc2q94Q2hwMi7B", - "filament_id": "OFFrbsvQ", + "filament_id": "OFwVVKEV", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/LH/filament/LHS ABS.json b/resources/profiles/LH/filament/LHS ABS.json index 28fe82243d..2e7ee48e32 100644 --- a/resources/profiles/LH/filament/LHS ABS.json +++ b/resources/profiles/LH/filament/LHS ABS.json @@ -1,7 +1,7 @@ { "name": "LHS ABS", "type": "filament", - "filament_id": "LHF_abs", + "filament_id": "OFztQ7rO", "setting_id": "EQxNYC7BdGEA2iiD", "from": "system", "instantiation": "true", diff --git a/resources/profiles/LH/filament/LHS ASA.json b/resources/profiles/LH/filament/LHS ASA.json index 8d8de19dfa..4cc096cb90 100644 --- a/resources/profiles/LH/filament/LHS ASA.json +++ b/resources/profiles/LH/filament/LHS ASA.json @@ -1,6 +1,6 @@ { "name": "LHS ASA", - "filament_id": "LHF_asa", + "filament_id": "OFaP2SsH", "setting_id": "hoq5bKHUb9DE1ezj", "type": "filament", "from": "system", diff --git a/resources/profiles/LH/filament/LHS PC CF.json b/resources/profiles/LH/filament/LHS PC CF.json index e565b5a9ab..54db9bf7fa 100644 --- a/resources/profiles/LH/filament/LHS PC CF.json +++ b/resources/profiles/LH/filament/LHS PC CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "FOQLD0UX6hUhJBQ0", - "filament_id": "LHF_pccf", + "filament_id": "OFu0fjPJ", "instantiation": "true", "compatible_printers": [ "LH Stinger 0.4 nozzle", diff --git a/resources/profiles/LH/filament/LHS PCTG.json b/resources/profiles/LH/filament/LHS PCTG.json index a2593c22b7..2f2a7d2fd6 100644 --- a/resources/profiles/LH/filament/LHS PCTG.json +++ b/resources/profiles/LH/filament/LHS PCTG.json @@ -1,7 +1,7 @@ { "name": "LHS PCTG", "type": "filament", - "filament_id": "LHF_pctg", + "filament_id": "OFBJAdLw", "setting_id": "dKWttiAQNwymKsIC", "from": "system", "instantiation": "true", diff --git a/resources/profiles/LH/filament/LHS PETG.json b/resources/profiles/LH/filament/LHS PETG.json index 2c960c477c..2956267dab 100644 --- a/resources/profiles/LH/filament/LHS PETG.json +++ b/resources/profiles/LH/filament/LHS PETG.json @@ -1,7 +1,7 @@ { "name": "LHS PETG", "type": "filament", - "filament_id": "LHF_petg", + "filament_id": "OFRJ325z", "setting_id": "aZdY1M44ui7Rtj8r", "from": "system", "instantiation": "true", diff --git a/resources/profiles/LH/filament/LHS PLA.json b/resources/profiles/LH/filament/LHS PLA.json index 285fd76c13..87ef788b7d 100644 --- a/resources/profiles/LH/filament/LHS PLA.json +++ b/resources/profiles/LH/filament/LHS PLA.json @@ -1,7 +1,7 @@ { "name": "LHS PLA", "type": "filament", - "filament_id": "LHF_pla", + "filament_id": "OFyoBZdm", "setting_id": "M8WSwqD1iQkQntpy", "from": "system", "instantiation": "true", diff --git a/resources/profiles/LH/filament/LHS TPU Foamy 78A.json b/resources/profiles/LH/filament/LHS TPU Foamy 78A.json index 47e4c606c6..3be659400a 100644 --- a/resources/profiles/LH/filament/LHS TPU Foamy 78A.json +++ b/resources/profiles/LH/filament/LHS TPU Foamy 78A.json @@ -1,7 +1,7 @@ { "name": "LHS TPU Foamy 78A", "type": "filament", - "filament_id": "LHF_ftpuf", + "filament_id": "OFngcE81", "setting_id": "FWyg21qHmAKeihMn", "from": "system", "instantiation": "true", diff --git a/resources/profiles/LH/filament/LHS TPU.json b/resources/profiles/LH/filament/LHS TPU.json index fc877eb084..f503425bd4 100644 --- a/resources/profiles/LH/filament/LHS TPU.json +++ b/resources/profiles/LH/filament/LHS TPU.json @@ -1,7 +1,7 @@ { "name": "LHS TPU", "type": "filament", - "filament_id": "LHF_ptpu_pl", + "filament_id": "OFIZMQwM", "setting_id": "ILgpZYIqYGH6mqdI", "from": "system", "instantiation": "true", diff --git a/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10 Plus.json b/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10 Plus.json index c27280bf49..af61062d28 100644 --- a/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10 Plus.json +++ b/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10 Plus.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "F6pgS8fPQFnN4R0n", - "filament_id": "GFLLK10PPETG", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10.json b/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10.json index 48343c508d..114c1aa3f8 100644 --- a/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10.json +++ b/resources/profiles/LONGER/filament/Generic PETG @LONGER LK10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "hWuf5kvAA5dXSd8f", - "filament_id": "GFLLK10PETG", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10 Plus.json b/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10 Plus.json index 7eccd144bd..01f5024a14 100644 --- a/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10 Plus.json +++ b/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10 Plus.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "N4pabxIYPI8KHgVp", - "filament_id": "GFLLK10PPLA", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10.json b/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10.json index fe91a5388b..9827cce1db 100644 --- a/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10.json +++ b/resources/profiles/LONGER/filament/Generic PLA @LONGER LK10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "BLf7EiZ9yayoKwJy", - "filament_id": "GFLLK10PLA", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm ABS.json b/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm ABS.json index c91c38c8e9..002c664cc2 100644 --- a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm ABS.json +++ b/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "XwsWBVH2xIwyRMm4", - "filament_id": "GFB99", + "filament_id": "OF6O67Xk", "instantiation": "true", "filament_diameter": [ "2.85" diff --git a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PETG.json b/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PETG.json index 748d8de25b..343900a1ce 100644 --- a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PETG.json +++ b/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "7aS9fdn94lEOU1gJ", - "filament_id": "GFG99", + "filament_id": "OF8eQjjt", "instantiation": "true", "filament_diameter": [ "2.85" diff --git a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PLA.json b/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PLA.json index 23547bfafc..89e0681b45 100644 --- a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PLA.json +++ b/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "1pyzsOWeVPCxWlqQ", - "filament_id": "GFL99", + "filament_id": "OFPryWt5", "instantiation": "true", "filament_diameter": [ "2.85" diff --git a/resources/profiles/MagicMaker/filament/MM Generic PEEK.json b/resources/profiles/MagicMaker/filament/MM Generic PEEK.json index 75b905476e..cfa53426f6 100644 --- a/resources/profiles/MagicMaker/filament/MM Generic PEEK.json +++ b/resources/profiles/MagicMaker/filament/MM Generic PEEK.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_peek", "from": "system", "setting_id": "iznBAOK0m6dO7SCh", - "filament_id": "GFG99", + "filament_id": "OFgSPtDn", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/OrcaArena/filament/Arena ABS @base.json b/resources/profiles/OrcaArena/filament/Arena ABS @base.json index 6b8bffc802..e2ae90f59d 100644 --- a/resources/profiles/OrcaArena/filament/Arena ABS @base.json +++ b/resources/profiles/OrcaArena/filament/Arena ABS @base.json @@ -3,7 +3,7 @@ "name": "Arena ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB00", + "filament_id": "OFJ3HRsR", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/Arena PA-CF @base.json b/resources/profiles/OrcaArena/filament/Arena PA-CF @base.json index 3cca273276..dfd447f93d 100644 --- a/resources/profiles/OrcaArena/filament/Arena PA-CF @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Arena PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN03", + "filament_id": "OFA026vt", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/OrcaArena/filament/Arena PAHT-CF @base.json b/resources/profiles/OrcaArena/filament/Arena PAHT-CF @base.json index bd91f8f92b..e792d76bdc 100644 --- a/resources/profiles/OrcaArena/filament/Arena PAHT-CF @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PAHT-CF @base.json @@ -3,7 +3,7 @@ "name": "Arena PAHT-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN04", + "filament_id": "OFtOPlK6", "instantiation": "false", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/OrcaArena/filament/Arena PC @base.json b/resources/profiles/OrcaArena/filament/Arena PC @base.json index 912971768d..5af0a9af69 100644 --- a/resources/profiles/OrcaArena/filament/Arena PC @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PC @base.json @@ -3,7 +3,7 @@ "name": "Arena PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GFC00", + "filament_id": "OFrr67nG", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PET-CF @base.json b/resources/profiles/OrcaArena/filament/Arena PET-CF @base.json index ec29afee99..a17488fff1 100644 --- a/resources/profiles/OrcaArena/filament/Arena PET-CF @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PET-CF @base.json @@ -3,7 +3,7 @@ "name": "Arena PET-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFT01", + "filament_id": "OFc87pL3", "instantiation": "false", "temperature_vitrification": [ "185" diff --git a/resources/profiles/OrcaArena/filament/Arena PETG Basic @base.json b/resources/profiles/OrcaArena/filament/Arena PETG Basic @base.json index ca09ce05bd..ed01353b35 100644 --- a/resources/profiles/OrcaArena/filament/Arena PETG Basic @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PETG Basic @base.json @@ -3,7 +3,7 @@ "name": "Arena PETG Basic @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG00", + "filament_id": "OFNBlAPT", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/Arena PETG-CF @base.json b/resources/profiles/OrcaArena/filament/Arena PETG-CF @base.json index 06a32d1956..b3b69c736f 100644 --- a/resources/profiles/OrcaArena/filament/Arena PETG-CF @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Arena PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG50", + "filament_id": "OFuO0cAP", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Basic @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Basic @base.json index 15fee6343b..c42ca761e0 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Basic @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Basic @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA00", + "filament_id": "OFSbGfsz", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Impact @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Impact @base.json index d049672842..04c28f1ec2 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Impact @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Impact @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Impact @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA03", + "filament_id": "OFjXrKFO", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Marble @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Marble @base.json index 95a18a2e21..58a7efc0e7 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Marble @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Marble @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA07", + "filament_id": "OFuehn62", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Matte @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Matte @base.json index d90b362299..b2293d70c8 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Matte @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA01", + "filament_id": "OFgptDSf", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Metal @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Metal @base.json index 3071459e05..5e71a14838 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Metal @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Metal @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Metal @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA02", + "filament_id": "OFOAdMCB", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Silk @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Silk @base.json index d3929f3c24..93554f77df 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Silk @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA05", + "filament_id": "OFmfizbq", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @base.json index db96b66e28..dc823a97f5 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Sparkle @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Sparkle @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA08", + "filament_id": "OFyHgT60", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA Tough @base.json b/resources/profiles/OrcaArena/filament/Arena PLA Tough @base.json index 6f2d30c051..38ae042314 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA Tough @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA Tough @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA Tough @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA09", + "filament_id": "OFtKeKa9", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena PLA-CF @base.json b/resources/profiles/OrcaArena/filament/Arena PLA-CF @base.json index c0783f0a03..c3acf67b7c 100644 --- a/resources/profiles/OrcaArena/filament/Arena PLA-CF @base.json +++ b/resources/profiles/OrcaArena/filament/Arena PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Arena PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA50", + "filament_id": "OF2hfMcG", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena Support G @base.json b/resources/profiles/OrcaArena/filament/Arena Support G @base.json index 72a18d0edd..2ab8eb1932 100644 --- a/resources/profiles/OrcaArena/filament/Arena Support G @base.json +++ b/resources/profiles/OrcaArena/filament/Arena Support G @base.json @@ -3,7 +3,7 @@ "name": "Arena Support G @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFS01", + "filament_id": "OFIPjqHt", "instantiation": "false", "required_nozzle_HRC": [ "3" diff --git a/resources/profiles/OrcaArena/filament/Arena Support W @base.json b/resources/profiles/OrcaArena/filament/Arena Support W @base.json index d51ee9c170..fa3733d2bc 100644 --- a/resources/profiles/OrcaArena/filament/Arena Support W @base.json +++ b/resources/profiles/OrcaArena/filament/Arena Support W @base.json @@ -3,7 +3,7 @@ "name": "Arena Support W @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFS00", + "filament_id": "OFI6WZpn", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/Arena TPU 95A @base.json b/resources/profiles/OrcaArena/filament/Arena TPU 95A @base.json index 0e6dec526f..b4069147be 100644 --- a/resources/profiles/OrcaArena/filament/Arena TPU 95A @base.json +++ b/resources/profiles/OrcaArena/filament/Arena TPU 95A @base.json @@ -3,7 +3,7 @@ "name": "Arena TPU 95A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU01", + "filament_id": "OFQGvU2G", "instantiation": "false", "filament_vendor": [ "Orca Arena" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json index ea3357846a..8a635421ee 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFetENFF", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json index cd0856f13f..26032a7d85 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFB98", + "filament_id": "OFmzftED", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json index caf87f47e9..2621b3cf05 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "XHOpI9EFQmYoJ3Sy", - "filament_id": "GFN98", + "filament_id": "OF4xhTuK", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json index 2f4438a82b..a95e022740 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "IintLqJOecQcKmA8", - "filament_id": "GFN99", + "filament_id": "OFmnJNqY", "instantiation": "true", "required_nozzle_HRC": [ "3" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json index d3b97beca6..97bdbe2df1 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GFC99", + "filament_id": "OFXhZ3uY", "instantiation": "false", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json index 253c710014..a68c25c24a 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFgSEwOZ", "instantiation": "false", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json index b71f5d4536..ba3364a5c4 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG98", + "filament_id": "OFwpkvqf", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json index d7618a6f97..ade5634118 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFD6kN7F", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json index 88fca4407a..9a0dc73322 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFqSTJ3I", + "filament_id": "OFbeeFkl", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json index e3e0efe224..c73b9fc480 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL98", + "filament_id": "OFx0ZzFV", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json index 42d91f10bc..53da039f09 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json @@ -3,7 +3,7 @@ "name": "OrcaArena Generic PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "GFS99", + "filament_id": "OFdLdGgJ", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json index a1451c04fd..8593c5c779 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json +++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "uPHnZUr5Sb16uKZm", - "filament_id": "GFU99", + "filament_id": "OFU5N9jI", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/OrcaArena/filament/PolyLite PLA @base.json b/resources/profiles/OrcaArena/filament/PolyLite PLA @base.json index 692492d21a..276bef31c5 100644 --- a/resources/profiles/OrcaArena/filament/PolyLite PLA @base.json +++ b/resources/profiles/OrcaArena/filament/PolyLite PLA @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL00", + "filament_id": "OF5CgdDq", "instantiation": "false", "filament_vendor": [ "Polymaker" diff --git a/resources/profiles/OrcaArena/filament/PolyTerra PLA @base.json b/resources/profiles/OrcaArena/filament/PolyTerra PLA @base.json index c572a15b91..6e167c7248 100644 --- a/resources/profiles/OrcaArena/filament/PolyTerra PLA @base.json +++ b/resources/profiles/OrcaArena/filament/PolyTerra PLA @base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL01", + "filament_id": "OFW29a9R", "instantiation": "false", "filament_vendor": [ "Polymaker" diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json b/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json index 7f38c6044a..ce0711b7e9 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json +++ b/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "ICnZH4LkPD7c6Lmm", - "filament_id": "GFSL99", + "filament_id": "OFqOk9Ww", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json b/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json index add7c8e295..2d0b34240a 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json +++ b/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_petg", "from": "system", "setting_id": "7LVGx2lNqhBDdYiJ", - "filament_id": "GFPETG-1", + "filament_id": "OFIeCuXj", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic PLA.json b/resources/profiles/Peopoly/filament/Peopoly Generic PLA.json index 100057e25b..3a24fb3bc7 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic PLA.json +++ b/resources/profiles/Peopoly/filament/Peopoly Generic PLA.json @@ -5,7 +5,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "KNsVV4dvEWAAkzDE", - "filament_id": "GFL99", + "filament_id": "OFRDLNM9", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json b/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json index b6da7244c7..fe53fb4651 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer ABS-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "ufcIVt3x0FqV69h4", - "filament_id": "OFqkcvDI", + "filament_id": "OFj64R5U", "instantiation": "true", "filament_flow_ratio": [ "0.91" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json index 1877ed8e3d..1629995edb 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PET-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "xSaZKOpjStJuKiM7", - "filament_id": "OFlzQ0IS", + "filament_id": "OFPYDWgC", "instantiation": "true", "filament_flow_ratio": [ "0.90" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json index 34e8f586a4..483e7163ca 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PETG-C.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_petg", "from": "system", "setting_id": "aUX6OHQrKPghlPBb", - "filament_id": "OFV1szQh", + "filament_id": "OFpPJSHE", "instantiation": "true", "fan_cooling_layer_time": [ "20" diff --git a/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json b/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json index d9d1acd1d5..a4bd236a62 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json +++ b/resources/profiles/Peopoly/filament/Peopoly Lancer PLA-C.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "EFHW4uKJCsBCjAEU", - "filament_id": "OF9tjFbj", + "filament_id": "OFEnbt6D", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Phrozen/filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json b/resources/profiles/Phrozen/filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json index 6453756f9e..8ca51614b6 100644 --- a/resources/profiles/Phrozen/filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json +++ b/resources/profiles/Phrozen/filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Cc3ULDFzvoHwh8bV", - "filament_id": "GFL99", + "filament_id": "OF6VgL2U", "instantiation": "true", "filament_settings_id": [ "Phrozen PLA @Phrozen Arco 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json index 0f666ab11b..ade8efad81 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @CORE One", "from": "system", "setting_id": "AADElwBWs9fzeAKC", - "filament_id": "Prusa Generic ABS @CORE One 0.6", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json index 6c046f232f..c6c30a2c6b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @CORE One", "from": "system", "setting_id": "QLaQiU2tF5ZFTVjP", - "filament_id": "Prusa Generic ABS @CORE One 0.8", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.4.json index f3c61471ed..84d2ed8ea6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @CORE One", "from": "system", "setting_id": "Sp0sbcvt0EqZ59NT", - "filament_id": "Prusa Generic ABS @CORE One HF 0.4", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.5.json index b6892f7630..568f8468e5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @CORE One", "from": "system", "setting_id": "U1ih5tnkViqI3vya", - "filament_id": "Prusa Generic ABS @CORE One HF 0.5", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.6.json index 1354767857..debed7aed6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @CORE One", "from": "system", "setting_id": "MuqHvIoTlM1Pbs8j", - "filament_id": "Prusa Generic ABS @CORE One HF 0.6", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.8.json index 513171ea52..66655ce8e8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @CORE One", "from": "system", "setting_id": "Wbpc2Ddzc3zPnQVr", - "filament_id": "Prusa Generic ABS @CORE One HF 0.8", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One.json index a5a1f6cce1..784eb0ef4d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "NajoyXhNAiyJyaRq", - "filament_id": "Prusa Generic ABS @CORE One", + "filament_id": "OFvGc67v", "instantiation": "true", "chamber_temperature": [ "40" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.25.json index e141e4925d..aacddbfd2d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "bQgom9OdLzHf862f", - "filament_id": "GFB99_5", + "filament_id": "OFvGc67v", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.6.json index 9108be7bd0..1b45ec65e7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "juio4SnE9x7bcYdO", - "filament_id": "GFB99_3", + "filament_id": "OFvGc67v", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.8.json index 67c49bfe9a..dfc5fbc984 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "dRt2nKkJ0saWba5s", - "filament_id": "GFB99_4", + "filament_id": "OFvGc67v", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5.json index c966113193..d0cc74cc63 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "etTLu2Uk95XriBxT", - "filament_id": "GFB99_2", + "filament_id": "OFvGc67v", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json index fb9f1a07e7..dd33eedfa7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @MK4S", "from": "system", "setting_id": "VVzzIN41B5ADTIeQ", - "filament_id": "Generic ABS @MK4S 0.6", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json index 856f2cfe6b..66b27bd6c3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @MK4S", "from": "system", "setting_id": "4705fRqWWP2GZOK8", - "filament_id": "Generic ABS @MK4S 0.8", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json index 8faf91c1df..ecd8ec0872 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @MK4S", "from": "system", "setting_id": "8iqhyZkLiVCvZYLa", - "filament_id": "Generic ABS @MK4S HF0.4", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json index 27f7e69c16..74f774bd11 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @MK4S HF0.4", "from": "system", "setting_id": "bf8ANklVcC0xW1rT", - "filament_id": "Generic ABS @MK4S HF0.5", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json index dd6439a0e4..3c461880c7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @MK4S HF0.4", "from": "system", "setting_id": "ZB9vO7AnRqMDCrOy", - "filament_id": "Generic ABS @MK4S HF0.6", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json index 3b359aa2fd..4d2d4631d5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ABS @MK4S HF0.4", "from": "system", "setting_id": "7cx9gZh2vUCR0ELG", - "filament_id": "Generic ABS @MK4S HF0.8", + "filament_id": "OFvGc67v", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json index 6880c7850d..37762490e5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "mDDX6Hdt6Ee00Iqb", - "filament_id": "Generic ABS @MK4S", + "filament_id": "OFvGc67v", "instantiation": "true", "close_fan_the_first_x_layers": "4", "compatible_printers": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json index ffa4525a5a..c64feecc6d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFvGc67v", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.6.json index 1622abdbf8..10b456d822 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "IF0vGesJrPxKZhhP", - "filament_id": "GFB99_6", + "filament_id": "OFyeSq8A", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.8.json index bb6fc8b41e..abd3a2fc9e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "Bl3iXBs56hdXM9SE", - "filament_id": "GFB99_7", + "filament_id": "OFyeSq8A", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5.json index b6a08a7c20..02c86e018b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0luFxwjErjX80SXh", - "filament_id": "GFB99_5", + "filament_id": "OFyeSq8A", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json index 228807da84..a1745176f2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic ABS HF @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OFCgpxn2", + "filament_id": "OFyeSq8A", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json index 5e47c117c6..ce22974fd1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @CORE One", "from": "system", "setting_id": "GB4mI21wSfo3jfnQ", - "filament_id": "Prusa Generic ASA @CORE One 0.6", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.8.json index 74cf13fd6a..c112241e63 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @CORE One", "from": "system", "setting_id": "jwPZBZ4B116kCVu9", - "filament_id": "Prusa Generic ASA @CORE One 0.8", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.4.json index 8fdca4347e..04bf35f2e7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @CORE One", "from": "system", "setting_id": "3SHxmODIq9SCK4Kd", - "filament_id": "Prusa Generic ASA @CORE One HF 0.4", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.5.json index 5f8eaeca43..dfe8fec3fe 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @CORE One", "from": "system", "setting_id": "RBSMuMnrcTyregVJ", - "filament_id": "Prusa Generic ASA @CORE One HF 0.5", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.6.json index 39b37c3ed8..f74efb4310 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @CORE One", "from": "system", "setting_id": "5ezNirZa3m7Oi1Ts", - "filament_id": "Prusa Generic ASA @CORE One HF 0.6", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.8.json index 782ea4ce94..8d6bb1a685 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @CORE One", "from": "system", "setting_id": "EtHBkeDF0LvudfBi", - "filament_id": "Prusa Generic ASA @CORE One HF 0.8", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json index c2c39822d7..e00a4d7ca8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Pg9KDqFB63PFJo3Q", - "filament_id": "Prusa Generic ASA @CORE One", + "filament_id": "OFoJcr46", "instantiation": "true", "chamber_temperature": [ "40" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.25.json index 213f887ea8..088221b03a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.25.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "oLhpDGV7BIMFqZZq", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.6.json index f94c769d78..d11f2f2dd6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.6.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "CN91PnsqqI5CTRhd", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.8.json index 0ba51d264d..2eae500425 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.8.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Mg0Sh8QULakXYt0m", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS.json index 10aaaf1503..2d969f15be 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "StIz1ZclM5WV6MCC", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.25.json index ca315a91c4..5888bf67d4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "EVFkOOWqYWkUZRQG", - "filament_id": "GFB98_5", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.6.json index f578c5e72a..b467748041 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "LW2yi7y86rJ59LMi", - "filament_id": "GFB98_3", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.8.json index 20625fbc8d..7330692d37 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "5iwLdW6pq5Y4Aziw", - "filament_id": "GFB98_4", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5.json index b7825b00e3..4f1717860a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "UaLDui75hljyKAkI", - "filament_id": "GFB98_2", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4.json index 10905e3a24..f3d8a91378 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "ubNQKQ8Ex6khEWaI", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json index 430313b6e5..cb1eb8f267 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @MK4S", "from": "system", "setting_id": "j5YvdepMw4z29kzr", - "filament_id": "Prusament ASA @MK4S 0.6", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json index 5853f7bc3f..cbacb6e747 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @MK4S", "from": "system", "setting_id": "FtVjP8q0MzM0vr2J", - "filament_id": "Prusament ASA @MK4S 0.8", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json index 8055c5926b..a9a784f496 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @MK4S", "from": "system", "setting_id": "na3FnleO5uhDF7Yr", - "filament_id": "Prusament ASA @MK4S HF0.4", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json index 6bf46c7fdc..47055f18aa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @MK4S HF0.4", "from": "system", "setting_id": "meEXtenGq7N4dWf3", - "filament_id": "Prusament ASA @MK4S HF0.5", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json index bd0250e1e9..414315ad65 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @MK4S HF0.4", "from": "system", "setting_id": "o0UhIK80Y28KX3AK", - "filament_id": "Prusament ASA @MK4S HF0.6", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json index 3c06463b06..f0b377c8d1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic ASA @MK4S HF0.4", "from": "system", "setting_id": "VDDgOXq5iphlyQ5U", - "filament_id": "Prusament ASA @MK4S HF0.8", + "filament_id": "OFoJcr46", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json index dfc2270174..75c3dcc399 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "5BZ0OsiwFPYGCcBg", - "filament_id": "Prusament ASA @MK4S", + "filament_id": "OFoJcr46", "instantiation": "true", "close_fan_the_first_x_layers": "4", "compatible_printers": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.6.json index a2288b5602..3a6e047baa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "TwgQePxtpUic69Yw", - "filament_id": "GFB98_6", + "filament_id": "OFK4LdYI", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.8.json index 719e8c0d7a..9d2bce435d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "TC1QAhU8v7mruXHK", - "filament_id": "GFB98_7", + "filament_id": "OFK4LdYI", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5.json index c514c44cef..f0d0395d78 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "1s3xgWuvTP6UvMG7", - "filament_id": "GFB98_5", + "filament_id": "OFK4LdYI", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json index 000196a2a1..6dc6096675 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic ASA HF @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OFkeeluv", + "filament_id": "OFK4LdYI", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA.json b/resources/profiles/Prusa/filament/Prusa Generic ASA.json index 85f1d08da6..3bc0c0fd69 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ASA.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "i5Zm7qbFAtsgG4mF", + "filament_id": "OFoJcr46", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json index 467a0e7aad..dcf3793661 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_flex", "from": "system", "setting_id": "PaXKTb31IFVovWiK", + "filament_id": "OFl2SXmv", "instantiation": "true", "filament_loading_speed_start": "3", "filament_loading_speed": "28", diff --git a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json index c6fd096196..7231531ee2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json @@ -4,6 +4,7 @@ "inherits": "fdm_filament_flex", "from": "system", "setting_id": "b5AA45MlL14moY71", + "filament_id": "OFl2SXmv", "instantiation": "true", "filament_loading_speed_start": "3", "filament_loading_speed": "28", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.25.json index a7f7c13c96..1a2065a58d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "4LeqziiUcsZFvsqn", - "filament_id": "GFN99_4", + "filament_id": "OFIy3kLw", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.6.json index 4a0860931c..8e67d973c4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "FoUTZTxQNZRSUZqi", - "filament_id": "GFN99_2", + "filament_id": "OFIy3kLw", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.8.json index ef6a9174fb..8a026c1c90 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "7Qe2dHRqSOhsuoPn", - "filament_id": "GFN99_3", + "filament_id": "OFIy3kLw", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5.json index db9b97feff..cdea8133e3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "HIOtwj2ImWrlXkld", - "filament_id": "GFN99_1", + "filament_id": "OFIy3kLw", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PA @base.json index 42e8d47bbd..08528488af 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PA @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN99", + "filament_id": "OFIy3kLw", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.25.json index db39929ab4..16fd70bc82 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "BjLde5wICEYFSlu1", - "filament_id": "GFN98_4", + "filament_id": "OFfznI0Q", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.6.json index 0607f4afe2..193dcfe35c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "XgIsgzltjlTU8ixC", - "filament_id": "GFN98_2", + "filament_id": "OFfznI0Q", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.8.json index 3d04097b7d..9cbde53ee4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "b2fjpGuYwbeo7O9K", - "filament_id": "GFN98_3", + "filament_id": "OFfznI0Q", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5.json index bf54572e72..b13ab2ddb0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "ko8pHTrnZTzz6LyX", - "filament_id": "GFN98_1", + "filament_id": "OFfznI0Q", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json index 350ab54889..28733da65c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Prusa Generic PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFXfgh61", + "filament_id": "OFfznI0Q", "instantiation": "false", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.25.json index cf1046b78b..8dfcd4ac73 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "365PSnHIwQoBabi7", - "filament_id": "GFC99_4", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.6.json index 5641ffefea..b9ac2b8114 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "zullllDHKByF2PMu", - "filament_id": "GFC99_2", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.8.json index 2118c4dc43..7edc6d5a05 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "TTIxalWBM5b6YTJ0", - "filament_id": "GFC99_3", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5.json index 06d150cddc..d63eaee60b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "2h9EbPiUgE3BIHVb", - "filament_id": "GFC99_1", + "filament_id": "OF97ru74", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.6.json index abcfde31e4..4b5d973cdd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "MAtF0WCx6uLte1Bq", - "filament_id": "GFC99_5", + "filament_id": "OFq5QANf", "instantiation": "true", "filament_max_volumetric_speed": [ "30" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.8.json index d10c44bebe..b7729e451f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "Om8P3dn8wY6CbdQg", - "filament_id": "GFC99_6", + "filament_id": "OFq5QANf", "instantiation": "true", "filament_max_volumetric_speed": [ "36" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5.json index 6e6c9f3747..7fdec94c49 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "uGi7QoODY99zHuCt", - "filament_id": "GFC99_4", + "filament_id": "OFq5QANf", "instantiation": "true", "filament_max_volumetric_speed": [ "24" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json index ece79b1919..ffce8990b7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PC HF @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OFQ9dI8j", + "filament_id": "OFq5QANf", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.6.json index 6e1ac6e621..e776e17543 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @CORE One", "from": "system", "setting_id": "plb6gY1isTp10Unr", - "filament_id": "Prusa Generic PETG @CORE One 0.6", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.8.json index 7d19ded509..a0b3bc4299 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @CORE One", "from": "system", "setting_id": "WISyN9WbqoZW5bBy", - "filament_id": "Prusa Generic PETG @CORE One 0.8", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.4.json index cb0eb3fb5b..d3354152df 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @CORE One", "from": "system", "setting_id": "hMxEpxx9ERuIq28Z", - "filament_id": "Prusa Generic PETG @CORE One HF 0.4", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.5.json index 53e681186f..69c4158297 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @CORE One", "from": "system", "setting_id": "HtW04UsVx5VpeLc9", - "filament_id": "Prusa Generic PETG @CORE One HF 0.5", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.6.json index a6a2b9fc55..c50d2b1cd0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @CORE One", "from": "system", "setting_id": "29TFTfss7xVear5j", - "filament_id": "Prusa Generic PETG @CORE One HF 0.6", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.8.json index 05b926349b..91d6a29a9a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @CORE One", "from": "system", "setting_id": "N91ct2U3Y3jOat0g", - "filament_id": "Prusa Generic PETG @CORE One HF 0.8", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One.json index 3e914c0ab9..fa5a8d2cd8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "VbFWb2QCAMxcrTAW", - "filament_id": "Prusa Generic PETG @CORE One", + "filament_id": "OF1Id239", "instantiation": "true", "chamber_temperature": [ "35" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.25.json index eccfa418a9..940f308232 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "g5YTLp0ZhzbpCD2h", - "filament_id": "GFG99_5", + "filament_id": "OF1Id239", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.6.json index beacc12d5f..f049544d2f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "6FATkctkE3RaWnWQ", - "filament_id": "GFG99_3", + "filament_id": "OF1Id239", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.8.json index b543c2ffcf..ba45f70c00 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "ITT0YpAms3lzeSBk", - "filament_id": "GFG99_4", + "filament_id": "OF1Id239", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5.json index e52a1b8628..e456955aae 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "71gokqKp7e6fhhf4", - "filament_id": "GFG99_2", + "filament_id": "OF1Id239", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json index 88d4bb1a2f..9b59b93ccf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @MK4S", "from": "system", "setting_id": "Pci5FyYkl7E87APR", - "filament_id": "Generic PETG @MK4S 0.6", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json index 358eac5276..8024185152 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @MK4S", "from": "system", "setting_id": "gBfDSTXrnY1HRyw7", - "filament_id": "Generic PETG @MK4S 0.8", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json index efbf8db0c7..4267889359 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @MK4S", "from": "system", "setting_id": "4pbIJVV1D2h5O3WZ", - "filament_id": "Generic PETG @MK4S HF0.4", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json index 3225bdfb2c..6129d321b2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @MK4S HF0.4", "from": "system", "setting_id": "vO26JgugJEsX5z6a", - "filament_id": "Generic PETG @MK4S HF0.5", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json index 56e0d1b40d..83a96f3a40 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @MK4S HF0.4", "from": "system", "setting_id": "tv7OUJ7pSPHTkE89", - "filament_id": "Generic PETG @MK4S HF0.6", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json index 21b47aca86..85c388ab7d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PETG @MK4S HF0.4", "from": "system", "setting_id": "wHfH0a2TgTYr9rWF", - "filament_id": "Generic PETG @MK4S HF0.8", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json index b807315eff..ff70f3d63e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "IGfvc0jGdG6evRj8", - "filament_id": "Generic PETG @MK4S", + "filament_id": "OF1Id239", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.25 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json index 7cc123d8fd..5ed73792e2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFT02", + "filament_id": "OF1Id239", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.6.json index 7459bccd56..63f9742402 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "Hw54qxSSdBrcOr4r", - "filament_id": "GFG99_6", + "filament_id": "OFOKYhi6", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.8.json index 36582d0481..e3401a666b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "txhzOPQmzVqkcdnP", - "filament_id": "GFG99_7", + "filament_id": "OFOKYhi6", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5.json index 6cd401b6c6..1f63b82d0b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "OjIQqC3uJdpcLqlG", - "filament_id": "GFG99_5", + "filament_id": "OFOKYhi6", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json index b9c02872b2..002c80fe6d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PETG HF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFphFSUJ", + "filament_id": "OFOKYhi6", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json index dbf1862382..a205ac7e71 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @CORE One", "from": "system", "setting_id": "8kSIJx0dpaelcAos", - "filament_id": "Prusa Generic PLA @CORE One 0.6", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.8.json index a10f1da37a..c710474420 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @CORE One", "from": "system", "setting_id": "qlG6J2sXs80HpkCl", - "filament_id": "Prusa Generic PLA @CORE One 0.8", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.4.json index 19b8d0c4df..5a38ba93f3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @CORE One", "from": "system", "setting_id": "KzpBU6cAAqm7z0Sg", - "filament_id": "Prusa Generic PLA @CORE One HF 0.4", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.5.json index 786bf2adab..1935f27062 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @CORE One", "from": "system", "setting_id": "2G99enCGyOVjrOlt", - "filament_id": "Prusa Generic PLA @CORE One HF 0.5", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.6.json index e325a17ac0..b47613e7d1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @CORE One", "from": "system", "setting_id": "iNQhrPrIj4GphWxI", - "filament_id": "Prusa Generic PLA @CORE One HF 0.6", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.8.json index cb895cd542..a3b5df42d8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @CORE One", "from": "system", "setting_id": "YIm5w8btcXZqnNFB", - "filament_id": "Prusa Generic PLA @CORE One HF 0.8", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One.json index faaa585e91..1f65998039 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "NDBqFGNNvKxlmo3V", - "filament_id": "Prusa Generic PLA @CORE One", + "filament_id": "OFiCHnso", "instantiation": "true", "chamber_temperature": [ "20" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.25.json index ade1148e1d..ab3b9413ae 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "mQtIWbOJ2a4TMYxU", - "filament_id": "GFL99_5", + "filament_id": "OFiCHnso", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.6.json index 6b4a104bd0..9d239a47fd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "lSbYoT83cp2tQjk3", - "filament_id": "GFL99_3", + "filament_id": "OFiCHnso", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.8.json index 13853813fb..e77aa1edf0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "kZuzkEvYEluqlAfM", - "filament_id": "GFL99_4", + "filament_id": "OFiCHnso", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5.json index c1d96ae9ed..d211b1fed2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "ojwcK3bKU2Jyosws", - "filament_id": "GFL99_2", + "filament_id": "OFiCHnso", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.6.json index b8cffb4b74..d6915f476d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @MK4S", "from": "system", "setting_id": "6pZohvVY1eUGi2k8", - "filament_id": "Generic PLA @MK4S 0.6", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json index d7bf8889ea..07b15552df 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @MK4S", "from": "system", "setting_id": "8z66T4ABcY8PLJMB", - "filament_id": "Generic PLA @MK4S 0.8", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json index d9485b0a57..39f7d1b020 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @MK4S", "from": "system", "setting_id": "LV8qQ1t2CmhHaRSA", - "filament_id": "Generic PLA @MK4S HF0.4", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json index 7cc2615b2b..97235be213 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @MK4S HF0.4", "from": "system", "setting_id": "WH3bJGQGSliMx6ta", - "filament_id": "Generic PLA @MK4S HF0.5", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json index a5f5e8b490..a90a033338 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @MK4S HF0.4", "from": "system", "setting_id": "du6Gy8TCxk5z7hPx", - "filament_id": "Generic PLA @MK4S HF0.6", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json index f145d7c0d2..4d381eab0a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @MK4S HF0.4", "from": "system", "setting_id": "aLcAkl8Zt2D5lOTp", - "filament_id": "Generic PLA @MK4S HF0.8", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json index e0c8ceedd4..9d35c362fa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "CqlMmArE8Llbji7t", - "filament_id": "Generic PLA @MK4S", + "filament_id": "OFiCHnso", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.25 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json index be5218517e..4aaa66dd9e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFiCHnso", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.6.json index fe7364310d..a75d98c47f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "IHOsyOhMvOcpHGtG", - "filament_id": "GFL99_6", + "filament_id": "OFl4ItvQ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.8.json index 26f2f013e7..c7f2c480be 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "GYne0LPI8ooQJe08", - "filament_id": "GFL99_7", + "filament_id": "OFl4ItvQ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5.json index 6d89453bd8..c1366194ec 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Bq51JVrGGEktAqIh", - "filament_id": "GFL99_5", + "filament_id": "OFl4ItvQ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json index 4cff82d6a5..fffecfd0e1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PLA HF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFicxmSa", + "filament_id": "OFl4ItvQ", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.6.json index 7ec1605d58..b974aa2fec 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA Silk @CORE One", "from": "system", "setting_id": "QUaunbCOoBxA8fyJ", - "filament_id": "Prusa Generic PLA Silk @CORE One 0.6", + "filament_id": "OFHFZ1Te", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json index fdce38720a..e877f0f0b4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA Silk @CORE One", "from": "system", "setting_id": "y2IZMYPduRS1mEFL", - "filament_id": "Prusa Generic PLA Silk @CORE One 0.8", + "filament_id": "OFHFZ1Te", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One.json index 3cdf40ad50..1d39e71aaa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "CYztrVFVOPD3RHJx", - "filament_id": "Prusa Generic PLA Silk @CORE One", + "filament_id": "OFHFZ1Te", "instantiation": "true", "chamber_temperature": [ "20" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json index a6597f5edf..506f82f3ea 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA Silk @MK4S", "from": "system", "setting_id": "e1pUu3Y5pDr7LzNu", - "filament_id": "Generic PLA Silk @MK4S 0.6", + "filament_id": "OFHFZ1Te", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json index f9e7154bdf..6c57e0486e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA Silk @MK4S", "from": "system", "setting_id": "Yw5uZEeqmR9elIn6", - "filament_id": "Generic PLA Silk @MK4S 0.8", + "filament_id": "OFHFZ1Te", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json index 248fec014e..d5217d07f3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic PLA @MK4S", "from": "system", "setting_id": "ngtF8hwv8cSubcR1", - "filament_id": "Generic PLA Silk @MK4S", + "filament_id": "OFHFZ1Te", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.25 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.25.json index 632de6b430..5a660705a7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Pi3x8Wj5sdB7TDDK", - "filament_id": "GFL98_5", + "filament_id": "OFQ7I5vC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.6.json index ec4bb6ee6a..1b9b06f8f9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "vtxoJOj2lc1qxV3H", - "filament_id": "GFL98_3", + "filament_id": "OFQ7I5vC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.8.json index eb7f730ef5..5f0619c66c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "9gYj4jTP6y4UmR9s", - "filament_id": "GFL98_4", + "filament_id": "OFQ7I5vC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5.json index df82e01d98..9f8546a1ae 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "yQASt4Ej55vgeZAN", - "filament_id": "GFL98_1", + "filament_id": "OFQ7I5vC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json index c899728e68..98cb90bcac 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Prusa Generic PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFv8SRZh", + "filament_id": "OFQ7I5vC", "instantiation": "false", "filament_type": [ "PLA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.25.json index 440310acd7..b0febd6c30 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "ciRHVEjYNqjT5EsD", - "filament_id": "GFS99_4", + "filament_id": "OFcCzEkS", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.6.json index 7f54ae1a7a..e6956d6b8f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "G8TFM51vPvMbGSbX", - "filament_id": "GFS99_2", + "filament_id": "OFcCzEkS", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.8.json index 1b6798fd1a..af962c0fec 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "hueUgJutZ71scT6F", - "filament_id": "GFS99_3", + "filament_id": "OFcCzEkS", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5.json index 9ac04757e7..aee4bf78bc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "yaPlNuxryIpkxiOe", - "filament_id": "GFS99_1", + "filament_id": "OFcCzEkS", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json b/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json index dc77145268..3da3125629 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "GFS99", + "filament_id": "OFcCzEkS", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.6.json index bcd14e6b66..6c1843c3ba 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.6.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "NfhvtCbeYlQ3el2O", - "filament_id": "GFS99_5", + "filament_id": "OFoT8F7Y", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.8.json index 8495914c13..9271b3051d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.8.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "J5PBEm3LvfpztfXU", - "filament_id": "GFS99_6", + "filament_id": "OFoT8F7Y", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5.json index 97b2d1ff89..36d34b4946 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "X2k0n055aaG1zc0u", - "filament_id": "GFS99_4", + "filament_id": "OFoT8F7Y", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json index 8d05e93111..8a768f844a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic PVA HF @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "OFxLeRyT", + "filament_id": "OFoT8F7Y", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.6.json index fff78aec9f..896518c23c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic TPU @CORE One", "from": "system", "setting_id": "OulnL3bWrEpRJbgJ", - "filament_id": "Prusa Generic TPU @CORE One 0.6", + "filament_id": "OFbenYUK", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.8.json index 4ba3f08222..8b270846d0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic TPU @CORE One", "from": "system", "setting_id": "9fAhdX2hOAnUDn1I", - "filament_id": "Prusa Generic TPU @CORE One 0.8", + "filament_id": "OFbenYUK", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json index 71fe4f21c5..9b212dd17a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_flex", "from": "system", "setting_id": "VR2WfERGWPIWTRha", - "filament_id": "Prusa Generic TPU @CORE One", + "filament_id": "OFbenYUK", "instantiation": "true", "chamber_temperature": [ "30" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json index c0e8ca4577..b3b017de67 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "wfxLtrIAOgG7TKib", - "filament_id": "GFU99_2", + "filament_id": "OFbenYUK", "instantiation": "true", "filament_max_volumetric_speed": [ "1.8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json index 89b8a94856..2c0e48d6a5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic TPU @MK4S", "from": "system", "setting_id": "3zJSkjnxFgeAbkhY", - "filament_id": "Generic FLEX @MK4S 0.6", + "filament_id": "OFbenYUK", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json index 0230b22bea..e78a2768d0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusa Generic TPU @MK4S", "from": "system", "setting_id": "tRRHfIUwFo1C8Q3B", - "filament_id": "Generic FLEX @MK4S 0.8", + "filament_id": "OFbenYUK", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json index a7b5d1fcf6..7f0ac852ee 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "JxNaZsG7Y2rQKATV", - "filament_id": "Generic FLEX @MK4S", + "filament_id": "OFbenYUK", "instantiation": "true", "close_fan_the_first_x_layers": "3", "compatible_printers": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json index a86c7a2b91..c0c1bccbb3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU99", + "filament_id": "OFbenYUK", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json index 611c693da1..b2ac07402c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "Gfuy9ZSCpJw3Usa6", - "filament_id": "GFU99_3", + "filament_id": "OFU3zwPc", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json index 0a41e94893..e08a83c0e6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json +++ b/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json @@ -3,6 +3,6 @@ "name": "Prusa Generic TPU HF @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OFbK5wve", + "filament_id": "OFU3zwPc", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.6.json index b3fe97133a..40bb6ee291 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament ASA @CORE One", "from": "system", "setting_id": "XlSISsmFlPbj3BOn", - "filament_id": "Prusament ASA @CORE One 0.6", + "filament_id": "OFmFwUWM", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.8.json index 330f3a7643..71c47268ba 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament ASA @CORE One", "from": "system", "setting_id": "89B204vxbuUqB3Os", - "filament_id": "Prusament ASA @CORE One 0.8", + "filament_id": "OFmFwUWM", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json index ace3c0cb55..e7977e0c94 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusament ASA @CORE One", "from": "system", "setting_id": "tXktQXr79am1s5UL", - "filament_id": "Prusament ASA @CORE One HF 0.4", + "filament_id": "OFmFwUWM", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json index 365a4f56a7..26e053cd79 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusament ASA @CORE One", "from": "system", "setting_id": "YbyojtjXvEtI4Tt3", - "filament_id": "Prusament ASA @CORE One HF 0.5", + "filament_id": "OFmFwUWM", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json index 9f79b6842a..5bde9d8869 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament ASA @CORE One", "from": "system", "setting_id": "35H9TLr1p2Jy767g", - "filament_id": "Prusament ASA @CORE One HF 0.6", + "filament_id": "OFmFwUWM", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.8.json index b006ea74c1..ba5273d125 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament ASA @CORE One", "from": "system", "setting_id": "efgN1KmROfVKa86P", - "filament_id": "Prusament ASA @CORE One HF 0.8", + "filament_id": "OFmFwUWM", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json index 1ca5222859..b1f2dace26 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "UUTjJ4Y8St3c87jD", - "filament_id": "Prusament ASA @CORE One", + "filament_id": "OFmFwUWM", "instantiation": "true", "chamber_temperature": [ "40" diff --git a/resources/profiles/Prusa/filament/Prusament ASA @XL 5T.json b/resources/profiles/Prusa/filament/Prusament ASA @XL 5T.json index 87d14f9e8f..fdb63e2e68 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @XL 5T.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "IQu91UAWOJOQcUq9", + "filament_id": "OFmFwUWM", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "260", "nozzle_temperature": "260", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/Prusament ASA @XL.json b/resources/profiles/Prusa/filament/Prusament ASA @XL.json index 9f3df999d4..c07021a9c3 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @XL.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "RaEoFoZdXkkOz9yh", + "filament_id": "OFmFwUWM", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "260", "nozzle_temperature": "260", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.6.json index 8698746393..cbbd006468 100644 --- a/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PA-CF @CORE One", "from": "system", "setting_id": "sEDEmqR4k65IhJ4D", - "filament_id": "Prusament PA-CF @CORE One 0.6", + "filament_id": "OF54SvEe", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.8.json index c22f07ddb4..434c534282 100644 --- a/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PA-CF @CORE One", "from": "system", "setting_id": "gwFsNIMKGU1f2vPS", - "filament_id": "Prusament PA-CF @CORE One 0.8", + "filament_id": "OF54SvEe", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One.json b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One.json index c1c87b7041..33382b1974 100644 --- a/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "08PdV2lMsSv1JeOt", - "filament_id": "Prusament PA-CF @CORE One", + "filament_id": "OF54SvEe", "instantiation": "true", "chamber_temperature": [ "40" @@ -60,7 +60,7 @@ "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.07{elsif nozzle_diameter[filament_extruder_id]==0.3}0.09{elsif nozzle_diameter[filament_extruder_id]==0.35}0.08{elsif nozzle_diameter[filament_extruder_id]==0.6}0.04{elsif nozzle_diameter[filament_extruder_id]==0.5}0.05{elsif nozzle_diameter[filament_extruder_id]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S|CORE One).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.05{elsif nozzle_diameter[filament_extruder_id]==0.5}0.035{elsif nozzle_diameter[filament_extruder_id]==0.6}0.025{elsif nozzle_diameter[filament_extruder_id]==0.8}0.016{elsif nozzle_diameter[filament_extruder_id]==0.25}0.14{elsif nozzle_diameter[filament_extruder_id]==0.3}0.09{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S45 ; set heatbreak target temp" ], "filament_type": [ - "PA" + "PA11-CF" ], "filament_vendor": [ "Prusa Polymers" diff --git a/resources/profiles/Prusa/filament/Prusament PA-CF @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PA-CF @XL 5T.json index d287e59aa4..af306fd2a7 100644 --- a/resources/profiles/Prusa/filament/Prusament PA-CF @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PA-CF @XL 5T.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_pa11cf", "from": "system", "setting_id": "FYerOcjToJ3ABpu1", + "filament_id": "OF54SvEe", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "275", "nozzle_temperature": "285", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json b/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json index 6735c31b8a..f843be92a0 100644 --- a/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_pa11cf", "from": "system", "setting_id": "IrL4iU2kkMBHIw3e", + "filament_id": "OF54SvEe", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "275", "nozzle_temperature": "285", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.6.json index c31c409a16..5aafb38b43 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC Blend @CORE One", "from": "system", "setting_id": "0ytT0Ro3sAjvUPN2", - "filament_id": "Prusament PC Blend @CORE One 0.6", + "filament_id": "OFvDbkFq", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.8.json index b27cac24c3..a3826bf7cc 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC Blend @CORE One", "from": "system", "setting_id": "WrAImqAV7odcGf8Y", - "filament_id": "Prusament PC Blend @CORE One 0.8", + "filament_id": "OFvDbkFq", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json index e9431a4a94..4e5b5643bd 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC Blend @CORE One", "from": "system", "setting_id": "pEsP537TBR5kozQB", - "filament_id": "Prusament PC Blend @CORE One HF 0.4", + "filament_id": "OFvDbkFq", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json index 824d9468ea..ab9a127df8 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC Blend @CORE One", "from": "system", "setting_id": "3IfLi1ZVCKKbEBUW", - "filament_id": "Prusament PC Blend @CORE One HF 0.5", + "filament_id": "OFvDbkFq", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json index 707aff7532..642f421819 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC Blend @CORE One", "from": "system", "setting_id": "Q8qWw2G7l2UvxGut", - "filament_id": "Prusament PC Blend @CORE One HF 0.6", + "filament_id": "OFvDbkFq", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.8.json index f75f439c4a..f66f2521c5 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC Blend @CORE One", "from": "system", "setting_id": "LDvckXo1zpccnT4g", - "filament_id": "Prusament PC Blend @CORE One HF 0.8", + "filament_id": "OFvDbkFq", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json index 0fe031c276..34ecd1d759 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "x1SkWhSSkVVIPwCF", - "filament_id": "Prusament PC Blend @CORE One", + "filament_id": "OFvDbkFq", "instantiation": "true", "chamber_temperature": [ "40" diff --git a/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.6.json index e12bc8db2b..f4722bb89a 100644 --- a/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC-CF @CORE One", "from": "system", "setting_id": "DYPBEKeKBdTenG3S", - "filament_id": "Prusament PC-CF @CORE One 0.6", + "filament_id": "OFjz0a3m", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.8.json index 90bbaf4217..2abf3ab8d7 100644 --- a/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PC-CF @CORE One", "from": "system", "setting_id": "0J8ZuIRTB6EgSke8", - "filament_id": "Prusament PC-CF @CORE One 0.8", + "filament_id": "OFjz0a3m", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One.json b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One.json index 2d860fe307..0d5622b7ab 100644 --- a/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "IK6Z7DVevvmR96Or", - "filament_id": "Prusament PC-CF @CORE One", + "filament_id": "OFjz0a3m", "instantiation": "true", "chamber_temperature": [ "40" @@ -60,7 +60,7 @@ "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.07{elsif nozzle_diameter[filament_extruder_id]==0.3}0.09{elsif nozzle_diameter[filament_extruder_id]==0.35}0.08{elsif nozzle_diameter[filament_extruder_id]==0.6}0.04{elsif nozzle_diameter[filament_extruder_id]==0.5}0.05{elsif nozzle_diameter[filament_extruder_id]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S|CORE One).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.05{elsif nozzle_diameter[filament_extruder_id]==0.5}0.035{elsif nozzle_diameter[filament_extruder_id]==0.6}0.025{elsif nozzle_diameter[filament_extruder_id]==0.8}0.016{elsif nozzle_diameter[filament_extruder_id]==0.25}0.14{elsif nozzle_diameter[filament_extruder_id]==0.3}0.09{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S45 ; set heatbreak target temp" ], "filament_type": [ - "PC" + "PC-CF" ], "filament_vendor": [ "Prusa Polymers" diff --git a/resources/profiles/Prusa/filament/Prusament PC-CF @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PC-CF @XL 5T.json index 482a0403df..0c6d1a3cdb 100644 --- a/resources/profiles/Prusa/filament/Prusament PC-CF @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PC-CF @XL 5T.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_pccf", "from": "system", "setting_id": "m1YND6uz3GWeVIBG", + "filament_id": "OFjz0a3m", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "285", "nozzle_temperature": "285", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json b/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json index 7081cd9523..572b970d02 100644 --- a/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_pccf", "from": "system", "setting_id": "Eq5x2CcEUUAZ5aof", + "filament_id": "OFjz0a3m", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "285", "nozzle_temperature": "285", "hot_plate_temp_initial_layer": "100", diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.6.json index 83ef41e09e..974cf5b0cc 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PETG @CORE One", "from": "system", "setting_id": "JVKHdd0UyFqnVj9g", - "filament_id": "Prusament PETG @CORE One 0.6", + "filament_id": "OFkR8E2c", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.8.json index eb6cb9a8fa..c1f2e23890 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PETG @CORE One", "from": "system", "setting_id": "0OCfuaF4u8wo5D20", - "filament_id": "Prusament PETG @CORE One 0.8", + "filament_id": "OFkR8E2c", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json index f2f309b90c..f34dcd29a7 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusament PETG @CORE One", "from": "system", "setting_id": "lwT1VxW5OkY36kUX", - "filament_id": "Prusament PETG @CORE One HF 0.4", + "filament_id": "OFkR8E2c", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json index 08ed962fe6..71001294fa 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusament PETG @CORE One", "from": "system", "setting_id": "XAgW7fElXxhaKaBT", - "filament_id": "Prusament PETG @CORE One HF 0.5", + "filament_id": "OFkR8E2c", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json index cc1fe65500..cea5ef7809 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PETG @CORE One", "from": "system", "setting_id": "6aTGEZj2EmpTR1mu", - "filament_id": "Prusament PETG @CORE One HF 0.6", + "filament_id": "OFkR8E2c", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.8.json index 0f2078b5b4..ec16eb9ef2 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PETG @CORE One", "from": "system", "setting_id": "EmrFLgk6ZkTHAvN8", - "filament_id": "Prusament PETG @CORE One HF 0.8", + "filament_id": "OFkR8E2c", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json index 1a03663b6d..00f78be204 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "LSvba9ds3XTwDMCG", - "filament_id": "Prusament PETG @CORE One", + "filament_id": "OFkR8E2c", "instantiation": "true", "chamber_temperature": [ "35" diff --git a/resources/profiles/Prusa/filament/Prusament PETG @base.json b/resources/profiles/Prusa/filament/Prusament PETG @base.json index 9077aad91c..a2d5de2e53 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @base.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @base.json @@ -3,7 +3,7 @@ "name": "Prusament PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFpHq9gJ", + "filament_id": "OFkR8E2c", "instantiation": "false", "filament_vendor": [ "Prusa Polymers" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.6.json index 647940d644..b699ba216f 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PLA @CORE One", "from": "system", "setting_id": "jGHl1i9Y1oJsLQY8", - "filament_id": "Prusament PLA @CORE One 0.6", + "filament_id": "OFnO4wnf", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.8.json index 3af2846aa0..b1a3109180 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PLA @CORE One", "from": "system", "setting_id": "ijkbGowmIm8uUYsf", - "filament_id": "Prusament PLA @CORE One 0.8", + "filament_id": "OFnO4wnf", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json index a44a2fd1c4..8c1d806d98 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "Prusament PLA @CORE One", "from": "system", "setting_id": "mf4Muog4IcsgkYoA", - "filament_id": "Prusament PLA @CORE One HF 0.4", + "filament_id": "OFnO4wnf", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.5.json index ab7f5b3a37..b91fd4aae0 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "Prusament PLA @CORE One", "from": "system", "setting_id": "zJf1Y6eP81j3v8VV", - "filament_id": "Prusament PLA @CORE One HF 0.5", + "filament_id": "OFnO4wnf", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.6.json index 7c94b57456..200666edcf 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PLA @CORE One", "from": "system", "setting_id": "UAvqLPGHYOT1B2lC", - "filament_id": "Prusament PLA @CORE One HF 0.6", + "filament_id": "OFnO4wnf", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.8.json index 3ba0a21670..84d55886d6 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PLA @CORE One", "from": "system", "setting_id": "0N17rx4NFmuHYLQl", - "filament_id": "Prusament PLA @CORE One HF 0.8", + "filament_id": "OFnO4wnf", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json index 78b1f80425..ddf62b89ac 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "PuujUMjNKLZvZNAH", - "filament_id": "Prusament PLA @CORE One", + "filament_id": "OFnO4wnf", "instantiation": "true", "chamber_temperature": [ "20" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @base.json b/resources/profiles/Prusa/filament/Prusament PLA @base.json index acba999339..fad8c00435 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @base.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @base.json @@ -3,7 +3,7 @@ "name": "Prusament PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFkoT6jl", + "filament_id": "OFnO4wnf", "instantiation": "false", "filament_vendor": [ "Prusa Polymers" diff --git a/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.6.json index 8c979342b3..6516085280 100644 --- a/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament PVB @CORE One", "from": "system", "setting_id": "GnslGWS97HuaWX76", - "filament_id": "Prusament PVB @CORE One 0.6", + "filament_id": "OFh7mvPO", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.8.json index 2496ec966d..a001c24fe7 100644 --- a/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament PVB @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament PVB @CORE One", "from": "system", "setting_id": "Nn7eVPawILDH4BRW", - "filament_id": "Prusament PVB @CORE One 0.8", + "filament_id": "OFh7mvPO", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json b/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json index c3c5cf16c8..4504aa77bf 100644 --- a/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pvb", "from": "system", "setting_id": "085dGkrnPhatF07x", - "filament_id": "Prusament PVB @CORE One", + "filament_id": "OFh7mvPO", "instantiation": "true", "chamber_temperature": [ "20" diff --git a/resources/profiles/Prusa/filament/Prusament PVB @XL 5T.json b/resources/profiles/Prusa/filament/Prusament PVB @XL 5T.json index 280a722bb3..366c6043cd 100644 --- a/resources/profiles/Prusa/filament/Prusament PVB @XL 5T.json +++ b/resources/profiles/Prusa/filament/Prusament PVB @XL 5T.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_pvb", "from": "system", "setting_id": "DIrPylH6rmu6YA43", + "filament_id": "OFh7mvPO", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "215", "nozzle_temperature": "215", "hot_plate_temp_initial_layer": "75", diff --git a/resources/profiles/Prusa/filament/Prusament PVB @XL.json b/resources/profiles/Prusa/filament/Prusament PVB @XL.json index 1ac285be6e..4a9a858c06 100644 --- a/resources/profiles/Prusa/filament/Prusament PVB @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PVB @XL.json @@ -4,7 +4,9 @@ "inherits": "fdm_filament_pvb", "from": "system", "setting_id": "RF55nfxQwqUqe00Q", + "filament_id": "OFh7mvPO", "instantiation": "true", + "filament_vendor": ["Prusa Polymers"], "nozzle_temperature_intial_layer": "215", "nozzle_temperature": "215", "hot_plate_temp_initial_layer": "75", diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json index 19f2eb0962..adbf76e56d 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "Prusament rPLA @CORE One", "from": "system", "setting_id": "BY8gwU1VY0hFBPSc", - "filament_id": "Prusament rPLA @CORE One 0.6", + "filament_id": "OFWRITFw", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.8.json index 23f10a2927..3c71431160 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "Prusament rPLA @CORE One", "from": "system", "setting_id": "dNK9a3tZOFeUZm60", - "filament_id": "Prusament rPLA @CORE One 0.8", + "filament_id": "OFWRITFw", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json index c32d3baf7f..b520bf4a22 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Bw6H4vFnq7YExyLd", - "filament_id": "Prusament rPLA @CORE One", + "filament_id": "OFWRITFw", "instantiation": "true", "chamber_temperature": [ "20" diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @base.json b/resources/profiles/Prusa/filament/Prusament rPLA @base.json index c9b731d04c..32df471fc6 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @base.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @base.json @@ -3,7 +3,7 @@ "name": "Prusament rPLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFjFPhUC", + "filament_id": "OFWRITFw", "instantiation": "false", "filament_vendor": [ "Prusa Polymers" diff --git a/resources/profiles/Prusa/filament/fdm_filament_asa.json b/resources/profiles/Prusa/filament/fdm_filament_asa.json index 865b195578..1236ab3286 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_asa.json +++ b/resources/profiles/Prusa/filament/fdm_filament_asa.json @@ -3,7 +3,6 @@ "name": "fdm_filament_asa", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFB98", "instantiation": "false", "cool_plate_temp": [ "105" diff --git a/resources/profiles/Prusa/filament/fdm_filament_flex.json b/resources/profiles/Prusa/filament/fdm_filament_flex.json index 4e0e96e59b..139c475174 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_flex.json +++ b/resources/profiles/Prusa/filament/fdm_filament_flex.json @@ -3,7 +3,6 @@ "name": "fdm_filament_flex", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFU99", "instantiation": "false", "hot_plate_temp_initial_layer": [ "50" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pa11cf.json b/resources/profiles/Prusa/filament/fdm_filament_pa11cf.json index 4a3d06afeb..8367e9dce3 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pa11cf.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pa11cf.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pa11cf", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFN98", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pccf.json b/resources/profiles/Prusa/filament/fdm_filament_pccf.json index 50b33b2380..7903295158 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pccf.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pccf.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pccf", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFC98", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Prusa/filament/fdm_filament_pvb.json b/resources/profiles/Prusa/filament/fdm_filament_pvb.json index a7365e16bd..ef5a5cdcd4 100644 --- a/resources/profiles/Prusa/filament/fdm_filament_pvb.json +++ b/resources/profiles/Prusa/filament/fdm_filament_pvb.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pvb", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFS98", "instantiation": "false", "cool_plate_temp": [ "35" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json index 0571a6c393..da2184d76f 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "UWRDko6WCvXczl33", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json index ff958e904c..933dddacde 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "LUEO7LVrgko3oXzg", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json index afba292989..42c415e15b 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "NKhfqNQIcfKQBYAK", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json index e082ba832a..31d428337d 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "sZn12as9SQDNFDO3", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json index 4eae1e7274..3fb7ac7709 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "coopc46hemdV9QIv", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json index c918896762..09d445c402 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "qvYl7pfvtgF2y25O", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json index 8679f08572..b5d438e789 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "AzHGQIE0dGXjOhqG", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json index e22ad74af9..eb82b82579 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "CoYm8sbAVmpmJNIV", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json index 6c26b42f6e..748e5e2919 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "FnQb4cNqORpQ3Wkq", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json index 0fe76e86e7..8b0a54e060 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "94qvrRFOKOACTK2g", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json index 3383f16f49..077da196cf 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu ABS", "from": "system", "setting_id": "ehJ163zLubzIrWzf", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Bambu ABS.json b/resources/profiles/Qidi/filament/Bambu ABS.json index 8a3f3c544c..ee4586555a 100644 --- a/resources/profiles/Qidi/filament/Bambu ABS.json +++ b/resources/profiles/Qidi/filament/Bambu ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "aZylcH8GeCJOqtTy", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json index 72ca8b3942..ba65e6a896 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "cZhyWv8zbkM3fgAS", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json index 2baf999d10..984bf0ca94 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "PfIdpsKf0Xw5admE", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json index bdb1fc0cf5..a5e6576981 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "czi4981YiirKP6Yy", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json index 457e514214..8745f9b7f4 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "1BV8aedNHRa3h7rp", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json index 8c175a472d..ea82a7a259 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "eNHYNrSKn90P4GdZ", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json index 51609fb0a1..274d012a16 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "VU3PW2x6pfQ9Ayqo", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json index 975dc9f5e7..497cdc3212 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "2ezevTOIexxkTBJ2", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json index 8353f29d0d..855bdcc901 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "2vTNJwgFvUFq7oS9", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json index f777567d23..5dce4c4998 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "Q5ToVl9Yb4GGoNXC", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json index abb934e808..77e61eb8b4 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "XpLJtB1WhRyb1C75", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json index 517ea571a2..ef8ff48a3c 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PETG @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PETG", "from": "system", "setting_id": "PiYLOckPVRFKFTS6", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/Bambu PETG.json b/resources/profiles/Qidi/filament/Bambu PETG.json index f3c852e3da..8f69df52f3 100644 --- a/resources/profiles/Qidi/filament/Bambu PETG.json +++ b/resources/profiles/Qidi/filament/Bambu PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "5ZkReXpCOi19xuJg", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json index 1aa1a5791f..39c01a3e51 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "xY62JrDaYjjSb3lh", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json index 4ed7e3fde8..6a5dc5dc2f 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "HjjvZoWwpjZ2gwDO", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json index 20a1f209d5..a6c420c613 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "5dZqeodmshu33k4e", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json index 9eb008e6e3..2c700d3b7b 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "6kHEv9BjLlJi4E9T", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json index 670a0dd494..83e71e07f2 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "G28Bah0iOaahWlPE", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json index c480153803..afa945e307 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "ioH4lDHLbCw65TIg", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json index a3364d6f1e..bdfdf0e47a 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "oAUHAhSZkmCjhJEP", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json index 1a5492b842..cb39244927 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "mT6I8HUJsMgYCjb4", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json index 38bee01574..26a45e77d9 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "5sr5ABQQzrYFUxtk", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json index 46f76ed5ee..6d77933fc8 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "CNzhUsHWT2FOW2Qe", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json index 97c9d86fa6..df8c6b8a5e 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Bambu PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Bambu PLA", "from": "system", "setting_id": "8Mosuf8MExl0g3Tz", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Bambu PLA.json b/resources/profiles/Qidi/filament/Bambu PLA.json index f4df7bb875..4061aca197 100644 --- a/resources/profiles/Qidi/filament/Bambu PLA.json +++ b/resources/profiles/Qidi/filament/Bambu PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "lweaPojzNVU2FJnO", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json index a91921bf7d..29a1578964 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "QASmOwd2vpLRwI9I", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json index d222581868..42e761ca25 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "FETCvNKTRyxJujEs", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json index 25a52df29a..1186b13dad 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "ywzSdHmCxIwmIFVS", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json index 3d1b1b018d..603023a014 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "EwhasEiqLRcN5gBN", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json index 0548ad7b80..6527685bab 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "0NVX3dTScYTIebm3", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json index efbc5367cf..69ac1b6b11 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "HCU0TmDPYF39Gc3X", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json index 07e2b9020a..008671a374 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "Pf6oZn5QrYSbJhdm", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json index be04669935..b777c29a9b 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "6LSdExBaTT0Mc3rY", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json index 338327a6f4..fbea89c0fb 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "vc2R90RYyDuY8vQn", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json index 0e0929a26e..6b612e4461 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "1HVRVgHeXWVj3T0v", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json index 9a77e829eb..50b05d928d 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX ABS @Qidi", "from": "system", "setting_id": "aJxjGxHK8UJOqYPV", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json index a10c29a679..7a3ee8c8ce 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/HATCHBOX ABS @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0fchNQsqRqwI6whN", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json index 0fd49f7b99..5b63882b5b 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "Cw3CaLrsjVfJKoWI", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json index d907869893..88a9ffa985 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "eLmXN4kJvaoq5Ude", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json index 30c74b3628..8c4767360d 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "mndT3gxOniftGEEZ", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json index dc93652d10..9737c4de7a 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "L8aHH2WqnlOYuyfd", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json index 6d403ed166..66da1ce3b3 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "LMva5CR9m19UAhcI", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json index 1e60285f5c..d5e9d135bf 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "5EfWTFx0dXRTREkj", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json index 9463655aed..055b64956f 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "xeu1S6h53DRVM9Pw", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json index 90fdab75cf..d002a5db8c 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "UrZzA62PJDuvo9EC", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json index c9f19b8bbe..62642bab11 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "jAykaomjQ4BS9Cg0", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json index 74c9c5645e..72f0ca2ae8 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "2QrBYfeT0mp048aY", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json index a404adcc52..5f0d6a3e6b 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PETG @Qidi", "from": "system", "setting_id": "9otX3aWO4xQA72DT", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json index 2d9a104b6a..02b6929088 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PETG @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "dqHKVy4ahTjpQFOJ", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json index 94399a5e99..4e21fb79ff 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "GrYmKcX6ghgUO8z0", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json index a3f934d4a3..d2b9e1f6b9 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "Fwd0BaBVmg2w9oBo", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json index c7c48eafaf..f09ce840a7 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "OjSAPfXD7c9LpDZI", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json index 3e4260f01e..37e1982068 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "tNk1yBoRzuKtWamt", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json index 2ba5095a7f..f03e9c8053 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "oULA9qVGUD5izX9o", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json index baacdde075..8331e6dc6c 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "RK1LyCal04XMqidp", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json index 444d1e7ec5..8eeaf11774 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "6ehhHeFIMe3KxHA1", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json index 781709ec0e..5066c19ab1 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "i3bQYXjlGipOAop7", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json index 0b7c393c5e..1dce884cfd 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "vknSksUeSeKFl8vB", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json index bbfc813ac4..7d5db3e2de 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "I5NFFjIYcoo3SkmC", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json index 0a698394bc..16a1a42344 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "HATCHBOX PLA @Qidi", "from": "system", "setting_id": "gzDFMFaDnAVuDy3B", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json index 54077f69b3..2e6ed1140b 100644 --- a/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/HATCHBOX PLA @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "jWtANauqr4Azj7fo", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json index 616249f7fb..6ca66cc671 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "PVJaNrzYRoafHb3k", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json index c442a6b9b4..4815755a54 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "6dP4f482dvR9Ihhu", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json index 438527e84e..d3ef4ea036 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "ol1pj7wlmGJlZHbA", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json index dcc67c9e49..7c9832acf5 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "d9bOxYmwJJ928QUm", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json index aa27b3bf99..56846eb0c1 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "3vOLIQxScIoHCUDQ", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json index 693927e275..905d2cef0b 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "ninsIRmjQReutXjA", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json index 2c50318e80..8692479cc1 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "m4sql22MWPed4UK9", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json index e2e657e67d..9dca464248 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "SbIhXnMLo7UWLdmF", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json index 310f56f725..edba90fe27 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "Hh22vTpUyqF09bma", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json index 0b41ec4fcf..3663179029 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "10PSPCpiTcS92auy", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json index ac1a6dd3f6..fdea3d5aeb 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture ABS @Qidi", "from": "system", "setting_id": "Xevn2nrx7W5VQX6z", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture ABS @Qidi.json b/resources/profiles/Qidi/filament/Overture ABS @Qidi.json index 9f8543d169..a422baae82 100644 --- a/resources/profiles/Qidi/filament/Overture ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/Overture ABS @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "rRuO94f0PYlPR3yu", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json index 801448598f..924362c286 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "YnRI4rYCHDIi7Q0w", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "pressure_advance": [ "0.057" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json index 4875cb845d..fbf2b78629 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "Jizherw9T9l0X76l", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json index 4a75b36230..f265222c29 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "dHlHvcm2BjzlfUSk", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json index 04bc00470b..cd3c18c309 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "3jqdiWNWro7yFptW", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json index 0921c9b6e8..4d9a6ad8c9 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "tARHr87BkRknTQJI", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json index c888887711..99a239670e 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "EEIdQ4XTkpQyRz3h", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json index 53a2a25920..5836edcfd7 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "NBbNF6S5sQYIiS9T", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json index 9dbd2f38a6..8414abfcca 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "gk2D7WKoLK1xPqLC", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json index a83fb80140..8ee92ded5a 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "wtl6yNqJQUVhiBnB", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json index 829d5e6e29..c60980ba47 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "1fl42MjkwXbpjJ3r", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json index 68736ba4c9..eff7da8211 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Overture PLA @Qidi", "from": "system", "setting_id": "vxGQSWw07PXnllwO", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Overture PLA @Qidi.json b/resources/profiles/Qidi/filament/Overture PLA @Qidi.json index 5a67c65ecc..b3ce80842d 100644 --- a/resources/profiles/Qidi/filament/Overture PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/Overture PLA @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "XXJ4dSi48JuA54Iv", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json index 7072ae9048..250eaa3223 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "5rbxArwT1VV5BOSq", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json index 12b6451671..082f09ffea 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "EqpfLGTZXcdjm5BM", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json index 631237f251..087808ff18 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "Ao01rvVFfkWlwpER", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json index 2002832792..4325782ea0 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "dfni3lzB8GJldfQD", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json index e589839cac..48a586618e 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "iWq2EddKO6QAUJuG", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json index 0add34cd62..bf25f2c6da 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "0EswisPwFjFmk1GT", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json index 2a22e88081..98ed0be9af 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "t3DcJuJsNgXKW0dP", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json index b1fcc53a1a..d669116cc3 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "Ino4r7XLgTCFh4YR", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json index 5d02632d1f..c586125db1 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "7NXI13ejzocjD7TO", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json index 62f530081c..2dccc6f635 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "QEJ9knURmXAGsFib", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json index 2874e9ed51..96ed3908e3 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite ABS @Qidi", "from": "system", "setting_id": "GzEXQzyKqqnCVUBh", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json index 749d87e959..ca0e5862fc 100644 --- a/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/PolyLite ABS @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "Q9QYOF2UmsrK7Wof", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json index d1fe71dbea..32839eb63d 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "uXrENPoTa7HWapCV", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "pressure_advance": [ "0.057" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json index 0de4f9ec71..5c81627600 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "XnU3X7A7kdRrfoTX", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json index 12f56a5826..874ae102f9 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "Q6H3JzOum8GYVRF9", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json index 563fdaf639..4f2a9d85a0 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "tSR6NKHk3ietpsga", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json index 5cab6e5d2d..d4b17517bb 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "ZF5is6IpP0gGcqRE", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json index 6f293d396b..fe5165436d 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "bAqfoS751xDFHubU", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json index 19d9c490cd..d277bafea9 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "2rWOMrYc40ZRNLQi", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json index 16e34885c6..a1a970be54 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "4x8HlY906khbFsG0", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json index 95b33c700a..3ee5d4697f 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "87QXnh5kCuQoPwjr", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json index 43d6ebbe3b..4cfd0f3202 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "WsMzyALZrDylCkZ6", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json index 01f23b61ee..025770dea7 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "PolyLite PLA @Qidi", "from": "system", "setting_id": "sHVHjhH9FzhRjeHT", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json index a7c49a98f8..d277778204 100644 --- a/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/PolyLite PLA @Qidi.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Kg6WHLbWxKAE8cCr", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json index 6d1f651941..ba454d0083 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2.json @@ -3,7 +3,7 @@ "name": "Bambu ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json index a66e95159e..6ef3859314 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "Bambu ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json index 56c8f26888..a677387d1b 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2.json @@ -3,7 +3,7 @@ "name": "Bambu PETG@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json index 61537e05c5..ac1ed2e4bc 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PETG @Q2C.json @@ -3,7 +3,7 @@ "name": "Bambu PETG@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json index fbbbe3bcf0..1eee11b706 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2.json @@ -3,7 +3,7 @@ "name": "Bambu PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json index 6e72108961..398a45ac25 100644 --- a/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Bambu PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "Bambu PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json index f3e45975a9..c3f6f6ede7 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2.json @@ -3,7 +3,7 @@ "name": "Generic PLA+@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFfdxQok", + "filament_id": "OFEWYR89", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json index 48422dbf2c..fd06d75bd0 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA+ @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic PLA+@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFfdxQok", + "filament_id": "OFEWYR89", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json index 99b96f7788..429f7bc58d 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2.json @@ -3,7 +3,7 @@ "name": "HATCHBOX ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json index df0c4c9006..a06b63de6d 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "HATCHBOX ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json index 73d7e901ab..14cc4b1463 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PETG@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json index 013e38199f..3922b8fbbb 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PETG @Q2C.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PETG@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json index aeba01311c..0de43e0804 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json index 40ac36e3dd..94fb13c4a3 100644 --- a/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/HATCHBOX PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json index ff0b89b0ec..cb96443ce7 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2.json @@ -3,7 +3,7 @@ "name": "Overture ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json index b271d4f87f..2caa6342ff 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Overture ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "Overture ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json index 8435661492..2bb82adf5f 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2.json @@ -3,7 +3,7 @@ "name": "Overture PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json index cc358bbb31..e3db0ea728 100644 --- a/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Overture PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "Overture PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json index fe2cf1e7f0..98ea19925c 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json index 69747075c6..ed269d96be 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json index b342506185..8639ef5ff7 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json index c8cc9c7f1d..366be7a6ba 100644 --- a/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/PolyLite PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json index f01f3e4d80..ac901e85ad 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Z0J9YPS8382vLms4", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json index b6f87914d3..0c5834be33 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "SA5qLMqlZg0lBV9u", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json index 397e9d9c2d..9f276e1282 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "MzM45pddZsnN8jk4", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json index 00ffd121ef..4f5a081162 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Tq1aLmF5jT1fx5mZ", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json index d03e15c72b..0cb80c93c1 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "1hhkoG2E1z6ya5hY", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "during_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json index 0661266966..98f2689236 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Vr1wXzAo5OR2PASA", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json index 36ddd1819a..c8965e1ade 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "OCg8c9SWQrZP0SrH", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json index dffcec3561..2d6cfd79a6 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "3fkdGYKFpaJ8yjwg", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json index eac761c62b..228a2b7441 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "Tkh7jC3ZhD7qchMF", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json index 6b0c61276a..e9139c0464 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "wOJOXhIjWFMUvDsB", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json index dec090494e..c0934114e4 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Odorless", "from": "system", "setting_id": "WqbBySroQTCBWMoz", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless.json index 7803db110f..d53b7c2bee 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "5GyjZE2Ukzo3BDdg", - "filament_id": "OFVhG0yM", + "filament_id": "OFma5TXH", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json index f04485915c..1f30fa81e6 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "CeOohxHZCLelVMCk", - "filament_id": "OFeybQvK", + "filament_id": "OFOuEEvv", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json index fd6e7b8c76..2ebe9f8df4 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "VzAotqGZviabVuS4", - "filament_id": "OFnj7bPm", + "filament_id": "OF0wz84w", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json index 2ec48424c2..aaa210c950 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "1hpYHzEDBeO8jwDr", - "filament_id": "OF8WvPVL", + "filament_id": "OF0w7OpJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json index 8beeba8c54..0824c6eae0 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "2ZB4CZPo7OnsVeFj", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json index e09f33c2ec..f35f44ff48 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "ANlmZnKFevlds1x9", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json index 404c73f209..2b516260c4 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "qGAb3jPiiSZqPc0W", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json index 93b6a852f7..b1ea6553b0 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "zPlNGjze5nz0Sqtn", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json index e28f719297..3ed4c50855 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "L6hmbX1bqdrGd9g2", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json index db9b53d8b5..b4cd47f8e0 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "ZKLPQIUecFL5GG2P", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json index 4b76aea4a6..5316755879 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "OlI3NRTSS4Vb9ABn", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json index 2224bcf267..8039f0046b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido", "from": "system", "setting_id": "7AXe36Wqh6uupouS", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json index da948783fc..c3dc666461 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "CQa9Ke6ku0jK7juR", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json index 496f544403..7f5946f4d8 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "KBXExHIJGyOE02sr", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json index a22da32e00..d114ce7ed2 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "QjDN8l4fq8nrEtZS", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json index 6206964150..fc4a9099c9 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "83M8HRLtzoEyAgdd", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json index 3d47382873..fdf74d3fc5 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "JWNlbq8qmrVoCjJZ", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "during_print_exhaust_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json index 31ebb14e56..2d0850b58f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "igcuTXhdFT9QEkki", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json index fdfe9154a8..bc81c0f940 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "Rci7D9y258kLZl3F", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json index 3106c593b8..1f1d71d6da 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "LClDGDpaf5l4XinA", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json index 5a187f9ed2..c8e0675c3e 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "TbTSNtElyeqwuhI2", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json index df8ac29f1a..f7b91d1384 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "lRSAQSUdgEOvrWOZ", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json index af46a4fc45..6aad4985d6 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS Rapido Metal", "from": "system", "setting_id": "sV1XN1EnDMTMC6eZ", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json index 3cee143732..9c133650ab 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido Metal.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "EcvWsnEhikUy64mA", - "filament_id": "OFToBodi", + "filament_id": "OFeCJqxx", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido.json index 08a58dc6dc..b29a065b5a 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "sru9yX08jyTVNmOz", - "filament_id": "OFW8UdlP", + "filament_id": "OFT2jon4", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json index 17ef67f639..38bd8a9438 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "BG8J7FyU5Sn6pmGk", - "filament_id": "OFYH00jV", + "filament_id": "OFt3HtlG", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json index 491e1f4660..59c267751c 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "87bAUrovoG3W1WZK", - "filament_id": "OFYH00jV", + "filament_id": "OFt3HtlG", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json index e5e82a99df..ca9e5f25a4 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "v0K7uK7rq54uGbrE", - "filament_id": "OFYH00jV", + "filament_id": "OFt3HtlG", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json index 174bccce8e..92db726d5d 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "OD1YZ5gmmk39jI21", - "filament_id": "OFYH00jV", + "filament_id": "OFt3HtlG", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json index b22eb5c8b5..aaf74e228f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "QzCAZozPOpv3IOzz", - "filament_id": "OFYH00jV", + "filament_id": "OFt3HtlG", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json index 32e6766cda..93b5abffd9 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF", "from": "system", "setting_id": "fvB8ilSXksTr2ahl", - "filament_id": "OFYH00jV", + "filament_id": "OFt3HtlG", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF.json b/resources/profiles/Qidi/filament/QIDI ABS-GF.json index d7f24f36c2..f07b650913 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "FW543AnWfRtseB8W", - "filament_id": "OFYH00jV", + "filament_id": "OFt3HtlG", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json index a99a9522de..f52455998b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "uskWZUmvzYkVgG0l", - "filament_id": "OFQZINrX", + "filament_id": "OFQMsFfF", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json index cfe8ea1bf0..a9e4dc2f3a 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "9laiuOlfZEWIjQ3u", - "filament_id": "OFQZINrX", + "filament_id": "OFQMsFfF", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json index eb4bbfa171..7aba539d32 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "Jh3kEQrLdoGw4WLW", - "filament_id": "OFQZINrX", + "filament_id": "OFQMsFfF", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json index ae910ae9d5..13a7f6576c 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "3tblNpw8VgOlt8VU", - "filament_id": "OFQZINrX", + "filament_id": "OFQMsFfF", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json index 3009f9db4d..2dd3e667ff 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "tssoWES4nOoMEh90", - "filament_id": "OFQZINrX", + "filament_id": "OFQMsFfF", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json index b5aad08653..6f090ca606 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF10", "from": "system", "setting_id": "cgzmqzFT32UhNW5Q", - "filament_id": "OFQZINrX", + "filament_id": "OFQMsFfF", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json index ffac088449..39ac4a7119 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "hxsu8XybSxfesTJf", - "filament_id": "OFQZINrX", + "filament_id": "OFQMsFfF", "instantiation": "true", "filament_type": [ "ABS-GF" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json index 8287d0aa7b..15314bf743 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "Do5JLiLyzue036L8", - "filament_id": "OFv2NHLC", + "filament_id": "OFZLtWYs", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json index ffb51be952..c0f30133ce 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "hTEx7UgX2wWanON5", - "filament_id": "OFv2NHLC", + "filament_id": "OFZLtWYs", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json index 6fb67b1002..ee93a959e9 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "shInwFwd1Yh5wUJB", - "filament_id": "OFv2NHLC", + "filament_id": "OFZLtWYs", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json index e4980df547..5c51beb27a 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "LQoXGFsJRpjCTBKm", - "filament_id": "OFv2NHLC", + "filament_id": "OFZLtWYs", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json index aab8dc01c3..0cf39c8240 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "5ONV5cuwTbSMWPMf", - "filament_id": "OFv2NHLC", + "filament_id": "OFZLtWYs", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json index 3b809bdd69..e204c4e0c9 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ABS-GF25", "from": "system", "setting_id": "nvfnoGOwhELWArss", - "filament_id": "OFv2NHLC", + "filament_id": "OFZLtWYs", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25.json index 097f336bb3..dbac9e9e47 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "mFWkL9nlS289XAWu", - "filament_id": "OFv2NHLC", + "filament_id": "OFZLtWYs", "instantiation": "true", "filament_type": [ "ABS-GF" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json index 3bdd268e3c..078e81b02b 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "JPrwCFLO4P82f5lz", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json index 074ac486c0..e199e58998 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "zku756j16aST1ugn", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json index ee4d8c3eac..8a5be0dcd5 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "EcewU7mP5y2vDwRn", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json index 7388eaf99b..03b5748208 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "JPCSXfcIngQGTuOz", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json index 1939e7b3e3..64e213bd94 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "hhkWOEdIbQrB4IR0", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json index 98cbe34d45..4578f2d1dc 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "QiV5OREyiy9cb2yA", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json index 7815a1ae6e..7723cdca74 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "yOWilrQPhpvcpWM4", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "chamber_temperature": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json index eeceeb147e..39b0b7be70 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "tohpo42HW9BLvVcH", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json index fcf20cb643..0e0f51245b 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "iDF5lahr0TRvLF8F", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json index 0aa3d22f7e..71682bf82d 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "p371tUSbBj3WOi5M", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json index 78599691d3..f0dd09ede0 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA", "from": "system", "setting_id": "4NUwEIv3156HKgev", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json index 0a7af77d4e..525810872c 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI ASA-CF", "setting_id": "UZg7s2SVhCGDcdkA", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "filament_settings_id": [ "QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json index 5b956ce37b..dccb6eb9fa 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI ASA-CF", "setting_id": "x8avbSHn73PayVfR", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "filament_settings_id": [ "QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json index 15bc124407..059390e58b 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle", "inherits": "QIDI ASA-CF", "setting_id": "FagCR4bLL1ctSXax", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "filament_settings_id": [ "QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json index 65d8322f3a..84035c06d3 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "T6U1oaEsA0T3ogMM", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json index cce1651f85..7532ce7249 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "8Xm0AjRaktaNfo4o", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json index 68c1c975f1..29a88f5e45 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "4p12RphItNlfwqwT", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json index be3b32c6ac..8e73a8d4f2 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "346HiaeZvs3BoFUb", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json index 7ddeb6a70f..203856fde8 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "LROz60JZsh6GN7CK", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json index ef9e6a0fe1..9bcccb476a 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "5OR8LnFPipv3h4h8", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "during_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json index 57b4dce412..fd6963ecb4 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "wyns97Rn3EVTl0v5", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "additional_cooling_fan_speed_unseal": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json index 4f55fa7c84..de52d4fea8 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "zituWsHG83yRR1lM", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "additional_cooling_fan_speed_unseal": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json index b18a387305..0c18c54f8e 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI ASA-CF", "from": "system", "setting_id": "2CgI1u8NrWGqxN1C", - "filament_id": "OFmF1xL9", + "filament_id": "OF1W7c76", "instantiation": "true", "additional_cooling_fan_speed_unseal": [ "0" diff --git a/resources/profiles/Qidi/filament/QIDI ASA.json b/resources/profiles/Qidi/filament/QIDI ASA.json index c69ce99c06..5e0f08db8e 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA.json +++ b/resources/profiles/Qidi/filament/QIDI ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "v2LrEujF68PPbrux", - "filament_id": "OFK820gS", + "filament_id": "OFTsHNQi", "instantiation": "true", "filament_type": [ "ASA" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json index 66de4a49b6..e377cff6f9 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "rDi5X7jq3PrXGeSo", - "filament_id": "OFXkwkn6", + "filament_id": "OFlN6DL1", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json index 4298dd4ea5..6921a3ac20 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "tF0ym95Eo2WVjYrv", - "filament_id": "OFXkwkn6", + "filament_id": "OFlN6DL1", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json index ebe1f68c1f..6482c628bc 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "bWc3l0t1llvWvFei", - "filament_id": "OFXkwkn6", + "filament_id": "OFlN6DL1", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra.json index 7cfd1faafa..3a7512ae98 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "Rp1vbScHgwAZAwNT", - "filament_id": "OFXkwkn6", + "filament_id": "OFlN6DL1", "instantiation": "true", "filament_type": [ "UltraPA" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json index 087691ba31..8aae289040 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "Q3votaRX4HuxZl1j", - "filament_id": "OFFIL5pD", + "filament_id": "OFn6WpN7", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json index 382b51b6f3..6fb1462acb 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "aaAKfscwITCW1cIY", - "filament_id": "OFFIL5pD", + "filament_id": "OFn6WpN7", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json index ea996d2a71..df40927a88 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "nsFoTEFnTCbVM5VS", - "filament_id": "OFFIL5pD", + "filament_id": "OFn6WpN7", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF.json b/resources/profiles/Qidi/filament/QIDI PA12-CF.json index f559526129..1c9670ae87 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "tDdg0DlqE4Nle5Xo", - "filament_id": "OFFIL5pD", + "filament_id": "OFn6WpN7", "instantiation": "true", "filament_type": [ "PA12-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json index e54c5f53e9..b4373b79b4 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "wBwy10qTZT9LPkX7", - "filament_id": "OFUkpobY", + "filament_id": "OFKgmsqE", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json index 8e9dfc5b7d..bb3e66d408 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "a7pcw1dTC3bXjkqQ", - "filament_id": "OFUkpobY", + "filament_id": "OFKgmsqE", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json index c74c3b9054..c2a557e26f 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "pRBh7YZdJFYv4rED", - "filament_id": "OFUkpobY", + "filament_id": "OFKgmsqE", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF.json index bb1296382a..f366e23fc5 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "Hws8EIuQkAfaCJGk", - "filament_id": "OFUkpobY", + "filament_id": "OFKgmsqE", "instantiation": "true", "filament_type": [ "PAHT-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json index 3c457fe294..f365f39f31 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "jRV6kS5c49Jf0IBJ", - "filament_id": "OFfJoIgg", + "filament_id": "OFo15hcT", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json index bf0a862d3c..134232f846 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "ic09uwyOjmjgZhCY", - "filament_id": "OFfJoIgg", + "filament_id": "OFo15hcT", "instantiation": "true", "pressure_advance": [ "0.023" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json index 6f1402814b..3d5b6136ba 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "BGwcBuMu2dcF1nGB", - "filament_id": "OFfJoIgg", + "filament_id": "OFo15hcT", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json index 08081a83b8..4139a0bb49 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "R8msB42rgbyfT0sG", - "filament_id": "OFfJoIgg", + "filament_id": "OFo15hcT", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json index ed19eb439b..3d10846072 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "D1nnJWlyUV0wvZnz", - "filament_id": "OFfJoIgg", + "filament_id": "OFo15hcT", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF.json index 676d2575b1..2093825bbd 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "A6BaDz936RbO2EW1", - "filament_id": "OFfJoIgg", + "filament_id": "OFo15hcT", "instantiation": "true", "filament_type": [ "PAHT-GF" diff --git a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json index 60d2eaf677..ffb254d8db 100644 --- a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI PEBA 95A", "setting_id": "VNbCsg7HAvK02shi", - "filament_id": "OFUJw3Lx", + "filament_id": "OFhiJE7Y", "instantiation": "true", "filament_settings_id": [ "QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json index e25178269b..41d449361d 100644 --- a/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI PEBA 95A", "setting_id": "SBJaM8xcxmruL8Sx", - "filament_id": "OFUJw3Lx", + "filament_id": "OFhiJE7Y", "instantiation": "true", "filament_settings_id": [ "QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json index 2dc2cc8a50..ecab417416 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "sPox9vMaLAuoZoP2", - "filament_id": "OF4gzzE4", + "filament_id": "OFKfJTwL", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json index 55e899aafb..8263cd2cf9 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "6BLOwVDtDPvTqanQ", - "filament_id": "OF4gzzE4", + "filament_id": "OFKfJTwL", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json index 3c9732f139..a1f15b927a 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "znZt3ns7eHGTA3sX", - "filament_id": "OF4gzzE4", + "filament_id": "OFKfJTwL", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF.json b/resources/profiles/Qidi/filament/QIDI PET-CF.json index b5a58b236b..e187e4550d 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "X4zXjt7t9eLbESzJ", - "filament_id": "OF4gzzE4", + "filament_id": "OFKfJTwL", "instantiation": "true", "filament_type": [ "PET-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json index a69ba467d9..e8bc3fc708 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "N9zX7M4yR8u5Jqjd", - "filament_id": "OF3XeEuV", + "filament_id": "OFhx4uOG", "instantiation": "true", "filament_settings_id": [ "QIDI PET-GF @0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json index 626098b09e..9a13f2e1c5 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "ATyJ8qPoYVqi7J3I", - "filament_id": "OF3XeEuV", + "filament_id": "OFhx4uOG", "instantiation": "true", "filament_settings_id": [ "QIDI PET-GF @0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json index b212549902..bff7391a88 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "I48bgbR8Rq9DDxmR", - "filament_id": "OF3XeEuV", + "filament_id": "OFhx4uOG", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json index 87e6b3b785..56f49905f9 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "hGLyYZ2WBTIFnWnc", - "filament_id": "OF3XeEuV", + "filament_id": "OFhx4uOG", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json index 5b372cda6a..39399a1915 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "XC3F1NLZxw1v5Bh3", - "filament_id": "OF3XeEuV", + "filament_id": "OFhx4uOG", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF.json b/resources/profiles/Qidi/filament/QIDI PET-GF.json index 78a901cbe1..cef1774ed3 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "nXZR8ykt6JdxvTCd", - "filament_id": "OF3XeEuV", + "filament_id": "OFhx4uOG", "instantiation": "true", "filament_type": [ "PET-GF" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json index d66f38f8fd..e1351c1452 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "U8Tz8l63gQMoW1TR", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json index 56206c0269..e2f7f3eae4 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "i5DnDzOFFFsd4ear", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json index 101e2d8d16..1c38fa0a64 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "eqwWKpJur2oPzaig", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json index c6c692eb41..6427dfebe7 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "ZwdzHcsJbYBI04Yn", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json index 99f2f1c94e..bd55a96d95 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "wYE4aUeszHw1HJrZ", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json index 21a359c65a..81c9040a53 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "SbHnONYlR2WneAjS", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json index b80993fba6..03e5e299a9 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "EQrNIdbODkHki7pY", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic.json b/resources/profiles/Qidi/filament/QIDI PETG Basic.json index a855dd785d..61f3784f74 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "7uiFWB9SSJvhXKt0", - "filament_id": "OFSSuKRr", + "filament_id": "OFuJ49uH", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json index b44faa2e7f..262479a3d5 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "17nQzSvxOhC8RqMv", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json index 75adc4d4d3..0668e88303 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "TJja29CvUqlXnhWM", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json index 9e965e2753..d4f9e92e17 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "6rVVNiYVHxsxqk0M", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json index 503cf229aa..5ede468e69 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "MoKlaB96ptTjnoa8", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json index ae7376700e..ceff06761e 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "S2CUnrPuZuvBo19K", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json index d4b7e161e1..5ce3194c0c 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "kEUCaWmAo3xZC09A", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json index 066270e96a..a64c3fba4a 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "4Tse2Ycxud3qX0aQ", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido.json index 7097f784d3..991ee37f5a 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "YK77S7a06UMEQzum", - "filament_id": "OFbS9rjH", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json index 856a8f8b32..cf42e76d85 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "wl53hiPD7EGYabrt", - "filament_id": "OFWkCAdc", + "filament_id": "OFVHMFJX", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json index ebd4cb47e9..6c1de3e610 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "QUkztHAxlI1gg1xe", - "filament_id": "OFqPp2yL", + "filament_id": "OFe8yBMG", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json index ebfeb1a3a6..e25eac8748 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "vtQb2QBD5ongR7vC", - "filament_id": "OF48G7He", + "filament_id": "OFfr6JDF", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json index 31e4a0a837..89415a8dc8 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "KHeb2TVAxtw6fbRm", - "filament_id": "OF1Zypyy", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json index 54ad4f4fe1..ad32ffa5d3 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "22HUqZbuYgOGNRfN", - "filament_id": "OF1Zypyy", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json index 1563a33564..76e0071f42 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "U35fhYtgLMsDXEws", - "filament_id": "OF1Zypyy", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json index fdf754efcc..9229387ad6 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "wqzUWt3IiEURFRYL", - "filament_id": "OF1Zypyy", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough.json b/resources/profiles/Qidi/filament/QIDI PETG Tough.json index 81eeb5a641..6a32ec5569 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "SrZXxBXWXda9boGv", - "filament_id": "OF1Zypyy", + "filament_id": "OFQ40XeN", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json index 4b0c2a6818..719f4cb648 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "I8DmnTJey0BaBBAN", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json index cee560227e..6b5acc46d3 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "0SbgoW822S43QDoX", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json index 591ef0fedf..92cbd91012 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "rOakaeWOHKz9immU", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json index 5a4d4bd206..581e9b9107 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "RBy7wrl1ZQOdKe8i", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json index 6b32f51dfa..69f9916106 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "Y0jCXY0Ihd6eRlm4", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json index 6dccf959e3..3fca9fa3f8 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "9yzSrCFgR00Lx8Ab", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json index 86548c4867..99edc43ac8 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "uMHHs1N1fLMq56FF", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent.json index 60a750367f..1b00da208d 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "5k6FnlL39pSbrei2", - "filament_id": "OFjohFkg", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json index dd8dee64fe..1de1163020 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "6EOvD75tBRyvffZF", - "filament_id": "OFPokkKe", + "filament_id": "OF4iWKrE", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json index 83f504fff5..01483c22f3 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "ByHCLDgv1HFiA1Bb", - "filament_id": "OFPokkKe", + "filament_id": "OF4iWKrE", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json index bf3b1e5515..1ff8be3c19 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "NBrZJME5Jt7jwU4W", - "filament_id": "OFPokkKe", + "filament_id": "OF4iWKrE", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF.json b/resources/profiles/Qidi/filament/QIDI PETG-CF.json index 23bafc4875..e2b5316a51 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "vg3YJMhVaXTMTVLJ", - "filament_id": "OFPokkKe", + "filament_id": "OF4iWKrE", "instantiation": "true", "filament_type": [ "PETG-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json index 802656c1e1..4528379034 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "4kBE3NMTit44g7S1", - "filament_id": "OF0Y5MLd", + "filament_id": "OFdtPd9h", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json index 582fe9675b..acb59a4b53 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "SzH90qDpFuNpG7Ud", - "filament_id": "OF0Y5MLd", + "filament_id": "OFdtPd9h", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json index 4ba14fed71..cdb3ab339f 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "9XoDC8DHvxvgrRor", - "filament_id": "OF0Y5MLd", + "filament_id": "OFdtPd9h", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF.json b/resources/profiles/Qidi/filament/QIDI PETG-GF.json index 1b8ada25c9..e9f7252039 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "bex5zSdkQThZQi0s", - "filament_id": "OF0Y5MLd", + "filament_id": "OFdtPd9h", "instantiation": "true", "filament_type": [ "PETG-GF" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json index 31134c4e2c..8fffe5d1a9 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "hWJXKDKNjeBqYYFk", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json index d7bd4eaf46..9f5cfa548b 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "LMfV673NzArmzY44", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json index 9b578ef512..444c03e6ea 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "CyXcxvEKE6gnCRm9", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json index 560db51ea0..3dc9c3c692 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "g7OVjk2xNWWNQo9D", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json index 0d21566770..8e446f1f83 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "EdgtTQVIiPatR9Rt", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json index 2e05ec1a09..198c392cd1 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "UTbL94nFN0Cx30p6", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json index f8f7dc88d9..ff845fb81c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "INxFTcta59v2Ukpy", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic.json b/resources/profiles/Qidi/filament/QIDI PLA Basic.json index 2c15693ba5..5456c83805 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "UlF92qvJnOYzq0mw", - "filament_id": "OFN0X7oN", + "filament_id": "OF4nQ62r", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json index 763557b382..4cce2a6f5c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "vzT3dsogzkZSegM0", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json index d283df5e97..8fc9a37ed1 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "rdGuWICdcIZ3fXJb", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json index 56d1503e8a..3acc12ff0a 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "9z0BoiNtKlwPoCI4", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json index 9de765cf78..061f7526f3 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "Txg82qpCGVco78Ih", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json index 774922475b..1d921fecff 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "smHGcdmpWzQy1vW3", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json index 54753b4f40..8eb3335beb 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "hGKQJNUIQR0srofE", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json index dd25635276..b5f8c2a48c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "kARyA9JRV7f6Wu3E", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json index c75d42b5a4..d9d99e5029 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "53yYF0gK91AQcKAy", - "filament_id": "OFvN3117", + "filament_id": "OFughwKn", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json index d02d87ea5d..a913878021 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "jpTA43XolFvODs9f", - "filament_id": "OFXNO5Of", + "filament_id": "OFhwiZ50", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json index 45906c1b51..92819732f0 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "MGW0kfdHATaAzL1P", - "filament_id": "OFs1CbB1", + "filament_id": "OFglhKLM", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json index c2216596e8..17ecf6e992 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "eQOfNVt6OqCFj0bV", - "filament_id": "OFmKNi3f", + "filament_id": "OFKIQO2W", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json index 3bdb9bec64..adc3655403 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "tdL1kK6jLbREgYna", - "filament_id": "OFmKNi3f", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json index ac6a619cb8..0af8afe9a4 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "zfL5B7iAlx3PbJ1j", - "filament_id": "OFmKNi3f", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json index 48f74dc047..5b8b3bd442 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "oZZn5VxcrwDJX9fE", - "filament_id": "OFmKNi3f", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json index 198ef80000..dadceacf8f 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "o1lfFStVDZMsdFtr", - "filament_id": "OFmKNi3f", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json index c143b656d7..fb1959a33d 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "HK2fT6TYIIS94MZD", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json index a1b519af08..be4fc7fc47 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "User", "setting_id": "syivJeR1eO6H8wsK", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json index ea13d3583e..e002a51409 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "User", "setting_id": "WC8KpzKwpQcHOStJ", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json index c546a5d00a..a31fa6c9a5 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "RccxOqWrkZljiU5Y", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json index 77dd1451c2..4448e4e24d 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "8KV7AfivVZHM6ReD", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json index c2cb8532be..7b9a1d8dc5 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "c5lFoguRq8sBwQ1K", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json index 8b96e4a264..d90e8dbcdb 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "95NdLwU31HQJthJE", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json index cdd0173131..d19017a05c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "gwmsxvv6cpmVlBDa", - "filament_id": "OFAUDGEQ", + "filament_id": "OF3IKafc", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json index 2022fa0518..9a56d85ace 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "oZC1FZ93158dUC0j", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json index 2525fd7186..6f37ee7eeb 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "Ix7a15ABLu7ykbMb", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json index f03a2919dc..de4e1c62fe 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "NdUtpGmW1Rl2h1Xc", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json index 0a90a98c7e..60bf1985b3 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "6obXUws35j7OkE2v", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json index f9c18e02f4..c2dd7afbd9 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "Z0YSeNJQ3rKDwzsp", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json index 83daae2d51..5fa9b63ea7 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "BoVtyU2REc0Ayzc4", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json index 6b18f61607..ff220ecd05 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "EKWOHWk37Yn1jS5V", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json index af8af08270..03c9200bd0 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "yrS51y3N1ooM5ULv", - "filament_id": "OFV4hD1o", + "filament_id": "OFANFm4x", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json index 7704c2b53c..5ca5b12e28 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "AaBBTIJSMkxxTPDt", - "filament_id": "OF0z1XpN", + "filament_id": "OFW5FqkL", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json index fea97d7530..d0382ee04f 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "hnWx5ZM2ecclYvKA", - "filament_id": "OF0z1XpN", + "filament_id": "OFW5FqkL", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json index 7191180725..5ea0e37bb8 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "bQTjglDv2qjgrUNl", - "filament_id": "OF0z1XpN", + "filament_id": "OFW5FqkL", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json index 47a2c6edb1..7c90a10971 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "zifqr9yiIZKivCNu", - "filament_id": "OF0z1XpN", + "filament_id": "OFW5FqkL", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido.json index d5bb8ebb62..f1ecaf7790 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "JdGWg2Kn3T2L2Ai2", - "filament_id": "OFmKNi3f", + "filament_id": "OFKIQO2W", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json index a65d1591a8..44ad31c806 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "BTqlIKpYFQCC8gJt", - "filament_id": "OF7cv1Ub", + "filament_id": "OFhWrAuP", "instantiation": "true", "pressure_advance": [ "0.01" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json index 768b6ebd1d..f3aa8a98ac 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "0Wr2y2a7rHYbk5fS", - "filament_id": "OF7cv1Ub", + "filament_id": "OFhWrAuP", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json index 32e8cc97be..a3256ff5c8 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "xGqY059EYGUevj9G", - "filament_id": "OF7cv1Ub", + "filament_id": "OFhWrAuP", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json index 1869f432df..146170c42a 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "Fh7yuJKSeYs8doRG", - "filament_id": "OF7cv1Ub", + "filament_id": "OFhWrAuP", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json index fae018e7bc..fa27094b4b 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "vs5bFF3r8Kid59u9", - "filament_id": "OF7cv1Ub", + "filament_id": "OFhWrAuP", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json index f02bce47ae..c56717e27a 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "E30t78jBGCkTztFC", - "filament_id": "OFAdAYYk", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json index 1eb21b213d..f5ec65de8b 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "pYmENqkzOsA9LRLW", - "filament_id": "OFAdAYYk", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json index 91d99f8f42..82f8ba4ac4 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "7ozi6TNb3ObLpD2v", - "filament_id": "OFAdAYYk", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json index 8714923f7d..fddc4c3fe2 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "iNx7JrGG0r5s24dV", - "filament_id": "OFAdAYYk", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json index caaf8696e5..510f62273a 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "tQnGlZa0FL2FpHho", - "filament_id": "OFAdAYYk", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF.json b/resources/profiles/Qidi/filament/QIDI PPS-CF.json index 9e56326ec1..b6465a1de8 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "ODM3oXV1OSv3qTbZ", - "filament_id": "OFAdAYYk", + "filament_id": "OFZOuWrO", "instantiation": "true", "filament_type": [ "PPS-CF" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json index 64884f4a2c..be4cc6b611 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI PPS-GF", "setting_id": "VgQiY3csDj6bBWSk", - "filament_id": "OFZAkPHG", + "filament_id": "OFp57RRC", "instantiation": "true", "filament_settings_id": [ "QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json index b0064ded5a..cc450abf5f 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI PPS-GF", "setting_id": "8hFaMBYD7pnmsZWd", - "filament_id": "OFZAkPHG", + "filament_id": "OFp57RRC", "instantiation": "true", "filament_settings_id": [ "QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json index c41c4fbaae..9245da8045 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle", "inherits": "QIDI PPS-GF", "setting_id": "BcrvpHAPx0FBvOi3", - "filament_id": "OFZAkPHG", + "filament_id": "OFp57RRC", "instantiation": "true", "filament_settings_id": [ "QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PAHT.json b/resources/profiles/Qidi/filament/QIDI Support For PAHT.json index 2ab04ac70e..465d3239fd 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PAHT.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PAHT.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "7cd7R9xbuNtLfCHa", - "filament_id": "OFa5cFqE", + "filament_id": "OFXn3Vd9", "instantiation": "true", "filament_type": [ "PAHT-S" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json b/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json index e93e7f7945..d0c8a33368 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PET-PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "Am158VMH3y6FDxON", - "filament_id": "OFWyCd0Y", + "filament_id": "OFqcL5UF", "instantiation": "true", "filament_type": [ "PA-S" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json index 210dde4248..21cc9d864e 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI TPU-Aero", "from": "system", "setting_id": "O7oxTgsH9q8jlqzd", - "filament_id": "OFNX5uRT", + "filament_id": "OFMDHOcT", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json index cdfe19f343..8fd94ae68b 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI TPU-Aero", "from": "system", "setting_id": "FR1LQ5DM0upGQQfs", - "filament_id": "OFNX5uRT", + "filament_id": "OFMDHOcT", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero.json index fb7f6a16fe..9c8171b3b1 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "BARooxJKaDXbGd9B", - "filament_id": "OFNX5uRT", + "filament_id": "OFMDHOcT", "instantiation": "true", "filament_type": [ "TPU-AERO" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json index fcbec8eaa5..323efc4494 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", "inherits": "QIDI TPU-GF", "setting_id": "GufOfCCphUDzeSo1", - "filament_id": "OFOysPuE", + "filament_id": "OF9EHUKK", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json index f295b881de..70c0b04f41 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", "inherits": "QIDI TPU-GF", "setting_id": "nY6q9vd6lpaXiQpc", - "filament_id": "OFOysPuE", + "filament_id": "OF9EHUKK", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json index 0a6c26ed10..4b2637fbcf 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", "inherits": "QIDI TPU-GF", "setting_id": "67agKUajM0pFFhia", - "filament_id": "OFOysPuE", + "filament_id": "OF9EHUKK", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json index 7eccf9202f..7c3f2912e3 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "RgmbbSJpyUyTXPO9", - "filament_id": "OFKjlAbC", + "filament_id": "OF9PELEb", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json index da545ecdb9..22da9225ea 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "aiGnr6fBoUCuwPS5", - "filament_id": "OFKjlAbC", + "filament_id": "OF9PELEb", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json index ee25c8c7df..5c89625458 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "G0qM351aUv23WFmP", - "filament_id": "OFKjlAbC", + "filament_id": "OF9PELEb", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json index 73f3ad14d1..3c84e2c8e5 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "2AOnWEOsaS2w9Nmr", - "filament_id": "OFKjlAbC", + "filament_id": "OF9PELEb", "instantiation": "true", "filament_type": [ "UltraPA-CF25" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json index c0a87567b7..86ef520191 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "y4aq26TNkKEafwbN", - "filament_id": "OFnsWQTp", + "filament_id": "OFvdZ2bx", "instantiation": "true", "slow_down_layer_time": [ "8" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json index 4c87714064..96650a289e 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "1y0tvUmMkDHYmvWC", - "filament_id": "OFnsWQTp", + "filament_id": "OFvdZ2bx", "instantiation": "true", "slow_down_layer_time": [ "8" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json index 6cbeef948f..900ffdb085 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "n4ywS2KDL59hb8nA", - "filament_id": "OFnsWQTp", + "filament_id": "OFvdZ2bx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json index df4bc13bfc..be06885f90 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "AZB82l14yp3vT5sz", - "filament_id": "OFnsWQTp", + "filament_id": "OFvdZ2bx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json index f64fa54a11..37805be62a 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "0ZZ9ygXQqnKrrWlL", - "filament_id": "OFnsWQTp", + "filament_id": "OFvdZ2bx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json index 9ca1b0488f..22492ba0a8 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "NANyXYa8NOQ45Gy2", - "filament_id": "OFnsWQTp", + "filament_id": "OFvdZ2bx", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json index 508cf24436..1ea1175292 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi ASA-Aero", "from": "system", "setting_id": "OVQGLLS3QOoDEPNp", - "filament_id": "OF0TjJ0G", + "filament_id": "OFG4do34", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json index 3b68bf48c5..56af153f3d 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi ASA-Aero", "from": "system", "setting_id": "FKWhpunDSV0iusbz", - "filament_id": "OF0TjJ0G", + "filament_id": "OFG4do34", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json index 216db80864..3095c0a964 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "xTg8UPJXoXdyGccz", - "filament_id": "OF0TjJ0G", + "filament_id": "OFG4do34", "instantiation": "true", "filament_type": [ "ASA-AERO" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json index 2e6b6d9089..b14283c761 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "BNOS859dmAw7GIZp", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json index 11fb8e0fad..7dd600cc44 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "XfuwzYZzTauK0ADk", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "fan_max_speed": [ "80" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json index 05b680a74a..0411a7a366 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "ziWmRGMYOpjc7Hpo", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json index b9e1f23232..39cca2e3bb 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "lLXYczQE4YfPiyDO", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json index 576f73e044..e24fd6df8f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "o62pcRmFnj2mIXhf", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json index 10d886d12e..6b67afc3a6 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "UBWjZCCGQrpgmlpa", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle.json index 7bb68abc19..f04c392d36 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "qB4eDc7UuoKv5m2U", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle.json index 6da9142823..0ba51d1d97 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "N3Ca9PN8nDnvhmak", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "fan_max_speed": [ "80" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle.json index d499ccf490..c614b1b214 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "UkNcVB3bJZqLN3fu", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle.json index 0c76ed7e66..1a25e73239 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "uK0zY0a6MpcFTZWr", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json index 06b75195a8..fdfdb04794 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ABS", "from": "system", "setting_id": "veNBpzcNYa6TAMry", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/resources/profiles/Qidi/filament/Qidi Generic ABS.json index f0ced9aabb..fd469656b7 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "wcv9ZpNwvZ0ZcWKw", - "filament_id": "GFB99", + "filament_id": "OFv4VZCd", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json index a2d9584778..b1dc3929af 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "OLkg128vxsk27w03", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json index 961629bae2..c76c3b7bf4 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "pGOT3C5eREsHRylS", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json index 2e5cf7b682..b2e93f6042 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "QRlzPtO4mqLKcdws", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json index e62e501e59..e31053553a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "vLLCDxhI2GR76M1p", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json index 2369d6b6c6..67919c260e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "6pY4I5kAFdSYPOte", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json index 7106465ea0..8205a3e728 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "A85OmyjS63OgZa0V", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json index 03f2d457fa..f7d7fadfa0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "1CBWjstSdMJLJWuv", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json index fbeaa4c1c1..0a0da5a68f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "UIsup1TGWKg0Fq72", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json index c4ae902f99..bf2fbce6c2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "HQupWXd5yKceVrm4", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json index 9cd5b1a694..70f2dca93b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "R6FcpVRhnSp0i8bK", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json index 926830393f..8fa1b77e26 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic ASA", "from": "system", "setting_id": "sE2DGjOmcjRuuh0z", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA.json b/resources/profiles/Qidi/filament/Qidi Generic ASA.json index d6aee78840..5c955f6322 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "WTOEo36YTIFcXDaI", - "filament_id": "OFG8vHw8", + "filament_id": "OFsxlLdo", "instantiation": "true", "filament_type": [ "ASA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json index 880a914309..ee5c5b3206 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "aOVEazsct9L3eD2u", - "filament_id": "GFN98", + "filament_id": "OFPy0Ogq", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA.json b/resources/profiles/Qidi/filament/Qidi Generic PA.json index 4e1f0d20ba..640faa445f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "S6S5nM9zZbNCyhya", - "filament_id": "GFN99", + "filament_id": "OFQbqeN7", "instantiation": "true", "filament_type": [ "PA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @0.2 nozzle.json index 5b7bbeb84a..80e7acafbe 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "i4Nt0riiDwptxOIe", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @0.8 nozzle.json index d7a15d0bc0..774e1deed8 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "8mJysYABmQTBlWLw", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json index 1e6313bc34..b869e3db14 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "be2KpgVjm4APQtrt", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json index 0aee03bd65..edcb7070ad 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "9aGpKzNCjXDcfmqr", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json index 5b348523ab..4e018cf7e0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "1BjBpSDoLs6nTHeo", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json index a551323664..33ef6fa1b2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "8ptIGtXeMSwVqkVB", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle.json index 8dcb9f5e4e..bb41002e5a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "IQCYG5yZFPsvTuHY", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle.json index 297315300a..1eb5bf3ae6 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "TPbG7zlsPowdKEVw", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle.json index 32c4f84112..ef7aadea0b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "mzsetSq0CzwqbGnP", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle.json index e3b4be943f..4cc95f36fe 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PC", "from": "system", "setting_id": "wlnm88gEKcNzvx7W", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC.json b/resources/profiles/Qidi/filament/Qidi Generic PC.json index a0a745246e..8d17246464 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "wd4PrqXE2um46ueW", - "filament_id": "GFC99", + "filament_id": "OFK01afJ", "instantiation": "true", "filament_type": [ "PC" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json index f40180cc1f..4dc4f79a35 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "GfDMSO3DjLxfMnUc", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json index b516c65225..8cc579f330 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "SzQLWO8poDxEU0ez", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json index 70b8be014e..f3006cef44 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "yyfoSMlQsvkmUGR5", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json index 69c74caccb..6ba08141b2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "ogHITGUcn1r2bHXc", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json index 1a55f38280..6ca659d410 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "CVyv3PHeZaSGmD6E", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json index e820fe24b2..f3a451fa22 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "tNl6q6MadSoFZ3EH", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle.json index 289b97e7e8..c30b0b9c48 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "1xGw8fYiSf6YzBnk", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json index 2bce0a96b0..19eee209c1 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "MMSCic1l0b3e5qe3", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle.json index 403177c5d7..320522f3b2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "KD0ABMKuQunww07p", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle.json index adaf03f5de..df1d833154 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "ZFkH9oLkRWDVovLu", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json index 2afbdbde97..7a659abfe5 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PETG", "from": "system", "setting_id": "ixR5wIrehSmn8Inz", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json index 3a668823ca..41a8a19505 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "kjmXKWCMonhYhy8U", - "filament_id": "GFG98", + "filament_id": "OFfZ0lTS", "instantiation": "true", "temperature_vitrification": [ "75" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG.json b/resources/profiles/Qidi/filament/Qidi Generic PETG.json index 993b9764ba..a46451b4b2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "Yk3w834THlnAS3jr", - "filament_id": "GFG99", + "filament_id": "OFKNAhls", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json index 2492a8ea78..c4ee570822 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "6e0DHBzRkQvU0419", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json index 63611956e2..b8dc934bf9 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "eCR3lbTRdkYcMZgl", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_max_volumetric_speed": [ "14" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json index 7aa69c184d..9cb96bf501 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "JSQupeTNYtzE8l6q", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json index 017b42a781..88954db351 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "n4rp1Pooux07hwx1", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json index 46523499ee..8784aa33ac 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "P57Nm7E7KTnHMov0", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json index b10017757b..c66a485d3b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "DWfVtYimjZxqyDzM", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json index e8d6372721..004bd0cda5 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "ausfQ4SuKLMuruFb", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json index b1b1b2e9e9..ca0eeb74ba 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "JJmzlY5XOz9eGO8n", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json index 6cd43b3246..ea5c6e5f2a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "EpYu1ME5tSsFYirK", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json index ce7016ad71..9b99d1a90f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "wZ8U1Ga1bQXbd2nN", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle.json index b9c1fc36d1..d59bd63cc0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "M0JCDyI7icGyqs43", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json index 8b257619c3..a940104863 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "tRztgu06hBi9IxSE", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_max_volumetric_speed": [ "14" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle.json index 7c9a86cdde..1581dfb47e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "8XzQCGoYi01mIjNY", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle.json index 4bb1e59e0b..d39b789104 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "hkeictJYR1KDX7kB", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json index f6131e0ca7..eeb8a443ef 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "4YnRWwYLWMODUHXq", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json index 2289deef1e..683f582678 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "bKi57zeQX7mAw7kl", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json index 15336f706a..d4836a5f3d 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA", "from": "system", "setting_id": "lscOLQTFf4Y3Ax1f", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json index a8040f89fd..2c20544437 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle", "from": "system", "setting_id": "HaE0HFgjT8wysrVT", - "filament_id": "OF5UUaUM", + "filament_id": "OFS8JF3S", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json index 13e4cbccbe..e4c16f3697 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", "from": "system", "setting_id": "vxXEJP3C4k5Zjvsx", - "filament_id": "OF5UUaUM", + "filament_id": "OFS8JF3S", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json index 3e9f248a9d..73b241ea48 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle", "from": "system", "setting_id": "VqVyXnU77CZCKsNy", - "filament_id": "OF5UUaUM", + "filament_id": "OFS8JF3S", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json index 2866afeee3..47fe217eb7 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle", "from": "system", "setting_id": "0504CZkoYLx6NMI0", - "filament_id": "OF5UUaUM", + "filament_id": "OFS8JF3S", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json index 08b2fd475b..9088564556 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA Silk", "from": "system", "setting_id": "lRRlOS4Xd1pGLIEq", - "filament_id": "GFA05", + "filament_id": "OFy4ajVZ", "instantiation": "true", "enable_pressure_advance": "1", "pressure_advance": [ diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json index 0c9b1b3d15..19d91f0f9c 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA Silk", "from": "system", "setting_id": "DaBZGfcdheWjNdgr", - "filament_id": "GFA05", + "filament_id": "OFy4ajVZ", "instantiation": "true", "enable_pressure_advance": "1", "pressure_advance": [ diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json index 128da01c7e..8f195626d2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "OATeG6kIIRyViXbn", - "filament_id": "GFA05", + "filament_id": "OFy4ajVZ", "instantiation": "true", "enable_pressure_advance": "1", "filament_type": [ diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json index 689b9db770..5639be330a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "dmKDk6Yb4zQFCWIe", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json index 649a08ca6f..d78cdb3490 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "vwFHzxD2MrRieUIw", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_settings_id": [ "Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json index 8b663fde80..cef91d9faa 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "wlXNWvECV8ylNVFF", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json index ad0dd1e2b3..9d0b6428cc 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "gR4NZ8mgTNVxxjhh", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json index 6860035d96..c21f2a31df 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "wCdBhg6B4tQZw7dp", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json index c34e9563a0..29c72ccfe5 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "7Bxn8OUT1MJbNvxC", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json index a29f72ac49..b034072cbb 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "miQxMqjI3odS4V1O", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json index 63b6dcfd94..aed12c1545 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "WwUGv09h9thWkzMf", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json index fe0c370b40..4e3df63a29 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "oAIJyTMV5EnXTJDF", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json index 834b6b82cc..4d1ec90cb1 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "Ya2viE6yXmdshs75", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json index 17212d9d74..4e5928cf60 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "XUhGdonOGCUI34EH", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json index 39a7b80db0..53d4d543ae 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "yvokLiCctDUmcDCR", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "pressure_advance": [ "0.034" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json index 4d5746ee75..72afba15b9 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "gZxafcPwX1hqI7Dm", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json index eb93efa8f0..4eced792ff 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "j6fJ7L02mVcZ01fO", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json index 38a2600264..a2359aff5e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "KTkq14RsduGBSdMZ", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json index 7593f9724c..e2d3c6b536 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "xiomvJqo2HAwsxT0", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "pressure_advance": [ "0.016" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json index dc501ef7e5..f438b1f7c0 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic PLA+", "from": "system", "setting_id": "3SemJWSvKeN7OXVy", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+.json index 7302486ec4..9ed1642e89 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA+.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "LNjBixpjLg5i8P1d", - "filament_id": "OFwHPTvy", + "filament_id": "OFsXOMoX", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json b/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json index ced518b3a6..b3e70b1a47 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "bJKgxsU0tR1NDtoN", - "filament_id": "GFL98", + "filament_id": "OFQTrLXB", "instantiation": "true", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA.json b/resources/profiles/Qidi/filament/Qidi Generic PLA.json index 2dc3b25203..dd060727ed 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "tmrmjsN8vDKGlNpX", - "filament_id": "GFL99", + "filament_id": "OFu79SUH", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PVA.json b/resources/profiles/Qidi/filament/Qidi Generic PVA.json index 3479b4eb41..23d6c89d40 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PVA.json +++ b/resources/profiles/Qidi/filament/Qidi Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "8450opPMJm6GG5Cq", - "filament_id": "GFS99", + "filament_id": "OFNZYgLA", "instantiation": "true", "filament_type": [ "PVA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json index dff4ce7559..19b01dbf26 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU 95A", "from": "system", "setting_id": "0gGSrFIulk4gPLSp", - "filament_id": "OFN0pBpo", + "filament_id": "OFWukXja", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json index f1add02a4f..ee19db18a9 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU 95A", "from": "system", "setting_id": "5fkE2aGkghsMdZ1W", - "filament_id": "OFN0pBpo", + "filament_id": "OFWukXja", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json index 2c4e76ead5..04e75b3633 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "JWZrlYnOOlGpTEg6", - "filament_id": "OFN0pBpo", + "filament_id": "OFWukXja", "instantiation": "true", "filament_type": [ "TPU" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json index 963e845d67..f54208a542 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU", "from": "system", "setting_id": "s0MMbJlTt9Cbh8FQ", - "filament_id": "GFU99", + "filament_id": "OFZsChIG", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json index 9e4acc8225..67d47da272 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi Generic TPU", "from": "system", "setting_id": "KqdGTkLW1x7oZpvj", - "filament_id": "GFU99", + "filament_id": "OFZsChIG", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU.json b/resources/profiles/Qidi/filament/Qidi Generic TPU.json index 8c57a5d28a..bf4d662d62 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU.json +++ b/resources/profiles/Qidi/filament/Qidi Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "qvJXA6V5mxiOguUj", - "filament_id": "GFU99", + "filament_id": "OFZsChIG", "instantiation": "true", "filament_type": [ "TPU" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json index f5db4b48f9..4036bc407c 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "0J1PKDesfiwmiXT3", - "filament_id": "OFa6L3Of", + "filament_id": "OFjD3YTW", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json index 0870f4d962..70aff6d258 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "CYzutFjZzD3tLXwM", - "filament_id": "OFa6L3Of", + "filament_id": "OFjD3YTW", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json index c036fb4fba..c0aaea29c7 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "YJvwrEo0BwfXMOqo", - "filament_id": "OFa6L3Of", + "filament_id": "OFjD3YTW", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json index 69b6bcd945..aac6e6f127 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "0pBt0usHW6MGQZXl", - "filament_id": "OFa6L3Of", + "filament_id": "OFjD3YTW", "instantiation": "true", "filament_type": [ "PC-ABS-FR" diff --git a/resources/profiles/Qidi/filament/Qidi PLA-CF.json b/resources/profiles/Qidi/filament/Qidi PLA-CF.json index 6db1fa32e2..ce37e1b42c 100644 --- a/resources/profiles/Qidi/filament/Qidi PLA-CF.json +++ b/resources/profiles/Qidi/filament/Qidi PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "oqzsRA4OuCqTWPGM", - "filament_id": "OFqyIUDi", + "filament_id": "OFjoAe0R", "instantiation": "true", "filament_flow_ratio": [ "0.96" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json index 172ba9b6f0..1121d1a200 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi TPU 95A-HF", "from": "system", "setting_id": "zqfVVsyY5ZMsfqjK", - "filament_id": "OFOW9K96", + "filament_id": "OFzAWsca", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json index 89c1974bb1..747a31d4bd 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi TPU 95A-HF", "from": "system", "setting_id": "fZISb4jbF8jv60dL", - "filament_id": "OFOW9K96", + "filament_id": "OFzAWsca", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json index 433f754f7a..ffbdbc9e5f 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "QCS6zw9BRMWWvrCo", - "filament_id": "OFOW9K96", + "filament_id": "OFzAWsca", "instantiation": "true", "filament_type": [ "TPU" diff --git a/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json b/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json index a8864cd29b..83ec8a1025 100644 --- a/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json +++ b/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uVa250OrqClMz41k", - "filament_id": "OFXcfTEb", + "filament_id": "OFpBV2Ma", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json index 96478af664..e59aa7077f 100644 --- a/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Bambu ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Bambu ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFuidAEg", + "filament_id": "OFhuaUQB", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json index 8101a994d5..77ba79c419 100644 --- a/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Bambu PETG @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Bambu PETG@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OF6EOy1A", + "filament_id": "OFLYDngx", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json index 08d299380c..cb14577cc5 100644 --- a/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Bambu PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Bambu PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OF2UFmOo", + "filament_id": "OF1dpPrW", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json index 07f0f3291d..281538953a 100644 --- a/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic PLA+ @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic PLA+@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFfdxQok", + "filament_id": "OFEWYR89", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json index 7e70c198c2..09f7e6a9a5 100644 --- a/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/HATCHBOX ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "HATCHBOX ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFPwi9X0", + "filament_id": "OFwLBAGf", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json b/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json index a7cf5ed949..89c266e681 100644 --- a/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/HATCHBOX PETG @X-Max 4.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PETG@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFAnyzjN", + "filament_id": "OFIWMSGX", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json index 3dcf2e340d..844a9f0942 100644 --- a/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/HATCHBOX PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "HATCHBOX PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFiJYDPC", + "filament_id": "OFeelsSM", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json index 49b3c2fe6b..acc9a9f96d 100644 --- a/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Overture ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Overture ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFuTFxVP", + "filament_id": "OFK8XHPn", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json index a217128c3d..91cf8d1e35 100644 --- a/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Overture PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Overture PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFC2FSsV", + "filament_id": "OFc3xdm9", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json index 849aebe38d..603dc9da52 100644 --- a/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/PolyLite ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFidJLn8", + "filament_id": "OFOvv91M", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json index 4d6101084d..01d5e352ef 100644 --- a/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/PolyLite PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "OFceJcLf", + "filament_id": "OF5CgdDq", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/RH3D/filament/Generic ABS @E3NG v1.2S.json b/resources/profiles/RH3D/filament/Generic ABS @E3NG v1.2S.json index 1c9cf63e43..045e04b689 100644 --- a/resources/profiles/RH3D/filament/Generic ABS @E3NG v1.2S.json +++ b/resources/profiles/RH3D/filament/Generic ABS @E3NG v1.2S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "VNx6rdTN7OIIXVpC", - "filament_id": "Generic ABS @E3NG v1.2S", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "E3NG v1.2S - 0.2 nozzle", diff --git a/resources/profiles/RH3D/filament/Generic ASA @E3NG v1.2S.json b/resources/profiles/RH3D/filament/Generic ASA @E3NG v1.2S.json index 329de9f04d..fd22b91c19 100644 --- a/resources/profiles/RH3D/filament/Generic ASA @E3NG v1.2S.json +++ b/resources/profiles/RH3D/filament/Generic ASA @E3NG v1.2S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "LK5M8q58HY86k9aX", - "filament_id": "Generic ASA @E3NG v1.2S", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "E3NG v1.2S - 0.2 nozzle", diff --git a/resources/profiles/RH3D/filament/Generic PCCF @E3NG v1.2S.json b/resources/profiles/RH3D/filament/Generic PCCF @E3NG v1.2S.json index 49cff221dd..d3a2002f8f 100644 --- a/resources/profiles/RH3D/filament/Generic PCCF @E3NG v1.2S.json +++ b/resources/profiles/RH3D/filament/Generic PCCF @E3NG v1.2S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pccf", "from": "system", "setting_id": "fnnja8VlKHWpuOjG", - "filament_id": "Generic PCCF @E3NG v1.2S", + "filament_id": "OFC5f4Ay", "instantiation": "true", "compatible_printers": [ "E3NG v1.2S - 0.5 nozzle", diff --git a/resources/profiles/RH3D/filament/Generic PETG @E3NG v1.2S.json b/resources/profiles/RH3D/filament/Generic PETG @E3NG v1.2S.json index 6bd5e940fe..1fd8ab22ed 100644 --- a/resources/profiles/RH3D/filament/Generic PETG @E3NG v1.2S.json +++ b/resources/profiles/RH3D/filament/Generic PETG @E3NG v1.2S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_petg", "from": "system", "setting_id": "IS3z7f5wnjsvv8vC", - "filament_id": "Generic PETG @E3NG v1.2S", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "E3NG v1.2S - 0.2 nozzle", diff --git a/resources/profiles/RH3D/filament/Generic PLA @E3NG v1.2S.json b/resources/profiles/RH3D/filament/Generic PLA @E3NG v1.2S.json index 86e514521c..bbf58fe55a 100644 --- a/resources/profiles/RH3D/filament/Generic PLA @E3NG v1.2S.json +++ b/resources/profiles/RH3D/filament/Generic PLA @E3NG v1.2S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "b1tuMVA0Hh27wYQH", - "filament_id": "Generic PLA @E3NG v1.2S", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "E3NG v1.2S - 0.2 nozzle", diff --git a/resources/profiles/RH3D/filament/Generic TPU @E3NG v1.2S.json b/resources/profiles/RH3D/filament/Generic TPU @E3NG v1.2S.json index 7c308efd71..f6c8a7ca6e 100644 --- a/resources/profiles/RH3D/filament/Generic TPU @E3NG v1.2S.json +++ b/resources/profiles/RH3D/filament/Generic TPU @E3NG v1.2S.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "kaTatels2H01rgeJ", - "filament_id": "Generic TPU @E3NG v1.2S", + "filament_id": "OFgbpcy9", "instantiation": "true", "compatible_printers": [ "E3NG v1.2S - 0.4 nozzle", diff --git a/resources/profiles/RH3D/filament/fdm_filament_abs.json b/resources/profiles/RH3D/filament/fdm_filament_abs.json index f68da37f19..f4ab005733 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_abs.json +++ b/resources/profiles/RH3D/filament/fdm_filament_abs.json @@ -3,7 +3,6 @@ "name": "fdm_filament_abs", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFRH01", "instantiation": "false", "cool_plate_temp": [ "100" diff --git a/resources/profiles/RH3D/filament/fdm_filament_asa.json b/resources/profiles/RH3D/filament/fdm_filament_asa.json index bc71167111..ac03beef13 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_asa.json +++ b/resources/profiles/RH3D/filament/fdm_filament_asa.json @@ -3,7 +3,6 @@ "name": "fdm_filament_asa", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFRH02", "instantiation": "false", "cool_plate_temp": [ "100" diff --git a/resources/profiles/RH3D/filament/fdm_filament_pccf.json b/resources/profiles/RH3D/filament/fdm_filament_pccf.json index b24ccd667e..4296da76c5 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_pccf.json +++ b/resources/profiles/RH3D/filament/fdm_filament_pccf.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pccf", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFRH06", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/RH3D/filament/fdm_filament_petg.json b/resources/profiles/RH3D/filament/fdm_filament_petg.json index 646a682703..aaa0f62357 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_petg.json +++ b/resources/profiles/RH3D/filament/fdm_filament_petg.json @@ -3,7 +3,6 @@ "name": "fdm_filament_petg", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFRH03", "instantiation": "false", "cool_plate_temp": [ "70" diff --git a/resources/profiles/RH3D/filament/fdm_filament_pla.json b/resources/profiles/RH3D/filament/fdm_filament_pla.json index ad4f375e9d..873a78461b 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_pla.json +++ b/resources/profiles/RH3D/filament/fdm_filament_pla.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pla", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFRH04", "instantiation": "false", "cool_plate_temp": [ "40" diff --git a/resources/profiles/RH3D/filament/fdm_filament_tpu.json b/resources/profiles/RH3D/filament/fdm_filament_tpu.json index e55e214275..dcf6f2c68d 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_tpu.json +++ b/resources/profiles/RH3D/filament/fdm_filament_tpu.json @@ -3,7 +3,6 @@ "name": "fdm_filament_tpu", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFRH05", "instantiation": "false", "cool_plate_temp": [ "30" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json index cd5e2573fa..698d14aba2 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "oE39mwr3PCpeBxZN", - "filament_id": "OFtcTs1o", + "filament_id": "OFtplX8o", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json index 55855d2045..c16d3c7869 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "GGkbwdd79jAXnwuf", - "filament_id": "OFSkBwxf", + "filament_id": "OFgcryz4", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json index ee05b628c1..ce0edbd3b0 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uCKZhFAPvEa2wKnA", - "filament_id": "OFS1ekCg", + "filament_id": "OFFC0VqZ", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json index ba7316afc7..1595d776b2 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "bf3YMNVRSE1i1E8N", - "filament_id": "OFjj9Yiz", + "filament_id": "OFmexHIS", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json index fd155fac44..75be42804b 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "dyG3zLuhX2qe8XJP", - "filament_id": "OF7M9vy4", + "filament_id": "OFiuJSmy", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json b/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json index 1dc5ca8791..c220b6dc58 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json +++ b/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "wLJ3X05Jnz1EqeOI", - "filament_id": "OFYehFGr", + "filament_id": "OFsNJjpc", "instantiation": "true", "filament_max_volumetric_speed": [ "5" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic ABS.json b/resources/profiles/Ratrig/filament/RatRig Generic ABS.json index b55a944e54..ed76ab9524 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic ABS.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "ovLAzbygn6JHqGk0", - "filament_id": "GFB99", + "filament_id": "OFyFRojy", "instantiation": "true", "filament_flow_ratio": [ "0.980" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic ASA.json b/resources/profiles/Ratrig/filament/RatRig Generic ASA.json index 5cee3f262c..6cc52605f5 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic ASA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "pmxazFQdx5Oa7Pke", - "filament_id": "GFB98", + "filament_id": "OF48L671", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json b/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json index 31c95abede..4fa73713e1 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "ZRrsXKPk8pY4yrwd", - "filament_id": "GFN98", + "filament_id": "OFNOxcYl", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PA.json b/resources/profiles/Ratrig/filament/RatRig Generic PA.json index 52bfb6ea3c..17a29f6fe5 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "fVGEV9t4w06LODgD", - "filament_id": "GFN99", + "filament_id": "OFEZNNw1", "instantiation": "true", "nozzle_temperature_initial_layer": [ "270" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PC.json b/resources/profiles/Ratrig/filament/RatRig Generic PC.json index 9f9cab8e38..3eab266588 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PC.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "XQ5VEJXu5X0L3Lbn", - "filament_id": "GFC99", + "filament_id": "OFdOWhCa", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json b/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json index 754c1e5667..1bc6658211 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "SG4Gt87iS1ql3s8S", - "filament_id": "OFzb2BLs", + "filament_id": "OFUrStd6", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PETG.json b/resources/profiles/Ratrig/filament/RatRig Generic PETG.json index e64dfbe2f4..ab649e81b3 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PETG.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "u6diBMbHW2nnKKTm", - "filament_id": "GFG99", + "filament_id": "OFxg7n2G", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json b/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json index 2ce8c792e9..e8278cb1ab 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Vwn22LQBChxWysmU", - "filament_id": "GFL98", + "filament_id": "OFlx52rn", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PLA.json b/resources/profiles/Ratrig/filament/RatRig Generic PLA.json index 91bc503ed8..1e99ec6398 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PLA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "IY6qXVoQqhsKuMzP", - "filament_id": "GFL99", + "filament_id": "OFd10YeG", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PVA.json b/resources/profiles/Ratrig/filament/RatRig Generic PVA.json index 69fa53a0f5..5035285a77 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PVA.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "9uJ3Rr6kn9jZZxPO", - "filament_id": "GFS99", + "filament_id": "OFsxRSwr", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic TPU.json b/resources/profiles/Ratrig/filament/RatRig Generic TPU.json index 3e1594501d..8e69cce08f 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic TPU.json +++ b/resources/profiles/Ratrig/filament/RatRig Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "zWOn983v5s2ujssj", - "filament_id": "GFU99", + "filament_id": "OFB09fpe", "instantiation": "true", "filament_max_volumetric_speed": [ "5" diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json index 3e5428690b..9308082af6 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "AzjpmeEXD6enWOG6", - "filament_id": "OFL7U2MV", + "filament_id": "OFhO5aEJ", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json index 8765e295fc..5f047c9b94 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "o2dP6EwooarikQ8R", - "filament_id": "OFXQX0tr", + "filament_id": "OFe61n6v", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json index 14bc8db764..3863ddcd07 100644 --- a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "e1QXBJqpkhHxXor1", - "filament_id": "OFnRTkEq", + "filament_id": "OF9emAI9", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/SecKit/filament/SecKit Generic ABS.json b/resources/profiles/SecKit/filament/SecKit Generic ABS.json index bac9887f55..ed9be1c69a 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic ABS.json +++ b/resources/profiles/SecKit/filament/SecKit Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "gUrHIkj9GExYWVjh", - "filament_id": "GFB99", + "filament_id": "OFnh79eM", "instantiation": "true", "filament_flow_ratio": [ "0.980" diff --git a/resources/profiles/SecKit/filament/SecKit Generic ASA.json b/resources/profiles/SecKit/filament/SecKit Generic ASA.json index c9fdf2bcfd..6688efd51f 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic ASA.json +++ b/resources/profiles/SecKit/filament/SecKit Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "UwVF6VlxRg0IW9hB", - "filament_id": "GFB98", + "filament_id": "OFrh4bBH", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PA-CF.json b/resources/profiles/SecKit/filament/SecKit Generic PA-CF.json index 569b174f1b..46ad248815 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PA-CF.json +++ b/resources/profiles/SecKit/filament/SecKit Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "0K4eQ2fbaasNdvsP", - "filament_id": "GFN98", + "filament_id": "OFtsVp4v", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PA.json b/resources/profiles/SecKit/filament/SecKit Generic PA.json index bf70f90120..38a275a6f2 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PA.json +++ b/resources/profiles/SecKit/filament/SecKit Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "GlgeZsK719DDjaPo", - "filament_id": "GFN99", + "filament_id": "OF8CXrvm", "instantiation": "true", "nozzle_temperature_initial_layer": [ "270" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PC.json b/resources/profiles/SecKit/filament/SecKit Generic PC.json index c76b39ec41..2244729859 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PC.json +++ b/resources/profiles/SecKit/filament/SecKit Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "8DHToBaqE7g5VNvN", - "filament_id": "GFC99", + "filament_id": "OF5E5KNA", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PETG.json b/resources/profiles/SecKit/filament/SecKit Generic PETG.json index af3bd585ab..07af417aae 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PETG.json +++ b/resources/profiles/SecKit/filament/SecKit Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "mx45AbmzGkqYMSsW", - "filament_id": "GFG99", + "filament_id": "OFqS8fzK", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PLA-CF.json b/resources/profiles/SecKit/filament/SecKit Generic PLA-CF.json index 6767fdc897..5ac681d9d7 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PLA-CF.json +++ b/resources/profiles/SecKit/filament/SecKit Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "dPLE2CXMpmdtyiZK", - "filament_id": "GFL98", + "filament_id": "OFF73Bvp", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PLA.json b/resources/profiles/SecKit/filament/SecKit Generic PLA.json index 62e073f2f2..2c85460be0 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PLA.json +++ b/resources/profiles/SecKit/filament/SecKit Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "7cpNIx6GWUp95tLN", - "filament_id": "GFL99", + "filament_id": "OFETFWx7", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PVA.json b/resources/profiles/SecKit/filament/SecKit Generic PVA.json index 6060d85690..67312ed658 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PVA.json +++ b/resources/profiles/SecKit/filament/SecKit Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "jiHEC4uCmPQLINlO", - "filament_id": "GFS99", + "filament_id": "OFyySVby", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/SecKit/filament/SecKit Generic TPU.json b/resources/profiles/SecKit/filament/SecKit Generic TPU.json index 25befa8256..dab7cf4bf5 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic TPU.json +++ b/resources/profiles/SecKit/filament/SecKit Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "b5GGHwZlR5oOx4eH", - "filament_id": "GFU99", + "filament_id": "OFoVZg32", "instantiation": "true", "filament_max_volumetric_speed": [ "5" diff --git a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_ABS.json b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_ABS.json index f00df71cfd..bad8b3a774 100644 --- a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_ABS.json +++ b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_ABS.json @@ -4,7 +4,7 @@ "inherits": "SeeMeCNC filament base", "from": "System", "setting_id": "jvmDQqgLy8vboFHw", - "filament_id": "SMCFB001", + "filament_id": "OFR0gODA", "instantiation": "true", "filament_settings_id": [ "SeeMeCNC ABS" diff --git a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PA-CF.json b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PA-CF.json index 25b2f84b7a..690a870c69 100644 --- a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PA-CF.json +++ b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PA-CF.json @@ -4,7 +4,7 @@ "inherits": "SeeMeCNC filament base", "from": "System", "setting_id": "xaySfHS4rdZcWsqA", - "filament_id": "SMCFN001", + "filament_id": "OF0b7M1z", "instantiation": "true", "filament_settings_id": [ "SeeMeCNC PA-CF" diff --git a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG-CF.json b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG-CF.json index f9cc79bcfd..9792260d36 100644 --- a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG-CF.json +++ b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG-CF.json @@ -4,7 +4,7 @@ "inherits": "SeeMeCNC filament base", "from": "System", "setting_id": "UDoa6miFYGnCLiHc", - "filament_id": "SMCFG002", + "filament_id": "OFaRjiIm", "instantiation": "true", "filament_settings_id": [ "SeeMeCNC PETG-CF" diff --git a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG.json b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG.json index a186501902..c58047fa8a 100644 --- a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG.json +++ b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PETG.json @@ -4,7 +4,7 @@ "inherits": "SeeMeCNC filament base", "from": "System", "setting_id": "wf9uGLhJeqRDZVR7", - "filament_id": "SMCFG001", + "filament_id": "OFxDHUX8", "instantiation": "true", "filament_settings_id": [ "SeeMeCNC PETG" diff --git a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PLA.json b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PLA.json index 8e9cc3c8d3..9747b4caba 100644 --- a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PLA.json +++ b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_PLA.json @@ -3,7 +3,7 @@ "name": "SeeMeCNC PLA", "from": "System", "setting_id": "hdn5fZars58kvjwQ", - "filament_id": "SMCFL001", + "filament_id": "OFbSChKb", "instantiation": "true", "filament_settings_id": [ "SeeMeCNC PLA" diff --git a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_TPU.json b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_TPU.json index 791da98e23..602470e962 100644 --- a/resources/profiles/SeeMeCNC/filament/SeeMeCNC_TPU.json +++ b/resources/profiles/SeeMeCNC/filament/SeeMeCNC_TPU.json @@ -4,7 +4,7 @@ "inherits": "SeeMeCNC filament base", "from": "System", "setting_id": "vsEH0aZOKiLat0hH", - "filament_id": "SMCFU001", + "filament_id": "OFyFyLIp", "instantiation": "true", "filament_settings_id": [ "SeeMeCNC TPU" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1 base.json index dfbff7e8fb..693553bdcb 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Fiberon ASA-CF08 @Snapmaker U1 base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFL71", + "filament_id": "OF0omtEb", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1 base.json index b292f8dd62..1496095361 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA12-CF10 @Snapmaker U1 base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL56", + "filament_id": "OFvxIS9g", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1 base.json index 88aab14bbf..d548075235 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-CF20 @Snapmaker U1 base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL57", + "filament_id": "OFEabreg", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1 base.json index f14d1abc1f..8aba062d0f 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA612-ESD @Snapmaker U1 base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL72", + "filament_id": "OFFZ458u", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1 base.json index 75e03cc52a..9245ada222 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Fiberon PETG-ESD @Snapmaker U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "GFL06", + "filament_id": "OFcytyoA", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1 base.json index 271ee8bb5d..5e1cfa7c61 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Fiberon PPS-GF20 @Snapmaker U1 base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFL73", + "filament_id": "OFeVzkSU", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1 base.json index 85f728d3f3..ab0658f139 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma CoPE @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM016", + "filament_id": "OFqw2PQA", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1 base.json index 2695cbee54..7c23e24034 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM001", + "filament_id": "OFsRDvTM", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1 base.json index 5b4b8725c2..2becd66703 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Celestial @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM008", + "filament_id": "OFRiYgMK", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1 base.json index 6b14e2b663..932dcd38c6 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Galaxy @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM007", + "filament_id": "OFFkCLBl", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1 base.json index 9e9936c4a4..c45de639c7 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Glow @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM010", + "filament_id": "OF0gGRWk", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1 base.json index 0e996eb298..80a1604ed2 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Luminous @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM011", + "filament_id": "OF0kCNDK", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1 base.json index 83ae20eb10..c052908999 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Marble @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM003", + "filament_id": "OFKiSMWR", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1 base.json index 6d178bca81..a4ae1b1114 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Matte @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM002", + "filament_id": "OFrOh600", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1 base.json index 28b2984832..d1b0a54bcd 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Metallic @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM012", + "filament_id": "OFjb0wos", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1 base.json index eedf3117a8..57a0598ca8 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Neon @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM013", + "filament_id": "OFO1GEq6", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1 base.json index df011d8dd3..5a6f2849ae 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Satin @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM005", + "filament_id": "OFPkCJKE", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1 base.json index daa8a6ffca..53d1ba2886 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Silk @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM004", + "filament_id": "OFS8lTQt", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1 base.json index c2841b4572..396f287684 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Starlight @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM009", + "filament_id": "OFC78WGQ", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1 base.json index f0ccd46a65..6a16bf9994 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Temp Shift @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM015", + "filament_id": "OFhASRWj", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1 base.json index 81d275cfaf..ff8c158df4 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Translucent @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM006", + "filament_id": "OFCIUsWh", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1 base.json index 7ac70319b2..3240927af2 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA UV Shift @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM014", + "filament_id": "OF1N1qMK", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1 base.json index 228df29a92..046a702928 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite CosPLA @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL62", + "filament_id": "OFJgijky", "instantiation": "false", "bed_type": [ "Cool Plate" 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 707d5ae54b..6c3fca2635 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 @@ -1,6 +1,7 @@ { "type": "filament", "from": "system", + "filament_id": "OFYGbPHX", "instantiation": "true", "name": "PolyLite Dual PLA @0.2 nozzle", "setting_id": "jhmy4YHi9MuL0DWu", 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 1a4422472c..b1f4803c1f 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 @@ -1,6 +1,7 @@ { "type": "filament", "from": "system", + "filament_id": "OF7SliVn", "instantiation": "true", "name": "PolyLite J1 PLA @0.2 nozzle", "setting_id": "jFlRSxx0KvN3BOUu", diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json index 6c5017d0a8..3dc56cc918 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite J1 PLA.json @@ -1,6 +1,7 @@ { "type": "filament", "from": "system", + "filament_id": "OF7SliVn", "instantiation": "true", "name": "PolyLite J1 PLA", "setting_id": "wcpOTTMyZNPFKyXr", diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1 base.json index e8fdd834fe..834f7df457 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PETG @Snapmaker U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "GFG60", + "filament_id": "OF0UJcb6", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1 base.json index 607649e569..a388fc42b5 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PETG Translucent @Snapmaker U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "GFL74", + "filament_id": "OF0VpkBM", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1 base.json index 8f3b508aec..fccff88c67 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL00", + "filament_id": "OF5CgdDq", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json index fcdcf7b003..d531cbeb35 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @base.json @@ -3,7 +3,7 @@ "from": "system", "instantiation": "false", "name": "PolyLite PLA @base", - "filament_id": "1393866034", + "filament_id": "OF5CgdDq", "inherits": "fdm_filament_pla", "filament_vendor": [ "Polymaker" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1 base.json index fc925c8faa..40cb531494 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Galaxy @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL63", + "filament_id": "OFvyB0Bz", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1 base.json index cc74173c06..f3e2e4ead4 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Glow @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL64", + "filament_id": "OF5umxxT", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1 base.json index a472e0bec0..20cb3f7ec5 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Luminous @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL65", + "filament_id": "OFBoSWxb", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1 base.json index 5638bec3ff..2b062379bb 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Neon @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL66", + "filament_id": "OFitS8al", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1 base.json index c32655ff83..18a295de81 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Pro @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM019", + "filament_id": "OFF9OKoY", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1 base.json index 898460830f..20057a31e0 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Pro Metallic @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL75", + "filament_id": "OFnXwW8l", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1 base.json index 17e4d2816a..393a597ea8 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Starlight @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL67", + "filament_id": "OFIxOuOu", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1 base.json index 29341f1c59..5931ddef7d 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Translucent @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL68", + "filament_id": "OFy02QHU", "instantiation": "false", "bed_type": [ "Cool Plate" 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 bdadb828e9..2c95f4b8ed 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 @@ -1,7 +1,7 @@ { "type": "filament", "from": "system", - "filament_id": "OF17cONC", + "filament_id": "OFCccVrQ", "instantiation": "true", "name": "PolyTerra Dual PLA @0.2 nozzle", "setting_id": "UQYgjH1uVxf3d2Nv", 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 6062914ff0..589d0cd93f 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 @@ -1,7 +1,7 @@ { "type": "filament", "from": "system", - "filament_id": "OFjZw7k1", + "filament_id": "OF43Raws", "instantiation": "true", "name": "PolyTerra J1 PLA @0.2 nozzle", "setting_id": "mxKHxGmBZzPLS82O", diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json index 1c23dc5fb4..3b4ae0320a 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra J1 PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "from": "system", - "filament_id": "OFjZw7k1", + "filament_id": "OF43Raws", "instantiation": "true", "name": "PolyTerra J1 PLA", "setting_id": "4MZWZX7QPBzxdEGj", diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1 base.json index 533e781485..82b4b9b839 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL01", + "filament_id": "OFW29a9R", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1 base.json index 141740a499..12242cc1e9 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA Marble @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL69", + "filament_id": "OFxe4rXr", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1 base.json index 19bec7d25b..a2f5602139 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA+ @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL70", + "filament_id": "OFEjbwqG", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1 base.json index b447be1455..eab6df9c97 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker HT-PLA @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM017", + "filament_id": "OFPoyiFs", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1 base.json index a98cb9b670..8b59bc45e9 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker HT-PLA-GF @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM018", + "filament_id": "OFlwmqrC", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1 base.json index 2209516118..6feec9c407 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker PETG @Snapmaker U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "GFL76", + "filament_id": "OF6H51Xx", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1 base.json index 5e32b79620..ac2509715a 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker PETG Galaxy @Snapmaker U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "GFL77", + "filament_id": "OFtFtiS0", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1 base.json index ebd4e5b11a..f072f2eb6f 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker PLA @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL78", + "filament_id": "OFelDBgv", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1 base.json index a15908f18e..5e0f051c25 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker PLA Pro @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL79", + "filament_id": "OF5oXk4M", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1 base.json index 9e2fc3f4e5..bfd8a59e3f 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker PLA Pro Metallic @Snapmaker U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL80", + "filament_id": "OFHknN4v", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1 base.json index f2144b7dc4..67754ade09 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker ABS @U1 base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "1682237920", + "filament_id": "OF72YYTd", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS @base.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS @base.json index 6de41e6bcb..1051af1626 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "3811508002", + "filament_id": "OF72YYTd", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json index a0e8b152b7..1ba6c22c9a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker ABS @U1 base", "from": "system", "setting_id": "xszx4XRGrp88OdP8", - "filament_id": "OFgtZjeX", + "filament_id": "OFJrvXth", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1 base.json index 012b5c4530..413c14cebb 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker ASA @U1 base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "12471727060", + "filament_id": "OF1d7c3A", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ASA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker ASA @base.json index 667836fe3d..4cc6b0db02 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ASA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ASA @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "2742961008", + "filament_id": "OF1d7c3A", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS @base.json index 3f61d2b12e..2629e15051 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "168223792", + "filament_id": "OFJhT2fd", "instantiation": "false", "hot_plate_temp": [ "110" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json index dd1863eac8..6554a924f6 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual ABS Benchy.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker Dual ABS @base", "from": "system", "setting_id": "YMUFsOzEISsMqCLe", - "filament_id": "OFxxa5yn", + "filament_id": "OFeAxvEt", "instantiation": "true", "compatible_printers": [ "Snapmaker Artisan (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual ASA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual ASA @base.json index ba18223e4a..7f54df76bb 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual ASA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual ASA @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "1247172706", + "filament_id": "OFKUEXPA", "instantiation": "false", "hot_plate_temp": [ "110" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual Breakaway @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual Breakaway @base.json index ef59734df1..bdb539a065 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual Breakaway @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual Breakaway @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual Breakaway @base", "inherits": "fdm_filament_breakaway", "from": "system", - "filament_id": "1207881278", + "filament_id": "OFfmHUkQ", "instantiation": "false", "filament_loading_speed_start": [ "35" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PA-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PA-CF @base.json index eedf48c86d..5390ffe222 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PA-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "3493177425", + "filament_id": "OFRooa0F", "instantiation": "false", "hot_plate_temp": [ "100" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PET @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PET @base.json index f222b257bb..84cd37dfe7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PET @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PET @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PET @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "2128577941", + "filament_id": "OFUIfGoh", "instantiation": "false", "overhang_fan_speed": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG @base.json index 55a188dfb7..ea5c61eb3b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PETG @base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "2209001062", + "filament_id": "OFBlFMVp", "instantiation": "false", "overhang_fan_speed": [ "25" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG-CF @base.json index 37c2b65a6e..5e8a40a8af 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PETG-CF @base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "1042511226", + "filament_id": "OF3msXEa", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA @base.json index 20b215ab7c..1d8a6fe9ba 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "1417031127", + "filament_id": "OFZivHGL", "instantiation": "false", "filament_retraction_length": [ "nil" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Eco @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Eco @base.json index 68fa882ada..0f880ac980 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Eco @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Eco @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PLA Eco @base", "inherits": "fdm_filament_pla_eco", "from": "system", - "filament_id": "200803790", + "filament_id": "OFyPG8v2", "instantiation": "false", "filament_density": [ "1.26" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Matte @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Matte @base.json index 1010df744a..6838983e1b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Matte @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "3503790988", + "filament_id": "OFlIsW6f", "instantiation": "false", "filament_density": [ "1.32" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Metal @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Metal @base.json index d90435974a..7080dddad1 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Metal @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Metal @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PLA Metal @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "2029994346", + "filament_id": "OFg3cWVt", "instantiation": "false", "filament_cost": [ "90" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Silk @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Silk @base.json index ded13a34e3..f2024f8ddf 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Silk @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "1181363872", + "filament_id": "OFyj3m13", "instantiation": "false", "hot_plate_temp_initial_layer": [ "65" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA-CF @base.json index 8d6ca390a9..d9b45b5f79 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "1702147325", + "filament_id": "OF6ATsCF", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual PVA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual PVA @base.json index eda6fbf638..d9bc0f80ed 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual PVA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual PVA @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "3104636980", + "filament_id": "OFDKIKyw", "instantiation": "false", "filament_loading_speed_start": [ "35" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json index 98b7787775..a8d87836b0 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPE.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker Dual TPU @base", "from": "system", "setting_id": "KoZqZ4l1tYZ99JYz", - "filament_id": "OFAbsMuV", + "filament_id": "OFTs8peJ", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU @base.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU @base.json index 3c106e21aa..903ea5c744 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker Dual TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "2971656290", + "filament_id": "OFjkdnyN", "instantiation": "false", "filament_loading_speed_start": [ "35" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json index 2696168f9d..04490520d3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Dual TPU High-Flow.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker Dual TPU @base", "from": "system", "setting_id": "D1vA7cdI5kghtrxf", - "filament_id": "OF0Ee2jQ", + "filament_id": "OFcBJQcC", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS @base.json index 91afed2dab..bf1229454c 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "1223824394", + "filament_id": "OFy14TRA", "instantiation": "false", "hot_plate_temp": [ "110" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json index c85da00ba2..3d3e47b701 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS Benchy.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker J1 ABS @base", "from": "system", "setting_id": "b1Z94AhG8viXuDsq", - "filament_id": "OFePPmng", + "filament_id": "OF8dCquh", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA @base.json index 0ac62b83b6..b72c5795f8 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "144877656", + "filament_id": "OFt7SngH", "instantiation": "false", "hot_plate_temp": [ "110" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 Breakaway @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 Breakaway @base.json index d0b9afe2ce..5acb7bd524 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 Breakaway @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 Breakaway @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker J1 Breakaway @base", "inherits": "fdm_filament_breakaway", "from": "system", - "filament_id": "3492897526", + "filament_id": "OFeTATC7", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF @base.json index 714a0f1190..4e923b2f76 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "1210173120", + "filament_id": "OFYEtXuk", "instantiation": "false", "overhang_fan_speed": [ "55" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PET @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PET @base.json index 7b2787695b..d3688cbdf7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PET @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PET @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PET @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "1009481135", + "filament_id": "OF8Jl6NT", "instantiation": "false", "overhang_fan_speed": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG @base.json index 560a29961d..327ac4d103 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PETG @base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "1172603684", + "filament_id": "OFQMTRc8", "instantiation": "false", "overhang_fan_speed": [ "35" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG-CF @base.json index cc323fa5b9..b3161b9c9d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PETG-CF @base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "4235401834", + "filament_id": "OFxYB4Sw", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA @base.json index 00ffe9de38..f845a62a77 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "377675245", + "filament_id": "OFSa39yP", "instantiation": "false", "filament_retraction_length": [ "nil" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Eco @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Eco @base.json index 61bafb8477..84e330f35d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Eco @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Eco @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PLA Eco @base", "inherits": "fdm_filament_pla_eco", "from": "system", - "filament_id": "3383257822", + "filament_id": "OFLbdkrE", "instantiation": "false", "filament_density": [ "1.26" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Matte @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Matte @base.json index 8cefd42ce1..7fcb2d8633 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Matte @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "1192769348", + "filament_id": "OFY3AB7j", "instantiation": "false", "filament_density": [ "1.32" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Metal @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Metal @base.json index 49d3a3a416..3fe36e7155 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Metal @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Metal @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PLA Metal @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "4012961186", + "filament_id": "OFt0JbR7", "instantiation": "false", "filament_cost": [ "90" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Silk @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Silk @base.json index 174982b184..331030d8dd 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Silk @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "1528786603", + "filament_id": "OFQ1KzO8", "instantiation": "false", "hot_plate_temp_initial_layer": [ "65" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF @base.json index 2dd3de3d58..07158641d8 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "3806593857", + "filament_id": "OFdD5Wbu", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA @base.json index a02dac10a5..05f057f0ca 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "4227461134", + "filament_id": "OF6TuVAg", "instantiation": "false", "slow_down_layer_time": [ "8" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json index 80c1ff3650..327ba6e6da 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPE.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker J1 TPU @base", "from": "system", "setting_id": "6N7VB3mKAShGVYL3", - "filament_id": "OFChH9xu", + "filament_id": "OFV5Q7j2", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU @base.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU @base.json index 315a18e3b4..aec03dd322 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker J1 TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "4092268632", + "filament_id": "OFyrnlUn", "instantiation": "false", "nozzle_temperature_initial_layer": [ "240" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json index 81cc01669e..66e5c331ae 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU High-Flow.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker J1 TPU @base", "from": "system", "setting_id": "wdN8j0Zv2bJ29XHA", - "filament_id": "OFKhtNBx", + "filament_id": "OFlBoEfL", "instantiation": "true", "compatible_printers": [ "Snapmaker J1 (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1 base.json index 66874b0b2d..62b54feb70 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PA-CF @U1 base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "34931774250", + "filament_id": "OFEmsric", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @base.json index c4c8117679..6918bcb746 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "581236806", + "filament_id": "OFEmsric", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json index 4eb1143082..364cb2a9aa 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @Dual.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker Dual PET @base", "from": "system", "setting_id": "3xJOWlbt2feyRKTV", - "filament_id": "2549587591", + "filament_id": "OFQYaiGg", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 Dual (0.8 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @U1 base.json index 6edd0ee2fa..2dae11ec36 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PET @U1 base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "21285779410", + "filament_id": "OFQYaiGg", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json index 9038a8cb4c..f6a9db6835 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker PET @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "2549587591", + "filament_id": "OFQYaiGg", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1 base.json index 5f048f2574..ce0e7c8122 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PETG @U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "22090010620", + "filament_id": "OF4WB37S", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG @base.json index 896b4dc154..02a40601f2 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker PETG @base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "1895495477", + "filament_id": "OF4WB37S", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1 base.json index 2d74db595b..47869c9779 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PETG-CF @U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "10425112260", + "filament_id": "OFOwQuZM", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @base.json index afd7cf79ee..1b0f300341 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PETG-CF @base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "1355502217", + "filament_id": "OFOwQuZM", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1 base.json index 3100986363..5611cb34f3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA @U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "14170311270", + "filament_id": "OFlufQpZ", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA @base.json index 9d010aa49d..48e1f70d80 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "3177068229", + "filament_id": "OFlufQpZ", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1 base.json index 43a0726b2c..c305704269 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA Eco @U1 base", "inherits": "fdm_filament_pla_eco", "from": "system", - "filament_id": "2008037900", + "filament_id": "OFpu74Qe", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @base.json index 4b41b7b9e1..e4ce7fc8c3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker PLA Eco @base", "inherits": "fdm_filament_pla_eco", "from": "system", - "filament_id": "1695556157", + "filament_id": "OFpu74Qe", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json index 351390aace..21384a0567 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1 base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Snapmaker PLA Lite @U1 base", "from": "system", - "filament_id": "1417031127011", + "filament_id": "OFEOnBj6", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json index 816b04dcd5..d8b3ebef60 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Snapmaker PLA Matte @U1 base", "from": "system", - "filament_id": "OFlbn4FY", + "filament_id": "OFF9cgY5", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json index 67c1ebd2e3..9e287f3203 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker PLA @U1 base", "from": "system", "setting_id": "uAhykL5ap1DAKacf", - "filament_id": "OFlbn4FY", + "filament_id": "OFF9cgY5", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1 base.json index a530b9208e..9efd7ee33c 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA Metal @U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "20299943460", + "filament_id": "OFtybfNX", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 base.json index 12d65834ea..fb20245193 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA Silk @U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "11813638720", + "filament_id": "OFWgFOjn", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @base.json index 8c821fdaaa..b35519fdd9 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "1655727393", + "filament_id": "OFWgFOjn", "instantiation": "false", "hot_plate_temp_initial_layer": [ "65" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json index 12caa4b25c..b87c48cbe5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Snapmaker PLA SnapSpeed @U1 base", "from": "system", - "filament_id": "141703112701", + "filament_id": "OFwhLMs4", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 base.json index 617a8c23ea..c108468f27 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA-CF @U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "17021473250", + "filament_id": "OFhQf8ou", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @base.json index 040e559f38..910a8a7617 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "3864371306", + "filament_id": "OFhQf8ou", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 base.json index 91ff319c8e..206f024091 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PVA @U1 base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "31046369800", + "filament_id": "OFyhjiNs", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @base.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @base.json index c49e948c02..1edf0516c4 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "1344609062", + "filament_id": "OFyhjiNs", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json index 59f4b2af8e..a4214b6cd0 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker TPU @U1 base", "from": "system", "setting_id": "aqE9IR6dFd2MQLXR", - "filament_id": "OF70DKqH", + "filament_id": "OFWTAEjH", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPE.json b/resources/profiles/Snapmaker/filament/Snapmaker TPE.json index 78b8f2484f..c5c42d6126 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPE.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPE.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker TPU @base", "from": "system", "setting_id": "pFGj8sxkPmk10bP4", - "filament_id": "OF70DKqH", + "filament_id": "OFWTAEjH", "instantiation": "true", "compatible_printers": [ "Snapmaker A250 (0.4 nozzle)", diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json index a6d8c41b5d..ca61b9fc3a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Snapmaker TPU 95A @U1 base", "from": "system", - "filament_id": "297165629001", + "filament_id": "OFKo87c6", "instantiation": "false", "overhang_fan_threshold": [ "95%" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1 base.json index 6e9efb2034..6ad1de856e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker TPU @U1 base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "29716562900", + "filament_id": "OF65InrS", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU @base.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU @base.json index 8208dc980c..85a66a5008 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU @base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU @base.json @@ -3,6 +3,6 @@ "name": "Snapmaker TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "1480063856", + "filament_id": "OF65InrS", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json index 96252c2de1..0aca011924 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker TPU @U1 base", "from": "system", "setting_id": "5AXIg8WCdcd74S5v", - "filament_id": "OFtet8ui", + "filament_id": "OFgyPlwU", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)", 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 9fe50fc1b6..ac456a82ee 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,6 +1,6 @@ { "type": "filament", - "filament_id": "OGFL96", + "filament_id": "OFesA6rF", "setting_id": "WAHQZmwHoS4WjoTx", "name": "Generic PLA Silk @Sovol SV08 MAX", "from": "system", 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 5926d0155d..f56ca13525 100644 --- a/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/Polymaker PETG @Sovol SV08 MAX.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OF22AxCm", + "filament_id": "OF6H51Xx", "setting_id": "JBFKMaFtd7kO8Ksq", "name": "Polymaker PETG @Sovol SV08 MAX", "from": "system", 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 384be40590..1ff8f57fac 100644 --- a/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json +++ b/resources/profiles/Sovol/filament/SUNLU PETG @Sovol SV08 MAX.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OGFSNL08", + "filament_id": "OF2GCW1l", "setting_id": "x68SPQCqVacBSGd5", "name": "SUNLU PETG @Sovol SV08 MAX", "from": "system", diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json index b904edd7d4..025dee3fe5 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "okqqqm0P8ehlQuDY", - "filament_id": "OFtemzzw", + "filament_id": "OF67EdL5", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json index 82969be3fb..41066fb061 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "5mtng0PM8CMglpD7", - "filament_id": "OFGFZhWu", + "filament_id": "OFe7Sx5B", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json index 317c30a966..b3780567d1 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "kgtcANsbfwSbdgOh", - "filament_id": "OFic2uNr", + "filament_id": "OFTvvox9", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json b/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json index c4c0397846..861b80c567 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "ERN0ozxmPhIMze0i", - "filament_id": "OFglpvEE", + "filament_id": "OFJfv07m", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json index 9a2b1e5cae..e38812d1a4 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "Me1iSJmocW35ClmN", - "filament_id": "OF5Bmdtg", + "filament_id": "OFCEA7Nt", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json index 87f012c539..4b1ab35b1c 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "ZrAm6Nm4FI7p4PgC", - "filament_id": "OFgMGSpF", + "filament_id": "OFl7nOAf", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json index 806b3a35fd..a0a3190eaf 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "YEEOGJYm4Z8W4vGV", - "filament_id": "OFSoZBK2", + "filament_id": "OFNZjrLo", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json index f19fb592b9..fbacdaf2da 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json +++ b/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "oNucKLcIdxwBPpUN", - "filament_id": "OFsmPFwh", + "filament_id": "OFkWaWRo", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV07 PLA.json b/resources/profiles/Sovol/filament/Sovol SV07 PLA.json index 47fe781fcc..b1b13b7e79 100644 --- a/resources/profiles/Sovol/filament/Sovol SV07 PLA.json +++ b/resources/profiles/Sovol/filament/Sovol SV07 PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "IHicmU5gzVf6G4F1", - "filament_id": "GFL99", + "filament_id": "OFaFNP2U", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 ABS.json b/resources/profiles/Sovol/filament/Sovol SV08 ABS.json index f35a2372a1..f29c3f274d 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 ABS.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "nq4vvrWqKjWKELEz", - "filament_id": "OFKH15Hd", + "filament_id": "OF016CJw", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PETG.json b/resources/profiles/Sovol/filament/Sovol SV08 PETG.json index 81e3e2db41..54718800a9 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PETG.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "CWd7KULbXvJeTTEy", - "filament_id": "OFIl3ar9", + "filament_id": "OFRi7v0b", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json b/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json index b013826043..dda11511e0 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "qmnuve3FgzrXgjPA", - "filament_id": "OFcsHCy4", + "filament_id": "OFcJ7AKd", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PLA.json b/resources/profiles/Sovol/filament/Sovol SV08 PLA.json index cb32bceb71..9e76203099 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PLA.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "nnU0222BS0F1c5ki", - "filament_id": "OFcsHCy4", + "filament_id": "OFcJ7AKd", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 TPU.json b/resources/profiles/Sovol/filament/Sovol SV08 TPU.json index f93c734acc..404675d8f4 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 TPU.json +++ b/resources/profiles/Sovol/filament/Sovol SV08 TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "tpBbCQhcSJsBesnG", - "filament_id": "OFY1U4uM", + "filament_id": "OFyCToOV", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero ABS.json b/resources/profiles/Sovol/filament/Sovol Zero ABS.json index 16fabab6e8..8ae60c192f 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero ABS.json +++ b/resources/profiles/Sovol/filament/Sovol Zero ABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "9pI7op6U4azpfNfb", - "filament_id": "OFgNzLVh", + "filament_id": "OFNX8GI1", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PC.json b/resources/profiles/Sovol/filament/Sovol Zero PC.json index 9c82b6a60b..87d4b2c924 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PC.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PC.json @@ -4,7 +4,7 @@ "inherits": "Generic PC @System", "from": "system", "setting_id": "vuuZXnlrMgUKtSI0", - "filament_id": "OFtwA91m", + "filament_id": "OFcdqaWI", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json b/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json index 569c670407..ce68719ba9 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "AfxHmpdOkMDJa2fk", - "filament_id": "OFk6T5YH", + "filament_id": "OFymnal9", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PETG.json b/resources/profiles/Sovol/filament/Sovol Zero PETG.json index db83f4d2e4..37f603579b 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PETG.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PETG.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "75OJvkXlmbcaHQfW", - "filament_id": "OFjurQ3I", + "filament_id": "OFHTVfaU", "instantiation": "true", "filament_flow_ratio": [ "1.0348" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json index b3d235da7d..6dfb630e0a 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "i9wDnSEIrOBPbOZl", - "filament_id": "OFtL05hE", + "filament_id": "OFzB4uOs", "instantiation": "true", "filament_flow_ratio": [ "1.0348" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json index 93c2382024..990a2b3edb 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "ZVvOaMwZ7noevsYf", - "filament_id": "OF5J2axC", + "filament_id": "OF7VJMYM", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json index 2db612ff8f..97e4050b8c 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "XxEJBNFLRltR2Xwn", - "filament_id": "OFP4poIv", + "filament_id": "OFAO9A7J", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json index d86d68212d..24fab028e8 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json +++ b/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "QowhGzqSwGQoAp1a", - "filament_id": "OF2tvNYA", + "filament_id": "OFJVFpJz", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero TPU.json b/resources/profiles/Sovol/filament/Sovol Zero TPU.json index d2f9247ada..bd4596b303 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero TPU.json +++ b/resources/profiles/Sovol/filament/Sovol Zero TPU.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "iZHXx0RyRO096L0z", - "filament_id": "OFO5R9KJ", + "filament_id": "OF6zAVFj", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS.json b/resources/profiles/Tiertime/filament/Tiertime ABS.json index 58b1849335..4ff6b5c8fd 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00", + "filament_id": "OFNQKF0M", "setting_id": "uAtyf2jCQEcv7D2r", "name": "Tiertime ABS", "from": "system", diff --git a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json index 1d716a957d..7014efe177 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB00_01", + "filament_id": "OFNQKF0M", "setting_id": "x1XBGyOHIgrD7PVs", "name": "Tiertime ABS@300HS", "from": "system", diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA.json b/resources/profiles/Tiertime/filament/Tiertime ASA.json index 397f8084a9..2550aa53ae 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ASA.json +++ b/resources/profiles/Tiertime/filament/Tiertime ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "6rwe3zrsvad1oq4C", - "filament_id": "GFB01", + "filament_id": "OFdrYBmI", "instantiation": "true", "fan_max_speed": [ "35" diff --git a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json index 165590114d..1f465c4dda 100644 --- a/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "FreBeBZ1r1VF4ouQ", - "filament_id": "GFB01_01", + "filament_id": "OFdrYBmI", "instantiation": "true", "fan_max_speed": [ "35" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json index 4319a9cd58..32cd14a523 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "ImJ3Urgk3VVtwceI", - "filament_id": "GFB99", + "filament_id": "OFNLXV8X", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json index 6e3d41f5fc..efd49d6b20 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "tCw1f7MxFjxPr7Ci", - "filament_id": "GFB99_01", + "filament_id": "OFNLXV8X", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json index 4280c28c4d..614b3b3c19 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "T1AzUXSewNk5Bj3x", - "filament_id": "GFB98", + "filament_id": "OFUaVAdj", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json index 062cf8e345..4962cc3046 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "7C5PjCg1vmTQFXWO", - "filament_id": "GFB98_01", + "filament_id": "OFUaVAdj", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json index a02176c07d..76918d2c91 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_bvoh", "from": "system", "setting_id": "dhrpnirMnet0hJZl", - "filament_id": "GFS97", + "filament_id": "OFGDaEHO", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json index abe8d42643..124749396e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_bvoh", "from": "system", "setting_id": "xfFXVyGfmXiu508N", - "filament_id": "GFS97_01", + "filament_id": "OFGDaEHO", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json index e0683c378d..6d9851fb73 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_eva", "from": "system", "setting_id": "ev5w69eBuTCYXB2d", - "filament_id": "GFR99", + "filament_id": "OFrnJJEa", "instantiation": "true", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json index 14ea1b88d1..ff107a65fb 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_eva", "from": "system", "setting_id": "pXuh92Zf1zPiaDXg", - "filament_id": "GFR99_01", + "filament_id": "OFrnJJEa", "instantiation": "true", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json index 213181630b..54e9d60fbd 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_hips", "from": "system", "setting_id": "sFY2AyXFzAFuj6sv", - "filament_id": "GFS98", + "filament_id": "OFW9uIkE", "instantiation": "true", "filament_is_support": [ "1" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json index 234412a67d..932b1e3239 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_hips", "from": "system", "setting_id": "9epHDviPNHRB5bPD", - "filament_id": "GFS98_01", + "filament_id": "OFW9uIkE", "instantiation": "true", "filament_is_support": [ "1" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json index 4e04b050cf..22b8edb633 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json @@ -3,7 +3,7 @@ "name": "Tiertime Generic PA-CF", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN98", + "filament_id": "OFHa3RZT", "setting_id": "DOWYicvaXaTMfzBU", "instantiation": "true", "fan_cooling_layer_time": [ diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json index bd618a1f83..b49c63ab92 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json @@ -3,7 +3,7 @@ "name": "Tiertime Generic PA-CF@300HS", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN98_02", + "filament_id": "OFHa3RZT", "setting_id": "nRxvUKo1YXE8daoX", "instantiation": "true", "fan_cooling_layer_time": [ diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json index b5fbdf1bcc..4f9e45d05e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA.json @@ -3,7 +3,7 @@ "name": "Tiertime Generic PA", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN99", + "filament_id": "OFQswlnF", "setting_id": "DmP33sDwKcBDRmDK", "instantiation": "true", "chamber_temperatures": [ diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json index 131ea71f3c..7ef4871120 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json @@ -3,7 +3,7 @@ "name": "Tiertime Generic PA@300HS", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN99_01", + "filament_id": "OFQswlnF", "setting_id": "ERn1WYMiSjs6a82N", "instantiation": "true", "chamber_temperatures": [ diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json index 4044d45fe3..264fe0fc03 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "5wzlA0sFj2xElixU", - "filament_id": "GFC99", + "filament_id": "OFN7aNHe", "instantiation": "true", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json index 6b919af688..86c506902c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "i2ShskYbiq61UJ1B", - "filament_id": "GFC99_01", + "filament_id": "OFN7aNHe", "instantiation": "true", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json index 2e4dc2d036..49c71cc115 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pctg", "from": "system", "setting_id": "UDqS8gFlHvPIysFk", - "filament_id": "GFG97", + "filament_id": "OFTKFAZ4", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json index 10b87ef227..86d034aa24 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pctg", "from": "system", "setting_id": "2Qbbi90zWBoo9dBl", - "filament_id": "GFG97-01", + "filament_id": "OFTKFAZ4", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json index 1cd9a569e6..dc20a657b0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pe", "from": "system", "setting_id": "jzT1pay155tbaY9M", - "filament_id": "GFP98", + "filament_id": "OFkUaDnU", "instantiation": "true", "filament_cost": [ "65.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json index 81b096e4b2..94686b9139 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pe", "from": "system", "setting_id": "5ChSjqNjRn8QArJP", - "filament_id": "GFP98_01", + "filament_id": "OFkUaDnU", "instantiation": "true", "filament_cost": [ "65.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json index 16b9244f12..0c9504212c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pe", "from": "system", "setting_id": "bYC8MPsm3VIgwaSt", - "filament_id": "GFP99", + "filament_id": "OFKuTr12", "instantiation": "true", "filament_cost": [ "40.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json index 7ebf4377fe..4e6aab9e87 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pe", "from": "system", "setting_id": "ZbU3Ov0P5wtbudQ0", - "filament_id": "GFP99_01", + "filament_id": "OFKuTr12", "instantiation": "true", "filament_cost": [ "40.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json index c3907360a9..32ab191cc2 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "zA6nHgNkxBxGKw0w", - "filament_id": "GFG98", + "filament_id": "OFWadebJ", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json index 04f803a53e..ed4c4d9347 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "jBUy8xUDg53e51kz", - "filament_id": "GFG98_01", + "filament_id": "OFWadebJ", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json index e261373c3d..6d15c90d59 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "UevLlG43knAdcET2", - "filament_id": "GFG99", + "filament_id": "OF1uR1t2", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json index cfec6ee335..56157be9e7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "ZZmmVicb1p0wb5r1", - "filament_id": "GFG99_01", + "filament_id": "OF1uR1t2", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json index f2be140f37..d924c5d28b 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pha", "from": "system", "setting_id": "tFuE7IEbeGEhCNnz", - "filament_id": "GFR98", + "filament_id": "OFxvKuYW", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json index e6e0475805..7c2deb0b12 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pha", "from": "system", "setting_id": "de5eveMr3bI3OCtF", - "filament_id": "GFR98_01", + "filament_id": "OFxvKuYW", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json index a77cb529ea..bda1527d04 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Ms3c6DePE0cjBeQ4", - "filament_id": "GFL95", + "filament_id": "OFodPDxO", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json index d36f12715b..5814210aee 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "e0vVCCT6Tw4061is", - "filament_id": "GFL95_01", + "filament_id": "OFodPDxO", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json index f2ba37e0eb..88b0e6a700 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "RgKM4PxtAasidTe5", - "filament_id": "GFL96", + "filament_id": "OF0GIkJm", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json index b1911a7e9f..b4fafb3019 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "yV358AeiALOn6xVr", - "filament_id": "GFL96_01", + "filament_id": "OF0GIkJm", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json index a78f6e0438..ff1c8b14ee 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "maM4lXic0F10faAb", - "filament_id": "GFL98", + "filament_id": "OFgVJhVt", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json index 3cc2f855f1..4cb7802847 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "3QSGv6pAz9ihFVuD", - "filament_id": "GFL98_01", + "filament_id": "OFgVJhVt", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json index 768f0e293a..ea77ef41e3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "q9W1goEbw6UUrNY3", - "filament_id": "GFL99", + "filament_id": "OFuSwKgm", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json index 6ba33d8004..3fe56ea2e0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "jTSVVOuHuQqETOpe", - "filament_id": "GFL99_01", + "filament_id": "OFuSwKgm", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json index 0c1ae8cae1..22cd19292d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pp", "from": "system", "setting_id": "O5VvyfY5CV6IfMPQ", - "filament_id": "GFP96", + "filament_id": "OFMTBcnz", "instantiation": "true", "filament_cost": [ "77.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json index 5874361c2a..15c4591f98 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pp", "from": "system", "setting_id": "3TZu7e58qrjP4F4u", - "filament_id": "GFP96_01", + "filament_id": "OFMTBcnz", "instantiation": "true", "filament_cost": [ "77.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json index bde8189b36..44557aed47 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pp", "from": "system", "setting_id": "ZQnzXtnTMVMVMNaS", - "filament_id": "GFP95", + "filament_id": "OFkYkQGO", "instantiation": "true", "filament_cost": [ "59.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json index b8a677999a..bac285fef0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pp", "from": "system", "setting_id": "WKwUmsEhhYFyGAP5", - "filament_id": "GFP95_01", + "filament_id": "OFkYkQGO", "instantiation": "true", "filament_cost": [ "59.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json index 895dd36cee..bef2a0ee16 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pp", "from": "system", "setting_id": "3ZYx92CbNBiocyXx", - "filament_id": "GFP97", + "filament_id": "OF3s929u", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json index 473e1b6643..b908fe1011 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pp", "from": "system", "setting_id": "lx9zoOh3ALDlLasf", - "filament_id": "GFP97_01", + "filament_id": "OF3s929u", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json index 9dba1d2e8a..924f324eb4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "2zYiuKYR7bESaCnd", - "filament_id": "GFN97", + "filament_id": "OFSPdsuW", "instantiation": "true", "filament_type": [ "PPA-CF" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json index 866d9981bb..918b4cf1a8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "wLH8aGr4ZNiHazwA", - "filament_id": "GFN97_01", + "filament_id": "OFSPdsuW", "instantiation": "true", "filament_type": [ "PPA-CF" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json index 88d413d976..e84a1c4bb9 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "hYkZEmk1B8X9EcF8", - "filament_id": "GFN96", + "filament_id": "OFptvi3F", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json index 120bbce3c1..dbc3c9ebf3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_ppa", "from": "system", "setting_id": "1zAhSxsuv3wxgBtQ", - "filament_id": "GFN96_01", + "filament_id": "OFptvi3F", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json index d55bfb7557..8a8485843c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pps", "from": "system", "setting_id": "E0gbADj0OHkGSOxt", - "filament_id": "GFT98", + "filament_id": "OFGzUNbm", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json index b4feee2599..cd3e802975 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pps", "from": "system", "setting_id": "6UHEejfZvhQGA4vB", - "filament_id": "GFT98_01", + "filament_id": "OFGzUNbm", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json index 8fcf9ee41a..77fe993cdb 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pps", "from": "system", "setting_id": "2L1eOtxSeCJxW3RV", - "filament_id": "GFT97", + "filament_id": "OFvPomQf", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json index 853646bf08..047117502e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pps", "from": "system", "setting_id": "5TZhbLxtLq6kSJJY", - "filament_id": "GFT97_01", + "filament_id": "OFvPomQf", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json index a77791002e..db73f4b947 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "bTkxwDd1TU8TUqVC", - "filament_id": "GFS99", + "filament_id": "OFMZAoqa", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json index f075f81a59..d1a5b62d7d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "BQ6G75c9eLQQ7ULg", - "filament_id": "GFS99_01", + "filament_id": "OFMZAoqa", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json index 359885ab4a..ab91c462d0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_sbs", "from": "system", "setting_id": "tHfCQJdD7qiIF4uT", - "filament_id": "OFlxnxDx", + "filament_id": "OFM87w9T", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json index 9fed905ccd..df8a4d7cbe 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_sbs", "from": "system", "setting_id": "neqjohDEPRiOa6ut", - "filament_id": "OFlxnxDx", + "filament_id": "OFM87w9T", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json index 8a9e07a22f..0ecd0d9636 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json @@ -3,7 +3,7 @@ "name": "Tiertime Generic TPU", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU99", + "filament_id": "OFCVUEaV", "setting_id": "Viy3kUE0cTV2rMiC", "instantiation": "true", "filament_max_volumetric_speed": [ diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json index 456acc8a4e..d1c8e5ba35 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json @@ -3,7 +3,7 @@ "name": "Tiertime Generic TPU@300HS", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU99_01", + "filament_id": "OFCVUEaV", "setting_id": "wgOtq6REuUQmNe5R", "instantiation": "true", "filament_max_volumetric_speed": [ diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json index 8c165a210d..310c4294fb 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "HuOPyruYQNhxsjYW", - "filament_id": "GFN05", + "filament_id": "OFe8tuNb", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json index 9d84f62383..bdd8281c05 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PA6-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "XniESd6DwW58wgYU", - "filament_id": "GFN05_01", + "filament_id": "OFe8tuNb", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Tiertime/filament/Tiertime PC.json b/resources/profiles/Tiertime/filament/Tiertime PC.json index 4d0ce8c9fa..9b83a065b1 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PC.json +++ b/resources/profiles/Tiertime/filament/Tiertime PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "ImTbFOOUrv2pQbCu", - "filament_id": "GFC00", + "filament_id": "OFdXVjGZ", "instantiation": "true", "filament_vendor": [ "Tiertime" diff --git a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json index fb3f03b63d..afefd7e394 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PC@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "nktjGLDy0Gjl0dO8", - "filament_id": "GFC00_01", + "filament_id": "OFdXVjGZ", "instantiation": "true", "filament_vendor": [ "Tiertime" diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json index 60a91bd937..c55a9a60c0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PET-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "WjpnXYqwyoeHdaC9", - "filament_id": "GFT01", + "filament_id": "OFCnywiC", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json index d844b97bf4..bbe3ec170d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PET-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "kHWlt3zl53mXcEGp", - "filament_id": "GFT01_01", + "filament_id": "OFCnywiC", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG.json b/resources/profiles/Tiertime/filament/Tiertime PETG.json index e4b5313393..9ec377f8f8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PETG.json +++ b/resources/profiles/Tiertime/filament/Tiertime PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "lw6WCNgazXfTwS4z", - "filament_id": "GFG00", + "filament_id": "OFObyktP", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json index 822d39d12d..b44cc3ce30 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PETG@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "bSujcskPkCuGi3At", - "filament_id": "GFG00_01", + "filament_id": "OFObyktP", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json index 86a1895caa..b60dab442f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "AN8Ptxqrd3fAfsAk", - "filament_id": "GFA50", + "filament_id": "OF7OqDp3", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json index 9a2dccc6cb..40558619cb 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA-CF@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "S7OJaqjGSnkaPyDQ", - "filament_id": "GFA50_01", + "filament_id": "OF7OqDp3", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA.json b/resources/profiles/Tiertime/filament/Tiertime PLA.json index 22729a9776..d0a030184a 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFA00", + "filament_id": "OFNGTH3w", "setting_id": "dlXQZNrJfvkJ3kWs", "name": "Tiertime PLA", "from": "system", diff --git a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json index b12f813f3e..48073d5c76 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PLA@300HS.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFA00_01", + "filament_id": "OFNGTH3w", "setting_id": "bqWrzfz6CXHohbpL", "name": "Tiertime PLA@300HS", "from": "system", diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA.json b/resources/profiles/Tiertime/filament/Tiertime PVA.json index 7adba03ec3..689f015f5a 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PVA.json +++ b/resources/profiles/Tiertime/filament/Tiertime PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "9Z1HdjB3dx1Rlyng", - "filament_id": "GFS04", + "filament_id": "OFyreocX", "instantiation": "true", "filament_cost": [ "79.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json index 722e3efd60..988cb744db 100644 --- a/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime PVA@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "1CwFwvd5cNbZwY95", - "filament_id": "GFS04_01", + "filament_id": "OFyreocX", "instantiation": "true", "filament_cost": [ "79.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json index 6feff32639..c328ac64f3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json +++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "aeeRALQ6vydj2vbR", - "filament_id": "GFU01", + "filament_id": "OFLOf6Sc", "instantiation": "true", "filament_vendor": [ "Tiertime" diff --git a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json index f4340bfed3..d95903d89d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json +++ b/resources/profiles/Tiertime/filament/Tiertime TPU 95A@300HS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "6ee2z5F26fqKny4n", - "filament_id": "GFU01_01", + "filament_id": "OFLOf6Sc", "instantiation": "true", "filament_vendor": [ "Tiertime" diff --git a/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json b/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json index b430674cd7..72564df29b 100644 --- a/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json +++ b/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "YqQSUrG195dCz67L", - "filament_id": "GFU99", + "filament_id": "OFdHsxB4", "instantiation": "true", "compatible_printers": [ "TwoTrees SK1 0.4 nozzle" diff --git a/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json b/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json index b713bc31f4..1a7cef302e 100644 --- a/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json +++ b/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "k7bLC5us9mGJzznW", - "filament_id": "GFL100", + "filament_id": "OFBpcB0a", "instantiation": "true", "compatible_printers": [ "TwoTrees SK1 0.4 nozzle" diff --git a/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json b/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json index f780cd48c2..6b67c28f15 100644 --- a/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json +++ b/resources/profiles/Volumic/filament/PA6 CF20 (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFHDaMut", + "filament_id": "OFcKtw8W", "setting_id": "wuZ0EvlbcJ8GxajY", "name": "PA6 CF20 (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/PETG ESD (Performance).json b/resources/profiles/Volumic/filament/PETG ESD (Performance).json index c50871b2a5..06814b64ad 100644 --- a/resources/profiles/Volumic/filament/PETG ESD (Performance).json +++ b/resources/profiles/Volumic/filament/PETG ESD (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFO3IOWM", + "filament_id": "OFiwEbze", "setting_id": "May8rNEMOOs1qtae", "name": "PETG ESD (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/PPS Carbone (Performance).json b/resources/profiles/Volumic/filament/PPS Carbone (Performance).json index 19d79c2174..4708f912c4 100644 --- a/resources/profiles/Volumic/filament/PPS Carbone (Performance).json +++ b/resources/profiles/Volumic/filament/PPS Carbone (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFBRSZom", + "filament_id": "OFEZpel7", "setting_id": "HE0yILdkhbiXbH1j", "name": "PPS Carbone (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json index 8b48f0995c..865f03155e 100644 --- a/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic ABS Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFyQwdaM", "setting_id": "466ggy6ydgaZOrSx", "name": "Volumic ABS Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic ABS Ultra.json b/resources/profiles/Volumic/filament/Volumic ABS Ultra.json index cab927e925..f538936b5a 100644 --- a/resources/profiles/Volumic/filament/Volumic ABS Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic ABS Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFyUJI3q", "setting_id": "omHiTINFPThooUqk", "name": "Volumic ABS Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json index 212d36d0d7..519387adf5 100644 --- a/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic ASA Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFLhOFQk", + "filament_id": "OFU7CKZt", "setting_id": "uE5jxeOBISvO5o7L", "name": "Volumic ASA Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic ASA Ultra.json b/resources/profiles/Volumic/filament/Volumic ASA Ultra.json index 638b2ce47c..2225125c3c 100644 --- a/resources/profiles/Volumic/filament/Volumic ASA Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic ASA Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OF7f0eUZ", + "filament_id": "OF2EB9Iz", "setting_id": "LOAp2zgQWqg1lQQ4", "name": "Volumic ASA Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json index 54049ab145..54d0f89bb3 100644 --- a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFU99", + "filament_id": "OFUH1aee", "setting_id": "k5V3bjZrtr7t8zl0", "name": "Volumic FLEX93 Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json index 16f143b405..84ccdc6d19 100644 --- a/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic FLEX93 Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFU99", + "filament_id": "OFuxH0Uz", "setting_id": "DXZ4Gp5XP5VCJTXY", "name": "Volumic FLEX93 Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json index 44ab540de1..8a4b44f59b 100644 --- a/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic NYLON Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFN99", + "filament_id": "OFi90KlM", "setting_id": "RC5gFyIejXWDJuHH", "name": "Volumic NYLON Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json b/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json index 9b7cbd0602..95c5f81a6a 100644 --- a/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic NYLON Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFN99", + "filament_id": "OFWa0NiB", "setting_id": "AL4xDgN8EIYb3UrL", "name": "Volumic NYLON Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PC Performance.json b/resources/profiles/Volumic/filament/Volumic PC Performance.json index d239419ccf..d454de5688 100644 --- a/resources/profiles/Volumic/filament/Volumic PC Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PC Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFC99", + "filament_id": "OFgSbX7E", "setting_id": "ht6Ar3ilCkPT7geN", "name": "Volumic PC (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PC.json b/resources/profiles/Volumic/filament/Volumic PC.json index 5ffe6cd415..12ea420585 100644 --- a/resources/profiles/Volumic/filament/Volumic PC.json +++ b/resources/profiles/Volumic/filament/Volumic PC.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFC99", + "filament_id": "OFaHjk1V", "setting_id": "3pUnwXise3J77Qmc", "name": "Volumic PC", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json b/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json index d45447dbe7..5e20cb2922 100644 --- a/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json +++ b/resources/profiles/Volumic/filament/Volumic PCTG Ultra (Performance).json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFxfCy9m", + "filament_id": "OFTdauIq", "setting_id": "NdegYSDVrQ4Rawtp", "name": "Volumic PCTG Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json index 3a3d240a4e..6b98fc49d2 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "OFsD974q", "setting_id": "bNcC5kGe9jOm7Ltu", "name": "Volumic PETG Ultra (Performance)", "from": "system", 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 adf3a8fc45..91827ebe80 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG98", + "filament_id": "OFY0F5qA", "setting_id": "IIFtCkVvHoLtxPxj", "name": "Volumic PETG Ultra carbone (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json b/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json index 4ee0a68464..137bad9d53 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra carbone.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG98", + "filament_id": "OFu08yGN", "setting_id": "nOKT0adoQi3O7Tge", "name": "Volumic PETG Ultra carbone", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PETG Ultra.json b/resources/profiles/Volumic/filament/Volumic PETG Ultra.json index 25162f2d94..8db07d0bab 100644 --- a/resources/profiles/Volumic/filament/Volumic PETG Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic PETG Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "OFG0kOKX", "setting_id": "CuBXW7SqUeJOcxPP", "name": "Volumic PETG Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json index 741d2eab82..2a02fe7c88 100644 --- a/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PLA Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OF3dJf4E", "setting_id": "8J2ZIz8ByFNEB9PC", "name": "Volumic PLA Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PLA Ultra.json b/resources/profiles/Volumic/filament/Volumic PLA Ultra.json index 67d33d3b52..2e5f762d39 100644 --- a/resources/profiles/Volumic/filament/Volumic PLA Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic PLA Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFXuGxvQ", "setting_id": "3BeQ60i4cOs3BfZn", "name": "Volumic PLA Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json index 401033bc96..3fafb8aac0 100644 --- a/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PP Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFPGelMX", + "filament_id": "OFNSYu5h", "setting_id": "nsiOJ8ExySR1RksQ", "name": "Volumic PP Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PP Ultra.json b/resources/profiles/Volumic/filament/Volumic PP Ultra.json index a79589876f..eba78219bc 100644 --- a/resources/profiles/Volumic/filament/Volumic PP Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic PP Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFAGqTQG", + "filament_id": "OFsFo7ms", "setting_id": "UA91pv54dzbBRkFe", "name": "Volumic PP Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PVA Performance.json b/resources/profiles/Volumic/filament/Volumic PVA Performance.json index 92a94ac5c1..199d33ed62 100644 --- a/resources/profiles/Volumic/filament/Volumic PVA Performance.json +++ b/resources/profiles/Volumic/filament/Volumic PVA Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFS99", + "filament_id": "OFRkjhxK", "setting_id": "L9ZTGhwNpVWT6E5j", "name": "Volumic PVA-BVOH (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic PVA.json b/resources/profiles/Volumic/filament/Volumic PVA.json index 5d9892417c..24c28a89a5 100644 --- a/resources/profiles/Volumic/filament/Volumic PVA.json +++ b/resources/profiles/Volumic/filament/Volumic PVA.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFS99", + "filament_id": "OFGdP6Na", "setting_id": "rw4bB5gYM6YF8v9e", "name": "Volumic PVA", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json index 025e1ada57..90562ebba2 100644 --- a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json +++ b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra Performance.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFPeGtB1", + "filament_id": "OFkGp50Y", "setting_id": "rxVkBvMZYgHOoFW6", "name": "Volumic UNIVERSAL Ultra (Performance)", "from": "system", diff --git a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json index b061d498c2..ee50a25ffd 100644 --- a/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json +++ b/resources/profiles/Volumic/filament/Volumic UNIVERSAL Ultra.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "OFIzguhB", + "filament_id": "OFpumhCM", "setting_id": "6iOFERN4x6xBbtuT", "name": "Volumic UNIVERSAL Ultra", "from": "system", diff --git a/resources/profiles/Volumic/filament/desactive.json b/resources/profiles/Volumic/filament/desactive.json index 6485f044f0..1c490c957e 100644 --- a/resources/profiles/Volumic/filament/desactive.json +++ b/resources/profiles/Volumic/filament/desactive.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "DFL99", + "filament_id": "OFCuaCer", "setting_id": "Sphn4hoDMpH2uy86", "name": "Désactivé", "from": "system", diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic ABS.json b/resources/profiles/Vzbot/filament/Vzbot Generic ABS.json index 831670240c..0ab07b4387 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic ABS.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "nRFPlbSKRMb0UpSI", - "filament_id": "GFB99", + "filament_id": "OFLBUkwC", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic ASA.json b/resources/profiles/Vzbot/filament/Vzbot Generic ASA.json index 0996b8cd18..69ba1b7b5b 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic ASA.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "rP4Qul9OY7lUhPgO", - "filament_id": "GFB98", + "filament_id": "OF4XAUnp", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PA-CF.json b/resources/profiles/Vzbot/filament/Vzbot Generic PA-CF.json index f51cda8ed9..75ca6d6b52 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PA-CF.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic PA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "AKO1twNgFO67N5GK", - "filament_id": "GFN98", + "filament_id": "OFNn21yM", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PA.json b/resources/profiles/Vzbot/filament/Vzbot Generic PA.json index 815969c712..46184d8018 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PA.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic PA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "4CBO5MnUk8Smhs3q", - "filament_id": "GFN99", + "filament_id": "OF0zx94L", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PC.json b/resources/profiles/Vzbot/filament/Vzbot Generic PC.json index ebb44e627a..9731fbbe07 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PC.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic PC.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pc", "from": "system", "setting_id": "wUe99Mr4HqzSNxgO", - "filament_id": "GFC99", + "filament_id": "OF9fOPpd", "instantiation": "true", "filament_max_volumetric_speed": [ "50" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PETG.json b/resources/profiles/Vzbot/filament/Vzbot Generic PETG.json index cc48d69299..0f585fbb8c 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PETG.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic PETG.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "C8LMRvN350POVqC2", - "filament_id": "GFG99", + "filament_id": "OFHUnLY2", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PLA-CF.json b/resources/profiles/Vzbot/filament/Vzbot Generic PLA-CF.json index 33ab4f69a3..2b73cddba8 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PLA-CF.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic PLA-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "nt1egZD1dQEVXp0v", - "filament_id": "GFL98", + "filament_id": "OFYHzKyS", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PLA.json b/resources/profiles/Vzbot/filament/Vzbot Generic PLA.json index 48a8aefecc..b0e447e66c 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PLA.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic PLA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "4JMiuJbl1gNrBipT", - "filament_id": "GFL99", + "filament_id": "OF2mgDsI", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PVA.json b/resources/profiles/Vzbot/filament/Vzbot Generic PVA.json index 0d0bd62a3e..23a748046e 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PVA.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "DX4eZb2tlNVqeUrn", - "filament_id": "GFS99", + "filament_id": "OFIda816", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic TPU.json b/resources/profiles/Vzbot/filament/Vzbot Generic TPU.json index f5ca392779..60901cb86e 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic TPU.json +++ b/resources/profiles/Vzbot/filament/Vzbot Generic TPU.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "YlhTF1F3OA2qj6o2", - "filament_id": "GFU99", + "filament_id": "OFGGyAgJ", "instantiation": "true", "filament_max_volumetric_speed": [ "50" diff --git a/resources/profiles/Wanhao France/filament/YUMI PETG.json b/resources/profiles/Wanhao France/filament/YUMI PETG.json index b8046df21f..97082ee19a 100644 --- a/resources/profiles/Wanhao France/filament/YUMI PETG.json +++ b/resources/profiles/Wanhao France/filament/YUMI PETG.json @@ -4,7 +4,7 @@ "inherits": "Yumi Generic PETG", "from": "system", "setting_id": "PFFm20QNgwqyuglH", - "filament_id": "GFG99", + "filament_id": "OF5NqBfC", "instantiation": "true", "filament_vendor": [ "Yumi" diff --git a/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json b/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json index f7bac7a60c..5655743ca6 100644 --- a/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json +++ b/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json @@ -4,7 +4,7 @@ "inherits": "Yumi Generic PLA", "from": "system", "setting_id": "zQSSA2QZi27ESyQK", - "filament_id": "GFU99", + "filament_id": "OFZ2LuAi", "instantiation": "true", "filament_vendor": [ "Yumi" diff --git a/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json b/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json index be13517ab5..52360e2d5b 100644 --- a/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json +++ b/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json @@ -4,7 +4,7 @@ "inherits": "Yumi Generic PLA", "from": "system", "setting_id": "v2p0ooSxHnvVkn57", - "filament_id": "GFU99", + "filament_id": "OFJxSqO4", "instantiation": "true", "filament_vendor": [ "Yumi" diff --git a/resources/profiles/Wanhao France/filament/Yumi Generic PETG.json b/resources/profiles/Wanhao France/filament/Yumi Generic PETG.json index 83d505ac6f..af50f6f8b0 100644 --- a/resources/profiles/Wanhao France/filament/Yumi Generic PETG.json +++ b/resources/profiles/Wanhao France/filament/Yumi Generic PETG.json @@ -3,7 +3,7 @@ "name": "Yumi Generic PETG", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFCu3jES", "instantiation": "false", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Wanhao France/filament/Yumi Generic PLA.json b/resources/profiles/Wanhao France/filament/Yumi Generic PLA.json index bbace09129..0ef9bfdad2 100644 --- a/resources/profiles/Wanhao France/filament/Yumi Generic PLA.json +++ b/resources/profiles/Wanhao France/filament/Yumi Generic PLA.json @@ -3,7 +3,7 @@ "name": "Yumi Generic PLA", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFGLeiNL", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/WonderMaker/filament/WonderMaker ABS.json b/resources/profiles/WonderMaker/filament/WonderMaker ABS.json index ab6833cb04..a15b27e098 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker ABS.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker ABS.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "from": "system", "setting_id": "cyLAXg9zBIDNkYNx", - "filament_id": "GFB00", + "filament_id": "OFjHrAX0", "instantiation": "true", "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": [ diff --git a/resources/profiles/WonderMaker/filament/WonderMaker ASA.json b/resources/profiles/WonderMaker/filament/WonderMaker ASA.json index b73a974ea9..186045f104 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker ASA.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker ASA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_asa", "from": "system", "setting_id": "Wu70ukKHBqIa4TDv", - "filament_id": "GFB01", + "filament_id": "OFy3sW6j", "instantiation": "true", "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.", "eng_plate_temp": [ diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PET-CF.json b/resources/profiles/WonderMaker/filament/WonderMaker PET-CF.json index 79d0a85a77..b86695c98d 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PET-CF.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PET-CF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "Rnm03E1ifi5A2vrQ", - "filament_id": "GFT01", + "filament_id": "OF4f8vVp", "instantiation": "true", "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.", "cool_plate_temp": [ diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PETG Basic.json b/resources/profiles/WonderMaker/filament/WonderMaker PETG Basic.json index 434c0f9fca..0da03e7d8d 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PETG Basic.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PETG Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "ZtPZlMNIqq3Gaavc", - "filament_id": "GFG00", + "filament_id": "OF5lGPup", "instantiation": "true", "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": [ diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PLA Basic.json b/resources/profiles/WonderMaker/filament/WonderMaker PLA Basic.json index 7440eae0ee..2723ffd1bb 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PLA Basic.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PLA Basic.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "HRFI81hKAaT1LwjF", - "filament_id": "GFA00", + "filament_id": "OFMK5gVo", "instantiation": "true", "filament_cost": [ "24.99" diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PLA Marble.json b/resources/profiles/WonderMaker/filament/WonderMaker PLA Marble.json index 7c641e69b0..9ebd12b035 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PLA Marble.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PLA Marble.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "eudiDwK2EVLlGnha", - "filament_id": "GFA07", + "filament_id": "OFEbIx49", "instantiation": "true", "filament_cost": [ "29.99" diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PLA Matte.json b/resources/profiles/WonderMaker/filament/WonderMaker PLA Matte.json index a935c96157..53fc60c709 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PLA Matte.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PLA Matte.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "YufHNkKBRBBxucHO", - "filament_id": "GFA01", + "filament_id": "OFepU7Tl", "instantiation": "true", "filament_cost": [ "24.99" diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PLA Metal.json b/resources/profiles/WonderMaker/filament/WonderMaker PLA Metal.json index 222fcbce1a..09454f9a80 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PLA Metal.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PLA Metal.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "4B7gD5YwPbUCvLAh", - "filament_id": "GFA02", + "filament_id": "OFcogyWl", "instantiation": "true", "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": [ diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PLA Silk.json b/resources/profiles/WonderMaker/filament/WonderMaker PLA Silk.json index 6738e2802e..7e2b3be650 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PLA Silk.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PLA Silk.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "8kSWEkCpitdwX11c", - "filament_id": "GFA05", + "filament_id": "OFncpm7O", "instantiation": "true", "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": [ diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PLA Wood.json b/resources/profiles/WonderMaker/filament/WonderMaker PLA Wood.json index d4b51f4b0d..a2b96925a6 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PLA Wood.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PLA Wood.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "KxnOjANQuyO10zzH", - "filament_id": "GFA16", + "filament_id": "OFBBgw7B", "instantiation": "true", "filament_cost": [ "24.99" diff --git a/resources/profiles/WonderMaker/filament/WonderMaker PVA.json b/resources/profiles/WonderMaker/filament/WonderMaker PVA.json index 65f504da95..1ec283f106 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker PVA.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker PVA.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pva", "from": "system", "setting_id": "PRdEoagTzltjzJCQ", - "filament_id": "GFS04", + "filament_id": "OF4ulo9Y", "instantiation": "true", "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": [ diff --git a/resources/profiles/WonderMaker/filament/WonderMaker TPU 95A.json b/resources/profiles/WonderMaker/filament/WonderMaker TPU 95A.json index 3b617e15ab..a8d7620cec 100755 --- a/resources/profiles/WonderMaker/filament/WonderMaker TPU 95A.json +++ b/resources/profiles/WonderMaker/filament/WonderMaker TPU 95A.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "eUyRprcb22IdYNv3", - "filament_id": "GFU01", + "filament_id": "OFLAXKqP", "instantiation": "true", "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": [ 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 5f505d80da..10b5421797 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt ABS;Generic ABS @Z-Bolt;Z-Bolt ABS @0.4 nozzle", "from": "system", "setting_id": "p97bQCnVyGgwMn2y", - "filament_id": "GFL204", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_max_volumetric_speed": [ "15" 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 641fff9a6b..ea89fac80f 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt ABS @0.6 nozzle", "from": "system", "setting_id": "BQdgCL8lvVW7I8Dw", - "filament_id": "GFL206", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_max_volumetric_speed": [ "18" 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 1b55d4460b..48c8a20136 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt ABS @0.8 nozzle", "from": "system", "setting_id": "Xn2L7IBp26Bb6G2K", - "filament_id": "GFL208", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_max_volumetric_speed": [ "21" diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json index bdef07fbb7..609e9f6106 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_abs", "renamed_from": "Z-Bolt ABS;Generic ABS @Z-Bolt", "from": "system", - "filament_id": "GFL200", + "filament_id": "OFY9muEs", "instantiation": "false", "filament_max_volumetric_speed": [ "20" 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 a933deaf74..7ee03a1904 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt ABS HT;Generic ABS HT @Z-Bolt;Z-Bolt ABS HT @0.4 nozzle", "from": "system", "setting_id": "TDGj84iuRAL9R1d4", - "filament_id": "GFL504", + "filament_id": "OFsP8PKH", "instantiation": "true", "filament_max_volumetric_speed": [ "15" 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 701a2e6b7f..626fbe9977 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt ABS HT @0.6 nozzle", "from": "system", "setting_id": "2AKxm2VhVlL2vMM1", - "filament_id": "GFL506", + "filament_id": "OFsP8PKH", "instantiation": "true", "filament_max_volumetric_speed": [ "18" 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 6c73a3d99f..feb932dcdb 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt ABS HT @0.8 nozzle", "from": "system", "setting_id": "ztusMudd96Ns3Ip0", - "filament_id": "GFL508", + "filament_id": "OFsP8PKH", "instantiation": "true", "filament_max_volumetric_speed": [ "21" diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json index 431d4dc7c2..0448f04bed 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @Z-Bolt Base", "renamed_from": "Z-Bolt ABS HT;Generic ABS HT @Z-Bolt", "from": "system", - "filament_id": "GFL500", + "filament_id": "OFsP8PKH", "instantiation": "false", "description": "Use this filament profile to print big ABS models with chamber heating", "chamber_temperatures": [ 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 e9b01c547c..c09de55efa 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PA;Generic PA @Z-Bolt;Z-Bolt PA @0.4 nozzle", "from": "system", "setting_id": "zuvJBWxHOiPMyExQ", - "filament_id": "GFL404", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_max_volumetric_speed": [ "8" 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 d74fcf8470..d6886e6b1e 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PA @0.6 nozzle", "from": "system", "setting_id": "MB0n4BeDFEI25yTe", - "filament_id": "GFL406", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_max_volumetric_speed": [ "10" 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 42d675d826..12a005431f 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PA @0.8 nozzle", "from": "system", "setting_id": "WZc4C1f6cPG8HZR3", - "filament_id": "GFL408", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json index 73459bf326..f593385ea7 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "renamed_from": "Z-Bolt PA;Generic PA @Z-Bolt", "from": "system", - "filament_id": "GFL400", + "filament_id": "OFg8ndtj", "instantiation": "false", "filament_max_volumetric_speed": [ "8" 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 476ece5d3b..a28c4bc1c3 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PETG;Generic PETG @Z-Bolt;Z-Bolt PETG @0.4 nozzle", "from": "system", "setting_id": "LWwbNXs8bf1iGELi", - "filament_id": "GFL304", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_max_volumetric_speed": [ "8" 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 8bd7ff1efa..15aab3fe46 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PETG @0.6 nozzle", "from": "system", "setting_id": "w4HVBbunzssG9j3s", - "filament_id": "GFL306", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_max_volumetric_speed": [ "10" 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 3bce1def13..4fe8b41490 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PETG @0.8 nozzle", "from": "system", "setting_id": "TnLZ0vOVjIjng3u0", - "filament_id": "GFL308", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json index 8e64cc6200..4c8d8dc6a7 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "renamed_from": "Z-Bolt PETG;Generic PETG @Z-Bolt", "from": "system", - "filament_id": "GFL300", + "filament_id": "OFYPdQJh", "instantiation": "false", "fan_cooling_layer_time": [ "30" 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 943d57d6c1..527888a93f 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PLA;Generic PLA @Z-Bolt;Z-Bolt PLA @0.4 nozzle", "from": "system", "setting_id": "0MfamDPH1L6sMRff", - "filament_id": "GFL100", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_max_volumetric_speed": [ "15" 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 a87f145129..af58bff7c5 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PLA @0.6 nozzle", "from": "system", "setting_id": "tdq9Ye9GLpZXlak6", - "filament_id": "GFL106", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_max_volumetric_speed": [ "18" 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 283951b1a2..dbe507507b 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 @@ -5,7 +5,7 @@ "renamed_from": "Z-Bolt PLA @0.8 nozzle", "from": "system", "setting_id": "GKtc9mJusUZJD6kx", - "filament_id": "GFL108", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_max_volumetric_speed": [ "21" diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json index 4b946c44cd..df2c3259e1 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "renamed_from": "Z-Bolt PLA;Generic PLA @Z-Bolt", "from": "system", - "filament_id": "GFL100", + "filament_id": "OFDSrzZ8", "instantiation": "false", "filament_max_volumetric_speed": [ "20" diff --git a/resources/profiles/iQ/filament/Fiberthree PACF Pro P1 @iQ TiQ2 0.4 Nozzle.json b/resources/profiles/iQ/filament/Fiberthree PACF Pro P1 @iQ TiQ2 0.4 Nozzle.json index 79be89b387..5710a6c96e 100644 --- a/resources/profiles/iQ/filament/Fiberthree PACF Pro P1 @iQ TiQ2 0.4 Nozzle.json +++ b/resources/profiles/iQ/filament/Fiberthree PACF Pro P1 @iQ TiQ2 0.4 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "7YUqT6co3NfvJ8L9", - "filament_id": "IQM1", + "filament_id": "OFjUGUIK", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/iQ/filament/Fiberthree PACF Pro P2 @iQ TiQ2 0.4 Nozzle.json b/resources/profiles/iQ/filament/Fiberthree PACF Pro P2 @iQ TiQ2 0.4 Nozzle.json index 8b07c6af0f..f3dfafcd74 100644 --- a/resources/profiles/iQ/filament/Fiberthree PACF Pro P2 @iQ TiQ2 0.4 Nozzle.json +++ b/resources/profiles/iQ/filament/Fiberthree PACF Pro P2 @iQ TiQ2 0.4 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "B5VrAYqX9Dzj5qfV", - "filament_id": "IQM7", + "filament_id": "OF6kj4jI", "instantiation": "true", "compatible_prints": [ "0.20mm Standard @iQ TiQ2 P2 - PACF Pro Fiberthree + VXL90 Xioneer (0.4 Nozzle)" diff --git a/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json b/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json index 986de30106..3ead9c48e3 100644 --- a/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json +++ b/resources/profiles/iQ/filament/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "5M829nxsQdq2Sde5", - "filament_id": "OFL4BLAC", + "filament_id": "OFXJ9iom", "instantiation": "true", "compatible_prints": [ "0.20mm Standard @iQ TiQ2 P1 - HPP4GF25 Grauts (0.4 Nozzle)" diff --git a/resources/profiles/iQ/filament/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle.json b/resources/profiles/iQ/filament/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle.json index e0faf6eb71..3409911a32 100644 --- a/resources/profiles/iQ/filament/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle.json +++ b/resources/profiles/iQ/filament/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "2gaJup2jw52l27sv", - "filament_id": "IQM2", + "filament_id": "OFJWKoYG", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/iQ/filament/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle.json b/resources/profiles/iQ/filament/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle.json index 5226e1e755..2bcd99b952 100644 --- a/resources/profiles/iQ/filament/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle.json +++ b/resources/profiles/iQ/filament/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "QefI7iu8bAQ9jzDK", - "filament_id": "IQM3", + "filament_id": "OFaeIx7W", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/iQ/filament/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle.json b/resources/profiles/iQ/filament/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle.json index 2855f13552..aacf080a4b 100644 --- a/resources/profiles/iQ/filament/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle.json +++ b/resources/profiles/iQ/filament/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_common", "from": "system", "setting_id": "rVzUhxKEDUfGMnQi", - "filament_id": "IQM1011", + "filament_id": "OFOJPAAS", "instantiation": "true", "compatible_prints": [ "0.20mm Standard @iQ TiQ2 P2 - PACF Pro Fiberthree + VXL90 Xioneer (0.4 Nozzle)" diff --git a/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json b/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json index 42abbeb819..037ec7f86c 100644 --- a/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D Greengate rPETG @0.8 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG01", + "filament_id": "OFSTCno1", "setting_id": "fRX555Prkdu5ESIp", "name": "re3D Greengate rPETG @0.8 nozzle", "from": "system", diff --git a/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json b/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json index 43de0b8685..3602474096 100644 --- a/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json +++ b/resources/profiles/re3D/filament/re3D Greengate rPETG @1.75 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG01", + "filament_id": "OFSTCno1", "setting_id": "6aPU6CYS2cmODkok", "name": "re3D Greengate rPETG @1.75 nozzle", "from": "system", diff --git a/resources/profiles/re3D/filament/re3D Greengate rPETG.json b/resources/profiles/re3D/filament/re3D Greengate rPETG.json index fe0ff8f81b..349d40fff9 100644 --- a/resources/profiles/re3D/filament/re3D Greengate rPETG.json +++ b/resources/profiles/re3D/filament/re3D Greengate rPETG.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "GFG01", + "filament_id": "OFSTCno1", "setting_id": "SdugLw5oy9GB7NID", "filament_settings_id": [ "re3D Greengate rPETG" 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 47a3a44f34..bb81730159 100644 --- a/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pc", - "filament_id": "GFG99", + "filament_id": "OFU3QXL7", "setting_id": "6yqRE2eSyER7X82N", "filament_settings_id": [ "re3D PC @0.4 nozzle" 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 c1f329f295..698cc5f4bd 100644 --- a/resources/profiles/re3D/filament/re3D PC @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PC @0.8 nozzle.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pc", - "filament_id": "GFG99", + "filament_id": "OFU3QXL7", "setting_id": "YVPbVSiVCzjp5ynf", "filament_settings_id": [ "re3D PC @0.8 nozzle" diff --git a/resources/profiles/re3D/filament/re3D PC.json b/resources/profiles/re3D/filament/re3D PC.json index 36e475e4e9..26e6ac4a92 100644 --- a/resources/profiles/re3D/filament/re3D PC.json +++ b/resources/profiles/re3D/filament/re3D PC.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pc", - "filament_id": "GFG99", + "filament_id": "OFU3QXL7", "setting_id": "eSR00TZTotTvJs8l", "filament_settings_id": [ "re3D PC" 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 c275a7517f..3e2ad13f10 100644 --- a/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "GFG03", + "filament_id": "OF3F63OE", "setting_id": "epcrSCwjgRXMycBx", "filament_settings_id": [ "re3D PETG @0.4 nozzle" 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 148f6540fe..5faa19b476 100644 --- a/resources/profiles/re3D/filament/re3D PETG @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PETG @0.8 nozzle.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "GFG03", + "filament_id": "OF3F63OE", "setting_id": "MoQie1JMlUeH0BwR", "filament_settings_id": [ "re3D PETG @0.8 nozzle" diff --git a/resources/profiles/re3D/filament/re3D PETG.json b/resources/profiles/re3D/filament/re3D PETG.json index fb4cf4278c..426849c4a1 100644 --- a/resources/profiles/re3D/filament/re3D PETG.json +++ b/resources/profiles/re3D/filament/re3D PETG.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "GFG03", + "filament_id": "OF3F63OE", "setting_id": "msXDK31R8KOvqNqK", "filament_settings_id": [ "re3D PETG" 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 1719807f7f..06a6d9942b 100644 --- a/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", - "filament_id": "GFL99", + "filament_id": "OFRyOsZj", "setting_id": "M8OOntNjjDBR4W32", "filament_settings_id": [ "re3D PLA @0.4 nozzle" 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 01e7abbc9a..41227d9da5 100644 --- a/resources/profiles/re3D/filament/re3D PLA @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PLA @0.8 nozzle.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", - "filament_id": "GFL99", + "filament_id": "OFRyOsZj", "setting_id": "SpF19Y2sSYbPHyxz", "filament_settings_id": [ "re3D PLA @0.8 nozzle" diff --git a/resources/profiles/re3D/filament/re3D PLA.json b/resources/profiles/re3D/filament/re3D PLA.json index c3eb730024..3f26dd5834 100644 --- a/resources/profiles/re3D/filament/re3D PLA.json +++ b/resources/profiles/re3D/filament/re3D PLA.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", - "filament_id": "GFL99", + "filament_id": "OFRyOsZj", "setting_id": "nPpDwvFg7WQr7K3t", "filament_settings_id": [ "re3D PLA" 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 a49f19e128..56a0875c80 100644 --- a/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG02", + "filament_id": "OFfHGM1D", "setting_id": "i9ii0b7qFYWnkGSq", "name": "re3D rPP @0.8 nozzle", "from": "system", 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 0bde56c596..91d8aa1a3b 100644 --- a/resources/profiles/re3D/filament/re3D rPP @1.75 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPP @1.75 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG02", + "filament_id": "OFfHGM1D", "setting_id": "356nOwsfGLI3CNqU", "name": "re3D rPP @1.75 nozzle", "from": "system", diff --git a/resources/profiles/re3D/filament/re3D rPP.json b/resources/profiles/re3D/filament/re3D rPP.json index d226697240..2c66bc7b97 100644 --- a/resources/profiles/re3D/filament/re3D rPP.json +++ b/resources/profiles/re3D/filament/re3D rPP.json @@ -7,7 +7,7 @@ "filament_type": [ "PP" ], - "filament_id": "GFG02", + "filament_id": "OFfHGM1D", "setting_id": "8PB62qm5Cd3SHLf4", "filament_settings_id": [ "re3D rPP" diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index a23c0d8cbc..fd99602923 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -1,5 +1,120 @@ { "hints": { + "GFA00_01": "OF9HCdyQ", + "GFA03": "OFjXrKFO", + "GFA50_01": "OF7OqDp3", + "GFA99": "OF0yFLkY", + "GFASA": "OF0yFLkY", + "GFB00_01": "OFNQKF0M", + "GFB01_01": "OFdrYBmI", + "GFB98": "OFLPAxz3", + "GFB98_01": "OFUaVAdj", + "GFB98_2": "OFoJcr46", + "GFB98_3": "OFoJcr46", + "GFB98_4": "OFoJcr46", + "GFB98_5": "OFK4LdYI", + "GFB98_6": "OFK4LdYI", + "GFB98_7": "OFK4LdYI", + "GFB99": "OFY9muEs", + "GFB99_01": "OFNLXV8X", + "GFB99_2": "OFvGc67v", + "GFB99_3": "OFvGc67v", + "GFB99_4": "OFvGc67v", + "GFB99_5": "OFvGc67v", + "GFB99_6": "OFyeSq8A", + "GFB99_7": "OFyeSq8A", + "GFC00_01": "OFdXVjGZ", + "GFC98": "OFjz0a3m", + "GFC99": "OFLakOUI", + "GFC99_01": "OFN7aNHe", + "GFC99_1": "OF97ru74", + "GFC99_2": "OF97ru74", + "GFC99_3": "OF97ru74", + "GFC99_4": "OF97ru74", + "GFC99_5": "OFq5QANf", + "GFC99_6": "OFq5QANf", + "GFG00_01": "OFObyktP", + "GFG03": "OF3F63OE", + "GFG96": "OF7lOgYF", + "GFG97": "OFu1evlr", + "GFG97-01": "OFTKFAZ4", + "GFG98": "OFoYSJKi", + "GFG98_01": "OFWadebJ", + "GFG99": "OFYPdQJh", + "GFG99_01": "OF1uR1t2", + "GFG99_2": "OF1Id239", + "GFG99_3": "OF1Id239", + "GFG99_4": "OF1Id239", + "GFG99_5": "OF1Id239", + "GFG99_6": "OFOKYhi6", + "GFG99_7": "OFOKYhi6", + "GFL100": "OFBpcB0a", + "GFL106": "OFDSrzZ8", + "GFL108": "OFDSrzZ8", + "GFL204": "OFY9muEs", + "GFL206": "OFY9muEs", + "GFL208": "OFY9muEs", + "GFL304": "OFYPdQJh", + "GFL306": "OFYPdQJh", + "GFL308": "OFYPdQJh", + "GFL404": "OFg8ndtj", + "GFL406": "OFg8ndtj", + "GFL408": "OFg8ndtj", + "GFL504": "OFsP8PKH", + "GFL506": "OFsP8PKH", + "GFL508": "OFsP8PKH", + "GFL71": "OF0omtEb", + "GFL72": "OFFZ458u", + "GFL73": "OFeVzkSU", + "GFL74": "OF0VpkBM", + "GFL75": "OFnXwW8l", + "GFL76": "OF6H51Xx", + "GFL77": "OFtFtiS0", + "GFL78": "OFelDBgv", + "GFL79": "OF5oXk4M", + "GFL80": "OFHknN4v", + "GFL94": "OFrGJ4tR", + "GFL95": "OFmpMwxS", + "GFL95_01": "OFodPDxO", + "GFL96": "OFesA6rF", + "GFL96_01": "OF0GIkJm", + "GFL97": "OFCp3Bgo", + "GFL98": "OFWbdGsC", + "GFL98_01": "OFgVJhVt", + "GFL98_1": "OFQ7I5vC", + "GFL98_3": "OFQ7I5vC", + "GFL98_4": "OFQ7I5vC", + "GFL98_5": "OFQ7I5vC", + "GFL99": "OFDSrzZ8", + "GFL99_01": "OFuSwKgm", + "GFL99_2": "OFiCHnso", + "GFL99_3": "OFiCHnso", + "GFL99_4": "OFiCHnso", + "GFL99_5": "OFiCHnso", + "GFL99_6": "OFl4ItvQ", + "GFL99_7": "OFl4ItvQ", + "GFLLK10PETG": "OFYPdQJh", + "GFLLK10PLA": "OFDSrzZ8", + "GFLLK10PPETG": "OFYPdQJh", + "GFLLK10PPLA": "OFDSrzZ8", + "GFLSBS99": "OFhQfUQY", + "GFN05_01": "OFe8tuNb", + "GFN96": "OF8Tlg47", + "GFN96_01": "OFptvi3F", + "GFN97": "OF8tPByX", + "GFN97_01": "OFSPdsuW", + "GFN98": "OFQLcbps", + "GFN98_02": "OFHa3RZT", + "GFN98_1": "OFfznI0Q", + "GFN98_2": "OFfznI0Q", + "GFN98_3": "OFfznI0Q", + "GFN98_4": "OFfznI0Q", + "GFN99": "OFg8ndtj", + "GFN99_01": "OFQswlnF", + "GFN99_1": "OFIy3kLw", + "GFN99_2": "OFIy3kLw", + "GFN99_3": "OFIy3kLw", + "GFN99_4": "OFIy3kLw", "GFOT001": "OFxA1p01", "GFOT002": "OFGkyftV", "GFOT003": "OF1Pke8t", @@ -8,6 +123,48 @@ "GFOT006": "OFcfQk4h", "GFOT008": "OFcvKkrs", "GFOT009": "OFM91vZs", + "GFP95": "OFNiSLfL", + "GFP95_01": "OFkYkQGO", + "GFP96": "OFXkm8q1", + "GFP96_01": "OFMTBcnz", + "GFP97": "OF1UNk9P", + "GFP97_01": "OF3s929u", + "GFP98": "OFd0Fv0k", + "GFP98_01": "OFkUaDnU", + "GFP99": "OFPklMI1", + "GFP99_01": "OFKuTr12", + "GFPA": "OFzS7zt4", + "GFPA6-CF": "OFQe7sAx", + "GFPAHT-CF": "OFaEuvNF", + "GFPC": "OFZtkHRq", + "GFPC-CF": "OFeIyhUx", + "GFPC-GF": "OFxJRuVF", + "GFPEBA": "OFjLAYgO", + "GFPET-CF": "OFRhCTUg", + "GFPETG": "OFYPdQJh", + "GFPETG-1": "OFIeCuXj", + "GFPETG-CF": "OF9UJOGF", + "GFPLA Glow": "OF5PtjTp", + "GFPLA Translucent": "OF7c9fln", + "GFPLA-CF": "OFZ0mR5b", + "GFPVA": "OFTkj6DR", + "GFR98": "OF74KeQR", + "GFR98_01": "OFxvKuYW", + "GFR99": "OFCD8qiU", + "GFR99_01": "OFrnJJEa", + "GFS04_01": "OFyreocX", + "GFS97": "OFo2UF2C", + "GFS97_01": "OFGDaEHO", + "GFS98": "OFsFon5l", + "GFS98_01": "OFW9uIkE", + "GFS99": "OFDvXujf", + "GFS99_01": "OFMZAoqa", + "GFS99_1": "OFcCzEkS", + "GFS99_2": "OFcCzEkS", + "GFS99_3": "OFcCzEkS", + "GFS99_4": "OFcCzEkS", + "GFS99_5": "OFoT8F7Y", + "GFS99_6": "OFoT8F7Y", "GFSEP001": "OFtudokz", "GFSEP002": "OFf5awy4", "GFSEP003": "OFbP8zEO", @@ -25,9 +182,777 @@ "GFSEP015": "OFvVy7yo", "GFSEP016": "OFTOPcx0", "GFSEP017": "OFXCBZTA", - "GFSEP018": "OFlSNkhc" + "GFSEP018": "OFlSNkhc", + "GFSL99": "OFqOk9Ww", + "GFT01_01": "OFCnywiC", + "GFT97_01": "OFvPomQf", + "GFT98_01": "OFGzUNbm", + "GFTPU 95A": "OFML2aVd", + "GFTPU for ACE": "OF0FfcAG", + "GFU01_01": "OFDJU6R3", + "GFU99": "OFgbpcy9", + "GFU99_01": "OFCVUEaV", + "GFU99_2": "OFbenYUK", + "GFU99_3": "OFU3zwPc" }, "retired": { + "00001": { + "claims": [ + "Creality/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "00002": { + "claims": [ + "Creality/Generic PLA-Silk" + ], + "successor": "OFi6PfUM" + }, + "00003": { + "claims": [ + "Creality/Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "00004": { + "claims": [ + "Creality/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "00005": { + "claims": [ + "Creality/Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "00006": { + "claims": [ + "Creality/Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "00007": { + "claims": [ + "Creality/Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "00008": { + "claims": [ + "Creality/Generic PA" + ], + "successor": "OFg8ndtj" + }, + "00009": { + "claims": [ + "Creality/Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "00010": { + "claims": [ + "Creality/Generic BVOH" + ], + "successor": "OFo2UF2C" + }, + "00011": { + "claims": [ + "Creality/Generic PVA" + ], + "successor": "OFDvXujf" + }, + "00012": { + "claims": [ + "Creality/Generic HIPS" + ], + "successor": "OFsFon5l" + }, + "00013": { + "claims": [ + "Creality/Generic PET-CF" + ], + "successor": "OFQdaVZS" + }, + "00014": { + "claims": [ + "Creality/Generic PETG-CF" + ], + "successor": "OFoYSJKi" + }, + "00015": { + "claims": [ + "Creality/Generic PA6-CF" + ], + "successor": "OFhTPf6L" + }, + "00016": { + "claims": [ + "Creality/Generic PAHT-CF" + ], + "successor": "OFH7b12v" + }, + "00017": { + "claims": [ + "Creality/Generic PPS" + ], + "successor": "OFq9svOz" + }, + "00018": { + "claims": [ + "Creality/Generic PPS-CF" + ], + "successor": "OF6rdQ6M" + }, + "00019": { + "claims": [ + "Creality/Generic PP" + ], + "successor": "OF1UNk9P" + }, + "00020": { + "claims": [ + "Creality/Generic PET" + ], + "successor": "OF6MOPWx" + }, + "00021": { + "claims": [ + "Creality/Generic PC" + ], + "successor": "OFLakOUI" + }, + "00022": { + "claims": [ + "Creality/Generic PA612-CF" + ], + "successor": "OF8eaY7j" + }, + "00023": { + "claims": [ + "Creality/Generic Support for PA" + ], + "successor": "OFDtop41" + }, + "00024": { + "claims": [ + "Creality/Generic Support for PLA" + ], + "successor": "OFin64Qg" + }, + "00025": { + "claims": [ + "Creality/Generic PA12-CF" + ], + "successor": "OFM4iJlv" + }, + "00026": { + "claims": [ + "Creality/Generic TPU 64D" + ], + "successor": "OFF3cuzT" + }, + "00027": { + "claims": [ + "Creality/Generic PETG-GF" + ], + "successor": "OFyLWVF3" + }, + "00031": { + "claims": [ + "Creality/Generic PP-CF" + ], + "successor": "OFXkm8q1" + }, + "00032": { + "claims": [ + "Creality/Generic PCTG" + ], + "successor": "OFu1evlr" + }, + "00033": { + "claims": [ + "Creality/Generic ASA-CF" + ], + "successor": "OF53eLVD" + }, + "00034": { + "claims": [ + "Creality/Generic PA6-GF" + ], + "successor": "OFh9u9c0" + }, + "00035": { + "claims": [ + "Creality/eSUN PLA-LW" + ], + "successor": "OFi5RSve" + }, + "01001": { + "claims": [ + "Creality/Creality Hyper PLA", + "Creality/Hyper PLA" + ], + "successor": "OFAIrQXu" + }, + "01002": { + "claims": [ + "Creality/Hyper L-W PLA" + ], + "successor": "OF70zbGS" + }, + "01003": { + "claims": [ + "Creality/Hyper Luminous" + ], + "successor": "OFC1PzXz" + }, + "01004": { + "claims": [ + "Creality/Hyper Stardust" + ], + "successor": "OFXnToSX" + }, + "01601": { + "claims": [ + "Creality/Soleyin Ultra PLA" + ], + "successor": "OF02UAVh" + }, + "02001": { + "claims": [ + "Creality/Creality Hyper PLA-CF", + "Creality/Hyper PLA-CF" + ], + "successor": "OFGwT5Av" + }, + "03001": { + "claims": [ + "Creality/Creality Hyper ABS", + "Creality/Hyper ABS" + ], + "successor": "OF8GnyFU" + }, + "04001": { + "claims": [ + "Creality/CR-PLA", + "Creality/Creality Generic PLA" + ], + "successor": "OFACSw9O" + }, + "05001": { + "claims": [ + "Creality/CR-Silk", + "Creality/Creality Silk PLA" + ], + "successor": "OF3OMgrI" + }, + "06001": { + "claims": [ + "Creality/CR-PETG", + "Creality/Creality Generic PETG" + ], + "successor": "OF3WQaKK" + }, + "06002": { + "claims": [ + "Creality/Hyper PETG" + ], + "successor": "OFujZSdh" + }, + "06003": { + "claims": [ + "Creality/Hyper PETG-CF" + ], + "successor": "OFusbWjj" + }, + "06004": { + "claims": [ + "Creality/Hyper PETG-GF" + ], + "successor": "OFLgwqp2" + }, + "06005": { + "claims": [ + "Creality/Soleyin Basic PETG" + ], + "successor": "OFBLktDy" + }, + "07001": { + "claims": [ + "Creality/CR-ABS", + "Creality/Creality Generic ABS" + ], + "successor": "OFGwZmgS" + }, + "07002": { + "claims": [ + "Creality/Hyper PC" + ], + "successor": "OFUF7oA4" + }, + "08001": { + "claims": [ + "Creality/Ender-PLA" + ], + "successor": "OFWao3Ic" + }, + "09001": { + "claims": [ + "Creality/EN-PLA+" + ], + "successor": "OFks6esg" + }, + "09002": { + "claims": [ + "Creality/ENDER FAST PLA" + ], + "successor": "OFfSqS4R" + }, + "10001": { + "claims": [ + "Creality/Creality Generic TPU", + "Creality/HP-TPU" + ], + "successor": "OFGcMkEB" + }, + "1009481135": { + "claims": [ + "Snapmaker/Snapmaker J1 PET" + ], + "successor": "OF8Jl6NT" + }, + "1042511226": { + "claims": [ + "Snapmaker/Snapmaker Dual PETG-CF" + ], + "successor": "OF3msXEa" + }, + "10425112260": { + "claims": [ + "Snapmaker/Snapmaker PETG-CF" + ], + "successor": "OFOwQuZM" + }, + "11001": { + "claims": [ + "Creality/CR-Nylon", + "Creality/Creality Generic PA" + ], + "successor": "OFMqYusc" + }, + "1172603684": { + "claims": [ + "Snapmaker/Snapmaker J1 PETG" + ], + "successor": "OFQMTRc8" + }, + "1181363872": { + "claims": [ + "Snapmaker/Snapmaker Dual PLA Silk" + ], + "successor": "OFyj3m13" + }, + "11813638720": { + "claims": [ + "Snapmaker/Snapmaker PLA Silk" + ], + "successor": "OFWgFOjn" + }, + "1192769348": { + "claims": [ + "Snapmaker/Snapmaker J1 PLA Matte" + ], + "successor": "OFY3AB7j" + }, + "12002": { + "claims": [ + "Creality/Hyper PPA-CF" + ], + "successor": "OFNvBIL0" + }, + "12003": { + "claims": [ + "Creality/Hyper PAHT-CF" + ], + "successor": "OF4APyxe" + }, + "12004": { + "claims": [ + "Creality/Hyper PA612-CF" + ], + "successor": "OFhkN0a7" + }, + "12005": { + "claims": [ + "Creality/Hyper PA6-CF" + ], + "successor": "OFn2GlhY" + }, + "1207881278": { + "claims": [ + "Snapmaker/Snapmaker Dual Breakaway" + ], + "successor": "OFfmHUkQ" + }, + "1210173120": { + "claims": [ + "Snapmaker/Snapmaker J1 PA-CF" + ], + "successor": "OFYEtXuk" + }, + "1223824394": { + "claims": [ + "Snapmaker/Snapmaker J1 ABS" + ], + "successor": "OFy14TRA" + }, + "1247172706": { + "claims": [ + "Snapmaker/Snapmaker Dual ASA" + ], + "successor": "OFKUEXPA" + }, + "12471727060": { + "claims": [ + "Snapmaker/Snapmaker ASA" + ], + "successor": "OF1d7c3A" + }, + "13001": { + "claims": [ + "Creality/CR-PLA Carbon" + ], + "successor": "OFrM4hdm" + }, + "1344609062": { + "claims": [ + "Snapmaker/Snapmaker PVA" + ], + "successor": "OFyhjiNs" + }, + "1355502217": { + "claims": [ + "Snapmaker/Snapmaker PETG-CF" + ], + "successor": "OFOwQuZM" + }, + "1393866034": { + "claims": [ + "Snapmaker/PolyLite Dual PLA", + "Snapmaker/PolyLite J1 PLA", + "Snapmaker/PolyLite PLA" + ], + "successor": "OF5CgdDq" + }, + "14001": { + "claims": [ + "Creality/CR-PLA Matte" + ], + "successor": "OFM0xjBG" + }, + "1417031127": { + "claims": [ + "Snapmaker/Snapmaker Dual PLA" + ], + "successor": "OFZivHGL" + }, + "14170311270": { + "claims": [ + "Snapmaker/Snapmaker PLA" + ], + "successor": "OFlufQpZ" + }, + "141703112701": { + "claims": [ + "Snapmaker/Snapmaker PLA SnapSpeed" + ], + "successor": "OFwhLMs4" + }, + "1417031127011": { + "claims": [ + "Snapmaker/Snapmaker PLA Lite" + ], + "successor": "OFEOnBj6" + }, + "144877656": { + "claims": [ + "Snapmaker/Snapmaker J1 ASA" + ], + "successor": "OFt7SngH" + }, + "1480063856": { + "claims": [ + "Snapmaker/Snapmaker TPU" + ], + "successor": "OF65InrS" + }, + "15001": { + "claims": [ + "Creality/CR-PLA Fluo" + ], + "successor": "OFgpQwkk" + }, + "1528786603": { + "claims": [ + "Snapmaker/Snapmaker J1 PLA Silk" + ], + "successor": "OFQ1KzO8" + }, + "16001": { + "claims": [ + "Creality/CR-TPU" + ], + "successor": "OFG2RkhN" + }, + "1655727393": { + "claims": [ + "Snapmaker/Snapmaker PLA Silk" + ], + "successor": "OFWgFOjn" + }, + "168223792": { + "claims": [ + "Snapmaker/Snapmaker Dual ABS" + ], + "successor": "OFJhT2fd" + }, + "1682237920": { + "claims": [ + "Snapmaker/Snapmaker ABS" + ], + "successor": "OF72YYTd" + }, + "1695556157": { + "claims": [ + "Snapmaker/Snapmaker PLA Eco" + ], + "successor": "OFpu74Qe" + }, + "17001": { + "claims": [ + "Creality/CR-Wood" + ], + "successor": "OFGxC8gB" + }, + "1702147325": { + "claims": [ + "Snapmaker/Snapmaker Dual PLA-CF" + ], + "successor": "OF6ATsCF" + }, + "17021473250": { + "claims": [ + "Snapmaker/Snapmaker PLA-CF" + ], + "successor": "OFhQf8ou" + }, + "18001": { + "claims": [ + "Creality/HP Ultra PLA" + ], + "successor": "OFCJpR7a" + }, + "1895495477": { + "claims": [ + "Snapmaker/Snapmaker PETG" + ], + "successor": "OF4WB37S" + }, + "19001": { + "claims": [ + "Creality/Creality Generic ASA", + "Creality/HP-ASA" + ], + "successor": "OFPHLnoe" + }, + "200803790": { + "claims": [ + "Snapmaker/Snapmaker Dual PLA Eco" + ], + "successor": "OFyPG8v2" + }, + "2008037900": { + "claims": [ + "Snapmaker/Snapmaker PLA Eco" + ], + "successor": "OFpu74Qe" + }, + "2029994346": { + "claims": [ + "Snapmaker/Snapmaker Dual PLA Metal" + ], + "successor": "OFg3cWVt" + }, + "20299943460": { + "claims": [ + "Snapmaker/Snapmaker PLA Metal" + ], + "successor": "OFtybfNX" + }, + "2128577941": { + "claims": [ + "Snapmaker/Snapmaker Dual PET" + ], + "successor": "OFUIfGoh" + }, + "21285779410": { + "claims": [ + "Snapmaker/Snapmaker PET" + ], + "successor": "OFQYaiGg" + }, + "2209001062": { + "claims": [ + "Snapmaker/Snapmaker Dual PETG" + ], + "successor": "OFBlFMVp" + }, + "22090010620": { + "claims": [ + "Snapmaker/Snapmaker PETG" + ], + "successor": "OF4WB37S" + }, + "2549587591": { + "claims": [ + "Snapmaker/Snapmaker PET" + ], + "successor": "OFQYaiGg" + }, + "2742961008": { + "claims": [ + "Snapmaker/Snapmaker ASA" + ], + "successor": "OF1d7c3A" + }, + "29001": { + "claims": [ + "Creality/Hyper Marble" + ], + "successor": "OFLzx3J4" + }, + "2971656290": { + "claims": [ + "Snapmaker/Snapmaker Dual TPU" + ], + "successor": "OFjkdnyN" + }, + "29716562900": { + "claims": [ + "Snapmaker/Snapmaker TPU" + ], + "successor": "OF65InrS" + }, + "297165629001": { + "claims": [ + "Snapmaker/Snapmaker TPU 95A" + ], + "successor": "OFKo87c6" + }, + "3104636980": { + "claims": [ + "Snapmaker/Snapmaker Dual PVA" + ], + "successor": "OFDKIKyw" + }, + "31046369800": { + "claims": [ + "Snapmaker/Snapmaker PVA" + ], + "successor": "OFyhjiNs" + }, + "3177068229": { + "claims": [ + "Snapmaker/Snapmaker PLA" + ], + "successor": "OFlufQpZ" + }, + "3383257822": { + "claims": [ + "Snapmaker/Snapmaker J1 PLA Eco" + ], + "successor": "OFLbdkrE" + }, + "3492897526": { + "claims": [ + "Snapmaker/Snapmaker J1 Breakaway" + ], + "successor": "OFeTATC7" + }, + "3493177425": { + "claims": [ + "Snapmaker/Snapmaker Dual PA-CF" + ], + "successor": "OFRooa0F" + }, + "34931774250": { + "claims": [ + "Snapmaker/Snapmaker PA-CF" + ], + "successor": "OFEmsric" + }, + "3503790988": { + "claims": [ + "Snapmaker/Snapmaker Dual PLA Matte" + ], + "successor": "OFlIsW6f" + }, + "377675245": { + "claims": [ + "Snapmaker/Snapmaker J1 PLA" + ], + "successor": "OFSa39yP" + }, + "3806593857": { + "claims": [ + "Snapmaker/Snapmaker J1 PLA-CF" + ], + "successor": "OFdD5Wbu" + }, + "3811508002": { + "claims": [ + "Snapmaker/Snapmaker ABS" + ], + "successor": "OF72YYTd" + }, + "3864371306": { + "claims": [ + "Snapmaker/Snapmaker PLA-CF" + ], + "successor": "OFhQf8ou" + }, + "4012961186": { + "claims": [ + "Snapmaker/Snapmaker J1 PLA Metal" + ], + "successor": "OFt0JbR7" + }, + "4092268632": { + "claims": [ + "Snapmaker/Snapmaker J1 TPU" + ], + "successor": "OFyrnlUn" + }, + "4227461134": { + "claims": [ + "Snapmaker/Snapmaker Breakaway Support For PLA", + "Snapmaker/Snapmaker J1 PVA" + ], + "successor": "OF6TuVAg" + }, + "4235401834": { + "claims": [ + "Snapmaker/Snapmaker J1 PETG-CF" + ], + "successor": "OFxYB4Sw" + }, + "581236806": { + "claims": [ + "Snapmaker/Snapmaker PA-CF" + ], + "successor": "OFEmsric" + }, "AZ01-1": { "claims": [ "BBL/AliZ PETG-CF", @@ -63,6 +988,66 @@ ], "successor": "OFd4zw5l" }, + "BSFI001": { + "claims": [ + "Blocks/Blocks Generic PLA" + ], + "successor": "OFNYewRS" + }, + "BSFI002": { + "claims": [ + "Blocks/Blocks Generic PETG" + ], + "successor": "OFrgGex8" + }, + "BSFI003": { + "claims": [ + "Blocks/Blocks Generic TPU" + ], + "successor": "OFMEbuBE" + }, + "BSFI004": { + "claims": [ + "Blocks/Blocks Generic ABS" + ], + "successor": "OFma52eS" + }, + "BSFI005": { + "claims": [ + "Blocks/Blocks Generic ASA" + ], + "successor": "OFB9dx27" + }, + "BSFI006": { + "claims": [ + "Blocks/Blocks Generic PA" + ], + "successor": "OFiUSDih" + }, + "BSFI007": { + "claims": [ + "Blocks/Blocks Generic PA-CF" + ], + "successor": "OF8bLDu7" + }, + "BSFI008": { + "claims": [ + "Blocks/Blocks Generic PC" + ], + "successor": "OFahE7HP" + }, + "BSFI009": { + "claims": [ + "Blocks/Blocks Generic PVA" + ], + "successor": "OFiorRtJ" + }, + "BSFI010": { + "claims": [ + "Blocks/Blocks Generic PLA-CF" + ], + "successor": "OFupq0tY" + }, "CX30DB20": { "claims": [ "BBL/COEX TPE 30D", @@ -160,6 +1145,12 @@ ], "successor": "OF0pzFLc" }, + "DFL99": { + "claims": [ + "Volumic/Désactivé" + ], + "successor": "OFCuaCer" + }, "DREMC001": { "claims": [], "successor": null @@ -218,6 +1209,198 @@ "claims": [], "successor": null }, + "E1001": { + "claims": [ + "Creality/eSUN PLA+" + ], + "successor": "OFqINlYj" + }, + "E1002": { + "claims": [ + "Creality/eSUN PLA-Silk" + ], + "successor": "OFIRUqWi" + }, + "E1003": { + "claims": [ + "Creality/eSUN PLA-Matte" + ], + "successor": "OFDETOM6" + }, + "E1004": { + "claims": [ + "Creality/eSUN PLA-Lite" + ], + "successor": "OFhbolij" + }, + "E1005": { + "claims": [ + "Creality/eSUN PLA-CF" + ], + "successor": "OFnHc3D6" + }, + "E1006": { + "claims": [ + "Creality/eSUN PLA-HS" + ], + "successor": "OFOHOf2F" + }, + "E2001": { + "claims": [ + "Creality/eSUN PETG" + ], + "successor": "OF3kBrdA" + }, + "E2002": { + "claims": [ + "Creality/eSUN PETG+HS" + ], + "successor": "OFrdZ0cK" + }, + "E2003": { + "claims": [ + "Creality/eSUN PETG-Basic" + ], + "successor": "OFFbQscs" + }, + "E3001": { + "claims": [ + "Creality/eSUN ABS+" + ], + "successor": "OFTXduCM" + }, + "E4001": { + "claims": [ + "Creality/eSUN ASA+" + ], + "successor": "OFUmS5z5" + }, + "E8001": { + "claims": [ + "Creality/eSUN PET-Basic" + ], + "successor": "OFHaYaB1" + }, + "EABSB00": { + "claims": [ + "Elegoo/Elegoo ABS" + ], + "successor": "OFxOHhZw" + }, + "EASAB00": { + "claims": [ + "Elegoo/Elegoo ASA" + ], + "successor": "OFobDOW5" + }, + "EFL33": { + "claims": [ + "Eryone/Eryone PP-CF" + ], + "successor": "OFbh7HcA" + }, + "EFL40": { + "claims": [ + "Eryone/Eryone PLA-CF" + ], + "successor": "OFilAA3b" + }, + "EFL43": { + "claims": [ + "Eryone/Eryone PETG-CF" + ], + "successor": "OFNstOna" + }, + "EFL71": { + "claims": [ + "Eryone/Eryone PA" + ], + "successor": "OFS4jbj3" + }, + "EFL72": { + "claims": [ + "Eryone/Eryone PA-CF" + ], + "successor": "OFp9wdmf" + }, + "EFL73": { + "claims": [ + "Eryone/Eryone PA-GF" + ], + "successor": "OFkq7rPy" + }, + "EFL81": { + "claims": [ + "Eryone/Eryone ABS-CF" + ], + "successor": "OFQ1zgm3" + }, + "EFL82": { + "claims": [ + "Eryone/Eryone ASA-CF" + ], + "successor": "OFwyt1xt" + }, + "EFL90": { + "claims": [ + "Eryone/Eryone PLA" + ], + "successor": "OFmKU2Ha" + }, + "EFL91": { + "claims": [ + "Eryone/Eryone ABS" + ], + "successor": "OFOzwywz" + }, + "EFL92": { + "claims": [ + "Eryone/Eryone ASA" + ], + "successor": "OFVtIasg" + }, + "EFL93": { + "claims": [ + "Eryone/Eryone PETG" + ], + "successor": "OF8kJys9" + }, + "EFL941": { + "claims": [ + "Eryone/Eryone Silk PLA" + ], + "successor": "OF7nBAd3" + }, + "EFL95": { + "claims": [ + "Eryone/Eryone TPU" + ], + "successor": "OFhUjPA5" + }, + "EPAHTB00": { + "claims": [ + "Elegoo/Elegoo PAHT-CF" + ], + "successor": "OF0h7ERL" + }, + "EPCB00": { + "claims": [ + "Elegoo/Elegoo PC" + ], + "successor": "OFUyDDNv" + }, + "EPETGB00": { + "claims": [ + "Elegoo/Elegoo PETG" + ], + "successor": "OFLcd093" + }, + "EPLAB00": { + "claims": [ + "Elegoo/Elegoo PLA" + ], + "successor": "OFvgE0Zh" + }, "ESN02": { "claims": [ "OrcaFilamentLibrary/eSUN ePLA-LW" @@ -230,6 +1413,12 @@ ], "successor": "OF3kBrdA" }, + "ETPUB00": { + "claims": [ + "Elegoo/Elegoo TPU 95A" + ], + "successor": "OFmhJs5V" + }, "FDPLAST01": { "claims": [ "OrcaFilamentLibrary/FDplast ABS" @@ -266,6 +1455,31 @@ ], "successor": "OFfmZrI3" }, + "FFF01": { + "claims": [ + "Flashforge/Flashforge PLA" + ], + "successor": "OFDKgoqx" + }, + "FFF02": { + "claims": [ + "Flashforge/Flashforge ABS" + ], + "successor": "OF5SJ3jz" + }, + "FFF03": { + "claims": [ + "Flashforge/Flashforge PETG", + "Flashforge/Generic PETG" + ], + "successor": "OFMpxamb" + }, + "FFG01": { + "claims": [ + "Flashforge/Flashforge Generic PLA" + ], + "successor": "OFtTHNTj" + }, "FILAR0001": { "claims": [ "OrcaFilamentLibrary/FilAr PLA Bronce" @@ -680,53 +1894,373 @@ ], "successor": "OFOiJfLM" }, + "GABSB00": { + "claims": [ + "Elegoo/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "GASAB00": { + "claims": [ + "Elegoo/Generic ASA", + "Elegoo/Generic ASA-CF" + ], + "successor": "OFLPAxz3" + }, "GFABS": { "claims": [ "Anycubic/Anycubic ABS" ], - "successor": "OFf2b9wu" + "successor": "OF223rZv" }, "GFL92": { "claims": [ "Anycubic/Anycubic PLA" ], - "successor": "OFgK2Xvv" + "successor": "OFmjN2bc" }, "GFL93": { "claims": [ "Anycubic/Anycubic PLA+" ], - "successor": "OFgrGfPy" + "successor": "OFnmp6rt" }, "GFPLA": { "claims": [ "Anycubic/Anycubic PLA" ], - "successor": "OFgK2Xvv" + "successor": "OFmjN2bc" }, "GFPLA High Speed": { "claims": [ "Anycubic/Anycubic PLA High Speed" ], - "successor": "OFgSK1hL" + "successor": "OFjVOWfJ" }, "GFPLA Matte": { "claims": [ "Anycubic/Anycubic PLA Matte" ], - "successor": "OFvYfHPB" + "successor": "OFIE3vOf" }, "GFPLA Silk": { "claims": [ "Anycubic/Anycubic PLA Silk" ], - "successor": "OFjdTQd6" + "successor": "OFFwJWea" }, "GFPLA+": { "claims": [ "Anycubic/Anycubic PLA+" ], - "successor": "OFgrGfPy" + "successor": "OFnmp6rt" + }, + "GPAB00": { + "claims": [ + "Elegoo/Generic PA" + ], + "successor": "OFg8ndtj" + }, + "GPCB00": { + "claims": [ + "Elegoo/Generic PC" + ], + "successor": "OFLakOUI" + }, + "GPETB00": { + "claims": [ + "Elegoo/Generic PET" + ], + "successor": "OF6MOPWx" + }, + "GPETGB00": { + "claims": [ + "Elegoo/Generic PETG", + "Elegoo/Generic PETG-CF" + ], + "successor": "OFYPdQJh" + }, + "GPLAB00": { + "claims": [ + "Elegoo/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "Generic ABS @E3NG v1.2S": { + "claims": [ + "RH3D/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "Generic ABS @MK4S": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Generic ABS @MK4S 0.6": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Generic ABS @MK4S 0.8": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Generic ABS @MK4S HF0.4": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Generic ABS @MK4S HF0.5": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Generic ABS @MK4S HF0.6": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Generic ABS @MK4S HF0.8": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Generic ASA @E3NG v1.2S": { + "claims": [ + "RH3D/Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "Generic FLEX @MK4S": { + "claims": [ + "Prusa/Prusa Generic TPU" + ], + "successor": "OFbenYUK" + }, + "Generic FLEX @MK4S 0.6": { + "claims": [ + "Prusa/Prusa Generic TPU" + ], + "successor": "OFbenYUK" + }, + "Generic FLEX @MK4S 0.8": { + "claims": [ + "Prusa/Prusa Generic TPU" + ], + "successor": "OFbenYUK" + }, + "Generic PCCF @E3NG v1.2S": { + "claims": [ + "RH3D/Generic PCCF" + ], + "successor": "OFC5f4Ay" + }, + "Generic PETG @E3NG v1.2S": { + "claims": [ + "RH3D/Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "Generic PETG @MK4S": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Generic PETG @MK4S 0.6": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Generic PETG @MK4S 0.8": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Generic PETG @MK4S HF0.4": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Generic PETG @MK4S HF0.5": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Generic PETG @MK4S HF0.6": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Generic PETG @MK4S HF0.8": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Generic PLA @E3NG v1.2S": { + "claims": [ + "RH3D/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "Generic PLA @MK4S": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Generic PLA @MK4S 0.6": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Generic PLA @MK4S 0.8": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Generic PLA @MK4S HF0.4": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Generic PLA @MK4S HF0.5": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Generic PLA @MK4S HF0.6": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Generic PLA @MK4S HF0.8": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Generic PLA Silk @MK4S": { + "claims": [ + "Prusa/Prusa Generic PLA Silk" + ], + "successor": "OFHFZ1Te" + }, + "Generic PLA Silk @MK4S 0.6": { + "claims": [ + "Prusa/Prusa Generic PLA Silk" + ], + "successor": "OFHFZ1Te" + }, + "Generic PLA Silk @MK4S 0.8": { + "claims": [ + "Prusa/Prusa Generic PLA Silk" + ], + "successor": "OFHFZ1Te" + }, + "Generic TPU @E3NG v1.2S": { + "claims": [ + "RH3D/Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "IQM1": { + "claims": [ + "iQ/Fiberthree PACF Pro P1" + ], + "successor": "OFjUGUIK" + }, + "IQM1011": { + "claims": [ + "iQ/VXL90 TiQ2 P2" + ], + "successor": "OFOJPAAS" + }, + "IQM2": { + "claims": [ + "iQ/Material4Print ABS Natur P1" + ], + "successor": "OFJWKoYG" + }, + "IQM3": { + "claims": [ + "iQ/Polymaker PETG Polymax black P1" + ], + "successor": "OFaeIx7W" + }, + "IQM7": { + "claims": [ + "iQ/Fiberthree PACF Pro P2" + ], + "successor": "OF6kj4jI" + }, + "LHF_abs": { + "claims": [ + "LH/LHS ABS" + ], + "successor": "OFztQ7rO" + }, + "LHF_asa": { + "claims": [ + "LH/LHS ASA" + ], + "successor": "OFaP2SsH" + }, + "LHF_ftpuf": { + "claims": [ + "LH/LHS TPU Foamy 78A" + ], + "successor": "OFngcE81" + }, + "LHF_pccf": { + "claims": [ + "LH/LHS PC CF" + ], + "successor": "OFu0fjPJ" + }, + "LHF_pctg": { + "claims": [ + "LH/LHS PCTG" + ], + "successor": "OFBJAdLw" + }, + "LHF_petg": { + "claims": [ + "LH/LHS PETG" + ], + "successor": "OFRJ325z" + }, + "LHF_pla": { + "claims": [ + "LH/LHS PLA" + ], + "successor": "OFyoBZdm" + }, + "LHF_ptpu_pl": { + "claims": [ + "LH/LHS TPU" + ], + "successor": "OFIZMQwM" }, "NIT01": { "claims": [ @@ -953,6 +2487,10 @@ ], "successor": "OFg57Nmc" }, + "OGFC99": { + "claims": [], + "successor": "OFLakOUI" + }, "OGFG00": { "claims": [ "OrcaFilamentLibrary/Bambu PETG Basic" @@ -989,6 +2527,10 @@ ], "successor": "OFu1evlr" }, + "OGFG99": { + "claims": [], + "successor": "OFYPdQJh" + }, "OGFGG300": { "claims": [ "OrcaFilamentLibrary/GreenGate3D PETG" @@ -1080,6 +2622,13 @@ ], "successor": "OFmpMwxS" }, + "OGFL96": { + "claims": [ + "Flashforge/Generic PLA Silk", + "Sovol/Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, "OGFL98": { "claims": [ "OrcaFilamentLibrary/Generic PLA-CF" @@ -1149,6 +2698,10 @@ ], "successor": "OFQLcbps" }, + "OGFN99": { + "claims": [], + "successor": "OFg8ndtj" + }, "OGFNMK00": { "claims": [ "OrcaFilamentLibrary/Numakers PLA+" @@ -1396,6 +2949,12 @@ ], "successor": "OFLJ8S6I" }, + "OGFSNL08": { + "claims": [ + "Sovol/SUNLU PETG" + ], + "successor": "OF2GCW1l" + }, "OGFT01": { "claims": [ "OrcaFilamentLibrary/Bambu PET-CF" @@ -1431,42 +2990,648 @@ ], "successor": "OFDvqJ6n" }, + "P1001": { + "claims": [ + "Creality/Panchroma PLA Satin" + ], + "successor": "OFPkCJKE" + }, + "P1002": { + "claims": [ + "Creality/PolySonic PLA Pro" + ], + "successor": "OFKbdiiJ" + }, + "P1003": { + "claims": [ + "Creality/Panchroma PLA Matte" + ], + "successor": "OFrOh600" + }, + "P1004": { + "claims": [ + "Creality/PolySonic PLA" + ], + "successor": "OF66KUAN" + }, "P11851ba": { "claims": [ "Artillery/Artillery PET" ], - "successor": "OFw0qp7w" + "successor": "OFb5EEM3" }, "P284941e": { "claims": [ "Artillery/Artillery PETG", "Artillery/Artillery PETG Basic" ], - "successor": "OFEYKrjb" + "successor": "OFilnglt" }, "P2fbf0c0": { "claims": [ "Artillery/Artillery TPU" ], - "successor": "OFTbsWVg" + "successor": "OFcJDtTx" }, "P39db358": { "claims": [ "Artillery/Artillery ABS" ], - "successor": "OFw1S8lL" + "successor": "OFgXgt98" + }, + "P510cfa0": { + "claims": [ + "Cubicon/Cubicon PLA" + ], + "successor": "OFEwRwmL" + }, + "P510cfa1": { + "claims": [ + "Cubicon/Cubicon PLA+" + ], + "successor": "OF7tt7DO" + }, + "P510cfa2": { + "claims": [ + "Cubicon/Cubicon PLAi21" + ], + "successor": "OFRhBryT" + }, + "P510cfb0": { + "claims": [ + "Cubicon/Cubicon ABS" + ], + "successor": "OFpDo5Ix" + }, + "P510cfb1": { + "claims": [ + "Cubicon/Cubicon ABS-A100" + ], + "successor": "OFy8tYJE" + }, + "P510cfb2": { + "claims": [ + "Cubicon/Cubicon ABSk" + ], + "successor": "OForhBi4" + }, + "P510cfc0": { + "claims": [ + "Cubicon/Cubicon PETG" + ], + "successor": "OFoBTKmn" + }, + "P510cfd0": { + "claims": [ + "Cubicon/Cubicon PA-CF" + ], + "successor": "OFiEz2XI" + }, + "P510eff9": { + "claims": [ + "Ginger Additive/Ginger Generic PETG" + ], + "successor": "OFsGqI4y" }, "P8163162": { "claims": [ "Artillery/Artillery PVA" ], - "successor": "OFc2SnEp" + "successor": "OFkx5MEe" }, "P87436f6": { "claims": [ "Artillery/Artillery ASA" ], - "successor": "OFtmT4Nd" + "successor": "OF5YVJXH" + }, + "Pfcf9c4c": { + "claims": [ + "Artillery/Artillery PLA" + ], + "successor": "OFzY7N3Z" + }, + "Prusa Generic ABS @CORE One": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Prusa Generic ABS @CORE One 0.6": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Prusa Generic ABS @CORE One 0.8": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Prusa Generic ABS @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Prusa Generic ABS @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Prusa Generic ABS @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Prusa Generic ABS @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFvGc67v" + }, + "Prusa Generic ASA @CORE One": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusa Generic ASA @CORE One 0.6": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusa Generic ASA @CORE One 0.8": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusa Generic ASA @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusa Generic ASA @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusa Generic ASA @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusa Generic ASA @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusa Generic PETG @CORE One": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Prusa Generic PETG @CORE One 0.6": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Prusa Generic PETG @CORE One 0.8": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Prusa Generic PETG @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Prusa Generic PETG @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Prusa Generic PETG @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Prusa Generic PETG @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OF1Id239" + }, + "Prusa Generic PLA @CORE One": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Prusa Generic PLA @CORE One 0.6": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Prusa Generic PLA @CORE One 0.8": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Prusa Generic PLA @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Prusa Generic PLA @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Prusa Generic PLA @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Prusa Generic PLA @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFiCHnso" + }, + "Prusa Generic PLA Silk @CORE One": { + "claims": [ + "Prusa/Prusa Generic PLA Silk" + ], + "successor": "OFHFZ1Te" + }, + "Prusa Generic PLA Silk @CORE One 0.6": { + "claims": [ + "Prusa/Prusa Generic PLA Silk" + ], + "successor": "OFHFZ1Te" + }, + "Prusa Generic PLA Silk @CORE One 0.8": { + "claims": [ + "Prusa/Prusa Generic PLA Silk" + ], + "successor": "OFHFZ1Te" + }, + "Prusa Generic TPU @CORE One": { + "claims": [ + "Prusa/Prusa Generic TPU" + ], + "successor": "OFbenYUK" + }, + "Prusa Generic TPU @CORE One 0.6": { + "claims": [ + "Prusa/Prusa Generic TPU" + ], + "successor": "OFbenYUK" + }, + "Prusa Generic TPU @CORE One 0.8": { + "claims": [ + "Prusa/Prusa Generic TPU" + ], + "successor": "OFbenYUK" + }, + "Prusament ASA @CORE One": { + "claims": [ + "Prusa/Prusament ASA" + ], + "successor": "OFmFwUWM" + }, + "Prusament ASA @CORE One 0.6": { + "claims": [ + "Prusa/Prusament ASA" + ], + "successor": "OFmFwUWM" + }, + "Prusament ASA @CORE One 0.8": { + "claims": [ + "Prusa/Prusament ASA" + ], + "successor": "OFmFwUWM" + }, + "Prusament ASA @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusament ASA" + ], + "successor": "OFmFwUWM" + }, + "Prusament ASA @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusament ASA" + ], + "successor": "OFmFwUWM" + }, + "Prusament ASA @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusament ASA" + ], + "successor": "OFmFwUWM" + }, + "Prusament ASA @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusament ASA" + ], + "successor": "OFmFwUWM" + }, + "Prusament ASA @MK4S": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusament ASA @MK4S 0.6": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusament ASA @MK4S 0.8": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusament ASA @MK4S HF0.4": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusament ASA @MK4S HF0.5": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusament ASA @MK4S HF0.6": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusament ASA @MK4S HF0.8": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFoJcr46" + }, + "Prusament PA-CF @CORE One": { + "claims": [ + "Prusa/Prusament PA-CF" + ], + "successor": "OF54SvEe" + }, + "Prusament PA-CF @CORE One 0.6": { + "claims": [ + "Prusa/Prusament PA-CF" + ], + "successor": "OF54SvEe" + }, + "Prusament PA-CF @CORE One 0.8": { + "claims": [ + "Prusa/Prusament PA-CF" + ], + "successor": "OF54SvEe" + }, + "Prusament PC Blend @CORE One": { + "claims": [ + "Prusa/Prusament PC Blend" + ], + "successor": "OFvDbkFq" + }, + "Prusament PC Blend @CORE One 0.6": { + "claims": [ + "Prusa/Prusament PC Blend" + ], + "successor": "OFvDbkFq" + }, + "Prusament PC Blend @CORE One 0.8": { + "claims": [ + "Prusa/Prusament PC Blend" + ], + "successor": "OFvDbkFq" + }, + "Prusament PC Blend @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusament PC Blend" + ], + "successor": "OFvDbkFq" + }, + "Prusament PC Blend @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusament PC Blend" + ], + "successor": "OFvDbkFq" + }, + "Prusament PC Blend @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusament PC Blend" + ], + "successor": "OFvDbkFq" + }, + "Prusament PC Blend @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusament PC Blend" + ], + "successor": "OFvDbkFq" + }, + "Prusament PC-CF @CORE One": { + "claims": [ + "Prusa/Prusament PC-CF" + ], + "successor": "OFjz0a3m" + }, + "Prusament PC-CF @CORE One 0.6": { + "claims": [ + "Prusa/Prusament PC-CF" + ], + "successor": "OFjz0a3m" + }, + "Prusament PC-CF @CORE One 0.8": { + "claims": [ + "Prusa/Prusament PC-CF" + ], + "successor": "OFjz0a3m" + }, + "Prusament PETG @CORE One": { + "claims": [ + "Prusa/Prusament PETG" + ], + "successor": "OFkR8E2c" + }, + "Prusament PETG @CORE One 0.6": { + "claims": [ + "Prusa/Prusament PETG" + ], + "successor": "OFkR8E2c" + }, + "Prusament PETG @CORE One 0.8": { + "claims": [ + "Prusa/Prusament PETG" + ], + "successor": "OFkR8E2c" + }, + "Prusament PETG @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusament PETG" + ], + "successor": "OFkR8E2c" + }, + "Prusament PETG @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusament PETG" + ], + "successor": "OFkR8E2c" + }, + "Prusament PETG @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusament PETG" + ], + "successor": "OFkR8E2c" + }, + "Prusament PETG @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusament PETG" + ], + "successor": "OFkR8E2c" + }, + "Prusament PLA @CORE One": { + "claims": [ + "Prusa/Prusament PLA" + ], + "successor": "OFnO4wnf" + }, + "Prusament PLA @CORE One 0.6": { + "claims": [ + "Prusa/Prusament PLA" + ], + "successor": "OFnO4wnf" + }, + "Prusament PLA @CORE One 0.8": { + "claims": [ + "Prusa/Prusament PLA" + ], + "successor": "OFnO4wnf" + }, + "Prusament PLA @CORE One HF 0.4": { + "claims": [ + "Prusa/Prusament PLA" + ], + "successor": "OFnO4wnf" + }, + "Prusament PLA @CORE One HF 0.5": { + "claims": [ + "Prusa/Prusament PLA" + ], + "successor": "OFnO4wnf" + }, + "Prusament PLA @CORE One HF 0.6": { + "claims": [ + "Prusa/Prusament PLA" + ], + "successor": "OFnO4wnf" + }, + "Prusament PLA @CORE One HF 0.8": { + "claims": [ + "Prusa/Prusament PLA" + ], + "successor": "OFnO4wnf" + }, + "Prusament PVB @CORE One": { + "claims": [ + "Prusa/Prusament PVB" + ], + "successor": "OFh7mvPO" + }, + "Prusament PVB @CORE One 0.6": { + "claims": [ + "Prusa/Prusament PVB" + ], + "successor": "OFh7mvPO" + }, + "Prusament PVB @CORE One 0.8": { + "claims": [ + "Prusa/Prusament PVB" + ], + "successor": "OFh7mvPO" + }, + "Prusament rPLA @CORE One": { + "claims": [ + "Prusa/Prusament rPLA" + ], + "successor": "OFWRITFw" + }, + "Prusament rPLA @CORE One 0.6": { + "claims": [ + "Prusa/Prusament rPLA" + ], + "successor": "OFWRITFw" + }, + "Prusament rPLA @CORE One 0.8": { + "claims": [ + "Prusa/Prusament rPLA" + ], + "successor": "OFWRITFw" + }, + "SMCFB001": { + "claims": [ + "SeeMeCNC/SeeMeCNC ABS" + ], + "successor": "OFR0gODA" + }, + "SMCFG001": { + "claims": [ + "SeeMeCNC/SeeMeCNC PETG" + ], + "successor": "OFxDHUX8" + }, + "SMCFG002": { + "claims": [ + "SeeMeCNC/SeeMeCNC PETG-CF" + ], + "successor": "OFaRjiIm" + }, + "SMCFL001": { + "claims": [ + "SeeMeCNC/SeeMeCNC PLA" + ], + "successor": "OFbSChKb" + }, + "SMCFN001": { + "claims": [ + "SeeMeCNC/SeeMeCNC PA-CF" + ], + "successor": "OF0b7M1z" + }, + "SMCFU001": { + "claims": [ + "SeeMeCNC/SeeMeCNC TPU" + ], + "successor": "OFyFyLIp" }, "VLMNT01": { "claims": [ diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index 3945c2ec8d..6f12554f14 100644 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -60,6 +60,11 @@ Run from anywhere: python3 scripts/assign_filament_ids.py drops listed never-shipped ids from lineage instead) --add-hint "OLD=NEW" record a cross-island succession hint (standalone) + --retire "OLD=NEW" + retire a vanished non-island shipped id with an explicit + successor (standalone; for lineage the claim vote can no + longer see because the claims migrated while another + declarer kept the id alive) --remint VENDOR re-derive VENDOR's declared ids from their triples and rewrite mismatches in place (repeatable) --drop-redundant-ids VENDOR @@ -1121,6 +1126,69 @@ def add_hints(pairs, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): return 0 +def retire_ids(pairs, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): + """--retire "OLD=NEW": retire a vanished non-island id with an explicit successor. + + For shipped ids whose lineage the claim vote can no longer see: the id + vanished from the tree in an earlier phase's shadow — another declarer kept + it alive while its claims migrated — so no --update-snapshot run ever saw + the id vanish while its claims could still vote. OLD must be absent from + the tree (declared or effective) and outside every reserved id space + (island ids forward via --add-hint; user-custom ids are never system ids), + and must not already be retired or hinted. NEW must be a live tree id. + Appends {"claims": [], "successor": NEW}. All pairs validate before + anything is written. Returns 0 on success. + """ + _utf8_console() + analysis = analyze_tree(profiles_dir) + errors = 0 + for msg in analysis["read_errors"]: + print_error(msg) + errors += 1 + ledger = load_ledger(retired_path) + live = set(analysis["ids"]) + declared_anywhere = set() + for vids in analysis["declared_ids"].values(): + declared_anywhere |= set(vids) + parsed = [] + for pair in pairs: + if "=" not in pair: + print_error(f'--retire expects "OLD=NEW", got "{pair}"') + errors += 1 + continue + old, new = pair.split("=", 1) + is_reserved, _island = reserved_space_owner(old) + if old in ledger["retired"]: + print_error(f'--retire: "{old}" is already retired') + errors += 1 + elif old in ledger["hints"]: + print_error(f'--retire: "{old}" is a hint key; it already forwards') + errors += 1 + elif is_reserved: + print_error( + f'--retire: "{old}" sits in a reserved id space; island ids ' + f"forward via --add-hint, user-custom ids are never retired") + errors += 1 + elif old in live or old in declared_anywhere: + print_error( + f'--retire: "{old}" still lives in the tree; re-mint or delete ' + f"its declarers first (an id that vanishes normally gets its " + f"successor voted by --update-snapshot)") + errors += 1 + elif new not in live: + print_error(f'--retire: successor "{new}" is not a live tree id') + errors += 1 + else: + parsed.append((old, new)) + if errors: + return 1 + for old, new in parsed: + ledger["retired"][old] = {"claims": [], "successor": new} + print_info(f'retired: "{old}" -> "{new}"') + write_ledger(retired_path, {"retired": ledger["retired"], "hints": ledger["hints"]}) + return 0 + + # --------------------------------------------------------------------------- # Byte-preserving profile edits # --------------------------------------------------------------------------- @@ -1336,6 +1404,9 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR, retired_path=RETIRED_ triple; rewrite mismatching declarations in place (byte-preserving). Never touches the snapshot — run --update-snapshot afterwards and review the diff. + A declaration already equal to ANY salt iteration of its own triple is + mint-conformant (check 3) and left alone — deliberate salt splits (distinct + presets of one product kept apart for per-printer AMS matching) survive. A candidate id is blocked when it is a retired key, a hints key, or occurs in the tree with any triple set other than exactly {T}. Equal-triple reuse is convergence: the same product must end up under the same id everywhere. @@ -1393,6 +1464,13 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR, retired_path=RETIRED_ if is_island_declaration(vendor, fid): continue scanned += 1 + # Any salt iteration of the declarer's own triple is already + # mint-conformant (check 3) — leave it. This keeps deliberate salt + # splits (two presets of one product that must stay distinct for + # per-printer AMS matching, validator -f) stable across re-mints. + if fid in {generate_filament_id(*rec["triple"], salt=s) + for s in range(MAX_CHECK_SALT + 1)}: + continue want = want_id(rec["triple"]) if fid == want: continue @@ -1481,6 +1559,10 @@ def main(argv=None): help="record a cross-island succession hint (island-owned " "live id -> live id) in the shipped ledger; standalone, " "repeatable") + parser.add_argument("--retire", metavar='"OLD=NEW"', action="append", + help="retire a vanished non-island shipped id with an " + "explicit successor (for lineage the claim vote can " + "no longer see); standalone, repeatable") parser.add_argument("--remint", metavar="VENDOR", action="append", help="re-derive VENDOR's declared filament_ids from their " "triples and rewrite mismatches in place; repeatable") @@ -1507,10 +1589,16 @@ def main(argv=None): return 0 if args.add_hint: - if args.update_snapshot or args.check or args.remint or args.drop_redundant_ids: + if (args.update_snapshot or args.check or args.remint + or args.drop_redundant_ids or args.retire): parser.error("--add-hint runs standalone") return add_hints(args.add_hint, args.profiles, RETIRED_PATH) + if args.retire: + if args.update_snapshot or args.check or args.remint or args.drop_redundant_ids: + parser.error("--retire runs standalone") + return retire_ids(args.retire, args.profiles, RETIRED_PATH) + if args.remint: if args.update_snapshot or args.check or args.drop_redundant_ids: parser.error("--remint cannot be combined with other modes") diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 69e671d74d..4349592b25 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1,39 +1,6 @@ { "alias_exceptions": [ - "Anker/Anker Generic PC @base", - "Anycubic/Anycubic Generic PC", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", - "BBL/Bambu PC @base", - "BBL/Bambu PC FR @base", "BBL/COEX NYLEX UNFILLED @BBL X1C", - "BBL/Generic PC @base", - "Blocks/Blocks Generic PC", - "Creality/Creality Generic PC", - "Creality/Generic PC @K1 Max_CFS-C-all", - "Creality/Generic PC @K1C-all", - "Creality/Generic PC @K1C_CFS-C-all", - "Creality/Generic PC @K1_CFS-C-all", - "Creality/Generic PC @K2 Plus-all", - "Creality/Generic PC @K2 Pro-all", - "Creality/Hyper PC @K2 Plus-all", - "Creality/Hyper PC @K2 Pro-all", - "Custom/Generic PC @MyToolChanger", - "Custom/Generic PETG @MyToolChanger", - "Custom/Generic PLA @MyToolChanger", - "Custom/Generic PLA-CF @MyToolChanger", - "Custom/Generic PVA @MyToolChanger", - "Custom/Generic TPU @MyToolChanger", - "Elegoo/Elegoo PC @base", - "Elegoo/Generic PC @base", - "FLSun/FLSun Generic PC", "Flashforge/Flashforge ABS Basic @FF C5", "Flashforge/Flashforge ABS Basic @FF C5P", "Flashforge/Flashforge ABS-GF @FF C5", @@ -104,16 +71,9 @@ "Flashforge/Generic TPU-90A @FF C5P", "Flashforge/Generic TPU-95A @FF C5", "Flashforge/Generic TPU-95A @FF C5P", - "FlyingBear/FlyingBear Generic PC", - "InfiMech/InfiMech Generic PC", "Lulzbot/Lulzbot 2.85mm ABS", "Lulzbot/Lulzbot 2.85mm PETG", "Lulzbot/Lulzbot 2.85mm PLA", - "OrcaArena/Arena PC @base", - "OrcaArena/OrcaArena Generic PC @base", - "Qidi/Qidi Generic PC", - "Ratrig/RatRig Generic PC", - "SecKit/SecKit Generic PC", "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", @@ -142,31 +102,10 @@ "Sovol/Sovol Zero PLA Basic HS Nozzle", "Sovol/Sovol Zero PLA Silk", "Sovol/Sovol Zero PLA Silk HS Nozzle", - "Sovol/Sovol Zero TPU", - "Tiertime/Tiertime Generic PC", - "Tiertime/Tiertime Generic PC@300HS", - "Tiertime/Tiertime PC", - "Tiertime/Tiertime PC@300HS", - "Volumic/Volumic PC", - "Volumic/Volumic PC (Performance)", - "Vzbot/Vzbot Generic PC", - "re3D/re3D PC", - "re3D/re3D PC @0.4 nozzle", - "re3D/re3D PC @0.8 nozzle" + "Sovol/Sovol Zero TPU" ], "id_overrides": [ - "Anker/Anker Generic PC @base", "Anycubic/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic Generic PC", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", "Anycubic/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", @@ -223,18 +162,16 @@ "Artillery/Artillery PVA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery TPU", "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "BBL/Bambu PC @base", - "BBL/Bambu PC FR @base", - "BBL/Generic PC @base", "BBL/Generic SBS", - "Blocks/Blocks Generic PC", + "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", "Chuanying/Chuanying Generic HIPS", "Chuanying/Chuanying Generic PVA", + "Chuanying/Chuanying PETG @Chuanying X1 0.25 Nozzle", "Co Print/CoPrint Generic ABS", "Co Print/CoPrint Generic PETG", "Co Print/CoPrint Generic TPU", + "Comgrow/Comgrow T300 PLA", "Creality/Creality Generic ASA-CF @Hi-all", - "Creality/Creality Generic PC", "Creality/Creality Generic PETG-CF @Hi-all", "Creality/Creality Generic PLA High Speed @Ender-3V3-all", "Creality/Creality Generic PLA High Speed @Hi-all", @@ -249,14 +186,6 @@ "Creality/Creality Generic PLA Silk @K1-all", "Creality/Creality Generic PLA Silk @K2-all", "Creality/Creality Generic PLA Wood @Hi-all", - "Creality/Generic PC @K1 Max_CFS-C-all", - "Creality/Generic PC @K1C-all", - "Creality/Generic PC @K1C_CFS-C-all", - "Creality/Generic PC @K1_CFS-C-all", - "Creality/Generic PC @K2 Plus-all", - "Creality/Generic PC @K2 Pro-all", - "Creality/Hyper PC @K2 Plus-all", - "Creality/Hyper PC @K2 Pro-all", "Cubicon/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", @@ -271,15 +200,12 @@ "Cubicon/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PA-CF @base", "Cubicon/Cubicon PC @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PC @base", "Cubicon/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PETG @base", "Cubicon/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle", @@ -291,17 +217,10 @@ "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PLAi21 @base", - "Custom/Generic PC @MyToolChanger", - "Custom/Generic PETG @MyToolChanger", - "Custom/Generic PLA @MyToolChanger", - "Custom/Generic PLA-CF @MyToolChanger", - "Custom/Generic PVA @MyToolChanger", - "Custom/Generic TPU @MyToolChanger", "Dremel/Dremel Generic PLA @3D20 all", "Dremel/Dremel Generic PLA @3D40 all", "Dremel/Dremel Generic PLA @3D45 all", "Elegoo/Elegoo ASA-CF @base", - "Elegoo/Elegoo PC @base", "Elegoo/Elegoo PC-FR @base", "Elegoo/Elegoo PET-CF @base", "Elegoo/Elegoo PETG HF @base", @@ -325,17 +244,27 @@ "Elegoo/Elegoo Rapid PLA+ @base", "Elegoo/Elegoo Rapid TPU 95A @base", "Elegoo/Generic ABS-CF @Elegoo Centauri", + "Elegoo/Generic ASA-CF @Elegoo Centauri", "Elegoo/Generic PA6-CF @Elegoo", - "Elegoo/Generic PC @base", "Elegoo/Generic PC-CF @Elegoo", "Elegoo/Generic PET-CF @Elegoo Centauri", "Elegoo/Generic PETG PRO @Elegoo", + "Elegoo/Generic PETG-CF @Elegoo Centauri", "Elegoo/Generic PLA Matte @Elegoo", - "FLSun/FLSun Generic PC", + "FLSun/FLSun S1 ABS", + "FLSun/FLSun S1 ASA", + "FLSun/FLSun S1 PETG", + "FLSun/FLSun S1 PLA Generic", "FLSun/FLSun S1 PLA High Speed", "FLSun/FLSun S1 PLA Silk", + "FLSun/FLSun S1 TPU", + "FLSun/FLSun T1 ABS", + "FLSun/FLSun T1 ASA", + "FLSun/FLSun T1 PETG", + "FLSun/FLSun T1 PLA Generic", "FLSun/FLSun T1 PLA High Speed", "FLSun/FLSun T1 PLA Silk", + "FLSun/FLSun T1 TPU", "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", "Flashforge/FlashForge PC @FF G4 0.6 nozzle", "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", @@ -350,6 +279,7 @@ "Flashforge/FlashForge PPS @FF G4P 0.8 HF nozzle", "Flashforge/FlashForge PPS-CF @FF G4 0.6 nozzle", "Flashforge/FlashForge PPS-CF @FF G4P 0.6 nozzle", + "Flashforge/Flashforge ABS @FF AD5M 0.25 Nozzle", "Flashforge/Flashforge ABS Basic", "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle", "Flashforge/Flashforge ABS Basic @FF AD5X", @@ -495,6 +425,7 @@ "Flashforge/Flashforge PET-CF", "Flashforge/Flashforge PET-CF @FF C5", "Flashforge/Flashforge PET-CF @FF C5P", + "Flashforge/Flashforge PETG @FF AD5M 0.25 Nozzle", "Flashforge/Flashforge PETG Basic", "Flashforge/Flashforge PETG Basic @FF AD5M 0.25 nozzle", "Flashforge/Flashforge PETG Pro", @@ -803,6 +734,7 @@ "Flashforge/FusRock S-Multi @FF C5P", "Flashforge/FusRock S-PAHT @FF C5", "Flashforge/FusRock S-PAHT @FF C5P", + "Flashforge/Generic ABS @Flashforge AD4", "Flashforge/Generic ASA @Flashforge AD4", "Flashforge/Generic PET @FF G4", "Flashforge/Generic PET @FF G4 0.6 HF nozzle", @@ -812,6 +744,7 @@ "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", "Flashforge/Generic PET @FF G4P 0.6 nozzle", "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", + "Flashforge/Generic PETG @Flashforge AD4", "Flashforge/Generic PETG-CF10 @Flashforge AD4", "Flashforge/Generic PLA @Flashforge AD4", "Flashforge/Generic PLA High Speed @Flashforge AD4", @@ -835,19 +768,12 @@ "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", "Flashforge/Polymaker Generic CoPA", "Flashforge/Polymaker Generic S1", - "FlyingBear/FlyingBear Generic PC", - "InfiMech/InfiMech Generic PC", "Lulzbot/Lulzbot 2.85mm ABS", "Lulzbot/Lulzbot 2.85mm PETG", "Lulzbot/Lulzbot 2.85mm PLA", - "OrcaArena/Arena PC @base", - "OrcaArena/OrcaArena Generic PC @base", "OrcaFilamentLibrary/AliZ PETG-CF @base", "OrcaFilamentLibrary/AliZ PETG-Metal @base", - "OrcaFilamentLibrary/Bambu PC @base", - "OrcaFilamentLibrary/Bambu PC FR @base", "OrcaFilamentLibrary/Elegoo ASA-CF @base", - "OrcaFilamentLibrary/Elegoo PC @base", "OrcaFilamentLibrary/Elegoo PC-FR @base", "OrcaFilamentLibrary/Elegoo PET-CF @base", "OrcaFilamentLibrary/Elegoo PETG HF @base", @@ -930,121 +856,9 @@ "OrcaFilamentLibrary/FilAr PLA-mate Uva", "OrcaFilamentLibrary/FilAr PLA-mate Verde", "OrcaFilamentLibrary/FilAr PLA-mate Violeta", - "OrcaFilamentLibrary/Generic PC @System", "OrcaFilamentLibrary/PolyLite Dual PLA @base", "OrcaFilamentLibrary/PolyTerra Dual PLA @System", - "Prusa/Prusa Generic ABS @CORE One 0.6", - "Prusa/Prusa Generic ABS @CORE One 0.8", - "Prusa/Prusa Generic ABS @CORE One HF 0.4", - "Prusa/Prusa Generic ABS @CORE One HF 0.5", - "Prusa/Prusa Generic ABS @CORE One HF 0.6", - "Prusa/Prusa Generic ABS @CORE One HF 0.8", - "Prusa/Prusa Generic ABS @MK4S 0.6", - "Prusa/Prusa Generic ABS @MK4S 0.8", - "Prusa/Prusa Generic ABS @MK4S HF0.4", - "Prusa/Prusa Generic ABS @MK4S HF0.5", - "Prusa/Prusa Generic ABS @MK4S HF0.6", - "Prusa/Prusa Generic ABS @MK4S HF0.8", - "Prusa/Prusa Generic ASA @CORE One", - "Prusa/Prusa Generic ASA @CORE One 0.6", - "Prusa/Prusa Generic ASA @CORE One 0.8", - "Prusa/Prusa Generic ASA @CORE One HF 0.4", - "Prusa/Prusa Generic ASA @CORE One HF 0.5", - "Prusa/Prusa Generic ASA @CORE One HF 0.6", - "Prusa/Prusa Generic ASA @CORE One HF 0.8", - "Prusa/Prusa Generic ASA @MK3.5", - "Prusa/Prusa Generic ASA @MK3.5 0.25", - "Prusa/Prusa Generic ASA @MK3.5 0.6", - "Prusa/Prusa Generic ASA @MK3.5 0.8", - "Prusa/Prusa Generic ASA @MK4S", - "Prusa/Prusa Generic ASA @MK4S 0.6", - "Prusa/Prusa Generic ASA @MK4S 0.8", - "Prusa/Prusa Generic ASA @MK4S HF0.4", - "Prusa/Prusa Generic ASA @MK4S HF0.5", - "Prusa/Prusa Generic ASA @MK4S HF0.6", - "Prusa/Prusa Generic ASA @MK4S HF0.8", - "Prusa/Prusa Generic ASA HF @MK3.5", - "Prusa/Prusa Generic ASA HF @MK3.5 0.6", - "Prusa/Prusa Generic ASA HF @MK3.5 0.8", - "Prusa/Prusa Generic ASA HF @base", - "Prusa/Prusa Generic PC @MK3.5", - "Prusa/Prusa Generic PC @MK3.5 0.25", - "Prusa/Prusa Generic PC @MK3.5 0.6", - "Prusa/Prusa Generic PC @MK3.5 0.8", - "Prusa/Prusa Generic PC HF @MK3.5", - "Prusa/Prusa Generic PC HF @MK3.5 0.6", - "Prusa/Prusa Generic PC HF @MK3.5 0.8", - "Prusa/Prusa Generic PC HF @base", - "Prusa/Prusa Generic PETG @CORE One 0.6", - "Prusa/Prusa Generic PETG @CORE One 0.8", - "Prusa/Prusa Generic PETG @CORE One HF 0.4", - "Prusa/Prusa Generic PETG @CORE One HF 0.5", - "Prusa/Prusa Generic PETG @CORE One HF 0.6", - "Prusa/Prusa Generic PETG @CORE One HF 0.8", - "Prusa/Prusa Generic PETG @MK4S 0.6", - "Prusa/Prusa Generic PETG @MK4S 0.8", - "Prusa/Prusa Generic PETG @MK4S HF0.4", - "Prusa/Prusa Generic PETG @MK4S HF0.5", - "Prusa/Prusa Generic PETG @MK4S HF0.6", - "Prusa/Prusa Generic PETG @MK4S HF0.8", - "Prusa/Prusa Generic PLA @CORE One 0.6", - "Prusa/Prusa Generic PLA @CORE One 0.8", - "Prusa/Prusa Generic PLA @CORE One HF 0.4", - "Prusa/Prusa Generic PLA @CORE One HF 0.5", - "Prusa/Prusa Generic PLA @CORE One HF 0.6", - "Prusa/Prusa Generic PLA @CORE One HF 0.8", - "Prusa/Prusa Generic PLA @MK4S 0.6", - "Prusa/Prusa Generic PLA @MK4S 0.8", - "Prusa/Prusa Generic PLA @MK4S HF0.4", - "Prusa/Prusa Generic PLA @MK4S HF0.5", - "Prusa/Prusa Generic PLA @MK4S HF0.6", - "Prusa/Prusa Generic PLA @MK4S HF0.8", - "Prusa/Prusa Generic PLA Silk @CORE One 0.6", - "Prusa/Prusa Generic PLA Silk @CORE One 0.8", "Prusa/Prusa Generic PLA Silk @MK4S", - "Prusa/Prusa Generic PLA Silk @MK4S 0.6", - "Prusa/Prusa Generic PLA Silk @MK4S 0.8", - "Prusa/Prusa Generic TPU @CORE One", - "Prusa/Prusa Generic TPU @CORE One 0.6", - "Prusa/Prusa Generic TPU @CORE One 0.8", - "Prusa/Prusa Generic TPU @MK4S 0.6", - "Prusa/Prusa Generic TPU @MK4S 0.8", - "Prusa/Prusament ASA @CORE One", - "Prusa/Prusament ASA @CORE One 0.6", - "Prusa/Prusament ASA @CORE One 0.8", - "Prusa/Prusament ASA @CORE One HF 0.4", - "Prusa/Prusament ASA @CORE One HF 0.5", - "Prusa/Prusament ASA @CORE One HF 0.6", - "Prusa/Prusament ASA @CORE One HF 0.8", - "Prusa/Prusament PA-CF @CORE One 0.6", - "Prusa/Prusament PA-CF @CORE One 0.8", - "Prusa/Prusament PC Blend @CORE One", - "Prusa/Prusament PC Blend @CORE One 0.6", - "Prusa/Prusament PC Blend @CORE One 0.8", - "Prusa/Prusament PC Blend @CORE One HF 0.4", - "Prusa/Prusament PC Blend @CORE One HF 0.5", - "Prusa/Prusament PC Blend @CORE One HF 0.6", - "Prusa/Prusament PC Blend @CORE One HF 0.8", - "Prusa/Prusament PC-CF @CORE One", - "Prusa/Prusament PC-CF @CORE One 0.6", - "Prusa/Prusament PC-CF @CORE One 0.8", - "Prusa/Prusament PETG @CORE One 0.6", - "Prusa/Prusament PETG @CORE One 0.8", - "Prusa/Prusament PETG @CORE One HF 0.4", - "Prusa/Prusament PETG @CORE One HF 0.5", - "Prusa/Prusament PETG @CORE One HF 0.6", - "Prusa/Prusament PETG @CORE One HF 0.8", - "Prusa/Prusament PLA @CORE One 0.6", - "Prusa/Prusament PLA @CORE One 0.8", - "Prusa/Prusament PLA @CORE One HF 0.4", - "Prusa/Prusament PLA @CORE One HF 0.5", - "Prusa/Prusament PLA @CORE One HF 0.6", - "Prusa/Prusament PLA @CORE One HF 0.8", - "Prusa/Prusament PVB @CORE One", - "Prusa/Prusament PVB @CORE One 0.6", - "Prusa/Prusament PVB @CORE One 0.8", - "Prusa/Prusament rPLA @CORE One 0.6", - "Prusa/Prusament rPLA @CORE One 0.8", "Qidi/QIDI ABS Rapido 0.2 nozzle", "Qidi/QIDI ABS Rapido 0.6 nozzle", "Qidi/QIDI ABS Rapido 0.8 nozzle", @@ -1160,7 +974,6 @@ "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PC", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", @@ -1170,14 +983,9 @@ "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle", "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle", - "RH3D/Generic ABS @E3NG v1.2S", - "RH3D/Generic ASA @E3NG v1.2S", - "RH3D/Generic PCCF @E3NG v1.2S", - "RH3D/Generic PETG @E3NG v1.2S", - "RH3D/Generic PLA @E3NG v1.2S", - "RH3D/Generic TPU @E3NG v1.2S", - "Ratrig/RatRig Generic PC", - "SecKit/SecKit Generic PC", + "Snapmaker/PolyLite Dual PLA @0.2 nozzle", + "Snapmaker/PolyLite J1 PLA", + "Snapmaker/PolyLite J1 PLA @0.2 nozzle", "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", @@ -1219,420 +1027,12 @@ "Sovol/Sovol Zero PLA Silk", "Sovol/Sovol Zero PLA Silk HS Nozzle", "Sovol/Sovol Zero TPU", - "Tiertime/Tiertime Generic PC", - "Tiertime/Tiertime Generic PC@300HS", - "Tiertime/Tiertime PC", - "Tiertime/Tiertime PC@300HS", - "Volumic/Volumic PC", - "Volumic/Volumic PC (Performance)", - "Vzbot/Vzbot Generic PC", + "Wanhao France/YUMI PETG", "Wanhao France/YUMI PLA Bowden", "Wanhao France/YUMI PLA Direct Drive", - "Z-Bolt/Generic ABS @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic ABS @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic ABS @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic ABS HT @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic ABS HT @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic ABS HT @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic ABS HT @Z-Bolt Base", - "Z-Bolt/Generic PA @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic PA @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic PA @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PETG @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic PETG @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic PETG @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PLA @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic PLA @Z-Bolt 0.8 nozzle", - "re3D/re3D PC", - "re3D/re3D PC @0.4 nozzle", - "re3D/re3D PC @0.8 nozzle" + "Z-Bolt/Generic ABS HT @Z-Bolt Base" ], "ids": { - "00001": [ - "Creality/Generic PLA" - ], - "00002": [ - "Creality/Generic PLA-Silk" - ], - "00003": [ - "Creality/Generic PETG" - ], - "00004": [ - "Creality/Generic ABS" - ], - "00005": [ - "Creality/Generic TPU" - ], - "00006": [ - "Creality/Generic PLA-CF" - ], - "00007": [ - "Creality/Generic ASA" - ], - "00008": [ - "Creality/Generic PA" - ], - "00009": [ - "Creality/Generic PA-CF" - ], - "00010": [ - "Creality/Generic BVOH" - ], - "00011": [ - "Creality/Generic PVA" - ], - "00012": [ - "Creality/Generic HIPS" - ], - "00013": [ - "Creality/Generic PET-CF" - ], - "00014": [ - "Creality/Generic PETG-CF" - ], - "00015": [ - "Creality/Generic PA6-CF" - ], - "00016": [ - "Creality/Generic PAHT-CF" - ], - "00017": [ - "Creality/Generic PPS" - ], - "00018": [ - "Creality/Generic PPS-CF" - ], - "00019": [ - "Creality/Generic PP" - ], - "00020": [ - "Creality/Generic PET" - ], - "00021": [ - "Creality/Generic PC" - ], - "00022": [ - "Creality/Generic PA612-CF" - ], - "00023": [ - "Creality/Generic Support for PA" - ], - "00024": [ - "Creality/Generic Support for PLA" - ], - "00025": [ - "Creality/Generic PA12-CF" - ], - "00026": [ - "Creality/Generic TPU 64D" - ], - "00027": [ - "Creality/Generic PETG-GF" - ], - "00031": [ - "Creality/Generic PP-CF" - ], - "00032": [ - "Creality/Generic PCTG" - ], - "00033": [ - "Creality/Generic ASA-CF" - ], - "00034": [ - "Creality/Generic PA6-GF" - ], - "00035": [ - "Creality/eSUN PLA-LW" - ], - "01001": [ - "Creality/Creality Hyper PLA", - "Creality/Hyper PLA" - ], - "01002": [ - "Creality/Hyper L-W PLA" - ], - "01003": [ - "Creality/Hyper Luminous" - ], - "01004": [ - "Creality/Hyper Stardust" - ], - "01601": [ - "Creality/Soleyin Ultra PLA" - ], - "02001": [ - "Creality/Creality Hyper PLA-CF", - "Creality/Hyper PLA-CF" - ], - "03001": [ - "Creality/Creality Hyper ABS", - "Creality/Hyper ABS" - ], - "04001": [ - "Creality/CR-PLA", - "Creality/Creality Generic PLA" - ], - "05001": [ - "Creality/CR-Silk", - "Creality/Creality Silk PLA" - ], - "06001": [ - "Creality/CR-PETG", - "Creality/Creality Generic PETG" - ], - "06002": [ - "Creality/Hyper PETG" - ], - "06003": [ - "Creality/Hyper PETG-CF" - ], - "06004": [ - "Creality/Hyper PETG-GF" - ], - "06005": [ - "Creality/Soleyin Basic PETG" - ], - "07001": [ - "Creality/CR-ABS", - "Creality/Creality Generic ABS" - ], - "07002": [ - "Creality/Hyper PC" - ], - "08001": [ - "Creality/Ender-PLA" - ], - "09001": [ - "Creality/EN-PLA+" - ], - "09002": [ - "Creality/ENDER FAST PLA" - ], - "10001": [ - "Creality/Creality Generic TPU", - "Creality/HP-TPU" - ], - "1009481135": [ - "Snapmaker/Snapmaker J1 PET" - ], - "1042511226": [ - "Snapmaker/Snapmaker Dual PETG-CF" - ], - "10425112260": [ - "Snapmaker/Snapmaker PETG-CF" - ], - "11001": [ - "Creality/CR-Nylon", - "Creality/Creality Generic PA" - ], - "1172603684": [ - "Snapmaker/Snapmaker J1 PETG" - ], - "1181363872": [ - "Snapmaker/Snapmaker Dual PLA Silk" - ], - "11813638720": [ - "Snapmaker/Snapmaker PLA Silk" - ], - "1192769348": [ - "Snapmaker/Snapmaker J1 PLA Matte" - ], - "12002": [ - "Creality/Hyper PPA-CF" - ], - "12003": [ - "Creality/Hyper PAHT-CF" - ], - "12004": [ - "Creality/Hyper PA612-CF" - ], - "12005": [ - "Creality/Hyper PA6-CF" - ], - "1207881278": [ - "Snapmaker/Snapmaker Dual Breakaway" - ], - "1210173120": [ - "Snapmaker/Snapmaker J1 PA-CF" - ], - "1223824394": [ - "Snapmaker/Snapmaker J1 ABS" - ], - "1247172706": [ - "Snapmaker/Snapmaker Dual ASA" - ], - "12471727060": [ - "Snapmaker/Snapmaker ASA" - ], - "13001": [ - "Creality/CR-PLA Carbon" - ], - "1344609062": [ - "Snapmaker/Snapmaker PVA" - ], - "1355502217": [ - "Snapmaker/Snapmaker PETG-CF" - ], - "1393866034": [ - "Snapmaker/PolyLite Dual PLA", - "Snapmaker/PolyLite J1 PLA", - "Snapmaker/PolyLite PLA" - ], - "14001": [ - "Creality/CR-PLA Matte" - ], - "1417031127": [ - "Snapmaker/Snapmaker Dual PLA" - ], - "14170311270": [ - "Snapmaker/Snapmaker PLA" - ], - "141703112701": [ - "Snapmaker/Snapmaker PLA SnapSpeed" - ], - "1417031127011": [ - "Snapmaker/Snapmaker PLA Lite" - ], - "144877656": [ - "Snapmaker/Snapmaker J1 ASA" - ], - "1480063856": [ - "Snapmaker/Snapmaker TPU" - ], - "15001": [ - "Creality/CR-PLA Fluo" - ], - "1528786603": [ - "Snapmaker/Snapmaker J1 PLA Silk" - ], - "16001": [ - "Creality/CR-TPU" - ], - "1655727393": [ - "Snapmaker/Snapmaker PLA Silk" - ], - "168223792": [ - "Snapmaker/Snapmaker Dual ABS" - ], - "1682237920": [ - "Snapmaker/Snapmaker ABS" - ], - "1695556157": [ - "Snapmaker/Snapmaker PLA Eco" - ], - "17001": [ - "Creality/CR-Wood" - ], - "1702147325": [ - "Snapmaker/Snapmaker Dual PLA-CF" - ], - "17021473250": [ - "Snapmaker/Snapmaker PLA-CF" - ], - "18001": [ - "Creality/HP Ultra PLA" - ], - "1895495477": [ - "Snapmaker/Snapmaker PETG" - ], - "19001": [ - "Creality/Creality Generic ASA", - "Creality/HP-ASA" - ], - "200803790": [ - "Snapmaker/Snapmaker Dual PLA Eco" - ], - "2008037900": [ - "Snapmaker/Snapmaker PLA Eco" - ], - "2029994346": [ - "Snapmaker/Snapmaker Dual PLA Metal" - ], - "20299943460": [ - "Snapmaker/Snapmaker PLA Metal" - ], - "2128577941": [ - "Snapmaker/Snapmaker Dual PET" - ], - "21285779410": [ - "Snapmaker/Snapmaker PET" - ], - "2209001062": [ - "Snapmaker/Snapmaker Dual PETG" - ], - "22090010620": [ - "Snapmaker/Snapmaker PETG" - ], - "2549587591": [ - "Snapmaker/Snapmaker PET" - ], - "2742961008": [ - "Snapmaker/Snapmaker ASA" - ], - "29001": [ - "Creality/Hyper Marble" - ], - "2971656290": [ - "Snapmaker/Snapmaker Dual TPU" - ], - "29716562900": [ - "Snapmaker/Snapmaker TPU" - ], - "297165629001": [ - "Snapmaker/Snapmaker TPU 95A" - ], - "3104636980": [ - "Snapmaker/Snapmaker Dual PVA" - ], - "31046369800": [ - "Snapmaker/Snapmaker PVA" - ], - "3177068229": [ - "Snapmaker/Snapmaker PLA" - ], - "3383257822": [ - "Snapmaker/Snapmaker J1 PLA Eco" - ], - "3492897526": [ - "Snapmaker/Snapmaker J1 Breakaway" - ], - "3493177425": [ - "Snapmaker/Snapmaker Dual PA-CF" - ], - "34931774250": [ - "Snapmaker/Snapmaker PA-CF" - ], - "3503790988": [ - "Snapmaker/Snapmaker Dual PLA Matte" - ], - "377675245": [ - "Snapmaker/Snapmaker J1 PLA" - ], - "3806593857": [ - "Snapmaker/Snapmaker J1 PLA-CF" - ], - "3811508002": [ - "Snapmaker/Snapmaker ABS" - ], - "3864371306": [ - "Snapmaker/Snapmaker PLA-CF" - ], - "4012961186": [ - "Snapmaker/Snapmaker J1 PLA Metal" - ], - "4092268632": [ - "Snapmaker/Snapmaker J1 TPU" - ], - "4227461134": [ - "Snapmaker/Snapmaker Breakaway Support For PLA", - "Snapmaker/Snapmaker J1 PVA" - ], - "4235401834": [ - "Snapmaker/Snapmaker J1 PETG-CF" - ], - "581236806": [ - "Snapmaker/Snapmaker PA-CF" - ], "BABB00": [ "BBL/BETA ABS" ], @@ -1756,36 +1156,6 @@ "BPLB20": [ "BBL/BETA PLA High Speed" ], - "BSFI001": [ - "Blocks/Blocks Generic PLA" - ], - "BSFI002": [ - "Blocks/Blocks Generic PETG" - ], - "BSFI003": [ - "Blocks/Blocks Generic TPU" - ], - "BSFI004": [ - "Blocks/Blocks Generic ABS" - ], - "BSFI005": [ - "Blocks/Blocks Generic ASA" - ], - "BSFI006": [ - "Blocks/Blocks Generic PA" - ], - "BSFI007": [ - "Blocks/Blocks Generic PA-CF" - ], - "BSFI008": [ - "Blocks/Blocks Generic PC" - ], - "BSFI009": [ - "Blocks/Blocks Generic PVA" - ], - "BSFI010": [ - "Blocks/Blocks Generic PLA-CF" - ], "BTUB00": [ "BBL/BETA TPU 90A" ], @@ -1798,174 +1168,29 @@ "BTUB03": [ "BBL/BETA TPU 98A" ], - "DFL99": [ - "Volumic/Désactivé" - ], - "E1001": [ - "Creality/eSUN PLA+" - ], - "E1002": [ - "Creality/eSUN PLA-Silk" - ], - "E1003": [ - "Creality/eSUN PLA-Matte" - ], - "E1004": [ - "Creality/eSUN PLA-Lite" - ], - "E1005": [ - "Creality/eSUN PLA-CF" - ], - "E1006": [ - "Creality/eSUN PLA-HS" - ], - "E2001": [ - "Creality/eSUN PETG" - ], - "E2002": [ - "Creality/eSUN PETG+HS" - ], - "E2003": [ - "Creality/eSUN PETG-Basic" - ], - "E3001": [ - "Creality/eSUN ABS+" - ], - "E4001": [ - "Creality/eSUN ASA+" - ], - "E8001": [ - "Creality/eSUN PET-Basic" - ], - "EABSB00": [ - "Elegoo/Elegoo ABS" - ], - "EASAB00": [ - "Elegoo/Elegoo ASA" - ], - "EFL33": [ - "Eryone/Eryone PP-CF" - ], - "EFL40": [ - "Eryone/Eryone PLA-CF" - ], - "EFL43": [ - "Eryone/Eryone PETG-CF" - ], - "EFL71": [ - "Eryone/Eryone PA" - ], - "EFL72": [ - "Eryone/Eryone PA-CF" - ], - "EFL73": [ - "Eryone/Eryone PA-GF" - ], - "EFL81": [ - "Eryone/Eryone ABS-CF" - ], - "EFL82": [ - "Eryone/Eryone ASA-CF" - ], - "EFL90": [ - "Eryone/Eryone PLA" - ], - "EFL91": [ - "Eryone/Eryone ABS" - ], - "EFL92": [ - "Eryone/Eryone ASA" - ], - "EFL93": [ - "Eryone/Eryone PETG" - ], - "EFL941": [ - "Eryone/Eryone Silk PLA" - ], - "EFL95": [ - "Eryone/Eryone TPU" - ], - "EPAHTB00": [ - "Elegoo/Elegoo PAHT-CF" - ], - "EPCB00": [ - "Elegoo/Elegoo PC" - ], - "EPETGB00": [ - "Elegoo/Elegoo PETG" - ], - "EPLAB00": [ - "Elegoo/Elegoo PLA" - ], - "ETPUB00": [ - "Elegoo/Elegoo TPU 95A" - ], - "FFF01": [ - "Flashforge/Flashforge PLA" - ], - "FFF02": [ - "Flashforge/Flashforge ABS" - ], - "FFF03": [ - "Flashforge/Flashforge PETG", - "Flashforge/Generic PETG" - ], - "FFG01": [ - "Flashforge/Flashforge Generic PLA" - ], - "GABSB00": [ - "Elegoo/Generic ABS" - ], - "GASAB00": [ - "Elegoo/Generic ASA", - "Elegoo/Generic ASA-CF" - ], "GFA00": [ - "Afinia/Afinia PLA", - "Afinia/Afinia Value PLA", - "BBL/Bambu PLA Basic", - "OrcaArena/Arena PLA Basic", - "Tiertime/Tiertime PLA", - "WonderMaker/WonderMaker PLA Basic" - ], - "GFA00_01": [ - "Afinia/Afinia PLA", - "Tiertime/Tiertime PLA" + "BBL/Bambu PLA Basic" ], "GFA01": [ - "BBL/Bambu PLA Matte", - "OrcaArena/Arena PLA Matte", - "WonderMaker/WonderMaker PLA Matte" + "BBL/Bambu PLA Matte" ], "GFA02": [ - "BBL/Bambu PLA Metal", - "OrcaArena/Arena PLA Metal", - "WonderMaker/WonderMaker PLA Metal" - ], - "GFA03": [ - "OrcaArena/Arena PLA Impact" + "BBL/Bambu PLA Metal" ], "GFA05": [ - "BBL/Bambu PLA Silk", - "OrcaArena/Arena PLA Silk", - "Qidi/Qidi Generic PLA Silk", - "WonderMaker/WonderMaker PLA Silk" + "BBL/Bambu PLA Silk" ], "GFA06": [ "BBL/Bambu PLA Silk+" ], "GFA07": [ - "BBL/Bambu PLA Marble", - "OrcaArena/Arena PLA Marble", - "WonderMaker/WonderMaker PLA Marble" + "BBL/Bambu PLA Marble" ], "GFA08": [ - "BBL/Bambu PLA Sparkle", - "OrcaArena/Arena PLA Sparkle" + "BBL/Bambu PLA Sparkle" ], "GFA09": [ - "BBL/Bambu PLA Tough", - "OrcaArena/Arena PLA Tough" + "BBL/Bambu PLA Tough" ], "GFA10": [ "BBL/Bambu PLA Tough+" @@ -1983,8 +1208,7 @@ "BBL/Bambu PLA Galaxy" ], "GFA16": [ - "BBL/Bambu PLA Wood", - "WonderMaker/WonderMaker PLA Wood" + "BBL/Bambu PLA Wood" ], "GFA17": [ "BBL/Bambu PLA Translucent" @@ -1993,41 +1217,13 @@ "BBL/Bambu PLA Lite" ], "GFA50": [ - "BBL/Bambu PLA-CF", - "OrcaArena/Arena PLA-CF", - "Tiertime/Tiertime PLA-CF" - ], - "GFA50_01": [ - "Tiertime/Tiertime PLA-CF" - ], - "GFA99": [ - "Anycubic/Anycubic ASA", - "CoLiDo/CoLiDo Generic PLA", - "CoLiDo/CoLiDo PLA+" - ], - "GFASA": [ - "Anycubic/Anycubic ASA" + "BBL/Bambu PLA-CF" ], "GFB00": [ - "Afinia/Afinia ABS", - "Afinia/Afinia ABS+", - "Afinia/Afinia Value ABS", - "BBL/Bambu ABS", - "OrcaArena/Arena ABS", - "Tiertime/Tiertime ABS", - "WonderMaker/WonderMaker ABS" - ], - "GFB00_01": [ - "Afinia/Afinia ABS", - "Tiertime/Tiertime ABS" + "BBL/Bambu ABS" ], "GFB01": [ - "BBL/Bambu ASA", - "Tiertime/Tiertime ASA", - "WonderMaker/WonderMaker ASA" - ], - "GFB01_01": [ - "Tiertime/Tiertime ASA" + "BBL/Bambu ASA" ], "GFB02": [ "BBL/Bambu ASA-Aero" @@ -2045,276 +1241,52 @@ "BBL/PolyLite ASA" ], "GFB98": [ - "Anker/Anker Generic ASA", - "Anker/Anker Generic ASA 0.2 nozzle", - "Anker/Anker Generic ASA 0.25 nozzle", - "Anycubic/Anycubic Generic ASA", - "Artillery/Artillery Generic ASA", - "BBL/Generic ASA", - "Creality/Creality Generic ASA", - "FLSun/FLSun Generic ASA", - "FLSun/FLSun S1 ASA", - "FLSun/FLSun T1 ASA", - "OrcaArena/OrcaArena Generic ASA", - "Prusa/Prusa Generic ASA", - "Prusa/Prusament ASA", - "Ratrig/RatRig Generic ASA", - "SecKit/SecKit Generic ASA", - "Tiertime/Tiertime Generic ASA", - "Vzbot/Vzbot Generic ASA" - ], - "GFB98_01": [ - "Tiertime/Tiertime Generic ASA" - ], - "GFB98_2": [ - "Prusa/Prusa Generic ASA" - ], - "GFB98_3": [ - "Prusa/Prusa Generic ASA" - ], - "GFB98_4": [ - "Prusa/Prusa Generic ASA" - ], - "GFB98_5": [ - "Prusa/Prusa Generic ASA", - "Prusa/Prusa Generic ASA HF" - ], - "GFB98_6": [ - "Prusa/Prusa Generic ASA HF" - ], - "GFB98_7": [ - "Prusa/Prusa Generic ASA HF" + "BBL/Generic ASA" ], "GFB99": [ - "Anker/Anker Generic ABS", - "Anker/Anker Generic ABS 0.2 nozzle", - "Anker/Anker Generic ABS 0.25 nozzle", - "Anycubic/Anycubic Generic ABS", - "Artillery/Artillery Generic ABS", - "BBL/Generic ABS", - "Chuanying/Chuanying ABS", - "Chuanying/Chuanying Generic ABS", - "CoLiDo/CoLiDo ABS", - "CoLiDo/CoLiDo Generic ABS", - "Comgrow/Comgrow Generic ABS", - "Creality/Creality Generic ABS", - "DeltaMaker/DeltaMaker Generic TPU", - "FLSun/FLSun Generic ABS", - "FLSun/FLSun S1 ABS", - "FLSun/FLSun T1 ABS", - "Flashforge/Flashforge Generic ABS", - "Flashforge/Generic ABS", - "FlyingBear/FlyingBear Generic ABS", - "InfiMech/InfiMech Generic ABS", - "Lulzbot/Lulzbot 2.85mm ABS", - "OrcaArena/OrcaArena Generic ABS", - "Prusa/Prusa Generic ABS", - "Qidi/Qidi Generic ABS", - "Ratrig/RatRig Generic ABS", - "SecKit/SecKit Generic ABS", - "Tiertime/Tiertime Generic ABS", - "Volumic/Volumic ABS Ultra", - "Volumic/Volumic ABS Ultra (Performance)", - "Vzbot/Vzbot Generic ABS" - ], - "GFB99_01": [ - "Tiertime/Tiertime Generic ABS" - ], - "GFB99_2": [ - "Prusa/Prusa Generic ABS" - ], - "GFB99_3": [ - "Prusa/Prusa Generic ABS" - ], - "GFB99_4": [ - "Prusa/Prusa Generic ABS" - ], - "GFB99_5": [ - "Prusa/Prusa Generic ABS", - "Prusa/Prusa Generic ABS HF" - ], - "GFB99_6": [ - "Prusa/Prusa Generic ABS HF" - ], - "GFB99_7": [ - "Prusa/Prusa Generic ABS HF" + "BBL/Generic ABS" ], "GFC00": [ - "BBL/Bambu PC", - "OrcaArena/Arena PC", - "Tiertime/Tiertime PC" - ], - "GFC00_01": [ - "Tiertime/Tiertime PC" + "BBL/Bambu PC" ], "GFC01": [ "BBL/Bambu PC FR" ], - "GFC98": [ - "Prusa/Prusament PC-CF" - ], "GFC99": [ - "Anker/Anker Generic PC", - "Anker/Anker Generic PC 0.2 nozzle", - "Anker/Anker Generic PC 0.25 nozzle", - "Anycubic/Anycubic Generic PC", - "BBL/Generic PC", - "Creality/Creality Generic PC", - "Custom/Generic PC", - "FLSun/FLSun Generic PC", - "FlyingBear/FlyingBear Generic PC", - "InfiMech/InfiMech Generic PC", - "OrcaArena/OrcaArena Generic PC", - "Prusa/Prusa Generic PC", - "Prusa/Prusament PC Blend", - "Qidi/Qidi Generic PC", - "Ratrig/RatRig Generic PC", - "SecKit/SecKit Generic PC", - "Tiertime/Tiertime Generic PC", - "Volumic/Volumic PC", - "Volumic/Volumic PC (Performance)", - "Vzbot/Vzbot Generic PC" - ], - "GFC99_01": [ - "Tiertime/Tiertime Generic PC" - ], - "GFC99_1": [ - "Prusa/Prusa Generic PC" - ], - "GFC99_2": [ - "Prusa/Prusa Generic PC" - ], - "GFC99_3": [ - "Prusa/Prusa Generic PC" - ], - "GFC99_4": [ - "Prusa/Prusa Generic PC", - "Prusa/Prusa Generic PC HF" - ], - "GFC99_5": [ - "Prusa/Prusa Generic PC HF" - ], - "GFC99_6": [ - "Prusa/Prusa Generic PC HF" + "BBL/Generic PC" ], "GFG00": [ - "BBL/Bambu PETG Basic", - "OrcaArena/Arena PETG Basic", - "Tiertime/Tiertime PETG", - "WonderMaker/WonderMaker PETG Basic" - ], - "GFG00_01": [ - "Tiertime/Tiertime PETG" + "BBL/Bambu PETG Basic" ], "GFG01": [ - "BBL/Bambu PETG Translucent", - "re3D/re3D Greengate rPETG" + "BBL/Bambu PETG Translucent" ], "GFG02": [ - "BBL/Bambu PETG HF", - "re3D/re3D rPP" - ], - "GFG03": [ - "re3D/re3D PETG" + "BBL/Bambu PETG HF" ], "GFG50": [ - "BBL/Bambu PETG-CF", - "OrcaArena/Arena PETG-CF" + "BBL/Bambu PETG-CF" ], "GFG60": [ - "BBL/PolyLite PETG", - "Snapmaker/PolyLite PETG" + "BBL/PolyLite PETG" ], "GFG96": [ "BBL/Generic PETG HF" ], "GFG97": [ - "BBL/Generic PCTG", - "Tiertime/Tiertime Generic PCTG" - ], - "GFG97-01": [ - "Tiertime/Tiertime Generic PCTG" + "BBL/Generic PCTG" ], "GFG98": [ - "Anker/Anker Generic PETG-CF", - "BBL/Generic PETG-CF", - "OrcaArena/OrcaArena Generic PETG-CF", - "Qidi/Qidi Generic PETG-CF", - "Tiertime/Tiertime Generic PETG-CF", - "Volumic/Volumic PETG Ultra carbone", - "Volumic/Volumic PETG Ultra carbone (Performance)" - ], - "GFG98_01": [ - "Tiertime/Tiertime Generic PETG-CF" + "BBL/Generic PETG-CF" ], "GFG99": [ - "Anker/Anker Generic PETG", - "Anker/Anker Generic PETG 0.2 nozzle", - "Anker/Anker Generic PETG 0.25 nozzle", - "Anycubic/Anycubic Generic PETG", - "Artillery/Artillery Generic PETG", - "BBL/Generic PETG", - "CONSTRUCT3D/C1 Generic PETG", - "Chuanying/Chuanying Generic PETG", - "Chuanying/Chuanying PETG", - "CoLiDo/CoLiDo Generic PETG", - "CoLiDo/CoLiDo PETG", - "Comgrow/Comgrow Generic PETG", - "Creality/Creality Generic PETG", - "Custom/Generic PETG", - "DeltaMaker/DeltaMaker Generic PETG", - "FLSun/FLSun Generic PETG", - "FLSun/FLSun S1 PETG", - "FLSun/FLSun T1 PETG", - "Flashforge/Flashforge Generic PETG", - "Flashforge/Generic PETG", - "FlyingBear/FlyingBear Generic PETG", - "FlyingBear/FlyingBear PETG Basic", - "InfiMech/InfiMech Generic PETG", - "Lulzbot/Lulzbot 2.85mm PETG", - "MagicMaker/MM Generic PEEK", - "OrcaArena/OrcaArena Generic PETG", - "Qidi/Qidi Generic PETG", - "Ratrig/RatRig Generic PETG", - "SecKit/SecKit Generic PETG", - "Tiertime/Tiertime Generic PETG", - "Volumic/Volumic PETG Ultra", - "Volumic/Volumic PETG Ultra (Performance)", - "Vzbot/Vzbot Generic PETG", - "Wanhao France/YUMI PETG", - "re3D/re3D PC" - ], - "GFG99_01": [ - "Tiertime/Tiertime Generic PETG" - ], - "GFG99_2": [ - "Prusa/Prusa Generic PETG" - ], - "GFG99_3": [ - "Prusa/Prusa Generic PETG" - ], - "GFG99_4": [ - "Prusa/Prusa Generic PETG" - ], - "GFG99_5": [ - "Prusa/Prusa Generic PETG", - "Prusa/Prusa Generic PETG HF" - ], - "GFG99_6": [ - "Prusa/Prusa Generic PETG HF" - ], - "GFG99_7": [ - "Prusa/Prusa Generic PETG HF" + "BBL/Generic PETG" ], "GFL00": [ - "BBL/PolyLite PLA", - "OrcaArena/PolyLite PLA", - "Snapmaker/PolyLite PLA" + "BBL/PolyLite PLA" ], "GFL01": [ - "BBL/PolyTerra PLA", - "OrcaArena/PolyTerra PLA", - "Snapmaker/PolyTerra PLA" + "BBL/PolyTerra PLA" ], "GFL03": [ "BBL/eSUN PLA+" @@ -2326,62 +1298,11 @@ "BBL/Overture Matte PLA" ], "GFL06": [ - "BBL/Fiberon PETG-ESD", - "Snapmaker/Fiberon PETG-ESD" - ], - "GFL100": [ - "TwoTrees/TwoTrees Generic HS PLA", - "Z-Bolt/Generic PLA" - ], - "GFL106": [ - "Z-Bolt/Generic PLA" - ], - "GFL108": [ - "Z-Bolt/Generic PLA" - ], - "GFL200": [], - "GFL204": [ - "Z-Bolt/Generic ABS" - ], - "GFL206": [ - "Z-Bolt/Generic ABS" - ], - "GFL208": [ - "Z-Bolt/Generic ABS" - ], - "GFL300": [], - "GFL304": [ - "Z-Bolt/Generic PETG" - ], - "GFL306": [ - "Z-Bolt/Generic PETG" - ], - "GFL308": [ - "Z-Bolt/Generic PETG" - ], - "GFL400": [], - "GFL404": [ - "Z-Bolt/Generic PA" - ], - "GFL406": [ - "Z-Bolt/Generic PA" - ], - "GFL408": [ - "Z-Bolt/Generic PA" + "BBL/Fiberon PETG-ESD" ], "GFL50": [ "BBL/Fiberon PA6-CF" ], - "GFL500": [], - "GFL504": [ - "Z-Bolt/Generic ABS HT" - ], - "GFL506": [ - "Z-Bolt/Generic ABS HT" - ], - "GFL508": [ - "Z-Bolt/Generic ABS HT" - ], "GFL51": [ "BBL/Fiberon PA6-GF" ], @@ -2398,13 +1319,10 @@ "BBL/Fiberon PETG-rCF" ], "GFL56": [ - "BBL/Fiberon PA12-CF10", - "Snapmaker/Fiberon PA12-CF10" + "BBL/Fiberon PA12-CF10" ], "GFL57": [ - "Anycubic/Fiberon PA6-CF20", - "BBL/Fiberon PA6-CF20", - "Snapmaker/Fiberon PA6-CF20" + "BBL/Fiberon PA6-CF20" ], "GFL58": [ "BBL/Fiberon PA6-GF25" @@ -2419,218 +1337,53 @@ "BBL/Fiberon PETG-rCF08" ], "GFL62": [ - "BBL/PolyLite CosPLA", - "Snapmaker/PolyLite CosPLA" + "BBL/PolyLite CosPLA" ], "GFL63": [ - "BBL/PolyLite PLA Galaxy", - "Snapmaker/PolyLite PLA Galaxy" + "BBL/PolyLite PLA Galaxy" ], "GFL64": [ - "BBL/PolyLite PLA Glow", - "Snapmaker/PolyLite PLA Glow" + "BBL/PolyLite PLA Glow" ], "GFL65": [ - "BBL/PolyLite PLA Luminous", - "Snapmaker/PolyLite PLA Luminous" + "BBL/PolyLite PLA Luminous" ], "GFL66": [ - "BBL/PolyLite PLA Neon", - "Snapmaker/PolyLite PLA Neon" + "BBL/PolyLite PLA Neon" ], "GFL67": [ - "BBL/PolyLite PLA Starlight", - "Snapmaker/PolyLite PLA Starlight" + "BBL/PolyLite PLA Starlight" ], "GFL68": [ - "BBL/PolyLite PLA Translucent", - "Snapmaker/PolyLite PLA Translucent" + "BBL/PolyLite PLA Translucent" ], "GFL69": [ - "BBL/PolyTerra PLA Marble", - "Snapmaker/PolyTerra PLA Marble" + "BBL/PolyTerra PLA Marble" ], "GFL70": [ - "BBL/PolyTerra PLA+", - "Snapmaker/PolyTerra PLA+" - ], - "GFL71": [ - "Snapmaker/Fiberon ASA-CF08" - ], - "GFL72": [ - "Snapmaker/Fiberon PA612-ESD" - ], - "GFL73": [ - "Snapmaker/Fiberon PPS-GF20" - ], - "GFL74": [ - "Snapmaker/PolyLite PETG Translucent" - ], - "GFL75": [ - "Snapmaker/PolyLite PLA Pro Metallic" - ], - "GFL76": [ - "Snapmaker/Polymaker PETG" - ], - "GFL77": [ - "Snapmaker/Polymaker PETG Galaxy" - ], - "GFL78": [ - "Snapmaker/Polymaker PLA" - ], - "GFL79": [ - "Anycubic/Polymaker PLA Pro", - "Snapmaker/Polymaker PLA Pro" - ], - "GFL80": [ - "Anycubic/Polymaker PLA Pro Metallic", - "Snapmaker/Polymaker PLA Pro Metallic" - ], - "GFL94": [ - "Anycubic/Anycubic PLA Slik" + "BBL/PolyTerra PLA+" ], "GFL95": [ - "Anker/Anker Generic PLA+", - "Anker/Anker Generic PLA+ 0.2 nozzle", - "Anker/Anker Generic PLA+ 0.25 nozzle", - "BBL/Generic PLA High Speed", - "Tiertime/Tiertime Generic PLA High Speed" - ], - "GFL95_01": [ - "Tiertime/Tiertime Generic PLA High Speed" + "BBL/Generic PLA High Speed" ], "GFL96": [ - "Anker/Anker Generic PLA Silk", - "Anker/Anker Generic PLA Silk 0.2 nozzle", - "Anker/Anker Generic PLA Silk 0.25 nozzle", - "BBL/Generic PLA Silk", - "Tiertime/Tiertime Generic PLA Silk" - ], - "GFL96_01": [ - "Tiertime/Tiertime Generic PLA Silk" - ], - "GFL97": [ - "Anycubic/Anycubic PLA SE" + "BBL/Generic PLA Silk" ], "GFL98": [ - "Anker/Anker Generic PLA-CF", - "Anycubic/Anycubic Generic PLA-CF", - "Anycubic/Anycubic PLA Glow", - "Artillery/Artillery Generic PLA-CF", - "BBL/Generic PLA-CF", - "Creality/Creality Generic PLA-CF", - "Custom/Generic PLA-CF", - "FLSun/FLSun Generic PLA-CF", - "OrcaArena/OrcaArena Generic PLA-CF", - "Qidi/Qidi Generic PLA-CF", - "Ratrig/RatRig Generic PLA-CF", - "SecKit/SecKit Generic PLA-CF", - "Tiertime/Tiertime Generic PLA-CF", - "Vzbot/Vzbot Generic PLA-CF" - ], - "GFL98_01": [ - "Tiertime/Tiertime Generic PLA-CF" - ], - "GFL98_1": [ - "Prusa/Prusa Generic PLA-CF" - ], - "GFL98_3": [ - "Prusa/Prusa Generic PLA-CF" - ], - "GFL98_4": [ - "Prusa/Prusa Generic PLA-CF" - ], - "GFL98_5": [ - "Prusa/Prusa Generic PLA-CF" + "BBL/Generic PLA-CF" ], "GFL99": [ - "Anker/Anker Generic PLA", - "Anker/Anker Generic PLA 0.2 nozzle", - "Anker/Anker Generic PLA 0.25 nozzle", - "Anycubic/Anycubic Generic PLA", - "Artillery/Artillery Generic PLA", - "BBL/Generic PLA", - "CONSTRUCT3D/C1 Generic PLA", - "Chuanying/Chuanying Generic PLA", - "Chuanying/Chuanying PLA", - "Co Print/CoPrint Generic PLA", - "Comgrow/Comgrow Generic PLA", - "Comgrow/Comgrow T300 PLA", - "Creality/Creality Generic PLA", - "Custom/Generic PLA", - "DeltaMaker/DeltaMaker Generic PLA", - "Dremel/Dremel Generic PLA", - "FLSun/FLSun Generic PLA", - "FLSun/FLSun S1 PLA Generic", - "FLSun/FLSun T1 PLA Generic", - "Flashforge/Generic PLA", - "Flashforge/Generic PLA High Speed", - "FlyingBear/FlyingBear Generic PLA", - "InfiMech/InfiMech Generic PLA", - "Lulzbot/Lulzbot 2.85mm PLA", - "OrcaArena/OrcaArena Generic PLA", - "Peopoly/Peopoly Generic PLA", - "Phrozen/Phrozen PLA", - "Prusa/Prusa Generic PLA", - "Qidi/Qidi Generic PLA", - "Ratrig/RatRig Generic PLA", - "SecKit/SecKit Generic PLA", - "Sovol/Sovol SV07 PLA", - "Tiertime/Tiertime Generic PLA", - "Volumic/Volumic PLA Ultra", - "Volumic/Volumic PLA Ultra (Performance)", - "Vzbot/Vzbot Generic PLA", - "re3D/re3D PLA" - ], - "GFL99_01": [ - "Tiertime/Tiertime Generic PLA" - ], - "GFL99_2": [ - "Prusa/Prusa Generic PLA" - ], - "GFL99_3": [ - "Prusa/Prusa Generic PLA" - ], - "GFL99_4": [ - "Prusa/Prusa Generic PLA" - ], - "GFL99_5": [ - "Prusa/Prusa Generic PLA", - "Prusa/Prusa Generic PLA HF" - ], - "GFL99_6": [ - "Prusa/Prusa Generic PLA HF" - ], - "GFL99_7": [ - "Prusa/Prusa Generic PLA HF" - ], - "GFLLK10PETG": [ - "LONGER/Generic PETG" - ], - "GFLLK10PLA": [ - "LONGER/Generic PLA" - ], - "GFLLK10PPETG": [ - "LONGER/Generic PETG" - ], - "GFLLK10PPLA": [ - "LONGER/Generic PLA" + "BBL/Generic PLA" ], "GFLSBS99": [], "GFN03": [ - "BBL/Bambu PA-CF", - "OrcaArena/Arena PA-CF" + "BBL/Bambu PA-CF" ], "GFN04": [ - "BBL/Bambu PAHT-CF", - "OrcaArena/Arena PAHT-CF" + "BBL/Bambu PAHT-CF" ], "GFN05": [ - "BBL/Bambu PA6-CF", - "Tiertime/Tiertime PA6-CF" - ], - "GFN05_01": [ - "Tiertime/Tiertime PA6-CF" + "BBL/Bambu PA6-CF" ], "GFN06": [ "BBL/Bambu PPA-CF" @@ -2639,81 +1392,16 @@ "BBL/Bambu PA6-GF" ], "GFN96": [ - "BBL/Generic PPA-GF", - "Tiertime/Tiertime Generic PPA-GF" - ], - "GFN96_01": [ - "Tiertime/Tiertime Generic PPA-GF" + "BBL/Generic PPA-GF" ], "GFN97": [ - "BBL/Generic PPA-CF", - "Tiertime/Tiertime Generic PPA-CF" - ], - "GFN97_01": [ - "Tiertime/Tiertime Generic PPA-CF" + "BBL/Generic PPA-CF" ], "GFN98": [ - "Anker/Anker Generic PA-CF", - "Anycubic/Anycubic Generic PA-CF", - "BBL/Generic PA-CF", - "Creality/Creality Generic PA-CF", - "FLSun/FLSun Generic PA-CF", - "FlyingBear/FlyingBear Generic PA-CF", - "InfiMech/InfiMech Generic PA-CF", - "OrcaArena/OrcaArena Generic PA-CF", - "Prusa/Prusament PA-CF", - "Qidi/Qidi Generic PA-CF", - "Ratrig/RatRig Generic PA-CF", - "SecKit/SecKit Generic PA-CF", - "Tiertime/Tiertime Generic PA-CF", - "Vzbot/Vzbot Generic PA-CF" - ], - "GFN98_02": [ - "Tiertime/Tiertime Generic PA-CF" - ], - "GFN98_1": [ - "Prusa/Prusa Generic PA-CF" - ], - "GFN98_2": [ - "Prusa/Prusa Generic PA-CF" - ], - "GFN98_3": [ - "Prusa/Prusa Generic PA-CF" - ], - "GFN98_4": [ - "Prusa/Prusa Generic PA-CF" + "BBL/Generic PA-CF" ], "GFN99": [ - "Anker/Anker Generic PA", - "Anker/Anker Generic PA 0.2 nozzle", - "Anker/Anker Generic PA 0.25 nozzle", - "Anycubic/Anycubic Generic PA", - "BBL/Generic PA", - "FLSun/FLSun Generic PA", - "OrcaArena/OrcaArena Generic PA", - "Prusa/Prusa Generic PA", - "Qidi/Qidi Generic PA", - "Ratrig/RatRig Generic PA", - "SecKit/SecKit Generic PA", - "Tiertime/Tiertime Generic PA", - "Volumic/Volumic NYLON Ultra", - "Volumic/Volumic NYLON Ultra (Performance)", - "Vzbot/Vzbot Generic PA" - ], - "GFN99_01": [ - "Tiertime/Tiertime Generic PA" - ], - "GFN99_1": [ - "Prusa/Prusa Generic PA" - ], - "GFN99_2": [ - "Prusa/Prusa Generic PA" - ], - "GFN99_3": [ - "Prusa/Prusa Generic PA" - ], - "GFN99_4": [ - "Prusa/Prusa Generic PA" + "BBL/Generic PA" ], "GFNMK00": [ "BBL/Numakers PLA+" @@ -2722,192 +1410,91 @@ "BBL/Overture PLA Pro" ], "GFP95": [ - "BBL/Generic PP-GF", - "Tiertime/Tiertime Generic PP-GF" - ], - "GFP95_01": [ - "Tiertime/Tiertime Generic PP-GF" + "BBL/Generic PP-GF" ], "GFP96": [ - "BBL/Generic PP-CF", - "Tiertime/Tiertime Generic PP-CF" - ], - "GFP96_01": [ - "Tiertime/Tiertime Generic PP-CF" + "BBL/Generic PP-CF" ], "GFP97": [ - "BBL/Generic PP", - "Tiertime/Tiertime Generic PP" - ], - "GFP97_01": [ - "Tiertime/Tiertime Generic PP" + "BBL/Generic PP" ], "GFP98": [ - "BBL/Generic PE-CF", - "Tiertime/Tiertime Generic PE-CF" - ], - "GFP98_01": [ - "Tiertime/Tiertime Generic PE-CF" + "BBL/Generic PE-CF" ], "GFP99": [ - "BBL/Generic PE", - "Tiertime/Tiertime Generic PE" - ], - "GFP99_01": [ - "Tiertime/Tiertime Generic PE" - ], - "GFPA": [ - "Anycubic/Anycubic PA" - ], - "GFPA6-CF": [ - "Anycubic/Anycubic PA6-CF" - ], - "GFPAHT-CF": [ - "Anycubic/Anycubic PAHT-CF" - ], - "GFPC": [ - "Anycubic/Anycubic PC" - ], - "GFPC-CF": [ - "Anycubic/Anycubic PC-CF" - ], - "GFPC-GF": [ - "Anycubic/Anycubic PC-GF" - ], - "GFPEBA": [ - "Anycubic/Anycubic PEBA" - ], - "GFPET-CF": [ - "Anycubic/Anycubic PET-CF" - ], - "GFPETG": [ - "Anycubic/Generic PETG" - ], - "GFPETG-1": [ - "Peopoly/Peopoly Generic PETG" - ], - "GFPETG-CF": [ - "Anycubic/Anycubic PETG-CF" - ], - "GFPLA Glow": [ - "Anycubic/Anycubic PLA Glow" - ], - "GFPLA Translucent": [ - "Anycubic/Anycubic PLA Translucent" - ], - "GFPLA-CF": [ - "Anycubic/Anycubic PLA-CF" + "BBL/Generic PE" ], "GFPM001": [ - "Anycubic/Panchroma PLA", - "BBL/Panchroma PLA", - "Snapmaker/Panchroma PLA" + "BBL/Panchroma PLA" ], "GFPM002": [ - "BBL/Panchroma PLA Matte", - "Snapmaker/Panchroma PLA Matte" + "BBL/Panchroma PLA Matte" ], "GFPM003": [ - "BBL/Panchroma PLA Marble", - "Snapmaker/Panchroma PLA Marble" + "BBL/Panchroma PLA Marble" ], "GFPM004": [ - "BBL/Panchroma PLA Silk", - "Snapmaker/Panchroma PLA Silk" + "BBL/Panchroma PLA Silk" ], "GFPM005": [ - "BBL/Panchroma PLA Satin", - "Snapmaker/Panchroma PLA Satin" + "BBL/Panchroma PLA Satin" ], "GFPM006": [ - "BBL/Panchroma PLA Translucent", - "Snapmaker/Panchroma PLA Translucent" + "BBL/Panchroma PLA Translucent" ], "GFPM007": [ - "BBL/Panchroma PLA Galaxy", - "Snapmaker/Panchroma PLA Galaxy" + "BBL/Panchroma PLA Galaxy" ], "GFPM008": [ - "BBL/Panchroma PLA Celestial", - "Snapmaker/Panchroma PLA Celestial" + "BBL/Panchroma PLA Celestial" ], "GFPM009": [ - "BBL/Panchroma PLA Starlight", - "Snapmaker/Panchroma PLA Starlight" + "BBL/Panchroma PLA Starlight" ], "GFPM010": [ - "BBL/Panchroma PLA Glow", - "Snapmaker/Panchroma PLA Glow" + "BBL/Panchroma PLA Glow" ], "GFPM011": [ - "BBL/Panchroma PLA Luminous", - "Snapmaker/Panchroma PLA Luminous" + "BBL/Panchroma PLA Luminous" ], "GFPM012": [ - "BBL/Panchroma PLA Metallic", - "Snapmaker/Panchroma PLA Metallic" + "BBL/Panchroma PLA Metallic" ], "GFPM013": [ - "BBL/Panchroma PLA Neon", - "Snapmaker/Panchroma PLA Neon" + "BBL/Panchroma PLA Neon" ], "GFPM014": [ - "BBL/Panchroma PLA UV Shift", - "Snapmaker/Panchroma PLA UV Shift" + "BBL/Panchroma PLA UV Shift" ], "GFPM015": [ - "BBL/Panchroma PLA Temp Shift", - "Snapmaker/Panchroma PLA Temp Shift" + "BBL/Panchroma PLA Temp Shift" ], "GFPM016": [ - "BBL/Panchroma CoPE", - "Snapmaker/Panchroma CoPE" + "BBL/Panchroma CoPE" ], "GFPM017": [ - "BBL/Polymaker HT-PLA", - "Snapmaker/Polymaker HT-PLA" + "BBL/Polymaker HT-PLA" ], "GFPM018": [ - "BBL/Polymaker HT-PLA-GF", - "Snapmaker/Polymaker HT-PLA-GF" + "BBL/Polymaker HT-PLA-GF" ], "GFPM019": [ - "BBL/PolyLite PLA Pro", - "Snapmaker/PolyLite PLA Pro" - ], - "GFPVA": [ - "Anycubic/Anycubic PVA" + "BBL/PolyLite PLA Pro" ], "GFR00": [ "BBL/FusRock ABS-GF" ], "GFR98": [ - "BBL/Generic PHA", - "Tiertime/Tiertime Generic PHA" - ], - "GFR98_01": [ - "Tiertime/Tiertime Generic PHA" + "BBL/Generic PHA" ], "GFR99": [ - "BBL/Generic EVA", - "Tiertime/Tiertime Generic EVA" + "BBL/Generic EVA" ], - "GFR99_01": [ - "Tiertime/Tiertime Generic EVA" - ], - "GFRH01": [], - "GFRH02": [], - "GFRH03": [], - "GFRH04": [], - "GFRH05": [], - "GFRH06": [], "GFS00": [ - "BBL/Bambu Support W", - "OrcaArena/Arena Support W" + "BBL/Bambu Support W" ], "GFS01": [ - "BBL/Bambu Support G", - "OrcaArena/Arena Support G" + "BBL/Bambu Support G" ], "GFS02": [ "BBL/Bambu Support For PLA" @@ -2916,12 +1503,7 @@ "BBL/Bambu Support For PA/PET" ], "GFS04": [ - "BBL/Bambu PVA", - "Tiertime/Tiertime PVA", - "WonderMaker/WonderMaker PVA" - ], - "GFS04_01": [ - "Tiertime/Tiertime PVA" + "BBL/Bambu PVA" ], "GFS05": [ "BBL/Bambu Support For PLA/PETG" @@ -2930,135 +1512,52 @@ "BBL/Bambu Support for ABS" ], "GFS97": [ - "BBL/Generic BVOH", - "Tiertime/Tiertime Generic BVOH" - ], - "GFS97_01": [ - "Tiertime/Tiertime Generic BVOH" + "BBL/Generic BVOH" ], "GFS98": [ - "BBL/Generic HIPS", - "Prusa/Prusament PVB", - "Tiertime/Tiertime Generic HIPS" - ], - "GFS98_01": [ - "Tiertime/Tiertime Generic HIPS" + "BBL/Generic HIPS" ], "GFS99": [ - "Anker/Anker Generic PVA", - "Anycubic/Anycubic Generic PVA", - "BBL/Generic PVA", - "Custom/Generic PVA", - "FLSun/FLSun Generic PVA", - "OrcaArena/OrcaArena Generic PVA", - "Prusa/Prusa Generic PVA", - "Qidi/Qidi Generic PVA", - "Ratrig/RatRig Generic PVA", - "SecKit/SecKit Generic PVA", - "Tiertime/Tiertime Generic PVA", - "Volumic/Volumic PVA", - "Volumic/Volumic PVA-BVOH (Performance)", - "Vzbot/Vzbot Generic PVA" - ], - "GFS99_01": [ - "Tiertime/Tiertime Generic PVA" - ], - "GFS99_1": [ - "Prusa/Prusa Generic PVA" - ], - "GFS99_2": [ - "Prusa/Prusa Generic PVA" - ], - "GFS99_3": [ - "Prusa/Prusa Generic PVA" - ], - "GFS99_4": [ - "Prusa/Prusa Generic PVA", - "Prusa/Prusa Generic PVA HF" - ], - "GFS99_5": [ - "Prusa/Prusa Generic PVA HF" - ], - "GFS99_6": [ - "Prusa/Prusa Generic PVA HF" - ], - "GFSL99": [ - "Peopoly/Peopoly Generic ABS" + "BBL/Generic PVA" ], "GFSNL02": [ - "BBL/SUNLU PLA Matte", - "Flashforge/SUNLU PLA Matte" + "BBL/SUNLU PLA Matte" ], "GFSNL03": [ - "BBL/SUNLU PLA+", - "Flashforge/SUNLU PLA+" + "BBL/SUNLU PLA+" ], "GFSNL04": [ - "BBL/SUNLU PLA+ 2.0", - "Flashforge/SUNLU PLA+ 2.0" + "BBL/SUNLU PLA+ 2.0" ], "GFSNL05": [ - "BBL/SUNLU Silk PLA+", - "Flashforge/SUNLU Silk PLA+" + "BBL/SUNLU Silk PLA+" ], "GFSNL06": [ - "BBL/SUNLU PLA Marble", - "Flashforge/SUNLU PLA Marble" + "BBL/SUNLU PLA Marble" ], "GFSNL07": [ - "BBL/SUNLU Wood PLA", - "Flashforge/SUNLU Wood PLA" + "BBL/SUNLU Wood PLA" ], "GFSNL08": [ - "BBL/SUNLU PETG", - "Flashforge/SUNLU PETG" + "BBL/SUNLU PETG" ], "GFT01": [ - "BBL/Bambu PET-CF", - "OrcaArena/Arena PET-CF", - "Tiertime/Tiertime PET-CF", - "WonderMaker/WonderMaker PET-CF" - ], - "GFT01_01": [ - "Tiertime/Tiertime PET-CF" + "BBL/Bambu PET-CF" ], "GFT02": [ - "BBL/Bambu PPS-CF", - "Prusa/Prusa Generic PETG" + "BBL/Bambu PPS-CF" ], "GFT97": [ - "BBL/Generic PPS", - "Tiertime/Tiertime Generic PPS" - ], - "GFT97_01": [ - "Tiertime/Tiertime Generic PPS" + "BBL/Generic PPS" ], "GFT98": [ - "BBL/Generic PPS-CF", - "Tiertime/Tiertime Generic PPS-CF" - ], - "GFT98_01": [ - "Tiertime/Tiertime Generic PPS-CF" - ], - "GFTPU 95A": [ - "Anycubic/Anycubic TPU 95A" - ], - "GFTPU for ACE": [ - "Anycubic/Anycubic TPU for ACE" + "BBL/Generic PPS-CF" ], "GFU00": [ "BBL/Bambu TPU 95A HF" ], "GFU01": [ - "Afinia/Afinia TPU", - "BBL/Bambu TPU 95A", - "OrcaArena/Arena TPU 95A", - "Tiertime/Tiertime TPU 95A", - "WonderMaker/WonderMaker TPU 95A" - ], - "GFU01_01": [ - "Afinia/Afinia TPU", - "Tiertime/Tiertime TPU 95A" + "BBL/Bambu TPU 95A" ], "GFU02": [ "BBL/Bambu TPU for AMS" @@ -3073,289 +1572,136 @@ "BBL/Generic TPU for AMS" ], "GFU99": [ - "Anker/Anker Generic TPU", - "Anycubic/Anycubic Generic TPU", - "Artillery/Artillery Generic TPU", - "BBL/Generic TPU", - "CoLiDo/CoLiDo Generic TPU", - "Creality/Creality Generic TPU", - "Custom/Generic TPU", - "FLSun/FLSun Generic TPU", - "FLSun/FLSun S1 TPU", - "FLSun/FLSun T1 TPU", - "FlyingBear/FlyingBear Generic TPU", - "FlyingBear/FlyingBear TPU Basic", - "InfiMech/InfiMech Generic TPU", - "InfiMech/InfiMech TPU Basic", - "OrcaArena/OrcaArena Generic TPU", - "Prusa/Prusa Generic FLEX", - "Prusa/Prusa Generic TPU", - "Qidi/Qidi Generic TPU", - "Ratrig/RatRig Generic TPU", - "SecKit/SecKit Generic TPU", - "Tiertime/Tiertime Generic TPU", - "TwoTrees/TwoTrees Generic 95A TPU", - "Volumic/Volumic FLEX93 Ultra", - "Volumic/Volumic FLEX93 Ultra (Performance)", - "Vzbot/Vzbot Generic TPU", - "Wanhao France/YUMI PLA Bowden", - "Wanhao France/YUMI PLA Direct Drive" + "BBL/Generic TPU" ], - "GFU99_01": [ - "Tiertime/Tiertime Generic TPU" + "OF016CJw": [ + "Sovol/Sovol SV08 ABS" ], - "GFU99_2": [ - "Prusa/Prusa Generic TPU" + "OF02UAVh": [ + "Creality/Soleyin Ultra PLA" ], - "GFU99_3": [ - "Prusa/Prusa Generic TPU HF" + "OF0FfcAG": [ + "Anycubic/Anycubic TPU for ACE" ], - "GPAB00": [ - "Elegoo/Generic PA" - ], - "GPCB00": [ - "Elegoo/Generic PC" - ], - "GPETB00": [ - "Elegoo/Generic PET" - ], - "GPETGB00": [ - "Elegoo/Generic PETG", - "Elegoo/Generic PETG-CF" - ], - "GPLAB00": [ - "Elegoo/Generic PLA" - ], - "Generic ABS @E3NG v1.2S": [ - "RH3D/Generic ABS" - ], - "Generic ABS @MK4S": [ - "Prusa/Prusa Generic ABS" - ], - "Generic ABS @MK4S 0.6": [ - "Prusa/Prusa Generic ABS" - ], - "Generic ABS @MK4S 0.8": [ - "Prusa/Prusa Generic ABS" - ], - "Generic ABS @MK4S HF0.4": [ - "Prusa/Prusa Generic ABS" - ], - "Generic ABS @MK4S HF0.5": [ - "Prusa/Prusa Generic ABS" - ], - "Generic ABS @MK4S HF0.6": [ - "Prusa/Prusa Generic ABS" - ], - "Generic ABS @MK4S HF0.8": [ - "Prusa/Prusa Generic ABS" - ], - "Generic ASA @E3NG v1.2S": [ - "RH3D/Generic ASA" - ], - "Generic FLEX @MK4S": [ - "Prusa/Prusa Generic TPU" - ], - "Generic FLEX @MK4S 0.6": [ - "Prusa/Prusa Generic TPU" - ], - "Generic FLEX @MK4S 0.8": [ - "Prusa/Prusa Generic TPU" - ], - "Generic PCCF @E3NG v1.2S": [ - "RH3D/Generic PCCF" - ], - "Generic PETG @E3NG v1.2S": [ - "RH3D/Generic PETG" - ], - "Generic PETG @MK4S": [ - "Prusa/Prusa Generic PETG" - ], - "Generic PETG @MK4S 0.6": [ - "Prusa/Prusa Generic PETG" - ], - "Generic PETG @MK4S 0.8": [ - "Prusa/Prusa Generic PETG" - ], - "Generic PETG @MK4S HF0.4": [ - "Prusa/Prusa Generic PETG" - ], - "Generic PETG @MK4S HF0.5": [ - "Prusa/Prusa Generic PETG" - ], - "Generic PETG @MK4S HF0.6": [ - "Prusa/Prusa Generic PETG" - ], - "Generic PETG @MK4S HF0.8": [ - "Prusa/Prusa Generic PETG" - ], - "Generic PLA @E3NG v1.2S": [ - "RH3D/Generic PLA" - ], - "Generic PLA @MK4S": [ - "Prusa/Prusa Generic PLA" - ], - "Generic PLA @MK4S 0.6": [ - "Prusa/Prusa Generic PLA" - ], - "Generic PLA @MK4S 0.8": [ - "Prusa/Prusa Generic PLA" - ], - "Generic PLA @MK4S HF0.4": [ - "Prusa/Prusa Generic PLA" - ], - "Generic PLA @MK4S HF0.5": [ - "Prusa/Prusa Generic PLA" - ], - "Generic PLA @MK4S HF0.6": [ - "Prusa/Prusa Generic PLA" - ], - "Generic PLA @MK4S HF0.8": [ - "Prusa/Prusa Generic PLA" - ], - "Generic PLA Silk @MK4S": [ - "Prusa/Prusa Generic PLA Silk" - ], - "Generic PLA Silk @MK4S 0.6": [ - "Prusa/Prusa Generic PLA Silk" - ], - "Generic PLA Silk @MK4S 0.8": [ - "Prusa/Prusa Generic PLA Silk" - ], - "Generic TPU @E3NG v1.2S": [ - "RH3D/Generic TPU" - ], - "IQM1": [ - "iQ/Fiberthree PACF Pro P1" - ], - "IQM1011": [ - "iQ/VXL90 TiQ2 P2" - ], - "IQM2": [ - "iQ/Material4Print ABS Natur P1" - ], - "IQM3": [ - "iQ/Polymaker PETG Polymax black P1" - ], - "IQM7": [ - "iQ/Fiberthree PACF Pro P2" - ], - "LHF_abs": [ - "LH/LHS ABS" - ], - "LHF_asa": [ - "LH/LHS ASA" - ], - "LHF_ftpuf": [ - "LH/LHS TPU Foamy 78A" - ], - "LHF_pccf": [ - "LH/LHS PC CF" - ], - "LHF_pctg": [ - "LH/LHS PCTG" - ], - "LHF_petg": [ - "LH/LHS PETG" - ], - "LHF_pla": [ - "LH/LHS PLA" - ], - "LHF_ptpu_pl": [ - "LH/LHS TPU" - ], - "OF09vOcG": [ - "Elegoo/Elegoo PLA Galaxy" - ], - "OF0Ee2jQ": [ - "Snapmaker/Snapmaker Dual TPU High-Flow" + "OF0GIkJm": [ + "Tiertime/Tiertime Generic PLA Silk" ], "OF0NgY1y": [ "BBL/COEX NYLEX PA6-CF", "OrcaFilamentLibrary/COEX NYLEX PA6-CF" ], - "OF0SyJhk": [ - "Flashforge/Flashforge PA6-CF" - ], - "OF0TODnN": [ - "Elegoo/Generic PET-CF" - ], - "OF0TjJ0G": [ - "Qidi/Qidi ASA-Aero" + "OF0R5Wc7": [ + "Artillery/Artillery PLA Tough" ], "OF0UJcb6": [ - "OrcaFilamentLibrary/PolyLite PETG" + "OrcaFilamentLibrary/PolyLite PETG", + "Snapmaker/PolyLite PETG" ], - "OF0UbONm": [ - "Flashforge/FusRock S-PAHT" - ], - "OF0VEdLB": [ - "Cubicon/Cubicon PETG" + "OF0VpkBM": [ + "Snapmaker/PolyLite PETG Translucent" ], "OF0Vtzaw": [ "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" ], - "OF0Y5MLd": [ - "Qidi/QIDI PETG-GF" + "OF0b7M1z": [ + "SeeMeCNC/SeeMeCNC PA-CF" + ], + "OF0c7mnL": [ + "InfiMech/InfiMech ABS" ], "OF0gGRWk": [ - "OrcaFilamentLibrary/Panchroma PLA Glow" + "OrcaFilamentLibrary/Panchroma PLA Glow", + "Snapmaker/Panchroma PLA Glow" ], "OF0h7ERL": [ + "Elegoo/Elegoo PAHT-CF", "OrcaFilamentLibrary/Elegoo PAHT-CF" ], "OF0kCNDK": [ - "OrcaFilamentLibrary/Panchroma PLA Luminous" + "OrcaFilamentLibrary/Panchroma PLA Luminous", + "Snapmaker/Panchroma PLA Luminous" + ], + "OF0omtEb": [ + "Snapmaker/Fiberon ASA-CF08" ], "OF0pzFLc": [ "BBL/COEX PLA+Silk", "OrcaFilamentLibrary/COEX PLA+Silk" ], + "OF0w7OpJ": [ + "Qidi/QIDI ABS Rapido 0.8 nozzle" + ], "OF0wBGNx": [ "OrcaFilamentLibrary/Bambu ASA-CF" ], - "OF0wk0Pk": [ - "Flashforge/Flashforge PLA Pro" + "OF0wz84w": [ + "Qidi/QIDI ABS Rapido 0.6 nozzle" ], - "OF0z1XpN": [ - "Qidi/QIDI PLA Rapido Silk" + "OF0yFLkY": [ + "Anycubic/Anycubic ASA" ], - "OF17cONC": [ - "Snapmaker/PolyTerra Dual PLA" + "OF0zx94L": [ + "Vzbot/Vzbot Generic PA" + ], + "OF112FvY": [ + "Anycubic/Generic PETG Basic" + ], + "OF1Id239": [ + "Prusa/Prusa Generic PETG" ], "OF1N1qMK": [ - "OrcaFilamentLibrary/Panchroma PLA UV Shift" + "OrcaFilamentLibrary/Panchroma PLA UV Shift", + "Snapmaker/Panchroma PLA UV Shift" + ], + "OF1OZujR": [ + "Flashforge/Flashforge Generic PVA" ], "OF1Pke8t": [ "BBL/Overture Easy PLA", "OrcaFilamentLibrary/Overture Easy PLA" ], "OF1UNk9P": [ + "Creality/Generic PP", "OrcaFilamentLibrary/Generic PP" ], - "OF1Zypyy": [ - "Qidi/QIDI PETG Tough" + "OF1W7c76": [ + "Qidi/QIDI ASA-CF" + ], + "OF1bQyX2": [ + "Flashforge/Flashforge PLA Matte" + ], + "OF1d7c3A": [ + "Snapmaker/Snapmaker ASA" + ], + "OF1daEUW": [ + "Anker/Anker Generic PETG-CF" + ], + "OF1dpPrW": [ + "Qidi/Bambu PLA" ], "OF1hznGB": [ + "Elegoo/Elegoo PLA PRO", "OrcaFilamentLibrary/Elegoo PLA PRO" ], - "OF22AxCm": [ - "Sovol/Polymaker PETG" + "OF1uR1t2": [ + "Tiertime/Tiertime Generic PETG" + ], + "OF223rZv": [ + "Anycubic/Anycubic ABS" + ], + "OF2EB9Iz": [ + "Volumic/Volumic ASA Ultra" ], "OF2EK9F1": [ "OrcaFilamentLibrary/FilAr PLA-mate Violeta" ], "OF2GCW1l": [ - "OrcaFilamentLibrary/SUNLU PETG" + "Flashforge/SUNLU PETG", + "OrcaFilamentLibrary/SUNLU PETG", + "Sovol/SUNLU PETG" ], - "OF2HQqTC": [ - "Cubicon/Cubicon PLA+" - ], - "OF2Psxdc": [ - "Co Print/CoPrint Generic TPU" - ], - "OF2UFmOo": [ - "Qidi/Bambu PLA" + "OF2RjrWH": [ + "Flashforge/FusRock Generic PAHT-GF" ], "OF2VFe4J": [ "OrcaFilamentLibrary/Bambu PAHT-CF" @@ -3363,277 +1709,524 @@ "OF2Z1nT5": [ "OrcaFilamentLibrary/FilAr PETG Azul Imperial" ], + "OF2bZtyg": [ + "Flashforge/Flashforge PLA-CF" + ], + "OF2hfMcG": [ + "OrcaArena/Arena PLA-CF" + ], + "OF2mgDsI": [ + "Vzbot/Vzbot Generic PLA" + ], "OF2pj5l5": [ "BBL/Overture Super PLA+", "OrcaFilamentLibrary/Overture Super PLA+" ], - "OF2tvNYA": [ - "Sovol/Sovol Zero PLA Silk" - ], "OF2xccEe": [], "OF30Ftju": [ + "Elegoo/Elegoo Rapid TPU 95A", "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" ], - "OF38Hyk4": [ - "Flashforge/Flashforge PETG Pro" + "OF3F63OE": [ + "re3D/re3D PETG" ], - "OF3XeEuV": [ - "Qidi/QIDI PET-GF" + "OF3IKafc": [ + "Qidi/QIDI PLA Rapido Matte" ], - "OF3YOOOs": [ - "Chuanying/Chuanying Generic PETG-CF10" + "OF3OMgrI": [ + "Creality/CR-Silk" ], - "OF3arl18": [ - "Elegoo/Elegoo Rapid PETG" + "OF3P0BQA": [ + "Anker/Anker Generic ABS", + "Anker/Anker Generic ABS 0.2 nozzle", + "Anker/Anker Generic ABS 0.25 nozzle" + ], + "OF3WQaKK": [ + "Creality/CR-PETG" + ], + "OF3dJf4E": [ + "Volumic/Volumic PLA Ultra (Performance)" + ], + "OF3fwO8b": [ + "FlyingBear/FlyingBear PLA Basic" ], "OF3kBrdA": [ + "Creality/eSUN PETG", "OrcaFilamentLibrary/eSUN PETG" ], - "OF41QVDH": [ - "Flashforge/Flashforge Generic PLA-Silk" + "OF3msXEa": [ + "Snapmaker/Snapmaker Dual PETG-CF" ], - "OF43idK2": [ - "Creality/Creality Generic PLA Matte" + "OF3s929u": [ + "Tiertime/Tiertime Generic PP" + ], + "OF3wxlw9": [ + "CoLiDo/CoLiDo Generic PETG" + ], + "OF3ydJTT": [ + "InfiMech/InfiMech PLA Hyper" + ], + "OF41jaTh": [ + "Flashforge/Flashforge TPU-90A" + ], + "OF42ZDpN": [ + "Flashforge/FusRock PAHT" + ], + "OF43Raws": [ + "Snapmaker/PolyTerra J1 PLA" ], "OF44VYzK": [ "OrcaFilamentLibrary/FilAr PETG Azul Francia" ], - "OF48G7He": [ - "Qidi/QIDI PETG Tough 0.8 nozzle" + "OF48L671": [ + "Ratrig/RatRig Generic ASA" + ], + "OF4APyxe": [ + "Creality/Hyper PAHT-CF" ], "OF4KsW72": [], - "OF4RKeng": [ - "Flashforge/Flashforge Generic ASA" + "OF4Mf5Gz": [ + "Creality/Creality Generic PETG" + ], + "OF4Nhggz": [ + "Artillery/Artillery PLA Basic+" ], "OF4RvVuU": [], - "OF4gzzE4": [ - "Qidi/QIDI PET-CF" + "OF4S3To3": [ + "Qidi/QIDI PETG Rapido" ], - "OF4jILJA": [ - "FlyingBear/FlyingBear PC" + "OF4WB37S": [ + "Snapmaker/Snapmaker PETG" ], - "OF4m9A5w": [ - "Flashforge/Flashforge Generic HIPS" + "OF4XAUnp": [ + "Vzbot/Vzbot Generic ASA" ], - "OF50NUZI": [ - "FlyingBear/FlyingBear PLA Basic" + "OF4f8vVp": [ + "WonderMaker/WonderMaker PET-CF" + ], + "OF4iWKrE": [ + "Qidi/QIDI PETG-CF" + ], + "OF4nQ62r": [ + "Qidi/QIDI PLA Basic" + ], + "OF4oCRKe": [ + "DeltaMaker/DeltaMaker Generic PETG" + ], + "OF4ulo9Y": [ + "WonderMaker/WonderMaker PVA" + ], + "OF4xhTuK": [ + "OrcaArena/OrcaArena Generic PA-CF" + ], + "OF4zzGwp": [ + "Flashforge/FusRock Generic PET-GF" + ], + "OF51XQar": [ + "CONSTRUCT3D/C1 Generic PLA" + ], + "OF53eLVD": [ + "Creality/Generic ASA-CF", + "Elegoo/Generic ASA-CF" ], "OF54B0S0": [ "OrcaFilamentLibrary/Bambu PPA-CF" ], - "OF57IbZT": [ - "Artillery/Artillery PLA Basic" + "OF54SvEe": [ + "Prusa/Prusament PA-CF" ], - "OF5Bmdtg": [ - "Sovol/Sovol SV06 Plus ACE ABS" + "OF5BN24W": [ + "Flashforge/Flashforge PPA-GF" ], "OF5CgdDq": [ - "OrcaFilamentLibrary/PolyLite PLA" + "OrcaArena/PolyLite PLA", + "OrcaFilamentLibrary/PolyLite PLA", + "Qidi/PolyLite PLA", + "Snapmaker/PolyLite PLA" ], - "OF5J2axC": [ - "Sovol/Sovol Zero PLA Basic" + "OF5E5KNA": [ + "SecKit/SecKit Generic PC" + ], + "OF5NQFKI": [ + "Flashforge/Flashforge PLA Galaxy" + ], + "OF5NqBfC": [ + "Wanhao France/YUMI PETG" ], "OF5P4jgA": [ "OrcaFilamentLibrary/FilAr PLA Dorado" ], - "OF5T1Y9R": [ - "Flashforge/Flashforge ABS Basic" + "OF5PtjTp": [ + "Anycubic/Anycubic PLA Glow" ], - "OF5UUaUM": [ - "Qidi/Qidi Generic PLA High Speed" + "OF5SJ3jz": [ + "Flashforge/Flashforge ABS" ], - "OF5Ugv12": [ - "FlyingBear/Other PLA" + "OF5YVJXH": [ + "Artillery/Artillery ASA" ], - "OF5kwfZu": [ - "Flashforge/FusRock Generic NexPA-CF25" + "OF5Zk4e1": [ + "Anycubic/Anycubic Generic ABS" + ], + "OF5c6nq3": [ + "Flashforge/Generic TPU-64D" + ], + "OF5lGPup": [ + "WonderMaker/WonderMaker PETG Basic" ], "OF5nlfKY": [ "OrcaFilamentLibrary/FilAr PLA Oro" ], + "OF5oNRED": [ + "Eryone/Eryone PP" + ], + "OF5oXk4M": [ + "Anycubic/Polymaker PLA Pro", + "Snapmaker/Polymaker PLA Pro" + ], "OF5rnhjh": [], + "OF5umxxT": [ + "Snapmaker/PolyLite PLA Glow" + ], "OF5vgi2G": [ "OrcaFilamentLibrary/FilAr PLA-mate Azul" ], - "OF60Lmeq": [ - "Flashforge/Flashforge PLA Matte" + "OF5vzBhb": [ + "Chuanying/Chuanying Generic PLA", + "Chuanying/Chuanying PLA" ], - "OF6EOy1A": [ - "Qidi/Bambu PETG" + "OF5w29Kq": [ + "Flashforge/Flashforge HS PETG" ], - "OF6FM5F7": [ - "Flashforge/FusRock PAHT" + "OF65InrS": [ + "Snapmaker/Snapmaker TPU" + ], + "OF66KUAN": [ + "Creality/PolySonic PLA" + ], + "OF67EdL5": [ + "Sovol/Sovol SV06 ACE ABS" + ], + "OF6ATsCF": [ + "Snapmaker/Snapmaker Dual PLA-CF" + ], + "OF6Fpw1E": [ + "Comgrow/Comgrow Generic PETG" + ], + "OF6H51Xx": [ + "Snapmaker/Polymaker PETG", + "Sovol/Polymaker PETG" + ], + "OF6K467o": [ + "InfiMech/InfiMech Generic PA-CF" + ], + "OF6KELDx": [ + "Co Print/CoPrint Generic PLA" ], "OF6Ll8lK": [ + "Elegoo/Elegoo PETG Translucent", "OrcaFilamentLibrary/Elegoo PETG Translucent" ], - "OF6Mxzsg": [ - "Flashforge/Generic TPU" + "OF6MOPWx": [ + "Creality/Generic PET", + "Elegoo/Generic PET", + "Flashforge/Generic PET" ], - "OF6SEkeJ": [ - "Flashforge/FusRock PET-CF" + "OF6O67Xk": [ + "Lulzbot/Lulzbot 2.85mm ABS" ], - "OF6XIeUW": [ - "Flashforge/Generic PLA-CF10" + "OF6TuVAg": [ + "Snapmaker/Snapmaker Breakaway Support For PLA", + "Snapmaker/Snapmaker J1 PVA" ], - "OF6XuVQE": [ - "Cubicon/Cubicon ABS" + "OF6VgL2U": [ + "Phrozen/Phrozen PLA" ], - "OF70DKqH": [ - "Snapmaker/Snapmaker TPE" + "OF6WddJ1": [ + "Flashforge/FusRock S-PAHT" + ], + "OF6kj4jI": [ + "iQ/Fiberthree PACF Pro P2" + ], + "OF6ooviO": [ + "FLSun/FLSun S1 TPU" + ], + "OF6rMr3U": [ + "Flashforge/FusRock Generic S-Multi" + ], + "OF6rdQ6M": [ + "Creality/Generic PPS-CF" + ], + "OF6tKa1Z": [ + "Anker/Anker Generic TPU" + ], + "OF6ueBwd": [ + "Flashforge/Flashforge PLA Pro" + ], + "OF6vKLaU": [ + "Artillery/Artillery Generic ASA" + ], + "OF6xLvYg": [ + "InfiMech/InfiMech Generic PC" + ], + "OF6zAVFj": [ + "Sovol/Sovol Zero TPU" + ], + "OF70zbGS": [ + "Creality/Hyper L-W PLA" + ], + "OF72YYTd": [ + "Snapmaker/Snapmaker ABS" ], "OF74KeQR": [ "OrcaFilamentLibrary/Generic PHA" ], + "OF79Fbo6": [ + "Cubicon/Cubicon PC" + ], "OF7H3VJM": [ "OrcaFilamentLibrary/eSUN PLA-Marble" ], - "OF7M9vy4": [ - "Ratrig/RatRig BigNozzle PLA" + "OF7OqDp3": [ + "Tiertime/Tiertime PLA-CF" ], - "OF7cv1Ub": [ - "Qidi/QIDI PLA-CF" + "OF7SliVn": [ + "Snapmaker/PolyLite J1 PLA" ], - "OF7f0eUZ": [ - "Volumic/Volumic ASA Ultra" + "OF7VJMYM": [ + "Sovol/Sovol Zero PLA Basic" + ], + "OF7c9fln": [ + "Anycubic/Anycubic PLA Translucent" + ], + "OF7g2vYQ": [ + "Co Print/CoPrint Generic TPU" ], "OF7lOgYF": [ "OrcaFilamentLibrary/Generic PETG HF" ], - "OF7tgL9c": [ - "Chuanying/Chuanying ASA", - "Chuanying/Chuanying Generic ASA" + "OF7lwj52": [ + "CoLiDo/CoLiDo PETG" + ], + "OF7nBAd3": [ + "Eryone/Eryone Silk PLA" + ], + "OF7tt7DO": [ + "Cubicon/Cubicon PLA+" + ], + "OF7uE5KB": [ + "Anker/Anker Generic PA-CF" + ], + "OF8CXrvm": [ + "SecKit/SecKit Generic PA" + ], + "OF8GnyFU": [ + "Creality/Hyper ABS" + ], + "OF8Hx3Pi": [ + "Cubicon/Cubicon PETG" + ], + "OF8Jl6NT": [ + "Snapmaker/Snapmaker J1 PET" ], "OF8Tlg47": [ "OrcaFilamentLibrary/Generic PPA-GF" ], - "OF8WvPVL": [ - "Qidi/QIDI ABS Rapido 0.8 nozzle" - ], "OF8aFWfQ": [ "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" ], + "OF8bLDu7": [ + "Blocks/Blocks Generic PA-CF" + ], + "OF8dCquh": [ + "Snapmaker/Snapmaker J1 ABS Benchy" + ], + "OF8eQjjt": [ + "Lulzbot/Lulzbot 2.85mm PETG" + ], + "OF8eaY7j": [ + "Creality/Generic PA612-CF" + ], "OF8jh0Lk": [ "OrcaFilamentLibrary/FilAr PLA-mate Marron" ], + "OF8kJys9": [ + "Eryone/Eryone PETG" + ], "OF8tPByX": [ "OrcaFilamentLibrary/Generic PPA-CF" ], + "OF8wE5l7": [ + "Artillery/Artillery PETG Basic" + ], + "OF97ru74": [ + "Prusa/Prusa Generic PC" + ], + "OF995YXg": [ + "Flashforge/Flashforge TPU-64D" + ], "OF99UMPq": [ "BBL/COEX ABS", "OrcaFilamentLibrary/COEX ABS" ], "OF99vXPs": [], + "OF9EHUKK": [ + "Qidi/QIDI TPU-GF" + ], + "OF9HCdyQ": [ + "Afinia/Afinia PLA" + ], "OF9OlTWH": [ "OrcaFilamentLibrary/Bambu PLA Marble" ], - "OF9RZyBz": [ - "Flashforge/Polymaker Generic S1" + "OF9PELEb": [ + "Qidi/QIDI UltraPA-CF25" ], - "OF9sr3Vn": [ - "Flashforge/Flashforge PLA Sparkle" + "OF9UJOGF": [ + "Anycubic/Anycubic PETG-CF" ], - "OF9tjFbj": [ - "Peopoly/Peopoly Lancer PLA-C" + "OF9emAI9": [ + "Ratrig/RatRig PunkFil PETG" ], - "OF9vnvM8": [ - "Artillery/Artillery PETG-CF" + "OF9fOPpd": [ + "Vzbot/Vzbot Generic PC" ], - "OFAEqlWa": [ - "Flashforge/Flashforge Generic PLA-SILK" + "OF9z5LZ9": [ + "FLSun/FLSun S1 PETG" ], - "OFAGqTQG": [ - "Volumic/Volumic PP Ultra" + "OFA026vt": [ + "OrcaArena/Arena PA-CF" ], - "OFAGrVjP": [ - "Flashforge/Flashforge PLA Silk" + "OFAC7Wyu": [ + "Artillery/Artillery PLA Matte" ], - "OFAHagT9": [ - "Elegoo/Elegoo Rapid PLA+" + "OFACSw9O": [ + "Creality/Creality Generic PLA" ], - "OFAK2XjZ": [ - "InfiMech/Other ABS" + "OFAIBCLJ": [ + "Elegoo/Generic ABS-CF" ], - "OFAUDGEQ": [ - "Qidi/QIDI PLA Rapido Matte" + "OFAIrQXu": [ + "Creality/Creality Hyper PLA" ], - "OFAUX5fB": [ - "CONSTRUCT3D/C1 Generic High Flow PETG" + "OFANFm4x": [ + "Qidi/QIDI PLA Rapido Metal" ], - "OFAbsMuV": [ - "Snapmaker/Snapmaker Dual TPE" + "OFAO9A7J": [ + "Sovol/Sovol Zero PLA Silk HS Nozzle" ], - "OFAdAYYk": [ - "Qidi/QIDI PPS-CF" + "OFAZllAN": [ + "Artillery/Artillery PLA-CF" ], - "OFAdZFD1": [ - "Flashforge/FusRock Generic PET-GF" - ], - "OFAiqi5v": [ - "Elegoo/Elegoo ASA-CF" + "OFAf9pJF": [ + "Flashforge/Flashforge TPU 95A" ], "OFAnyRUI": [ "OrcaFilamentLibrary/Bambu Support For PLA" ], - "OFAnyzjN": [ - "Qidi/HATCHBOX PETG" - ], "OFAt6ec0": [ "OrcaFilamentLibrary/FilAr PLA Marron Oxido" ], - "OFAtydxE": [ - "Flashforge/FusRock S-Multi" + "OFB09fpe": [ + "Ratrig/RatRig Generic TPU" + ], + "OFB0a3hT": [ + "Anker/Anker Generic PLA-CF" + ], + "OFB1Tv1E": [ + "Anycubic/Anycubic Generic PA" ], "OFB5SmWk": [ "OrcaFilamentLibrary/Valment PLA Galaxy" ], - "OFBGxHgT": [ - "FlyingBear/FlyingBear PLA" + "OFB8wSps": [ + "Flashforge/FusRock PET-CF" ], - "OFBRSZom": [ - "Volumic/PPS Carbone (Performance)" + "OFB9dx27": [ + "Blocks/Blocks Generic ASA" + ], + "OFBBgw7B": [ + "WonderMaker/WonderMaker PLA Wood" + ], + "OFBC32Wb": [ + "Flashforge/FusRock PET" + ], + "OFBIadjM": [ + "Chuanying/Chuanying ASA", + "Chuanying/Chuanying Generic ASA" + ], + "OFBJAdLw": [ + "LH/LHS PCTG" + ], + "OFBK6zAi": [ + "Flashforge/Flashforge PETG-CF" + ], + "OFBLktDy": [ + "Creality/Soleyin Basic PETG" ], "OFBSW57R": [ "OrcaFilamentLibrary/Bambu PLA Aero" ], "OFBUIlZ7": [ + "Elegoo/Elegoo PLA+", "OrcaFilamentLibrary/Elegoo PLA+" ], - "OFBvxnjM": [ - "Elegoo/Elegoo PETG-GF" + "OFBlFMVp": [ + "Snapmaker/Snapmaker Dual PETG" + ], + "OFBoSWxb": [ + "Snapmaker/PolyLite PLA Luminous" + ], + "OFBpcB0a": [ + "TwoTrees/TwoTrees Generic HS PLA" + ], + "OFBtlI8M": [ + "FlyingBear/FlyingBear Generic ABS" ], "OFBw6eEG": [ "OrcaFilamentLibrary/Overture Matte PLA" ], - "OFC2FSsV": [ - "Qidi/Overture PLA" + "OFC1PzXz": [ + "Creality/Hyper Luminous" ], - "OFC5CCeo": [ - "Flashforge/Flashforge Generic PETG-CF" + "OFC20UMj": [ + "Flashforge/Flashforge Generic TPU" + ], + "OFC5f4Ay": [ + "RH3D/Generic PCCF" ], "OFC78WGQ": [ - "OrcaFilamentLibrary/Panchroma PLA Starlight" + "OrcaFilamentLibrary/Panchroma PLA Starlight", + "Snapmaker/Panchroma PLA Starlight" ], "OFCD8qiU": [ "OrcaFilamentLibrary/Generic EVA" ], + "OFCEA7Nt": [ + "Sovol/Sovol SV06 Plus ACE ABS" + ], "OFCIUsWh": [ - "OrcaFilamentLibrary/Panchroma PLA Translucent" + "OrcaFilamentLibrary/Panchroma PLA Translucent", + "Snapmaker/Panchroma PLA Translucent" ], - "OFCJaXZS": [ - "Flashforge/Flashforge PPS" + "OFCJpR7a": [ + "Creality/HP Ultra PLA" ], - "OFCKK3u9": [ - "FlyingBear/FlyingBear PA-CF" + "OFCVUEaV": [ + "Tiertime/Tiertime Generic TPU" + ], + "OFCZsqXg": [ + "Creality/Hyper PLA" + ], + "OFCaJHAA": [ + "Flashforge/FusRock Generic S-PAHT" ], "OFCccVrQ": [ - "OrcaFilamentLibrary/PolyTerra Dual PLA" + "OrcaFilamentLibrary/PolyTerra Dual PLA", + "Snapmaker/PolyTerra Dual PLA" ], - "OFCgpxn2": [ - "Prusa/Prusa Generic ABS HF" - ], - "OFChH9xu": [ - "Snapmaker/Snapmaker J1 TPE" + "OFCcsYtf": [ + "FLSun/FLSun Generic ASA" ], "OFCidU7j": [ "OrcaFilamentLibrary/DREMC ABS-GF" @@ -3641,36 +2234,80 @@ "OFCjG251": [ "OrcaFilamentLibrary/FilAr PLA-mate Verde" ], + "OFCnywiC": [ + "Tiertime/Tiertime PET-CF" + ], "OFCoRobU": [ "OrcaFilamentLibrary/Elas ASA" ], + "OFCp3Bgo": [ + "Anycubic/Anycubic PLA SE" + ], + "OFCu3jES": [], + "OFCuaCer": [ + "Volumic/Désactivé" + ], + "OFD21ije": [ + "Cubicon/Cubicon PA-CF" + ], + "OFD2JNS1": [ + "Dremel/Dremel Generic PLA" + ], + "OFD6kN7F": [ + "OrcaArena/OrcaArena Generic PLA" + ], + "OFD9taow": [ + "FlyingBear/FlyingBear PLA Hyper" + ], "OFDETOM6": [ + "Creality/eSUN PLA-Matte", "OrcaFilamentLibrary/eSUN PLA-Matte" ], "OFDGigEI": [ "OrcaFilamentLibrary/Bambu PLA Dynamic" ], - "OFDMWB6t": [ - "Elegoo/Elegoo PLA+" + "OFDJU6R3": [ + "Afinia/Afinia TPU" + ], + "OFDKIKyw": [ + "Snapmaker/Snapmaker Dual PVA" + ], + "OFDKgoqx": [ + "Flashforge/Flashforge PLA" + ], + "OFDRpXLZ": [ + "FlyingBear/Other PETG", + "InfiMech/Other PETG" ], "OFDSrzZ8": [ + "Creality/Generic PLA", + "Custom/Generic PLA", + "Elegoo/Generic PLA", "Flashforge/Generic PLA", + "LONGER/Generic PLA", "OrcaFilamentLibrary/Generic PLA", - "Sovol/Generic PLA" + "RH3D/Generic PLA", + "Sovol/Generic PLA", + "Z-Bolt/Generic PLA" ], "OFDe8uyM": [ "OrcaFilamentLibrary/Valment PLA" ], - "OFDkABjZ": [ - "Flashforge/Generic TPU-90A" + "OFDeTsJw": [ + "Chuanying/Chuanying Generic HIPS" + ], + "OFDgQaca": [ + "FlyingBear/FlyingBear PETG" ], "OFDpW3J8": [ "OrcaFilamentLibrary/FILL3D PLA Basic" ], - "OFDramZ2": [ - "Co Print/CoPrint Generic PETG" + "OFDtop41": [ + "Creality/Generic Support for PA" ], "OFDvXujf": [ + "Creality/Generic PVA", + "Custom/Generic PVA", "OrcaFilamentLibrary/Generic PVA" ], "OFDvqJ6n": [ @@ -3683,123 +2320,297 @@ "BBL/COEX TPU 60A", "OrcaFilamentLibrary/COEX TPU 60A" ], - "OFE22Uba": [ - "Flashforge/Flashforge TPU-90A" + "OFEE1Dld": [ + "Artillery/Artillery Generic TPU" ], "OFEGNJD4": [ "OrcaFilamentLibrary/Bambu PLA Silk" ], - "OFEYKrjb": [ - "Artillery/Artillery PETG" + "OFEMfQsX": [ + "Flashforge/Flashforge PETG Basic" + ], + "OFENzGSm": [ + "FLSun/FLSun T1 TPU" + ], + "OFEOnBj6": [ + "Snapmaker/Snapmaker PLA Lite" + ], + "OFETFWx7": [ + "SecKit/SecKit Generic PLA" + ], + "OFEWYR89": [ + "Qidi/Generic PLA+" ], "OFEZ449N": [ "OrcaFilamentLibrary/FilAr PLA-mate Uva" ], - "OFEdyZqS": [ - "Anycubic/Anycubic PLA Luminous" + "OFEZNNw1": [ + "Ratrig/RatRig Generic PA" + ], + "OFEZpel7": [ + "Volumic/PPS Carbone (Performance)" + ], + "OFEabreg": [ + "Anycubic/Fiberon PA6-CF20", + "Snapmaker/Fiberon PA6-CF20" + ], + "OFEbIx49": [ + "WonderMaker/WonderMaker PLA Marble" ], "OFEhuUNq": [], + "OFEj7sca": [ + "Cubicon/Cubicon PC" + ], + "OFEjbwqG": [ + "Snapmaker/PolyTerra PLA+" + ], "OFEkPBwx": [ "OrcaFilamentLibrary/Bambu PLA Glow" ], + "OFEmsric": [ + "Snapmaker/Snapmaker PA-CF" + ], + "OFEnbt6D": [ + "Peopoly/Peopoly Lancer PLA-C" + ], "OFEswT5W": [ "OrcaFilamentLibrary/Bambu PLA-CF" ], - "OFF9OKoY": [ - "OrcaFilamentLibrary/PolyLite PLA Pro" + "OFEwRwmL": [ + "Cubicon/Cubicon PLA" ], - "OFFIL5pD": [ - "Qidi/QIDI PA12-CF" + "OFF3cuzT": [ + "Creality/Generic TPU 64D" + ], + "OFF73Bvp": [ + "SecKit/SecKit Generic PLA-CF" + ], + "OFF9OKoY": [ + "OrcaFilamentLibrary/PolyLite PLA Pro", + "Snapmaker/PolyLite PLA Pro" + ], + "OFF9cgY5": [ + "Snapmaker/Snapmaker PLA Matte" + ], + "OFFC0VqZ": [ + "Ratrig/RatRig BigNozzle PCTG" ], "OFFNYwWR": [ "OrcaFilamentLibrary/Bambu PA-CF" ], - "OFFenwbU": [ - "FLSun/FLSun S1 PLA Silk" + "OFFP4ORR": [ + "Creality/Creality Hyper ABS" + ], + "OFFX1DRD": [ + "FlyingBear/FlyingBear PC" + ], + "OFFZ0BBL": [ + "FlyingBear/FlyingBear Generic PLA" + ], + "OFFZ458u": [ + "Snapmaker/Fiberon PA612-ESD" + ], + "OFFbQscs": [ + "Creality/eSUN PETG-Basic" ], "OFFkCLBl": [ - "OrcaFilamentLibrary/Panchroma PLA Galaxy" - ], - "OFFmJ8aR": [ - "FlyingBear/Other PLA Hyper" - ], - "OFFrbsvQ": [ - "InfiMech/Other TPU" + "OrcaFilamentLibrary/Panchroma PLA Galaxy", + "Snapmaker/Panchroma PLA Galaxy" ], "OFFvzqcd": [ "OrcaFilamentLibrary/Bambu PETG Basic" ], - "OFG8vHw8": [ - "Qidi/Qidi Generic ASA" + "OFFwJWea": [ + "Anycubic/Anycubic PLA Silk" ], - "OFGFZhWu": [ - "Sovol/Sovol SV06 ACE PETG" + "OFFxZ7hZ": [ + "Chuanying/Chuanying Generic PLA-CF10" + ], + "OFG0kOKX": [ + "Volumic/Volumic PETG Ultra" + ], + "OFG2RkhN": [ + "Creality/CR-TPU" + ], + "OFG4do34": [ + "Qidi/Qidi ASA-Aero" + ], + "OFGDaEHO": [ + "Tiertime/Tiertime Generic BVOH" + ], + "OFGGyAgJ": [ + "Vzbot/Vzbot Generic TPU" + ], + "OFGJ1nxs": [ + "FlyingBear/Other PLA", + "InfiMech/Other PLA" + ], + "OFGKLoUm": [ + "Anycubic/Anycubic Generic TPU" + ], + "OFGLeiNL": [], + "OFGPJxnt": [ + "Anker/Anker Generic PC", + "Anker/Anker Generic PC 0.2 nozzle", + "Anker/Anker Generic PC 0.25 nozzle" ], "OFGVwfK0": [ "OrcaFilamentLibrary/FilAr PLA-mate Gris" ], - "OFGb4hPY": [ - "Anycubic/Anycubic PEBA 95A" - ], + "OFGc282l": [], "OFGcLA5R": [ "OrcaFilamentLibrary/FilAr PLA-mate Beige" ], - "OFGfdP6J": [ - "Flashforge/FusRock Generic S-Multi" + "OFGcMkEB": [ + "Creality/HP-TPU" + ], + "OFGdP6Na": [ + "Volumic/Volumic PVA" ], "OFGkyftV": [ "BBL/Overture Silk PLA", "OrcaFilamentLibrary/Overture Silk PLA" ], + "OFGwT5Av": [ + "Creality/Creality Hyper PLA-CF" + ], + "OFGwZmgS": [ + "Creality/CR-ABS" + ], + "OFGxC8gB": [ + "Creality/CR-Wood" + ], + "OFGzUNbm": [ + "Tiertime/Tiertime Generic PPS-CF" + ], "OFH2nN08": [ "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" ], + "OFH5UH6P": [ + "Flashforge/Flashforge ABS-GF" + ], + "OFH6Pjxe": [ + "Flashforge/Flashforge PLA Matte" + ], + "OFH7b12v": [ + "Creality/Generic PAHT-CF" + ], "OFHAccHz": [ "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" ], - "OFHBTqyD": [ - "Flashforge/Flashforge PLA Basic" + "OFHFZ1Te": [ + "Prusa/Prusa Generic PLA Silk" ], - "OFHDaMut": [ - "Volumic/PA6 CF20 (Performance)" + "OFHQUAoZ": [ + "FLSun/FLSun Generic PA-CF" ], - "OFHL32M0": [ - "Anycubic/Anycubic TPU" + "OFHTVfaU": [ + "Sovol/Sovol Zero PETG" + ], + "OFHUnLY2": [ + "Vzbot/Vzbot Generic PETG" ], "OFHWSM21": [ "OrcaFilamentLibrary/Fiberon PET-CF" ], + "OFHa3RZT": [ + "Tiertime/Tiertime Generic PA-CF" + ], "OFHa48An": [ "OrcaFilamentLibrary/Bambu PET-CF" ], + "OFHaYaB1": [ + "Creality/eSUN PET-Basic" + ], + "OFHf2lKK": [ + "FlyingBear/FlyingBear TPU Basic" + ], "OFHfzQXo": [ "OrcaFilamentLibrary/Eolas Prints PLA Transition" ], + "OFHknN4v": [ + "Anycubic/Polymaker PLA Pro Metallic", + "Snapmaker/Polymaker PLA Pro Metallic" + ], "OFHmPYRy": [ + "Flashforge/SUNLU PLA+ 2.0", "OrcaFilamentLibrary/SUNLU PLA+ 2.0" ], - "OFHtQDC9": [ - "Elegoo/Elegoo PLA Basic" + "OFI6WZpn": [ + "OrcaArena/Arena Support W" + ], + "OFI80Hct": [ + "Anycubic/Anycubic Generic ASA" ], "OFIBXa0k": [ "OrcaFilamentLibrary/FilAr PLA-mate Rojo" ], + "OFIE3vOf": [ + "Anycubic/Anycubic PLA Matte" + ], + "OFIK0xFa": [ + "FLSun/FLSun S1 ASA" + ], + "OFIPjqHt": [ + "OrcaArena/Arena Support G" + ], + "OFIRUqWi": [ + "Creality/eSUN PLA-Silk" + ], + "OFIVWJPm": [ + "InfiMech/InfiMech TPU" + ], + "OFIWMSGX": [ + "Qidi/HATCHBOX PETG" + ], + "OFIYTy8S": [ + "Anker/Anker Generic PLA+", + "Anker/Anker Generic PLA+ 0.2 nozzle", + "Anker/Anker Generic PLA+ 0.25 nozzle" + ], + "OFIZMQwM": [ + "LH/LHS TPU" + ], "OFIamQnD": [ "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" ], + "OFIda816": [ + "Vzbot/Vzbot Generic PVA" + ], + "OFIeCuXj": [ + "Peopoly/Peopoly Generic PETG" + ], "OFIegjmD": [ "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" ], "OFIfnzxC": [ "OrcaFilamentLibrary/Bambu Support For PLA/PETG" ], - "OFIl3ar9": [ - "Sovol/Sovol SV08 PETG" + "OFIgbDHq": [ + "Anycubic/Anycubic PLA Luminous" ], - "OFIzguhB": [ - "Volumic/Volumic UNIVERSAL Ultra" + "OFIieIka": [ + "Flashforge/Polymaker CoPA" + ], + "OFIxOuOu": [ + "Snapmaker/PolyLite PLA Starlight" + ], + "OFIxitiU": [ + "Flashforge/Flashforge PLA Basic" + ], + "OFIy3kLw": [ + "Prusa/Prusa Generic PA" + ], + "OFJ3HRsR": [ + "OrcaArena/Arena ABS" + ], + "OFJ80y1e": [ + "FLSun/FLSun T1 PETG" ], "OFJHBEGD": [], + "OFJJpaLS": [ + "FLSun/FLSun Generic PETG" + ], "OFJNeELv": [ "OrcaFilamentLibrary/FILL3D PA" ], @@ -3810,32 +2621,65 @@ "OFJQDUk3": [ "OrcaFilamentLibrary/FilAr PETG Cristal" ], + "OFJSksUs": [ + "FLSun/FLSun Generic PLA" + ], + "OFJVFpJz": [ + "Sovol/Sovol Zero PLA Silk" + ], + "OFJWKoYG": [ + "iQ/Material4Print ABS Natur P1" + ], + "OFJYpVAQ": [ + "Flashforge/Generic TPU-90A" + ], + "OFJfv07m": [ + "Sovol/Sovol SV06 ACE TPU" + ], + "OFJgijky": [ + "Snapmaker/PolyLite CosPLA" + ], + "OFJhT2fd": [ + "Snapmaker/Snapmaker Dual ABS" + ], + "OFJrvXth": [ + "Snapmaker/Snapmaker ABS Benchy" + ], "OFJs1ToM": [ "BBL/COEX NYLEX UNFILLED " ], "OFJu1XwK": [ "OrcaFilamentLibrary/NIT PETG" ], - "OFK39W9u": [ - "Flashforge/Flashforge Generic PETG-CF10" + "OFJxSqO4": [ + "Wanhao France/YUMI PLA Direct Drive" ], - "OFK820gS": [ - "Qidi/QIDI ASA" + "OFK01afJ": [ + "Qidi/Qidi Generic PC" ], - "OFKDnrjL": [ - "Artillery/Artillery PLA Matte" + "OFK4LdYI": [ + "Prusa/Prusa Generic ASA HF" ], - "OFKH15Hd": [ - "Sovol/Sovol SV08 ABS" + "OFK74HJD": [ + "Flashforge/Flashforge PLA Pro" + ], + "OFK8XHPn": [ + "Qidi/Overture ABS" + ], + "OFKIQO2W": [ + "Qidi/QIDI PLA Rapido" ], "OFKKajh6": [ "OrcaFilamentLibrary/FilAr PLA Gris Plata" ], + "OFKNAhls": [ + "Qidi/Qidi Generic PETG" + ], "OFKTSiYF": [ "OrcaFilamentLibrary/FilAr PLA Blanco Calido" ], - "OFKWVi10": [ - "Flashforge/Flashforge Generic PLA-CF10" + "OFKUEXPA": [ + "Snapmaker/Snapmaker Dual ASA" ], "OFKWWgyp": [ "OrcaFilamentLibrary/FilAr PLA Carpincho" @@ -3843,115 +2687,231 @@ "OFKZ9skj": [ "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" ], - "OFKZH00L": [ - "Flashforge/FusRock Generic PET-CF" + "OFKbdiiJ": [ + "Creality/PolySonic PLA Pro" + ], + "OFKfJTwL": [ + "Qidi/QIDI PET-CF" + ], + "OFKgmsqE": [ + "Qidi/QIDI PAHT-CF" ], "OFKhMPeX": [ "OrcaFilamentLibrary/Bambu PC" ], - "OFKhtNBx": [ - "Snapmaker/Snapmaker J1 TPU High-Flow" - ], "OFKiSMWR": [ - "OrcaFilamentLibrary/Panchroma PLA Marble" + "OrcaFilamentLibrary/Panchroma PLA Marble", + "Snapmaker/Panchroma PLA Marble" ], - "OFKjlAbC": [ - "Qidi/QIDI UltraPA-CF25" + "OFKo87c6": [ + "Snapmaker/Snapmaker TPU 95A" ], - "OFKzh9lx": [ - "InfiMech/InfiMech PLA" + "OFKpQTJI": [ + "Flashforge/Flashforge TPU 65D" ], - "OFL4BLAC": [ - "iQ/Grauts HPP4GF25 P1" + "OFKuTr12": [ + "Tiertime/Tiertime Generic PE" ], - "OFL4KniM": [ - "Elegoo/Elegoo Rapid TPU 95A" + "OFKyCgaK": [ + "Anycubic/Anycubic Generic PLA" ], - "OFL7U2MV": [ - "Ratrig/RatRig PunkFil ABS" + "OFLAXKqP": [ + "WonderMaker/WonderMaker TPU 95A" ], - "OFL7vEML": [ - "Flashforge/FlashForge PC" + "OFLBUkwC": [ + "Vzbot/Vzbot Generic ABS" + ], + "OFLC1oRH": [ + "Flashforge/Flashforge PPA-CF" + ], + "OFLDSqqi": [ + "Flashforge/Flashforge Generic ABS" ], "OFLJ8S6I": [ + "Flashforge/SUNLU Wood PLA", "OrcaFilamentLibrary/SUNLU Wood PLA" ], "OFLNgV3C": [], + "OFLOf6Sc": [ + "Tiertime/Tiertime TPU 95A" + ], "OFLPAxz3": [ + "Creality/Generic ASA", "Custom/Generic ASA", - "OrcaFilamentLibrary/Generic ASA" + "Elegoo/Generic ASA", + "Flashforge/Generic ASA", + "OrcaFilamentLibrary/Generic ASA", + "RH3D/Generic ASA" ], "OFLXvuMr": [ + "Elegoo/Elegoo Rapid PETG", "OrcaFilamentLibrary/Elegoo Rapid PETG" ], + "OFLYDIb8": [ + "Flashforge/Flashforge PLA Silk" + ], + "OFLYDngx": [ + "Qidi/Bambu PETG" + ], "OFLakOUI": [ + "Creality/Generic PC", + "Custom/Generic PC", + "Elegoo/Generic PC", "OrcaFilamentLibrary/Generic PC", "Sovol/Generic PC" ], + "OFLbXwoL": [ + "Artillery/Artillery PLA Silk" + ], + "OFLbdkrE": [ + "Snapmaker/Snapmaker J1 PLA Eco" + ], "OFLcd093": [ + "Elegoo/Elegoo PETG", "OrcaFilamentLibrary/Elegoo PETG" ], - "OFLeFaUO": [ - "Flashforge/Flashforge Generic PVA" + "OFLfywkp": [ + "Afinia/Afinia ABS+" ], - "OFLhOFQk": [ - "Volumic/Volumic ASA Ultra (Performance)" + "OFLgwqp2": [ + "Creality/Hyper PETG-GF" ], - "OFLiTjQK": [ - "FlyingBear/Other PA-CF" + "OFLrdHse": [ + "Flashforge/Flashforge Generic HS PLA" ], - "OFLriDvE": [ - "Creality/Creality Generic PLA High Speed" + "OFLuczRG": [ + "Creality/Creality Generic ASA-CF" ], - "OFLxO2Oc": [ - "Flashforge/FusRock PET" + "OFLzx3J4": [ + "Creality/Hyper Marble" ], - "OFM3PeVe": [ - "Flashforge/Flashforge ASA-CF" + "OFM0xjBG": [ + "Creality/CR-PLA Matte" + ], + "OFM4iJlv": [ + "Creality/Generic PA12-CF" + ], + "OFM87w9T": [ + "Tiertime/Tiertime Generic SBS" ], "OFM91vZs": [ "BBL/Overture ASA", "OrcaFilamentLibrary/Overture ASA" ], - "OFMHTnPP": [ - "Flashforge/Flashforge PA12-CF" + "OFMDHOcT": [ + "Qidi/QIDI TPU-Aero" + ], + "OFMEbuBE": [ + "Blocks/Blocks Generic TPU" + ], + "OFMIma8C": [ + "Flashforge/Flashforge PLA Luminous" + ], + "OFMIurFh": [ + "Creality/Creality HF Generic Speed PLA" + ], + "OFMK5gVo": [ + "WonderMaker/WonderMaker PLA Basic" + ], + "OFML2aVd": [ + "Anycubic/Anycubic TPU 95A" + ], + "OFMSvS8z": [ + "Artillery/Artillery PA" + ], + "OFMTBcnz": [ + "Tiertime/Tiertime Generic PP-CF" ], "OFMTK0UC": [ "OrcaFilamentLibrary/Bambu Support For PA/PET" ], "OFMUWNkp": [ + "Flashforge/SUNLU PLA+", "OrcaFilamentLibrary/SUNLU PLA+" ], + "OFMZAoqa": [ + "Tiertime/Tiertime Generic PVA" + ], "OFMZvH0z": [ "BBL/Overture Rock PLA", "OrcaFilamentLibrary/Overture Rock PLA" ], + "OFMgJQCZ": [ + "Anker/Anker Generic PA", + "Anker/Anker Generic PA 0.2 nozzle", + "Anker/Anker Generic PA 0.25 nozzle" + ], "OFMjtqTC": [ "OrcaFilamentLibrary/Bambu PLA Wood" ], + "OFMoLF46": [ + "FLSun/FLSun Generic TPU" + ], + "OFMpxamb": [ + "Flashforge/Flashforge PETG" + ], + "OFMqYusc": [ + "Creality/Creality Generic PA" + ], + "OFMsDGbs": [ + "Anycubic/Anycubic TPU" + ], "OFMuXBmO": [ "OrcaFilamentLibrary/Elas PLA Basic" ], - "OFN0X7oN": [ - "Qidi/QIDI PLA Basic" + "OFMyLYV8": [ + "Flashforge/Flashforge PETG Transparent" ], - "OFN0pBpo": [ - "Qidi/Qidi Generic TPU 95A" + "OFN7aNHe": [ + "Tiertime/Tiertime Generic PC" ], - "OFNQHqAV": [ - "Cubicon/Cubicon ABSk" + "OFN9fefN": [ + "Cubicon/Cubicon ABS-A100" ], - "OFNRgSch": [ - "Artillery/Artillery PC" + "OFNBlAPT": [ + "OrcaArena/Arena PETG Basic" + ], + "OFNGTH3w": [ + "Tiertime/Tiertime PLA" + ], + "OFNLXV8X": [ + "Tiertime/Tiertime Generic ABS" + ], + "OFNOxcYl": [ + "Ratrig/RatRig Generic PA-CF" + ], + "OFNQKF0M": [ + "Tiertime/Tiertime ABS" + ], + "OFNSYu5h": [ + "Volumic/Volumic PP Ultra (Performance)" ], "OFNU9YIW": [ "OrcaFilamentLibrary/FilAr PETG Azul Boreal" ], - "OFNX5uRT": [ - "Qidi/QIDI TPU-Aero" + "OFNW4ZTC": [ + "Creality/Creality Generic PLA Wood" ], - "OFNbajj9": [ - "Creality/Creality Generic ASA-CF" + "OFNWcJsM": [ + "Comgrow/Comgrow T300 PLA" + ], + "OFNWnx2c": [ + "Flashforge/Flashforge TPU-95A" + ], + "OFNX8GI1": [ + "Sovol/Sovol Zero ABS" + ], + "OFNYewRS": [ + "Blocks/Blocks Generic PLA" + ], + "OFNZYgLA": [ + "Qidi/Qidi Generic PVA" + ], + "OFNZjrLo": [ + "Sovol/Sovol SV06 Plus ACE PLA" + ], + "OFNcdCrm": [ + "Anycubic/Anycubic Generic PLA-CF" ], "OFNemJM6": [ "OrcaFilamentLibrary/FilAr PLA Cobre" @@ -3962,293 +2922,498 @@ "OFNk8bxk": [ "OrcaFilamentLibrary/Bambu PA6-GF" ], - "OFNvrbnf": [ - "Co Print/CoPrint Generic ABS" + "OFNn21yM": [ + "Vzbot/Vzbot Generic PA-CF" ], - "OFNz8rrn": [ - "FlyingBear/FlyingBear PLA Hyper" + "OFNstOna": [ + "Eryone/Eryone PETG-CF" + ], + "OFNvBIL0": [ + "Creality/Hyper PPA-CF" ], "OFO1GEq6": [ - "OrcaFilamentLibrary/Panchroma PLA Neon" + "OrcaFilamentLibrary/Panchroma PLA Neon", + "Snapmaker/Panchroma PLA Neon" ], - "OFO3IOWM": [ - "Volumic/PETG ESD (Performance)" - ], - "OFO5R9KJ": [ - "Sovol/Sovol Zero TPU" + "OFO5djrM": [ + "Flashforge/Generic PETG-CF10" ], "OFOABq7t": [ "BBL/AliZ PETG-Metal", "OrcaFilamentLibrary/AliZ PETG-Metal" ], - "OFOJUJAS": [ - "Cubicon/Cubicon PA-CF" + "OFOAdMCB": [ + "OrcaArena/Arena PLA Metal" ], - "OFOSzSuh": [ - "Flashforge/Flashforge PA-CF" + "OFOHOf2F": [ + "Creality/eSUN PLA-HS" ], - "OFOW9K96": [ - "Qidi/Qidi TPU 95A-HF" + "OFOJPAAS": [ + "iQ/VXL90 TiQ2 P2" + ], + "OFOKYhi6": [ + "Prusa/Prusa Generic PETG HF" + ], + "OFObG16Q": [ + "InfiMech/InfiMech PLA Basic" + ], + "OFObyktP": [ + "Tiertime/Tiertime PETG" ], "OFOiJfLM": [ "OrcaFilamentLibrary/FILL3D PETG CF" ], - "OFOkTA0C": [ - "Elegoo/Elegoo PETG Translucent" - ], - "OFOp3Oef": [ - "Anycubic/Generic ABS" + "OFOnSNt3": [ + "Artillery/Artillery PETG-CF" ], "OFOsHDnB": [ + "Elegoo/Elegoo PETG PRO", "OrcaFilamentLibrary/Elegoo PETG PRO" ], - "OFOvv91M": [ - "OrcaFilamentLibrary/PolyLite ABS" + "OFOuEEvv": [ + "Qidi/QIDI ABS Rapido 0.2 nozzle" ], - "OFOysPuE": [ - "Qidi/QIDI TPU-GF" + "OFOvv91M": [ + "OrcaFilamentLibrary/PolyLite ABS", + "Qidi/PolyLite ABS" + ], + "OFOwQuZM": [ + "Snapmaker/Snapmaker PETG-CF" + ], + "OFOzwywz": [ + "Eryone/Eryone ABS" ], "OFP26zNb": [ "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" ], - "OFP4poIv": [ - "Sovol/Sovol Zero PLA Silk HS Nozzle" + "OFPHLnoe": [ + "Creality/HP-ASA" ], - "OFPGelMX": [ - "Volumic/Volumic PP Ultra (Performance)" - ], - "OFPJJxkF": [ - "Flashforge/Flashforge PET-CF" - ], - "OFPJrlC3": [ - "Flashforge/Flashforge PLA-CF" + "OFPQfNAf": [ + "Flashforge/Flashforge PETG Pro" ], "OFPWPlSC": [ "OrcaFilamentLibrary/FILL3D PP" ], + "OFPYDWgC": [ + "Peopoly/Peopoly Lancer PET-CF" + ], "OFPbyOSk": [ "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" ], "OFPc4zVY": [ "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" ], - "OFPeGtB1": [ - "Volumic/Volumic UNIVERSAL Ultra (Performance)" + "OFPdhDlK": [ + "Anycubic/Anycubic Generic PA-CF" + ], + "OFPjOUtz": [ + "Flashforge/FusRock Generic PAHT-CF" ], "OFPkCJKE": [ - "OrcaFilamentLibrary/Panchroma PLA Satin" + "Creality/Panchroma PLA Satin", + "OrcaFilamentLibrary/Panchroma PLA Satin", + "Snapmaker/Panchroma PLA Satin" ], "OFPklMI1": [ "OrcaFilamentLibrary/Generic PE" ], - "OFPokkKe": [ - "Qidi/QIDI PETG-CF" - ], "OFPoyiFs": [ - "OrcaFilamentLibrary/Polymaker HT-PLA" + "OrcaFilamentLibrary/Polymaker HT-PLA", + "Snapmaker/Polymaker HT-PLA" ], "OFPqX3x2": [ "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" ], - "OFPwi9X0": [ - "Qidi/HATCHBOX ABS" + "OFPryWt5": [ + "Lulzbot/Lulzbot 2.85mm PLA" + ], + "OFPy0Ogq": [ + "Qidi/Qidi Generic PA-CF" + ], + "OFQ1KzO8": [ + "Snapmaker/Snapmaker J1 PLA Silk" + ], + "OFQ1zgm3": [ + "Eryone/Eryone ABS-CF" ], "OFQ3e56w": [ "OrcaFilamentLibrary/Bambu PLA Galaxy" ], - "OFQ5xAKf": [ - "Chuanying/Chuanying Generic PVA" + "OFQ40XeN": [ + "Qidi/QIDI PETG Tough" ], - "OFQ9dI8j": [ - "Prusa/Prusa Generic PC HF" + "OFQ7I5vC": [ + "Prusa/Prusa Generic PLA-CF" ], - "OFQCAYAt": [ - "Flashforge/Flashforge PPA-CF" + "OFQ9qnkd": [ + "FLSun/FLSun T1 PLA High Speed" + ], + "OFQC8Vna": [ + "Flashforge/Flashforge Generic PETG-CF" + ], + "OFQEGL7z": [ + "FlyingBear/FlyingBear PA-CF" + ], + "OFQGvU2G": [ + "OrcaArena/Arena TPU 95A" ], "OFQHiNJs": [ "OrcaFilamentLibrary/Bambu Support G" ], "OFQLcbps": [ + "Creality/Generic PA-CF", "Custom/Generic PA-CF", "OrcaFilamentLibrary/Generic PA-CF" ], + "OFQMTRc8": [ + "Snapmaker/Snapmaker J1 PETG" + ], + "OFQMsFfF": [ + "Qidi/QIDI ABS-GF10" + ], + "OFQTrLXB": [ + "Qidi/Qidi Generic PLA-CF" + ], "OFQWIKbV": [ "OrcaFilamentLibrary/FilAr PLA Titanio" ], - "OFQZINrX": [ - "Qidi/QIDI ABS-GF10" + "OFQYaiGg": [ + "Snapmaker/Snapmaker PET" + ], + "OFQZeyZv": [ + "Flashforge/Flashforge PLA Buint Ti" ], "OFQbjX3s": [ "OrcaFilamentLibrary/FILL3D PETG" ], - "OFR8dTVW": [ - "FLSun/FLSun S1 PLA High Speed" + "OFQbqeN7": [ + "Qidi/Qidi Generic PA" ], - "OFRNU58t": [ - "Flashforge/Flashforge TPU 95A" + "OFQdaVZS": [ + "Creality/Generic PET-CF", + "Elegoo/Generic PET-CF" ], - "OFRR8LUh": [ - "Flashforge/Generic ASA" + "OFQe7sAx": [ + "Anycubic/Anycubic PA6-CF" ], - "OFRgDMDJ": [ - "Flashforge/Flashforge PETG Transparent" + "OFQiq4fb": [ + "Flashforge/Flashforge PVA" + ], + "OFQswlnF": [ + "Tiertime/Tiertime Generic PA" + ], + "OFR0gODA": [ + "SeeMeCNC/SeeMeCNC ABS" + ], + "OFRDLNM9": [ + "Peopoly/Peopoly Generic PLA" + ], + "OFRJ325z": [ + "LH/LHS PETG" + ], + "OFRPEs5o": [ + "Flashforge/Flashforge Generic ASA" + ], + "OFRhBryT": [ + "Cubicon/Cubicon PLAi21" + ], + "OFRhCTUg": [ + "Anycubic/Anycubic PET-CF" + ], + "OFRi7v0b": [ + "Sovol/Sovol SV08 PETG" ], "OFRiFnfQ": [ "OrcaFilamentLibrary/Eolas Prints PETG Transition" ], "OFRiYgMK": [ - "OrcaFilamentLibrary/Panchroma PLA Celestial" + "OrcaFilamentLibrary/Panchroma PLA Celestial", + "Snapmaker/Panchroma PLA Celestial" + ], + "OFRiyes1": [ + "Anker/Anker Generic ASA", + "Anker/Anker Generic ASA 0.2 nozzle", + "Anker/Anker Generic ASA 0.25 nozzle" + ], + "OFRkjhxK": [ + "Volumic/Volumic PVA-BVOH (Performance)" + ], + "OFRmGKVX": [ + "Cubicon/Cubicon PLA+" + ], + "OFRooa0F": [ + "Snapmaker/Snapmaker Dual PA-CF" + ], + "OFRpAZ1P": [ + "DeltaMaker/DeltaMaker Brand PLA" + ], + "OFRujL0v": [ + "Flashforge/FusRock Generic PET-CF" + ], + "OFRusgEn": [ + "Chuanying/Chuanying Generic PVA" + ], + "OFRyOsZj": [ + "re3D/re3D PLA" ], "OFRzR5mi": [ "OrcaFilamentLibrary/eSUN ePLA-LW" ], - "OFS1ekCg": [ - "Ratrig/RatRig BigNozzle PCTG" + "OFRzsaDK": [ + "FlyingBear/FlyingBear Generic TPU" ], "OFS2tn6G": [ "OrcaFilamentLibrary/Fiberon PA612-CF" ], - "OFS3HrR1": [ - "InfiMech/Other PLA" + "OFS4jbj3": [ + "Eryone/Eryone PA" + ], + "OFS8JF3S": [ + "Qidi/Qidi Generic PLA High Speed" ], "OFS8lTQt": [ - "OrcaFilamentLibrary/Panchroma PLA Silk" + "OrcaFilamentLibrary/Panchroma PLA Silk", + "Snapmaker/Panchroma PLA Silk" ], - "OFSCm6pJ": [ - "Elegoo/Elegoo PET-CF" + "OFSDFYs4": [ + "Creality/Creality Generic PLA-CF" ], - "OFSSuKRr": [ - "Qidi/QIDI PETG Basic" + "OFSGbf2I": [ + "Anycubic/Anycubic Generic PVA" ], - "OFSdF3B1": [ - "Flashforge/FusRock PAHT-CF" + "OFSPdsuW": [ + "Tiertime/Tiertime Generic PPA-CF" ], - "OFSkBwxf": [ - "Ratrig/RatRig BigNozzle ASA" + "OFSStjay": [ + "FLSun/FLSun S1 PLA Silk" ], - "OFSoZBK2": [ - "Sovol/Sovol SV06 Plus ACE PLA" + "OFSTCno1": [ + "re3D/re3D Greengate rPETG" ], - "OFSpTWdv": [ - "InfiMech/Other PA-CF" + "OFSa39yP": [ + "Snapmaker/Snapmaker J1 PLA" + ], + "OFSbGfsz": [ + "OrcaArena/Arena PLA Basic" + ], + "OFShw1X8": [ + "Flashforge/Flashforge ABS Basic" ], "OFSwbBWS": [], + "OFT2jon4": [ + "Qidi/QIDI ABS Rapido" + ], "OFTGHyNC": [ "OrcaFilamentLibrary/Bambu PLA Impact" ], + "OFTKFAZ4": [ + "Tiertime/Tiertime Generic PCTG" + ], "OFTOPcx0": [ "OrcaFilamentLibrary/Eolas Prints TPU Transition" ], "OFTRZ8Y4": [ "OrcaFilamentLibrary/Bambu PETG-CF" ], - "OFTa6gPH": [ - "Flashforge/Flashforge PLA Pro" + "OFTSXxzE": [ + "Flashforge/Flashforge PPS-CF" ], - "OFTbdJyT": [ - "FlyingBear/Other PC" - ], - "OFTbsWVg": [ - "Artillery/Artillery TPU" + "OFTXduCM": [ + "Creality/eSUN ABS+" ], "OFTcE0nA": [ "OrcaFilamentLibrary/eSUN PLA-Basic" ], + "OFTdauIq": [ + "Volumic/Volumic PCTG Ultra (Performance)" + ], + "OFTkj6DR": [ + "Anycubic/Anycubic PVA" + ], "OFTlRzpe": [ "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" ], - "OFToBodi": [ - "Qidi/QIDI ABS Rapido Metal" + "OFTnWzBs": [ + "Creality/Hyper PLA-CF" ], - "OFTsGps3": [ - "InfiMech/InfiMech PC" + "OFTs8peJ": [ + "Snapmaker/Snapmaker Dual TPE" ], - "OFTszIHE": [ - "Creality/Creality Generic PLA Silk" + "OFTsHNQi": [ + "Qidi/QIDI ASA" + ], + "OFTvvox9": [ + "Sovol/Sovol SV06 ACE PLA" + ], + "OFU0n0zW": [ + "FLSun/FLSun T1 PLA Generic" ], "OFU1zPxE": [ + "Elegoo/Elegoo PLA Galaxy", "OrcaFilamentLibrary/Elegoo PLA Galaxy" ], - "OFUJw3Lx": [ - "Qidi/QIDI PEBA 95A" + "OFU3QXL7": [ + "re3D/re3D PC" ], - "OFUYjPc4": [ - "Dremel/Dremel Generic PLA" + "OFU3zwPc": [ + "Prusa/Prusa Generic TPU HF" + ], + "OFU5N9jI": [ + "OrcaArena/OrcaArena Generic TPU" + ], + "OFU6fjbi": [ + "Co Print/CoPrint Generic ABS" + ], + "OFU7CKZt": [ + "Volumic/Volumic ASA Ultra (Performance)" + ], + "OFUCpLaL": [ + "Flashforge/FlashForge PPS" + ], + "OFUF7oA4": [ + "Creality/Hyper PC" + ], + "OFUH1aee": [ + "Volumic/Volumic FLEX93 Ultra (Performance)" + ], + "OFUIfGoh": [ + "Snapmaker/Snapmaker Dual PET" + ], + "OFUScM0D": [ + "Flashforge/FusRock S-Multi" + ], + "OFUWRqwb": [ + "Creality/Creality Generic PA-CF" + ], + "OFUYCqtB": [ + "InfiMech/InfiMech PLA" + ], + "OFUaHEO9": [ + "Anycubic/Anycubic PEBA 95A" + ], + "OFUaVAdj": [ + "Tiertime/Tiertime Generic ASA" ], "OFUanySo": [ "OrcaFilamentLibrary/Bambu PLA Silk+" ], - "OFUkpobY": [ - "Qidi/QIDI PAHT-CF" + "OFUmS5z5": [ + "Creality/eSUN ASA+" ], - "OFUqBrgf": [ - "Chuanying/Chuanying Generic TPU" + "OFUrStd6": [ + "Ratrig/RatRig Generic PCTG" + ], + "OFUtGagr": [ + "Artillery/Artillery Generic PLA-CF" ], "OFUyDDNv": [ + "Elegoo/Elegoo PC", "OrcaFilamentLibrary/Elegoo PC" ], - "OFV1szQh": [ - "Peopoly/Peopoly Lancer PETG-C" + "OFV0KrAG": [ + "FLSun/FLSun T1 ABS" ], - "OFV4hD1o": [ - "Qidi/QIDI PLA Rapido Metal" + "OFV5Q7j2": [ + "Snapmaker/Snapmaker J1 TPE" ], "OFV5tNw6": [ + "Elegoo/Elegoo PET-CF", "OrcaFilamentLibrary/Elegoo PET-CF" ], - "OFVBNoov": [ - "InfiMech/InfiMech ABS" + "OFV5wEMe": [ + "Afinia/Afinia ABS" ], "OFVBlUFH": [], "OFVCkX5w": [ "OrcaFilamentLibrary/Bambu TPU 95A" ], - "OFVJXE4n": [ - "FlyingBear/Other ABS" + "OFVHMFJX": [ + "Qidi/QIDI PETG Tough 0.2 nozzle" ], - "OFVhG0yM": [ - "Qidi/QIDI ABS Odorless" + "OFVKADz5": [ + "Comgrow/Comgrow Generic PLA" ], "OFVptRxp": [ "BBL/COEX TPE 30D", "OrcaFilamentLibrary/COEX TPE 30D" ], + "OFVqZ2H0": [ + "FLSun/FLSun Generic PC" + ], + "OFVtIasg": [ + "Eryone/Eryone ASA" + ], "OFW29a9R": [ + "OrcaArena/PolyTerra PLA", "OrcaFilamentLibrary/PolyTerra PLA", "Snapmaker/PolyTerra PLA" ], - "OFW8UdlP": [ - "Qidi/QIDI ABS Rapido" + "OFW5FqkL": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "OFW9uIkE": [ + "Tiertime/Tiertime Generic HIPS" + ], + "OFWIr7ZE": [ + "CoLiDo/CoLiDo Generic ABS" + ], + "OFWRITFw": [ + "Prusa/Prusament rPLA" + ], + "OFWTAEjH": [ + "Snapmaker/Snapmaker TPE" ], "OFWTRJ1K": [ "OrcaFilamentLibrary/FilAr PLA Bronce" ], + "OFWY6vBh": [ + "Anycubic/Anycubic Generic PC" + ], "OFWYtgCa": [ + "Elegoo/Elegoo PLA Wood", "OrcaFilamentLibrary/Elegoo PLA Wood" ], + "OFWa0NiB": [ + "Volumic/Volumic NYLON Ultra" + ], + "OFWadebJ": [ + "Tiertime/Tiertime Generic PETG-CF" + ], + "OFWao3Ic": [ + "Creality/Ender-PLA" + ], + "OFWbbuRY": [ + "InfiMech/InfiMech Generic ABS" + ], "OFWbdGsC": [ + "Creality/Generic PLA-CF", + "Custom/Generic PLA-CF", "OrcaFilamentLibrary/Generic PLA-CF" ], - "OFWkCAdc": [ - "Qidi/QIDI PETG Tough 0.2 nozzle" + "OFWgFOjn": [ + "Snapmaker/Snapmaker PLA Silk" ], - "OFWs8KIZ": [ - "Flashforge/Flashforge ABS-CF" + "OFWnSvGu": [ + "Flashforge/Flashforge ASA-GF" ], - "OFWv6JYn": [ - "Flashforge/Flashforge PLA Metal" + "OFWof1Ap": [ + "FLSun/FLSun Generic ABS" + ], + "OFWukXja": [ + "Qidi/Qidi Generic TPU 95A" ], "OFWwF7K7": [ "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" ], - "OFWyCd0Y": [ - "Qidi/QIDI Support For PET/PA" + "OFWzr7m0": [ + "Anycubic/Anycubic Generic PETG" ], "OFX0ycRQ": [ "OrcaFilamentLibrary/Fiberon PA12-CF" ], - "OFXA8vy9": [ - "Artillery/Artillery PLA Basic+" + "OFX2zcrM": [ + "Flashforge/Generic PLA-CF10" ], "OFXCBZTA": [ "OrcaFilamentLibrary/Eolas Prints ABS" @@ -4256,93 +3421,158 @@ "OFXIbw5D": [ "OrcaFilamentLibrary/Bambu PLA Matte" ], - "OFXNO5Of": [ - "Qidi/QIDI PLA Rapido 0.2 nozzle" - ], - "OFXQX0tr": [ - "Ratrig/RatRig PunkFil PETG CF" + "OFXJ9iom": [ + "iQ/Grauts HPP4GF25 P1" ], "OFXTPuqV": [ "OrcaFilamentLibrary/Elas PETG Basic" ], - "OFXcfTEb": [ - "Qidi/Tinmorry PETG-ECO" + "OFXXUHSG": [ + "Chuanying/Chuanying Generic PETG-CF10" ], - "OFXfgh61": [ - "Prusa/Prusa Generic PA-CF" + "OFXhZ3uY": [ + "OrcaArena/OrcaArena Generic PC" + ], + "OFXi59OX": [ + "Afinia/Afinia Value ABS" + ], + "OFXk1emJ": [ + "Artillery/Artillery PLA Basic" ], "OFXkm8q1": [ + "Creality/Generic PP-CF", "OrcaFilamentLibrary/Generic PP-CF" ], - "OFXkwkn6": [ - "Qidi/QIDI PA-Ultra" + "OFXn3Vd9": [ + "Qidi/QIDI Support For PAHT" ], - "OFXv4FUi": [ - "Flashforge/Flashforge PLA Galaxy" + "OFXnToSX": [ + "Creality/Hyper Stardust" + ], + "OFXuGxvQ": [ + "Volumic/Volumic PLA Ultra" + ], + "OFXuwtnq": [ + "Co Print/CoPrint Generic PETG" + ], + "OFXyyfX6": [ + "Anker/Anker Generic PLA Silk", + "Anker/Anker Generic PLA Silk 0.2 nozzle", + "Anker/Anker Generic PLA Silk 0.25 nozzle" ], "OFXz7Mwx": [ + "Elegoo/Elegoo PLA Silk", "OrcaFilamentLibrary/Elegoo PLA Silk" ], "OFXzQ4yL": [ "OrcaFilamentLibrary/Bambu ASA-Aero" ], - "OFY1U4uM": [ - "Sovol/Sovol SV08 TPU" + "OFY0F5qA": [ + "Volumic/Volumic PETG Ultra carbone (Performance)" + ], + "OFY3AB7j": [ + "Snapmaker/Snapmaker J1 PLA Matte" ], "OFY9muEs": [ + "Anycubic/Generic ABS", + "Creality/Generic ABS", "Custom/Generic ABS", + "Elegoo/Generic ABS", + "Flashforge/Generic ABS", "OrcaFilamentLibrary/Generic ABS", - "Sovol/Generic ABS" + "RH3D/Generic ABS", + "Sovol/Generic ABS", + "Z-Bolt/Generic ABS" ], - "OFYG2Gfy": [ - "Afinia/Afinia ABS+" + "OFYEtXuk": [ + "Snapmaker/Snapmaker J1 PA-CF" ], "OFYGbPHX": [ - "OrcaFilamentLibrary/PolyLite Dual PLA" + "OrcaFilamentLibrary/PolyLite Dual PLA", + "Snapmaker/PolyLite Dual PLA" ], - "OFYH00jV": [ - "Qidi/QIDI ABS-GF" + "OFYHzKyS": [ + "Vzbot/Vzbot Generic PLA-CF" ], - "OFYICbI4": [ - "Flashforge/FusRock Generic PAHT-CF" + "OFYPdJ7t": [ + "Creality/Creality Generic ABS" ], "OFYPdQJh": [ + "Anycubic/Generic PETG", + "Creality/Generic PETG", + "Custom/Generic PETG", + "Elegoo/Generic PETG", + "Flashforge/Generic PETG", + "LONGER/Generic PETG", "OrcaFilamentLibrary/Generic PETG", - "Sovol/Generic PETG" - ], - "OFYRS7GZ": [ - "Flashforge/Generic TPU-95A" - ], - "OFYZs7dN": [ - "Flashforge/Flashforge Generic HS PLA" + "RH3D/Generic PETG", + "Sovol/Generic PETG", + "Z-Bolt/Generic PETG" ], "OFYd5uS3": [], - "OFYehFGr": [ - "Ratrig/RatRig BigNozzle TPU" - ], - "OFYfZgxU": [ + "OFYezc6s": [ "FlyingBear/FlyingBear TPU" ], + "OFYl0c8v": [ + "Flashforge/Flashforge Generic HIPS" + ], + "OFYlZMmy": [ + "Chuanying/Chuanying Generic TPU" + ], + "OFYlthXI": [ + "Flashforge/Flashforge Generic PLA-CF" + ], + "OFYtS9zg": [ + "Flashforge/FusRock PAHT-CF" + ], + "OFYuowge": [ + "FlyingBear/Other ABS", + "InfiMech/Other ABS" + ], + "OFYvSO1W": [ + "Flashforge/Flashforge Generic PLA-Silk" + ], + "OFZ0mR5b": [ + "Anycubic/Anycubic PLA-CF" + ], + "OFZ1hANN": [ + "Flashforge/FusRock Generic NexPA-CF25" + ], + "OFZ2LuAi": [ + "Wanhao France/YUMI PLA Bowden" + ], "OFZ4QbfK": [ "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" ], - "OFZAkPHG": [ - "Qidi/QIDI PPS-GF" + "OFZ4fTO8": [ + "CONSTRUCT3D/C1 Generic High Flow PETG" ], - "OFZQFvHQ": [ - "Flashforge/Flashforge HS PETG" + "OFZHgTVI": [ + "Flashforge/Flashforge Generic PETG" ], - "OFZcrV9c": [ - "Flashforge/Flashforge PPS-CF" + "OFZLtWYs": [ + "Qidi/QIDI ABS-GF25" ], - "OFZjZ1k7": [ - "Creality/Creality HF Generic PLA" + "OFZOuWrO": [ + "Qidi/QIDI PPS-CF" ], - "OFa5cFqE": [ - "Qidi/QIDI Support For PAHT" + "OFZPlCck": [ + "Chuanying/Chuanying Generic ABS" ], - "OFa6L3Of": [ - "Qidi/Qidi PC-ABS-FR" + "OFZivHGL": [ + "Snapmaker/Snapmaker Dual PLA" + ], + "OFZsChIG": [ + "Qidi/Qidi Generic TPU" + ], + "OFZtOQtl": [ + "Flashforge/Flashforge PA6-CF" + ], + "OFZtkHRq": [ + "Anycubic/Anycubic PC" + ], + "OFaBwRvT": [ + "Flashforge/Flashforge ASA Basic" ], "OFaDOaNt": [ "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" @@ -4350,74 +3580,130 @@ "OFaEesXQ": [ "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" ], - "OFaKIoH2": [ - "Elegoo/Elegoo PLA Sparkle" + "OFaEuvNF": [ + "Anycubic/Anycubic PAHT-CF" ], - "OFaKZ6JI": [ - "Anycubic/Generic PETG Basic" + "OFaFNP2U": [ + "Sovol/Sovol SV07 PLA" + ], + "OFaHjk1V": [ + "Volumic/Volumic PC" + ], + "OFaP2SsH": [ + "LH/LHS ASA" ], "OFaQMgRH": [ "OrcaFilamentLibrary/Bambu PLA Tough" ], + "OFaRjiIm": [ + "SeeMeCNC/SeeMeCNC PETG-CF" + ], + "OFaU2JxD": [ + "Dremel/Dremel Generic PLA" + ], "OFaYz8iE": [ "OrcaFilamentLibrary/Elas PLA Pro" ], + "OFaeIx7W": [ + "iQ/Polymaker PETG Polymax black P1" + ], + "OFafO6VM": [ + "Elegoo/Generic PC-CF" + ], + "OFafocjw": [ + "Cubicon/Cubicon ABS" + ], + "OFahE7HP": [ + "Blocks/Blocks Generic PC" + ], "OFausr3F": [ "OrcaFilamentLibrary/FilAr PLA-mate Rosa" ], - "OFaxQnfz": [ - "Cubicon/Cubicon PC" + "OFaz8VoR": [ + "Flashforge/Flashforge HIPS" ], - "OFb3UzMZ": [ - "InfiMech/InfiMech PA-CF" - ], - "OFbK5wve": [ - "Prusa/Prusa Generic TPU HF" + "OFb5EEM3": [ + "Artillery/Artillery PET" ], "OFbP8zEO": [ "OrcaFilamentLibrary/Eolas Prints PLA Silk" ], - "OFbS9rjH": [ - "Qidi/QIDI PETG Rapido" + "OFbSChKb": [ + "SeeMeCNC/SeeMeCNC PLA" ], - "OFbYP6Wb": [ - "Elegoo/Elegoo PLA Marble" + "OFbSZBOi": [ + "InfiMech/InfiMech TPU Basic" ], - "OFc2SnEp": [ - "Artillery/Artillery PVA" + "OFbeeFkl": [ + "OrcaArena/OrcaArena Generic PLA Silk" + ], + "OFbenYUK": [ + "Prusa/Prusa Generic TPU" + ], + "OFbh7HcA": [ + "Eryone/Eryone PP-CF" + ], + "OFbjtPQy": [ + "FLSun/FLSun T1 ASA" + ], + "OFbt04e0": [ + "DeltaMaker/DeltaMaker Generic TPU" + ], + "OFc0xiCz": [ + "InfiMech/InfiMech Generic TPU" ], "OFc3xdm9": [ - "OrcaFilamentLibrary/Overture PLA" + "OrcaFilamentLibrary/Overture PLA", + "Qidi/Overture PLA" ], - "OFcZZWnB": [ - "Cubicon/Cubicon ABS-A100" + "OFc87pL3": [ + "OrcaArena/Arena PET-CF" ], - "OFceJcLf": [ - "Qidi/PolyLite PLA" + "OFcBJQcC": [ + "Snapmaker/Snapmaker Dual TPU High-Flow" + ], + "OFcCzEkS": [ + "Prusa/Prusa Generic PVA" + ], + "OFcJ7AKd": [ + "Sovol/Sovol SV08 PLA" + ], + "OFcJDtTx": [ + "Artillery/Artillery TPU" + ], + "OFcKtw8W": [ + "Volumic/PA6 CF20 (Performance)" + ], + "OFcdqaWI": [ + "Sovol/Sovol Zero PC" ], "OFcfQk4h": [ "BBL/Overture Air PLA", "OrcaFilamentLibrary/Overture Air PLA" ], - "OFcqs5g7": [ - "Elegoo/Elegoo PLA Translucent2" + "OFcogyWl": [ + "WonderMaker/WonderMaker PLA Metal" ], - "OFcsHCy4": [ - "Sovol/Sovol SV08 PLA" + "OFctbSkL": [ + "Blocks/Blocks Generic ASA-CF" + ], + "OFctg8r1": [ + "CoLiDo/CoLiDo PLA+" ], "OFcvKkrs": [ "BBL/Overture TPU", "OrcaFilamentLibrary/Overture TPU" ], - "OFcy60o4": [ - "Flashforge/Flashforge ASA Basic" - ], "OFcytyoA": [ - "OrcaFilamentLibrary/Fiberon PETG-ESD" + "OrcaFilamentLibrary/Fiberon PETG-ESD", + "Snapmaker/Fiberon PETG-ESD" ], "OFd0Fv0k": [ "OrcaFilamentLibrary/Generic PE-CF" ], + "OFd10YeG": [ + "Ratrig/RatRig Generic PLA" + ], "OFd2vX0G": [ "BBL/COEX PLA PRIME", "OrcaFilamentLibrary/COEX PLA PRIME" @@ -4426,80 +3712,154 @@ "BBL/AliZ PA-CF", "OrcaFilamentLibrary/AliZ PA-CF" ], + "OFdD5Wbu": [ + "Snapmaker/Snapmaker J1 PLA-CF" + ], + "OFdEIwxy": [ + "Flashforge/Flashforge Generic PLA-CF10" + ], + "OFdHsxB4": [ + "TwoTrees/TwoTrees Generic 95A TPU" + ], "OFdI4zMo": [], - "OFdLGn0R": [ - "Creality/Creality Generic PLA Wood" + "OFdLdGgJ": [ + "OrcaArena/OrcaArena Generic PVA" ], - "OFdNORGt": [ - "Flashforge/Flashforge ASA-GF" + "OFdOWhCa": [ + "Ratrig/RatRig Generic PC" ], - "OFdSGkUG": [ - "Anycubic/Anycubic PETG" + "OFdXVjGZ": [ + "Tiertime/Tiertime PC" + ], + "OFdXgp2K": [ + "Chuanying/Chuanying Generic HS PLA", + "Chuanying/Chuanying HS PLA" ], "OFdb8YNz": [ "OrcaFilamentLibrary/FilAr PLA Verde Manzana" ], - "OFdhVJql": [ - "Flashforge/Flashforge PLA Buint Ti" + "OFdkWDiy": [ + "Cubicon/Cubicon PLAi21" + ], + "OFdlGycb": [ + "CoLiDo/CoLiDo Generic TPU" + ], + "OFdrYBmI": [ + "Tiertime/Tiertime ASA" + ], + "OFdtPd9h": [ + "Qidi/QIDI PETG-GF" ], "OFdzlrhi": [ "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" ], - "OFeFRwST": [ - "Flashforge/Flashforge PVA" + "OFe61n6v": [ + "Ratrig/RatRig PunkFil PETG CF" ], - "OFePPmng": [ - "Snapmaker/Snapmaker J1 ABS Benchy" + "OFe6sfXS": [ + "Flashforge/FlashForge PC" ], - "OFeWMAGH": [ - "Flashforge/Flashforge HS PLA Burnt Ti" + "OFe7Sx5B": [ + "Sovol/Sovol SV06 ACE PETG" ], - "OFefhSuj": [ - "InfiMech/InfiMech PLA Hyper" + "OFe8UJXH": [ + "Creality/Creality Generic PC" + ], + "OFe8tuNb": [ + "Tiertime/Tiertime PA6-CF" + ], + "OFe8yBMG": [ + "Qidi/QIDI PETG Tough 0.6 nozzle" + ], + "OFeAxvEt": [ + "Snapmaker/Snapmaker Dual ABS Benchy" + ], + "OFeCJqxx": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "OFeDfaCh": [ + "CoLiDo/CoLiDo Generic PLA" + ], + "OFeIyhUx": [ + "Anycubic/Anycubic PC-CF" + ], + "OFeJjoKF": [ + "FLSun/FLSun Generic PA" + ], + "OFeK2vkS": [ + "Chuanying/Chuanying Generic PLA-Silk", + "Chuanying/Chuanying PLA-SILK" + ], + "OFeTATC7": [ + "Snapmaker/Snapmaker J1 Breakaway" + ], + "OFeVzkSU": [ + "Snapmaker/Fiberon PPS-GF20" + ], + "OFec7Qiw": [ + "Flashforge/Flashforge PLA Sparkle" + ], + "OFeelsSM": [ + "Qidi/HATCHBOX PLA" + ], + "OFelDBgv": [ + "Snapmaker/Polymaker PLA" + ], + "OFepU7Tl": [ + "WonderMaker/WonderMaker PLA Matte" ], "OFesA6rF": [ "Flashforge/Generic PLA Silk", - "OrcaFilamentLibrary/Generic PLA Silk" + "OrcaFilamentLibrary/Generic PLA Silk", + "Sovol/Generic PLA Silk" + ], + "OFetENFF": [ + "OrcaArena/OrcaArena Generic ABS" ], "OFexaZU2": [ "OrcaFilamentLibrary/FilAr PLA Manteca" ], - "OFeybQvK": [ - "Qidi/QIDI ABS Rapido 0.2 nozzle" - ], - "OFf0JIqs": [ - "Eryone/Eryone PP" - ], - "OFf2b9wu": [ - "Anycubic/Anycubic ABS" + "OFf0MkD5": [ + "Qidi/QIDI PETG Translucent" ], "OFf5awy4": [ "OrcaFilamentLibrary/Eolas Prints PLA Matte" ], + "OFf6ZEvu": [ + "InfiMech/InfiMech PC" + ], "OFf6mfQO": [ "OrcaFilamentLibrary/Bambu Support for ABS" ], + "OFf6ynfH": [ + "FlyingBear/FlyingBear PETG Basic" + ], "OFfBpSRI": [ "OrcaFilamentLibrary/Bambu ASA" ], + "OFfHGM1D": [ + "re3D/re3D rPP" + ], "OFfJSCzm": [ "OrcaFilamentLibrary/FDplast PETG" ], - "OFfJoIgg": [ - "Qidi/QIDI PAHT-GF" + "OFfSqS4R": [ + "Creality/ENDER FAST PLA" + ], + "OFfZ0lTS": [ + "Qidi/Qidi Generic PETG-CF" ], "OFfZcoKr": [ "OrcaFilamentLibrary/FilAr PLA-mate Piel" ], - "OFfdxQok": [ - "Qidi/Generic PLA+" + "OFfb10SK": [ + "Artillery/Artillery PC" ], - "OFfiN1Lw": [ - "Chuanying/Chuanying Generic HS PLA", - "Chuanying/Chuanying HS PLA" + "OFfegVpA": [ + "Flashforge/Polymaker Generic S1" ], - "OFfkPhrJ": [ - "Creality/Creality HF Generic Speed PLA" + "OFfmHUkQ": [ + "Snapmaker/Snapmaker Dual Breakaway" ], "OFfmZrI3": [ "OrcaFilamentLibrary/FDplast TPU" @@ -4508,9 +3868,6 @@ "BBL/COEX TPE 40D", "OrcaFilamentLibrary/COEX TPE 40D" ], - "OFfoA8kJ": [ - "CoLiDo/CoLiDo PLA" - ], "OFfq5YXA": [ "OrcaFilamentLibrary/Valment PLA-CF" ], @@ -4518,14 +3875,24 @@ "BBL/COEX TPE 60D", "OrcaFilamentLibrary/COEX TPE 60D" ], - "OFftQOek": [ - "Flashforge/Flashforge PLA Matte" + "OFfr6JDF": [ + "Qidi/QIDI PETG Tough 0.8 nozzle" ], "OFfuhviw": [ + "Elegoo/Elegoo PLA Marble", "OrcaFilamentLibrary/Elegoo PLA Marble" ], - "OFg4N6ZL": [ - "FlyingBear/FlyingBear PETG" + "OFfuih8e": [ + "Creality/Creality Silk PLA" + ], + "OFfxFQf9": [ + "Chuanying/Chuanying Generic PETG" + ], + "OFfznI0Q": [ + "Prusa/Prusa Generic PA-CF" + ], + "OFg3cWVt": [ + "Snapmaker/Snapmaker Dual PLA Metal" ], "OFg57Nmc": [ "OrcaFilamentLibrary/Bambu PC FR" @@ -4534,175 +3901,290 @@ "OrcaFilamentLibrary/FILL3D PPCF" ], "OFg8ndtj": [ + "Creality/Generic PA", "Custom/Generic PA", - "OrcaFilamentLibrary/Generic PA" + "Elegoo/Generic PA", + "OrcaFilamentLibrary/Generic PA", + "Z-Bolt/Generic PA" ], - "OFgJX0Fc": [ - "Flashforge/FlashForge PPS" - ], - "OFgK2Xvv": [ - "Anycubic/Anycubic PLA" - ], - "OFgMGSpF": [ - "Sovol/Sovol SV06 Plus ACE PETG" + "OFgHh8ly": [ + "Afinia/Afinia Value PLA" ], "OFgMWJ8T": [ "OrcaFilamentLibrary/FilAr PLA Negro Azabache" ], - "OFgNzLVh": [ - "Sovol/Sovol Zero ABS" + "OFgSEwOZ": [ + "OrcaArena/OrcaArena Generic PETG" ], - "OFgSK1hL": [ - "Anycubic/Anycubic PLA High Speed" + "OFgSPtDn": [ + "MagicMaker/MM Generic PEEK" + ], + "OFgSbX7E": [ + "Volumic/Volumic PC (Performance)" + ], + "OFgVJhVt": [ + "Tiertime/Tiertime Generic PLA-CF" + ], + "OFgVQkqW": [ + "Cubicon/Cubicon ABSk" + ], + "OFgXgt98": [ + "Artillery/Artillery ABS" ], "OFgbpcy9": [ + "Anycubic/Generic TPU", + "Creality/Generic TPU", + "Custom/Generic TPU", + "Flashforge/Generic TPU", "OrcaFilamentLibrary/Generic TPU", + "RH3D/Generic TPU", "Sovol/Generic TPU" ], - "OFglpvEE": [ - "Sovol/Sovol SV06 ACE TPU" + "OFgcryz4": [ + "Ratrig/RatRig BigNozzle ASA" + ], + "OFgeM7nD": [ + "Flashforge/Flashforge PA12-CF" + ], + "OFgf4gZa": [ + "Flashforge/Flashforge PA" + ], + "OFglhKLM": [ + "Qidi/QIDI PLA Rapido 0.8 nozzle" ], "OFgpLTMR": [ "OrcaFilamentLibrary/FilAr PETG Gris Plata" ], - "OFgrGfPy": [ - "Anycubic/Anycubic PLA+" + "OFgpQwkk": [ + "Creality/CR-PLA Fluo" ], - "OFgtZjeX": [ - "Snapmaker/Snapmaker ABS Benchy" + "OFgptDSf": [ + "OrcaArena/Arena PLA Matte" ], - "OFh5GUhZ": [ - "Elegoo/Elegoo PLA Wood" + "OFgvOmM2": [ + "Anker/Anker Generic PETG", + "Anker/Anker Generic PETG 0.2 nozzle", + "Anker/Anker Generic PETG 0.25 nozzle" + ], + "OFgyPlwU": [ + "Snapmaker/Snapmaker TPU High-Flow" + ], + "OFh7mvPO": [ + "Prusa/Prusament PVB" + ], + "OFh9u9c0": [ + "Creality/Generic PA6-GF" ], "OFhASRWj": [ - "OrcaFilamentLibrary/Panchroma PLA Temp Shift" - ], - "OFhKNHC8": [ - "Elegoo/Generic PETG PRO" + "OrcaFilamentLibrary/Panchroma PLA Temp Shift", + "Snapmaker/Panchroma PLA Temp Shift" ], "OFhMO9Kh": [ "OrcaFilamentLibrary/GreenGate3D PETG" ], + "OFhO5aEJ": [ + "Ratrig/RatRig PunkFil ABS" + ], + "OFhQf8ou": [ + "Snapmaker/Snapmaker PLA-CF" + ], "OFhQfUQY": [ "OrcaFilamentLibrary/Generic SBS" ], + "OFhTPf6L": [ + "Creality/Generic PA6-CF", + "Elegoo/Generic PA6-CF" + ], + "OFhUjPA5": [ + "Eryone/Eryone TPU" + ], "OFhWc5Bv": [ "OrcaFilamentLibrary/NIT ABS" ], "OFhWhL1i": [ "OrcaFilamentLibrary/Eolas Prints PETG" ], + "OFhWrAuP": [ + "Qidi/QIDI PLA-CF" + ], + "OFhbolij": [ + "Creality/eSUN PLA-Lite" + ], "OFhcYzR8": [ + "Elegoo/Elegoo PLA Sparkle", "OrcaFilamentLibrary/Elegoo PLA Sparkle" ], + "OFhcrFw9": [ + "Creality/Creality Generic TPU" + ], "OFhfd722": [ "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A" ], + "OFhiJE7Y": [ + "Qidi/QIDI PEBA 95A" + ], + "OFhkN0a7": [ + "Creality/Hyper PA612-CF" + ], "OFhlCNqq": [ "BBL/COEX PLA", "OrcaFilamentLibrary/COEX PLA" ], "OFhuaUQB": [ - "OrcaFilamentLibrary/Bambu ABS" + "OrcaFilamentLibrary/Bambu ABS", + "Qidi/Bambu ABS" ], - "OFhzHd2Y": [ - "Flashforge/Flashforge HIPS" + "OFhwiZ50": [ + "Qidi/QIDI PLA Rapido 0.2 nozzle" ], - "OFi1ocNv": [ - "Flashforge/Flashforge PA" + "OFhx4uOG": [ + "Qidi/QIDI PET-GF" + ], + "OFi5RSve": [ + "Creality/eSUN PLA-LW" + ], + "OFi6PfUM": [ + "Creality/Generic PLA-Silk" + ], + "OFi7Bf0F": [ + "Flashforge/Flashforge ABS-CF" + ], + "OFi90KlM": [ + "Volumic/Volumic NYLON Ultra (Performance)" + ], + "OFiCHnso": [ + "Prusa/Prusa Generic PLA" ], "OFiDpM1B": [ "OrcaFilamentLibrary/FilAr PLA-mate Bordo" ], - "OFiJYDPC": [ - "Qidi/HATCHBOX PLA" + "OFiEz2XI": [ + "Cubicon/Cubicon PA-CF" + ], + "OFiUSDih": [ + "Blocks/Blocks Generic PA" ], "OFiWaoqD": [ "OrcaFilamentLibrary/DREMC PPA-CF" ], - "OFic2uNr": [ - "Sovol/Sovol SV06 ACE PLA" + "OFifxPW1": [ + "DeltaMaker/DeltaMaker Generic PLA" ], - "OFicxmSa": [ - "Prusa/Prusa Generic PLA HF" + "OFilAA3b": [ + "Eryone/Eryone PLA-CF" ], - "OFidJLn8": [ - "Qidi/PolyLite ABS" + "OFilD4bP": [ + "FlyingBear/FlyingBear PLA" ], - "OFiyGNbI": [ - "Elegoo/Elegoo PETG-CF" + "OFilnglt": [ + "Artillery/Artillery PETG" + ], + "OFin64Qg": [ + "Creality/Generic Support for PLA" + ], + "OFiorRtJ": [ + "Blocks/Blocks Generic PVA" + ], + "OFitS8al": [ + "Snapmaker/PolyLite PLA Neon" + ], + "OFiuJSmy": [ + "Ratrig/RatRig BigNozzle PLA" + ], + "OFiwEbze": [ + "Volumic/PETG ESD (Performance)" ], "OFj3bTjw": [ "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" ], - "OFjFPhUC": [ - "Prusa/Prusament rPLA" + "OFj64R5U": [ + "Peopoly/Peopoly Lancer ABS-GF" + ], + "OFjD3YTW": [ + "Qidi/Qidi PC-ABS-FR" + ], + "OFjHrAX0": [ + "WonderMaker/WonderMaker ABS" + ], + "OFjLAYgO": [ + "Anycubic/Anycubic PEBA" ], "OFjPXrXO": [ + "Elegoo/Elegoo PLA Glow", "OrcaFilamentLibrary/Elegoo PLA Glow" ], "OFjT9PkZ": [ "OrcaFilamentLibrary/FilAr PLA Tabaco" ], - "OFjZw7k1": [ - "Snapmaker/PolyTerra J1 PLA" + "OFjUGUIK": [ + "iQ/Fiberthree PACF Pro P1" + ], + "OFjVOWfJ": [ + "Anycubic/Anycubic PLA High Speed" + ], + "OFjXrKFO": [ + "OrcaArena/Arena PLA Impact" ], "OFjb0wos": [ - "OrcaFilamentLibrary/Panchroma PLA Metallic" + "OrcaFilamentLibrary/Panchroma PLA Metallic", + "Snapmaker/Panchroma PLA Metallic" ], - "OFjdTQd6": [ - "Anycubic/Anycubic PLA Silk" + "OFjcwUEm": [ + "Cubicon/Cubicon PLA" ], - "OFjepy6j": [ - "Flashforge/FusRock Generic S-PAHT" + "OFjkdnyN": [ + "Snapmaker/Snapmaker Dual TPU" ], - "OFjj9Yiz": [ - "Ratrig/RatRig BigNozzle PETG" + "OFjoAe0R": [ + "Qidi/Qidi PLA-CF" ], - "OFjohFkg": [ - "Qidi/QIDI PETG Translucent" + "OFjoIVZ6": [ + "FlyingBear/FlyingBear Generic PA-CF" ], "OFjorDcx": [ "OrcaFilamentLibrary/FDplast ABS" ], - "OFjqPjjl": [ - "Flashforge/Generic PET" - ], "OFjt9en1": [ "OrcaFilamentLibrary/Generic CoPE" ], - "OFjurQ3I": [ - "Sovol/Sovol Zero PETG" - ], - "OFk388hR": [ - "Elegoo/Generic PA6-CF" - ], - "OFk6T5YH": [ - "Sovol/Sovol Zero PETG HS Nozzle" + "OFjz0a3m": [ + "Prusa/Prusament PC-CF" ], "OFk8t9mz": [ "OrcaFilamentLibrary/Fiberon PETG-rCF" ], + "OFkAltI8": [ + "FlyingBear/Other PA-CF", + "InfiMech/Other PA-CF" + ], + "OFkGp50Y": [ + "Volumic/Volumic UNIVERSAL Ultra (Performance)" + ], "OFkGvN4d": [ "OrcaFilamentLibrary/FilAr PLA Verde Pixel" ], "OFkOviHk": [ "OrcaFilamentLibrary/Fiberon PA6-CF" ], - "OFkaDtKx": [ - "Flashforge/Flashforge PA66-CF" + "OFkR8E2c": [ + "Prusa/Prusament PETG" ], - "OFkeeluv": [ - "Prusa/Prusa Generic ASA HF" + "OFkUaDnU": [ + "Tiertime/Tiertime Generic PE-CF" ], - "OFkfK62J": [ - "Elegoo/Elegoo PLA Silk" + "OFkWaWRo": [ + "Sovol/Sovol SV06 Plus ACE TPU" + ], + "OFkYkQGO": [ + "Tiertime/Tiertime Generic PP-GF" ], "OFkhhUS0": [ + "Elegoo/Elegoo Rapid PLA+", "OrcaFilamentLibrary/Elegoo Rapid PLA+" ], - "OFklg4aM": [ - "Elegoo/Elegoo PLA PRO" + "OFklJcWK": [ + "FlyingBear/Other PLA Hyper", + "InfiMech/Other PLA Hyper" ], "OFknl9Iz": [ "OrcaFilamentLibrary/Bambu ABS-GF" @@ -4710,453 +4192,681 @@ "OFkoLUtR": [ "OrcaFilamentLibrary/FilAr PLA Verde Oliva" ], - "OFkoT6jl": [ - "Prusa/Prusament PLA" + "OFkq7rPy": [ + "Eryone/Eryone PA-GF" + ], + "OFks6esg": [ + "Creality/EN-PLA+" + ], + "OFkwIWwc": [ + "Flashforge/Flashforge PLA Color Change" + ], + "OFkx5MEe": [ + "Artillery/Artillery PVA" ], "OFkzr35f": [ "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" ], - "OFlN56xW": [ - "Chuanying/Chuanying Generic PLA-Silk", - "Chuanying/Chuanying PLA-SILK" + "OFl2SXmv": [ + "Prusa/Prusa Generic FLEX" ], - "OFlNKZLP": [ - "Flashforge/Flashforge PLA Metal" + "OFl4ItvQ": [ + "Prusa/Prusa Generic PLA HF" + ], + "OFl7nOAf": [ + "Sovol/Sovol SV06 Plus ACE PETG" + ], + "OFlBoEfL": [ + "Snapmaker/Snapmaker J1 TPU High-Flow" + ], + "OFlIsW6f": [ + "Snapmaker/Snapmaker Dual PLA Matte" + ], + "OFlLmUeV": [ + "Ginger Additive/Ginger Generic PLA" + ], + "OFlN6DL1": [ + "Qidi/QIDI PA-Ultra" + ], + "OFlNWVr5": [ + "Flashforge/Flashforge Generic PETG-CF10" ], "OFlP3KWq": [ + "Elegoo/Elegoo PETG HF", "OrcaFilamentLibrary/Elegoo PETG HF" ], "OFlSNkhc": [ "OrcaFilamentLibrary/Eolas Prints ASA" ], - "OFlbn4FY": [ - "Snapmaker/Snapmaker PLA Matte" + "OFlXJxX1": [ + "Chuanying/Chuanying PETG" + ], + "OFllmFhT": [ + "Elegoo/Generic PETG PRO" ], "OFln72PT": [ + "Elegoo/Elegoo PLA-CF", "OrcaFilamentLibrary/Elegoo PLA-CF" ], "OFlsTpJG": [ + "Elegoo/Elegoo PC-FR", "OrcaFilamentLibrary/Elegoo PC-FR" ], + "OFlufQpZ": [ + "Snapmaker/Snapmaker PLA" + ], "OFlwmqrC": [ - "OrcaFilamentLibrary/Polymaker HT-PLA-GF" + "OrcaFilamentLibrary/Polymaker HT-PLA-GF", + "Snapmaker/Polymaker HT-PLA-GF" ], - "OFlxnxDx": [ - "Tiertime/Tiertime Generic SBS" - ], - "OFlzQ0IS": [ - "Peopoly/Peopoly Lancer PET-CF" + "OFlx52rn": [ + "Ratrig/RatRig Generic PLA-CF" ], "OFm06H6V": [ + "Elegoo/Elegoo PLA Basic", "OrcaFilamentLibrary/Elegoo PLA Basic" ], - "OFm1VZed": [ - "Flashforge/Flashforge Generic PLA-CF" + "OFm4ysMO": [ + "FlyingBear/FlyingBear ABS" ], - "OFmF1xL9": [ - "Qidi/QIDI ASA-CF" + "OFm70lLt": [ + "CoLiDo/CoLiDo PLA" + ], + "OFmFwUWM": [ + "Prusa/Prusament ASA" ], "OFmJAd3A": [ "OrcaFilamentLibrary/FDplast HIPS" ], - "OFmKNi3f": [ - "Qidi/QIDI PLA Rapido" + "OFmKU2Ha": [ + "Eryone/Eryone PLA" ], - "OFmOWC74": [ - "Elegoo/Elegoo PETG PRO" + "OFmQkb3c": [ + "Flashforge/Flashforge HS PLA Burnt Ti" ], "OFmY0l6t": [ + "Elegoo/Generic PLA Matte", "OrcaFilamentLibrary/Generic PLA Matte" ], + "OFma52eS": [ + "Blocks/Blocks Generic ABS" + ], + "OFma5TXH": [ + "Qidi/QIDI ABS Odorless" + ], "OFmaeU4a": [ "OrcaFilamentLibrary/FilAr PLA-mate Naranja" ], - "OFmcJsqt": [ - "InfiMech/InfiMech TPU" + "OFmexHIS": [ + "Ratrig/RatRig BigNozzle PETG" ], - "OFmduKVr": [ - "Flashforge/FlashForge PPS-CF" - ], - "OFmgesco": [ - "Flashforge/Flashforge TPU 65D" + "OFmfizbq": [ + "OrcaArena/Arena PLA Silk" ], "OFmhJs5V": [ + "Elegoo/Elegoo TPU 95A", "OrcaFilamentLibrary/Elegoo TPU 95A" ], + "OFmhWhEf": [ + "Creality/Creality HF Generic PLA" + ], + "OFmjN2bc": [ + "Anycubic/Anycubic PLA" + ], "OFmn9NZL": [ "OrcaFilamentLibrary/FusRock ABS-GF" ], + "OFmnJNqY": [ + "OrcaArena/OrcaArena Generic PA" + ], "OFmpMwxS": [ + "Flashforge/Generic PLA High Speed", "OrcaFilamentLibrary/Generic PLA High Speed" ], "OFmveLWz": [ + "Elegoo/Elegoo PETG-GF", "OrcaFilamentLibrary/Elegoo PETG-GF" ], + "OFmzftED": [ + "OrcaArena/OrcaArena Generic ASA" + ], "OFn1QaY3": [ + "Elegoo/Elegoo PLA Translucent2", "OrcaFilamentLibrary/Elegoo PLA Translucent2" ], - "OFnLnZQo": [ - "Cubicon/Cubicon PC" + "OFn2GlhY": [ + "Creality/Hyper PA6-CF" ], - "OFnMW5jr": [ - "FlyingBear/FlyingBear ABS" + "OFn6WpN7": [ + "Qidi/QIDI PA12-CF" ], - "OFnRTkEq": [ - "Ratrig/RatRig PunkFil PETG" + "OFnHc3D6": [ + "Creality/eSUN PLA-CF" ], - "OFnY9ovF": [ - "Artillery/Artillery PA-CF" + "OFnMv3W5": [ + "Flashforge/Flashforge HS PLA" + ], + "OFnO4wnf": [ + "Prusa/Prusament PLA" + ], + "OFnSeLHk": [ + "CoLiDo/CoLiDo PLA Silk" + ], + "OFnXrkhA": [ + "InfiMech/InfiMech PA-CF" + ], + "OFnXwW8l": [ + "Snapmaker/PolyLite PLA Pro Metallic" ], "OFnYVFk2": [ "OrcaFilamentLibrary/FilAr PLA Azul Francia" ], + "OFncpm7O": [ + "WonderMaker/WonderMaker PLA Silk" + ], + "OFndmfJ1": [ + "Anker/Anker Generic PLA", + "Anker/Anker Generic PLA 0.2 nozzle", + "Anker/Anker Generic PLA 0.25 nozzle" + ], + "OFneOFWe": [ + "CoLiDo/CoLiDo ABS" + ], "OFnejEt4": [ "OrcaFilamentLibrary/FilAr PETG Cian" ], + "OFnfBvn5": [ + "Artillery/Artillery Generic PLA" + ], + "OFngcE81": [ + "LH/LHS TPU Foamy 78A" + ], + "OFnh79eM": [ + "SecKit/SecKit Generic ABS" + ], "OFniMuTN": [ "OrcaFilamentLibrary/Bambu PA6-CF" ], - "OFnj7bPm": [ - "Qidi/QIDI ABS Rapido 0.6 nozzle" + "OFnmp6rt": [ + "Anycubic/Anycubic PLA+" ], - "OFnsWQTp": [ - "Qidi/QIDI WOOD Rapido" - ], - "OFnyirh9": [ - "Artillery/Artillery PLA Silk" + "OFo15hcT": [ + "Qidi/QIDI PAHT-GF" ], "OFo2UF2C": [ + "Creality/Generic BVOH", "Flashforge/Generic BVOH", "OrcaFilamentLibrary/Generic BVOH" ], - "OFo4VB3w": [ - "Elegoo/Generic ABS-CF" + "OFo6n2pB": [ + "Anycubic/Anycubic PETG" ], - "OFo9EwvK": [ - "Flashforge/Generic PETG-CF10" + "OFoBTKmn": [ + "Cubicon/Cubicon PETG" ], - "OFoAaHcF": [ - "Flashforge/FusRock Generic PAHT-GF" + "OFoDgVnY": [ + "FLSun/FLSun S1 PLA Generic" ], - "OFoJUGj6": [ - "Flashforge/Flashforge HS PLA" + "OFoJcr46": [ + "Prusa/Prusa Generic ASA" ], "OFoSknDB": [ "OrcaFilamentLibrary/FILL3D PLA Turbo" ], + "OFoT8F7Y": [ + "Prusa/Prusa Generic PVA HF" + ], + "OFoVZg32": [ + "SecKit/SecKit Generic TPU" + ], "OFoYSJKi": [ + "Creality/Generic PETG-CF", + "Elegoo/Generic PETG-CF", "OrcaFilamentLibrary/Generic PETG-CF" ], "OFobDOW5": [ + "Elegoo/Elegoo ASA", "OrcaFilamentLibrary/Elegoo ASA" ], "OFocyw69": [ "BBL/AliZ PETG", "OrcaFilamentLibrary/AliZ PETG" ], + "OFodPDxO": [ + "Tiertime/Tiertime Generic PLA High Speed" + ], + "OFogbnCb": [ + "Flashforge/FlashForge PPS-CF" + ], "OFoiVqVM": [ "OrcaFilamentLibrary/Bambu PLA Basic" ], - "OFoimrpo": [ - "Flashforge/Flashforge PETG-CF" + "OFoqrHTw": [ + "FLSun/FLSun S1 PLA High Speed" + ], + "OForhBi4": [ + "Cubicon/Cubicon ABSk" ], "OFovEIbw": [ "OrcaFilamentLibrary/Bambu PETG HF" ], - "OFp8lkYD": [ - "Flashforge/Flashforge PPA-GF" + "OFp4ETDP": [ + "Creality/CR-PLA" ], - "OFp90N8a": [ - "Artillery/Artillery PA" + "OFp57RRC": [ + "Qidi/QIDI PPS-GF" + ], + "OFp8gtPH": [ + "Creality/Creality Generic PLA Silk" + ], + "OFp9wdmf": [ + "Eryone/Eryone PA-CF" + ], + "OFpAaY6w": [ + "Creality/Creality Generic ASA" + ], + "OFpBV2Ma": [ + "Qidi/Tinmorry PETG-ECO" ], "OFpBlrvY": [ "OrcaFilamentLibrary/Valment PLA Silk" ], - "OFpHq9gJ": [ - "Prusa/Prusament PETG" + "OFpDo5Ix": [ + "Cubicon/Cubicon ABS" ], "OFpPGSKG": [ + "Flashforge/SUNLU Silk PLA+", "OrcaFilamentLibrary/SUNLU Silk PLA+" ], + "OFpPJSHE": [ + "Peopoly/Peopoly Lancer PETG-C" + ], + "OFpSYJLI": [ + "Creality/Creality Generic PLA Matte" + ], "OFpW4gdi": [ + "Flashforge/SUNLU PLA Matte", "OrcaFilamentLibrary/SUNLU PLA Matte" ], - "OFphFSUJ": [ - "Prusa/Prusa Generic PETG HF" + "OFptvi3F": [ + "Tiertime/Tiertime Generic PPA-GF" ], - "OFq6IhFg": [ - "Cubicon/Cubicon PLA" + "OFpu74Qe": [ + "Snapmaker/Snapmaker PLA Eco" + ], + "OFpumhCM": [ + "Volumic/Volumic UNIVERSAL Ultra" + ], + "OFq0TY7C": [ + "Flashforge/Flashforge ASA-CF" + ], + "OFq5QANf": [ + "Prusa/Prusa Generic PC HF" ], "OFq8gfS4": [ "OrcaFilamentLibrary/FilAr PETG Negro Azabache" ], + "OFq9svOz": [ + "Creality/Generic PPS" + ], "OFqGRZyH": [ "OrcaFilamentLibrary/Numakers PLA+" ], "OFqINlYj": [ + "Creality/eSUN PLA+", "OrcaFilamentLibrary/eSUN PLA+" ], - "OFqPp2yL": [ - "Qidi/QIDI PETG Tough 0.6 nozzle" + "OFqKmLJe": [ + "Creality/Creality Generic PETG-CF" ], - "OFqRWRU6": [ - "Flashforge/Flashforge ABS-GF" + "OFqOk9Ww": [ + "Peopoly/Peopoly Generic ABS" ], - "OFqSTJ3I": [ - "OrcaArena/OrcaArena Generic PLA Silk" + "OFqS8fzK": [ + "SecKit/SecKit Generic PETG" ], - "OFqkcvDI": [ - "Peopoly/Peopoly Lancer ABS-GF" + "OFqcL5UF": [ + "Qidi/QIDI Support For PET/PA" ], "OFqtx549": [ "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" ], "OFqw2PQA": [ - "OrcaFilamentLibrary/Panchroma CoPE" - ], - "OFqyIUDi": [ - "Qidi/Qidi PLA-CF" + "OrcaFilamentLibrary/Panchroma CoPE", + "Snapmaker/Panchroma CoPE" ], "OFrFBEfd": [ "OrcaFilamentLibrary/Eolas Prints PLA Neon" ], + "OFrGJ4tR": [ + "Anycubic/Anycubic PLA Slik" + ], "OFrKLeE3": [ "OrcaFilamentLibrary/Bambu PLA Metal" ], - "OFrOh600": [ - "OrcaFilamentLibrary/Panchroma PLA Matte" + "OFrLiqiM": [ + "InfiMech/InfiMech PETG" ], - "OFrbbq6E": [ - "InfiMech/Other PLA Hyper" + "OFrM4hdm": [ + "Creality/CR-PLA Carbon" + ], + "OFrO2zyn": [ + "Creality/Creality Generic PLA High Speed" + ], + "OFrOh600": [ + "Creality/Panchroma PLA Matte", + "OrcaFilamentLibrary/Panchroma PLA Matte", + "Snapmaker/Panchroma PLA Matte" + ], + "OFrQqCwL": [ + "InfiMech/InfiMech Generic PLA" + ], + "OFrdZ0cK": [ + "Creality/eSUN PETG+HS" + ], + "OFrgGex8": [ + "Blocks/Blocks Generic PETG" + ], + "OFrh4bBH": [ + "SecKit/SecKit Generic ASA" + ], + "OFrjacXf": [ + "Flashforge/Flashforge PET-CF" + ], + "OFrnJJEa": [ + "Tiertime/Tiertime Generic EVA" + ], + "OFrnkURQ": [ + "Flashforge/Flashforge PLA Metal" + ], + "OFrr67nG": [ + "OrcaArena/Arena PC" + ], + "OFrrMLDw": [ + "Flashforge/Flashforge Generic PLA-SILK" ], "OFryjl35": [ + "Elegoo/Elegoo ASA-CF", "OrcaFilamentLibrary/Elegoo ASA-CF" ], - "OFs1CbB1": [ - "Qidi/QIDI PLA Rapido 0.8 nozzle" + "OFs1sNLz": [ + "Chuanying/Chuanying ABS" + ], + "OFs2ReMr": [ + "InfiMech/InfiMech Generic PETG" ], "OFsB2lxm": [ + "Elegoo/Elegoo PLA Matte", "OrcaFilamentLibrary/Elegoo PLA Matte" ], - "OFsCOJv7": [ - "Anycubic/Generic TPU" + "OFsCbVbN": [ + "Anker/Anker Generic PVA" + ], + "OFsD974q": [ + "Volumic/Volumic PETG Ultra (Performance)" ], "OFsDXRpS": [ "OrcaFilamentLibrary/FilAr PLA Piel" ], + "OFsF96Gt": [ + "FLSun/FLSun Generic PLA-CF" + ], + "OFsFo7ms": [ + "Volumic/Volumic PP Ultra" + ], "OFsFon5l": [ + "Creality/Generic HIPS", "OrcaFilamentLibrary/Generic HIPS" ], + "OFsGqI4y": [ + "Ginger Additive/Ginger Generic PETG" + ], "OFsHSVZc": [ "OrcaFilamentLibrary/Bambu Support W" ], - "OFsLkLw6": [ - "Elegoo/Generic PLA Matte" + "OFsNJjpc": [ + "Ratrig/RatRig BigNozzle TPU" + ], + "OFsP8PKH": [ + "Z-Bolt/Generic ABS HT" ], "OFsRDvTM": [ - "OrcaFilamentLibrary/Panchroma PLA" + "Anycubic/Panchroma PLA", + "OrcaFilamentLibrary/Panchroma PLA", + "Snapmaker/Panchroma PLA" + ], + "OFsXOMoX": [ + "Qidi/Qidi Generic PLA+" ], "OFsXQXbs": [ "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" ], - "OFsgANe3": [ - "Flashforge/Flashforge PAHT-CF" - ], - "OFsmPFwh": [ - "Sovol/Sovol SV06 Plus ACE TPU" + "OFsoQ12i": [ + "Comgrow/Comgrow Generic ABS" ], "OFsoykbm": [ "OrcaFilamentLibrary/DREMC PA6-CF" ], - "OFt1YdX8": [ - "FLSun/FLSun T1 PLA Silk" + "OFsxRSwr": [ + "Ratrig/RatRig Generic PVA" ], - "OFt5bvKK": [ - "Artillery/Artillery PETG Basic" + "OFsxlLdo": [ + "Qidi/Qidi Generic ASA" + ], + "OFt0JbR7": [ + "Snapmaker/Snapmaker J1 PLA Metal" + ], + "OFt3HtlG": [ + "Qidi/QIDI ABS-GF" ], "OFt6e0US": [ "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" ], - "OFt9AiN5": [ - "Flashforge/Polymaker CoPA" + "OFt7SngH": [ + "Snapmaker/Snapmaker J1 ASA" ], - "OFtEFtsz": [ - "Flashforge/Polymaker Generic CoPA" + "OFtFtiS0": [ + "Snapmaker/Polymaker PETG Galaxy" ], - "OFtJMczs": [ - "Flashforge/Flashforge TPU-64D" + "OFtGC1ye": [ + "Artillery/Artillery PA-CF" ], - "OFtL05hE": [ - "Sovol/Sovol Zero PLA Basic HS Nozzle" + "OFtKeKa9": [ + "OrcaArena/Arena PLA Tough" + ], + "OFtOPlK6": [ + "OrcaArena/Arena PAHT-CF" ], "OFtOoWIj": [], + "OFtP1rqJ": [ + "FLSun/FLSun Generic PVA" + ], "OFtRn8X8": [ "OrcaFilamentLibrary/FDplast SBS" ], - "OFtXBjvb": [ - "Artillery/Artillery PLA Tough" - ], - "OFtcKVgP": [], - "OFtcTs1o": [ - "Ratrig/RatRig BigNozzle ABS" + "OFtTHNTj": [ + "Flashforge/Flashforge Generic PLA" ], + "OFtTYl9Q": [], "OFtefokm": [ "OrcaFilamentLibrary/FilAr PLA-mate Blanco" ], - "OFtemzzw": [ - "Sovol/Sovol SV06 ACE ABS" - ], - "OFtet8ui": [ - "Snapmaker/Snapmaker TPU High-Flow" - ], - "OFti31HS": [ - "Cubicon/Cubicon PLAi21" - ], - "OFtmT4Nd": [ - "Artillery/Artillery ASA" - ], "OFtpXCCv": [ "BBL/COEX ASA PRIME", "OrcaFilamentLibrary/COEX ASA PRIME" ], + "OFtplX8o": [ + "Ratrig/RatRig BigNozzle ABS" + ], "OFtr8eZw": [ "OrcaFilamentLibrary/FDplast PLA" ], + "OFtsVp4v": [ + "SecKit/SecKit Generic PA-CF" + ], "OFtudokz": [ "OrcaFilamentLibrary/Eolas Prints PLA Premium" ], - "OFtwA91m": [ - "Sovol/Sovol Zero PC" + "OFtybfNX": [ + "Snapmaker/Snapmaker PLA Metal" + ], + "OFu08yGN": [ + "Volumic/Volumic PETG Ultra carbone" + ], + "OFu0fjPJ": [ + "LH/LHS PC CF" ], "OFu1evlr": [ + "Creality/Generic PCTG", "OrcaFilamentLibrary/Generic PCTG" ], - "OFuPC4S8": [ - "Elegoo/Elegoo PLA-CF" + "OFu79SUH": [ + "Qidi/Qidi Generic PLA" ], - "OFuPN3iW": [ - "FlyingBear/Other PETG" + "OFuFqYyG": [ + "Flashforge/Flashforge PAHT-CF" ], - "OFuTFxVP": [ - "Qidi/Overture ABS" + "OFuGRMNV": [ + "Flashforge/Flashforge PA-CF" + ], + "OFuJ49uH": [ + "Qidi/QIDI PETG Basic" + ], + "OFuO0cAP": [ + "OrcaArena/Arena PETG-CF" + ], + "OFuSwKgm": [ + "Tiertime/Tiertime Generic PLA" + ], + "OFuUJyRx": [ + "FLSun/FLSun T1 PLA Silk" ], "OFuUuIhR": [ + "Elegoo/Elegoo PETG-CF", "OrcaFilamentLibrary/Elegoo PETG-CF" ], + "OFuV79ru": [ + "Flashforge/Flashforge PA66-CF" + ], "OFuWCQXN": [ "BBL/COEX ABS PRIME", "OrcaFilamentLibrary/COEX ABS PRIME" ], - "OFuXkYly": [ - "Elegoo/Elegoo PLA Glow" - ], - "OFuYvNS3": [ - "Afinia/Afinia Value ABS" + "OFuehn62": [ + "OrcaArena/Arena PLA Marble" ], "OFufTAK9": [ "OrcaFilamentLibrary/FilAr PLA-mate Negro" ], - "OFuidAEg": [ - "Qidi/Bambu ABS" + "OFughwKn": [ + "Qidi/QIDI PLA Matte Basic" ], - "OFuq9tqb": [ - "InfiMech/InfiMech PLA Basic" + "OFujZSdh": [ + "Creality/Hyper PETG" + ], + "OFulOdT2": [ + "Flashforge/Generic TPU 85A" + ], + "OFupq0tY": [ + "Blocks/Blocks Generic PLA-CF" ], "OFurdQxc": [ "OrcaFilamentLibrary/FilAr PETG Magenta" ], - "OFuswXlp": [ - "Flashforge/Generic TPU 85A" + "OFusbWjj": [ + "Creality/Hyper PETG-CF" ], - "OFuyJhLF": [ - "Flashforge/Flashforge PETG Basic" + "OFuxH0Uz": [ + "Volumic/Volumic FLEX93 Ultra" ], - "OFv2NHLC": [ - "Qidi/QIDI ABS-GF25" + "OFv4VZCd": [ + "Qidi/Qidi Generic ABS" ], - "OFv8SRZh": [ - "Prusa/Prusa Generic PLA-CF" + "OFvDbkFq": [ + "Prusa/Prusament PC Blend" ], - "OFvGSn0l": [ - "Creality/Creality Generic PETG-CF" + "OFvGc67v": [ + "Prusa/Prusa Generic ABS" ], "OFvKUnLh": [ "OrcaFilamentLibrary/Bambu TPU 95A HF" ], - "OFvN3117": [ - "Qidi/QIDI PLA Matte Basic" - ], - "OFvOhSjO": [ - "FlyingBear/Other TPU" + "OFvLppPU": [ + "Creality/CR-Nylon" ], "OFvPPMxL": [ "OrcaFilamentLibrary/FilAr PLA Verde FilAr" ], + "OFvPomQf": [ + "Tiertime/Tiertime Generic PPS" + ], "OFvTVZc3": [ "BBL/COEX PETG", "OrcaFilamentLibrary/COEX PETG" ], + "OFvVxvzZ": [ + "Flashforge/Flashforge PLA Metal" + ], "OFvVy7yo": [ "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant" ], - "OFvYfHPB": [ - "Anycubic/Anycubic PLA Matte" - ], - "OFvaXhYD": [ - "InfiMech/InfiMech PETG" + "OFvdZ2bx": [ + "Qidi/QIDI WOOD Rapido" ], "OFvgE0Zh": [ + "Elegoo/Elegoo PLA", "OrcaFilamentLibrary/Elegoo PLA" ], - "OFviQ9lH": [ - "Flashforge/Flashforge Generic TPU" - ], "OFvrXuV7": [ "OrcaFilamentLibrary/PolyLite ASA" ], - "OFvsS7Fb": [ - "Flashforge/Generic TPU-64D" + "OFvxIS9g": [ + "Snapmaker/Fiberon PA12-CF10" ], - "OFvw0owy": [ - "Afinia/Afinia Value PLA" - ], - "OFvxvkAd": [ - "Artillery/Artillery PLA-CF" + "OFvyB0Bz": [ + "Snapmaker/PolyLite PLA Galaxy" ], "OFvzvwCu": [ "OrcaFilamentLibrary/Eolas Prints PLA High Speed" ], - "OFw05rkF": [ - "InfiMech/Other PETG" - ], - "OFw0qp7w": [ - "Artillery/Artillery PET" - ], - "OFw1S8lL": [ - "Artillery/Artillery ABS" - ], - "OFwHPTvy": [ - "Qidi/Qidi Generic PLA+" - ], "OFwJ0qu2": [], + "OFwLBAGf": [ + "Qidi/HATCHBOX ABS" + ], + "OFwMFLAm": [ + "Artillery/Artillery Generic ABS" + ], "OFwPrlCM": [ "OrcaFilamentLibrary/Bambu PETG Translucent" ], "OFwRJ4g0": [ "OrcaFilamentLibrary/NIT PLA" ], + "OFwVVKEV": [ + "FlyingBear/Other TPU", + "InfiMech/Other TPU" + ], "OFwaYjL6": [ "OrcaFilamentLibrary/Fiberon PA6-GF" ], - "OFwf0oWp": [ - "Flashforge/Flashforge PLA Luminous" + "OFwhLMs4": [ + "Snapmaker/Snapmaker PLA SnapSpeed" + ], + "OFwpkvqf": [ + "OrcaArena/OrcaArena Generic PETG-CF" ], "OFwu7IAG": [ "BBL/COEX PCTG PRIME", "OrcaFilamentLibrary/COEX PCTG PRIME" ], - "OFwyqcGn": [ - "Elegoo/Elegoo PLA Matte" + "OFwxpmHM": [ + "Flashforge/Polymaker Generic CoPA" + ], + "OFwyt1xt": [ + "Eryone/Eryone ASA-CF" + ], + "OFx0ZzFV": [ + "OrcaArena/OrcaArena Generic PLA-CF" ], "OFx8Lmsd": [ "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" @@ -5164,371 +4874,148 @@ "OFxA1p01": [ "OrcaFilamentLibrary/Overture PLA Pro" ], - "OFxLeRyT": [ - "Prusa/Prusa Generic PVA HF" + "OFxDHUX8": [ + "SeeMeCNC/SeeMeCNC PETG" + ], + "OFxJRuVF": [ + "Anycubic/Anycubic PC-GF" + ], + "OFxMGIPt": [ + "Flashforge/Flashforge PPS" ], "OFxOHhZw": [ + "Elegoo/Elegoo ABS", "OrcaFilamentLibrary/Elegoo ABS" ], + "OFxTMg1d": [ + "FlyingBear/FlyingBear Generic PC" + ], "OFxUwUeW": [ + "Flashforge/SUNLU PLA Marble", "OrcaFilamentLibrary/SUNLU PLA Marble" ], - "OFxVzzn4": [ - "Chuanying/Chuanying Generic PLA-CF10" + "OFxYB4Sw": [ + "Snapmaker/Snapmaker J1 PETG-CF" ], - "OFxfCy9m": [ - "Volumic/Volumic PCTG Ultra (Performance)" + "OFxe4rXr": [ + "Snapmaker/PolyTerra PLA Marble" ], - "OFxjFYxE": [ - "Elegoo/Elegoo PETG HF" + "OFxg7n2G": [ + "Ratrig/RatRig Generic PETG" ], - "OFxlch4V": [ - "CoLiDo/CoLiDo PLA Silk" + "OFxvKuYW": [ + "Tiertime/Tiertime Generic PHA" ], - "OFxodd2u": [ - "DeltaMaker/DeltaMaker Brand PLA" + "OFy02QHU": [ + "Snapmaker/PolyLite PLA Translucent" ], - "OFxxa5yn": [ - "Snapmaker/Snapmaker Dual ABS Benchy" + "OFy14TRA": [ + "Snapmaker/Snapmaker J1 ABS" ], - "OFy7oQ1g": [ - "Blocks/Blocks Generic ASA-CF" + "OFy3sW6j": [ + "WonderMaker/WonderMaker ASA" ], - "OFyD1Zo8": [ + "OFy48TOp": [ + "Flashforge/Generic TPU-95A" + ], + "OFy4ajVZ": [ + "Qidi/Qidi Generic PLA Silk" + ], + "OFy8tYJE": [ + "Cubicon/Cubicon ABS-A100" + ], + "OFyCToOV": [ + "Sovol/Sovol SV08 TPU" + ], + "OFyFRojy": [ + "Ratrig/RatRig Generic ABS" + ], + "OFyFyLIp": [ + "SeeMeCNC/SeeMeCNC TPU" + ], + "OFyHgT60": [ + "OrcaArena/Arena PLA Sparkle" + ], + "OFyK5Lt9": [ + "Artillery/Artillery Generic PETG" + ], + "OFyLWVF3": [ + "Creality/Generic PETG-GF" + ], + "OFyPG8v2": [ + "Snapmaker/Snapmaker Dual PLA Eco" + ], + "OFyQwdaM": [ + "Volumic/Volumic ABS Ultra (Performance)" + ], + "OFyRCIMh": [ + "FlyingBear/Other PC", "InfiMech/Other PC" ], + "OFyUJI3q": [ + "Volumic/Volumic ABS Ultra" + ], "OFybzvQN": [ "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" ], - "OFyoW5W2": [ - "Flashforge/Flashforge PLA Color Change" + "OFyeSq8A": [ + "Prusa/Prusa Generic ABS HF" ], - "OFypQeKR": [ - "Elegoo/Generic PC-CF" + "OFyhjiNs": [ + "Snapmaker/Snapmaker PVA" + ], + "OFyj3m13": [ + "Snapmaker/Snapmaker Dual PLA Silk" + ], + "OFymnal9": [ + "Sovol/Sovol Zero PETG HS Nozzle" + ], + "OFyoBZdm": [ + "LH/LHS PLA" + ], + "OFyreocX": [ + "Tiertime/Tiertime PVA" + ], + "OFyrnlUn": [ + "Snapmaker/Snapmaker J1 TPU" ], "OFysxCep": [ "OrcaFilamentLibrary/FilAr PETG Coral" ], - "OFyt23xJ": [ - "FLSun/FLSun T1 PLA High Speed" - ], - "OFyxAbO4": [ - "Flashforge/Flashforge TPU-95A" - ], "OFyxayW4": [ "BBL/AliZ PLA", "OrcaFilamentLibrary/AliZ PLA" ], - "OFzFbFcl": [ - "Elegoo/Elegoo PC-FR" + "OFyySVby": [ + "SecKit/SecKit Generic PVA" ], - "OFzQQeCi": [ - "Chuanying/Chuanying Generic HIPS" + "OFz3q5Xz": [ + "CONSTRUCT3D/C1 Generic PETG" ], - "OFzb2BLs": [ - "Ratrig/RatRig Generic PCTG" + "OFzAWsca": [ + "Qidi/Qidi TPU 95A-HF" ], - "OFziUL2X": [ - "Ginger Additive/Ginger Generic PLA" + "OFzB4uOs": [ + "Sovol/Sovol Zero PLA Basic HS Nozzle" + ], + "OFzS7zt4": [ + "Anycubic/Anycubic PA" + ], + "OFzXURfo": [ + "FlyingBear/FlyingBear Generic PETG" + ], + "OFzY7N3Z": [ + "Artillery/Artillery PLA" ], "OFzrUUxc": [], + "OFztQ7rO": [ + "LH/LHS ABS" + ], "OFzyIxba": [ "OrcaFilamentLibrary/Bambu PVA" ], - "OGFC99": [], - "OGFG99": [], - "OGFL96": [ - "Flashforge/Generic PLA Silk", - "Sovol/Generic PLA Silk" - ], - "OGFN99": [], - "OGFSNL08": [ - "Sovol/SUNLU PETG" - ], - "P1001": [ - "Creality/Panchroma PLA Satin" - ], - "P1002": [ - "Creality/PolySonic PLA Pro" - ], - "P1003": [ - "Creality/Panchroma PLA Matte" - ], - "P1004": [ - "Creality/PolySonic PLA" - ], - "P510cfa0": [ - "Cubicon/Cubicon PLA" - ], - "P510cfa1": [ - "Cubicon/Cubicon PLA+" - ], - "P510cfa2": [ - "Cubicon/Cubicon PLAi21" - ], - "P510cfb0": [ - "Cubicon/Cubicon ABS" - ], - "P510cfb1": [ - "Cubicon/Cubicon ABS-A100" - ], - "P510cfb2": [ - "Cubicon/Cubicon ABSk" - ], - "P510cfc0": [ - "Cubicon/Cubicon PETG" - ], - "P510cfd0": [ - "Cubicon/Cubicon PA-CF" - ], - "P510eff9": [ - "Ginger Additive/Ginger Generic PETG" - ], - "Pfcf9c4c": [ - "Artillery/Artillery PLA" - ], - "Prusa Generic ABS @CORE One": [ - "Prusa/Prusa Generic ABS" - ], - "Prusa Generic ABS @CORE One 0.6": [ - "Prusa/Prusa Generic ABS" - ], - "Prusa Generic ABS @CORE One 0.8": [ - "Prusa/Prusa Generic ABS" - ], - "Prusa Generic ABS @CORE One HF 0.4": [ - "Prusa/Prusa Generic ABS" - ], - "Prusa Generic ABS @CORE One HF 0.5": [ - "Prusa/Prusa Generic ABS" - ], - "Prusa Generic ABS @CORE One HF 0.6": [ - "Prusa/Prusa Generic ABS" - ], - "Prusa Generic ABS @CORE One HF 0.8": [ - "Prusa/Prusa Generic ABS" - ], - "Prusa Generic ASA @CORE One": [ - "Prusa/Prusa Generic ASA" - ], - "Prusa Generic ASA @CORE One 0.6": [ - "Prusa/Prusa Generic ASA" - ], - "Prusa Generic ASA @CORE One 0.8": [ - "Prusa/Prusa Generic ASA" - ], - "Prusa Generic ASA @CORE One HF 0.4": [ - "Prusa/Prusa Generic ASA" - ], - "Prusa Generic ASA @CORE One HF 0.5": [ - "Prusa/Prusa Generic ASA" - ], - "Prusa Generic ASA @CORE One HF 0.6": [ - "Prusa/Prusa Generic ASA" - ], - "Prusa Generic ASA @CORE One HF 0.8": [ - "Prusa/Prusa Generic ASA" - ], - "Prusa Generic PETG @CORE One": [ - "Prusa/Prusa Generic PETG" - ], - "Prusa Generic PETG @CORE One 0.6": [ - "Prusa/Prusa Generic PETG" - ], - "Prusa Generic PETG @CORE One 0.8": [ - "Prusa/Prusa Generic PETG" - ], - "Prusa Generic PETG @CORE One HF 0.4": [ - "Prusa/Prusa Generic PETG" - ], - "Prusa Generic PETG @CORE One HF 0.5": [ - "Prusa/Prusa Generic PETG" - ], - "Prusa Generic PETG @CORE One HF 0.6": [ - "Prusa/Prusa Generic PETG" - ], - "Prusa Generic PETG @CORE One HF 0.8": [ - "Prusa/Prusa Generic PETG" - ], - "Prusa Generic PLA @CORE One": [ - "Prusa/Prusa Generic PLA" - ], - "Prusa Generic PLA @CORE One 0.6": [ - "Prusa/Prusa Generic PLA" - ], - "Prusa Generic PLA @CORE One 0.8": [ - "Prusa/Prusa Generic PLA" - ], - "Prusa Generic PLA @CORE One HF 0.4": [ - "Prusa/Prusa Generic PLA" - ], - "Prusa Generic PLA @CORE One HF 0.5": [ - "Prusa/Prusa Generic PLA" - ], - "Prusa Generic PLA @CORE One HF 0.6": [ - "Prusa/Prusa Generic PLA" - ], - "Prusa Generic PLA @CORE One HF 0.8": [ - "Prusa/Prusa Generic PLA" - ], - "Prusa Generic PLA Silk @CORE One": [ - "Prusa/Prusa Generic PLA Silk" - ], - "Prusa Generic PLA Silk @CORE One 0.6": [ - "Prusa/Prusa Generic PLA Silk" - ], - "Prusa Generic PLA Silk @CORE One 0.8": [ - "Prusa/Prusa Generic PLA Silk" - ], - "Prusa Generic TPU @CORE One": [ - "Prusa/Prusa Generic TPU" - ], - "Prusa Generic TPU @CORE One 0.6": [ - "Prusa/Prusa Generic TPU" - ], - "Prusa Generic TPU @CORE One 0.8": [ - "Prusa/Prusa Generic TPU" - ], - "Prusament ASA @CORE One": [ - "Prusa/Prusament ASA" - ], - "Prusament ASA @CORE One 0.6": [ - "Prusa/Prusament ASA" - ], - "Prusament ASA @CORE One 0.8": [ - "Prusa/Prusament ASA" - ], - "Prusament ASA @CORE One HF 0.4": [ - "Prusa/Prusament ASA" - ], - "Prusament ASA @CORE One HF 0.5": [ - "Prusa/Prusament ASA" - ], - "Prusament ASA @CORE One HF 0.6": [ - "Prusa/Prusament ASA" - ], - "Prusament ASA @CORE One HF 0.8": [ - "Prusa/Prusament ASA" - ], - "Prusament ASA @MK4S": [ - "Prusa/Prusa Generic ASA" - ], - "Prusament ASA @MK4S 0.6": [ - "Prusa/Prusa Generic ASA" - ], - "Prusament ASA @MK4S 0.8": [ - "Prusa/Prusa Generic ASA" - ], - "Prusament ASA @MK4S HF0.4": [ - "Prusa/Prusa Generic ASA" - ], - "Prusament ASA @MK4S HF0.5": [ - "Prusa/Prusa Generic ASA" - ], - "Prusament ASA @MK4S HF0.6": [ - "Prusa/Prusa Generic ASA" - ], - "Prusament ASA @MK4S HF0.8": [ - "Prusa/Prusa Generic ASA" - ], - "Prusament PA-CF @CORE One": [ - "Prusa/Prusament PA-CF" - ], - "Prusament PA-CF @CORE One 0.6": [ - "Prusa/Prusament PA-CF" - ], - "Prusament PA-CF @CORE One 0.8": [ - "Prusa/Prusament PA-CF" - ], - "Prusament PC Blend @CORE One": [ - "Prusa/Prusament PC Blend" - ], - "Prusament PC Blend @CORE One 0.6": [ - "Prusa/Prusament PC Blend" - ], - "Prusament PC Blend @CORE One 0.8": [ - "Prusa/Prusament PC Blend" - ], - "Prusament PC Blend @CORE One HF 0.4": [ - "Prusa/Prusament PC Blend" - ], - "Prusament PC Blend @CORE One HF 0.5": [ - "Prusa/Prusament PC Blend" - ], - "Prusament PC Blend @CORE One HF 0.6": [ - "Prusa/Prusament PC Blend" - ], - "Prusament PC Blend @CORE One HF 0.8": [ - "Prusa/Prusament PC Blend" - ], - "Prusament PC-CF @CORE One": [ - "Prusa/Prusament PC-CF" - ], - "Prusament PC-CF @CORE One 0.6": [ - "Prusa/Prusament PC-CF" - ], - "Prusament PC-CF @CORE One 0.8": [ - "Prusa/Prusament PC-CF" - ], - "Prusament PETG @CORE One": [ - "Prusa/Prusament PETG" - ], - "Prusament PETG @CORE One 0.6": [ - "Prusa/Prusament PETG" - ], - "Prusament PETG @CORE One 0.8": [ - "Prusa/Prusament PETG" - ], - "Prusament PETG @CORE One HF 0.4": [ - "Prusa/Prusament PETG" - ], - "Prusament PETG @CORE One HF 0.5": [ - "Prusa/Prusament PETG" - ], - "Prusament PETG @CORE One HF 0.6": [ - "Prusa/Prusament PETG" - ], - "Prusament PETG @CORE One HF 0.8": [ - "Prusa/Prusament PETG" - ], - "Prusament PLA @CORE One": [ - "Prusa/Prusament PLA" - ], - "Prusament PLA @CORE One 0.6": [ - "Prusa/Prusament PLA" - ], - "Prusament PLA @CORE One 0.8": [ - "Prusa/Prusament PLA" - ], - "Prusament PLA @CORE One HF 0.4": [ - "Prusa/Prusament PLA" - ], - "Prusament PLA @CORE One HF 0.5": [ - "Prusa/Prusament PLA" - ], - "Prusament PLA @CORE One HF 0.6": [ - "Prusa/Prusament PLA" - ], - "Prusament PLA @CORE One HF 0.8": [ - "Prusa/Prusament PLA" - ], - "Prusament PVB @CORE One": [ - "Prusa/Prusament PVB" - ], - "Prusament PVB @CORE One 0.6": [ - "Prusa/Prusament PVB" - ], - "Prusament PVB @CORE One 0.8": [ - "Prusa/Prusament PVB" - ], - "Prusament rPLA @CORE One": [ - "Prusa/Prusament rPLA" - ], - "Prusament rPLA @CORE One 0.6": [ - "Prusa/Prusament rPLA" - ], - "Prusament rPLA @CORE One 0.8": [ - "Prusa/Prusament rPLA" + "OFzzmK2Q": [ + "FLSun/FLSun S1 ABS" ], "QD_0_1_1": [ "Qidi/QIDI PLA Rapido" @@ -6009,24 +5496,6 @@ ], "QD_3_1_8": [ "Qidi/QIDI PLA Matte Basic" - ], - "SMCFB001": [ - "SeeMeCNC/SeeMeCNC ABS" - ], - "SMCFG001": [ - "SeeMeCNC/SeeMeCNC PETG" - ], - "SMCFG002": [ - "SeeMeCNC/SeeMeCNC PETG-CF" - ], - "SMCFL001": [ - "SeeMeCNC/SeeMeCNC PLA" - ], - "SMCFN001": [ - "SeeMeCNC/SeeMeCNC PA-CF" - ], - "SMCFU001": [ - "SeeMeCNC/SeeMeCNC TPU" ] }, "instantiated_with_id": [ @@ -6846,12 +6315,6 @@ "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PLAi21 @base", - "Custom/Generic PC @MyToolChanger", - "Custom/Generic PETG @MyToolChanger", - "Custom/Generic PLA @MyToolChanger", - "Custom/Generic PLA-CF @MyToolChanger", - "Custom/Generic PVA @MyToolChanger", - "Custom/Generic TPU @MyToolChanger", "DeltaMaker/DeltaMaker Brand PLA", "DeltaMaker/DeltaMaker Generic PETG", "DeltaMaker/DeltaMaker Generic PLA", @@ -6861,10 +6324,12 @@ "Dremel/Dremel Generic PLA @3D40 all", "Dremel/Dremel Generic PLA @3D45 all", "Elegoo/Generic ABS-CF @Elegoo Centauri", + "Elegoo/Generic ASA-CF @Elegoo Centauri", "Elegoo/Generic PA6-CF @Elegoo", "Elegoo/Generic PC-CF @Elegoo", "Elegoo/Generic PET-CF @Elegoo Centauri", "Elegoo/Generic PETG PRO @Elegoo", + "Elegoo/Generic PETG-CF @Elegoo Centauri", "Elegoo/Generic PLA Matte @Elegoo", "Eryone/Eryone ABS", "Eryone/Eryone ABS-CF", @@ -7652,6 +7117,7 @@ "Prusa/Prusa Generic ABS HF @MK3.5", "Prusa/Prusa Generic ABS HF @MK3.5 0.6", "Prusa/Prusa Generic ABS HF @MK3.5 0.8", + "Prusa/Prusa Generic ASA", "Prusa/Prusa Generic ASA @CORE One", "Prusa/Prusa Generic ASA @CORE One 0.6", "Prusa/Prusa Generic ASA @CORE One 0.8", @@ -7659,10 +7125,15 @@ "Prusa/Prusa Generic ASA @CORE One HF 0.5", "Prusa/Prusa Generic ASA @CORE One HF 0.6", "Prusa/Prusa Generic ASA @CORE One HF 0.8", + "Prusa/Prusa Generic ASA @MINIIS", + "Prusa/Prusa Generic ASA @MINIIS 0.25", + "Prusa/Prusa Generic ASA @MINIIS 0.6", + "Prusa/Prusa Generic ASA @MINIIS 0.8", "Prusa/Prusa Generic ASA @MK3.5", "Prusa/Prusa Generic ASA @MK3.5 0.25", "Prusa/Prusa Generic ASA @MK3.5 0.6", "Prusa/Prusa Generic ASA @MK3.5 0.8", + "Prusa/Prusa Generic ASA @MK4", "Prusa/Prusa Generic ASA @MK4S", "Prusa/Prusa Generic ASA @MK4S 0.6", "Prusa/Prusa Generic ASA @MK4S 0.8", @@ -7673,6 +7144,8 @@ "Prusa/Prusa Generic ASA HF @MK3.5", "Prusa/Prusa Generic ASA HF @MK3.5 0.6", "Prusa/Prusa Generic ASA HF @MK3.5 0.8", + "Prusa/Prusa Generic FLEX @XL", + "Prusa/Prusa Generic FLEX @XL 5T", "Prusa/Prusa Generic PA @MK3.5", "Prusa/Prusa Generic PA @MK3.5 0.25", "Prusa/Prusa Generic PA @MK3.5 0.6", @@ -7681,6 +7154,11 @@ "Prusa/Prusa Generic PA-CF @MK3.5 0.25", "Prusa/Prusa Generic PA-CF @MK3.5 0.6", "Prusa/Prusa Generic PA-CF @MK3.5 0.8", + "Prusa/Prusa Generic PC", + "Prusa/Prusa Generic PC @MINIIS", + "Prusa/Prusa Generic PC @MINIIS 0.25", + "Prusa/Prusa Generic PC @MINIIS 0.6", + "Prusa/Prusa Generic PC @MINIIS 0.8", "Prusa/Prusa Generic PC @MK3.5", "Prusa/Prusa Generic PC @MK3.5 0.25", "Prusa/Prusa Generic PC @MK3.5 0.6", @@ -7762,9 +7240,13 @@ "Prusa/Prusament ASA @CORE One HF 0.5", "Prusa/Prusament ASA @CORE One HF 0.6", "Prusa/Prusament ASA @CORE One HF 0.8", + "Prusa/Prusament ASA @XL", + "Prusa/Prusament ASA @XL 5T", "Prusa/Prusament PA-CF @CORE One", "Prusa/Prusament PA-CF @CORE One 0.6", "Prusa/Prusament PA-CF @CORE One 0.8", + "Prusa/Prusament PA-CF @XL", + "Prusa/Prusament PA-CF @XL 5T", "Prusa/Prusament PC Blend @CORE One", "Prusa/Prusament PC Blend @CORE One 0.6", "Prusa/Prusament PC Blend @CORE One 0.8", @@ -7772,9 +7254,13 @@ "Prusa/Prusament PC Blend @CORE One HF 0.5", "Prusa/Prusament PC Blend @CORE One HF 0.6", "Prusa/Prusament PC Blend @CORE One HF 0.8", + "Prusa/Prusament PC Blend @XL", + "Prusa/Prusament PC Blend @XL 5T", "Prusa/Prusament PC-CF @CORE One", "Prusa/Prusament PC-CF @CORE One 0.6", "Prusa/Prusament PC-CF @CORE One 0.8", + "Prusa/Prusament PC-CF @XL", + "Prusa/Prusament PC-CF @XL 5T", "Prusa/Prusament PETG @CORE One", "Prusa/Prusament PETG @CORE One 0.6", "Prusa/Prusament PETG @CORE One 0.8", @@ -7792,6 +7278,8 @@ "Prusa/Prusament PVB @CORE One", "Prusa/Prusament PVB @CORE One 0.6", "Prusa/Prusament PVB @CORE One 0.8", + "Prusa/Prusament PVB @XL", + "Prusa/Prusament PVB @XL 5T", "Prusa/Prusament rPLA @CORE One", "Prusa/Prusament rPLA @CORE One 0.6", "Prusa/Prusament rPLA @CORE One 0.8", @@ -8387,6 +7875,9 @@ "SeeMeCNC/SeeMeCNC PETG-CF", "SeeMeCNC/SeeMeCNC PLA", "SeeMeCNC/SeeMeCNC TPU", + "Snapmaker/PolyLite Dual PLA @0.2 nozzle", + "Snapmaker/PolyLite J1 PLA", + "Snapmaker/PolyLite J1 PLA @0.2 nozzle", "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", @@ -8595,4601 +8086,34 @@ "re3D/re3D rPP @0.8 nozzle", "re3D/re3D rPP @1.75 nozzle" ], - "triple_exceptions": [ - "Anycubic/Anycubic ABS", - "Anycubic/Anycubic ASA", - "Anycubic/Anycubic PETG", - "Anycubic/Anycubic PLA", - "Anycubic/Anycubic PLA High Speed", - "Anycubic/Anycubic PLA Silk", - "Anycubic/Anycubic PLA+", - "Anycubic/Anycubic TPU", - "Anycubic/Generic PETG", - "Creality/Creality Generic ABS", - "Creality/Creality Generic ASA", - "Creality/Creality Generic PETG", - "Creality/Creality Generic TPU", - "Creality/Generic PETG-GF", - "Flashforge/Flashforge ABS", - "Flashforge/Flashforge ASA-CF", - "Flashforge/Flashforge PET-CF", - "Flashforge/Flashforge PETG", - "Flashforge/Flashforge PPA-CF", - "Flashforge/Flashforge PPS-CF", - "Flashforge/FusRock Generic PAHT-CF", - "Flashforge/FusRock Generic PET-CF", - "Flashforge/FusRock Generic S-Multi", - "Flashforge/FusRock Generic S-PAHT", - "Prusa/Prusa Generic ASA", - "Prusa/Prusa Generic TPU", - "Prusa/Prusa Generic TPU HF", - "Prusa/Prusament PETG", - "Prusa/Prusament PLA", - "Prusa/Prusament rPLA", - "Snapmaker/PolyLite PLA", - "re3D/re3D Greengate rPETG" - ], + "triple_exceptions": [], "triples": { - "00001": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "00002": [ - [ - "Generic", - "PLA", - "Generic PLA-Silk" - ] - ], - "00003": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "00004": [ + "OF016CJw": [ [ "Generic", "ABS", - "Generic ABS" + "Sovol SV08 ABS" ] ], - "00005": [ - [ - "Generic", - "TPU", - "Generic TPU" - ] - ], - "00006": [ - [ - "Generic", - "PLA-CF", - "Generic PLA-CF" - ] - ], - "00007": [ - [ - "Generic", - "ASA", - "Generic ASA" - ] - ], - "00008": [ - [ - "Generic", - "PA", - "Generic PA" - ] - ], - "00009": [ - [ - "Generic", - "PA-CF", - "Generic PA-CF" - ] - ], - "00010": [ - [ - "Generic", - "BVOH", - "Generic BVOH" - ] - ], - "00011": [ - [ - "Generic", - "PVA", - "Generic PVA" - ] - ], - "00012": [ - [ - "Generic", - "HIPS", - "Generic HIPS" - ] - ], - "00013": [ - [ - "Generic", - "PET-CF", - "Generic PET-CF" - ] - ], - "00014": [ - [ - "Generic", - "PETG-CF", - "Generic PETG-CF" - ] - ], - "00015": [ - [ - "Generic", - "PA6-CF", - "Generic PA6-CF" - ] - ], - "00016": [ - [ - "Generic", - "PA-CF", - "Generic PAHT-CF" - ] - ], - "00017": [ - [ - "Generic", - "PPS", - "Generic PPS" - ] - ], - "00018": [ - [ - "Generic", - "PPS-CF", - "Generic PPS-CF" - ] - ], - "00019": [ - [ - "Generic", - "PP", - "Generic PP" - ] - ], - "00020": [ - [ - "Generic", - "PET", - "Generic PET" - ] - ], - "00021": [ - [ - "Generic", - "PC", - "Generic PC" - ] - ], - "00022": [ - [ - "Generic", - "PA-CF", - "Generic PA612-CF" - ] - ], - "00023": [ - [ - "Generic", - "PA", - "Generic Support for PA" - ] - ], - "00024": [ - [ - "Generic", - "PLA", - "Generic Support for PLA" - ] - ], - "00025": [ - [ - "Generic", - "PA-CF", - "Generic PA12-CF" - ] - ], - "00026": [ - [ - "Generic", - "TPU", - "Generic TPU 64D" - ] - ], - "00027": [ - [ - "Creality", - "PETG-GF", - "Generic PETG-GF" - ], - [ - "Generic", - "PETG-GF", - "Generic PETG-GF" - ] - ], - "00031": [ - [ - "Generic", - "PP-CF", - "Generic PP-CF" - ] - ], - "00032": [ - [ - "Generic", - "PCTG", - "Generic PCTG" - ] - ], - "00033": [ - [ - "Generic", - "ASA-CF", - "Generic ASA-CF" - ] - ], - "00034": [ - [ - "Generic", - "PA-GF", - "Generic PA6-GF" - ] - ], - "00035": [ - [ - "eSUN", - "PLA", - "eSUN PLA-LW" - ] - ], - "01001": [ - [ - "Creality", - "PLA", - "Creality Hyper PLA" - ], - [ - "Creality", - "PLA", - "Hyper PLA" - ] - ], - "01002": [ - [ - "Creality", - "PLA", - "Hyper L-W PLA" - ] - ], - "01003": [ - [ - "Creality", - "PLA", - "Hyper Luminous" - ] - ], - "01004": [ - [ - "Creality", - "PLA", - "Hyper Stardust" - ] - ], - "01601": [ + "OF02UAVh": [ [ "Creality", "PLA", "Soleyin Ultra PLA" ] ], - "02001": [ - [ - "Creality", - "PLA-CF", - "Creality Hyper PLA-CF" - ], - [ - "Creality", - "PLA-CF", - "Hyper PLA-CF" - ] - ], - "03001": [ - [ - "Creality", - "ABS", - "Creality Hyper ABS" - ], - [ - "Creality", - "ABS", - "Hyper ABS" - ] - ], - "04001": [ - [ - "Creality", - "PLA", - "CR-PLA" - ], - [ - "Generic", - "PLA", - "Creality Generic PLA" - ] - ], - "05001": [ - [ - "Creality", - "PLA", - "CR-Silk" - ], - [ - "Creality", - "PLA", - "Creality Silk PLA" - ] - ], - "06001": [ - [ - "Creality", - "PETG", - "CR-PETG" - ], - [ - "Creality", - "PETG", - "Creality Generic PETG" - ] - ], - "06002": [ - [ - "Creality", - "PETG", - "Hyper PETG" - ] - ], - "06003": [ - [ - "Creality", - "PETG-CF", - "Hyper PETG-CF" - ] - ], - "06004": [ - [ - "Creality", - "PETG-GF", - "Hyper PETG-GF" - ] - ], - "06005": [ - [ - "Creality", - "PETG", - "Soleyin Basic PETG" - ] - ], - "07001": [ - [ - "Creality", - "ABS", - "CR-ABS" - ], - [ - "Creality", - "ABS", - "Creality Generic ABS" - ] - ], - "07002": [ - [ - "Creality", - "PC", - "Hyper PC" - ] - ], - "08001": [ - [ - "Creality", - "PLA", - "Ender-PLA" - ] - ], - "09001": [ - [ - "Creality", - "PLA", - "EN-PLA+" - ] - ], - "09002": [ - [ - "Creality", - "PLA", - "ENDER FAST PLA" - ] - ], - "10001": [ - [ - "Creality", - "TPU", - "Creality Generic TPU" - ], - [ - "Creality", - "TPU", - "HP-TPU" - ] - ], - "1009481135": [ - [ - "Snapmaker", - "PET", - "Snapmaker J1 PET" - ] - ], - "1042511226": [ - [ - "Snapmaker", - "PETG-CF", - "Snapmaker Dual PETG-CF" - ] - ], - "10425112260": [ - [ - "Snapmaker", - "PETG-CF", - "Snapmaker PETG-CF" - ] - ], - "11001": [ - [ - "Creality", - "PA", - "CR-Nylon" - ], - [ - "Creality", - "PA", - "Creality Generic PA" - ] - ], - "1172603684": [ - [ - "Snapmaker", - "PETG", - "Snapmaker J1 PETG" - ] - ], - "1181363872": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Silk" - ] - ], - "11813638720": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Silk" - ] - ], - "1192769348": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Matte" - ] - ], - "12002": [ - [ - "Creality", - "PA-CF", - "Hyper PPA-CF" - ] - ], - "12003": [ - [ - "Creality", - "PA-CF", - "Hyper PAHT-CF" - ] - ], - "12004": [ - [ - "Creality", - "PA-CF", - "Hyper PA612-CF" - ] - ], - "12005": [ - [ - "Creality", - "PA-CF", - "Hyper PA6-CF" - ] - ], - "1207881278": [ - [ - "Snapmaker", - "Breakaway Support", - "Snapmaker Dual Breakaway" - ] - ], - "1210173120": [ - [ - "Snapmaker", - "PA-CF", - "Snapmaker J1 PA-CF" - ] - ], - "1223824394": [ - [ - "Snapmaker", - "ABS", - "Snapmaker J1 ABS" - ] - ], - "1247172706": [ - [ - "Snapmaker", - "ASA", - "Snapmaker Dual ASA" - ] - ], - "12471727060": [ - [ - "Snapmaker", - "ASA", - "Snapmaker ASA" - ] - ], - "13001": [ - [ - "Creality", - "PLA-CF", - "CR-PLA Carbon" - ] - ], - "1344609062": [ - [ - "Snapmaker", - "PVA", - "Snapmaker PVA" - ] - ], - "1355502217": [ - [ - "Snapmaker", - "PETG-CF", - "Snapmaker PETG-CF" - ] - ], - "1393866034": [ - [ - "Snapmaker", - "PLA", - "PolyLite PLA" - ] - ], - "14001": [ - [ - "Creality", - "PLA", - "CR-PLA Matte" - ] - ], - "1417031127": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA" - ] - ], - "14170311270": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA" - ] - ], - "141703112701": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA SnapSpeed" - ] - ], - "1417031127011": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Lite" - ] - ], - "144877656": [ - [ - "Snapmaker", - "ASA", - "Snapmaker J1 ASA" - ] - ], - "1480063856": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU" - ] - ], - "15001": [ - [ - "Creality", - "PLA", - "CR-PLA Fluo" - ] - ], - "1528786603": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Silk" - ] - ], - "16001": [ - [ - "Creality", - "TPU", - "CR-TPU" - ] - ], - "1655727393": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Silk" - ] - ], - "168223792": [ - [ - "Snapmaker", - "ABS", - "Snapmaker Dual ABS" - ] - ], - "1682237920": [ - [ - "Snapmaker", - "ABS", - "Snapmaker ABS" - ] - ], - "1695556157": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Eco" - ] - ], - "17001": [ - [ - "Creality", - "PLA", - "CR-Wood" - ] - ], - "1702147325": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker Dual PLA-CF" - ] - ], - "17021473250": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker PLA-CF" - ] - ], - "18001": [ - [ - "Creality", - "PLA", - "HP Ultra PLA" - ] - ], - "1895495477": [ - [ - "Snapmaker", - "PETG", - "Snapmaker PETG" - ] - ], - "19001": [ - [ - "Creality", - "ASA", - "Creality Generic ASA" - ], - [ - "Creality", - "ASA", - "HP-ASA" - ] - ], - "200803790": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Eco" - ] - ], - "2008037900": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Eco" - ] - ], - "2029994346": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Metal" - ] - ], - "20299943460": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Metal" - ] - ], - "2128577941": [ - [ - "Snapmaker", - "PET", - "Snapmaker Dual PET" - ] - ], - "21285779410": [ - [ - "Snapmaker", - "PET", - "Snapmaker PET" - ] - ], - "2209001062": [ - [ - "Snapmaker", - "PETG", - "Snapmaker Dual PETG" - ] - ], - "22090010620": [ - [ - "Snapmaker", - "PETG", - "Snapmaker PETG" - ] - ], - "2549587591": [ - [ - "Snapmaker", - "PET", - "Snapmaker PET" - ] - ], - "2742961008": [ - [ - "Snapmaker", - "ASA", - "Snapmaker ASA" - ] - ], - "29001": [ - [ - "Creality", - "PLA", - "Hyper Marble" - ] - ], - "2971656290": [ - [ - "Snapmaker", - "TPU", - "Snapmaker Dual TPU" - ] - ], - "29716562900": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU" - ] - ], - "297165629001": [ - [ - "Generic", - "TPU", - "Snapmaker TPU 95A" - ] - ], - "3104636980": [ - [ - "Snapmaker", - "PVA", - "Snapmaker Dual PVA" - ] - ], - "31046369800": [ - [ - "Snapmaker", - "PVA", - "Snapmaker PVA" - ] - ], - "3177068229": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA" - ] - ], - "3383257822": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Eco" - ] - ], - "3492897526": [ - [ - "Snapmaker", - "Breakaway Support", - "Snapmaker J1 Breakaway" - ] - ], - "3493177425": [ - [ - "Snapmaker", - "PA-CF", - "Snapmaker Dual PA-CF" - ] - ], - "34931774250": [ - [ - "Snapmaker", - "PA-CF", - "Snapmaker PA-CF" - ] - ], - "3503790988": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Matte" - ] - ], - "377675245": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA" - ] - ], - "3806593857": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker J1 PLA-CF" - ] - ], - "3811508002": [ - [ - "Snapmaker", - "ABS", - "Snapmaker ABS" - ] - ], - "3864371306": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker PLA-CF" - ] - ], - "4012961186": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Metal" - ] - ], - "4092268632": [ - [ - "Snapmaker", - "TPU", - "Snapmaker J1 TPU" - ] - ], - "4227461134": [ - [ - "Snapmaker", - "PVA", - "Snapmaker J1 PVA" - ] - ], - "4235401834": [ - [ - "Snapmaker", - "PETG-CF", - "Snapmaker J1 PETG-CF" - ] - ], - "581236806": [ - [ - "Snapmaker", - "PA-CF", - "Snapmaker PA-CF" - ] - ], - "BSFI001": [ - [ - "Generic", - "PLA", - "Blocks Generic PLA" - ] - ], - "BSFI002": [ - [ - "Generic", - "PETG", - "Blocks Generic PETG" - ] - ], - "BSFI003": [ - [ - "Generic", - "TPU", - "Blocks Generic TPU" - ] - ], - "BSFI004": [ - [ - "Generic", - "ABS", - "Blocks Generic ABS" - ] - ], - "BSFI005": [ - [ - "Generic", - "ASA", - "Blocks Generic ASA" - ] - ], - "BSFI006": [ - [ - "Generic", - "PA", - "Blocks Generic PA" - ] - ], - "BSFI007": [ - [ - "Generic", - "PA-CF", - "Blocks Generic PA-CF" - ] - ], - "BSFI008": [ - [ - "Generic", - "PC", - "Blocks Generic PC" - ] - ], - "BSFI009": [ - [ - "Generic", - "PVA", - "Blocks Generic PVA" - ] - ], - "BSFI010": [ - [ - "Generic", - "PLA-CF", - "Blocks Generic PLA-CF" - ] - ], - "DFL99": [ - [ - "Volumic", - "PLA", - "Désactivé" - ] - ], - "E1001": [ - [ - "eSUN", - "PLA", - "eSUN PLA+" - ] - ], - "E1002": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Silk" - ] - ], - "E1003": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Matte" - ] - ], - "E1004": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Lite" - ] - ], - "E1005": [ - [ - "eSUN", - "PLA-CF", - "eSUN PLA-CF" - ] - ], - "E1006": [ - [ - "eSUN", - "PLA", - "eSUN PLA-HS" - ] - ], - "E2001": [ - [ - "eSUN", - "PETG", - "eSUN PETG" - ] - ], - "E2002": [ - [ - "eSUN", - "PETG", - "eSUN PETG+HS" - ] - ], - "E2003": [ - [ - "eSUN", - "PETG", - "eSUN PETG-Basic" - ] - ], - "E3001": [ - [ - "eSUN", - "ABS", - "eSUN ABS+" - ] - ], - "E4001": [ - [ - "eSUN", - "ASA", - "eSUN ASA+" - ] - ], - "E8001": [ - [ - "eSUN", - "PET", - "eSUN PET-Basic" - ] - ], - "EABSB00": [ - [ - "Elegoo", - "ABS", - "Elegoo ABS" - ] - ], - "EASAB00": [ - [ - "Elegoo", - "ASA", - "Elegoo ASA" - ] - ], - "EFL33": [ - [ - "Eryone", - "PP-CF", - "Eryone PP-CF" - ] - ], - "EFL40": [ - [ - "Eryone", - "PLA-CF", - "Eryone PLA-CF" - ] - ], - "EFL43": [ - [ - "Eryone", - "PETG-CF", - "Eryone PETG-CF" - ] - ], - "EFL71": [ - [ - "Eryone", - "PA", - "Eryone PA" - ] - ], - "EFL72": [ - [ - "Eryone", - "PA-CF", - "Eryone PA-CF" - ] - ], - "EFL73": [ - [ - "Eryone", - "PA-GF", - "Eryone PA-GF" - ] - ], - "EFL81": [ - [ - "Eryone", - "ABS-CF", - "Eryone ABS-CF" - ] - ], - "EFL82": [ - [ - "Eryone", - "ASA-CF", - "Eryone ASA-CF" - ] - ], - "EFL90": [ - [ - "Eryone", - "PLA", - "Eryone PLA" - ] - ], - "EFL91": [ - [ - "Eryone", - "ABS", - "Eryone ABS" - ] - ], - "EFL92": [ - [ - "Eryone", - "ASA", - "Eryone ASA" - ] - ], - "EFL93": [ - [ - "Eryone", - "PETG", - "Eryone PETG" - ] - ], - "EFL941": [ - [ - "Eryone", - "PLA Silk", - "Eryone Silk PLA" - ] - ], - "EFL95": [ - [ - "Eryone", - "TPU", - "Eryone TPU" - ] - ], - "EPAHTB00": [ - [ - "Elegoo", - "PA", - "Elegoo PAHT" - ] - ], - "EPCB00": [ - [ - "Elegoo", - "PC", - "Elegoo PC" - ] - ], - "EPETGB00": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG" - ] - ], - "EPLAB00": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA" - ] - ], - "ETPUB00": [ - [ - "Elegoo", - "TPU", - "Elegoo TPU" - ] - ], - "FFF01": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA" - ] - ], - "FFF02": [ - [ - "Flashforge", - "ABS", - "Flashforge ABS" - ] - ], - "FFF03": [ - [ - "Flashforge", - "PETG", - "Flashforge PETG" - ], - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "FFG01": [ - [ - "Generic", - "PLA", - "Flashforge Generic PLA" - ] - ], - "GABSB00": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "GASAB00": [ - [ - "Generic", - "ASA", - "Generic ASA" - ] - ], - "GFA00": [ - [ - "Afinia", - "PLA", - "Afinia PLA" - ], - [ - "Afinia", - "PLA", - "Afinia Value PLA" - ], - [ - "Orca Arena", - "PLA", - "Arena PLA Basic" - ], - [ - "Tiertime", - "PLA", - "Tiertime PLA" - ], - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Basic" - ] - ], - "GFA00_01": [ - [ - "Afinia", - "PLA", - "Afinia PLA" - ], - [ - "Tiertime", - "PLA", - "Tiertime PLA" - ] - ], - "GFA01": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Matte" - ], - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Matte" - ] - ], - "GFA02": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Metal" - ], - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Metal" - ] - ], - "GFA03": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Impact" - ] - ], - "GFA05": [ - [ - "Generic", - "PLA", - "Qidi Generic PLA Silk" - ], - [ - "Orca Arena", - "PLA", - "Arena PLA Silk" - ], - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Silk" - ] - ], - "GFA07": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Marble" - ], - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Marble" - ] - ], - "GFA08": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Sparkle" - ] - ], - "GFA09": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Tough" - ] - ], - "GFA16": [ - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Wood" - ] - ], - "GFA50": [ - [ - "Orca Arena", - "PLA-CF", - "Arena PLA-CF" - ], - [ - "Tiertime", - "PLA-CF", - "Tiertime PLA-CF" - ] - ], - "GFA50_01": [ - [ - "Tiertime", - "PLA-CF", - "Tiertime PLA-CF" - ] - ], - "GFA99": [ - [ - "Anycubic", - "ASA", - "Anycubic ASA" - ], - [ - "CoLiDo", - "PLA", - "CoLiDo Generic PLA" - ], - [ - "CoLiDo", - "PLA", - "CoLiDo PLA+" - ], - [ - "Generic", - "ASA", - "Anycubic ASA" - ] - ], - "GFASA": [ - [ - "Anycubic", - "ASA", - "Anycubic ASA" - ], - [ - "Generic", - "ASA", - "Anycubic ASA" - ] - ], - "GFB00": [ - [ - "Afinia", - "ABS", - "Afinia ABS" - ], - [ - "Afinia", - "ABS", - "Afinia ABS+" - ], - [ - "Afinia", - "ABS", - "Afinia Value ABS" - ], - [ - "Orca Arena", - "ABS", - "Arena ABS" - ], - [ - "Tiertime", - "ABS", - "Tiertime ABS" - ], - [ - "WonderMaker", - "ABS", - "WonderMaker ABS" - ] - ], - "GFB00_01": [ - [ - "Afinia", - "ABS", - "Afinia ABS" - ], - [ - "Tiertime", - "ABS", - "Tiertime ABS" - ] - ], - "GFB01": [ - [ - "Tiertime", - "ASA", - "Tiertime ASA" - ], - [ - "WonderMaker", - "ASA", - "WonderMaker ASA" - ] - ], - "GFB01_01": [ - [ - "Tiertime", - "ASA", - "Tiertime ASA" - ] - ], - "GFB98": [ - [ - "Generic", - "ASA", - "Anker Generic ASA" - ], - [ - "Generic", - "ASA", - "Anycubic Generic ASA" - ], - [ - "Generic", - "ASA", - "Artillery Generic ASA" - ], - [ - "Generic", - "ASA", - "Creality Generic ASA" - ], - [ - "Generic", - "ASA", - "FLSun Generic ASA" - ], - [ - "Generic", - "ASA", - "FLSun S1 ASA" - ], - [ - "Generic", - "ASA", - "FLSun T1 ASA" - ], - [ - "Generic", - "ASA", - "OrcaArena Generic ASA" - ], - [ - "Generic", - "ASA", - "RatRig Generic ASA" - ], - [ - "Generic", - "ASA", - "SecKit Generic ASA" - ], - [ - "Generic", - "ASA", - "Tiertime Generic ASA" - ], - [ - "Generic", - "ASA", - "Vzbot Generic ASA" - ], - [ - "Generic", - "ASA", - "fdm_filament_asa" - ] - ], - "GFB98_01": [ - [ - "Generic", - "ASA", - "Tiertime Generic ASA" - ] - ], - "GFB98_2": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "GFB98_3": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "GFB98_4": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "GFB98_5": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ], - [ - "Generic", - "ASA", - "Prusa Generic ASA HF" - ] - ], - "GFB98_6": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA HF" - ] - ], - "GFB98_7": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA HF" - ] - ], - "GFB99": [ - [ - "CoLiDo", - "ABS", - "CoLiDo ABS" - ], - [ - "CoLiDo", - "ABS", - "CoLiDo Generic ABS" - ], - [ - "FlyingBear", - "ABS", - "FlyingBear Generic ABS" - ], - [ - "Generic", - "ABS", - "Anker Generic ABS" - ], - [ - "Generic", - "ABS", - "Anycubic Generic ABS" - ], - [ - "Generic", - "ABS", - "Artillery Generic ABS" - ], - [ - "Generic", - "ABS", - "Chuanying ABS" - ], - [ - "Generic", - "ABS", - "Chuanying Generic ABS" - ], - [ - "Generic", - "ABS", - "Comgrow Generic ABS" - ], - [ - "Generic", - "ABS", - "Creality Generic ABS" - ], - [ - "Generic", - "ABS", - "FLSun Generic ABS" - ], - [ - "Generic", - "ABS", - "FLSun S1 ABS" - ], - [ - "Generic", - "ABS", - "FLSun T1 ABS" - ], - [ - "Generic", - "ABS", - "Flashforge ABS" - ], - [ - "Generic", - "ABS", - "Flashforge Generic ABS" - ], - [ - "Generic", - "ABS", - "Generic ABS" - ], - [ - "Generic", - "ABS", - "Lulzbot 2.85mm ABS" - ], - [ - "Generic", - "ABS", - "OrcaArena Generic ABS" - ], - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ], - [ - "Generic", - "ABS", - "Qidi Generic ABS" - ], - [ - "Generic", - "ABS", - "RatRig Generic ABS" - ], - [ - "Generic", - "ABS", - "SecKit Generic ABS" - ], - [ - "Generic", - "ABS", - "Tiertime Generic ABS" - ], - [ - "Generic", - "ABS", - "Vzbot Generic ABS" - ], - [ - "Generic", - "TPU", - "DeltaMaker Generic TPU" - ], - [ - "InfiMech", - "ABS", - "InfiMech Generic ABS" - ], - [ - "Volumic", - "ABS", - "Volumic ABS Ultra" - ], - [ - "Volumic", - "ABS", - "Volumic ABS Ultra (Performance)" - ] - ], - "GFB99_01": [ - [ - "Generic", - "ABS", - "Tiertime Generic ABS" - ] - ], - "GFB99_2": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "GFB99_3": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "GFB99_4": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "GFB99_5": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ], - [ - "Generic", - "ABS", - "Prusa Generic ABS HF" - ] - ], - "GFB99_6": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS HF" - ] - ], - "GFB99_7": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS HF" - ] - ], - "GFC00": [ - [ - "Orca Arena", - "PC", - "Arena PC" - ], - [ - "Tiertime", - "PC", - "Tiertime PC" - ] - ], - "GFC00_01": [ - [ - "Tiertime", - "PC", - "Tiertime PC" - ] - ], - "GFC98": [ - [ - "Generic", - "PC-CF", - "fdm_filament_pccf" - ] - ], - "GFC99": [ - [ - "FlyingBear", - "PC", - "FlyingBear Generic PC" - ], - [ - "Generic", - "PC", - "Anker Generic PC" - ], - [ - "Generic", - "PC", - "Anycubic Generic PC" - ], - [ - "Generic", - "PC", - "Creality Generic PC" - ], - [ - "Generic", - "PC", - "FLSun Generic PC" - ], - [ - "Generic", - "PC", - "Generic PC" - ], - [ - "Generic", - "PC", - "OrcaArena Generic PC" - ], - [ - "Generic", - "PC", - "Qidi Generic PC" - ], - [ - "Generic", - "PC", - "RatRig Generic PC" - ], - [ - "Generic", - "PC", - "SecKit Generic PC" - ], - [ - "Generic", - "PC", - "Tiertime Generic PC" - ], - [ - "Generic", - "PC", - "Vzbot Generic PC" - ], - [ - "Generic", - "PC", - "fdm_filament_pc" - ], - [ - "InfiMech", - "PC", - "InfiMech Generic PC" - ], - [ - "Volumic", - "PC", - "Volumic PC" - ], - [ - "Volumic", - "PC", - "Volumic PC (Performance)" - ] - ], - "GFC99_01": [ - [ - "Generic", - "PC", - "Tiertime Generic PC" - ] - ], - "GFC99_1": [ - [ - "Generic", - "PC", - "Prusa Generic PC" - ] - ], - "GFC99_2": [ - [ - "Generic", - "PC", - "Prusa Generic PC" - ] - ], - "GFC99_3": [ - [ - "Generic", - "PC", - "Prusa Generic PC" - ] - ], - "GFC99_4": [ - [ - "Generic", - "PC", - "Prusa Generic PC" - ], - [ - "Generic", - "PC", - "Prusa Generic PC HF" - ] - ], - "GFC99_5": [ - [ - "Generic", - "PC", - "Prusa Generic PC HF" - ] - ], - "GFC99_6": [ - [ - "Generic", - "PC", - "Prusa Generic PC HF" - ] - ], - "GFG00": [ - [ - "Orca Arena", - "PETG", - "Arena PETG Basic" - ], - [ - "Tiertime", - "PETG", - "Tiertime PETG" - ], - [ - "WonderMaker", - "PETG", - "WonderMaker PETG Basic" - ] - ], - "GFG00_01": [ - [ - "Tiertime", - "PETG", - "Tiertime PETG" - ] - ], - "GFG01": [ - [ - "Generic", - "PETG", - "re3D Greengate rPETG" - ], - [ - "re3D", - "PETG", - "re3D Greengate rPETG" - ] - ], - "GFG02": [ - [ - "re3D", - "PP", - "re3D rPP" - ] - ], - "GFG03": [ - [ - "re3D", - "PETG", - "re3D PETG" - ] - ], - "GFG50": [ - [ - "Orca Arena", - "PETG-CF", - "Arena PETG-CF" - ] - ], - "GFG60": [ - [ - "Polymaker", - "PETG", - "PolyLite PETG" - ] - ], - "GFG97": [ - [ - "Generic", - "PCTG", - "Tiertime Generic PCTG" - ] - ], - "GFG97-01": [ - [ - "Generic", - "PCTG", - "Tiertime Generic PCTG" - ] - ], - "GFG98": [ - [ - "Generic", - "PETG-CF", - "Anker Generic PETG-CF" - ], - [ - "Generic", - "PETG-CF", - "Qidi Generic PETG-CF" - ], - [ - "Generic", - "PETG-CF", - "Tiertime Generic PETG-CF" - ], - [ - "Orca Arena", - "PETG-CF", - "OrcaArena Generic PETG-CF" - ], - [ - "Volumic", - "PETG", - "Volumic PETG Ultra carbone" - ], - [ - "Volumic", - "PETG", - "Volumic PETG Ultra carbone (Performance)" - ] - ], - "GFG98_01": [ - [ - "Generic", - "PETG-CF", - "Tiertime Generic PETG-CF" - ] - ], - "GFG99": [ - [ - "CoLiDo", - "PETG", - "CoLiDo Generic PETG" - ], - [ - "CoLiDo", - "PETG", - "CoLiDo PETG" - ], - [ - "FlyingBear", - "PETG", - "FlyingBear Generic PETG" - ], - [ - "FlyingBear", - "PETG Basic", - "FlyingBear PETG Basic" - ], - [ - "Generic", - "PEEK", - "MM Generic PEEK" - ], - [ - "Generic", - "PETG", - "Anker Generic PETG" - ], - [ - "Generic", - "PETG", - "Anycubic Generic PETG" - ], - [ - "Generic", - "PETG", - "Artillery Generic PETG" - ], - [ - "Generic", - "PETG", - "C1 Generic PETG" - ], - [ - "Generic", - "PETG", - "Chuanying Generic PETG" - ], - [ - "Generic", - "PETG", - "Chuanying PETG" - ], - [ - "Generic", - "PETG", - "Comgrow Generic PETG" - ], - [ - "Generic", - "PETG", - "Creality Generic PETG" - ], - [ - "Generic", - "PETG", - "DeltaMaker Generic PETG" - ], - [ - "Generic", - "PETG", - "FLSun Generic PETG" - ], - [ - "Generic", - "PETG", - "FLSun S1 PETG" - ], - [ - "Generic", - "PETG", - "FLSun T1 PETG" - ], - [ - "Generic", - "PETG", - "Flashforge Generic PETG" - ], - [ - "Generic", - "PETG", - "Flashforge PETG" - ], - [ - "Generic", - "PETG", - "Generic PETG" - ], - [ - "Generic", - "PETG", - "Lulzbot 2.85mm PETG" - ], - [ - "Generic", - "PETG", - "OrcaArena Generic PETG" - ], - [ - "Generic", - "PETG", - "Qidi Generic PETG" - ], - [ - "Generic", - "PETG", - "RatRig Generic PETG" - ], - [ - "Generic", - "PETG", - "SecKit Generic PETG" - ], - [ - "Generic", - "PETG", - "Tiertime Generic PETG" - ], - [ - "Generic", - "PETG", - "Vzbot Generic PETG" - ], - [ - "Generic", - "PETG", - "Yumi Generic PETG" - ], - [ - "InfiMech", - "PETG", - "InfiMech Generic PETG" - ], - [ - "Volumic", - "PETG", - "Volumic PETG Ultra" - ], - [ - "Volumic", - "PETG", - "Volumic PETG Ultra (Performance)" - ], - [ - "Yumi", - "PETG", - "YUMI PETG" - ], - [ - "re3D", - "PC", - "re3D PC" - ] - ], - "GFG99_01": [ - [ - "Generic", - "PETG", - "Tiertime Generic PETG" - ] - ], - "GFG99_2": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "GFG99_3": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "GFG99_4": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "GFG99_5": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ], - [ - "Generic", - "PETG", - "Prusa Generic PETG HF" - ] - ], - "GFG99_6": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG HF" - ] - ], - "GFG99_7": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG HF" - ] - ], - "GFL00": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA" - ] - ], - "GFL01": [ - [ - "Polymaker", - "PLA", - "PolyTerra PLA" - ] - ], - "GFL06": [ - [ - "Polymaker", - "PETG", - "Fiberon PETG-ESD" - ] - ], - "GFL100": [ - [ - "Generic", - "PLA", - "Generic PLA" - ], - [ - "Generic", - "PLA", - "TwoTrees Generic HS PLA" - ] - ], - "GFL106": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "GFL108": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "GFL200": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "GFL204": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "GFL206": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "GFL208": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "GFL300": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GFL304": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GFL306": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GFL308": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GFL400": [ - [ - "Generic", - "PA", - "Generic PA" - ] - ], - "GFL404": [ - [ - "Generic", - "PA", - "Generic PA" - ] - ], - "GFL406": [ - [ - "Generic", - "PA", - "Generic PA" - ] - ], - "GFL408": [ - [ - "Generic", - "PA", - "Generic PA" - ] - ], - "GFL500": [ - [ - "Generic", - "ABS", - "Generic ABS HT" - ] - ], - "GFL504": [ - [ - "Generic", - "ABS", - "Generic ABS HT" - ] - ], - "GFL506": [ - [ - "Generic", - "ABS", - "Generic ABS HT" - ] - ], - "GFL508": [ - [ - "Generic", - "ABS", - "Generic ABS HT" - ] - ], - "GFL56": [ - [ - "Polymaker", - "PA-CF", - "Fiberon PA12-CF10" - ] - ], - "GFL57": [ - [ - "Polymaker", - "PA6-CF", - "Fiberon PA6-CF20" - ] - ], - "GFL62": [ - [ - "Polymaker", - "PLA", - "PolyLite CosPLA" - ] - ], - "GFL63": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Galaxy" - ] - ], - "GFL64": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Glow" - ] - ], - "GFL65": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Luminous" - ] - ], - "GFL66": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Neon" - ] - ], - "GFL67": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Starlight" - ] - ], - "GFL68": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Translucent" - ] - ], - "GFL69": [ - [ - "Polymaker", - "PLA", - "PolyTerra PLA Marble" - ] - ], - "GFL70": [ - [ - "Polymaker", - "PLA", - "PolyTerra PLA+" - ] - ], - "GFL71": [ - [ - "Polymaker", - "ASA", - "Fiberon ASA-CF08" - ] - ], - "GFL72": [ - [ - "Polymaker", - "PA-CF", - "Fiberon PA612-ESD" - ] - ], - "GFL73": [ - [ - "Polymaker", - "ABS", - "Fiberon PPS-GF20" - ] - ], - "GFL74": [ - [ - "Polymaker", - "PETG", - "PolyLite PETG Translucent" - ] - ], - "GFL75": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Pro Metallic" - ] - ], - "GFL76": [ - [ - "Polymaker", - "PETG", - "Polymaker PETG" - ] - ], - "GFL77": [ - [ - "Polymaker", - "PETG", - "Polymaker PETG Galaxy" - ] - ], - "GFL78": [ - [ - "Polymaker", - "PLA", - "Polymaker PLA" - ] - ], - "GFL79": [ - [ - "Polymaker", - "PLA", - "Polymaker PLA Pro" - ] - ], - "GFL80": [ - [ - "Polymaker", - "PLA", - "Polymaker PLA Pro Metallic" - ] - ], - "GFL94": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Slik" - ] - ], - "GFL95": [ - [ - "Generic", - "PLA", - "Anker Generic PLA+" - ], - [ - "Generic", - "PLA", - "Tiertime Generic PLA High Speed" - ] - ], - "GFL95_01": [ - [ - "Generic", - "PLA", - "Tiertime Generic PLA High Speed" - ] - ], - "GFL96": [ - [ - "Generic", - "PLA", - "Anker Generic PLA Silk" - ], - [ - "Generic", - "PLA", - "Tiertime Generic PLA Silk" - ] - ], - "GFL96_01": [ - [ - "Generic", - "PLA", - "Tiertime Generic PLA Silk" - ] - ], - "GFL97": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA SE" - ] - ], - "GFL98": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Glow" - ], - [ - "Generic", - "PLA-CF", - "Anker Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "Anycubic Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "Artillery Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "Creality Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "FLSun Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "OrcaArena Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "Qidi Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "RatRig Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "SecKit Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "Tiertime Generic PLA-CF" - ], - [ - "Generic", - "PLA-CF", - "Vzbot Generic PLA-CF" - ] - ], - "GFL98_01": [ - [ - "Generic", - "PLA-CF", - "Tiertime Generic PLA-CF" - ] - ], - "GFL98_1": [ - [ - "Generic", - "PLA-CF", - "Prusa Generic PLA-CF" - ] - ], - "GFL98_3": [ - [ - "Generic", - "PLA-CF", - "Prusa Generic PLA-CF" - ] - ], - "GFL98_4": [ - [ - "Generic", - "PLA-CF", - "Prusa Generic PLA-CF" - ] - ], - "GFL98_5": [ - [ - "Generic", - "PLA-CF", - "Prusa Generic PLA-CF" - ] - ], - "GFL99": [ - [ - "Co Print", - "PLA", - "CoPrint Generic PLA" - ], - [ - "FlyingBear", - "PLA", - "FlyingBear Generic PLA" - ], - [ - "Generic", - "ASA", - "Flashforge ASA" - ], - [ - "Generic", - "PLA", - "Anker Generic PLA" - ], - [ - "Generic", - "PLA", - "Anycubic Generic PLA" - ], - [ - "Generic", - "PLA", - "Artillery Generic PLA" - ], - [ - "Generic", - "PLA", - "C1 Generic PLA" - ], - [ - "Generic", - "PLA", - "Chuanying Generic PLA" - ], - [ - "Generic", - "PLA", - "Comgrow Generic PLA" - ], - [ - "Generic", - "PLA", - "Comgrow T300 PLA" - ], - [ - "Generic", - "PLA", - "Creality Generic PLA" - ], - [ - "Generic", - "PLA", - "DeltaMaker Generic PLA" - ], - [ - "Generic", - "PLA", - "Dremel Generic PLA" - ], - [ - "Generic", - "PLA", - "FLSun Generic PLA" - ], - [ - "Generic", - "PLA", - "FLSun S1 PLA Generic" - ], - [ - "Generic", - "PLA", - "FLSun T1 PLA Generic" - ], - [ - "Generic", - "PLA", - "Flashforge PLA-SILK" - ], - [ - "Generic", - "PLA", - "Generic PLA" - ], - [ - "Generic", - "PLA", - "Generic PLA High Speed" - ], - [ - "Generic", - "PLA", - "Lulzbot 2.85mm PLA" - ], - [ - "Generic", - "PLA", - "OrcaArena Generic PLA" - ], - [ - "Generic", - "PLA", - "Peopoly Generic PLA" - ], - [ - "Generic", - "PLA", - "Phrozen PLA" - ], - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ], - [ - "Generic", - "PLA", - "Qidi Generic PLA" - ], - [ - "Generic", - "PLA", - "RatRig Generic PLA" - ], - [ - "Generic", - "PLA", - "SecKit Generic PLA" - ], - [ - "Generic", - "PLA", - "Sovol SV07 PLA" - ], - [ - "Generic", - "PLA", - "Tiertime Generic PLA" - ], - [ - "Generic", - "PLA", - "Vzbot Generic PLA" - ], - [ - "Generic", - "PLA", - "Yumi Generic PLA" - ], - [ - "InfiMech", - "PLA", - "InfiMech Generic PLA" - ], - [ - "Volumic", - "PLA", - "Volumic PLA Ultra" - ], - [ - "Volumic", - "PLA", - "Volumic PLA Ultra (Performance)" - ], - [ - "re3D", - "PLA", - "re3D PLA" - ] - ], - "GFL99_01": [ - [ - "Generic", - "PLA", - "Tiertime Generic PLA" - ] - ], - "GFL99_2": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "GFL99_3": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "GFL99_4": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "GFL99_5": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ], - [ - "Generic", - "PLA", - "Prusa Generic PLA HF" - ] - ], - "GFL99_6": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA HF" - ] - ], - "GFL99_7": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA HF" - ] - ], - "GFLLK10PETG": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GFLLK10PLA": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "GFLLK10PPETG": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GFLLK10PPLA": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "GFN03": [ - [ - "Orca Arena", - "PA-CF", - "Arena PA-CF" - ] - ], - "GFN04": [ - [ - "Orca Arena", - "PA-CF", - "Arena PAHT-CF" - ] - ], - "GFN05": [ - [ - "Tiertime", - "PA6-CF", - "Tiertime PA6-CF" - ] - ], - "GFN05_01": [ - [ - "Tiertime", - "PA6-CF", - "Tiertime PA6-CF" - ] - ], - "GFN96": [ - [ - "Generic", - "PPA-GF", - "Tiertime Generic PPA-GF" - ] - ], - "GFN96_01": [ - [ - "Generic", - "PPA-GF", - "Tiertime Generic PPA-GF" - ] - ], - "GFN97": [ - [ - "Generic", - "PPA-CF", - "Tiertime Generic PPA-CF" - ] - ], - "GFN97_01": [ - [ - "Generic", - "PPA-CF", - "Tiertime Generic PPA-CF" - ] - ], - "GFN98": [ - [ - "FlyingBear", - "PA-CF", - "FlyingBear Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "Anker Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "Anycubic Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "Creality Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "FLSun Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "OrcaArena Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "Qidi Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "RatRig Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "SecKit Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "Tiertime Generic PA-CF" - ], - [ - "Generic", - "PA-CF", - "Vzbot Generic PA-CF" - ], - [ - "Generic", - "PA11-CF", - "fdm_filament_pa11cf" - ], - [ - "InfiMech", - "PA-CF", - "InfiMech Generic PA-CF" - ] - ], - "GFN98_02": [ - [ - "Generic", - "PA-CF", - "Tiertime Generic PA-CF" - ] - ], - "GFN98_1": [ - [ - "Generic", - "PA-CF", - "Prusa Generic PA-CF" - ] - ], - "GFN98_2": [ - [ - "Generic", - "PA-CF", - "Prusa Generic PA-CF" - ] - ], - "GFN98_3": [ - [ - "Generic", - "PA-CF", - "Prusa Generic PA-CF" - ] - ], - "GFN98_4": [ - [ - "Generic", - "PA-CF", - "Prusa Generic PA-CF" - ] - ], - "GFN99": [ - [ - "Generic", - "PA", - "Anker Generic PA" - ], - [ - "Generic", - "PA", - "Anycubic Generic PA" - ], - [ - "Generic", - "PA", - "FLSun Generic PA" - ], - [ - "Generic", - "PA", - "OrcaArena Generic PA" - ], - [ - "Generic", - "PA", - "Prusa Generic PA" - ], - [ - "Generic", - "PA", - "Qidi Generic PA" - ], - [ - "Generic", - "PA", - "RatRig Generic PA" - ], - [ - "Generic", - "PA", - "SecKit Generic PA" - ], - [ - "Generic", - "PA", - "Tiertime Generic PA" - ], - [ - "Generic", - "PA", - "Vzbot Generic PA" - ], - [ - "Volumic", - "PA", - "Volumic NYLON Ultra" - ], - [ - "Volumic", - "PA", - "Volumic NYLON Ultra (Performance)" - ] - ], - "GFN99_01": [ - [ - "Generic", - "PA", - "Tiertime Generic PA" - ] - ], - "GFN99_1": [ - [ - "Generic", - "PA", - "Prusa Generic PA" - ] - ], - "GFN99_2": [ - [ - "Generic", - "PA", - "Prusa Generic PA" - ] - ], - "GFN99_3": [ - [ - "Generic", - "PA", - "Prusa Generic PA" - ] - ], - "GFN99_4": [ - [ - "Generic", - "PA", - "Prusa Generic PA" - ] - ], - "GFP95": [ - [ - "Generic", - "PP-GF", - "Tiertime Generic PP-GF" - ] - ], - "GFP95_01": [ - [ - "Generic", - "PP-GF", - "Tiertime Generic PP-GF" - ] - ], - "GFP96": [ - [ - "Generic", - "PP-CF", - "Tiertime Generic PP-CF" - ] - ], - "GFP96_01": [ - [ - "Generic", - "PP-CF", - "Tiertime Generic PP-CF" - ] - ], - "GFP97": [ - [ - "Generic", - "PP", - "Tiertime Generic PP" - ] - ], - "GFP97_01": [ - [ - "Generic", - "PP", - "Tiertime Generic PP" - ] - ], - "GFP98": [ - [ - "Generic", - "PE-CF", - "Tiertime Generic PE-CF" - ] - ], - "GFP98_01": [ - [ - "Generic", - "PE-CF", - "Tiertime Generic PE-CF" - ] - ], - "GFP99": [ - [ - "Generic", - "PE", - "Tiertime Generic PE" - ] - ], - "GFP99_01": [ - [ - "Generic", - "PE", - "Tiertime Generic PE" - ] - ], - "GFPA": [ - [ - "Anycubic", - "PA", - "Anycubic PA" - ] - ], - "GFPA6-CF": [ - [ - "Anycubic", - "PA6-CF", - "Anycubic PA6-CF" - ] - ], - "GFPAHT-CF": [ - [ - "Anycubic", - "PAHT-CF", - "Anycubic PAHT-CF" - ] - ], - "GFPC": [ - [ - "Anycubic", - "PC", - "Anycubic PC" - ] - ], - "GFPC-CF": [ - [ - "Anycubic", - "PC-CF", - "Anycubic PC-CF" - ] - ], - "GFPC-GF": [ - [ - "Anycubic", - "PC-GF", - "Anycubic PC-GF" - ] - ], - "GFPEBA": [ - [ - "Anycubic", - "PEBA", - "Anycubic PEBA" - ] - ], - "GFPET-CF": [ - [ - "Anycubic", - "PET-CF", - "Anycubic PET-CF" - ] - ], - "GFPETG": [ - [ - "Anycubic", - "PETG", - "Generic PETG" - ], - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GFPETG-1": [ - [ - "Generic", - "PETG", - "Peopoly Generic PETG" - ] - ], - "GFPETG-CF": [ - [ - "Anycubic", - "PETG-CF", - "Anycubic PETG-CF" - ] - ], - "GFPLA Glow": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Glow" - ] - ], - "GFPLA Translucent": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Translucent" - ] - ], - "GFPLA-CF": [ - [ - "Anycubic", - "PLA-CF", - "Anycubic PLA-CF" - ] - ], - "GFPM001": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA" - ] - ], - "GFPM002": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Matte" - ] - ], - "GFPM003": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Marble" - ] - ], - "GFPM004": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Silk" - ] - ], - "GFPM005": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Satin" - ] - ], - "GFPM006": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Translucent" - ] - ], - "GFPM007": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Galaxy" - ] - ], - "GFPM008": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Celestial" - ] - ], - "GFPM009": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Starlight" - ] - ], - "GFPM010": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Glow" - ] - ], - "GFPM011": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Luminous" - ] - ], - "GFPM012": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Metallic" - ] - ], - "GFPM013": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Neon" - ] - ], - "GFPM014": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA UV Shift" - ] - ], - "GFPM015": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Temp Shift" - ] - ], - "GFPM016": [ - [ - "Polymaker", - "PLA", - "Panchroma CoPE" - ] - ], - "GFPM017": [ - [ - "Polymaker", - "PLA", - "Polymaker HT-PLA" - ] - ], - "GFPM018": [ - [ - "Polymaker", - "PLA", - "Polymaker HT-PLA-GF" - ] - ], - "GFPM019": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Pro" - ] - ], - "GFPVA": [ - [ - "Anycubic", - "PVA", - "Anycubic PVA" - ] - ], - "GFR98": [ - [ - "Generic", - "PHA", - "Tiertime Generic PHA" - ] - ], - "GFR98_01": [ - [ - "Generic", - "PHA", - "Tiertime Generic PHA" - ] - ], - "GFR99": [ - [ - "Generic", - "EVA", - "Tiertime Generic EVA" - ] - ], - "GFR99_01": [ - [ - "Generic", - "EVA", - "Tiertime Generic EVA" - ] - ], - "GFRH01": [ - [ - "Generic", - "ABS", - "fdm_filament_abs" - ] - ], - "GFRH02": [ - [ - "Generic", - "ASA", - "fdm_filament_asa" - ] - ], - "GFRH03": [ - [ - "Generic", - "PETG", - "fdm_filament_petg" - ] - ], - "GFRH04": [ - [ - "Generic", - "PLA", - "fdm_filament_pla" - ] - ], - "GFRH05": [ - [ - "Generic", - "TPU", - "fdm_filament_tpu" - ] - ], - "GFRH06": [ - [ - "Generic", - "PC-CF", - "fdm_filament_pccf" - ] - ], - "GFS00": [ - [ - "Orca Arena", - "PLA", - "Arena Support W" - ] - ], - "GFS01": [ - [ - "Orca Arena", - "PA", - "Arena Support G" - ] - ], - "GFS04": [ - [ - "Tiertime", - "PVA", - "Tiertime PVA" - ], - [ - "WonderMaker", - "PVA", - "WonderMaker PVA" - ] - ], - "GFS04_01": [ - [ - "Tiertime", - "PVA", - "Tiertime PVA" - ] - ], - "GFS97": [ - [ - "Generic", - "BVOH", - "Tiertime Generic BVOH" - ] - ], - "GFS97_01": [ - [ - "Generic", - "BVOH", - "Tiertime Generic BVOH" - ] - ], - "GFS98": [ - [ - "Generic", - "HIPS", - "Tiertime Generic HIPS" - ], - [ - "Generic", - "PVB", - "fdm_filament_pvb" - ] - ], - "GFS98_01": [ - [ - "Generic", - "HIPS", - "Tiertime Generic HIPS" - ] - ], - "GFS99": [ - [ - "Generic", - "PVA", - "Anker Generic PVA" - ], - [ - "Generic", - "PVA", - "Anycubic Generic PVA" - ], - [ - "Generic", - "PVA", - "FLSun Generic PVA" - ], - [ - "Generic", - "PVA", - "Generic PVA" - ], - [ - "Generic", - "PVA", - "OrcaArena Generic PVA" - ], - [ - "Generic", - "PVA", - "Prusa Generic PVA" - ], - [ - "Generic", - "PVA", - "Qidi Generic PVA" - ], - [ - "Generic", - "PVA", - "RatRig Generic PVA" - ], - [ - "Generic", - "PVA", - "SecKit Generic PVA" - ], - [ - "Generic", - "PVA", - "Tiertime Generic PVA" - ], - [ - "Generic", - "PVA", - "Vzbot Generic PVA" - ], - [ - "Volumic", - "PVA", - "Volumic PVA" - ], - [ - "Volumic", - "PVA", - "Volumic PVA-BVOH (Performance)" - ] - ], - "GFS99_01": [ - [ - "Generic", - "PVA", - "Tiertime Generic PVA" - ] - ], - "GFS99_1": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA" - ] - ], - "GFS99_2": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA" - ] - ], - "GFS99_3": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA" - ] - ], - "GFS99_4": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA" - ], - [ - "Generic", - "PVA", - "Prusa Generic PVA HF" - ] - ], - "GFS99_5": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA HF" - ] - ], - "GFS99_6": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA HF" - ] - ], - "GFSL99": [ - [ - "Generic", - "ABS", - "Peopoly Generic ABS" - ] - ], - "GFSNL02": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA Matte" - ] - ], - "GFSNL03": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA+" - ] - ], - "GFSNL04": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA+ 2.0" - ] - ], - "GFSNL05": [ - [ - "SUNLU", - "PLA", - "SUNLU Silk PLA+" - ] - ], - "GFSNL06": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA Marble" - ] - ], - "GFSNL07": [ - [ - "SUNLU", - "PLA", - "SUNLU Wood PLA" - ] - ], - "GFSNL08": [ - [ - "SUNLU", - "PETG", - "SUNLU PETG" - ] - ], - "GFT01": [ - [ - "Orca Arena", - "PET-CF", - "Arena PET-CF" - ], - [ - "Tiertime", - "PET-CF", - "Tiertime PET-CF" - ], - [ - "WonderMaker", - "PET-CF", - "WonderMaker PET-CF" - ] - ], - "GFT01_01": [ - [ - "Tiertime", - "PET-CF", - "Tiertime PET-CF" - ] - ], - "GFT02": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "GFT97": [ - [ - "Generic", - "PPS", - "Tiertime Generic PPS" - ] - ], - "GFT97_01": [ - [ - "Generic", - "PPS", - "Tiertime Generic PPS" - ] - ], - "GFT98": [ - [ - "Generic", - "PPS-CF", - "Tiertime Generic PPS-CF" - ] - ], - "GFT98_01": [ - [ - "Generic", - "PPS-CF", - "Tiertime Generic PPS-CF" - ] - ], - "GFTPU 95A": [ - [ - "Anycubic", - "TPU", - "Anycubic TPU 95A" - ] - ], - "GFTPU for ACE": [ + "OF0FfcAG": [ [ "Anycubic", "TPU", "Anycubic TPU for ACE" ] ], - "GFU01": [ - [ - "Afinia", - "TPU", - "Afinia TPU" - ], - [ - "Orca Arena", - "TPU", - "Arena TPU 95A" - ], - [ - "Tiertime", - "TPU", - "Tiertime TPU 95A" - ], - [ - "WonderMaker", - "TPU", - "WonderMaker TPU 95A" - ] - ], - "GFU01_01": [ - [ - "Afinia", - "TPU", - "Afinia TPU" - ], - [ - "Tiertime", - "TPU", - "Tiertime TPU 95A" - ] - ], - "GFU99": [ - [ - "CoLiDo", - "TPU", - "CoLiDo Generic TPU" - ], - [ - "FlyingBear", - "TPU", - "FlyingBear Generic TPU" - ], - [ - "FlyingBear", - "TPU", - "FlyingBear TPU Basic" - ], - [ - "Generic", - "FLEX", - "fdm_filament_flex" - ], - [ - "Generic", - "TPU", - "Anker Generic TPU" - ], - [ - "Generic", - "TPU", - "Anycubic Generic TPU" - ], - [ - "Generic", - "TPU", - "Artillery Generic TPU" - ], - [ - "Generic", - "TPU", - "Creality Generic TPU" - ], - [ - "Generic", - "TPU", - "FLSun Generic TPU" - ], - [ - "Generic", - "TPU", - "FLSun S1 TPU" - ], - [ - "Generic", - "TPU", - "FLSun T1 TPU" - ], - [ - "Generic", - "TPU", - "Generic TPU" - ], - [ - "Generic", - "TPU", - "OrcaArena Generic TPU" - ], - [ - "Generic", - "TPU", - "Prusa Generic TPU" - ], - [ - "Generic", - "TPU", - "Qidi Generic TPU" - ], - [ - "Generic", - "TPU", - "RatRig Generic TPU" - ], - [ - "Generic", - "TPU", - "SecKit Generic TPU" - ], - [ - "Generic", - "TPU", - "Tiertime Generic TPU" - ], - [ - "Generic", - "TPU", - "TwoTrees Generic 95A TPU" - ], - [ - "Generic", - "TPU", - "Vzbot Generic TPU" - ], - [ - "InfiMech", - "TPU", - "InfiMech Generic TPU" - ], - [ - "InfiMech", - "TPU", - "InfiMech TPU Basic" - ], - [ - "Volumic", - "TPU", - "Volumic FLEX93 Ultra" - ], - [ - "Volumic", - "TPU", - "Volumic FLEX93 Ultra (Performance)" - ], - [ - "Yumi", - "PLA", - "YUMI PLA Bowden" - ], - [ - "Yumi", - "PLA", - "YUMI PLA Direct Drive" - ] - ], - "GFU99_01": [ - [ - "Generic", - "TPU", - "Tiertime Generic TPU" - ] - ], - "GFU99_2": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU" - ] - ], - "GFU99_3": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU HF" - ] - ], - "GPAB00": [ - [ - "Generic", - "PA", - "Generic PA" - ] - ], - "GPCB00": [ - [ - "Generic", - "PC", - "Generic PC" - ] - ], - "GPETB00": [ - [ - "Generic", - "PET", - "Generic PET" - ] - ], - "GPETGB00": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "GPLAB00": [ + "OF0GIkJm": [ [ "Generic", "PLA", - "Generic PLA" - ] - ], - "Generic ABS @E3NG v1.2S": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "Generic ABS @MK4S": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Generic ABS @MK4S 0.6": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Generic ABS @MK4S 0.8": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Generic ABS @MK4S HF0.4": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Generic ABS @MK4S HF0.5": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Generic ABS @MK4S HF0.6": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Generic ABS @MK4S HF0.8": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Generic ASA @E3NG v1.2S": [ - [ - "Generic", - "ASA", - "Generic ASA" - ] - ], - "Generic FLEX @MK4S": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU" - ] - ], - "Generic FLEX @MK4S 0.6": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU" - ] - ], - "Generic FLEX @MK4S 0.8": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU" - ] - ], - "Generic PCCF @E3NG v1.2S": [ - [ - "Generic", - "PC-CF", - "Generic PCCF" - ] - ], - "Generic PETG @E3NG v1.2S": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "Generic PETG @MK4S": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Generic PETG @MK4S 0.6": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Generic PETG @MK4S 0.8": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Generic PETG @MK4S HF0.4": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Generic PETG @MK4S HF0.5": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Generic PETG @MK4S HF0.6": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Generic PETG @MK4S HF0.8": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Generic PLA @E3NG v1.2S": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "Generic PLA @MK4S": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Generic PLA @MK4S 0.6": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Generic PLA @MK4S 0.8": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Generic PLA @MK4S HF0.4": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Generic PLA @MK4S HF0.5": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Generic PLA @MK4S HF0.6": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Generic PLA @MK4S HF0.8": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Generic PLA Silk @MK4S": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA Silk" - ] - ], - "Generic PLA Silk @MK4S 0.6": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA Silk" - ] - ], - "Generic PLA Silk @MK4S 0.8": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA Silk" - ] - ], - "Generic TPU @E3NG v1.2S": [ - [ - "Generic", - "TPU", - "Generic TPU" - ] - ], - "IQM1": [ - [ - "iQ Materials", - "PACF Pro", - "Fiberthree PACF Pro P1" - ] - ], - "IQM1011": [ - [ - "iQ Materials", - "VXL90 Xioneer", - "VXL90 TiQ2 P2" - ] - ], - "IQM2": [ - [ - "iQ Materials", - "ABS Material4Print Natur", - "Material4Print ABS Natur P1" - ] - ], - "IQM3": [ - [ - "iQ Materials", - "PETG Polymax", - "Polymaker PETG Polymax black P1" - ] - ], - "IQM7": [ - [ - "iQ Materials", - "PACF Pro", - "Fiberthree PACF Pro P2" - ] - ], - "LHF_abs": [ - [ - "LH Stinger", - "ASA", - "LHS ABS" - ] - ], - "LHF_asa": [ - [ - "LH Stinger", - "ASA", - "LHS ASA" - ] - ], - "LHF_ftpuf": [ - [ - "LH Stinger", - "TPU", - "LHS TPU Foamy 78A" - ] - ], - "LHF_pccf": [ - [ - "LH Stinger", - "PC", - "LHS PC CF" - ] - ], - "LHF_pctg": [ - [ - "LH Stinger", - "PCTG", - "LHS PCTG" - ] - ], - "LHF_petg": [ - [ - "LH Stinger", - "PETG", - "LHS PETG" - ] - ], - "LHF_pla": [ - [ - "LH Stinger", - "PLA", - "LHS PLA" - ] - ], - "LHF_ptpu_pl": [ - [ - "LH Stinger", - "TPU", - "LHS TPU" - ] - ], - "OF09vOcG": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Galaxy" - ] - ], - "OF0Ee2jQ": [ - [ - "Snapmaker", - "TPU", - "Snapmaker Dual TPU High-Flow" + "Tiertime Generic PLA Silk" ] ], "OF0NgY1y": [ @@ -13199,25 +8123,11 @@ "COEX NYLEX PA6-CF" ] ], - "OF0SyJhk": [ + "OF0R5Wc7": [ [ - "FusRock", - "PA6-CF", - "Flashforge PA6-CF" - ] - ], - "OF0TODnN": [ - [ - "Generic", - "PET-CF", - "Generic PET-CF" - ] - ], - "OF0TjJ0G": [ - [ - "QIDI", - "ASA-AERO", - "Qidi ASA-Aero" + "Artillery", + "PLA Tough", + "Artillery PLA Tough" ] ], "OF0UJcb6": [ @@ -13227,18 +8137,11 @@ "PolyLite PETG" ] ], - "OF0UbONm": [ + "OF0VpkBM": [ [ - "Generic", - "S-PAHT", - "FusRock S-PAHT" - ] - ], - "OF0VEdLB": [ - [ - "Cubicon", + "Polymaker", "PETG", - "Cubicon PETG" + "PolyLite PETG Translucent" ] ], "OF0Vtzaw": [ @@ -13248,11 +8151,18 @@ "FilAr PETG Amarillo Radiante" ] ], - "OF0Y5MLd": [ + "OF0b7M1z": [ [ - "QIDI", - "PETG-GF", - "QIDI PETG-GF" + "SeeMeCNC", + "PA-CF", + "SeeMeCNC PA-CF" + ] + ], + "OF0c7mnL": [ + [ + "InfiMech", + "ABS", + "InfiMech ABS" ] ], "OF0gGRWk": [ @@ -13276,6 +8186,13 @@ "Panchroma PLA Luminous" ] ], + "OF0omtEb": [ + [ + "Polymaker", + "ASA", + "Fiberon ASA-CF08" + ] + ], "OF0pzFLc": [ [ "COEX 3D", @@ -13283,6 +8200,13 @@ "COEX PLA+Silk" ] ], + "OF0w7OpJ": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido 0.8 nozzle" + ] + ], "OF0wBGNx": [ [ "Bambu Lab", @@ -13290,25 +8214,39 @@ "Bambu ASA-CF" ] ], - "OF0wk0Pk": [ - [ - "Generic", - "PLA", - "Flashforge PLA Pro" - ] - ], - "OF0z1XpN": [ + "OF0wz84w": [ [ "QIDI", - "PLA", - "QIDI PLA Rapido Silk" + "ABS", + "QIDI ABS Rapido 0.6 nozzle" ] ], - "OF17cONC": [ + "OF0yFLkY": [ [ - "Polymaker", - "PLA", - "PolyTerra Dual PLA" + "Anycubic", + "ASA", + "Anycubic ASA" + ] + ], + "OF0zx94L": [ + [ + "Generic", + "PA", + "Vzbot Generic PA" + ] + ], + "OF112FvY": [ + [ + "Generic", + "PETG", + "Generic PETG Basic" + ] + ], + "OF1Id239": [ + [ + "Generic", + "PETG", + "Prusa Generic PETG" ] ], "OF1N1qMK": [ @@ -13318,6 +8256,13 @@ "Panchroma PLA UV Shift" ] ], + "OF1OZujR": [ + [ + "Generic", + "PVA", + "Flashforge Generic PVA" + ] + ], "OF1Pke8t": [ [ "Overture", @@ -13332,11 +8277,39 @@ "Generic PP" ] ], - "OF1Zypyy": [ + "OF1W7c76": [ [ "QIDI", - "PETG", - "QIDI PETG Tough" + "ASA-CF", + "QIDI ASA-CF" + ] + ], + "OF1bQyX2": [ + [ + "Generic", + "PLA", + "Flashforge PLA Matte" + ] + ], + "OF1d7c3A": [ + [ + "Snapmaker", + "ASA", + "Snapmaker ASA" + ] + ], + "OF1daEUW": [ + [ + "Generic", + "PETG-CF", + "Anker Generic PETG-CF" + ] + ], + "OF1dpPrW": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA" ] ], "OF1hznGB": [ @@ -13346,11 +8319,25 @@ "Elegoo PLA PRO" ] ], - "OF22AxCm": [ + "OF1uR1t2": [ [ "Generic", "PETG", - "Polymaker PETG" + "Tiertime Generic PETG" + ] + ], + "OF223rZv": [ + [ + "Anycubic", + "ABS", + "Anycubic ABS" + ] + ], + "OF2EB9Iz": [ + [ + "Volumic", + "ASA", + "Volumic ASA Ultra" ] ], "OF2EK9F1": [ @@ -13367,25 +8354,11 @@ "SUNLU PETG" ] ], - "OF2HQqTC": [ + "OF2RjrWH": [ [ - "Cubicon", - "PLA", - "Cubicon PLA+" - ] - ], - "OF2Psxdc": [ - [ - "Co Print", - "TPU", - "CoPrint Generic TPU" - ] - ], - "OF2UFmOo": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA" + "Generic", + "PAHT-GF", + "FusRock Generic PAHT-GF" ] ], "OF2VFe4J": [ @@ -13402,6 +8375,27 @@ "FilAr PETG Azul Imperial" ] ], + "OF2bZtyg": [ + [ + "Generic", + "PLA-CF", + "Flashforge PLA-CF" + ] + ], + "OF2hfMcG": [ + [ + "Orca Arena", + "PLA-CF", + "Arena PLA-CF" + ] + ], + "OF2mgDsI": [ + [ + "Generic", + "PLA", + "Vzbot Generic PLA" + ] + ], "OF2pj5l5": [ [ "Overture", @@ -13409,13 +8403,6 @@ "Overture Super PLA+" ] ], - "OF2tvNYA": [ - [ - "Generic", - "PLA", - "Sovol Zero PLA Silk" - ] - ], "OF2xccEe": [ [ "DREMC", @@ -13430,32 +8417,53 @@ "Elegoo Rapid TPU 95A" ] ], - "OF38Hyk4": [ + "OF3F63OE": [ [ - "Generic", + "re3D", "PETG", - "Flashforge PETG Pro" + "re3D PETG" ] ], - "OF3XeEuV": [ + "OF3IKafc": [ [ "QIDI", - "PET-GF", - "QIDI PET-GF" + "PLA", + "QIDI PLA Rapido Matte" ] ], - "OF3YOOOs": [ + "OF3OMgrI": [ + [ + "Creality", + "PLA", + "CR-Silk" + ] + ], + "OF3P0BQA": [ [ "Generic", - "PETG-CF", - "Chuanying Generic PETG-CF10" + "ABS", + "Anker Generic ABS" ] ], - "OF3arl18": [ + "OF3WQaKK": [ [ - "Elegoo", + "Creality", "PETG", - "Elegoo Rapid PETG" + "CR-PETG" + ] + ], + "OF3dJf4E": [ + [ + "Volumic", + "PLA", + "Volumic PLA Ultra (Performance)" + ] + ], + "OF3fwO8b": [ + [ + "FlyingBear", + "PLA", + "FlyingBear PLA Basic" ] ], "OF3kBrdA": [ @@ -13465,18 +8473,53 @@ "eSUN PETG" ] ], - "OF41QVDH": [ + "OF3msXEa": [ [ - "Generic", - "PLA", - "Flashforge Generic PLA-Silk" + "Snapmaker", + "PETG-CF", + "Snapmaker Dual PETG-CF" ] ], - "OF43idK2": [ + "OF3s929u": [ [ "Generic", + "PP", + "Tiertime Generic PP" + ] + ], + "OF3wxlw9": [ + [ + "CoLiDo", + "PETG", + "CoLiDo Generic PETG" + ] + ], + "OF3ydJTT": [ + [ + "InfiMech", "PLA", - "Creality Generic PLA Matte" + "InfiMech PLA Hyper" + ] + ], + "OF41jaTh": [ + [ + "Generic", + "TPU-90A", + "Flashforge TPU-90A" + ] + ], + "OF42ZDpN": [ + [ + "Generic", + "PAHT", + "FusRock PAHT" + ] + ], + "OF43Raws": [ + [ + "Polymaker", + "PLA", + "PolyTerra J1 PLA" ] ], "OF44VYzK": [ @@ -13486,11 +8529,18 @@ "FilAr PETG Azul Francia" ] ], - "OF48G7He": [ + "OF48L671": [ [ - "QIDI", - "PETG", - "QIDI PETG Tough 0.8 nozzle" + "Generic", + "ASA", + "RatRig Generic ASA" + ] + ], + "OF4APyxe": [ + [ + "Creality", + "PA-CF", + "Hyper PAHT-CF" ] ], "OF4KsW72": [ @@ -13500,11 +8550,18 @@ "FilAr PLA" ] ], - "OF4RKeng": [ + "OF4Mf5Gz": [ [ "Generic", - "ASA", - "Flashforge Generic ASA" + "PETG", + "Creality Generic PETG" + ] + ], + "OF4Nhggz": [ + [ + "Artillery", + "PLA Basic+", + "Artillery PLA Basic+" ] ], "OF4RvVuU": [ @@ -13514,32 +8571,88 @@ "Bambu PPS-CF" ] ], - "OF4gzzE4": [ + "OF4S3To3": [ [ "QIDI", - "PET-CF", - "QIDI PET-CF" + "PETG", + "QIDI PETG Rapido" ] ], - "OF4jILJA": [ + "OF4WB37S": [ [ - "FlyingBear", - "PC", - "FlyingBear PC" + "Snapmaker", + "PETG", + "Snapmaker PETG" ] ], - "OF4m9A5w": [ + "OF4XAUnp": [ [ "Generic", - "HIPS", - "Flashforge Generic HIPS" + "ASA", + "Vzbot Generic ASA" ] ], - "OF50NUZI": [ + "OF4f8vVp": [ [ - "FlyingBear", + "WonderMaker", + "PET-CF", + "WonderMaker PET-CF" + ] + ], + "OF4iWKrE": [ + [ + "QIDI", + "PETG-CF", + "QIDI PETG-CF" + ] + ], + "OF4nQ62r": [ + [ + "QIDI", "PLA", - "FlyingBear PLA Basic" + "QIDI PLA Basic" + ] + ], + "OF4oCRKe": [ + [ + "Generic", + "PETG", + "DeltaMaker Generic PETG" + ] + ], + "OF4ulo9Y": [ + [ + "WonderMaker", + "PVA", + "WonderMaker PVA" + ] + ], + "OF4xhTuK": [ + [ + "Generic", + "PA-CF", + "OrcaArena Generic PA-CF" + ] + ], + "OF4zzGwp": [ + [ + "Generic", + "PET-GF", + "FusRock Generic PET-GF" + ] + ], + "OF51XQar": [ + [ + "Generic", + "PLA", + "C1 Generic PLA" + ] + ], + "OF53eLVD": [ + [ + "Generic", + "ASA-CF", + "Generic ASA-CF" ] ], "OF54B0S0": [ @@ -13549,18 +8662,18 @@ "Bambu PPA-CF" ] ], - "OF57IbZT": [ + "OF54SvEe": [ [ - "Artillery", - "PLA Basic", - "Artillery PLA Basic" + "Prusa Polymers", + "PA11-CF", + "Prusament PA-CF" ] ], - "OF5Bmdtg": [ + "OF5BN24W": [ [ - "Generic", - "ABS", - "Sovol SV06 Plus ACE ABS" + "Flashforge", + "PPA-GF", + "Flashforge PPA-GF" ] ], "OF5CgdDq": [ @@ -13570,11 +8683,25 @@ "PolyLite PLA" ] ], - "OF5J2axC": [ + "OF5E5KNA": [ + [ + "Generic", + "PC", + "SecKit Generic PC" + ] + ], + "OF5NQFKI": [ [ "Generic", "PLA", - "Sovol Zero PLA Basic" + "Flashforge PLA Galaxy" + ] + ], + "OF5NqBfC": [ + [ + "Yumi", + "PETG", + "YUMI PETG" ] ], "OF5P4jgA": [ @@ -13584,32 +8711,46 @@ "FilAr PLA Dorado" ] ], - "OF5T1Y9R": [ + "OF5PtjTp": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Glow" + ] + ], + "OF5SJ3jz": [ + [ + "Flashforge", + "ABS", + "Flashforge ABS" + ] + ], + "OF5YVJXH": [ + [ + "Artillery", + "ASA", + "Artillery ASA" + ] + ], + "OF5Zk4e1": [ [ "Generic", "ABS", - "Flashforge ABS Basic" + "Anycubic Generic ABS" ] ], - "OF5UUaUM": [ + "OF5c6nq3": [ [ "Generic", - "PLA", - "Qidi Generic PLA High Speed" + "TPU-64D", + "Generic TPU-64D" ] ], - "OF5Ugv12": [ + "OF5lGPup": [ [ - "Other", - "PLA", - "Other PLA" - ] - ], - "OF5kwfZu": [ - [ - "FusRock", - "PA-CF", - "FusRock Generic NexPA-CF25" + "WonderMaker", + "PETG", + "WonderMaker PETG Basic" ] ], "OF5nlfKY": [ @@ -13619,6 +8760,20 @@ "FilAr PLA Oro" ] ], + "OF5oNRED": [ + [ + "Eryone", + "PP", + "Eryone PP" + ] + ], + "OF5oXk4M": [ + [ + "Polymaker", + "PLA", + "Polymaker PLA Pro" + ] + ], "OF5rnhjh": [ [ "FilAr", @@ -13626,6 +8781,13 @@ "FilAr PETG" ] ], + "OF5umxxT": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Glow" + ] + ], "OF5vgi2G": [ [ "FilAr", @@ -13633,25 +8795,74 @@ "FilAr PLA-mate Azul" ] ], - "OF60Lmeq": [ + "OF5vzBhb": [ [ "Generic", "PLA", - "Flashforge PLA Matte" + "Chuanying Generic PLA" ] ], - "OF6EOy1A": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG" - ] - ], - "OF6FM5F7": [ + "OF5w29Kq": [ [ "Generic", - "PAHT", - "FusRock PAHT" + "PETG", + "Flashforge HS PETG" + ] + ], + "OF65InrS": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPU" + ] + ], + "OF66KUAN": [ + [ + "Polymaker", + "PLA", + "PolySonic PLA" + ] + ], + "OF67EdL5": [ + [ + "Generic", + "ABS", + "Sovol SV06 ACE ABS" + ] + ], + "OF6ATsCF": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker Dual PLA-CF" + ] + ], + "OF6Fpw1E": [ + [ + "Generic", + "PETG", + "Comgrow Generic PETG" + ] + ], + "OF6H51Xx": [ + [ + "Polymaker", + "PETG", + "Polymaker PETG" + ] + ], + "OF6K467o": [ + [ + "InfiMech", + "PA-CF", + "InfiMech Generic PA-CF" + ] + ], + "OF6KELDx": [ + [ + "Co Print", + "PLA", + "CoPrint Generic PLA" ] ], "OF6Ll8lK": [ @@ -13661,39 +8872,116 @@ "Elegoo PETG Translucent" ] ], - "OF6Mxzsg": [ + "OF6MOPWx": [ [ "Generic", - "TPU", - "Generic TPU" + "PET", + "Generic PET" ] ], - "OF6SEkeJ": [ + "OF6O67Xk": [ [ "Generic", - "PET-CF", - "FusRock PET-CF" - ] - ], - "OF6XIeUW": [ - [ - "Generic", - "PLA-CF", - "Generic PLA-CF10" - ] - ], - "OF6XuVQE": [ - [ - "Cubicon", "ABS", - "Cubicon ABS" + "Lulzbot 2.85mm ABS" ] ], - "OF70DKqH": [ + "OF6TuVAg": [ [ "Snapmaker", + "PVA", + "Snapmaker J1 PVA" + ] + ], + "OF6VgL2U": [ + [ + "Generic", + "PLA", + "Phrozen PLA" + ] + ], + "OF6WddJ1": [ + [ + "Generic", + "S-PAHT", + "FusRock S-PAHT" + ] + ], + "OF6kj4jI": [ + [ + "iQ Materials", + "PACF Pro", + "Fiberthree PACF Pro P2" + ] + ], + "OF6ooviO": [ + [ + "Generic", "TPU", - "Snapmaker TPE" + "FLSun S1 TPU" + ] + ], + "OF6rMr3U": [ + [ + "Generic", + "PA", + "FusRock Generic S-Multi" + ] + ], + "OF6rdQ6M": [ + [ + "Generic", + "PPS-CF", + "Generic PPS-CF" + ] + ], + "OF6tKa1Z": [ + [ + "Generic", + "TPU", + "Anker Generic TPU" + ] + ], + "OF6ueBwd": [ + [ + "Generic", + "PLA", + "Flashforge PLA Pro" + ] + ], + "OF6vKLaU": [ + [ + "Generic", + "ASA", + "Artillery Generic ASA" + ] + ], + "OF6xLvYg": [ + [ + "InfiMech", + "PC", + "InfiMech Generic PC" + ] + ], + "OF6zAVFj": [ + [ + "Generic", + "TPU", + "Sovol Zero TPU" + ] + ], + "OF70zbGS": [ + [ + "Creality", + "PLA", + "Hyper L-W PLA" + ] + ], + "OF72YYTd": [ + [ + "Snapmaker", + "ABS", + "Snapmaker ABS" ] ], "OF74KeQR": [ @@ -13703,6 +8991,13 @@ "Generic PHA" ] ], + "OF79Fbo6": [ + [ + "Cubicon", + "PC", + "Cubicon PC" + ] + ], "OF7H3VJM": [ [ "eSUN", @@ -13710,25 +9005,39 @@ "eSUN PLA-Marble" ] ], - "OF7M9vy4": [ + "OF7OqDp3": [ + [ + "Tiertime", + "PLA-CF", + "Tiertime PLA-CF" + ] + ], + "OF7SliVn": [ + [ + "Polymaker", + "PLA", + "PolyLite J1 PLA" + ] + ], + "OF7VJMYM": [ [ "Generic", "PLA", - "RatRig BigNozzle PLA" + "Sovol Zero PLA Basic" ] ], - "OF7cv1Ub": [ + "OF7c9fln": [ [ - "QIDI", - "PLA-CF", - "QIDI PLA-CF" + "Anycubic", + "PLA", + "Anycubic PLA Translucent" ] ], - "OF7f0eUZ": [ + "OF7g2vYQ": [ [ - "Volumic", - "ASA", - "Volumic ASA Ultra" + "Co Print", + "TPU", + "CoPrint Generic TPU" ] ], "OF7lOgYF": [ @@ -13738,11 +9047,60 @@ "Generic PETG HF" ] ], - "OF7tgL9c": [ + "OF7lwj52": [ + [ + "CoLiDo", + "PETG", + "CoLiDo PETG" + ] + ], + "OF7nBAd3": [ + [ + "Eryone", + "PLA Silk", + "Eryone Silk PLA" + ] + ], + "OF7tt7DO": [ + [ + "Cubicon", + "PLA", + "Cubicon PLA+" + ] + ], + "OF7uE5KB": [ [ "Generic", - "ASA", - "Chuanying Generic ASA" + "PA-CF", + "Anker Generic PA-CF" + ] + ], + "OF8CXrvm": [ + [ + "Generic", + "PA", + "SecKit Generic PA" + ] + ], + "OF8GnyFU": [ + [ + "Creality", + "ABS", + "Hyper ABS" + ] + ], + "OF8Hx3Pi": [ + [ + "Cubicon", + "PETG", + "Cubicon PETG" + ] + ], + "OF8Jl6NT": [ + [ + "Snapmaker", + "PET", + "Snapmaker J1 PET" ] ], "OF8Tlg47": [ @@ -13752,13 +9110,6 @@ "Generic PPA-GF" ] ], - "OF8WvPVL": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido 0.8 nozzle" - ] - ], "OF8aFWfQ": [ [ "FilAr", @@ -13766,6 +9117,34 @@ "FilAr PLA Amarillo Lirio" ] ], + "OF8bLDu7": [ + [ + "Generic", + "PA-CF", + "Blocks Generic PA-CF" + ] + ], + "OF8dCquh": [ + [ + "Snapmaker", + "ABS", + "Snapmaker J1 ABS Benchy" + ] + ], + "OF8eQjjt": [ + [ + "Generic", + "PETG", + "Lulzbot 2.85mm PETG" + ] + ], + "OF8eaY7j": [ + [ + "Generic", + "PA-CF", + "Generic PA612-CF" + ] + ], "OF8jh0Lk": [ [ "FilAr", @@ -13773,6 +9152,13 @@ "FilAr PLA-mate Marron" ] ], + "OF8kJys9": [ + [ + "Eryone", + "PETG", + "Eryone PETG" + ] + ], "OF8tPByX": [ [ "Generic", @@ -13780,6 +9166,27 @@ "Generic PPA-CF" ] ], + "OF8wE5l7": [ + [ + "Artillery", + "PETG Basic", + "Artillery PETG Basic" + ] + ], + "OF97ru74": [ + [ + "Generic", + "PC", + "Prusa Generic PC" + ] + ], + "OF995YXg": [ + [ + "Generic", + "TPU-64D", + "Flashforge TPU-64D" + ] + ], "OF99UMPq": [ [ "COEX 3D", @@ -13794,6 +9201,20 @@ "DREMC ABS+" ] ], + "OF9EHUKK": [ + [ + "QIDI", + "TPU-GF", + "QIDI TPU-GF" + ] + ], + "OF9HCdyQ": [ + [ + "Afinia", + "PLA", + "Afinia PLA" + ] + ], "OF9OlTWH": [ [ "Bambu Lab", @@ -13801,109 +9222,102 @@ "Bambu PLA Marble" ] ], - "OF9RZyBz": [ - [ - "Polymaker", - "PA", - "Polymaker Generic S1" - ] - ], - "OF9sr3Vn": [ - [ - "Generic", - "PLA", - "Flashforge PLA Sparkle" - ] - ], - "OF9tjFbj": [ - [ - "Peopoly", - "PLA", - "Peopoly Lancer PLA-C" - ] - ], - "OF9vnvM8": [ - [ - "Artillery", - "PETG-CF", - "Artillery PETG-CF" - ] - ], - "OFAEqlWa": [ - [ - "Generic", - "PLA", - "Flashforge Generic PLA-SILK" - ] - ], - "OFAGqTQG": [ - [ - "Volumic", - "PP", - "Volumic PP Ultra" - ] - ], - "OFAGrVjP": [ - [ - "Generic", - "PLA", - "Flashforge PLA Silk" - ] - ], - "OFAHagT9": [ - [ - "Elegoo", - "PLA", - "Elegoo Rapid PLA+" - ] - ], - "OFAK2XjZ": [ - [ - "Other", - "ABS", - "Other ABS" - ] - ], - "OFAUDGEQ": [ + "OF9PELEb": [ [ "QIDI", - "PLA", - "QIDI PLA Rapido Matte" + "UltraPA-CF25", + "QIDI UltraPA-CF25" ] ], - "OFAUX5fB": [ + "OF9UJOGF": [ + [ + "Anycubic", + "PETG-CF", + "Anycubic PETG-CF" + ] + ], + "OF9emAI9": [ + [ + "RatRig", + "PETG", + "RatRig PunkFil PETG" + ] + ], + "OF9fOPpd": [ + [ + "Generic", + "PC", + "Vzbot Generic PC" + ] + ], + "OF9z5LZ9": [ [ "Generic", "PETG", - "C1 Generic High Flow PETG" + "FLSun S1 PETG" ] ], - "OFAbsMuV": [ + "OFA026vt": [ [ - "Snapmaker", - "TPU", - "Snapmaker Dual TPE" + "Orca Arena", + "PA-CF", + "Arena PA-CF" ] ], - "OFAdAYYk": [ + "OFAC7Wyu": [ + [ + "Artillery", + "PLA Matte", + "Artillery PLA Matte" + ] + ], + "OFACSw9O": [ + [ + "Generic", + "PLA", + "Creality Generic PLA" + ] + ], + "OFAIBCLJ": [ + [ + "Generic", + "ABS-CF", + "Generic ABS-CF" + ] + ], + "OFAIrQXu": [ + [ + "Creality", + "PLA", + "Creality Hyper PLA" + ] + ], + "OFANFm4x": [ [ "QIDI", - "PPS-CF", - "QIDI PPS-CF" + "PLA", + "QIDI PLA Rapido Metal" ] ], - "OFAdZFD1": [ + "OFAO9A7J": [ [ - "FusRock", - "PET-GF", - "FusRock Generic PET-GF" + "Generic", + "PLA", + "Sovol Zero PLA Silk HS Nozzle" ] ], - "OFAiqi5v": [ + "OFAZllAN": [ [ - "Elegoo", - "ASA", - "Elegoo ASA-CF" + "Artillery", + "PLA-CF", + "Artillery PLA-CF" + ] + ], + "OFAf9pJF": [ + [ + "Generic", + "TPU", + "Flashforge TPU 95A" ] ], "OFAnyRUI": [ @@ -13913,13 +9327,6 @@ "Bambu Support For PLA" ] ], - "OFAnyzjN": [ - [ - "HATCHBOX", - "PETG", - "HATCHBOX PETG" - ] - ], "OFAt6ec0": [ [ "FilAr", @@ -13927,11 +9334,25 @@ "FilAr PLA Marron Oxido" ] ], - "OFAtydxE": [ + "OFB09fpe": [ [ "Generic", - "S-Multi", - "FusRock S-Multi" + "TPU", + "RatRig Generic TPU" + ] + ], + "OFB0a3hT": [ + [ + "Generic", + "PLA-CF", + "Anker Generic PLA-CF" + ] + ], + "OFB1Tv1E": [ + [ + "Generic", + "PA", + "Anycubic Generic PA" ] ], "OFB5SmWk": [ @@ -13941,18 +9362,60 @@ "Valment PLA Galaxy" ] ], - "OFBGxHgT": [ + "OFB8wSps": [ [ - "FlyingBear", - "PLA", - "FlyingBear PLA" + "Generic", + "PET-CF", + "FusRock PET-CF" ] ], - "OFBRSZom": [ + "OFB9dx27": [ [ - "Volumic", - "PPS-CF", - "PPS Carbone (Performance)" + "Generic", + "ASA", + "Blocks Generic ASA" + ] + ], + "OFBBgw7B": [ + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Wood" + ] + ], + "OFBC32Wb": [ + [ + "Generic", + "PET", + "FusRock PET" + ] + ], + "OFBIadjM": [ + [ + "Generic", + "ASA", + "Chuanying Generic ASA" + ] + ], + "OFBJAdLw": [ + [ + "LH Stinger", + "PCTG", + "LHS PCTG" + ] + ], + "OFBK6zAi": [ + [ + "Generic", + "PETG-CF", + "Flashforge PETG-CF" + ] + ], + "OFBLktDy": [ + [ + "Creality", + "PETG", + "Soleyin Basic PETG" ] ], "OFBSW57R": [ @@ -13969,11 +9432,32 @@ "Elegoo PLA+" ] ], - "OFBvxnjM": [ + "OFBlFMVp": [ [ - "Elegoo", + "Snapmaker", "PETG", - "Elegoo PETG-GF" + "Snapmaker Dual PETG" + ] + ], + "OFBoSWxb": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Luminous" + ] + ], + "OFBpcB0a": [ + [ + "Generic", + "PLA", + "TwoTrees Generic HS PLA" + ] + ], + "OFBtlI8M": [ + [ + "FlyingBear", + "ABS", + "FlyingBear Generic ABS" ] ], "OFBw6eEG": [ @@ -13983,18 +9467,25 @@ "Overture Matte PLA" ] ], - "OFC2FSsV": [ + "OFC1PzXz": [ [ - "Overture", + "Creality", "PLA", - "Overture PLA" + "Hyper Luminous" ] ], - "OFC5CCeo": [ + "OFC20UMj": [ [ "Generic", - "PETG-CF", - "Flashforge Generic PETG-CF" + "TPU", + "Flashforge Generic TPU" + ] + ], + "OFC5f4Ay": [ + [ + "Generic", + "PC-CF", + "Generic PCCF" ] ], "OFC78WGQ": [ @@ -14011,6 +9502,13 @@ "Generic EVA" ] ], + "OFCEA7Nt": [ + [ + "Generic", + "ABS", + "Sovol SV06 Plus ACE ABS" + ] + ], "OFCIUsWh": [ [ "Polymaker", @@ -14018,18 +9516,32 @@ "Panchroma PLA Translucent" ] ], - "OFCJaXZS": [ + "OFCJpR7a": [ [ - "Generic", - "PPS", - "Flashforge PPS" + "Creality", + "PLA", + "HP Ultra PLA" ] ], - "OFCKK3u9": [ + "OFCVUEaV": [ [ - "FlyingBear", - "PA-CF", - "FlyingBear PA-CF" + "Generic", + "TPU", + "Tiertime Generic TPU" + ] + ], + "OFCZsqXg": [ + [ + "Creality", + "PLA", + "Hyper PLA" + ] + ], + "OFCaJHAA": [ + [ + "Generic", + "PAHT", + "FusRock Generic S-PAHT" ] ], "OFCccVrQ": [ @@ -14039,18 +9551,11 @@ "PolyTerra Dual PLA" ] ], - "OFCgpxn2": [ + "OFCcsYtf": [ [ "Generic", - "ABS", - "Prusa Generic ABS HF" - ] - ], - "OFChH9xu": [ - [ - "Snapmaker", - "TPU", - "Snapmaker J1 TPE" + "ASA", + "FLSun Generic ASA" ] ], "OFCidU7j": [ @@ -14067,6 +9572,13 @@ "FilAr PLA-mate Verde" ] ], + "OFCnywiC": [ + [ + "Tiertime", + "PET-CF", + "Tiertime PET-CF" + ] + ], "OFCoRobU": [ [ "Elas", @@ -14074,6 +9586,55 @@ "Elas ASA" ] ], + "OFCp3Bgo": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA SE" + ] + ], + "OFCu3jES": [ + [ + "Generic", + "PETG", + "Yumi Generic PETG" + ] + ], + "OFCuaCer": [ + [ + "Volumic", + "PLA", + "Désactivé" + ] + ], + "OFD21ije": [ + [ + "Cubicon", + "PA", + "Cubicon PA-CF" + ] + ], + "OFD2JNS1": [ + [ + "Generic", + "PLA", + "Dremel Generic PLA" + ] + ], + "OFD6kN7F": [ + [ + "Generic", + "PLA", + "OrcaArena Generic PLA" + ] + ], + "OFD9taow": [ + [ + "FlyingBear", + "PLA", + "FlyingBear PLA Hyper" + ] + ], "OFDETOM6": [ [ "eSUN", @@ -14088,11 +9649,32 @@ "Bambu PLA Dynamic" ] ], - "OFDMWB6t": [ + "OFDJU6R3": [ [ - "Elegoo", + "Afinia", + "TPU", + "Afinia TPU" + ] + ], + "OFDKIKyw": [ + [ + "Snapmaker", + "PVA", + "Snapmaker Dual PVA" + ] + ], + "OFDKgoqx": [ + [ + "Flashforge", "PLA", - "Elegoo PLA+" + "Flashforge PLA" + ] + ], + "OFDRpXLZ": [ + [ + "Other", + "PETG", + "Other PETG" ] ], "OFDSrzZ8": [ @@ -14109,11 +9691,18 @@ "Valment PLA" ] ], - "OFDkABjZ": [ + "OFDeTsJw": [ [ "Generic", - "TPU-90A", - "Generic TPU-90A" + "HIPS", + "Chuanying Generic HIPS" + ] + ], + "OFDgQaca": [ + [ + "FlyingBear", + "PETG", + "FlyingBear PETG" ] ], "OFDpW3J8": [ @@ -14123,11 +9712,11 @@ "FILL3D PLA Basic" ] ], - "OFDramZ2": [ + "OFDtop41": [ [ - "Co Print", - "PETG", - "CoPrint Generic PETG" + "Generic", + "PA", + "Generic Support for PA" ] ], "OFDvXujf": [ @@ -14158,11 +9747,11 @@ "COEX TPU 60A" ] ], - "OFE22Uba": [ + "OFEE1Dld": [ [ "Generic", - "TPU-90A", - "Flashforge TPU-90A" + "TPU", + "Artillery Generic TPU" ] ], "OFEGNJD4": [ @@ -14172,11 +9761,39 @@ "Bambu PLA Silk" ] ], - "OFEYKrjb": [ + "OFEMfQsX": [ [ - "Artillery", + "Generic", "PETG", - "Artillery PETG" + "Flashforge PETG Basic" + ] + ], + "OFENzGSm": [ + [ + "Generic", + "TPU", + "FLSun T1 TPU" + ] + ], + "OFEOnBj6": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Lite" + ] + ], + "OFETFWx7": [ + [ + "Generic", + "PLA", + "SecKit Generic PLA" + ] + ], + "OFEWYR89": [ + [ + "Generic", + "PLA", + "Generic PLA+" ] ], "OFEZ449N": [ @@ -14186,11 +9803,32 @@ "FilAr PLA-mate Uva" ] ], - "OFEdyZqS": [ + "OFEZNNw1": [ [ - "Anycubic", + "Generic", + "PA", + "RatRig Generic PA" + ] + ], + "OFEZpel7": [ + [ + "Volumic", + "PPS-CF", + "PPS Carbone (Performance)" + ] + ], + "OFEabreg": [ + [ + "Polymaker", + "PA6-CF", + "Fiberon PA6-CF20" + ] + ], + "OFEbIx49": [ + [ + "WonderMaker", "PLA", - "Anycubic PLA Luminous" + "WonderMaker PLA Marble" ] ], "OFEhuUNq": [ @@ -14200,6 +9838,20 @@ "DREMC PA12-CF" ] ], + "OFEj7sca": [ + [ + "Cubicon", + "PC", + "Cubicon PC" + ] + ], + "OFEjbwqG": [ + [ + "Polymaker", + "PLA", + "PolyTerra PLA+" + ] + ], "OFEkPBwx": [ [ "Bambu Lab", @@ -14207,6 +9859,20 @@ "Bambu PLA Glow" ] ], + "OFEmsric": [ + [ + "Snapmaker", + "PA-CF", + "Snapmaker PA-CF" + ] + ], + "OFEnbt6D": [ + [ + "Peopoly", + "PLA", + "Peopoly Lancer PLA-C" + ] + ], "OFEswT5W": [ [ "Bambu Lab", @@ -14214,6 +9880,27 @@ "Bambu PLA-CF" ] ], + "OFEwRwmL": [ + [ + "Cubicon", + "PLA", + "Cubicon PLA" + ] + ], + "OFF3cuzT": [ + [ + "Generic", + "TPU", + "Generic TPU 64D" + ] + ], + "OFF73Bvp": [ + [ + "Generic", + "PLA-CF", + "SecKit Generic PLA-CF" + ] + ], "OFF9OKoY": [ [ "Polymaker", @@ -14221,11 +9908,18 @@ "PolyLite PLA Pro" ] ], - "OFFIL5pD": [ + "OFF9cgY5": [ [ - "QIDI", - "PA12-CF", - "QIDI PA12-CF" + "Snapmaker", + "PLA", + "Snapmaker PLA Matte" + ] + ], + "OFFC0VqZ": [ + [ + "Generic", + "PETG", + "RatRig BigNozzle PCTG" ] ], "OFFNYwWR": [ @@ -14235,11 +9929,39 @@ "Bambu PA-CF" ] ], - "OFFenwbU": [ + "OFFP4ORR": [ [ - "Generic", + "Creality", + "ABS", + "Creality Hyper ABS" + ] + ], + "OFFX1DRD": [ + [ + "FlyingBear", + "PC", + "FlyingBear PC" + ] + ], + "OFFZ0BBL": [ + [ + "FlyingBear", "PLA", - "FLSun S1 PLA Silk" + "FlyingBear Generic PLA" + ] + ], + "OFFZ458u": [ + [ + "Polymaker", + "PA-CF", + "Fiberon PA612-ESD" + ] + ], + "OFFbQscs": [ + [ + "eSUN", + "PETG", + "eSUN PETG-Basic" ] ], "OFFkCLBl": [ @@ -14249,20 +9971,6 @@ "Panchroma PLA Galaxy" ] ], - "OFFmJ8aR": [ - [ - "Other", - "PLA", - "Other PLA Hyper" - ] - ], - "OFFrbsvQ": [ - [ - "Other", - "TPU", - "Other TPU" - ] - ], "OFFvzqcd": [ [ "Bambu Lab", @@ -14270,18 +9978,81 @@ "Bambu PETG Basic" ] ], - "OFG8vHw8": [ + "OFFwJWea": [ [ - "Generic", - "ASA", - "Qidi Generic ASA" + "Anycubic", + "PLA", + "Anycubic PLA Silk" ] ], - "OFGFZhWu": [ + "OFFxZ7hZ": [ [ "Generic", + "PLA-CF", + "Chuanying Generic PLA-CF10" + ] + ], + "OFG0kOKX": [ + [ + "Volumic", "PETG", - "Sovol SV06 ACE PETG" + "Volumic PETG Ultra" + ] + ], + "OFG2RkhN": [ + [ + "Creality", + "TPU", + "CR-TPU" + ] + ], + "OFG4do34": [ + [ + "QIDI", + "ASA-AERO", + "Qidi ASA-Aero" + ] + ], + "OFGDaEHO": [ + [ + "Generic", + "BVOH", + "Tiertime Generic BVOH" + ] + ], + "OFGGyAgJ": [ + [ + "Generic", + "TPU", + "Vzbot Generic TPU" + ] + ], + "OFGJ1nxs": [ + [ + "Other", + "PLA", + "Other PLA" + ] + ], + "OFGKLoUm": [ + [ + "Generic", + "TPU", + "Anycubic Generic TPU" + ] + ], + "OFGLeiNL": [ + [ + "Generic", + "PLA", + "Yumi Generic PLA" + ] + ], + "OFGPJxnt": [ + [ + "Generic", + "PC", + "Anker Generic PC" ] ], "OFGVwfK0": [ @@ -14291,11 +10062,11 @@ "FilAr PLA-mate Gris" ] ], - "OFGb4hPY": [ + "OFGc282l": [ [ - "Anycubic", - "PEBA", - "Anycubic PEBA 95A" + "Generic", + "PLA", + "Flashforge PLA-SILK" ] ], "OFGcLA5R": [ @@ -14305,16 +10076,18 @@ "FilAr PLA-mate Beige" ] ], - "OFGfdP6J": [ + "OFGcMkEB": [ [ - "FusRock", - "S-Multi", - "FusRock Generic S-Multi" - ], + "Creality", + "TPU", + "HP-TPU" + ] + ], + "OFGdP6Na": [ [ - "Generic", - "PET-CF", - "FusRock Generic S-Multi" + "Volumic", + "PVA", + "Volumic PVA" ] ], "OFGkyftV": [ @@ -14324,6 +10097,34 @@ "Overture Silk PLA" ] ], + "OFGwT5Av": [ + [ + "Creality", + "PLA-CF", + "Creality Hyper PLA-CF" + ] + ], + "OFGwZmgS": [ + [ + "Creality", + "ABS", + "CR-ABS" + ] + ], + "OFGxC8gB": [ + [ + "Creality", + "PLA", + "CR-Wood" + ] + ], + "OFGzUNbm": [ + [ + "Generic", + "PPS-CF", + "Tiertime Generic PPS-CF" + ] + ], "OFH2nN08": [ [ "Eolas Prints", @@ -14331,6 +10132,27 @@ "Eolas Prints PLA INGEO 850" ] ], + "OFH5UH6P": [ + [ + "Generic", + "ABS-GF", + "Flashforge ABS-GF" + ] + ], + "OFH6Pjxe": [ + [ + "Generic", + "PLA", + "Flashforge PLA Matte" + ] + ], + "OFH7b12v": [ + [ + "Generic", + "PA-CF", + "Generic PAHT-CF" + ] + ], "OFHAccHz": [ [ "FilAr", @@ -14338,30 +10160,32 @@ "FilAr PLA Blanco Antartida" ] ], - "OFHBTqyD": [ + "OFHFZ1Te": [ [ "Generic", "PLA", - "Flashforge PLA Basic" + "Prusa Generic PLA Silk" ] ], - "OFHDaMut": [ - [ - "Volumic", - "PA6-CF", - "PA6 CF20 (Performance)" - ] - ], - "OFHL32M0": [ - [ - "Anycubic", - "TPU", - "Anycubic TPU" - ], + "OFHQUAoZ": [ [ "Generic", - "TPU", - "Anycubic TPU" + "PA-CF", + "FLSun Generic PA-CF" + ] + ], + "OFHTVfaU": [ + [ + "Generic", + "PETG", + "Sovol Zero PETG" + ] + ], + "OFHUnLY2": [ + [ + "Generic", + "PETG", + "Vzbot Generic PETG" ] ], "OFHWSM21": [ @@ -14371,6 +10195,13 @@ "Fiberon PET-CF" ] ], + "OFHa3RZT": [ + [ + "Generic", + "PA-CF", + "Tiertime Generic PA-CF" + ] + ], "OFHa48An": [ [ "Bambu Lab", @@ -14378,6 +10209,20 @@ "Bambu PET-CF" ] ], + "OFHaYaB1": [ + [ + "eSUN", + "PET", + "eSUN PET-Basic" + ] + ], + "OFHf2lKK": [ + [ + "FlyingBear", + "TPU", + "FlyingBear TPU Basic" + ] + ], "OFHfzQXo": [ [ "Eolas Prints", @@ -14385,6 +10230,13 @@ "Eolas Prints PLA Transition" ] ], + "OFHknN4v": [ + [ + "Polymaker", + "PLA", + "Polymaker PLA Pro Metallic" + ] + ], "OFHmPYRy": [ [ "SUNLU", @@ -14392,11 +10244,18 @@ "SUNLU PLA+ 2.0" ] ], - "OFHtQDC9": [ + "OFI6WZpn": [ [ - "Elegoo", + "Orca Arena", "PLA", - "Elegoo PLA Basic" + "Arena Support W" + ] + ], + "OFI80Hct": [ + [ + "Generic", + "ASA", + "Anycubic Generic ASA" ] ], "OFIBXa0k": [ @@ -14406,6 +10265,62 @@ "FilAr PLA-mate Rojo" ] ], + "OFIE3vOf": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Matte" + ] + ], + "OFIK0xFa": [ + [ + "Generic", + "ASA", + "FLSun S1 ASA" + ] + ], + "OFIPjqHt": [ + [ + "Orca Arena", + "PA", + "Arena Support G" + ] + ], + "OFIRUqWi": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Silk" + ] + ], + "OFIVWJPm": [ + [ + "InfiMech", + "TPU", + "InfiMech TPU" + ] + ], + "OFIWMSGX": [ + [ + "HATCHBOX", + "PETG", + "HATCHBOX PETG" + ] + ], + "OFIYTy8S": [ + [ + "Generic", + "PLA", + "Anker Generic PLA+" + ] + ], + "OFIZMQwM": [ + [ + "LH Stinger", + "TPU", + "LHS TPU" + ] + ], "OFIamQnD": [ [ "FilAr", @@ -14413,6 +10328,20 @@ "FilAr PLA Gris Ceniza" ] ], + "OFIda816": [ + [ + "Generic", + "PVA", + "Vzbot Generic PVA" + ] + ], + "OFIeCuXj": [ + [ + "Generic", + "PETG", + "Peopoly Generic PETG" + ] + ], "OFIegjmD": [ [ "Eolas Prints", @@ -14427,18 +10356,53 @@ "Bambu Support For PLA/PETG" ] ], - "OFIl3ar9": [ + "OFIgbDHq": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Luminous" + ] + ], + "OFIieIka": [ + [ + "Generic", + "PA", + "Polymaker CoPA" + ] + ], + "OFIxOuOu": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Starlight" + ] + ], + "OFIxitiU": [ + [ + "Generic", + "PLA", + "Flashforge PLA Basic" + ] + ], + "OFIy3kLw": [ + [ + "Generic", + "PA", + "Prusa Generic PA" + ] + ], + "OFJ3HRsR": [ + [ + "Orca Arena", + "ABS", + "Arena ABS" + ] + ], + "OFJ80y1e": [ [ "Generic", "PETG", - "Sovol SV08 PETG" - ] - ], - "OFIzguhB": [ - [ - "Volumic", - "UNIV", - "Volumic UNIVERSAL Ultra" + "FLSun T1 PETG" ] ], "OFJHBEGD": [ @@ -14448,6 +10412,13 @@ "DREMC PLA+ HS" ] ], + "OFJJpaLS": [ + [ + "Generic", + "PETG", + "FLSun Generic PETG" + ] + ], "OFJNeELv": [ [ "FILL3D", @@ -14469,6 +10440,62 @@ "FilAr PETG Cristal" ] ], + "OFJSksUs": [ + [ + "Generic", + "PLA", + "FLSun Generic PLA" + ] + ], + "OFJVFpJz": [ + [ + "Generic", + "PLA", + "Sovol Zero PLA Silk" + ] + ], + "OFJWKoYG": [ + [ + "iQ Materials", + "ABS Material4Print Natur", + "Material4Print ABS Natur P1" + ] + ], + "OFJYpVAQ": [ + [ + "Generic", + "TPU-90A", + "Generic TPU-90A" + ] + ], + "OFJfv07m": [ + [ + "Generic", + "TPU", + "Sovol SV06 ACE TPU" + ] + ], + "OFJgijky": [ + [ + "Polymaker", + "PLA", + "PolyLite CosPLA" + ] + ], + "OFJhT2fd": [ + [ + "Snapmaker", + "ABS", + "Snapmaker Dual ABS" + ] + ], + "OFJrvXth": [ + [ + "Snapmaker", + "ABS", + "Snapmaker ABS Benchy" + ] + ], "OFJs1ToM": [ [ "COEX 3D", @@ -14483,32 +10510,46 @@ "NIT PETG" ] ], - "OFK39W9u": [ + "OFJxSqO4": [ [ - "Generic", - "PETG-CF", - "Flashforge Generic PETG-CF10" + "Yumi", + "PLA", + "YUMI PLA Direct Drive" ] ], - "OFK820gS": [ + "OFK01afJ": [ + [ + "Generic", + "PC", + "Qidi Generic PC" + ] + ], + "OFK4LdYI": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA HF" + ] + ], + "OFK74HJD": [ + [ + "Generic", + "PLA", + "Flashforge PLA Pro" + ] + ], + "OFK8XHPn": [ + [ + "Overture", + "ABS", + "Overture ABS" + ] + ], + "OFKIQO2W": [ [ "QIDI", - "ASA", - "QIDI ASA" - ] - ], - "OFKDnrjL": [ - [ - "Artillery", - "PLA Matte", - "Artillery PLA Matte" - ] - ], - "OFKH15Hd": [ - [ - "Generic", - "ABS", - "Sovol SV08 ABS" + "PLA", + "QIDI PLA Rapido" ] ], "OFKKajh6": [ @@ -14518,6 +10559,13 @@ "FilAr PLA Gris Plata" ] ], + "OFKNAhls": [ + [ + "Generic", + "PETG", + "Qidi Generic PETG" + ] + ], "OFKTSiYF": [ [ "FilAr", @@ -14525,11 +10573,11 @@ "FilAr PLA Blanco Calido" ] ], - "OFKWVi10": [ + "OFKUEXPA": [ [ - "Generic", - "PLA-CF", - "Flashforge Generic PLA-CF10" + "Snapmaker", + "ASA", + "Snapmaker Dual ASA" ] ], "OFKWWgyp": [ @@ -14546,16 +10594,25 @@ "FilAr PLA Naranja Tigre" ] ], - "OFKZH00L": [ + "OFKbdiiJ": [ [ - "FusRock", - "PET-CF", - "FusRock Generic PET-CF" - ], + "Polymaker", + "PLA", + "PolySonic PLA Pro" + ] + ], + "OFKfJTwL": [ [ - "Generic", + "QIDI", "PET-CF", - "FusRock Generic PET-CF" + "QIDI PET-CF" + ] + ], + "OFKgmsqE": [ + [ + "QIDI", + "PAHT-CF", + "QIDI PAHT-CF" ] ], "OFKhMPeX": [ @@ -14565,13 +10622,6 @@ "Bambu PC" ] ], - "OFKhtNBx": [ - [ - "Snapmaker", - "TPU", - "Snapmaker J1 TPU High-Flow" - ] - ], "OFKiSMWR": [ [ "Polymaker", @@ -14579,46 +10629,60 @@ "Panchroma PLA Marble" ] ], - "OFKjlAbC": [ - [ - "QIDI", - "UltraPA-CF25", - "QIDI UltraPA-CF25" - ] - ], - "OFKzh9lx": [ - [ - "InfiMech", - "PLA", - "InfiMech PLA" - ] - ], - "OFL4BLAC": [ - [ - "iQ Materials", - "HPP4GF25", - "Grauts HPP4GF25 P1" - ] - ], - "OFL4KniM": [ - [ - "Elegoo", - "TPU", - "Elegoo Rapid TPU 95A" - ] - ], - "OFL7U2MV": [ - [ - "RatRig", - "ABS", - "RatRig PunkFil ABS" - ] - ], - "OFL7vEML": [ + "OFKo87c6": [ [ "Generic", - "PC", - "FlashForge PC" + "TPU", + "Snapmaker TPU 95A" + ] + ], + "OFKpQTJI": [ + [ + "Generic", + "TPU", + "Flashforge TPU 65D" + ] + ], + "OFKuTr12": [ + [ + "Generic", + "PE", + "Tiertime Generic PE" + ] + ], + "OFKyCgaK": [ + [ + "Generic", + "PLA", + "Anycubic Generic PLA" + ] + ], + "OFLAXKqP": [ + [ + "WonderMaker", + "TPU", + "WonderMaker TPU 95A" + ] + ], + "OFLBUkwC": [ + [ + "Generic", + "ABS", + "Vzbot Generic ABS" + ] + ], + "OFLC1oRH": [ + [ + "Flashforge", + "PPA-CF", + "Flashforge PPA-CF" + ] + ], + "OFLDSqqi": [ + [ + "Generic", + "ABS", + "Flashforge Generic ABS" ] ], "OFLJ8S6I": [ @@ -14635,6 +10699,13 @@ "DREMC ASA" ] ], + "OFLOf6Sc": [ + [ + "Tiertime", + "TPU", + "Tiertime TPU 95A" + ] + ], "OFLPAxz3": [ [ "Generic", @@ -14649,6 +10720,20 @@ "Elegoo Rapid PETG" ] ], + "OFLYDIb8": [ + [ + "Generic", + "PLA", + "Flashforge PLA Silk" + ] + ], + "OFLYDngx": [ + [ + "Bambu Lab", + "PETG", + "Bambu PETG" + ] + ], "OFLakOUI": [ [ "Generic", @@ -14656,6 +10741,20 @@ "Generic PC" ] ], + "OFLbXwoL": [ + [ + "Artillery", + "PLA Silk", + "Artillery PLA Silk" + ] + ], + "OFLbdkrE": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Eco" + ] + ], "OFLcd093": [ [ "Elegoo", @@ -14663,51 +10762,60 @@ "Elegoo PETG" ] ], - "OFLeFaUO": [ + "OFLfywkp": [ [ - "Generic", - "PVA", - "Flashforge Generic PVA" + "Afinia", + "ABS", + "Afinia ABS+" ] ], - "OFLhOFQk": [ + "OFLgwqp2": [ [ - "Volumic", - "ASA", - "Volumic ASA Ultra (Performance)" + "Creality", + "PETG-GF", + "Hyper PETG-GF" ] ], - "OFLiTjQK": [ - [ - "Other", - "PA-CF", - "Other PA-CF" - ] - ], - "OFLriDvE": [ + "OFLrdHse": [ [ "Generic", "PLA", - "Creality Generic PLA High Speed" + "Flashforge Generic HS PLA" ] ], - "OFLxO2Oc": [ + "OFLuczRG": [ [ "Generic", - "PET", - "FusRock PET" + "ASA", + "Creality Generic ASA-CF" ] ], - "OFM3PeVe": [ + "OFLzx3J4": [ [ - "FusRock", - "ASA-CF", - "Flashforge ASA-CF" - ], + "Creality", + "PLA", + "Hyper Marble" + ] + ], + "OFM0xjBG": [ + [ + "Creality", + "PLA", + "CR-PLA Matte" + ] + ], + "OFM4iJlv": [ [ "Generic", - "ASA-CF", - "Flashforge ASA-CF" + "PA-CF", + "Generic PA12-CF" + ] + ], + "OFM87w9T": [ + [ + "Generic", + "SBS", + "Tiertime Generic SBS" ] ], "OFM91vZs": [ @@ -14717,11 +10825,60 @@ "Overture ASA" ] ], - "OFMHTnPP": [ + "OFMDHOcT": [ [ - "FusRock", - "PA-CF", - "Flashforge PA12-CF" + "QIDI", + "TPU-AERO", + "QIDI TPU-Aero" + ] + ], + "OFMEbuBE": [ + [ + "Generic", + "TPU", + "Blocks Generic TPU" + ] + ], + "OFMIma8C": [ + [ + "Generic", + "PLA", + "Flashforge PLA Luminous" + ] + ], + "OFMIurFh": [ + [ + "Generic", + "PLA", + "Creality HF Generic Speed PLA" + ] + ], + "OFMK5gVo": [ + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Basic" + ] + ], + "OFML2aVd": [ + [ + "Anycubic", + "TPU", + "Anycubic TPU 95A" + ] + ], + "OFMSvS8z": [ + [ + "Artillery", + "PA", + "Artillery PA" + ] + ], + "OFMTBcnz": [ + [ + "Generic", + "PP-CF", + "Tiertime Generic PP-CF" ] ], "OFMTK0UC": [ @@ -14738,6 +10895,13 @@ "SUNLU PLA+" ] ], + "OFMZAoqa": [ + [ + "Generic", + "PVA", + "Tiertime Generic PVA" + ] + ], "OFMZvH0z": [ [ "Overture", @@ -14745,6 +10909,13 @@ "Overture Rock PLA" ] ], + "OFMgJQCZ": [ + [ + "Generic", + "PA", + "Anker Generic PA" + ] + ], "OFMjtqTC": [ [ "Bambu Lab", @@ -14752,6 +10923,34 @@ "Bambu PLA Wood" ] ], + "OFMoLF46": [ + [ + "Generic", + "TPU", + "FLSun Generic TPU" + ] + ], + "OFMpxamb": [ + [ + "Flashforge", + "PETG", + "Flashforge PETG" + ] + ], + "OFMqYusc": [ + [ + "Generic", + "PA", + "Creality Generic PA" + ] + ], + "OFMsDGbs": [ + [ + "Anycubic", + "TPU", + "Anycubic TPU" + ] + ], "OFMuXBmO": [ [ "Elas", @@ -14759,32 +10958,67 @@ "Elas PLA Basic" ] ], - "OFN0X7oN": [ - [ - "QIDI", - "PLA", - "QIDI PLA Basic" - ] - ], - "OFN0pBpo": [ + "OFMyLYV8": [ [ "Generic", - "TPU", - "Qidi Generic TPU 95A" + "PETG", + "Flashforge PETG Transparent" ] ], - "OFNQHqAV": [ + "OFN7aNHe": [ + [ + "Generic", + "PC", + "Tiertime Generic PC" + ] + ], + "OFN9fefN": [ [ "Cubicon", "ABS", - "Cubicon ABSk" + "Cubicon ABS-A100" ] ], - "OFNRgSch": [ + "OFNBlAPT": [ [ - "Artillery", - "PC", - "Artillery PC" + "Orca Arena", + "PETG", + "Arena PETG Basic" + ] + ], + "OFNGTH3w": [ + [ + "Tiertime", + "PLA", + "Tiertime PLA" + ] + ], + "OFNLXV8X": [ + [ + "Generic", + "ABS", + "Tiertime Generic ABS" + ] + ], + "OFNOxcYl": [ + [ + "Generic", + "PA-CF", + "RatRig Generic PA-CF" + ] + ], + "OFNQKF0M": [ + [ + "Tiertime", + "ABS", + "Tiertime ABS" + ] + ], + "OFNSYu5h": [ + [ + "Volumic", + "PP", + "Volumic PP Ultra (Performance)" ] ], "OFNU9YIW": [ @@ -14794,18 +11028,60 @@ "FilAr PETG Azul Boreal" ] ], - "OFNX5uRT": [ - [ - "QIDI", - "TPU-AERO", - "QIDI TPU-Aero" - ] - ], - "OFNbajj9": [ + "OFNW4ZTC": [ [ "Generic", - "ASA", - "Creality Generic ASA-CF" + "PLA", + "Creality Generic PLA Wood" + ] + ], + "OFNWcJsM": [ + [ + "Generic", + "PLA", + "Comgrow T300 PLA" + ] + ], + "OFNWnx2c": [ + [ + "Generic", + "TPU-95A", + "Flashforge TPU-95A" + ] + ], + "OFNX8GI1": [ + [ + "Generic", + "ABS", + "Sovol Zero ABS" + ] + ], + "OFNYewRS": [ + [ + "Generic", + "PLA", + "Blocks Generic PLA" + ] + ], + "OFNZYgLA": [ + [ + "Generic", + "PVA", + "Qidi Generic PVA" + ] + ], + "OFNZjrLo": [ + [ + "Generic", + "PLA", + "Sovol SV06 Plus ACE PLA" + ] + ], + "OFNcdCrm": [ + [ + "Generic", + "PLA-CF", + "Anycubic Generic PLA-CF" ] ], "OFNemJM6": [ @@ -14829,18 +11105,25 @@ "Bambu PA6-GF" ] ], - "OFNvrbnf": [ + "OFNn21yM": [ [ - "Co Print", - "ABS", - "CoPrint Generic ABS" + "Generic", + "PA-CF", + "Vzbot Generic PA-CF" ] ], - "OFNz8rrn": [ + "OFNstOna": [ [ - "FlyingBear", - "PLA", - "FlyingBear PLA Hyper" + "Eryone", + "PETG-CF", + "Eryone PETG-CF" + ] + ], + "OFNvBIL0": [ + [ + "Creality", + "PA-CF", + "Hyper PPA-CF" ] ], "OFO1GEq6": [ @@ -14850,18 +11133,11 @@ "Panchroma PLA Neon" ] ], - "OFO3IOWM": [ - [ - "Volumic", - "PETG-ESD", - "PETG ESD (Performance)" - ] - ], - "OFO5R9KJ": [ + "OFO5djrM": [ [ "Generic", - "TPU", - "Sovol Zero TPU" + "PETG-CF", + "Generic PETG-CF10" ] ], "OFOABq7t": [ @@ -14871,25 +11147,46 @@ "AliZ PETG-Metal" ] ], - "OFOJUJAS": [ + "OFOAdMCB": [ [ - "Cubicon", - "PA", - "Cubicon PA-CF" + "Orca Arena", + "PLA", + "Arena PLA Metal" ] ], - "OFOSzSuh": [ + "OFOHOf2F": [ + [ + "eSUN", + "PLA", + "eSUN PLA-HS" + ] + ], + "OFOJPAAS": [ + [ + "iQ Materials", + "VXL90 Xioneer", + "VXL90 TiQ2 P2" + ] + ], + "OFOKYhi6": [ [ "Generic", - "PA-CF", - "Flashforge PA-CF" + "PETG", + "Prusa Generic PETG HF" ] ], - "OFOW9K96": [ + "OFObG16Q": [ [ - "QIDI", - "TPU", - "Qidi TPU 95A-HF" + "InfiMech", + "PLA", + "InfiMech PLA Basic" + ] + ], + "OFObyktP": [ + [ + "Tiertime", + "PETG", + "Tiertime PETG" ] ], "OFOiJfLM": [ @@ -14899,18 +11196,11 @@ "FILL3D PETG CF" ] ], - "OFOkTA0C": [ + "OFOnSNt3": [ [ - "Elegoo", - "PETG", - "Elegoo PETG Translucent" - ] - ], - "OFOp3Oef": [ - [ - "Generic", - "ABS", - "Generic ABS" + "Artillery", + "PETG-CF", + "Artillery PETG-CF" ] ], "OFOsHDnB": [ @@ -14920,6 +11210,13 @@ "Elegoo PETG PRO" ] ], + "OFOuEEvv": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido 0.2 nozzle" + ] + ], "OFOvv91M": [ [ "Polymaker", @@ -14927,11 +11224,18 @@ "PolyLite ABS" ] ], - "OFOysPuE": [ + "OFOwQuZM": [ [ - "QIDI", - "TPU-GF", - "QIDI TPU-GF" + "Snapmaker", + "PETG-CF", + "Snapmaker PETG-CF" + ] + ], + "OFOzwywz": [ + [ + "Eryone", + "ABS", + "Eryone ABS" ] ], "OFP26zNb": [ @@ -14941,37 +11245,18 @@ "FilAr PLA Violeta Jacaranda" ] ], - "OFP4poIv": [ + "OFPHLnoe": [ [ - "Generic", - "PLA", - "Sovol Zero PLA Silk HS Nozzle" + "Creality", + "ASA", + "HP-ASA" ] ], - "OFPGelMX": [ - [ - "Volumic", - "PP", - "Volumic PP Ultra (Performance)" - ] - ], - "OFPJJxkF": [ - [ - "FusRock", - "PET-CF", - "Flashforge PET-CF" - ], + "OFPQfNAf": [ [ "Generic", - "PET-CF", - "Flashforge PET-CF" - ] - ], - "OFPJrlC3": [ - [ - "Generic", - "PLA-CF", - "Flashforge PLA-CF" + "PETG", + "Flashforge PETG Pro" ] ], "OFPWPlSC": [ @@ -14981,6 +11266,13 @@ "FILL3D PP" ] ], + "OFPYDWgC": [ + [ + "Peopoly", + "PET-CF", + "Peopoly Lancer PET-CF" + ] + ], "OFPbyOSk": [ [ "FilAr", @@ -14995,11 +11287,18 @@ "Eolas Prints PLA INGEO 870" ] ], - "OFPeGtB1": [ + "OFPdhDlK": [ [ - "Volumic", - "UNIV", - "Volumic UNIVERSAL Ultra (Performance)" + "Generic", + "PA-CF", + "Anycubic Generic PA-CF" + ] + ], + "OFPjOUtz": [ + [ + "Generic", + "PAHT-CF", + "FusRock Generic PAHT-CF" ] ], "OFPkCJKE": [ @@ -15016,13 +11315,6 @@ "Generic PE" ] ], - "OFPokkKe": [ - [ - "QIDI", - "PETG-CF", - "QIDI PETG-CF" - ] - ], "OFPoyiFs": [ [ "Polymaker", @@ -15037,11 +11329,32 @@ "FilAr PLA Rosa Amaranto" ] ], - "OFPwi9X0": [ + "OFPryWt5": [ [ - "HATCHBOX", - "ABS", - "HATCHBOX ABS" + "Generic", + "PLA", + "Lulzbot 2.85mm PLA" + ] + ], + "OFPy0Ogq": [ + [ + "Generic", + "PA-CF", + "Qidi Generic PA-CF" + ] + ], + "OFQ1KzO8": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Silk" + ] + ], + "OFQ1zgm3": [ + [ + "Eryone", + "ABS-CF", + "Eryone ABS-CF" ] ], "OFQ3e56w": [ @@ -15051,30 +11364,46 @@ "Bambu PLA Galaxy" ] ], - "OFQ5xAKf": [ + "OFQ40XeN": [ [ - "Generic", - "PVA", - "Chuanying Generic PVA" + "QIDI", + "PETG", + "QIDI PETG Tough" ] ], - "OFQ9dI8j": [ + "OFQ7I5vC": [ [ "Generic", - "PC", - "Prusa Generic PC HF" + "PLA-CF", + "Prusa Generic PLA-CF" ] ], - "OFQCAYAt": [ - [ - "FusRock", - "PPA-CF", - "Flashforge PPA-CF" - ], + "OFQ9qnkd": [ [ "Generic", - "PPA-CF", - "Flashforge PPA-CF" + "PLA", + "FLSun T1 PLA High Speed" + ] + ], + "OFQC8Vna": [ + [ + "Generic", + "PETG-CF", + "Flashforge Generic PETG-CF" + ] + ], + "OFQEGL7z": [ + [ + "FlyingBear", + "PA-CF", + "FlyingBear PA-CF" + ] + ], + "OFQGvU2G": [ + [ + "Orca Arena", + "TPU", + "Arena TPU 95A" ] ], "OFQHiNJs": [ @@ -15091,6 +11420,27 @@ "Generic PA-CF" ] ], + "OFQMTRc8": [ + [ + "Snapmaker", + "PETG", + "Snapmaker J1 PETG" + ] + ], + "OFQMsFfF": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF10" + ] + ], + "OFQTrLXB": [ + [ + "Generic", + "PLA-CF", + "Qidi Generic PLA-CF" + ] + ], "OFQWIKbV": [ [ "FilAr", @@ -15098,11 +11448,18 @@ "FilAr PLA Titanio" ] ], - "OFQZINrX": [ + "OFQYaiGg": [ [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF10" + "Snapmaker", + "PET", + "Snapmaker PET" + ] + ], + "OFQZeyZv": [ + [ + "Generic", + "PLA", + "Flashforge PLA Buint Ti" ] ], "OFQbjX3s": [ @@ -15112,32 +11469,88 @@ "FILL3D PETG" ] ], - "OFR8dTVW": [ + "OFQbqeN7": [ + [ + "Generic", + "PA", + "Qidi Generic PA" + ] + ], + "OFQdaVZS": [ + [ + "Generic", + "PET-CF", + "Generic PET-CF" + ] + ], + "OFQe7sAx": [ + [ + "Anycubic", + "PA6-CF", + "Anycubic PA6-CF" + ] + ], + "OFQiq4fb": [ + [ + "Generic", + "PVA", + "Flashforge PVA" + ] + ], + "OFQswlnF": [ + [ + "Generic", + "PA", + "Tiertime Generic PA" + ] + ], + "OFR0gODA": [ + [ + "SeeMeCNC", + "ABS", + "SeeMeCNC ABS" + ] + ], + "OFRDLNM9": [ [ "Generic", "PLA", - "FLSun S1 PLA High Speed" + "Peopoly Generic PLA" ] ], - "OFRNU58t": [ + "OFRJ325z": [ [ - "Generic", - "TPU", - "Flashforge TPU 95A" + "LH Stinger", + "PETG", + "LHS PETG" ] ], - "OFRR8LUh": [ + "OFRPEs5o": [ [ "Generic", "ASA", - "Generic ASA" + "Flashforge Generic ASA" ] ], - "OFRgDMDJ": [ + "OFRhBryT": [ + [ + "Cubicon", + "PLA", + "Cubicon PLAi21" + ] + ], + "OFRhCTUg": [ + [ + "Anycubic", + "PET-CF", + "Anycubic PET-CF" + ] + ], + "OFRi7v0b": [ [ "Generic", "PETG", - "Flashforge PETG Transparent" + "Sovol SV08 PETG" ] ], "OFRiFnfQ": [ @@ -15154,6 +11567,62 @@ "Panchroma PLA Celestial" ] ], + "OFRiyes1": [ + [ + "Generic", + "ASA", + "Anker Generic ASA" + ] + ], + "OFRkjhxK": [ + [ + "Volumic", + "PVA", + "Volumic PVA-BVOH (Performance)" + ] + ], + "OFRmGKVX": [ + [ + "Cubicon", + "PLA", + "Cubicon PLA+" + ] + ], + "OFRooa0F": [ + [ + "Snapmaker", + "PA-CF", + "Snapmaker Dual PA-CF" + ] + ], + "OFRpAZ1P": [ + [ + "DeltaMaker", + "PLA", + "DeltaMaker Brand PLA" + ] + ], + "OFRujL0v": [ + [ + "Generic", + "PET-CF", + "FusRock Generic PET-CF" + ] + ], + "OFRusgEn": [ + [ + "Generic", + "PVA", + "Chuanying Generic PVA" + ] + ], + "OFRyOsZj": [ + [ + "re3D", + "PLA", + "re3D PLA" + ] + ], "OFRzR5mi": [ [ "eSUN", @@ -15161,11 +11630,11 @@ "eSUN ePLA-LW" ] ], - "OFS1ekCg": [ + "OFRzsaDK": [ [ - "Generic", - "PETG", - "RatRig BigNozzle PCTG" + "FlyingBear", + "TPU", + "FlyingBear Generic TPU" ] ], "OFS2tn6G": [ @@ -15175,11 +11644,18 @@ "Fiberon PA612-CF" ] ], - "OFS3HrR1": [ + "OFS4jbj3": [ [ - "Other", + "Eryone", + "PA", + "Eryone PA" + ] + ], + "OFS8JF3S": [ + [ + "Generic", "PLA", - "Other PLA" + "Qidi Generic PLA High Speed" ] ], "OFS8lTQt": [ @@ -15189,46 +11665,60 @@ "Panchroma PLA Silk" ] ], - "OFSCm6pJ": [ - [ - "Elegoo", - "PETG", - "Elegoo PET-CF" - ] - ], - "OFSSuKRr": [ - [ - "QIDI", - "PETG", - "QIDI PETG Basic" - ] - ], - "OFSdF3B1": [ + "OFSDFYs4": [ [ "Generic", - "PAHT-CF", - "FusRock PAHT-CF" + "PLA-CF", + "Creality Generic PLA-CF" ] ], - "OFSkBwxf": [ + "OFSGbf2I": [ [ "Generic", - "ASA", - "RatRig BigNozzle ASA" + "PVA", + "Anycubic Generic PVA" ] ], - "OFSoZBK2": [ + "OFSPdsuW": [ + [ + "Generic", + "PPA-CF", + "Tiertime Generic PPA-CF" + ] + ], + "OFSStjay": [ [ "Generic", "PLA", - "Sovol SV06 Plus ACE PLA" + "FLSun S1 PLA Silk" ] ], - "OFSpTWdv": [ + "OFSTCno1": [ [ - "Other", - "PA-CF", - "Other PA-CF" + "GreenGate3D", + "PETG", + "re3D Greengate rPETG" + ] + ], + "OFSa39yP": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA" + ] + ], + "OFSbGfsz": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Basic" + ] + ], + "OFShw1X8": [ + [ + "Generic", + "ABS", + "Flashforge ABS Basic" ] ], "OFSwbBWS": [ @@ -15238,6 +11728,13 @@ "DREMC PLA+" ] ], + "OFT2jon4": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido" + ] + ], "OFTGHyNC": [ [ "Bambu Lab", @@ -15245,6 +11742,13 @@ "Bambu PLA Impact" ] ], + "OFTKFAZ4": [ + [ + "Generic", + "PCTG", + "Tiertime Generic PCTG" + ] + ], "OFTOPcx0": [ [ "Eolas Prints", @@ -15259,25 +11763,18 @@ "Bambu PETG-CF" ] ], - "OFTa6gPH": [ + "OFTSXxzE": [ [ - "Generic", - "PLA", - "Flashforge PLA Pro" + "Flashforge", + "PPS-CF", + "Flashforge PPS-CF" ] ], - "OFTbdJyT": [ + "OFTXduCM": [ [ - "Other", - "PC", - "Other PC" - ] - ], - "OFTbsWVg": [ - [ - "Artillery", - "TPU", - "Artillery TPU" + "eSUN", + "ABS", + "eSUN ABS+" ] ], "OFTcE0nA": [ @@ -15287,6 +11784,20 @@ "eSUN PLA-Basic" ] ], + "OFTdauIq": [ + [ + "Volumic", + "PETG", + "Volumic PCTG Ultra (Performance)" + ] + ], + "OFTkj6DR": [ + [ + "Anycubic", + "PVA", + "Anycubic PVA" + ] + ], "OFTlRzpe": [ [ "FilAr", @@ -15294,25 +11805,39 @@ "FilAr PLA Gris Pizarra" ] ], - "OFToBodi": [ + "OFTnWzBs": [ + [ + "Creality", + "PLA-CF", + "Hyper PLA-CF" + ] + ], + "OFTs8peJ": [ + [ + "Snapmaker", + "TPU", + "Snapmaker Dual TPE" + ] + ], + "OFTsHNQi": [ [ "QIDI", - "ABS", - "QIDI ABS Rapido Metal" + "ASA", + "QIDI ASA" ] ], - "OFTsGps3": [ - [ - "InfiMech", - "PC", - "InfiMech PC" - ] - ], - "OFTszIHE": [ + "OFTvvox9": [ [ "Generic", "PLA", - "Creality Generic PLA Silk" + "Sovol SV06 ACE PLA" + ] + ], + "OFU0n0zW": [ + [ + "Generic", + "PLA", + "FLSun T1 PLA Generic" ] ], "OFU1zPxE": [ @@ -15322,18 +11847,102 @@ "Elegoo PLA Galaxy" ] ], - "OFUJw3Lx": [ + "OFU3QXL7": [ [ - "QIDI", - "PEBA", - "QIDI PEBA 95A" + "re3D", + "PC", + "re3D PC" ] ], - "OFUYjPc4": [ + "OFU3zwPc": [ [ "Generic", + "TPU", + "Prusa Generic TPU HF" + ] + ], + "OFU5N9jI": [ + [ + "Generic", + "TPU", + "OrcaArena Generic TPU" + ] + ], + "OFU6fjbi": [ + [ + "Co Print", + "ABS", + "CoPrint Generic ABS" + ] + ], + "OFU7CKZt": [ + [ + "Volumic", + "ASA", + "Volumic ASA Ultra (Performance)" + ] + ], + "OFUCpLaL": [ + [ + "Generic", + "PPS", + "FlashForge PPS" + ] + ], + "OFUF7oA4": [ + [ + "Creality", + "PC", + "Hyper PC" + ] + ], + "OFUH1aee": [ + [ + "Volumic", + "TPU", + "Volumic FLEX93 Ultra (Performance)" + ] + ], + "OFUIfGoh": [ + [ + "Snapmaker", + "PET", + "Snapmaker Dual PET" + ] + ], + "OFUScM0D": [ + [ + "Generic", + "S-Multi", + "FusRock S-Multi" + ] + ], + "OFUWRqwb": [ + [ + "Generic", + "PA-CF", + "Creality Generic PA-CF" + ] + ], + "OFUYCqtB": [ + [ + "InfiMech", "PLA", - "Dremel Generic PLA" + "InfiMech PLA" + ] + ], + "OFUaHEO9": [ + [ + "Anycubic", + "PEBA", + "Anycubic PEBA 95A" + ] + ], + "OFUaVAdj": [ + [ + "Generic", + "ASA", + "Tiertime Generic ASA" ] ], "OFUanySo": [ @@ -15343,18 +11952,25 @@ "Bambu PLA Silk+" ] ], - "OFUkpobY": [ + "OFUmS5z5": [ [ - "QIDI", - "PAHT-CF", - "QIDI PAHT-CF" + "eSUN", + "ASA", + "eSUN ASA+" ] ], - "OFUqBrgf": [ + "OFUrStd6": [ [ "Generic", - "TPU", - "Chuanying Generic TPU" + "PETG", + "RatRig Generic PCTG" + ] + ], + "OFUtGagr": [ + [ + "Generic", + "PLA-CF", + "Artillery Generic PLA-CF" ] ], "OFUyDDNv": [ @@ -15364,18 +11980,18 @@ "Elegoo PC" ] ], - "OFV1szQh": [ + "OFV0KrAG": [ [ - "Peopoly", - "PETG", - "Peopoly Lancer PETG-C" + "Generic", + "ABS", + "FLSun T1 ABS" ] ], - "OFV4hD1o": [ + "OFV5Q7j2": [ [ - "QIDI", - "PLA", - "QIDI PLA Rapido Metal" + "Snapmaker", + "TPU", + "Snapmaker J1 TPE" ] ], "OFV5tNw6": [ @@ -15385,11 +12001,11 @@ "Elegoo PET-CF" ] ], - "OFVBNoov": [ + "OFV5wEMe": [ [ - "InfiMech", + "Afinia", "ABS", - "InfiMech ABS" + "Afinia ABS" ] ], "OFVBlUFH": [ @@ -15406,18 +12022,18 @@ "Bambu TPU 95A" ] ], - "OFVJXE4n": [ - [ - "Other", - "ABS", - "Other ABS" - ] - ], - "OFVhG0yM": [ + "OFVHMFJX": [ [ "QIDI", - "ABS", - "QIDI ABS Odorless" + "PETG", + "QIDI PETG Tough 0.2 nozzle" + ] + ], + "OFVKADz5": [ + [ + "Generic", + "PLA", + "Comgrow Generic PLA" ] ], "OFVptRxp": [ @@ -15427,6 +12043,20 @@ "COEX TPE 30D" ] ], + "OFVqZ2H0": [ + [ + "Generic", + "PC", + "FLSun Generic PC" + ] + ], + "OFVtIasg": [ + [ + "Eryone", + "ASA", + "Eryone ASA" + ] + ], "OFW29a9R": [ [ "Polymaker", @@ -15434,11 +12064,39 @@ "PolyTerra PLA" ] ], - "OFW8UdlP": [ + "OFW5FqkL": [ [ "QIDI", + "PLA", + "QIDI PLA Rapido Silk" + ] + ], + "OFW9uIkE": [ + [ + "Generic", + "HIPS", + "Tiertime Generic HIPS" + ] + ], + "OFWIr7ZE": [ + [ + "CoLiDo", "ABS", - "QIDI ABS Rapido" + "CoLiDo Generic ABS" + ] + ], + "OFWRITFw": [ + [ + "Prusa Polymers", + "PLA", + "Prusament rPLA" + ] + ], + "OFWTAEjH": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPE" ] ], "OFWTRJ1K": [ @@ -15448,6 +12106,13 @@ "FilAr PLA Bronce" ] ], + "OFWY6vBh": [ + [ + "Generic", + "PC", + "Anycubic Generic PC" + ] + ], "OFWYtgCa": [ [ "Elegoo", @@ -15455,6 +12120,34 @@ "Elegoo PLA Wood" ] ], + "OFWa0NiB": [ + [ + "Volumic", + "PA", + "Volumic NYLON Ultra" + ] + ], + "OFWadebJ": [ + [ + "Generic", + "PETG-CF", + "Tiertime Generic PETG-CF" + ] + ], + "OFWao3Ic": [ + [ + "Creality", + "PLA", + "Ender-PLA" + ] + ], + "OFWbbuRY": [ + [ + "InfiMech", + "ABS", + "InfiMech Generic ABS" + ] + ], "OFWbdGsC": [ [ "Generic", @@ -15462,25 +12155,32 @@ "Generic PLA-CF" ] ], - "OFWkCAdc": [ + "OFWgFOjn": [ [ - "QIDI", - "PETG", - "QIDI PETG Tough 0.2 nozzle" - ] - ], - "OFWs8KIZ": [ - [ - "Generic", - "ABS-CF", - "Flashforge ABS-CF" - ] - ], - "OFWv6JYn": [ - [ - "Generic", + "Snapmaker", "PLA", - "Flashforge PLA Metal" + "Snapmaker PLA Silk" + ] + ], + "OFWnSvGu": [ + [ + "Generic", + "ASA-GF", + "Flashforge ASA-GF" + ] + ], + "OFWof1Ap": [ + [ + "Generic", + "ABS", + "FLSun Generic ABS" + ] + ], + "OFWukXja": [ + [ + "Generic", + "TPU", + "Qidi Generic TPU 95A" ] ], "OFWwF7K7": [ @@ -15490,11 +12190,11 @@ "FilAr PLA Cafe con Leche" ] ], - "OFWyCd0Y": [ + "OFWzr7m0": [ [ - "QIDI", - "PA-S", - "QIDI Support For PET/PA" + "Generic", + "PETG", + "Anycubic Generic PETG" ] ], "OFX0ycRQ": [ @@ -15504,11 +12204,11 @@ "Fiberon PA12-CF" ] ], - "OFXA8vy9": [ + "OFX2zcrM": [ [ - "Artillery", - "PLA Basic+", - "Artillery PLA Basic+" + "Generic", + "PLA-CF", + "Generic PLA-CF10" ] ], "OFXCBZTA": [ @@ -15525,18 +12225,11 @@ "Bambu PLA Matte" ] ], - "OFXNO5Of": [ + "OFXJ9iom": [ [ - "QIDI", - "PLA", - "QIDI PLA Rapido 0.2 nozzle" - ] - ], - "OFXQX0tr": [ - [ - "RatRig", - "PETG-CF10", - "RatRig PunkFil PETG CF" + "iQ Materials", + "HPP4GF25", + "Grauts HPP4GF25 P1" ] ], "OFXTPuqV": [ @@ -15546,18 +12239,32 @@ "Elas PETG Basic" ] ], - "OFXcfTEb": [ + "OFXXUHSG": [ [ "Generic", - "PETG", - "Tinmorry PETG-ECO" + "PETG-CF", + "Chuanying Generic PETG-CF10" ] ], - "OFXfgh61": [ + "OFXhZ3uY": [ [ "Generic", - "PA-CF", - "Prusa Generic PA-CF" + "PC", + "OrcaArena Generic PC" + ] + ], + "OFXi59OX": [ + [ + "Afinia", + "ABS", + "Afinia Value ABS" + ] + ], + "OFXk1emJ": [ + [ + "Artillery", + "PLA Basic", + "Artillery PLA Basic" ] ], "OFXkm8q1": [ @@ -15567,18 +12274,39 @@ "Generic PP-CF" ] ], - "OFXkwkn6": [ + "OFXn3Vd9": [ [ "QIDI", - "UltraPA", - "QIDI PA-Ultra" + "PAHT-S", + "QIDI Support For PAHT" ] ], - "OFXv4FUi": [ + "OFXnToSX": [ + [ + "Creality", + "PLA", + "Hyper Stardust" + ] + ], + "OFXuGxvQ": [ + [ + "Volumic", + "PLA", + "Volumic PLA Ultra" + ] + ], + "OFXuwtnq": [ + [ + "Co Print", + "PETG", + "CoPrint Generic PETG" + ] + ], + "OFXyyfX6": [ [ "Generic", "PLA", - "Flashforge PLA Galaxy" + "Anker Generic PLA Silk" ] ], "OFXz7Mwx": [ @@ -15595,11 +12323,18 @@ "Bambu ASA-Aero" ] ], - "OFY1U4uM": [ + "OFY0F5qA": [ [ - "Generic", - "TPU", - "Sovol SV08 TPU" + "Volumic", + "PETG", + "Volumic PETG Ultra carbone (Performance)" + ] + ], + "OFY3AB7j": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Matte" ] ], "OFY9muEs": [ @@ -15609,11 +12344,11 @@ "Generic ABS" ] ], - "OFYG2Gfy": [ + "OFYEtXuk": [ [ - "Afinia", - "ABS", - "Afinia ABS+" + "Snapmaker", + "PA-CF", + "Snapmaker J1 PA-CF" ] ], "OFYGbPHX": [ @@ -15623,23 +12358,18 @@ "PolyLite Dual PLA" ] ], - "OFYH00jV": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF" - ] - ], - "OFYICbI4": [ - [ - "FusRock", - "PAHT-CF", - "FusRock Generic PAHT-CF" - ], + "OFYHzKyS": [ [ "Generic", - "PAHT-CF", - "FusRock Generic PAHT-CF" + "PLA-CF", + "Vzbot Generic PLA-CF" + ] + ], + "OFYPdJ7t": [ + [ + "Generic", + "ABS", + "Creality Generic ABS" ] ], "OFYPdQJh": [ @@ -15649,20 +12379,6 @@ "Generic PETG" ] ], - "OFYRS7GZ": [ - [ - "Generic", - "TPU-95A", - "Generic TPU-95A" - ] - ], - "OFYZs7dN": [ - [ - "Generic", - "PLA", - "Flashforge Generic HS PLA" - ] - ], "OFYd5uS3": [ [ "DREMC", @@ -15670,20 +12386,76 @@ "DREMC TPU 95A" ] ], - "OFYehFGr": [ - [ - "Generic", - "TPU", - "RatRig BigNozzle TPU" - ] - ], - "OFYfZgxU": [ + "OFYezc6s": [ [ "FlyingBear", "TPU", "FlyingBear TPU" ] ], + "OFYl0c8v": [ + [ + "Generic", + "HIPS", + "Flashforge Generic HIPS" + ] + ], + "OFYlZMmy": [ + [ + "Generic", + "TPU", + "Chuanying Generic TPU" + ] + ], + "OFYlthXI": [ + [ + "Generic", + "PLA-CF", + "Flashforge Generic PLA-CF" + ] + ], + "OFYtS9zg": [ + [ + "Generic", + "PAHT-CF", + "FusRock PAHT-CF" + ] + ], + "OFYuowge": [ + [ + "Other", + "ABS", + "Other ABS" + ] + ], + "OFYvSO1W": [ + [ + "Generic", + "PLA", + "Flashforge Generic PLA-Silk" + ] + ], + "OFZ0mR5b": [ + [ + "Anycubic", + "PLA-CF", + "Anycubic PLA-CF" + ] + ], + "OFZ1hANN": [ + [ + "FusRock", + "PA-CF", + "FusRock Generic NexPA-CF25" + ] + ], + "OFZ2LuAi": [ + [ + "Yumi", + "PLA", + "YUMI PLA Bowden" + ] + ], "OFZ4QbfK": [ [ "FilAr", @@ -15691,51 +12463,74 @@ "FilAr PLA Rosa Flamenco" ] ], - "OFZAkPHG": [ - [ - "QIDI", - "PPS-GF", - "QIDI PPS-GF" - ] - ], - "OFZQFvHQ": [ + "OFZ4fTO8": [ [ "Generic", "PETG", - "Flashforge HS PETG" + "C1 Generic High Flow PETG" ] ], - "OFZcrV9c": [ - [ - "FusRock", - "PPS-CF", - "Flashforge PPS-CF" - ], + "OFZHgTVI": [ [ "Generic", - "PPS-CF", - "Flashforge PPS-CF" + "PETG", + "Flashforge Generic PETG" ] ], - "OFZjZ1k7": [ + "OFZLtWYs": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF25" + ] + ], + "OFZOuWrO": [ + [ + "QIDI", + "PPS-CF", + "QIDI PPS-CF" + ] + ], + "OFZPlCck": [ [ "Generic", + "ABS", + "Chuanying Generic ABS" + ] + ], + "OFZivHGL": [ + [ + "Snapmaker", "PLA", - "Creality HF Generic PLA" + "Snapmaker Dual PLA" ] ], - "OFa5cFqE": [ + "OFZsChIG": [ [ - "QIDI", - "PAHT-S", - "QIDI Support For PAHT" + "Generic", + "TPU", + "Qidi Generic TPU" ] ], - "OFa6L3Of": [ + "OFZtOQtl": [ [ - "QIDI", - "PC-ABS-FR", - "Qidi PC-ABS-FR" + "Flashforge", + "PA6-CF", + "Flashforge PA6-CF" + ] + ], + "OFZtkHRq": [ + [ + "Anycubic", + "PC", + "Anycubic PC" + ] + ], + "OFaBwRvT": [ + [ + "Generic", + "ASA", + "Flashforge ASA Basic" ] ], "OFaDOaNt": [ @@ -15752,18 +12547,32 @@ "FilAr PLA Rojo de Carreras" ] ], - "OFaKIoH2": [ + "OFaEuvNF": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Sparkle" + "Anycubic", + "PAHT-CF", + "Anycubic PAHT-CF" ] ], - "OFaKZ6JI": [ + "OFaFNP2U": [ [ "Generic", - "PETG", - "Generic PETG Basic" + "PLA", + "Sovol SV07 PLA" + ] + ], + "OFaHjk1V": [ + [ + "Volumic", + "PC", + "Volumic PC" + ] + ], + "OFaP2SsH": [ + [ + "LH Stinger", + "ASA", + "LHS ASA" ] ], "OFaQMgRH": [ @@ -15773,6 +12582,20 @@ "Bambu PLA Tough" ] ], + "OFaRjiIm": [ + [ + "SeeMeCNC", + "PETG-CF", + "SeeMeCNC PETG-CF" + ] + ], + "OFaU2JxD": [ + [ + "Generic", + "PLA", + "Dremel Generic PLA" + ] + ], "OFaYz8iE": [ [ "Elas", @@ -15780,6 +12603,34 @@ "Elas PLA Pro" ] ], + "OFaeIx7W": [ + [ + "iQ Materials", + "PETG Polymax", + "Polymaker PETG Polymax black P1" + ] + ], + "OFafO6VM": [ + [ + "Generic", + "PC-CF", + "Generic PC-CF" + ] + ], + "OFafocjw": [ + [ + "Cubicon", + "ABS", + "Cubicon ABS" + ] + ], + "OFahE7HP": [ + [ + "Generic", + "PC", + "Blocks Generic PC" + ] + ], "OFausr3F": [ [ "FilAr", @@ -15787,25 +12638,18 @@ "FilAr PLA-mate Rosa" ] ], - "OFaxQnfz": [ - [ - "Cubicon", - "PC", - "Cubicon PC" - ] - ], - "OFb3UzMZ": [ - [ - "InfiMech", - "PA-CF", - "InfiMech PA-CF" - ] - ], - "OFbK5wve": [ + "OFaz8VoR": [ [ "Generic", - "TPU", - "Prusa Generic TPU HF" + "HIPS", + "Flashforge HIPS" + ] + ], + "OFb5EEM3": [ + [ + "Artillery", + "PET", + "Artillery PET" ] ], "OFbP8zEO": [ @@ -15815,25 +12659,60 @@ "Eolas Prints PLA Silk" ] ], - "OFbS9rjH": [ + "OFbSChKb": [ [ - "QIDI", - "PETG", - "QIDI PETG Rapido" - ] - ], - "OFbYP6Wb": [ - [ - "Elegoo", + "SeeMeCNC", "PLA", - "Elegoo PLA Marble" + "SeeMeCNC PLA" ] ], - "OFc2SnEp": [ + "OFbSZBOi": [ [ - "Artillery", - "PVA", - "Artillery PVA" + "InfiMech", + "TPU", + "InfiMech TPU Basic" + ] + ], + "OFbeeFkl": [ + [ + "Generic", + "PLA", + "OrcaArena Generic PLA Silk" + ] + ], + "OFbenYUK": [ + [ + "Generic", + "TPU", + "Prusa Generic TPU" + ] + ], + "OFbh7HcA": [ + [ + "Eryone", + "PP-CF", + "Eryone PP-CF" + ] + ], + "OFbjtPQy": [ + [ + "Generic", + "ASA", + "FLSun T1 ASA" + ] + ], + "OFbt04e0": [ + [ + "Generic", + "TPU", + "DeltaMaker Generic TPU" + ] + ], + "OFc0xiCz": [ + [ + "InfiMech", + "TPU", + "InfiMech Generic TPU" ] ], "OFc3xdm9": [ @@ -15843,18 +12722,53 @@ "Overture PLA" ] ], - "OFcZZWnB": [ + "OFc87pL3": [ [ - "Cubicon", - "ABS", - "Cubicon ABS-A100" + "Orca Arena", + "PET-CF", + "Arena PET-CF" ] ], - "OFceJcLf": [ + "OFcBJQcC": [ [ - "Polymaker", + "Snapmaker", + "TPU", + "Snapmaker Dual TPU High-Flow" + ] + ], + "OFcCzEkS": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA" + ] + ], + "OFcJ7AKd": [ + [ + "Generic", "PLA", - "PolyLite PLA" + "Sovol SV08 PLA" + ] + ], + "OFcJDtTx": [ + [ + "Artillery", + "TPU", + "Artillery TPU" + ] + ], + "OFcKtw8W": [ + [ + "Volumic", + "PA6-CF", + "PA6 CF20 (Performance)" + ] + ], + "OFcdqaWI": [ + [ + "Generic", + "PC", + "Sovol Zero PC" ] ], "OFcfQk4h": [ @@ -15864,18 +12778,25 @@ "Overture Air PLA" ] ], - "OFcqs5g7": [ + "OFcogyWl": [ [ - "Elegoo", + "WonderMaker", "PLA", - "Elegoo PLA Translucent2" + "WonderMaker PLA Metal" ] ], - "OFcsHCy4": [ + "OFctbSkL": [ [ "Generic", + "ASA", + "Blocks Generic ASA-CF" + ] + ], + "OFctg8r1": [ + [ + "CoLiDo", "PLA", - "Sovol SV08 PLA" + "CoLiDo PLA+" ] ], "OFcvKkrs": [ @@ -15885,13 +12806,6 @@ "Overture TPU" ] ], - "OFcy60o4": [ - [ - "Generic", - "ASA", - "Flashforge ASA Basic" - ] - ], "OFcytyoA": [ [ "Polymaker", @@ -15906,6 +12820,13 @@ "Generic PE-CF" ] ], + "OFd10YeG": [ + [ + "Generic", + "PLA", + "RatRig Generic PLA" + ] + ], "OFd2vX0G": [ [ "COEX 3D", @@ -15920,6 +12841,27 @@ "AliZ PA-CF" ] ], + "OFdD5Wbu": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker J1 PLA-CF" + ] + ], + "OFdEIwxy": [ + [ + "Generic", + "PLA-CF", + "Flashforge Generic PLA-CF10" + ] + ], + "OFdHsxB4": [ + [ + "Generic", + "TPU", + "TwoTrees Generic 95A TPU" + ] + ], "OFdI4zMo": [ [ "DREMC", @@ -15927,30 +12869,32 @@ "DREMC ASA CF" ] ], - "OFdLGn0R": [ + "OFdLdGgJ": [ + [ + "Generic", + "PVA", + "OrcaArena Generic PVA" + ] + ], + "OFdOWhCa": [ + [ + "Generic", + "PC", + "RatRig Generic PC" + ] + ], + "OFdXVjGZ": [ + [ + "Tiertime", + "PC", + "Tiertime PC" + ] + ], + "OFdXgp2K": [ [ "Generic", "PLA", - "Creality Generic PLA Wood" - ] - ], - "OFdNORGt": [ - [ - "Generic", - "ASA-GF", - "Flashforge ASA-GF" - ] - ], - "OFdSGkUG": [ - [ - "Anycubic", - "PETG", - "Anycubic PETG" - ], - [ - "Generic", - "PETG", - "Anycubic PETG" + "Chuanying Generic HS PLA" ] ], "OFdb8YNz": [ @@ -15960,11 +12904,32 @@ "FilAr PLA Verde Manzana" ] ], - "OFdhVJql": [ + "OFdkWDiy": [ [ - "Generic", + "Cubicon", "PLA", - "Flashforge PLA Buint Ti" + "Cubicon PLAi21" + ] + ], + "OFdlGycb": [ + [ + "CoLiDo", + "TPU", + "CoLiDo Generic TPU" + ] + ], + "OFdrYBmI": [ + [ + "Tiertime", + "ASA", + "Tiertime ASA" + ] + ], + "OFdtPd9h": [ + [ + "QIDI", + "PETG-GF", + "QIDI PETG-GF" ] ], "OFdzlrhi": [ @@ -15974,32 +12939,130 @@ "FilAr PLA-mate Chocolate" ] ], - "OFeFRwST": [ + "OFe61n6v": [ [ - "Generic", - "PVA", - "Flashforge PVA" + "RatRig", + "PETG-CF10", + "RatRig PunkFil PETG CF" ] ], - "OFePPmng": [ + "OFe6sfXS": [ + [ + "Generic", + "PC", + "FlashForge PC" + ] + ], + "OFe7Sx5B": [ + [ + "Generic", + "PETG", + "Sovol SV06 ACE PETG" + ] + ], + "OFe8UJXH": [ + [ + "Generic", + "PC", + "Creality Generic PC" + ] + ], + "OFe8tuNb": [ + [ + "Tiertime", + "PA6-CF", + "Tiertime PA6-CF" + ] + ], + "OFe8yBMG": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough 0.6 nozzle" + ] + ], + "OFeAxvEt": [ [ "Snapmaker", "ABS", - "Snapmaker J1 ABS Benchy" + "Snapmaker Dual ABS Benchy" ] ], - "OFeWMAGH": [ + "OFeCJqxx": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido Metal" + ] + ], + "OFeDfaCh": [ + [ + "CoLiDo", + "PLA", + "CoLiDo Generic PLA" + ] + ], + "OFeIyhUx": [ + [ + "Anycubic", + "PC-CF", + "Anycubic PC-CF" + ] + ], + "OFeJjoKF": [ + [ + "Generic", + "PA", + "FLSun Generic PA" + ] + ], + "OFeK2vkS": [ [ "Generic", "PLA", - "Flashforge HS PLA Burnt Ti" + "Chuanying Generic PLA-Silk" ] ], - "OFefhSuj": [ + "OFeTATC7": [ [ - "InfiMech", + "Snapmaker", + "Breakaway Support", + "Snapmaker J1 Breakaway" + ] + ], + "OFeVzkSU": [ + [ + "Polymaker", + "ABS", + "Fiberon PPS-GF20" + ] + ], + "OFec7Qiw": [ + [ + "Generic", "PLA", - "InfiMech PLA Hyper" + "Flashforge PLA Sparkle" + ] + ], + "OFeelsSM": [ + [ + "HATCHBOX", + "PLA", + "HATCHBOX PLA" + ] + ], + "OFelDBgv": [ + [ + "Polymaker", + "PLA", + "Polymaker PLA" + ] + ], + "OFepU7Tl": [ + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Matte" ] ], "OFesA6rF": [ @@ -16009,6 +13072,13 @@ "Generic PLA Silk" ] ], + "OFetENFF": [ + [ + "Generic", + "ABS", + "OrcaArena Generic ABS" + ] + ], "OFexaZU2": [ [ "FilAr", @@ -16016,30 +13086,11 @@ "FilAr PLA Manteca" ] ], - "OFeybQvK": [ + "OFf0MkD5": [ [ "QIDI", - "ABS", - "QIDI ABS Rapido 0.2 nozzle" - ] - ], - "OFf0JIqs": [ - [ - "Eryone", - "PP", - "Eryone PP" - ] - ], - "OFf2b9wu": [ - [ - "Anycubic", - "ABS", - "Anycubic ABS" - ], - [ - "Generic", - "ABS", - "Anycubic ABS" + "PETG", + "QIDI PETG Translucent" ] ], "OFf5awy4": [ @@ -16049,6 +13100,13 @@ "Eolas Prints PLA Matte" ] ], + "OFf6ZEvu": [ + [ + "InfiMech", + "PC", + "InfiMech PC" + ] + ], "OFf6mfQO": [ [ "Bambu Lab", @@ -16056,6 +13114,13 @@ "Bambu Support for ABS" ] ], + "OFf6ynfH": [ + [ + "FlyingBear", + "PETG Basic", + "FlyingBear PETG Basic" + ] + ], "OFfBpSRI": [ [ "Bambu Lab", @@ -16063,6 +13128,13 @@ "Bambu ASA" ] ], + "OFfHGM1D": [ + [ + "re3D", + "PP", + "re3D rPP" + ] + ], "OFfJSCzm": [ [ "FDplast", @@ -16070,11 +13142,18 @@ "FDplast PETG" ] ], - "OFfJoIgg": [ + "OFfSqS4R": [ [ - "QIDI", - "PAHT-GF", - "QIDI PAHT-GF" + "Creality", + "PLA", + "ENDER FAST PLA" + ] + ], + "OFfZ0lTS": [ + [ + "Generic", + "PETG-CF", + "Qidi Generic PETG-CF" ] ], "OFfZcoKr": [ @@ -16084,25 +13163,25 @@ "FilAr PLA-mate Piel" ] ], - "OFfdxQok": [ + "OFfb10SK": [ [ - "Generic", - "PLA", - "Generic PLA+" + "Artillery", + "PC", + "Artillery PC" ] ], - "OFfiN1Lw": [ + "OFfegVpA": [ [ - "Generic", - "PLA", - "Chuanying Generic HS PLA" + "Polymaker", + "PA", + "Polymaker Generic S1" ] ], - "OFfkPhrJ": [ + "OFfmHUkQ": [ [ - "Generic", - "PLA", - "Creality HF Generic Speed PLA" + "Snapmaker", + "Breakaway Support", + "Snapmaker Dual Breakaway" ] ], "OFfmZrI3": [ @@ -16119,13 +13198,6 @@ "COEX TPE 40D" ] ], - "OFfoA8kJ": [ - [ - "CoLiDo", - "PLA", - "CoLiDo PLA" - ] - ], "OFfq5YXA": [ [ "Valment", @@ -16140,11 +13212,11 @@ "COEX TPE 60D" ] ], - "OFftQOek": [ + "OFfr6JDF": [ [ - "Generic", - "PLA", - "Flashforge PLA Matte" + "QIDI", + "PETG", + "QIDI PETG Tough 0.8 nozzle" ] ], "OFfuhviw": [ @@ -16154,11 +13226,32 @@ "Elegoo PLA Marble" ] ], - "OFg4N6ZL": [ + "OFfuih8e": [ [ - "FlyingBear", + "Creality", + "PLA", + "Creality Silk PLA" + ] + ], + "OFfxFQf9": [ + [ + "Generic", "PETG", - "FlyingBear PETG" + "Chuanying Generic PETG" + ] + ], + "OFfznI0Q": [ + [ + "Generic", + "PA-CF", + "Prusa Generic PA-CF" + ] + ], + "OFg3cWVt": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Metal" ] ], "OFg57Nmc": [ @@ -16182,30 +13275,11 @@ "Generic PA" ] ], - "OFgJX0Fc": [ + "OFgHh8ly": [ [ - "Generic", - "PPS", - "FlashForge PPS" - ] - ], - "OFgK2Xvv": [ - [ - "Anycubic", + "Afinia", "PLA", - "Anycubic PLA" - ], - [ - "Generic", - "PLA", - "Anycubic PLA" - ] - ], - "OFgMGSpF": [ - [ - "Generic", - "PETG", - "Sovol SV06 Plus ACE PETG" + "Afinia Value PLA" ] ], "OFgMWJ8T": [ @@ -16215,23 +13289,46 @@ "FilAr PLA Negro Azabache" ] ], - "OFgNzLVh": [ + "OFgSEwOZ": [ [ "Generic", - "ABS", - "Sovol Zero ABS" + "PETG", + "OrcaArena Generic PETG" ] ], - "OFgSK1hL": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA High Speed" - ], + "OFgSPtDn": [ [ "Generic", - "PLA", - "Anycubic PLA High Speed" + "PEEK", + "MM Generic PEEK" + ] + ], + "OFgSbX7E": [ + [ + "Volumic", + "PC", + "Volumic PC (Performance)" + ] + ], + "OFgVJhVt": [ + [ + "Generic", + "PLA-CF", + "Tiertime Generic PLA-CF" + ] + ], + "OFgVQkqW": [ + [ + "Cubicon", + "ABS", + "Cubicon ABSk" + ] + ], + "OFgXgt98": [ + [ + "Artillery", + "ABS", + "Artillery ABS" ] ], "OFgbpcy9": [ @@ -16241,11 +13338,32 @@ "Generic TPU" ] ], - "OFglpvEE": [ + "OFgcryz4": [ [ "Generic", - "TPU", - "Sovol SV06 ACE TPU" + "ASA", + "RatRig BigNozzle ASA" + ] + ], + "OFgeM7nD": [ + [ + "Flashforge", + "PA-CF", + "Flashforge PA12-CF" + ] + ], + "OFgf4gZa": [ + [ + "Generic", + "PA", + "Flashforge PA" + ] + ], + "OFglhKLM": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido 0.8 nozzle" ] ], "OFgpLTMR": [ @@ -16255,30 +13373,46 @@ "FilAr PETG Gris Plata" ] ], - "OFgrGfPy": [ + "OFgpQwkk": [ [ - "Anycubic", + "Creality", "PLA", - "Anycubic PLA+" - ], + "CR-PLA Fluo" + ] + ], + "OFgptDSf": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Matte" + ] + ], + "OFgvOmM2": [ [ "Generic", - "PLA", - "Anycubic PLA+" + "PETG", + "Anker Generic PETG" ] ], - "OFgtZjeX": [ + "OFgyPlwU": [ [ "Snapmaker", - "ABS", - "Snapmaker ABS Benchy" + "TPU", + "Snapmaker TPU High-Flow" ] ], - "OFh5GUhZ": [ + "OFh7mvPO": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Wood" + "Prusa Polymers", + "PVB", + "Prusament PVB" + ] + ], + "OFh9u9c0": [ + [ + "Generic", + "PA-GF", + "Generic PA6-GF" ] ], "OFhASRWj": [ @@ -16288,13 +13422,6 @@ "Panchroma PLA Temp Shift" ] ], - "OFhKNHC8": [ - [ - "Generic", - "PETG", - "Generic PETG PRO" - ] - ], "OFhMO9Kh": [ [ "GreenGate3D", @@ -16302,6 +13429,20 @@ "GreenGate3D PETG" ] ], + "OFhO5aEJ": [ + [ + "RatRig", + "ABS", + "RatRig PunkFil ABS" + ] + ], + "OFhQf8ou": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker PLA-CF" + ] + ], "OFhQfUQY": [ [ "Generic", @@ -16309,6 +13450,20 @@ "Generic SBS" ] ], + "OFhTPf6L": [ + [ + "Generic", + "PA6-CF", + "Generic PA6-CF" + ] + ], + "OFhUjPA5": [ + [ + "Eryone", + "TPU", + "Eryone TPU" + ] + ], "OFhWc5Bv": [ [ "NIT", @@ -16323,6 +13478,20 @@ "Eolas Prints PETG" ] ], + "OFhWrAuP": [ + [ + "QIDI", + "PLA-CF", + "QIDI PLA-CF" + ] + ], + "OFhbolij": [ + [ + "eSUN", + "PLA", + "eSUN PLA-Lite" + ] + ], "OFhcYzR8": [ [ "Elegoo", @@ -16330,6 +13499,13 @@ "Elegoo PLA Sparkle" ] ], + "OFhcrFw9": [ + [ + "Generic", + "TPU", + "Creality Generic TPU" + ] + ], "OFhfd722": [ [ "Eolas Prints", @@ -16337,6 +13513,20 @@ "Eolas Prints TPU Flex 93A" ] ], + "OFhiJE7Y": [ + [ + "QIDI", + "PEBA", + "QIDI PEBA 95A" + ] + ], + "OFhkN0a7": [ + [ + "Creality", + "PA-CF", + "Hyper PA612-CF" + ] + ], "OFhlCNqq": [ [ "COEX 3D", @@ -16351,18 +13541,53 @@ "Bambu ABS" ] ], - "OFhzHd2Y": [ + "OFhwiZ50": [ [ - "Generic", - "HIPS", - "Flashforge HIPS" + "QIDI", + "PLA", + "QIDI PLA Rapido 0.2 nozzle" ] ], - "OFi1ocNv": [ + "OFhx4uOG": [ + [ + "QIDI", + "PET-GF", + "QIDI PET-GF" + ] + ], + "OFi5RSve": [ + [ + "eSUN", + "PLA", + "eSUN PLA-LW" + ] + ], + "OFi6PfUM": [ [ "Generic", + "PLA", + "Generic PLA-Silk" + ] + ], + "OFi7Bf0F": [ + [ + "Generic", + "ABS-CF", + "Flashforge ABS-CF" + ] + ], + "OFi90KlM": [ + [ + "Volumic", "PA", - "Flashforge PA" + "Volumic NYLON Ultra (Performance)" + ] + ], + "OFiCHnso": [ + [ + "Generic", + "PLA", + "Prusa Generic PLA" ] ], "OFiDpM1B": [ @@ -16372,11 +13597,18 @@ "FilAr PLA-mate Bordo" ] ], - "OFiJYDPC": [ + "OFiEz2XI": [ [ - "HATCHBOX", - "PLA", - "HATCHBOX PLA" + "Cubicon", + "PA", + "Cubicon PA-CF" + ] + ], + "OFiUSDih": [ + [ + "Generic", + "PA", + "Blocks Generic PA" ] ], "OFiWaoqD": [ @@ -16386,32 +13618,67 @@ "DREMC PPA-CF" ] ], - "OFic2uNr": [ + "OFifxPW1": [ [ "Generic", "PLA", - "Sovol SV06 ACE PLA" + "DeltaMaker Generic PLA" ] ], - "OFicxmSa": [ + "OFilAA3b": [ + [ + "Eryone", + "PLA-CF", + "Eryone PLA-CF" + ] + ], + "OFilD4bP": [ + [ + "FlyingBear", + "PLA", + "FlyingBear PLA" + ] + ], + "OFilnglt": [ + [ + "Artillery", + "PETG", + "Artillery PETG" + ] + ], + "OFin64Qg": [ [ "Generic", "PLA", - "Prusa Generic PLA HF" + "Generic Support for PLA" ] ], - "OFidJLn8": [ + "OFiorRtJ": [ + [ + "Generic", + "PVA", + "Blocks Generic PVA" + ] + ], + "OFitS8al": [ [ "Polymaker", - "ABS", - "PolyLite ABS" + "PLA", + "PolyLite PLA Neon" ] ], - "OFiyGNbI": [ + "OFiuJSmy": [ [ - "Elegoo", - "PETG", - "Elegoo PETG-CF" + "Generic", + "PLA", + "RatRig BigNozzle PLA" + ] + ], + "OFiwEbze": [ + [ + "Volumic", + "PETG-ESD", + "PETG ESD (Performance)" ] ], "OFj3bTjw": [ @@ -16421,11 +13688,32 @@ "FilAr PLA-mate Amarillo" ] ], - "OFjFPhUC": [ + "OFj64R5U": [ [ - "Generic", - "PLA", - "Prusament rPLA" + "Peopoly", + "ABS", + "Peopoly Lancer ABS-GF" + ] + ], + "OFjD3YTW": [ + [ + "QIDI", + "PC-ABS-FR", + "Qidi PC-ABS-FR" + ] + ], + "OFjHrAX0": [ + [ + "WonderMaker", + "ABS", + "WonderMaker ABS" + ] + ], + "OFjLAYgO": [ + [ + "Anycubic", + "PEBA", + "Anycubic PEBA" ] ], "OFjPXrXO": [ @@ -16442,11 +13730,25 @@ "FilAr PLA Tabaco" ] ], - "OFjZw7k1": [ + "OFjUGUIK": [ [ - "Polymaker", + "iQ Materials", + "PACF Pro", + "Fiberthree PACF Pro P1" + ] + ], + "OFjVOWfJ": [ + [ + "Anycubic", "PLA", - "PolyTerra J1 PLA" + "Anycubic PLA High Speed" + ] + ], + "OFjXrKFO": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Impact" ] ], "OFjb0wos": [ @@ -16456,42 +13758,32 @@ "Panchroma PLA Metallic" ] ], - "OFjdTQd6": [ + "OFjcwUEm": [ [ - "Anycubic", + "Cubicon", "PLA", - "Anycubic PLA Silk" - ], - [ - "Generic", - "PLA", - "Anycubic PLA Silk" + "Cubicon PLA" ] ], - "OFjepy6j": [ + "OFjkdnyN": [ [ - "FusRock", - "S-PAHT", - "FusRock Generic S-PAHT" - ], - [ - "Generic", - "PA-CF", - "FusRock Generic S-PAHT" + "Snapmaker", + "TPU", + "Snapmaker Dual TPU" ] ], - "OFjj9Yiz": [ - [ - "Generic", - "PETG", - "RatRig BigNozzle PETG" - ] - ], - "OFjohFkg": [ + "OFjoAe0R": [ [ "QIDI", - "PETG", - "QIDI PETG Translucent" + "PLA-CF", + "Qidi PLA-CF" + ] + ], + "OFjoIVZ6": [ + [ + "FlyingBear", + "PA-CF", + "FlyingBear Generic PA-CF" ] ], "OFjorDcx": [ @@ -16501,13 +13793,6 @@ "FDplast ABS" ] ], - "OFjqPjjl": [ - [ - "Generic", - "PET", - "Generic PET" - ] - ], "OFjt9en1": [ [ "Generic", @@ -16515,25 +13800,11 @@ "Generic CoPE" ] ], - "OFjurQ3I": [ + "OFjz0a3m": [ [ - "Generic", - "PETG", - "Sovol Zero PETG" - ] - ], - "OFk388hR": [ - [ - "Generic", - "PA6-CF", - "Generic PA6-CF" - ] - ], - "OFk6T5YH": [ - [ - "Generic", - "PETG", - "Sovol Zero PETG HS Nozzle" + "Prusa Polymers", + "PC-CF", + "Prusament PC-CF" ] ], "OFk8t9mz": [ @@ -16543,6 +13814,20 @@ "Fiberon PETG-rCF" ] ], + "OFkAltI8": [ + [ + "Other", + "PA-CF", + "Other PA-CF" + ] + ], + "OFkGp50Y": [ + [ + "Volumic", + "UNIV", + "Volumic UNIVERSAL Ultra (Performance)" + ] + ], "OFkGvN4d": [ [ "FilAr", @@ -16557,25 +13842,32 @@ "Fiberon PA6-CF" ] ], - "OFkaDtKx": [ + "OFkR8E2c": [ [ - "FusRock", - "PA-CF", - "Flashforge PA66-CF" + "Prusa Polymers", + "PETG", + "Prusament PETG" ] ], - "OFkeeluv": [ + "OFkUaDnU": [ [ "Generic", - "ASA", - "Prusa Generic ASA HF" + "PE-CF", + "Tiertime Generic PE-CF" ] ], - "OFkfK62J": [ + "OFkWaWRo": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Silk" + "Generic", + "TPU", + "Sovol SV06 Plus ACE TPU" + ] + ], + "OFkYkQGO": [ + [ + "Generic", + "PP-GF", + "Tiertime Generic PP-GF" ] ], "OFkhhUS0": [ @@ -16585,11 +13877,11 @@ "Elegoo Rapid PLA+" ] ], - "OFklg4aM": [ + "OFklJcWK": [ [ - "Elegoo", + "Other", "PLA", - "Elegoo PLA PRO" + "Other PLA Hyper" ] ], "OFknl9Iz": [ @@ -16606,11 +13898,32 @@ "FilAr PLA Verde Oliva" ] ], - "OFkoT6jl": [ + "OFkq7rPy": [ + [ + "Eryone", + "PA-GF", + "Eryone PA-GF" + ] + ], + "OFks6esg": [ + [ + "Creality", + "PLA", + "EN-PLA+" + ] + ], + "OFkwIWwc": [ [ "Generic", "PLA", - "Prusament PLA" + "Flashforge PLA Color Change" + ] + ], + "OFkx5MEe": [ + [ + "Artillery", + "PVA", + "Artillery PVA" ] ], "OFkzr35f": [ @@ -16620,18 +13933,60 @@ "Eolas Prints PLA Antibacterial" ] ], - "OFlN56xW": [ + "OFl2SXmv": [ [ "Generic", - "PLA", - "Chuanying Generic PLA-Silk" + "FLEX", + "Prusa Generic FLEX" ] ], - "OFlNKZLP": [ + "OFl4ItvQ": [ [ "Generic", "PLA", - "Flashforge PLA Metal" + "Prusa Generic PLA HF" + ] + ], + "OFl7nOAf": [ + [ + "Generic", + "PETG", + "Sovol SV06 Plus ACE PETG" + ] + ], + "OFlBoEfL": [ + [ + "Snapmaker", + "TPU", + "Snapmaker J1 TPU High-Flow" + ] + ], + "OFlIsW6f": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Matte" + ] + ], + "OFlLmUeV": [ + [ + "Generic", + "PLA", + "Ginger Generic PLA" + ] + ], + "OFlN6DL1": [ + [ + "QIDI", + "UltraPA", + "QIDI PA-Ultra" + ] + ], + "OFlNWVr5": [ + [ + "Generic", + "PETG-CF", + "Flashforge Generic PETG-CF10" ] ], "OFlP3KWq": [ @@ -16648,11 +14003,18 @@ "Eolas Prints ASA" ] ], - "OFlbn4FY": [ + "OFlXJxX1": [ [ - "Snapmaker", - "PLA", - "Snapmaker PLA Matte" + "Generic", + "PETG", + "Chuanying PETG" + ] + ], + "OFllmFhT": [ + [ + "Generic", + "PETG", + "Generic PETG PRO" ] ], "OFln72PT": [ @@ -16669,6 +14031,13 @@ "Elegoo PC-FR" ] ], + "OFlufQpZ": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA" + ] + ], "OFlwmqrC": [ [ "Polymaker", @@ -16676,18 +14045,11 @@ "Polymaker HT-PLA-GF" ] ], - "OFlxnxDx": [ + "OFlx52rn": [ [ "Generic", - "SBS", - "Tiertime Generic SBS" - ] - ], - "OFlzQ0IS": [ - [ - "Peopoly", - "PET-CF", - "Peopoly Lancer PET-CF" + "PLA-CF", + "RatRig Generic PLA-CF" ] ], "OFm06H6V": [ @@ -16697,18 +14059,25 @@ "Elegoo PLA Basic" ] ], - "OFm1VZed": [ + "OFm4ysMO": [ [ - "Generic", - "PLA-CF", - "Flashforge Generic PLA-CF" + "FlyingBear", + "ABS", + "FlyingBear ABS" ] ], - "OFmF1xL9": [ + "OFm70lLt": [ [ - "QIDI", - "ASA-CF", - "QIDI ASA-CF" + "CoLiDo", + "PLA", + "CoLiDo PLA" + ] + ], + "OFmFwUWM": [ + [ + "Prusa Polymers", + "ASA", + "Prusament ASA" ] ], "OFmJAd3A": [ @@ -16718,18 +14087,18 @@ "FDplast HIPS" ] ], - "OFmKNi3f": [ + "OFmKU2Ha": [ [ - "QIDI", + "Eryone", "PLA", - "QIDI PLA Rapido" + "Eryone PLA" ] ], - "OFmOWC74": [ + "OFmQkb3c": [ [ - "Elegoo", - "PETG", - "Elegoo PETG PRO" + "Generic", + "PLA", + "Flashforge HS PLA Burnt Ti" ] ], "OFmY0l6t": [ @@ -16739,6 +14108,20 @@ "Generic PLA Matte" ] ], + "OFma52eS": [ + [ + "Generic", + "ABS", + "Blocks Generic ABS" + ] + ], + "OFma5TXH": [ + [ + "QIDI", + "ABS", + "QIDI ABS Odorless" + ] + ], "OFmaeU4a": [ [ "FilAr", @@ -16746,25 +14129,18 @@ "FilAr PLA-mate Naranja" ] ], - "OFmcJsqt": [ - [ - "InfiMech", - "TPU", - "InfiMech TPU" - ] - ], - "OFmduKVr": [ + "OFmexHIS": [ [ "Generic", - "PPS-CF", - "FlashForge PPS-CF" + "PETG", + "RatRig BigNozzle PETG" ] ], - "OFmgesco": [ + "OFmfizbq": [ [ - "Generic", - "TPU", - "Flashforge TPU 65D" + "Orca Arena", + "PLA", + "Arena PLA Silk" ] ], "OFmhJs5V": [ @@ -16774,6 +14150,20 @@ "Elegoo TPU" ] ], + "OFmhWhEf": [ + [ + "Generic", + "PLA", + "Creality HF Generic PLA" + ] + ], + "OFmjN2bc": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA" + ] + ], "OFmn9NZL": [ [ "FusRock", @@ -16781,6 +14171,13 @@ "FusRock ABS-GF" ] ], + "OFmnJNqY": [ + [ + "Generic", + "PA", + "OrcaArena Generic PA" + ] + ], "OFmpMwxS": [ [ "Generic", @@ -16795,6 +14192,13 @@ "Elegoo PETG-GF" ] ], + "OFmzftED": [ + [ + "Generic", + "ASA", + "OrcaArena Generic ASA" + ] + ], "OFn1QaY3": [ [ "Elegoo", @@ -16802,32 +14206,60 @@ "Elegoo PLA Translucent2" ] ], - "OFnLnZQo": [ + "OFn2GlhY": [ [ - "Cubicon", - "PC", - "Cubicon PC" - ] - ], - "OFnMW5jr": [ - [ - "FlyingBear", - "ABS", - "FlyingBear ABS" - ] - ], - "OFnRTkEq": [ - [ - "RatRig", - "PETG", - "RatRig PunkFil PETG" - ] - ], - "OFnY9ovF": [ - [ - "Artillery", + "Creality", "PA-CF", - "Artillery PA-CF" + "Hyper PA6-CF" + ] + ], + "OFn6WpN7": [ + [ + "QIDI", + "PA12-CF", + "QIDI PA12-CF" + ] + ], + "OFnHc3D6": [ + [ + "eSUN", + "PLA-CF", + "eSUN PLA-CF" + ] + ], + "OFnMv3W5": [ + [ + "Generic", + "PLA", + "Flashforge HS PLA" + ] + ], + "OFnO4wnf": [ + [ + "Prusa Polymers", + "PLA", + "Prusament PLA" + ] + ], + "OFnSeLHk": [ + [ + "CoLiDo", + "PLA", + "CoLiDo PLA Silk" + ] + ], + "OFnXrkhA": [ + [ + "InfiMech", + "PA-CF", + "InfiMech PA-CF" + ] + ], + "OFnXwW8l": [ + [ + "Polymaker", + "PLA", + "PolyLite PLA Pro Metallic" ] ], "OFnYVFk2": [ @@ -16837,6 +14269,27 @@ "FilAr PLA Azul Francia" ] ], + "OFncpm7O": [ + [ + "WonderMaker", + "PLA", + "WonderMaker PLA Silk" + ] + ], + "OFndmfJ1": [ + [ + "Generic", + "PLA", + "Anker Generic PLA" + ] + ], + "OFneOFWe": [ + [ + "CoLiDo", + "ABS", + "CoLiDo ABS" + ] + ], "OFnejEt4": [ [ "FilAr", @@ -16844,6 +14297,27 @@ "FilAr PETG Cian" ] ], + "OFnfBvn5": [ + [ + "Generic", + "PLA", + "Artillery Generic PLA" + ] + ], + "OFngcE81": [ + [ + "LH Stinger", + "TPU", + "LHS TPU Foamy 78A" + ] + ], + "OFnh79eM": [ + [ + "Generic", + "ABS", + "SecKit Generic ABS" + ] + ], "OFniMuTN": [ [ "Bambu Lab", @@ -16851,25 +14325,18 @@ "Bambu PA6-CF" ] ], - "OFnj7bPm": [ + "OFnmp6rt": [ [ - "QIDI", - "ABS", - "QIDI ABS Rapido 0.6 nozzle" - ] - ], - "OFnsWQTp": [ - [ - "QIDI", + "Anycubic", "PLA", - "QIDI WOOD Rapido" + "Anycubic PLA+" ] ], - "OFnyirh9": [ + "OFo15hcT": [ [ - "Artillery", - "PLA Silk", - "Artillery PLA Silk" + "QIDI", + "PAHT-GF", + "QIDI PAHT-GF" ] ], "OFo2UF2C": [ @@ -16879,32 +14346,32 @@ "Generic BVOH" ] ], - "OFo4VB3w": [ + "OFo6n2pB": [ [ - "Generic", - "ABS-CF", - "Generic ABS-CF" + "Anycubic", + "PETG", + "Anycubic PETG" ] ], - "OFo9EwvK": [ + "OFoBTKmn": [ [ - "Generic", - "PETG-CF", - "Generic PETG-CF10" + "Cubicon", + "PETG", + "Cubicon PETG" ] ], - "OFoAaHcF": [ - [ - "FusRock", - "PAHT-GF", - "FusRock Generic PAHT-GF" - ] - ], - "OFoJUGj6": [ + "OFoDgVnY": [ [ "Generic", "PLA", - "Flashforge HS PLA" + "FLSun S1 PLA Generic" + ] + ], + "OFoJcr46": [ + [ + "Generic", + "ASA", + "Prusa Generic ASA" ] ], "OFoSknDB": [ @@ -16914,6 +14381,20 @@ "FILL3D PLA Turbo" ] ], + "OFoT8F7Y": [ + [ + "Generic", + "PVA", + "Prusa Generic PVA HF" + ] + ], + "OFoVZg32": [ + [ + "Generic", + "TPU", + "SecKit Generic TPU" + ] + ], "OFoYSJKi": [ [ "Generic", @@ -16935,6 +14416,20 @@ "AliZ PETG" ] ], + "OFodPDxO": [ + [ + "Generic", + "PLA", + "Tiertime Generic PLA High Speed" + ] + ], + "OFogbnCb": [ + [ + "Generic", + "PPS-CF", + "FlashForge PPS-CF" + ] + ], "OFoiVqVM": [ [ "Bambu Lab", @@ -16942,11 +14437,18 @@ "Bambu PLA Basic" ] ], - "OFoimrpo": [ + "OFoqrHTw": [ [ "Generic", - "PETG-CF", - "Flashforge PETG-CF" + "PLA", + "FLSun S1 PLA High Speed" + ] + ], + "OForhBi4": [ + [ + "Cubicon", + "ABS", + "Cubicon ABSk" ] ], "OFovEIbw": [ @@ -16956,18 +14458,46 @@ "Bambu PETG HF" ] ], - "OFp8lkYD": [ + "OFp4ETDP": [ [ - "FusRock", - "PPA-GF", - "Flashforge PPA-GF" + "Creality", + "PLA", + "CR-PLA" ] ], - "OFp90N8a": [ + "OFp57RRC": [ [ - "Artillery", - "PA", - "Artillery PA" + "QIDI", + "PPS-GF", + "QIDI PPS-GF" + ] + ], + "OFp8gtPH": [ + [ + "Generic", + "PLA", + "Creality Generic PLA Silk" + ] + ], + "OFp9wdmf": [ + [ + "Eryone", + "PA-CF", + "Eryone PA-CF" + ] + ], + "OFpAaY6w": [ + [ + "Generic", + "ASA", + "Creality Generic ASA" + ] + ], + "OFpBV2Ma": [ + [ + "Generic", + "PETG", + "Tinmorry PETG-ECO" ] ], "OFpBlrvY": [ @@ -16977,11 +14507,11 @@ "Valment PLA Silk" ] ], - "OFpHq9gJ": [ + "OFpDo5Ix": [ [ - "Generic", - "PETG", - "Prusament PETG" + "Cubicon", + "ABS", + "Cubicon ABS" ] ], "OFpPGSKG": [ @@ -16991,6 +14521,20 @@ "SUNLU Silk PLA+" ] ], + "OFpPJSHE": [ + [ + "Peopoly", + "PETG", + "Peopoly Lancer PETG-C" + ] + ], + "OFpSYJLI": [ + [ + "Generic", + "PLA", + "Creality Generic PLA Matte" + ] + ], "OFpW4gdi": [ [ "SUNLU", @@ -16998,18 +14542,39 @@ "SUNLU PLA Matte" ] ], - "OFphFSUJ": [ + "OFptvi3F": [ [ "Generic", - "PETG", - "Prusa Generic PETG HF" + "PPA-GF", + "Tiertime Generic PPA-GF" ] ], - "OFq6IhFg": [ + "OFpu74Qe": [ [ - "Cubicon", + "Snapmaker", "PLA", - "Cubicon PLA" + "Snapmaker PLA Eco" + ] + ], + "OFpumhCM": [ + [ + "Volumic", + "UNIV", + "Volumic UNIVERSAL Ultra" + ] + ], + "OFq0TY7C": [ + [ + "Flashforge", + "ASA-CF", + "Flashforge ASA-CF" + ] + ], + "OFq5QANf": [ + [ + "Generic", + "PC", + "Prusa Generic PC HF" ] ], "OFq8gfS4": [ @@ -17019,6 +14584,13 @@ "FilAr PETG Negro Azabache" ] ], + "OFq9svOz": [ + [ + "Generic", + "PPS", + "Generic PPS" + ] + ], "OFqGRZyH": [ [ "Numakers", @@ -17033,32 +14605,32 @@ "eSUN PLA+" ] ], - "OFqPp2yL": [ + "OFqKmLJe": [ + [ + "Generic", + "PETG", + "Creality Generic PETG-CF" + ] + ], + "OFqOk9Ww": [ + [ + "Generic", + "ABS", + "Peopoly Generic ABS" + ] + ], + "OFqS8fzK": [ + [ + "Generic", + "PETG", + "SecKit Generic PETG" + ] + ], + "OFqcL5UF": [ [ "QIDI", - "PETG", - "QIDI PETG Tough 0.6 nozzle" - ] - ], - "OFqRWRU6": [ - [ - "Generic", - "ABS-GF", - "Flashforge ABS-GF" - ] - ], - "OFqSTJ3I": [ - [ - "Generic", - "PLA", - "OrcaArena Generic PLA Silk" - ] - ], - "OFqkcvDI": [ - [ - "Peopoly", - "ABS", - "Peopoly Lancer ABS-GF" + "PA-S", + "QIDI Support For PET/PA" ] ], "OFqtx549": [ @@ -17075,13 +14647,6 @@ "Panchroma CoPE" ] ], - "OFqyIUDi": [ - [ - "QIDI", - "PLA-CF", - "Qidi PLA-CF" - ] - ], "OFrFBEfd": [ [ "Eolas Prints", @@ -17089,6 +14654,13 @@ "Eolas Prints PLA Neon" ] ], + "OFrGJ4tR": [ + [ + "Anycubic", + "PLA", + "Anycubic PLA Slik" + ] + ], "OFrKLeE3": [ [ "Bambu Lab", @@ -17096,6 +14668,27 @@ "Bambu PLA Metal" ] ], + "OFrLiqiM": [ + [ + "InfiMech", + "PETG", + "InfiMech PETG" + ] + ], + "OFrM4hdm": [ + [ + "Creality", + "PLA-CF", + "CR-PLA Carbon" + ] + ], + "OFrO2zyn": [ + [ + "Generic", + "PLA", + "Creality Generic PLA High Speed" + ] + ], "OFrOh600": [ [ "Polymaker", @@ -17103,11 +14696,67 @@ "Panchroma PLA Matte" ] ], - "OFrbbq6E": [ + "OFrQqCwL": [ [ - "Other", + "InfiMech", "PLA", - "Other PLA Hyper" + "InfiMech Generic PLA" + ] + ], + "OFrdZ0cK": [ + [ + "eSUN", + "PETG", + "eSUN PETG+HS" + ] + ], + "OFrgGex8": [ + [ + "Generic", + "PETG", + "Blocks Generic PETG" + ] + ], + "OFrh4bBH": [ + [ + "Generic", + "ASA", + "SecKit Generic ASA" + ] + ], + "OFrjacXf": [ + [ + "Flashforge", + "PET-CF", + "Flashforge PET-CF" + ] + ], + "OFrnJJEa": [ + [ + "Generic", + "EVA", + "Tiertime Generic EVA" + ] + ], + "OFrnkURQ": [ + [ + "Generic", + "PLA", + "Flashforge PLA Metal" + ] + ], + "OFrr67nG": [ + [ + "Orca Arena", + "PC", + "Arena PC" + ] + ], + "OFrrMLDw": [ + [ + "Generic", + "PLA", + "Flashforge Generic PLA-SILK" ] ], "OFryjl35": [ @@ -17117,11 +14766,18 @@ "Elegoo ASA-CF" ] ], - "OFs1CbB1": [ + "OFs1sNLz": [ [ - "QIDI", - "PLA", - "QIDI PLA Rapido 0.8 nozzle" + "Generic", + "ABS", + "Chuanying ABS" + ] + ], + "OFs2ReMr": [ + [ + "InfiMech", + "PETG", + "InfiMech Generic PETG" ] ], "OFsB2lxm": [ @@ -17131,11 +14787,18 @@ "Elegoo PLA Matte" ] ], - "OFsCOJv7": [ + "OFsCbVbN": [ [ "Generic", - "TPU", - "Generic TPU" + "PVA", + "Anker Generic PVA" + ] + ], + "OFsD974q": [ + [ + "Volumic", + "PETG", + "Volumic PETG Ultra (Performance)" ] ], "OFsDXRpS": [ @@ -17145,6 +14808,20 @@ "FilAr PLA Piel" ] ], + "OFsF96Gt": [ + [ + "Generic", + "PLA-CF", + "FLSun Generic PLA-CF" + ] + ], + "OFsFo7ms": [ + [ + "Volumic", + "PP", + "Volumic PP Ultra" + ] + ], "OFsFon5l": [ [ "Generic", @@ -17152,6 +14829,13 @@ "Generic HIPS" ] ], + "OFsGqI4y": [ + [ + "Generic", + "PETG", + "Ginger Generic PETG" + ] + ], "OFsHSVZc": [ [ "Bambu Lab", @@ -17159,11 +14843,18 @@ "Bambu Support W" ] ], - "OFsLkLw6": [ + "OFsNJjpc": [ [ "Generic", - "PLA", - "Generic PLA Matte" + "TPU", + "RatRig BigNozzle TPU" + ] + ], + "OFsP8PKH": [ + [ + "Generic", + "ABS", + "Generic ABS HT" ] ], "OFsRDvTM": [ @@ -17173,6 +14864,13 @@ "Panchroma PLA" ] ], + "OFsXOMoX": [ + [ + "Generic", + "PLA", + "Qidi Generic PLA+" + ] + ], "OFsXQXbs": [ [ "FilAr", @@ -17180,18 +14878,11 @@ "FilAr PETG Blanco Antartida" ] ], - "OFsgANe3": [ + "OFsoQ12i": [ [ "Generic", - "PAHT-CF", - "Flashforge PAHT-CF" - ] - ], - "OFsmPFwh": [ - [ - "Generic", - "TPU", - "Sovol SV06 Plus ACE TPU" + "ABS", + "Comgrow Generic ABS" ] ], "OFsoykbm": [ @@ -17201,18 +14892,32 @@ "DREMC PA6-CF" ] ], - "OFt1YdX8": [ + "OFsxRSwr": [ [ "Generic", - "PLA", - "FLSun T1 PLA Silk" + "PVA", + "RatRig Generic PVA" ] ], - "OFt5bvKK": [ + "OFsxlLdo": [ [ - "Artillery", - "PETG Basic", - "Artillery PETG Basic" + "Generic", + "ASA", + "Qidi Generic ASA" + ] + ], + "OFt0JbR7": [ + [ + "Snapmaker", + "PLA", + "Snapmaker J1 PLA Metal" + ] + ], + "OFt3HtlG": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF" ] ], "OFt6e0US": [ @@ -17222,32 +14927,39 @@ "FilAr PETG Amarillo Lima" ] ], - "OFt9AiN5": [ + "OFt7SngH": [ [ - "Generic", - "PA", - "Polymaker CoPA" + "Snapmaker", + "ASA", + "Snapmaker J1 ASA" ] ], - "OFtEFtsz": [ + "OFtFtiS0": [ [ "Polymaker", - "PA", - "Polymaker Generic CoPA" + "PETG", + "Polymaker PETG Galaxy" ] ], - "OFtJMczs": [ + "OFtGC1ye": [ [ - "Generic", - "TPU-64D", - "Flashforge TPU-64D" + "Artillery", + "PA-CF", + "Artillery PA-CF" ] ], - "OFtL05hE": [ + "OFtKeKa9": [ [ - "Generic", + "Orca Arena", "PLA", - "Sovol Zero PLA Basic HS Nozzle" + "Arena PLA Tough" + ] + ], + "OFtOPlK6": [ + [ + "Orca Arena", + "PA-CF", + "Arena PAHT-CF" ] ], "OFtOoWIj": [ @@ -17257,6 +14969,13 @@ "FilAr PLA-mate" ] ], + "OFtP1rqJ": [ + [ + "Generic", + "PVA", + "FLSun Generic PVA" + ] + ], "OFtRn8X8": [ [ "FDplast", @@ -17264,25 +14983,18 @@ "FDplast SBS" ] ], - "OFtXBjvb": [ - [ - "Artillery", - "PLA Tough", - "Artillery PLA Tough" - ] - ], - "OFtcKVgP": [ + "OFtTHNTj": [ [ "Generic", - "PC", - "fdm_filament_pc" + "PLA", + "Flashforge Generic PLA" ] ], - "OFtcTs1o": [ + "OFtTYl9Q": [ [ "Generic", - "ABS", - "RatRig BigNozzle ABS" + "ASA", + "Flashforge ASA" ] ], "OFtefokm": [ @@ -17292,34 +15004,6 @@ "FilAr PLA-mate Blanco" ] ], - "OFtemzzw": [ - [ - "Generic", - "ABS", - "Sovol SV06 ACE ABS" - ] - ], - "OFtet8ui": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU High-Flow" - ] - ], - "OFti31HS": [ - [ - "Cubicon", - "PLA", - "Cubicon PLAi21" - ] - ], - "OFtmT4Nd": [ - [ - "Artillery", - "ASA", - "Artillery ASA" - ] - ], "OFtpXCCv": [ [ "COEX 3D", @@ -17327,6 +15011,13 @@ "COEX ASA PRIME" ] ], + "OFtplX8o": [ + [ + "Generic", + "ABS", + "RatRig BigNozzle ABS" + ] + ], "OFtr8eZw": [ [ "FDplast", @@ -17334,6 +15025,13 @@ "FDplast PLA" ] ], + "OFtsVp4v": [ + [ + "Generic", + "PA-CF", + "SecKit Generic PA-CF" + ] + ], "OFtudokz": [ [ "Eolas Prints", @@ -17341,11 +15039,25 @@ "Eolas Prints PLA Premium" ] ], - "OFtwA91m": [ + "OFtybfNX": [ [ - "Generic", + "Snapmaker", + "PLA", + "Snapmaker PLA Metal" + ] + ], + "OFu08yGN": [ + [ + "Volumic", + "PETG", + "Volumic PETG Ultra carbone" + ] + ], + "OFu0fjPJ": [ + [ + "LH Stinger", "PC", - "Sovol Zero PC" + "LHS PC CF" ] ], "OFu1evlr": [ @@ -17355,25 +15067,53 @@ "Generic PCTG" ] ], - "OFuPC4S8": [ + "OFu79SUH": [ [ - "Elegoo", + "Generic", "PLA", - "Elegoo PLA-CF" + "Qidi Generic PLA" ] ], - "OFuPN3iW": [ + "OFuFqYyG": [ [ - "Other", + "Generic", + "PAHT-CF", + "Flashforge PAHT-CF" + ] + ], + "OFuGRMNV": [ + [ + "Generic", + "PA-CF", + "Flashforge PA-CF" + ] + ], + "OFuJ49uH": [ + [ + "QIDI", "PETG", - "Other PETG" + "QIDI PETG Basic" ] ], - "OFuTFxVP": [ + "OFuO0cAP": [ [ - "Overture", - "ABS", - "Overture ABS" + "Orca Arena", + "PETG-CF", + "Arena PETG-CF" + ] + ], + "OFuSwKgm": [ + [ + "Generic", + "PLA", + "Tiertime Generic PLA" + ] + ], + "OFuUJyRx": [ + [ + "Generic", + "PLA", + "FLSun T1 PLA Silk" ] ], "OFuUuIhR": [ @@ -17383,6 +15123,13 @@ "Elegoo PETG-CF" ] ], + "OFuV79ru": [ + [ + "Flashforge", + "PA-CF", + "Flashforge PA66-CF" + ] + ], "OFuWCQXN": [ [ "COEX 3D", @@ -17390,18 +15137,11 @@ "COEX ABS PRIME" ] ], - "OFuXkYly": [ + "OFuehn62": [ [ - "Elegoo", + "Orca Arena", "PLA", - "Elegoo PLA Glow" - ] - ], - "OFuYvNS3": [ - [ - "Afinia", - "ABS", - "Afinia Value ABS" + "Arena PLA Marble" ] ], "OFufTAK9": [ @@ -17411,18 +15151,32 @@ "FilAr PLA-mate Negro" ] ], - "OFuidAEg": [ + "OFughwKn": [ [ - "Bambu Lab", - "ABS", - "Bambu ABS" + "QIDI", + "PLA", + "QIDI PLA Matte Basic" ] ], - "OFuq9tqb": [ + "OFujZSdh": [ [ - "InfiMech", - "PLA", - "InfiMech PLA Basic" + "Creality", + "PETG", + "Hyper PETG" + ] + ], + "OFulOdT2": [ + [ + "Generic", + "TPU", + "Generic TPU 85A" + ] + ], + "OFupq0tY": [ + [ + "Generic", + "PLA-CF", + "Blocks Generic PLA-CF" ] ], "OFurdQxc": [ @@ -17432,39 +15186,39 @@ "FilAr PETG Magenta" ] ], - "OFuswXlp": [ + "OFusbWjj": [ [ - "Generic", + "Creality", + "PETG-CF", + "Hyper PETG-CF" + ] + ], + "OFuxH0Uz": [ + [ + "Volumic", "TPU", - "Generic TPU 85A" + "Volumic FLEX93 Ultra" ] ], - "OFuyJhLF": [ + "OFv4VZCd": [ [ "Generic", - "PETG", - "Flashforge PETG Basic" + "ABS", + "Qidi Generic ABS" ] ], - "OFv2NHLC": [ + "OFvDbkFq": [ [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF25" + "Prusa Polymers", + "PC", + "Prusament PC Blend" ] ], - "OFv8SRZh": [ + "OFvGc67v": [ [ "Generic", - "PLA-CF", - "Prusa Generic PLA-CF" - ] - ], - "OFvGSn0l": [ - [ - "Generic", - "PETG", - "Creality Generic PETG-CF" + "ABS", + "Prusa Generic ABS" ] ], "OFvKUnLh": [ @@ -17474,18 +15228,11 @@ "Bambu TPU 95A HF" ] ], - "OFvN3117": [ + "OFvLppPU": [ [ - "QIDI", - "PLA", - "QIDI PLA Matte Basic" - ] - ], - "OFvOhSjO": [ - [ - "Other", - "TPU", - "Other TPU" + "Creality", + "PA", + "CR-Nylon" ] ], "OFvPPMxL": [ @@ -17495,6 +15242,13 @@ "FilAr PLA Verde FilAr" ] ], + "OFvPomQf": [ + [ + "Generic", + "PPS", + "Tiertime Generic PPS" + ] + ], "OFvTVZc3": [ [ "COEX 3D", @@ -17502,6 +15256,13 @@ "COEX PETG" ] ], + "OFvVxvzZ": [ + [ + "Generic", + "PLA", + "Flashforge PLA Metal" + ] + ], "OFvVy7yo": [ [ "Eolas Prints", @@ -17509,18 +15270,11 @@ "Eolas Prints TPU D60 UV Resistant" ] ], - "OFvYfHPB": [ + "OFvdZ2bx": [ [ - "Anycubic", + "QIDI", "PLA", - "Anycubic PLA Matte" - ] - ], - "OFvaXhYD": [ - [ - "InfiMech", - "PETG", - "InfiMech PETG" + "QIDI WOOD Rapido" ] ], "OFvgE0Zh": [ @@ -17530,13 +15284,6 @@ "Elegoo PLA" ] ], - "OFviQ9lH": [ - [ - "Generic", - "TPU", - "Flashforge Generic TPU" - ] - ], "OFvrXuV7": [ [ "Polymaker", @@ -17544,25 +15291,18 @@ "PolyLite ASA" ] ], - "OFvsS7Fb": [ + "OFvxIS9g": [ [ - "Generic", - "TPU-64D", - "Generic TPU-64D" + "Polymaker", + "PA-CF", + "Fiberon PA12-CF10" ] ], - "OFvw0owy": [ + "OFvyB0Bz": [ [ - "Afinia", + "Polymaker", "PLA", - "Afinia Value PLA" - ] - ], - "OFvxvkAd": [ - [ - "Artillery", - "PLA-CF", - "Artillery PLA-CF" + "PolyLite PLA Galaxy" ] ], "OFvzvwCu": [ @@ -17572,34 +15312,6 @@ "Eolas Prints PLA High Speed" ] ], - "OFw05rkF": [ - [ - "Other", - "PETG", - "Other PETG" - ] - ], - "OFw0qp7w": [ - [ - "Artillery", - "PET", - "Artillery PET" - ] - ], - "OFw1S8lL": [ - [ - "Artillery", - "ABS", - "Artillery ABS" - ] - ], - "OFwHPTvy": [ - [ - "Generic", - "PLA", - "Qidi Generic PLA+" - ] - ], "OFwJ0qu2": [ [ "DREMC", @@ -17607,6 +15319,20 @@ "DREMC PET-CF" ] ], + "OFwLBAGf": [ + [ + "HATCHBOX", + "ABS", + "HATCHBOX ABS" + ] + ], + "OFwMFLAm": [ + [ + "Generic", + "ABS", + "Artillery Generic ABS" + ] + ], "OFwPrlCM": [ [ "Bambu Lab", @@ -17621,6 +15347,13 @@ "NIT PLA" ] ], + "OFwVVKEV": [ + [ + "Other", + "TPU", + "Other TPU" + ] + ], "OFwaYjL6": [ [ "Polymaker", @@ -17628,11 +15361,18 @@ "Fiberon PA6-GF" ] ], - "OFwf0oWp": [ + "OFwhLMs4": [ [ - "Generic", + "Snapmaker", "PLA", - "Flashforge PLA Luminous" + "Snapmaker PLA SnapSpeed" + ] + ], + "OFwpkvqf": [ + [ + "Orca Arena", + "PETG-CF", + "OrcaArena Generic PETG-CF" ] ], "OFwu7IAG": [ @@ -17642,11 +15382,25 @@ "COEX PCTG PRIME" ] ], - "OFwyqcGn": [ + "OFwxpmHM": [ [ - "Elegoo", - "PLA", - "Elegoo PLA Matte" + "Polymaker", + "PA", + "Polymaker Generic CoPA" + ] + ], + "OFwyt1xt": [ + [ + "Eryone", + "ASA-CF", + "Eryone ASA-CF" + ] + ], + "OFx0ZzFV": [ + [ + "Generic", + "PLA-CF", + "OrcaArena Generic PLA-CF" ] ], "OFx8Lmsd": [ @@ -17663,11 +15417,25 @@ "Overture PLA Pro" ] ], - "OFxLeRyT": [ + "OFxDHUX8": [ + [ + "SeeMeCNC", + "PETG", + "SeeMeCNC PETG" + ] + ], + "OFxJRuVF": [ + [ + "Anycubic", + "PC-GF", + "Anycubic PC-GF" + ] + ], + "OFxMGIPt": [ [ "Generic", - "PVA", - "Prusa Generic PVA HF" + "PPS", + "Flashforge PPS" ] ], "OFxOHhZw": [ @@ -17677,6 +15445,13 @@ "Elegoo ABS" ] ], + "OFxTMg1d": [ + [ + "FlyingBear", + "PC", + "FlyingBear Generic PC" + ] + ], "OFxUwUeW": [ [ "SUNLU", @@ -17684,62 +15459,146 @@ "SUNLU PLA Marble" ] ], - "OFxVzzn4": [ + "OFxYB4Sw": [ + [ + "Snapmaker", + "PETG-CF", + "Snapmaker J1 PETG-CF" + ] + ], + "OFxe4rXr": [ + [ + "Polymaker", + "PLA", + "PolyTerra PLA Marble" + ] + ], + "OFxg7n2G": [ [ "Generic", - "PLA-CF", - "Chuanying Generic PLA-CF10" - ] - ], - "OFxfCy9m": [ - [ - "Volumic", "PETG", - "Volumic PCTG Ultra (Performance)" + "RatRig Generic PETG" ] ], - "OFxjFYxE": [ + "OFxvKuYW": [ [ - "Elegoo", - "PETG", - "Elegoo PETG HF" + "Generic", + "PHA", + "Tiertime Generic PHA" ] ], - "OFxlch4V": [ + "OFy02QHU": [ [ - "CoLiDo", + "Polymaker", "PLA", - "CoLiDo PLA Silk" + "PolyLite PLA Translucent" ] ], - "OFxodd2u": [ - [ - "DeltaMaker", - "PLA", - "DeltaMaker Brand PLA" - ] - ], - "OFxxa5yn": [ + "OFy14TRA": [ [ "Snapmaker", "ABS", - "Snapmaker Dual ABS Benchy" + "Snapmaker J1 ABS" ] ], - "OFy7oQ1g": [ + "OFy3sW6j": [ + [ + "WonderMaker", + "ASA", + "WonderMaker ASA" + ] + ], + "OFy48TOp": [ [ "Generic", - "ASA", - "Blocks Generic ASA-CF" + "TPU-95A", + "Generic TPU-95A" ] ], - "OFyD1Zo8": [ + "OFy4ajVZ": [ + [ + "Generic", + "PLA", + "Qidi Generic PLA Silk" + ] + ], + "OFy8tYJE": [ + [ + "Cubicon", + "ABS", + "Cubicon ABS-A100" + ] + ], + "OFyCToOV": [ + [ + "Generic", + "TPU", + "Sovol SV08 TPU" + ] + ], + "OFyFRojy": [ + [ + "Generic", + "ABS", + "RatRig Generic ABS" + ] + ], + "OFyFyLIp": [ + [ + "SeeMeCNC", + "TPU", + "SeeMeCNC TPU" + ] + ], + "OFyHgT60": [ + [ + "Orca Arena", + "PLA", + "Arena PLA Sparkle" + ] + ], + "OFyK5Lt9": [ + [ + "Generic", + "PETG", + "Artillery Generic PETG" + ] + ], + "OFyLWVF3": [ + [ + "Generic", + "PETG-GF", + "Generic PETG-GF" + ] + ], + "OFyPG8v2": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Eco" + ] + ], + "OFyQwdaM": [ + [ + "Volumic", + "ABS", + "Volumic ABS Ultra (Performance)" + ] + ], + "OFyRCIMh": [ [ "Other", "PC", "Other PC" ] ], + "OFyUJI3q": [ + [ + "Volumic", + "ABS", + "Volumic ABS Ultra" + ] + ], "OFybzvQN": [ [ "FilAr", @@ -17747,18 +15606,53 @@ "FilAr PETG Gris Ceniza" ] ], - "OFyoW5W2": [ + "OFyeSq8A": [ [ "Generic", - "PLA", - "Flashforge PLA Color Change" + "ABS", + "Prusa Generic ABS HF" ] ], - "OFypQeKR": [ + "OFyhjiNs": [ + [ + "Snapmaker", + "PVA", + "Snapmaker PVA" + ] + ], + "OFyj3m13": [ + [ + "Snapmaker", + "PLA", + "Snapmaker Dual PLA Silk" + ] + ], + "OFymnal9": [ [ "Generic", - "PC-CF", - "Generic PC-CF" + "PETG", + "Sovol Zero PETG HS Nozzle" + ] + ], + "OFyoBZdm": [ + [ + "LH Stinger", + "PLA", + "LHS PLA" + ] + ], + "OFyreocX": [ + [ + "Tiertime", + "PVA", + "Tiertime PVA" + ] + ], + "OFyrnlUn": [ + [ + "Snapmaker", + "TPU", + "Snapmaker J1 TPU" ] ], "OFysxCep": [ @@ -17768,20 +15662,6 @@ "FilAr PETG Coral" ] ], - "OFyt23xJ": [ - [ - "Generic", - "PLA", - "FLSun T1 PLA High Speed" - ] - ], - "OFyxAbO4": [ - [ - "Generic", - "TPU-95A", - "Flashforge TPU-95A" - ] - ], "OFyxayW4": [ [ "Aliz", @@ -17789,32 +15669,53 @@ "AliZ PLA" ] ], - "OFzFbFcl": [ - [ - "Elegoo", - "PC", - "Elegoo PC-FR" - ] - ], - "OFzQQeCi": [ + "OFyySVby": [ [ "Generic", - "HIPS", - "Chuanying Generic HIPS" + "PVA", + "SecKit Generic PVA" ] ], - "OFzb2BLs": [ + "OFz3q5Xz": [ [ "Generic", "PETG", - "RatRig Generic PCTG" + "C1 Generic PETG" ] ], - "OFziUL2X": [ + "OFzAWsca": [ + [ + "QIDI", + "TPU", + "Qidi TPU 95A-HF" + ] + ], + "OFzB4uOs": [ [ "Generic", "PLA", - "Ginger Generic PLA" + "Sovol Zero PLA Basic HS Nozzle" + ] + ], + "OFzS7zt4": [ + [ + "Anycubic", + "PA", + "Anycubic PA" + ] + ], + "OFzXURfo": [ + [ + "FlyingBear", + "PETG", + "FlyingBear Generic PETG" + ] + ], + "OFzY7N3Z": [ + [ + "Artillery", + "PLA", + "Artillery PLA" ] ], "OFzrUUxc": [ @@ -17824,6 +15725,13 @@ "DREMC ABS" ] ], + "OFztQ7rO": [ + [ + "LH Stinger", + "ASA", + "LHS ABS" + ] + ], "OFzyIxba": [ [ "Bambu Lab", @@ -17831,746 +15739,11 @@ "Bambu PVA" ] ], - "OGFC99": [ - [ - "Generic", - "PC", - "fdm_filament_pc" - ] - ], - "OGFG99": [ - [ - "Generic", - "PETG", - "fdm_filament_pet" - ] - ], - "OGFL96": [ - [ - "Generic", - "PLA", - "Generic PLA Silk" - ] - ], - "OGFN99": [ - [ - "Generic", - "PA", - "fdm_filament_pa" - ] - ], - "OGFSNL08": [ - [ - "Generic", - "PETG", - "SUNLU PETG" - ] - ], - "P1001": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Satin" - ] - ], - "P1002": [ - [ - "Polymaker", - "PLA", - "PolySonic PLA Pro" - ] - ], - "P1003": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Matte" - ] - ], - "P1004": [ - [ - "Polymaker", - "PLA", - "PolySonic PLA" - ] - ], - "P510cfa0": [ - [ - "Cubicon", - "PLA", - "Cubicon PLA" - ] - ], - "P510cfa1": [ - [ - "Cubicon", - "PLA", - "Cubicon PLA+" - ] - ], - "P510cfa2": [ - [ - "Cubicon", - "PLA", - "Cubicon PLAi21" - ] - ], - "P510cfb0": [ - [ - "Cubicon", - "ABS", - "Cubicon ABS" - ] - ], - "P510cfb1": [ - [ - "Cubicon", - "ABS", - "Cubicon ABS-A100" - ] - ], - "P510cfb2": [ - [ - "Cubicon", - "ABS", - "Cubicon ABSk" - ] - ], - "P510cfc0": [ - [ - "Cubicon", - "PETG", - "Cubicon PETG" - ] - ], - "P510cfd0": [ - [ - "Cubicon", - "PA", - "Cubicon PA-CF" - ] - ], - "P510eff9": [ - [ - "Generic", - "PETG", - "Ginger Generic PETG" - ] - ], - "Pfcf9c4c": [ - [ - "Artillery", - "PLA", - "Artillery PLA" - ] - ], - "Prusa Generic ABS @CORE One": [ + "OFzzmK2Q": [ [ "Generic", "ABS", - "Prusa Generic ABS" - ] - ], - "Prusa Generic ABS @CORE One 0.6": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Prusa Generic ABS @CORE One 0.8": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Prusa Generic ABS @CORE One HF 0.4": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Prusa Generic ABS @CORE One HF 0.5": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Prusa Generic ABS @CORE One HF 0.6": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Prusa Generic ABS @CORE One HF 0.8": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], - "Prusa Generic ASA @CORE One": [ - [ - "Prusa Polymers", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusa Generic ASA @CORE One 0.6": [ - [ - "Prusa Polymers", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusa Generic ASA @CORE One 0.8": [ - [ - "Prusa Polymers", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusa Generic ASA @CORE One HF 0.4": [ - [ - "Prusa Polymers", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusa Generic ASA @CORE One HF 0.5": [ - [ - "Prusa Polymers", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusa Generic ASA @CORE One HF 0.6": [ - [ - "Prusa Polymers", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusa Generic ASA @CORE One HF 0.8": [ - [ - "Prusa Polymers", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusa Generic PETG @CORE One": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Prusa Generic PETG @CORE One 0.6": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Prusa Generic PETG @CORE One 0.8": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Prusa Generic PETG @CORE One HF 0.4": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Prusa Generic PETG @CORE One HF 0.5": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Prusa Generic PETG @CORE One HF 0.6": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Prusa Generic PETG @CORE One HF 0.8": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], - "Prusa Generic PLA @CORE One": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Prusa Generic PLA @CORE One 0.6": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Prusa Generic PLA @CORE One 0.8": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Prusa Generic PLA @CORE One HF 0.4": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Prusa Generic PLA @CORE One HF 0.5": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Prusa Generic PLA @CORE One HF 0.6": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Prusa Generic PLA @CORE One HF 0.8": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], - "Prusa Generic PLA Silk @CORE One": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA Silk" - ] - ], - "Prusa Generic PLA Silk @CORE One 0.6": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA Silk" - ] - ], - "Prusa Generic PLA Silk @CORE One 0.8": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA Silk" - ] - ], - "Prusa Generic TPU @CORE One": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU" - ] - ], - "Prusa Generic TPU @CORE One 0.6": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU" - ] - ], - "Prusa Generic TPU @CORE One 0.8": [ - [ - "Generic", - "FLEX", - "Prusa Generic TPU" - ] - ], - "Prusament ASA @CORE One": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "Prusament ASA @CORE One 0.6": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "Prusament ASA @CORE One 0.8": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "Prusament ASA @CORE One HF 0.4": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "Prusament ASA @CORE One HF 0.5": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "Prusament ASA @CORE One HF 0.6": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "Prusament ASA @CORE One HF 0.8": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "Prusament ASA @MK4S": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusament ASA @MK4S 0.6": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusament ASA @MK4S 0.8": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusament ASA @MK4S HF0.4": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusament ASA @MK4S HF0.5": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusament ASA @MK4S HF0.6": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusament ASA @MK4S HF0.8": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], - "Prusament PA-CF @CORE One": [ - [ - "Prusa Polymers", - "PA", - "Prusament PA-CF" - ] - ], - "Prusament PA-CF @CORE One 0.6": [ - [ - "Prusa Polymers", - "PA", - "Prusament PA-CF" - ] - ], - "Prusament PA-CF @CORE One 0.8": [ - [ - "Prusa Polymers", - "PA", - "Prusament PA-CF" - ] - ], - "Prusament PC Blend @CORE One": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "Prusament PC Blend @CORE One 0.6": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "Prusament PC Blend @CORE One 0.8": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "Prusament PC Blend @CORE One HF 0.4": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "Prusament PC Blend @CORE One HF 0.5": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "Prusament PC Blend @CORE One HF 0.6": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "Prusament PC Blend @CORE One HF 0.8": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "Prusament PC-CF @CORE One": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC-CF" - ] - ], - "Prusament PC-CF @CORE One 0.6": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC-CF" - ] - ], - "Prusament PC-CF @CORE One 0.8": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC-CF" - ] - ], - "Prusament PETG @CORE One": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "Prusament PETG @CORE One 0.6": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "Prusament PETG @CORE One 0.8": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "Prusament PETG @CORE One HF 0.4": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "Prusament PETG @CORE One HF 0.5": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "Prusament PETG @CORE One HF 0.6": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "Prusament PETG @CORE One HF 0.8": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "Prusament PLA @CORE One": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "Prusament PLA @CORE One 0.6": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "Prusament PLA @CORE One 0.8": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "Prusament PLA @CORE One HF 0.4": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "Prusament PLA @CORE One HF 0.5": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "Prusament PLA @CORE One HF 0.6": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "Prusament PLA @CORE One HF 0.8": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "Prusament PVB @CORE One": [ - [ - "Prusa Polymers", - "PVB", - "Prusament PVB" - ] - ], - "Prusament PVB @CORE One 0.6": [ - [ - "Prusa Polymers", - "PVB", - "Prusament PVB" - ] - ], - "Prusament PVB @CORE One 0.8": [ - [ - "Prusa Polymers", - "PVB", - "Prusament PVB" - ] - ], - "Prusament rPLA @CORE One": [ - [ - "Prusa Polymers", - "PLA", - "Prusament rPLA" - ] - ], - "Prusament rPLA @CORE One 0.6": [ - [ - "Prusa Polymers", - "PLA", - "Prusament rPLA" - ] - ], - "Prusament rPLA @CORE One 0.8": [ - [ - "Prusa Polymers", - "PLA", - "Prusament rPLA" - ] - ], - "SMCFB001": [ - [ - "SeeMeCNC", - "ABS", - "SeeMeCNC ABS" - ] - ], - "SMCFG001": [ - [ - "SeeMeCNC", - "PETG", - "SeeMeCNC PETG" - ] - ], - "SMCFG002": [ - [ - "SeeMeCNC", - "PETG-CF", - "SeeMeCNC PETG-CF" - ] - ], - "SMCFL001": [ - [ - "SeeMeCNC", - "PLA", - "SeeMeCNC PLA" - ] - ], - "SMCFN001": [ - [ - "SeeMeCNC", - "PA-CF", - "SeeMeCNC PA-CF" - ] - ], - "SMCFU001": [ - [ - "SeeMeCNC", - "TPU", - "SeeMeCNC TPU" + "FLSun S1 ABS" ] ] } diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index d60377f51e..cfba38866c 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -153,6 +153,12 @@ class SyntheticTree: rc = afi.add_hints(pairs, self.profiles, self.retired) return rc, buf.getvalue() + def retire(self, pairs): + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + rc = afi.retire_ids(pairs, self.profiles, self.retired) + return rc, buf.getvalue() + def make_clean_tree(): """Baseline tree: OFL base+generic, a vendor family, a clean tuned generic.""" @@ -1049,6 +1055,65 @@ class TestAddHint(SyntheticTreeCase): self.assertIn('expects "OLD=NEW"', out) +class TestRetire(SyntheticTreeCase): + def test_retires_vanished_id_with_successor(self): + rc, out = self.t.retire(["OFOLD001=AX01"]) + self.assertEqual(rc, 0, out) + self.assertEqual(load_json_file(self.t.retired)["retired"]["OFOLD001"], + {"claims": [], "successor": "AX01"}) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_rejects_live_old(self): + rc, out = self.t.retire(["AX01=OGFL99"]) + self.assertEqual(rc, 1) + self.assertIn("still lives in the tree", out) + self.assertEqual(afi.load_ledger(self.t.retired)["retired"], {}) + + def test_rejects_declaration_only_old(self): + # The inert-fork case: an id declared by a claim-less root still lives + # in the tree; the declaration must be deleted before --retire. + self.t.write_preset("VendorA", preset("ZOLD @base", filament_id="ZDECL01", + instantiation=False, + filament_vendor="ZV", + filament_type="PLA")) + rc, out = self.t.retire(["ZDECL01=AX01"]) + self.assertEqual(rc, 1) + self.assertIn("still lives in the tree", out) + + def test_rejects_island_space_old(self): + rc, out = self.t.retire(["GFXX99=AX01"]) + self.assertEqual(rc, 1) + self.assertIn("reserved id space", out) + + def test_rejects_user_space_old(self): + rc, out = self.t.retire(["P1234ABC=AX01"]) + self.assertEqual(rc, 1) + self.assertIn("reserved id space", out) + + def test_rejects_already_retired_old(self): + self.t.write_ledger(retired={"ROLD": {"claims": [], "successor": None}}) + rc, out = self.t.retire(["ROLD=AX01"]) + self.assertEqual(rc, 1) + self.assertIn("already retired", out) + + def test_rejects_hinted_old(self): + self.t.write_ledger(hints={"HOLD": "AX01"}) + rc, out = self.t.retire(["HOLD=AX01"]) + self.assertEqual(rc, 1) + self.assertIn("hint key", out) + + def test_rejects_dead_successor(self): + rc, out = self.t.retire(["OFOLD001=OFnope99"]) + self.assertEqual(rc, 1) + self.assertIn("not a live tree id", out) + + def test_rejects_malformed_pair(self): + rc, out = self.t.retire(["OFOLD001"]) + self.assertEqual(rc, 1) + self.assertIn('expects "OLD=NEW"', out) + + # --------------------------------------------------------------------------- # default run: mint + insert # --------------------------------------------------------------------------- @@ -1261,6 +1326,21 @@ class TestRemint(SyntheticTreeCase): changed, errors, _out = self.t.remint(["VendorA"]) self.assertEqual((changed, errors), (0, 0)) + def test_salted_declaration_survives_remint(self): + # A deliberate salt split (a second preset of one product kept on its + # own id for per-printer AMS disambiguation) is mint-conformant and + # must not be converged back onto salt 0. + salt1 = afi.generate_filament_id(*self.TRIPLE, salt=1) + self.t.write_preset("VendorA", preset("APLA @legacy", + filament_id=salt1, + inherits="APLA @base", + compatible_printers=["P2 0.4 nozzle"])) + changed, errors, out = self.t.remint(["VendorA"]) + self.assertEqual(errors, 0, out) + self.assertEqual(changed, 1) # only the non-conformant AX01 root + legacy = load_json_file(self.t.preset_path("VendorA", "APLA @legacy")) + self.assertEqual(legacy["filament_id"], salt1) + def test_same_triple_converges_within_run(self): self.t.add_vendor("VendorB", [ preset("APLA @Bbase", filament_id="BX01", instantiation=False, From 71563cc6c6eb396631d55ad2a4c38eddfaf1308c Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 21 Aug 2026 18:13:18 +0800 Subject: [PATCH 20/52] Add filament_id plan v4: dissolve the Qidi QD_* island --- filament_id_plan_v4.md | 224 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 filament_id_plan_v4.md diff --git a/filament_id_plan_v4.md b/filament_id_plan_v4.md new file mode 100644 index 0000000000..046a7cae1c --- /dev/null +++ b/filament_id_plan_v4.md @@ -0,0 +1,224 @@ +# filament_id plan v4: dissolve the Qidi `QD_*` island + +Supersedes §0.2 of `filament_id_plan_v3.md` (the "`QD_*` island — untouched, forever" +decision) and amends every v3 section that carved out `QD_*`. Everything else in v3 — +the mint rule, the succession ledger, the BBL island, checks 1–9 — stands as +implemented (v3.0–v3.2, all gates green at commit `f7c1b290fd`). + +Decision driver: the island contradicts the catalog architecture v3 built. Qidi presets +carry 204 `QD___` ids over 264 declarations (49 families, +measured 2026-08-21) — one commercial product carries up to *five* ids (one per printer +series: `QIDI PLA Rapido` = `QD_0_1_1` … `QD_4_1_1`), which is exactly the +fragmentation v3 exists to remove. The island was frozen because Qidi's filament box +composes these ids from device enums and requires exactly-matching presets +(`QidiPrinterAgent.cpp:146-152`). But v3.0 shipped the machinery that makes freezing +unnecessary: the succession ledger already translates retired ids on resolution miss. +`QD_*` stops being a *preset id space* and becomes a *device protocol namespace*, +translated once at the agent edge. + +## 0. The architecture change + +Two tiers, **one** frozen island: + +1. **BBL island — untouched, unchanged.** All v3 reasoning holds (device/RFID/cloud + contract is external and opaque). +2. **Everything else converges on OFL product ids — now including Qidi.** All 204 + `QD_*` ids re-mint from their family triples and gain **retired** ledger entries + (not cross-island hints: after dissolution there is no island to own them, and + check 4's "never again" is exactly the guard we want against upstream re-adding + them). The box keeps working because `QidiPrinterAgent` resolves its composed + `QD_*` id through `resolve_filament_id_succession()` on miss — the same mechanism + every other retired id already uses. + +Why retire rather than hint (the one real design choice here): hints exist for ids a +*foreign catalog* owns and may legitimately re-ship (`GF*`). Post-dissolution, nothing +may ever re-ship a `QD_*` id in the profile tree — the device composes them at +runtime, the tree translates them. Retired entries make CI enforce that permanently +(`--update-snapshot` refuses resurrections, check 4 refuses occurrences); hints would +permit re-shipping, which is now always a regression. The QD→family mapping is +strictly 1:1 (verified: no `QD_*` id is claimed by more than one family), so the +mode-rule successor is unambiguous for every entry. + +## 1. What the dissolution consists of + +Three independent work packages, ordered for bisectability: + +- **(A) Re-converge the drifted tree** — prerequisite, not Qidi-specific. The + 2026-07 main merge (`f3fa3a34bd`) brought upstream vendor updates in pre-v3 style: + `--check` currently exits with **243 errors** (123 unsanctioned new ids, 46 new + instantiated own-key presets, 31 override drifts, 18 reserved-space claims, 5 + hint-keys re-declared — Qidi re-added `GFB99`/`GFG99`/`GFL99`, Snapmaker re-added + `GFG96`/`GFU99` and even four *retired* ids incl. `OGFL99`, plus Snapmaker U1 + triple errors and a GreenGate3D rename). This is the standing WF-B maintenance + pass; the dissolution's gates cannot go green on a red base. +- **(B) C++ succession hook in the Qidi agent** — safe to land before any data + changes (pure miss-path: while `QD_*` presets still exist, the hook never fires). +- **(C) The dissolution proper** — tooling flip + Qidi data fixes + re-mint + + snapshot/ledger regeneration, one vendor worksheet in the v3.2 mold. + +## 2. Runtime translation (work package B) + +`QidiPrinterAgent.cpp:183-192` currently: compose `setting_id` → keep it if a visible +base preset declares it → else degrade to `filament_id_by_type(tray_type)` (i.e. every +QIDI-brand box slot silently becomes Generic once the ids re-mint). Insert the +succession walk between those two steps: + +```cpp +} else if (!setting_id.empty() && has_visible_base_preset(bundle->filaments, setting_id)) { + tray.tray_info_idx = setting_id; +} else { + // Retired QD_* protocol ids forward to their minted successors via the shipped ledger. + const std::string successor = setting_id.empty() ? std::string() + : resolve_filament_id_succession(setting_id); + if (!successor.empty() && has_visible_base_preset(bundle->filaments, successor)) + tray.tray_info_idx = successor; + else + tray.tray_info_idx = bundle->filaments.filament_id_by_type(tray.tray_type); +} +``` + +`resolve_filament_id_succession` is `Preset.hpp:119` (loads once, cycle-guarded, +empty-safe) — no new includes needed beyond what the file already reaches through +`PresetBundle`. This one hook covers both composition paths: the numeric-series +`build_setting_id` lambda *and* the non-numeric fallback +`map_filament_type_to_setting_id` (`:325-342`), whose four hardcoded returns +(`QD_1_0_1`/`_11`/`_41`/`_50` = Generic PLA/ABS/PETG/TPU 95A) become ledger keys in +package C. Keep that function as-is but extend its comment: the returned ids are +retired ledger keys by design, and `scripts/tests/test_filament_id.py` parses the +initializer (see §4 tests) — the Moonraker treatment (`MoonrakerPrinterAgent.cpp: +619-627`) of replacing the table with name lookups was considered and not taken: the +table already routes through the same ledger as the composed ids, and two translation +mechanisms in one agent is worse than one. + +Tests (same commit): + +- `tests/libslic3r/test_filament_id_succession.cpp`: add a section asserting a + `QD_`-shaped key forwards like any other (`{"QD_2_1_11", "OFnew001"}` resolves to + `"OFnew001"`) — pins that the walk is prefix-agnostic. +- `scripts/tests/test_filament_id.py`: new test parsing the four `QD_` literals out of + `QidiPrinterAgent.cpp::map_filament_type_to_setting_id` (mirror the parser in + `scripts/test_moonraker_lane_data.py`) and asserting each is a ledger key whose + chain terminates at a live tree id. **Add it marked expected-fail/skipped until + package C lands, then flip it on** — it is the permanent code↔ledger lockstep guard. + +## 3. Tooling and validation flip (work package C, first commit) + +All in `scripts/assign_filament_ids.py`; every touched line measured 2026-08-21: + +- `is_island_declaration` (`:327-329`) → `return vendor == "BBL"`. This single change + pulls every `QD_*` declarer into the triple bookkeeping (`:385`) and thus into + checks 3 and 8, into `--remint`'s domain (`:1464`), and out of the hint-key + tolerances (`:877`, `:1100`). +- `reserved_space_owner` (`:596-604`): `QD_*` returns `(True, None)` — reserved, + ownerless, exactly like the P-hex/user-custom space. Consequences, all wanted: + check 6 refuses any future vendor claim; the `--update-snapshot` sanction gate + (`:938-963`) refuses new `QD_*` ids outright; the vanish path (`:994`) routes + `QD_*` to **retired** (owner `None` ≠ island), not released-with-hint. Update the + two message sites that render `owner is None` as "reserved for user-custom presets" + (`:628` docstring, `:958`, and check 6's copy) to name the space generically or + special-case `QD_*` ("Qidi device protocol; dissolved island — retired, never + declarable"). +- Check 1 (`:667-668`): delete the `vendor == "Qidi" and fid.startswith("QD_")` + exemption. +- Module docstring (`:27-45`): rewrite the `QD_*` bullet — reserved space stays + listed, but as "device protocol namespace, translated via the succession ledger; + dissolved as a catalog island in v4, may never be declared". +- `scripts/tests/test_filament_id.py`: update the three island assertions — + `reserved_space_owner("QD_X4_PLA")` → `(True, None)` (`:403`), + `is_island_declaration("Qidi", "QD_X4_PLA")` → `False` (`:413`), and the + reserved-space message case (`:570`). + +No changes to the ledger schema, the C++ checks, `--retire` (post-flip it accepts +`QD_*` olds automatically — they are non-island now), or the validator: check 3's +"non-BBL, non-`QD_*`" phrasing in v3 §3 was always implemented as "non-island", so the +flip *is* the spec change. + +## 4. Migration phases + +**v4.0 — re-converge the drifted tree (package A).** Per-vendor WF-B worksheets over +the 243 errors: Snapmaker U1 (triple divergence `Generic|Snapmaker|snapmaker`, empty +vendors, four resurrected retired ids — these force re-mints since retirement is +permanent), BBL/addnorth `GF_AN*` overrides (BBL island: grandfather via snapshot, +they are BBL-internal), Qidi/Snapmaker re-declared hint keys (re-mint those declarers, +the check's own prescription), GreenGate3D rename, then `--update-snapshot` (new +upstream `QD_*` ids sanction cleanly — the island is still intact in this phase) and +the full v3 §5 gate battery. Bump `version` in every touched +`resources/profiles/.json`. **Do not start v4.2 until `--check` exits 0.** + +**v4.1 — the agent hook (package B).** §2 as written; `libslic3r_tests` + +`scripts/tests/test_filament_id.py` green; behavior-neutral by construction (no `QD_*` +ledger entries exist yet). + +**v4.2 — the dissolution (package C).** One Qidi worksheet, v3.2 machinery: + +1. Tooling flip commit (§3). `--check` now reports the Qidi island as + non-conformant — expected, red only between commits of this phase. +2. Data fixes, before any re-mint (the v3 "W3 lands first" lesson — type/vendor are + key components): add `filament_vendor: ["QIDI"]` at each QIDI-brand family's + inheritance apex so all declarers resolve it (39 of 49 families currently resolve + none — check 8a would refuse the mint). Verify the six Generic families + (`Generic PLA/ABS/PETG/PC/TPU 95A/PLA Silk`) resolve triples identical to their + OFL counterparts (vendor `Generic`, OFL's `filament_type`) so they *converge onto + the OFL ids* by triple math — the whole point; any mismatch is a W3-style data fix + here, not a fork. No `inherits`/`compatible_printers` re-pointing anywhere: the + series intermediates (`Generic PLA@Q2-Series` etc., all `instantiation: false`) + simply keep declarations whose values become the OFL ids. +3. `python scripts/assign_filament_ids.py --remint Qidi` — rewrites all 264 + declarations in place to their family mints (same triple ⇒ same id across a + family's series intermediates and per-nozzle declarers; convergence with OFL ids + is legal by design, `want_id` already permits same-triple collisions `:1447`). +4. `--update-snapshot` — retires every vanished `QD_*` id with its mode-rule + successor. **Audit the ledger diff: all ~204 new entries must be `QD_*`→non-null.** + A null successor (possible only for a declared-only id with zero instantiated + claims) gets an explicit `--retire "QD_x=OFy"` with the family's minted id. +5. Un-skip the §2 lockstep test. Bump `resources/profiles/Qidi.json` version. Full + gate battery (§5). + +Known residue, accepted: `QIDI PC-ABS-FR` (series 1–2) vs `QIDI PC/ABS-FR` +(series 3–4) are two preset-name families for one product → two ids. Renames were +ruled out in v3 (`renamed_from` rejected for migrations); if upstream ever unifies the +name, content-addressing re-ids and the ledger absorbs it — self-healing, no action +now. + +**v4.3 — OFL consolidation (unchanged).** v3.3 stays optional and id-stable; QIDI-brand +families are vendor-unique and stay in the Qidi bundle. + +## 5. Gates (per phase, delta from v3 §5) + +Unchanged battery: `orca_extra_profile_check.py` exit 0, `assign_filament_ids.py +--check` exit 0, `scripts/tests/test_filament_id.py` all green, `libslic3r_tests` +green, validator `-l 2` tree-wide + `-f` tree-wide + `-v Qidi` exit 0, custom-preset +fixture archives (v4.2 touches no preset visibility, but they are cheap insurance — +run them for v4.0, which touches instantiation-adjacent upstream drift), flatten +config-equivalence. New for v4.2: equivalence diff may contain **only** `filament_id` +value changes (QD→OF) and the added `filament_vendor` keys on QIDI-brand families; +ledger diff audit per §4.4; the map-literal lockstep test. Manual release-checklist +item: Qidi box smoke test — slot holding a QIDI-brand material must surface the brand +preset (not Generic) on an updated client, via the memory-documented local Klipper +test rig. + +## 6. Accepted costs (explicit, new relative to v3) + +- **Every Qidi box slot resolves through the ledger miss-path forever** (one hash-map + walk per slot per status poll — negligible, and structurally identical to how + every retired id already resolves). The QD→OF translation table is maintained by + the retirement machinery, not by hand. +- **Older Orca clients** (pre-v4 profiles) paired with re-minted profile trees lose + QIDI-brand slot matching (they look up `QD_*` and fall back generic-by-type — the + degradation the hook removes for updated clients). Same one-time field-transition + shape v3 §6 already accepted for AMS/AFC ids. +- **Two ids for PC-ABS-FR** until upstream unifies the family name (§4 residue). + +## 7. Evidence + +Measured on this tree 2026-08-21 unless cited to v3: 204 distinct `QD_*` ids / 264 +declaring presets / 49 families, QD→family strictly 1:1, per-series id sets +(`QD_0..4_1_1` = `QIDI PLA Rapido` etc.); 39 families resolve no `filament_vendor`; +declarations live on `instantiation:false` series intermediates (Q2/Q2C/X5/X4) and +per-nozzle X-Plus-4 presets; composition + miss-fallback at +`QidiPrinterAgent.cpp:146-152, 183-192`, hardcoded fallback table `:325-342`; +succession helpers `Preset.hpp:109-119`; ledger = 575 retired + 194 hints, zero `QD_*` +entries; snapshot holds 160 of the 204 (the 44 newcomers are post-merge drift); +`--check` = 243 errors, categorized in §1(A); island exemption mechanics at +`assign_filament_ids.py:327-329, 385, 596-604, 667, 877, 994, 1464, 1514`; `--remint` +same-triple convergence guard `:1447-1453`; retirement-permanence gate `:965-976`. From 58d1a3b093e050c6ba176171dc48224b17a1984d Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 21 Aug 2026 18:13:18 +0800 Subject: [PATCH 21/52] filament_id v4.0: re-converge post-merge drift (Qidi/Snapmaker/re3D) The 2026-08 main merge brought upstream vendor updates in pre-v3 style; assign_filament_ids.py --check reported 243 errors. Re-converged per plan v4 SS1(A)/SS4: - Qidi X5: 12 brand presets had copied BBL catalog ids (GFB99/GFG99/GFL99); re-minted to their product triples (PolyLite PLA converges onto OF5CgdDq). - Snapmaker U1: fixed empty/lowercase/wrong filament_vendor on 5 bases (triple inputs, W3-style); re-minted 24 declarations, resurrecting no retired ids (11813638720/141703112701/1417031127011/OGFL99 all re-minted away; base2 duplicates converge onto their families' v3.2 ids). - re3D: rPETG had copied GFG01 (BBL space); re-minted to OFmCOW2Y. The GreenGate3D bundle was removed upstream with its product relocated here; retired OFSTCno1 -> OFmCOW2Y so shipped references keep resolving. - validator -f: resolved 34 AMS-match ambiguities using the v3 mechanisms: salt-1 ids on the 5 re3D root presets and Snapmaker PLA-CF @U1 0.4 (duplicate presets of one product; deletion forbidden), own minted ids for the 4 cross-family riders (Polymaker General/Silk/Tough PLA Family, Snapmaker PLA Full Spectrum). - Snapshot re-sanctioned (+92 ids incl. 44 new QD_4_* island ids and BBL addnorth GF_AN*); ledger +1 entry (OFSTCno1). Gates: --check 0; orca_extra_profile_check 0/0; 116 script tests OK; validator base + -f exit 0. Vendor versions bumped (Qidi, Snapmaker, re3D). --- resources/profiles/Qidi.json | 2 +- .../Qidi/filament/X5/Bambu ABS @X-Plus 5.json | 2 +- .../filament/X5/Bambu PETG @X-Plus 5.json | 2 +- .../Qidi/filament/X5/Bambu PLA @X-Plus 5.json | 2 +- .../filament/X5/Generic PLA+ @X-Plus 5.json | 2 +- .../filament/X5/HATCHBOX ABS @X-Plus 5.json | 2 +- .../filament/X5/HATCHBOX PETG @X-Plus 5.json | 2 +- .../filament/X5/HATCHBOX PLA @X-Plus 5.json | 2 +- .../filament/X5/Overture ABS @X-Plus 5.json | 2 +- .../filament/X5/Overture PLA @X-Plus 5.json | 2 +- .../filament/X5/PolyLite ABS @X-Plus 5.json | 2 +- .../filament/X5/PolyLite PLA @X-Plus 5.json | 2 +- .../X5/Polymaker PLA-HT @X-Plus 5.json | 2 +- resources/profiles/Snapmaker.json | 2 +- .../Polymaker General PLA Family @U1.json | 1 + .../filament/Polymaker PLA @U1 base.json | 4 +- .../Polymaker Silk PLA Family @U1.json | 1 + .../Polymaker Tough PLA Family @U1.json | 1 + .../filament/Snapmaker PETG HF @U1 base2.json | 4 +- .../Snapmaker PETG Translucent @U1 base.json | 2 +- .../Snapmaker PLA Basic @U1 base.json | 5 +- ...aker PLA Full Spectrum @U1 0.4 nozzle.json | 1 + .../filament/Snapmaker PLA Glow @U1 base.json | 2 +- .../Snapmaker PLA Matte @U1 base2.json | 5 +- .../Snapmaker PLA Silk @U1 0.2 nozzle.json | 2 +- .../Snapmaker PLA Silk @U1 0.6 nozzle.json | 2 +- .../Snapmaker PLA Silk @U1 0.8 nozzle.json | 2 +- .../filament/Snapmaker PLA Silk @U1.json | 2 +- .../Snapmaker PLA SnapSpeed @U1 base2.json | 4 +- .../Snapmaker PLA Translucent @U1 base.json | 2 +- .../Snapmaker PLA Wood @U1 0.4 nozzle.json | 2 +- .../Snapmaker PLA Wood @U1 0.6 nozzle.json | 2 +- .../Snapmaker PLA Wood @U1 0.8 nozzle.json | 2 +- .../Snapmaker PLA-CF @U1 0.4 nozzle.json | 2 +- .../Snapmaker PLA-CF @U1 0.6 nozzle.json | 2 +- .../Snapmaker PLA-CF @U1 0.8 nozzle.json | 2 +- .../Snapmaker TPU 90A @U1 0.6 nozzle.json | 2 +- .../Snapmaker TPU 90A @U1 0.8 nozzle.json | 2 +- .../filament/Snapmaker TPU 90A @U1.json | 2 +- .../Snapmaker TPU 95A HF @U1 0.6 nozzle.json | 2 +- .../Snapmaker TPU 95A HF @U1 0.8 nozzle.json | 2 +- .../filament/Snapmaker TPU 95A HF @U1.json | 2 +- resources/profiles/re3D.json | 2 +- resources/profiles/re3D/filament/re3D PC.json | 2 +- .../profiles/re3D/filament/re3D PETG.json | 2 +- .../profiles/re3D/filament/re3D PLA.json | 2 +- .../re3D/filament/re3D rPETG @0.8 nozzle.json | 2 +- .../filament/re3D rPETG @1.75 nozzle.json | 2 +- .../profiles/re3D/filament/re3D rPETG.json | 2 +- .../profiles/re3D/filament/re3D rPP.json | 2 +- resources/profiles/retired_filament_ids.json | 6 + scripts/filament_id_snapshot.json | 520 +++++++++++++++++- 52 files changed, 566 insertions(+), 68 deletions(-) diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index 08a2d6a230..ecceff5a8a 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "02.04.00.10", + "version": "02.04.00.11", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ 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 1464576f61..0e0fdb08b0 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFhuaUQB", "name": "Bambu ABS@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 0a4d2ce22c..ef6ea57354 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "OFLYDngx", "name": "Bambu PETG@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 7660c8174d..ad90cb8a81 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OF1dpPrW", "name": "Bambu PLA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 e1d40b179f..72d7b6f9c6 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFEWYR89", "name": "Generic PLA+@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 3f5987240c..323fcf3e90 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFwLBAGf", "name": "HATCHBOX ABS@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 5f794e561c..6f0495c45b 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "OFIWMSGX", "name": "HATCHBOX PETG@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 094e540793..7ee05c27f7 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFeelsSM", "name": "HATCHBOX PLA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 ea12b78ead..82863e8d80 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFK8XHPn", "name": "Overture ABS@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 571eb2bbeb..0dbb498feb 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFc3xdm9", "name": "Overture PLA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 48b6caa32b..1cf57f8ce3 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "OFOvv91M", "name": "PolyLite ABS@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 5b37f7ae8a..4702c9ba1c 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OF5CgdDq", "name": "PolyLite PLA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 f3c54e81f1..233542bab1 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,6 +1,6 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "OFfYHK5z", "name": "Polymaker PLA-HT@X-Plus 5-Series", "from": "system", "instantiation": "false", diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index 9a6fab7942..65b1d12a3a 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -1,6 +1,6 @@ { "name": "Snapmaker", - "version": "02.04.00.09", + "version": "02.04.00.10", "force_update": "0", "description": "Snapmaker configurations", "machine_model_list": [ diff --git a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json index c706ba776d..0e743d7aee 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json @@ -4,6 +4,7 @@ "inherits": "Polymaker PLA @U1 base", "from": "system", "setting_id": "thXfSaUkOAKJ50ey", + "filament_id": "OF44ERDr", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json b/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json index b27c48f720..ae420e8912 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Polymaker PLA @U1 base.json @@ -3,7 +3,7 @@ "name": "Polymaker PLA @U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OGFL99", + "filament_id": "OFelDBgv", "instantiation": "false", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" @@ -48,7 +48,7 @@ "nil" ], "filament_vendor": [ - "Generic" + "Polymaker" ], "filament_scarf_seam_type": [ "none" diff --git a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json index b6bd119022..990cc483f3 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json @@ -4,6 +4,7 @@ "inherits": "Polymaker PLA @U1 base", "from": "system", "setting_id": "h8vIYpXbxFtHPV6e", + "filament_id": "OFH57ibH", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json index e5c2c7d7f6..1dad000fb2 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json @@ -4,6 +4,7 @@ "inherits": "Polymaker PLA @U1 base", "from": "system", "setting_id": "d6CC81Es2hp46bto", + "filament_id": "OFgdaBOt", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json index 0ad75759a1..4f934b93a3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 base2.json @@ -3,7 +3,7 @@ "name": "Snapmaker PETG HF @U1 base2", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "GFG96", + "filament_id": "OFL9aRjN", "instantiation": "false", "cool_plate_temp": [ "0" @@ -177,7 +177,7 @@ "nil" ], "filament_vendor": [ - "Generic" + "Snapmaker" ], "filament_prime_volume": [ "45" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json index eb18fb4838..6b51cd2535 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json @@ -3,6 +3,6 @@ "name": "Snapmaker PETG Translucent @U1 base", "inherits": "fdm_filament_petg", "from": "system", - "filament_id": "PETG_TRANSLUCENT_001", + "filament_id": "OFW8lqnb", "instantiation": "false" } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json index adf7624e1f..d6e7e209c6 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1 base.json @@ -2,8 +2,11 @@ "type": "filament", "name": "Snapmaker PLA Basic @U1 base", "from": "system", - "filament_id": "1417031127011", + "filament_id": "OFhmxnYw", "instantiation": "false", + "filament_vendor": [ + "Snapmaker" + ], "filament_end_gcode": [ "" ], diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json index 990e67a79e..219e8075e5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker PLA Basic @U1 base", "from": "system", "setting_id": "iybaFWrXKOsmXgMJ", + "filament_id": "OFOPU1xv", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json index ad3c1f4bbb..e69ca63254 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA Glow @U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "SPGLOW001", + "filament_id": "OFfD87Gy", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json index 6c0dcf26fd..109dbc19e7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 base2.json @@ -2,8 +2,11 @@ "type": "filament", "name": "Snapmaker PLA Matte @U1 base2", "from": "system", - "filament_id": "141703112701", + "filament_id": "OFF9cgY5", "instantiation": "false", + "filament_vendor": [ + "Snapmaker" + ], "filament_end_gcode": [ "" ], diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json index 5eb860506c..e4fdb8016b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker PLA Basic @U1 base", "from": "system", "setting_id": "Q5xH6oGGlbXr14Pa", - "filament_id": "11813638720", + "filament_id": "OFWgFOjn", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json index 5df6ff5a3a..b144ce86dd 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker PLA Basic @U1 base", "from": "system", "setting_id": "2pieDQoz9PiDCnU1", - "filament_id": "11813638720", + "filament_id": "OFWgFOjn", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.6 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json index 0758372ea0..aa92e97d18 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker PLA Basic @U1 base", "from": "system", "setting_id": "f3H0JFUnds0mkKCN", - "filament_id": "11813638720", + "filament_id": "OFWgFOjn", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.8 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json index c68904ffd9..6b6030b919 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json @@ -4,7 +4,7 @@ "inherits": "Snapmaker PLA Basic @U1 base", "from": "system", "setting_id": "9PkHSwtXFM0zPWth", - "filament_id": "11813638720", + "filament_id": "OFWgFOjn", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json index 84889e3d9b..41876b04bb 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 base2.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Snapmaker PLA SnapSpeed @U1 base2", "from": "system", - "filament_id": "141703112701", + "filament_id": "OFwhLMs4", "instantiation": "false", "activate_air_filtration": [ "0" @@ -195,7 +195,7 @@ "100" ], "filament_vendor": [ - "snapmaker" + "Snapmaker" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json index 4f4842ae1d..1ed79183c9 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 base.json @@ -3,7 +3,7 @@ "name": "Snapmaker PLA Translucent @U1 base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "SPTR001", + "filament_id": "OFLTYJW0", "instantiation": "false", "filament_end_gcode": [ "" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json index 4768ac2783..283d5876b7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "XvizDDHbds3bVrzi", - "filament_id": "GFL9922", + "filament_id": "OFdd8ZqJ", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json index 43d306ebae..09555457d5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "Kp77DCcitdmoyjqm", - "filament_id": "GFL9922", + "filament_id": "OFdd8ZqJ", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.6 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json index da788a35fb..4a5a04a5ee 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "nBYnNiqwLo6nAsqi", - "filament_id": "GFL9922", + "filament_id": "OFdd8ZqJ", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.8 nozzle)" 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 b986a7244a..44aeab2a48 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 @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "2INwruC3ZVkBTdUT", - "filament_id": "GFL98111", + "filament_id": "OFf52D4e", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json index dcb6392634..6f09ea5d6a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "CKfdL85SvbOLzMuP", - "filament_id": "GFL98111", + "filament_id": "OFhQf8ou", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.6 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json index 1e6e961497..564e59e1a9 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pla", "from": "system", "setting_id": "fhhnfJm4dN9FXpWQ", - "filament_id": "GFL98111", + "filament_id": "OFhQf8ou", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.8 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json index 6ae8a5b675..afb529e983 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "uQCplebxmpBpzsnk", - "filament_id": "GFU99", + "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json index 45f0f7a0e9..8cf3452469 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "w4Hpl2qNPmgNvaeM", - "filament_id": "GFU99", + "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ "3.5" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json index e89397849b..8f6ba9663f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "T4MmgICRrSzvmCZ5", - "filament_id": "GFU99", + "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json index 1085c84e6f..b9619dcca5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "Q2svXpkEqg0dCdq3", - "filament_id": "GFU99", + "filament_id": "OFXSvqOX", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.6 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json index bef4c7712f..4283ac2651 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "RjsE08h3l37cAkAs", - "filament_id": "GFU99", + "filament_id": "OFXSvqOX", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.8 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json index 5e0696d906..816b78ceb8 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "KwcwmV2UmZUgCBoz", - "filament_id": "GFU99", + "filament_id": "OFXSvqOX", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/re3D.json b/resources/profiles/re3D.json index 94cca3c2ef..9a00807c1a 100644 --- a/resources/profiles/re3D.json +++ b/resources/profiles/re3D.json @@ -1,7 +1,7 @@ { "name": "re3D", "url": "", - "version": "03.00.08", + "version": "03.00.09", "force_update": "0", "description": "re3D configurations", "machine_model_list": [ diff --git a/resources/profiles/re3D/filament/re3D PC.json b/resources/profiles/re3D/filament/re3D PC.json index d06438c3bd..dbd43758de 100644 --- a/resources/profiles/re3D/filament/re3D PC.json +++ b/resources/profiles/re3D/filament/re3D PC.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pc", - "filament_id": "OFU3QXL7", + "filament_id": "OFwbsgWj", "setting_id": "eSR00TZTotTvJs8l", "filament_settings_id": [ "re3D PC" diff --git a/resources/profiles/re3D/filament/re3D PETG.json b/resources/profiles/re3D/filament/re3D PETG.json index 8337cbf61a..273ef5165b 100644 --- a/resources/profiles/re3D/filament/re3D PETG.json +++ b/resources/profiles/re3D/filament/re3D PETG.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "OF3F63OE", + "filament_id": "OFX0etlv", "setting_id": "msXDK31R8KOvqNqK", "filament_settings_id": [ "re3D PETG" diff --git a/resources/profiles/re3D/filament/re3D PLA.json b/resources/profiles/re3D/filament/re3D PLA.json index 5e8bf16a63..7637049e80 100644 --- a/resources/profiles/re3D/filament/re3D PLA.json +++ b/resources/profiles/re3D/filament/re3D PLA.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", - "filament_id": "OFRyOsZj", + "filament_id": "OFDdEaoL", "setting_id": "nPpDwvFg7WQr7K3t", "filament_settings_id": [ "re3D PLA" 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 0ac0d012f5..ffe4277113 100644 --- a/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG01", + "filament_id": "OFmCOW2Y", "setting_id": "WlELqPVnuL7DaTxs", "name": "re3D rPETG @0.8 nozzle", "from": "system", 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 8cd090fc06..888880055f 100644 --- a/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPETG @1.75 nozzle.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG01", + "filament_id": "OFmCOW2Y", "setting_id": "sHzO2S3mmE6Iqs2O", "name": "re3D rPETG @1.75 nozzle", "from": "system", diff --git a/resources/profiles/re3D/filament/re3D rPETG.json b/resources/profiles/re3D/filament/re3D rPETG.json index fe19f12539..85f359d828 100644 --- a/resources/profiles/re3D/filament/re3D rPETG.json +++ b/resources/profiles/re3D/filament/re3D rPETG.json @@ -5,7 +5,7 @@ "renamed_from": "re3D Greengate rPETG", "instantiation": "true", "inherits": "fdm_filament_pet", - "filament_id": "GFG01", + "filament_id": "OFD8loeT", "setting_id": "6aESuJ2S2Kogd4Lq", "filament_settings_id": [ "re3D rPETG" diff --git a/resources/profiles/re3D/filament/re3D rPP.json b/resources/profiles/re3D/filament/re3D rPP.json index 057e88413b..c4d2d776a9 100644 --- a/resources/profiles/re3D/filament/re3D rPP.json +++ b/resources/profiles/re3D/filament/re3D rPP.json @@ -4,7 +4,7 @@ "from": "system", "instantiation": "true", "inherits": "fdm_filament_pp", - "filament_id": "OFfHGM1D", + "filament_id": "OFm8rqoY", "setting_id": "8PB62qm5Cd3SHLf4", "filament_settings_id": [ "re3D rPP" diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index fd99602923..241b4cbb9f 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -2328,6 +2328,12 @@ ], "successor": "OFhQfUQY" }, + "OFSTCno1": { + "claims": [ + "re3D/re3D Greengate rPETG" + ], + "successor": "OFmCOW2Y" + }, "OGFA00": { "claims": [ "OrcaFilamentLibrary/Bambu PLA Basic" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 4349592b25..c8ae5b34be 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -163,6 +163,33 @@ "Artillery/Artillery TPU", "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", "BBL/Generic SBS", + "BBL/addnorth ABS rABS", + "BBL/addnorth PA Adura", + "BBL/addnorth PA Adura FDA", + "BBL/addnorth PA-CF Adura X", + "BBL/addnorth PA6 Addlantis", + "BBL/addnorth PC BLend HT LCF", + "BBL/addnorth PETG Base", + "BBL/addnorth PETG ESD", + "BBL/addnorth PETG Economy", + "BBL/addnorth PETG Flame v0", + "BBL/addnorth PETG PRO Matte", + "BBL/addnorth PETG rPETG Matte", + "BBL/addnorth PETG-CF Rigid X", + "BBL/addnorth PLA E-PLA", + "BBL/addnorth PLA Economy", + "BBL/addnorth PLA HT-PLA PRO Matte", + "BBL/addnorth PLA Premium Silk", + "BBL/addnorth PLA Textura", + "BBL/addnorth PLA Wood", + "BBL/addnorth PLA X-PLA", + "BBL/addnorth PLA X-PLA High Speed", + "BBL/addnorth PLA rPLA RE-ADD", + "BBL/addnorth PLA-CF Carbon Fiber", + "BBL/addnorth PVDF Adamant S1", + "BBL/addnorth TPU EasyFlex", + "BBL/addnorth TPU Pro Matte 85A", + "BBL/addnorth TPU Pro Matte 95A", "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", "Chuanying/Chuanying Generic HIPS", "Chuanying/Chuanying Generic PVA", @@ -989,6 +1016,9 @@ "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", + "Snapmaker/Polymaker General PLA Family @U1", + "Snapmaker/Polymaker Silk PLA Family @U1", + "Snapmaker/Polymaker Tough PLA Family @U1", "Snapmaker/Snapmaker ABS Benchy @U1", "Snapmaker/Snapmaker Dual ABS Benchy", "Snapmaker/Snapmaker Dual TPE", @@ -997,7 +1027,12 @@ "Snapmaker/Snapmaker J1 TPE", "Snapmaker/Snapmaker J1 TPU High-Flow", "Snapmaker/Snapmaker PET @Dual", + "Snapmaker/Snapmaker PLA Full Spectrum @U1 0.4 nozzle", "Snapmaker/Snapmaker PLA Matte @U1", + "Snapmaker/Snapmaker PLA Silk @U1", + "Snapmaker/Snapmaker PLA Silk @U1 0.2 nozzle", + "Snapmaker/Snapmaker PLA Silk @U1 0.6 nozzle", + "Snapmaker/Snapmaker PLA Silk @U1 0.8 nozzle", "Snapmaker/Snapmaker TPE", "Snapmaker/Snapmaker TPE @U1", "Snapmaker/Snapmaker TPU High-Flow @U1", @@ -1216,6 +1251,9 @@ "GFA18": [ "BBL/Bambu PLA Lite" ], + "GFA19": [ + "BBL/Bambu PLA Pure" + ], "GFA50": [ "BBL/Bambu PLA-CF" ], @@ -1574,6 +1612,87 @@ "GFU99": [ "BBL/Generic TPU" ], + "GF_ANAD": [ + "BBL/addnorth PA Adura" + ], + "GF_ANAF": [ + "BBL/addnorth PA Adura FDA" + ], + "GF_ANAX": [ + "BBL/addnorth PA-CF Adura X" + ], + "GF_ANEF": [ + "BBL/addnorth TPU EasyFlex" + ], + "GF_ANEG": [ + "BBL/addnorth PETG ESD" + ], + "GF_ANEP": [ + "BBL/addnorth PLA E-PLA" + ], + "GF_ANGE": [ + "BBL/addnorth PETG Economy" + ], + "GF_ANHTP": [ + "BBL/addnorth PLA HT-PLA PRO Matte" + ], + "GF_ANLA": [ + "BBL/addnorth PA6 Addlantis" + ], + "GF_ANPBX": [ + "BBL/addnorth PC BLend HT LCF" + ], + "GF_ANPCF": [ + "BBL/addnorth PLA-CF Carbon Fiber" + ], + "GF_ANPE": [ + "BBL/addnorth PETG Base" + ], + "GF_ANPF": [ + "BBL/addnorth PETG Flame v0" + ], + "GF_ANPL": [ + "BBL/addnorth PLA Economy" + ], + "GF_ANPLW": [ + "BBL/addnorth PLA Wood" + ], + "GF_ANPM": [ + "BBL/addnorth PETG PRO Matte" + ], + "GF_ANPS": [ + "BBL/addnorth PLA Premium Silk" + ], + "GF_ANPV": [ + "BBL/addnorth PVDF Adamant S1" + ], + "GF_ANRA": [ + "BBL/addnorth ABS rABS" + ], + "GF_ANRM": [ + "BBL/addnorth PETG rPETG Matte" + ], + "GF_ANRPL": [ + "BBL/addnorth PLA rPLA RE-ADD" + ], + "GF_ANRX": [ + "BBL/addnorth PETG-CF Rigid X" + ], + "GF_ANTA": [ + "BBL/addnorth TPU Pro Matte 85A" + ], + "GF_ANTE": [ + "BBL/addnorth PLA Textura" + ], + "GF_ANTM": [ + "BBL/addnorth TPU Pro Matte 95A" + ], + "GF_ANXP": [ + "BBL/addnorth PLA X-PLA" + ], + "GF_ANXPH": [ + "BBL/addnorth PLA X-PLA High Speed" + ], "OF016CJw": [ "Sovol/Sovol SV08 ABS" ], @@ -1775,6 +1894,9 @@ "OF43Raws": [ "Snapmaker/PolyTerra J1 PLA" ], + "OF44ERDr": [ + "Snapmaker/Polymaker General PLA Family" + ], "OF44VYzK": [ "OrcaFilamentLibrary/FilAr PETG Azul Francia" ], @@ -2256,6 +2378,9 @@ "OFD6kN7F": [ "OrcaArena/OrcaArena Generic PLA" ], + "OFD8loeT": [ + "re3D/re3D rPETG" + ], "OFD9taow": [ "FlyingBear/FlyingBear PLA Hyper" ], @@ -2290,6 +2415,9 @@ "Sovol/Generic PLA", "Z-Bolt/Generic PLA" ], + "OFDdEaoL": [ + "re3D/re3D PLA" + ], "OFDe8uyM": [ "OrcaFilamentLibrary/Valment PLA" ], @@ -2486,6 +2614,9 @@ "OFH2nN08": [ "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" ], + "OFH57ibH": [ + "Snapmaker/Polymaker Silk PLA Family" + ], "OFH5UH6P": [ "Flashforge/Flashforge ABS-GF" ], @@ -2715,6 +2846,9 @@ "OFKyCgaK": [ "Anycubic/Anycubic Generic PLA" ], + "OFL9aRjN": [ + "Snapmaker/Snapmaker PETG HF" + ], "OFLAXKqP": [ "WonderMaker/WonderMaker TPU 95A" ], @@ -2743,6 +2877,9 @@ "OrcaFilamentLibrary/Generic ASA", "RH3D/Generic ASA" ], + "OFLTYJW0": [ + "Snapmaker/Snapmaker PLA Translucent" + ], "OFLXvuMr": [ "Elegoo/Elegoo Rapid PETG", "OrcaFilamentLibrary/Elegoo Rapid PETG" @@ -2954,6 +3091,9 @@ "OFOKYhi6": [ "Prusa/Prusa Generic PETG HF" ], + "OFOPU1xv": [ + "Snapmaker/Snapmaker PLA Full Spectrum" + ], "OFObG16Q": [ "InfiMech/InfiMech PLA Basic" ], @@ -3188,9 +3328,6 @@ "OFSStjay": [ "FLSun/FLSun S1 PLA Silk" ], - "OFSTCno1": [ - "re3D/re3D Greengate rPETG" - ], "OFSa39yP": [ "Snapmaker/Snapmaker J1 PLA" ], @@ -3352,6 +3489,9 @@ "OFW5FqkL": [ "Qidi/QIDI PLA Rapido Silk" ], + "OFW8lqnb": [ + "Snapmaker/Snapmaker PETG Translucent" + ], "OFW9uIkE": [ "Tiertime/Tiertime Generic HIPS" ], @@ -3409,6 +3549,9 @@ "OFWzr7m0": [ "Anycubic/Anycubic Generic PETG" ], + "OFX0etlv": [ + "re3D/re3D PETG" + ], "OFX0ycRQ": [ "OrcaFilamentLibrary/Fiberon PA12-CF" ], @@ -3424,6 +3567,9 @@ "OFXJ9iom": [ "iQ/Grauts HPP4GF25 P1" ], + "OFXSvqOX": [ + "Snapmaker/Snapmaker TPU 95A HF" + ], "OFXTPuqV": [ "OrcaFilamentLibrary/Elas PETG Basic" ], @@ -3473,6 +3619,9 @@ "OFY3AB7j": [ "Snapmaker/Snapmaker J1 PLA Matte" ], + "OFY7jxcS": [ + "Snapmaker/Snapmaker TPU 90A" + ], "OFY9muEs": [ "Anycubic/Generic ABS", "Creality/Generic ABS", @@ -3738,6 +3887,9 @@ "OFdb8YNz": [ "OrcaFilamentLibrary/FilAr PLA Verde Manzana" ], + "OFdd8ZqJ": [ + "Snapmaker/Snapmaker PLA Wood" + ], "OFdkWDiy": [ "Cubicon/Cubicon PLAi21" ], @@ -3822,6 +3974,9 @@ "OFf0MkD5": [ "Qidi/QIDI PETG Translucent" ], + "OFf52D4e": [ + "Snapmaker/Snapmaker PLA-CF" + ], "OFf5awy4": [ "OrcaFilamentLibrary/Eolas Prints PLA Matte" ], @@ -3837,6 +3992,9 @@ "OFfBpSRI": [ "OrcaFilamentLibrary/Bambu ASA" ], + "OFfD87Gy": [ + "Snapmaker/Snapmaker PLA Glow" + ], "OFfHGM1D": [ "re3D/re3D rPP" ], @@ -3846,6 +4004,9 @@ "OFfSqS4R": [ "Creality/ENDER FAST PLA" ], + "OFfYHK5z": [ + "Qidi/Polymaker PLA-HT" + ], "OFfZ0lTS": [ "Qidi/Qidi Generic PETG-CF" ], @@ -3943,6 +4104,9 @@ "OFgcryz4": [ "Ratrig/RatRig BigNozzle ASA" ], + "OFgdaBOt": [ + "Snapmaker/Polymaker Tough PLA Family" + ], "OFgeM7nD": [ "Flashforge/Flashforge PA12-CF" ], @@ -4030,6 +4194,9 @@ "BBL/COEX PLA", "OrcaFilamentLibrary/COEX PLA" ], + "OFhmxnYw": [ + "Snapmaker/Snapmaker PLA Basic" + ], "OFhuaUQB": [ "OrcaFilamentLibrary/Bambu ABS", "Qidi/Bambu ABS" @@ -4272,6 +4439,12 @@ "OFm70lLt": [ "CoLiDo/CoLiDo PLA" ], + "OFm8rqoY": [ + "re3D/re3D rPP" + ], + "OFmCOW2Y": [ + "re3D/re3D rPETG" + ], "OFmFwUWM": [ "Prusa/Prusament ASA" ], @@ -4849,6 +5022,9 @@ "OFwaYjL6": [ "OrcaFilamentLibrary/Fiberon PA6-GF" ], + "OFwbsgWj": [ + "re3D/re3D PC" + ], "OFwhLMs4": [ "Snapmaker/Snapmaker PLA SnapSpeed" ], @@ -5496,20 +5672,146 @@ ], "QD_3_1_8": [ "Qidi/QIDI PLA Matte Basic" + ], + "QD_4_0_1": [ + "Qidi/Generic PLA" + ], + "QD_4_0_11": [ + "Qidi/Generic ABS" + ], + "QD_4_0_23": [ + "Qidi/Generic PC" + ], + "QD_4_0_4": [ + "Qidi/Generic PLA Silk" + ], + "QD_4_0_41": [ + "Qidi/Generic PETG" + ], + "QD_4_0_50": [ + "Qidi/Generic TPU 95A" + ], + "QD_4_1_1": [ + "Qidi/QIDI PLA Rapido" + ], + "QD_4_1_11": [ + "Qidi/QIDI ABS Rapido" + ], + "QD_4_1_12": [ + "Qidi/QIDI ABS-GF" + ], + "QD_4_1_13": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "QD_4_1_14": [ + "Qidi/QIDI ABS Odorless" + ], + "QD_4_1_15": [ + "Qidi/QIDI TPU-GF" + ], + "QD_4_1_18": [ + "Qidi/QIDI ASA" + ], + "QD_4_1_19": [ + "Qidi/QIDI ASA-Aero" + ], + "QD_4_1_2": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "QD_4_1_20": [ + "Qidi/QIDI ASA-CF" + ], + "QD_4_1_24": [ + "Qidi/QIDI UltraPA" + ], + "QD_4_1_25": [ + "Qidi/QIDI PA6-CF" + ], + "QD_4_1_26": [ + "Qidi/QIDI UltraPA-CF25" + ], + "QD_4_1_27": [ + "Qidi/QIDI PA12-CF" + ], + "QD_4_1_3": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "QD_4_1_30": [ + "Qidi/QIDI PAHT-CF" + ], + "QD_4_1_31": [ + "Qidi/QIDI PAHT-GF" + ], + "QD_4_1_32": [ + "Qidi/QIDI Support For PAHT" + ], + "QD_4_1_33": [ + "Qidi/QIDI Support For PET/PA" + ], + "QD_4_1_34": [ + "Qidi/QIDI PC/ABS-FR" + ], + "QD_4_1_36": [ + "Qidi/QIDI PEBA 95A" + ], + "QD_4_1_37": [ + "Qidi/QIDI PET-CF" + ], + "QD_4_1_38": [ + "Qidi/QIDI PET-GF" + ], + "QD_4_1_39": [ + "Qidi/QIDI PETG Basic" + ], + "QD_4_1_4": [ + "Qidi/QIDI PLA Silk" + ], + "QD_4_1_40": [ + "Qidi/QIDI PETG Tough" + ], + "QD_4_1_41": [ + "Qidi/QIDI PETG Rapido" + ], + "QD_4_1_42": [ + "Qidi/QIDI PETG-CF" + ], + "QD_4_1_43": [ + "Qidi/QIDI PETG-GF" + ], + "QD_4_1_44": [ + "Qidi/QIDI PPS-CF" + ], + "QD_4_1_45": [ + "Qidi/QIDI PETG Translucent" + ], + "QD_4_1_46": [ + "Qidi/QIDI PPS-GF" + ], + "QD_4_1_49": [ + "Qidi/QIDI TPU-Aero" + ], + "QD_4_1_5": [ + "Qidi/QIDI PLA-CF" + ], + "QD_4_1_50": [ + "Qidi/QIDI TPU 95A-HF" + ], + "QD_4_1_6": [ + "Qidi/QIDI WOOD Rapido" + ], + "QD_4_1_7": [ + "Qidi/QIDI PLA Basic" + ], + "QD_4_1_8": [ + "Qidi/QIDI PLA Matte Basic" ] }, "instantiated_with_id": [ - "Afinia/Afinia ABS", - "Afinia/Afinia ABS+", "Afinia/Afinia ABS+@HS", "Afinia/Afinia ABS@HS", - "Afinia/Afinia PLA", "Afinia/Afinia PLA@HS", - "Afinia/Afinia TPU", "Afinia/Afinia TPU@HS", - "Afinia/Afinia Value ABS", "Afinia/Afinia Value ABS@HS", - "Afinia/Afinia Value PLA", "Afinia/Afinia Value PLA@HS", "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle", "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle", @@ -5720,6 +6022,33 @@ "Artillery/Artillery TPU @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery TPU @Artillery M1 Pro 0.8 nozzle", "BBL/Generic SBS", + "BBL/addnorth ABS rABS", + "BBL/addnorth PA Adura", + "BBL/addnorth PA Adura FDA", + "BBL/addnorth PA-CF Adura X", + "BBL/addnorth PA6 Addlantis", + "BBL/addnorth PC BLend HT LCF", + "BBL/addnorth PETG Base", + "BBL/addnorth PETG ESD", + "BBL/addnorth PETG Economy", + "BBL/addnorth PETG Flame v0", + "BBL/addnorth PETG PRO Matte", + "BBL/addnorth PETG rPETG Matte", + "BBL/addnorth PETG-CF Rigid X", + "BBL/addnorth PLA E-PLA", + "BBL/addnorth PLA Economy", + "BBL/addnorth PLA HT-PLA PRO Matte", + "BBL/addnorth PLA Premium Silk", + "BBL/addnorth PLA Textura", + "BBL/addnorth PLA Wood", + "BBL/addnorth PLA X-PLA", + "BBL/addnorth PLA X-PLA High Speed", + "BBL/addnorth PLA rPLA RE-ADD", + "BBL/addnorth PLA-CF Carbon Fiber", + "BBL/addnorth PVDF Adamant S1", + "BBL/addnorth TPU EasyFlex", + "BBL/addnorth TPU Pro Matte 85A", + "BBL/addnorth TPU Pro Matte 95A", "Blocks/Blocks Generic ABS", "Blocks/Blocks Generic ASA", "Blocks/Blocks Generic ASA-CF", @@ -7881,6 +8210,9 @@ "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", + "Snapmaker/Polymaker General PLA Family @U1", + "Snapmaker/Polymaker Silk PLA Family @U1", + "Snapmaker/Polymaker Tough PLA Family @U1", "Snapmaker/Snapmaker ABS Benchy @U1", "Snapmaker/Snapmaker Dual ABS Benchy", "Snapmaker/Snapmaker Dual TPE", @@ -7889,9 +8221,26 @@ "Snapmaker/Snapmaker J1 TPE", "Snapmaker/Snapmaker J1 TPU High-Flow", "Snapmaker/Snapmaker PET @Dual", + "Snapmaker/Snapmaker PLA Full Spectrum @U1 0.4 nozzle", "Snapmaker/Snapmaker PLA Matte @U1", + "Snapmaker/Snapmaker PLA Silk @U1", + "Snapmaker/Snapmaker PLA Silk @U1 0.2 nozzle", + "Snapmaker/Snapmaker PLA Silk @U1 0.6 nozzle", + "Snapmaker/Snapmaker PLA Silk @U1 0.8 nozzle", + "Snapmaker/Snapmaker PLA Wood @U1 0.4 nozzle", + "Snapmaker/Snapmaker PLA Wood @U1 0.6 nozzle", + "Snapmaker/Snapmaker PLA Wood @U1 0.8 nozzle", + "Snapmaker/Snapmaker PLA-CF @U1 0.4 nozzle", + "Snapmaker/Snapmaker PLA-CF @U1 0.6 nozzle", + "Snapmaker/Snapmaker PLA-CF @U1 0.8 nozzle", "Snapmaker/Snapmaker TPE", "Snapmaker/Snapmaker TPE @U1", + "Snapmaker/Snapmaker TPU 90A @U1", + "Snapmaker/Snapmaker TPU 90A @U1 0.6 nozzle", + "Snapmaker/Snapmaker TPU 90A @U1 0.8 nozzle", + "Snapmaker/Snapmaker TPU 95A HF @U1", + "Snapmaker/Snapmaker TPU 95A HF @U1 0.6 nozzle", + "Snapmaker/Snapmaker TPU 95A HF @U1 0.8 nozzle", "Snapmaker/Snapmaker TPU High-Flow @U1", "Sovol/Generic PLA Silk @Sovol SV08 MAX", "Sovol/Polymaker PETG @Sovol SV08 MAX", @@ -8070,9 +8419,6 @@ "iQ/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle", "iQ/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle", "iQ/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle", - "re3D/re3D Greengate rPETG", - "re3D/re3D Greengate rPETG @0.8 nozzle", - "re3D/re3D Greengate rPETG @1.75 nozzle", "re3D/re3D PC", "re3D/re3D PC @0.4 nozzle", "re3D/re3D PC @0.8 nozzle", @@ -8082,6 +8428,9 @@ "re3D/re3D PLA", "re3D/re3D PLA @0.4 nozzle", "re3D/re3D PLA @0.8 nozzle", + "re3D/re3D rPETG", + "re3D/re3D rPETG @0.8 nozzle", + "re3D/re3D rPETG @1.75 nozzle", "re3D/re3D rPP", "re3D/re3D rPP @0.8 nozzle", "re3D/re3D rPP @1.75 nozzle" @@ -8522,6 +8871,13 @@ "PolyTerra J1 PLA" ] ], + "OF44ERDr": [ + [ + "Polymaker", + "PLA", + "Polymaker General PLA Family" + ] + ], "OF44VYzK": [ [ "FilAr", @@ -9628,6 +9984,13 @@ "OrcaArena Generic PLA" ] ], + "OFD8loeT": [ + [ + "re3D", + "PETG", + "re3D rPETG" + ] + ], "OFD9taow": [ [ "FlyingBear", @@ -9684,6 +10047,13 @@ "Generic PLA" ] ], + "OFDdEaoL": [ + [ + "re3D", + "PLA", + "re3D PLA" + ] + ], "OFDe8uyM": [ [ "Valment", @@ -10132,6 +10502,13 @@ "Eolas Prints PLA INGEO 850" ] ], + "OFH57ibH": [ + [ + "Polymaker", + "PLA", + "Polymaker Silk PLA Family" + ] + ], "OFH5UH6P": [ [ "Generic", @@ -10657,6 +11034,13 @@ "Anycubic Generic PLA" ] ], + "OFL9aRjN": [ + [ + "Snapmaker", + "PETG", + "Snapmaker PETG HF" + ] + ], "OFLAXKqP": [ [ "WonderMaker", @@ -10713,6 +11097,13 @@ "Generic ASA" ] ], + "OFLTYJW0": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Translucent" + ] + ], "OFLXvuMr": [ [ "Elegoo", @@ -11175,6 +11566,13 @@ "Prusa Generic PETG HF" ] ], + "OFOPU1xv": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Full Spectrum" + ] + ], "OFObG16Q": [ [ "InfiMech", @@ -11693,13 +12091,6 @@ "FLSun S1 PLA Silk" ] ], - "OFSTCno1": [ - [ - "GreenGate3D", - "PETG", - "re3D Greengate rPETG" - ] - ], "OFSa39yP": [ [ "Snapmaker", @@ -12071,6 +12462,13 @@ "QIDI PLA Rapido Silk" ] ], + "OFW8lqnb": [ + [ + "Snapmaker", + "PETG", + "Snapmaker PETG Translucent" + ] + ], "OFW9uIkE": [ [ "Generic", @@ -12197,6 +12595,13 @@ "Anycubic Generic PETG" ] ], + "OFX0etlv": [ + [ + "re3D", + "PETG", + "re3D PETG" + ] + ], "OFX0ycRQ": [ [ "Polymaker", @@ -12232,6 +12637,13 @@ "Grauts HPP4GF25 P1" ] ], + "OFXSvqOX": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPU 95A HF" + ] + ], "OFXTPuqV": [ [ "Elas", @@ -12337,6 +12749,13 @@ "Snapmaker J1 PLA Matte" ] ], + "OFY7jxcS": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPU 90A" + ] + ], "OFY9muEs": [ [ "Generic", @@ -12904,6 +13323,13 @@ "FilAr PLA Verde Manzana" ] ], + "OFdd8ZqJ": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Wood" + ] + ], "OFdkWDiy": [ [ "Cubicon", @@ -13093,6 +13519,13 @@ "QIDI PETG Translucent" ] ], + "OFf52D4e": [ + [ + "Snapmaker", + "PLA-CF", + "Snapmaker PLA-CF" + ] + ], "OFf5awy4": [ [ "Eolas Prints", @@ -13128,6 +13561,13 @@ "Bambu ASA" ] ], + "OFfD87Gy": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Glow" + ] + ], "OFfHGM1D": [ [ "re3D", @@ -13149,6 +13589,13 @@ "ENDER FAST PLA" ] ], + "OFfYHK5z": [ + [ + "Polymaker", + "PLA", + "Polymaker PLA-HT" + ] + ], "OFfZ0lTS": [ [ "Generic", @@ -13345,6 +13792,13 @@ "RatRig BigNozzle ASA" ] ], + "OFgdaBOt": [ + [ + "Polymaker", + "PLA", + "Polymaker Tough PLA Family" + ] + ], "OFgeM7nD": [ [ "Flashforge", @@ -13534,6 +13988,13 @@ "COEX PLA" ] ], + "OFhmxnYw": [ + [ + "Snapmaker", + "PLA", + "Snapmaker PLA Basic" + ] + ], "OFhuaUQB": [ [ "Bambu Lab", @@ -14073,6 +14534,20 @@ "CoLiDo PLA" ] ], + "OFm8rqoY": [ + [ + "re3D", + "PP", + "re3D rPP" + ] + ], + "OFmCOW2Y": [ + [ + "re3D", + "PETG", + "re3D rPETG" + ] + ], "OFmFwUWM": [ [ "Prusa Polymers", @@ -15361,6 +15836,13 @@ "Fiberon PA6-GF" ] ], + "OFwbsgWj": [ + [ + "re3D", + "PC", + "re3D PC" + ] + ], "OFwhLMs4": [ [ "Snapmaker", From 1c405f8a2c1d174649e4af451195461b8398c07e Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 21 Aug 2026 18:34:20 +0800 Subject: [PATCH 22/52] filament_id v4.1: resolve retired QD_* ids in the Qidi box miss path QidiPrinterAgent composes QD___ setting ids from device enums and previously degraded any slot whose id matched no visible preset to generic-by-type. Plan v4.2 retires every QD_* preset id to the succession ledger, so insert the ledger walk between the direct match and the generic fallback: a composed QD_* id now forwards to its family's minted OF* successor exactly like every other retired id. Behavior-neutral until the ids are actually retired (the ledger holds no QD_* keys yet, and live QD_* presets still match directly). Also documents the code<->ledger lockstep on the hardcoded non-numeric- series fallback table (QD_1_0_1/_11/_41/_50) and adds a C++ test pinning that the succession walk is key-format agnostic. Gates: libslic3r_tests [filament_id] 14 assertions green; libslic3r_gui compiles. --- src/slic3r/Utils/QidiPrinterAgent.cpp | 12 +++++++++++- tests/libslic3r/test_filament_id_succession.cpp | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/slic3r/Utils/QidiPrinterAgent.cpp b/src/slic3r/Utils/QidiPrinterAgent.cpp index 6b05480194..22b8d37735 100644 --- a/src/slic3r/Utils/QidiPrinterAgent.cpp +++ b/src/slic3r/Utils/QidiPrinterAgent.cpp @@ -188,7 +188,13 @@ bool QidiPrinterAgent::fetch_slot_info(const std::string& base_url, } else if (!setting_id.empty() && has_visible_base_preset(bundle->filaments, setting_id)) { tray.tray_info_idx = setting_id; } else { - tray.tray_info_idx = bundle->filaments.filament_id_by_type(tray.tray_type); + // Retired QD_* protocol ids forward to their minted successors via the shipped ledger. + const std::string successor = setting_id.empty() ? std::string() + : resolve_filament_id_succession(setting_id); + if (!successor.empty() && has_visible_base_preset(bundle->filaments, successor)) + tray.tray_info_idx = successor; + else + tray.tray_info_idx = bundle->filaments.filament_id_by_type(tray.tray_type); } // Look up color from dictionary @@ -324,6 +330,10 @@ void QidiPrinterAgent::parse_filament_sections(const std::string& content, std:: std::string QidiPrinterAgent::map_filament_type_to_setting_id(const std::string& filament_type) { + // These QD_* protocol ids no longer appear on any preset: they are retired ledger keys + // that parse_box_status resolves through resolve_filament_id_succession(). Each literal + // must stay a ledger key whose chain ends at a live preset id — + // scripts/tests/test_filament_id.py parses this function and enforces that. const std::string upper = trim_and_upper(filament_type); if (upper == "PLA") { diff --git a/tests/libslic3r/test_filament_id_succession.cpp b/tests/libslic3r/test_filament_id_succession.cpp index 36268277f8..12fa82f9bb 100644 --- a/tests/libslic3r/test_filament_id_succession.cpp +++ b/tests/libslic3r/test_filament_id_succession.cpp @@ -34,6 +34,14 @@ TEST_CASE("filament_id succession follows forwarding chains", "[Preset][filament CHECK(follow_filament_id_succession("OFchainB", forwards) == "OFlive00"); CHECK(follow_filament_id_succession("OFchainC", forwards) == "OFlive00"); } + + // QidiPrinterAgent resolves device-composed QD_* protocol ids through this same walk; + // the map key format carries no OF assumption. + SECTION("device-protocol QD_* keys forward like any other id") { + const std::map qd = {{"QD_2_1_11", "OFnew001"}}; + CHECK(follow_filament_id_succession("QD_2_1_11", qd) == "OFnew001"); + CHECK(follow_filament_id_succession("QD_2_1_12", qd).empty()); + } } // Cycles are a ledger-validation error (script check 9) and never ship, but the client From 8d83414d095b317b5f8f3bb46e0f1edf2a9af69a Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 21 Aug 2026 18:34:20 +0800 Subject: [PATCH 23/52] filament_id v4.2a: dissolve the QD_* island in the tooling (plan v4 SS3) - is_island_declaration: only BBL remains an island; Qidi QD_* declarations now enter the triple bookkeeping (checks 3 and 8, --remint's domain). - reserved_space_owner: QD_* stays reserved but ownerless -- no vendor may declare it, --update-snapshot refuses new QD_* ids outright, and vanished QD_* ids take the retired-with-successor path instead of the island release-with-hint path. New reserved_space_desc() names the space in check 6 / sanction-gate messages. - Check 1 drops the vendor-Qidi QD_* format exemption; --add-hint now refuses QD_* keys (island space is GF* only); docstrings updated. - Snapshot regenerated: the 204 QD_* declarer triples are now recorded (declared triples 1113 -> 1317); ids/claims unchanged. - Tests updated for the flip; new (skipped until v4.2b) lockstep test asserting the QidiPrinterAgent fallback QD_* literals stay retired ledger keys chaining to live ids. Tree state is untouched: presets still declare their QD_* ids, all grandfathered by the snapshot. --check exit 0; 117 script tests OK. --- scripts/assign_filament_ids.py | 47 +- scripts/filament_id_snapshot.json | 1428 +++++++++++++++++++++++++++++ scripts/tests/test_filament_id.py | 34 +- 3 files changed, 1488 insertions(+), 21 deletions(-) diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index 6f12554f14..c5e6aefe58 100644 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -26,7 +26,11 @@ Policy (companion to assign_vendor_setting_ids.py; see filament_id_plan_v3.md): resolving. * Reserved id spaces that are never minted into or altered: - GF* Bambu AMS/RFID catalog (vendor BBL untouchable) - - QD_* Qidi device protocol + - QD_* Qidi device protocol (dissolved island, plan v4: + every shipped QD_* id is retired in the ledger and + the QidiPrinterAgent translates device-composed + QD_* ids through the succession walk; no preset + may ever declare one again) - P + 7 hex chars (case-insensitive) and the literal "null" user-custom presets (CreatePresetsDialog.cpp) - every already-shipped id, grandfathered via scripts/filament_id_snapshot.json @@ -40,7 +44,7 @@ Policy (companion to assign_vendor_setting_ids.py; see filament_id_plan_v3.md): rule over the vanished id's old claims — and the runtime follows those chains (plus cross-island "hints" for ids Orca cannot retire, e.g. GF*) on resolution miss. A retired id may never be used again for anything. - Vanished ids in a FOREIGN island's space (GF*/QD_*) are released with a + Vanished ids in a FOREIGN island's space (GF*) are released with a hint instead of retired: the island's catalog owns them and may legitimately (re)ship them. @@ -325,8 +329,9 @@ def resolve_triple(name, filaments, ofl_filaments): def is_island_declaration(vendor, fid): - """Declarations frozen outside the OF mint domain: all of BBL, QD_* in Qidi.""" - return vendor == "BBL" or (vendor == "Qidi" and fid.startswith("QD_")) + """Declarations frozen outside the OF mint domain: all of BBL (the QD_* + island was dissolved by plan v4 — Qidi declarations mint like any other).""" + return vendor == "BBL" def analyze_tree(profiles_dir): @@ -598,12 +603,21 @@ def reserved_space_owner(fid): if fid.startswith("GF"): return True, "BBL" if fid.startswith("QD_"): - return True, "Qidi" + return True, None # dissolved Qidi device-protocol space: NO vendor may declare it if USER_CUSTOM_ID_RE.match(fid) or fid == "null": return True, None # user-custom space: no system vendor may own it return False, None +def reserved_space_desc(fid, owner): + """Human description of a reserved space for error messages.""" + if owner: + return f"owned by {owner}" + if fid.startswith("QD_"): + return "Qidi device protocol; dissolved island — ids are retired, never declarable" + return "reserved for user-custom presets" + + # --------------------------------------------------------------------------- # Checks (imported and called tree-wide by orca_extra_profile_check.py) # --------------------------------------------------------------------------- @@ -613,8 +627,7 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, """Validate filament_id state across every vendor. Returns the error count. 1. Format: every id occurring in the tree (declared or effective) must be in - the snapshot, or match ^OF[0-9A-Za-z]{6}$, or belong to vendor BBL, or be - a QD_* id within vendor Qidi. + the snapshot, or match ^OF[0-9A-Za-z]{6}$, or belong to vendor BBL. 2. Snapshot equality, both directions: the tree-derived id->families multimap AND the id->triples map of the declarers must equal the snapshot exactly (the snapshot diff is the maintainer gate). @@ -625,8 +638,8 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, 5. Alias hygiene: a vendor preset riding an OFL family must keep the OFL base name, claim printers via non-empty compatible_printers, and declare no filament_id key of its own. - 6. Reserved namespaces (GF*/QD_*/P-hex/"null") only for their owner vendors, - except claims grandfathered in the snapshot. + 6. Reserved namespaces (GF* for BBL; QD_*/P-hex/"null" for nobody) must not + be claimed by other vendors, except claims grandfathered in the snapshot. 7. Structure ratchet: (a) no NEW instantiated preset carries its own filament_id key; (b) no NEW declared-vs-inherited id drift; (c) every instantiated filament resolves an effective id (a hard load error in C++). @@ -664,8 +677,6 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, continue if vendor == "BBL": continue - if vendor == "Qidi" and fid.startswith("QD_"): - continue print_error( f'filament_id "{fid}" ({vendor}) is neither grandfathered in the ' f'snapshot nor a minted "OF" id; new family ids must come from ' @@ -765,7 +776,7 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, continue if claim in snap_ids.get(fid, []): continue # grandfathered - space = f"owned by {owner}" if owner else "reserved for user-custom presets" + space = reserved_space_desc(fid, owner) print_error( f'filament_id "{fid}" of "{claim}" is in a reserved id space ' f"({space}) and must not be claimed by system presets of other vendors") @@ -861,7 +872,7 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, if island is None: print_error( f'hint key "{key}" ({RETIRED_REL}) is not in an island id space ' - f"(GF*/QD_*); non-island ids are retired with a successor instead") + f"(GF*); non-island ids are retired with a successor instead") errors += 1 continue if key in retired: @@ -902,7 +913,7 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, Vanished ids gain a succession-ledger entry whose successor is picked by the mode rule over their old claims (None when the family died heirless); - vanished ids in a foreign island's space (GF*/QD_*) are released with a + vanished ids in a foreign island's space (GF*) are released with a hint instead — the island catalog owns them, so they must stay mintable there and must never be blocked by check 4. --forget-never-shipped lists ids to drop from lineage instead of retiring @@ -955,7 +966,7 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, refusals.append((fid, f"{vendor}/(declared only)", owner)) if refusals and not allow_shared_catalog: for fid, claim, owner in refusals: - space = f"owned by {owner}" if owner else "reserved for user-custom presets" + space = reserved_space_desc(fid, owner) print_error( f'refusing to sanction new claim "{claim}" on reserved-namespace id ' f'"{fid}" ({space}); pass --allow-shared-catalog only for ' @@ -977,7 +988,7 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, # Retire ids that fully vanished from the tree (append-only ledger), with a # mode-rule successor so devices and user presets keep resolving. Vanished - # ids in a FOREIGN island's reserved space (GF*/QD_*) are never retired — + # ids in a FOREIGN island's reserved space (GF*) are never retired — # the island's catalog still owns them and may legitimately (re)ship them — # they are RELEASED, with a succession hint so they keep resolving on miss. claim_ids = claim_effective_ids(analysis) @@ -1073,7 +1084,7 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, def add_hints(pairs, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): """--add-hint "OLD=NEW": forward an island-space id to a live id. - OLD must sit in an island id space (GF*/QD_*), must not be retired, and — + OLD must sit in an island id space (GF*), must not be retired, and — when live in the tree — may be declared only by island vendors (Orca cannot retire it). An absent OLD is fine: island catalogs own ids Orca never shipped or has released. NEW must be live in the tree. All pairs validate @@ -1103,7 +1114,7 @@ def add_hints(pairs, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): errors += 1 elif island is None: print_error( - f'--add-hint: "{old}" is not in an island id space (GF*/QD_*); ' + f'--add-hint: "{old}" is not in an island id space (GF*); ' f"non-island ids are retired with a successor by --update-snapshot") errors += 1 elif outsiders: diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index c8ae5b34be..14d207b34f 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -16227,6 +16227,1434 @@ "ABS", "FLSun S1 ABS" ] + ], + "QD_0_1_1": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido" + ] + ], + "QD_0_1_15": [ + [ + "QIDI", + "TPU-GF", + "QIDI TPU-GF" + ] + ], + "QD_0_1_2": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Matte" + ] + ], + "QD_0_1_20": [ + [ + "QIDI", + "ASA-CF", + "QIDI ASA-CF" + ] + ], + "QD_0_1_24": [ + [ + "QIDI", + "UltraPA", + "QIDI PA-Ultra" + ] + ], + "QD_0_1_26": [ + [ + "QIDI", + "UltraPA-CF25", + "QIDI UltraPA-CF25" + ] + ], + "QD_0_1_27": [ + [ + "QIDI", + "PA12-CF", + "QIDI PA12-CF" + ] + ], + "QD_0_1_3": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Metal" + ] + ], + "QD_0_1_30": [ + [ + "QIDI", + "PAHT-CF", + "QIDI PAHT-CF" + ] + ], + "QD_0_1_31": [ + [ + "QIDI", + "PAHT-GF", + "QIDI PAHT-GF" + ] + ], + "QD_0_1_32": [ + [ + "QIDI", + "PAHT-S", + "QIDI Support For PAHT" + ] + ], + "QD_0_1_33": [ + [ + "QIDI", + "PA-S", + "QIDI Support For PET/PA" + ] + ], + "QD_0_1_34": [ + [ + "QIDI", + "PC-ABS-FR", + "Qidi PC-ABS-FR" + ] + ], + "QD_0_1_36": [ + [ + "QIDI", + "PEBA", + "QIDI PEBA 95A" + ] + ], + "QD_0_1_37": [ + [ + "QIDI", + "PET-CF", + "QIDI PET-CF" + ] + ], + "QD_0_1_38": [ + [ + "QIDI", + "PET-GF", + "QIDI PET-GF" + ] + ], + "QD_0_1_39": [ + [ + "QIDI", + "PETG", + "QIDI PETG Basic" + ] + ], + "QD_0_1_4": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Silk" + ] + ], + "QD_0_1_40": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough" + ] + ], + "QD_0_1_41": [ + [ + "QIDI", + "PETG", + "QIDI PETG Rapido" + ] + ], + "QD_0_1_42": [ + [ + "QIDI", + "PETG-CF", + "QIDI PETG-CF" + ] + ], + "QD_0_1_43": [ + [ + "QIDI", + "PETG-GF", + "QIDI PETG-GF" + ] + ], + "QD_0_1_44": [ + [ + "QIDI", + "PPS-CF", + "QIDI PPS-CF" + ] + ], + "QD_0_1_45": [ + [ + "QIDI", + "PETG", + "QIDI PETG Translucent" + ] + ], + "QD_0_1_46": [ + [ + "QIDI", + "PPS-GF", + "QIDI PPS-GF" + ] + ], + "QD_0_1_49": [ + [ + "QIDI", + "TPU-AERO", + "QIDI TPU-Aero" + ] + ], + "QD_0_1_5": [ + [ + "QIDI", + "PLA-CF", + "QIDI PLA-CF" + ] + ], + "QD_0_1_50": [ + [ + "QIDI", + "TPU", + "Qidi TPU 95A-HF" + ] + ], + "QD_0_1_6": [ + [ + "QIDI", + "PLA", + "QIDI WOOD Rapido" + ] + ], + "QD_0_1_7": [ + [ + "QIDI", + "PLA", + "QIDI PLA Basic" + ] + ], + "QD_0_1_8": [ + [ + "QIDI", + "PLA", + "QIDI PLA Matte Basic" + ] + ], + "QD_1_0_1": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "QD_1_0_11": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "QD_1_0_23": [ + [ + "Generic", + "PC", + "Generic PC" + ] + ], + "QD_1_0_4": [ + [ + "Generic", + "PLA", + "Generic PLA Silk" + ] + ], + "QD_1_0_41": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "QD_1_0_50": [ + [ + "Generic", + "TPU", + "Generic TPU 95A" + ] + ], + "QD_1_1_1": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido" + ] + ], + "QD_1_1_11": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido" + ] + ], + "QD_1_1_12": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF" + ] + ], + "QD_1_1_13": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido Metal" + ] + ], + "QD_1_1_14": [ + [ + "QIDI", + "ABS", + "QIDI ABS Odorless" + ] + ], + "QD_1_1_15": [ + [ + "QIDI", + "TPU-GF", + "QIDI TPU-GF" + ] + ], + "QD_1_1_18": [ + [ + "QIDI", + "ASA", + "QIDI ASA" + ] + ], + "QD_1_1_19": [ + [ + "QIDI", + "ASA-AERO", + "QIDI ASA-Aero" + ] + ], + "QD_1_1_2": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Matte" + ] + ], + "QD_1_1_20": [ + [ + "QIDI", + "ASA-CF", + "QIDI ASA-CF" + ] + ], + "QD_1_1_24": [ + [ + "QIDI", + "UltraPA", + "QIDI UltraPA" + ] + ], + "QD_1_1_26": [ + [ + "QIDI", + "UltraPA-CF25", + "QIDI UltraPA-CF25" + ] + ], + "QD_1_1_27": [ + [ + "QIDI", + "PA12-CF", + "QIDI PA12-CF" + ] + ], + "QD_1_1_3": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Metal" + ] + ], + "QD_1_1_30": [ + [ + "QIDI", + "PAHT-CF", + "QIDI PAHT-CF" + ] + ], + "QD_1_1_31": [ + [ + "QIDI", + "PAHT-GF", + "QIDI PAHT-GF" + ] + ], + "QD_1_1_32": [ + [ + "QIDI", + "PAHT-S", + "QIDI Support For PAHT" + ] + ], + "QD_1_1_33": [ + [ + "QIDI", + "PA-S", + "QIDI Support For PET/PA" + ] + ], + "QD_1_1_34": [ + [ + "QIDI", + "PC-ABS-FR", + "QIDI PC-ABS-FR" + ] + ], + "QD_1_1_36": [ + [ + "QIDI", + "PEBA", + "QIDI PEBA 95A" + ] + ], + "QD_1_1_37": [ + [ + "QIDI", + "PET-CF", + "QIDI PET-CF" + ] + ], + "QD_1_1_38": [ + [ + "QIDI", + "PET-GF", + "QIDI PET-GF" + ] + ], + "QD_1_1_39": [ + [ + "QIDI", + "PETG", + "QIDI PETG Basic" + ] + ], + "QD_1_1_4": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Silk" + ] + ], + "QD_1_1_40": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough" + ] + ], + "QD_1_1_41": [ + [ + "QIDI", + "PETG", + "QIDI PETG Rapido" + ] + ], + "QD_1_1_42": [ + [ + "QIDI", + "PETG-CF", + "QIDI PETG-CF" + ] + ], + "QD_1_1_43": [ + [ + "QIDI", + "PETG-GF", + "QIDI PETG-GF" + ] + ], + "QD_1_1_44": [ + [ + "QIDI", + "PPS-CF", + "QIDI PPS-CF" + ] + ], + "QD_1_1_45": [ + [ + "QIDI", + "PETG", + "QIDI PETG Translucent" + ] + ], + "QD_1_1_46": [ + [ + "QIDI", + "PPS-GF", + "QIDI PPS-GF" + ] + ], + "QD_1_1_49": [ + [ + "QIDI", + "TPU-AERO", + "QIDI TPU-Aero" + ] + ], + "QD_1_1_5": [ + [ + "QIDI", + "PLA-CF", + "QIDI PLA-CF" + ] + ], + "QD_1_1_50": [ + [ + "QIDI", + "TPU", + "QIDI TPU 95A-HF" + ] + ], + "QD_1_1_6": [ + [ + "QIDI", + "PLA", + "QIDI WOOD Rapido" + ] + ], + "QD_1_1_7": [ + [ + "QIDI", + "PLA", + "QIDI PLA Basic" + ] + ], + "QD_1_1_8": [ + [ + "QIDI", + "PLA", + "QIDI PLA Matte Basic" + ] + ], + "QD_2_0_1": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "QD_2_0_11": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "QD_2_0_23": [ + [ + "Generic", + "PC", + "Generic PC" + ] + ], + "QD_2_0_4": [ + [ + "Generic", + "PLA", + "Generic PLA Silk" + ] + ], + "QD_2_0_41": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "QD_2_0_50": [ + [ + "Generic", + "TPU", + "Generic TPU 95A" + ] + ], + "QD_2_1_1": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido" + ] + ], + "QD_2_1_11": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido" + ] + ], + "QD_2_1_12": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF" + ] + ], + "QD_2_1_13": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido Metal" + ] + ], + "QD_2_1_14": [ + [ + "QIDI", + "ABS", + "QIDI ABS Odorless" + ] + ], + "QD_2_1_15": [ + [ + "QIDI", + "TPU-GF", + "QIDI TPU-GF" + ] + ], + "QD_2_1_18": [ + [ + "QIDI", + "ASA", + "QIDI ASA" + ] + ], + "QD_2_1_19": [ + [ + "QIDI", + "ASA-AERO", + "QIDI ASA-Aero" + ] + ], + "QD_2_1_2": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Matte" + ] + ], + "QD_2_1_20": [ + [ + "QIDI", + "ASA-CF", + "QIDI ASA-CF" + ] + ], + "QD_2_1_24": [ + [ + "QIDI", + "UltraPA", + "QIDI UltraPA" + ] + ], + "QD_2_1_26": [ + [ + "QIDI", + "UltraPA-CF25", + "QIDI UltraPA-CF25" + ] + ], + "QD_2_1_27": [ + [ + "QIDI", + "PA12-CF", + "QIDI PA12-CF" + ] + ], + "QD_2_1_3": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Metal" + ] + ], + "QD_2_1_30": [ + [ + "QIDI", + "PAHT-CF", + "QIDI PAHT-CF" + ] + ], + "QD_2_1_31": [ + [ + "QIDI", + "PAHT-GF", + "QIDI PAHT-GF" + ] + ], + "QD_2_1_32": [ + [ + "QIDI", + "PAHT-S", + "QIDI Support For PAHT" + ] + ], + "QD_2_1_33": [ + [ + "QIDI", + "PA-S", + "QIDI Support For PET/PA" + ] + ], + "QD_2_1_34": [ + [ + "QIDI", + "PC-ABS-FR", + "QIDI PC-ABS-FR" + ] + ], + "QD_2_1_36": [ + [ + "QIDI", + "PEBA", + "QIDI PEBA 95A" + ] + ], + "QD_2_1_37": [ + [ + "QIDI", + "PET-CF", + "QIDI PET-CF" + ] + ], + "QD_2_1_38": [ + [ + "QIDI", + "PET-GF", + "QIDI PET-GF" + ] + ], + "QD_2_1_39": [ + [ + "QIDI", + "PETG", + "QIDI PETG Basic" + ] + ], + "QD_2_1_4": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Silk" + ] + ], + "QD_2_1_40": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough" + ] + ], + "QD_2_1_41": [ + [ + "QIDI", + "PETG", + "QIDI PETG Rapido" + ] + ], + "QD_2_1_42": [ + [ + "QIDI", + "PETG-CF", + "QIDI PETG-CF" + ] + ], + "QD_2_1_43": [ + [ + "QIDI", + "PETG-GF", + "QIDI PETG-GF" + ] + ], + "QD_2_1_44": [ + [ + "QIDI", + "PPS-CF", + "QIDI PPS-CF" + ] + ], + "QD_2_1_45": [ + [ + "QIDI", + "PETG", + "QIDI PETG Translucent" + ] + ], + "QD_2_1_46": [ + [ + "QIDI", + "PPS-GF", + "QIDI PPS-GF" + ] + ], + "QD_2_1_49": [ + [ + "QIDI", + "TPU-AERO", + "QIDI TPU-Aero" + ] + ], + "QD_2_1_5": [ + [ + "QIDI", + "PLA-CF", + "QIDI PLA-CF" + ] + ], + "QD_2_1_50": [ + [ + "QIDI", + "TPU", + "QIDI TPU 95A-HF" + ] + ], + "QD_2_1_6": [ + [ + "QIDI", + "PLA", + "QIDI WOOD Rapido" + ] + ], + "QD_2_1_7": [ + [ + "QIDI", + "PLA", + "QIDI PLA Basic" + ] + ], + "QD_2_1_8": [ + [ + "QIDI", + "PLA", + "QIDI PLA Matte Basic" + ] + ], + "QD_3_0_1": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "QD_3_0_11": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "QD_3_0_23": [ + [ + "Generic", + "PC", + "Generic PC" + ] + ], + "QD_3_0_4": [ + [ + "Generic", + "PLA", + "Generic PLA Silk" + ] + ], + "QD_3_0_41": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "QD_3_0_50": [ + [ + "Generic", + "TPU", + "Generic TPU 95A" + ] + ], + "QD_3_1_1": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido" + ] + ], + "QD_3_1_11": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido" + ] + ], + "QD_3_1_12": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF" + ] + ], + "QD_3_1_13": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido Metal" + ] + ], + "QD_3_1_14": [ + [ + "QIDI", + "ABS", + "QIDI ABS Odorless" + ] + ], + "QD_3_1_15": [ + [ + "QIDI", + "TPU-GF", + "QIDI TPU-GF" + ] + ], + "QD_3_1_18": [ + [ + "QIDI", + "ASA", + "QIDI ASA" + ] + ], + "QD_3_1_19": [ + [ + "QIDI", + "ASA-AERO", + "QIDI ASA-Aero" + ] + ], + "QD_3_1_2": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Matte" + ] + ], + "QD_3_1_20": [ + [ + "QIDI", + "ASA-CF", + "QIDI ASA-CF" + ] + ], + "QD_3_1_24": [ + [ + "QIDI", + "UltraPA", + "QIDI UltraPA" + ] + ], + "QD_3_1_26": [ + [ + "QIDI", + "UltraPA-CF25", + "QIDI UltraPA-CF25" + ] + ], + "QD_3_1_27": [ + [ + "QIDI", + "PA12-CF", + "QIDI PA12-CF" + ] + ], + "QD_3_1_3": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Metal" + ] + ], + "QD_3_1_30": [ + [ + "QIDI", + "PAHT-CF", + "QIDI PAHT-CF" + ] + ], + "QD_3_1_31": [ + [ + "QIDI", + "PAHT-GF", + "QIDI PAHT-GF" + ] + ], + "QD_3_1_32": [ + [ + "QIDI", + "PAHT-S", + "QIDI Support For PAHT" + ] + ], + "QD_3_1_33": [ + [ + "QIDI", + "PA-S", + "QIDI Support For PET/PA" + ] + ], + "QD_3_1_34": [ + [ + "QIDI", + "PC-ABS-FR", + "QIDI PC/ABS-FR" + ] + ], + "QD_3_1_36": [ + [ + "QIDI", + "PEBA", + "QIDI PEBA 95A" + ] + ], + "QD_3_1_37": [ + [ + "QIDI", + "PET-CF", + "QIDI PET-CF" + ] + ], + "QD_3_1_38": [ + [ + "QIDI", + "PET-GF", + "QIDI PET-GF" + ] + ], + "QD_3_1_39": [ + [ + "QIDI", + "PETG", + "QIDI PETG Basic" + ] + ], + "QD_3_1_4": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Silk" + ] + ], + "QD_3_1_40": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough" + ] + ], + "QD_3_1_41": [ + [ + "QIDI", + "PETG", + "QIDI PETG Rapido" + ] + ], + "QD_3_1_42": [ + [ + "QIDI", + "PETG-CF", + "QIDI PETG-CF" + ] + ], + "QD_3_1_43": [ + [ + "QIDI", + "PETG-GF", + "QIDI PETG-GF" + ] + ], + "QD_3_1_44": [ + [ + "QIDI", + "PPS-CF", + "QIDI PPS-CF" + ] + ], + "QD_3_1_45": [ + [ + "QIDI", + "PETG", + "QIDI PETG Translucent" + ] + ], + "QD_3_1_46": [ + [ + "QIDI", + "PPS-GF", + "QIDI PPS-GF" + ] + ], + "QD_3_1_49": [ + [ + "QIDI", + "TPU-AERO", + "QIDI TPU-Aero" + ] + ], + "QD_3_1_5": [ + [ + "QIDI", + "PLA-CF", + "QIDI PLA-CF" + ] + ], + "QD_3_1_50": [ + [ + "QIDI", + "TPU", + "QIDI TPU 95A-HF" + ] + ], + "QD_3_1_6": [ + [ + "QIDI", + "PLA", + "QIDI WOOD Rapido" + ] + ], + "QD_3_1_7": [ + [ + "QIDI", + "PLA", + "QIDI PLA Basic" + ] + ], + "QD_3_1_8": [ + [ + "QIDI", + "PLA", + "QIDI PLA Matte Basic" + ] + ], + "QD_4_0_1": [ + [ + "Generic", + "PLA", + "Generic PLA" + ] + ], + "QD_4_0_11": [ + [ + "Generic", + "ABS", + "Generic ABS" + ] + ], + "QD_4_0_23": [ + [ + "Generic", + "PC", + "Generic PC" + ] + ], + "QD_4_0_4": [ + [ + "Generic", + "PLA", + "Generic PLA Silk" + ] + ], + "QD_4_0_41": [ + [ + "Generic", + "PETG", + "Generic PETG" + ] + ], + "QD_4_0_50": [ + [ + "Generic", + "TPU", + "Generic TPU 95A" + ] + ], + "QD_4_1_1": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido" + ] + ], + "QD_4_1_11": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido" + ] + ], + "QD_4_1_12": [ + [ + "QIDI", + "ABS-GF", + "QIDI ABS-GF" + ] + ], + "QD_4_1_13": [ + [ + "QIDI", + "ABS", + "QIDI ABS Rapido Metal" + ] + ], + "QD_4_1_14": [ + [ + "QIDI", + "ABS", + "QIDI ABS Odorless" + ] + ], + "QD_4_1_15": [ + [ + "QIDI", + "TPU-GF", + "QIDI TPU-GF" + ] + ], + "QD_4_1_18": [ + [ + "QIDI", + "ASA", + "QIDI ASA" + ] + ], + "QD_4_1_19": [ + [ + "QIDI", + "ASA-AERO", + "QIDI ASA-Aero" + ] + ], + "QD_4_1_2": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Matte" + ] + ], + "QD_4_1_20": [ + [ + "QIDI", + "ASA-CF", + "QIDI ASA-CF" + ] + ], + "QD_4_1_24": [ + [ + "QIDI", + "UltraPA", + "QIDI UltraPA" + ] + ], + "QD_4_1_25": [ + [ + "QIDI", + "PA6-CF", + "QIDI PA6-CF" + ] + ], + "QD_4_1_26": [ + [ + "QIDI", + "UltraPA-CF25", + "QIDI UltraPA-CF25" + ] + ], + "QD_4_1_27": [ + [ + "QIDI", + "PA12-CF", + "QIDI PA12-CF" + ] + ], + "QD_4_1_3": [ + [ + "QIDI", + "PLA", + "QIDI PLA Rapido Metal" + ] + ], + "QD_4_1_30": [ + [ + "QIDI", + "PAHT-CF", + "QIDI PAHT-CF" + ] + ], + "QD_4_1_31": [ + [ + "QIDI", + "PAHT-GF", + "QIDI PAHT-GF" + ] + ], + "QD_4_1_32": [ + [ + "QIDI", + "PAHT-S", + "QIDI Support For PAHT" + ] + ], + "QD_4_1_33": [ + [ + "QIDI", + "PA-S", + "QIDI Support For PET/PA" + ] + ], + "QD_4_1_34": [ + [ + "QIDI", + "PC-ABS-FR", + "QIDI PC/ABS-FR" + ] + ], + "QD_4_1_36": [ + [ + "QIDI", + "PEBA", + "QIDI PEBA 95A" + ] + ], + "QD_4_1_37": [ + [ + "QIDI", + "PET-CF", + "QIDI PET-CF" + ] + ], + "QD_4_1_38": [ + [ + "QIDI", + "PET-GF", + "QIDI PET-GF" + ] + ], + "QD_4_1_39": [ + [ + "QIDI", + "PETG", + "QIDI PETG Basic" + ] + ], + "QD_4_1_4": [ + [ + "QIDI", + "PLA", + "QIDI PLA Silk" + ] + ], + "QD_4_1_40": [ + [ + "QIDI", + "PETG", + "QIDI PETG Tough" + ] + ], + "QD_4_1_41": [ + [ + "QIDI", + "PETG", + "QIDI PETG Rapido" + ] + ], + "QD_4_1_42": [ + [ + "QIDI", + "PETG-CF", + "QIDI PETG-CF" + ] + ], + "QD_4_1_43": [ + [ + "QIDI", + "PETG-GF", + "QIDI PETG-GF" + ] + ], + "QD_4_1_44": [ + [ + "QIDI", + "PPS-CF", + "QIDI PPS-CF" + ] + ], + "QD_4_1_45": [ + [ + "QIDI", + "PETG", + "QIDI PETG Translucent" + ] + ], + "QD_4_1_46": [ + [ + "QIDI", + "PPS-GF", + "QIDI PPS-GF" + ] + ], + "QD_4_1_49": [ + [ + "QIDI", + "TPU-AERO", + "QIDI TPU-Aero" + ] + ], + "QD_4_1_5": [ + [ + "QIDI", + "PLA-CF", + "QIDI PLA-CF" + ] + ], + "QD_4_1_50": [ + [ + "QIDI", + "TPU", + "QIDI TPU 95A-HF" + ] + ], + "QD_4_1_6": [ + [ + "QIDI", + "PLA", + "QIDI WOOD Rapido" + ] + ], + "QD_4_1_7": [ + [ + "QIDI", + "PLA", + "QIDI PLA Basic" + ] + ], + "QD_4_1_8": [ + [ + "QIDI", + "PLA", + "QIDI PLA Matte Basic" + ] ] } } diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index cfba38866c..0918702017 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -8,6 +8,7 @@ import contextlib import io import json import os +import re import shutil import sys import tempfile @@ -400,7 +401,8 @@ class TestTripleResolution(unittest.TestCase): class TestReservedSpaces(unittest.TestCase): def test_owners(self): self.assertEqual(afi.reserved_space_owner("GFL99"), (True, "BBL")) - self.assertEqual(afi.reserved_space_owner("QD_X4_PLA"), (True, "Qidi")) + # dissolved island (plan v4): reserved, but no vendor may declare it + self.assertEqual(afi.reserved_space_owner("QD_X4_PLA"), (True, None)) self.assertEqual(afi.reserved_space_owner("P1234abc"), (True, None)) self.assertEqual(afi.reserved_space_owner("pAbCdEf1"), (True, None)) # case-insensitive self.assertEqual(afi.reserved_space_owner("null"), (True, None)) @@ -410,7 +412,8 @@ class TestReservedSpaces(unittest.TestCase): def test_island_declarations(self): self.assertTrue(afi.is_island_declaration("BBL", "GFL99")) self.assertTrue(afi.is_island_declaration("BBL", "OF5CgdDq")) - self.assertTrue(afi.is_island_declaration("Qidi", "QD_X4_PLA")) + # dissolved island (plan v4): Qidi declarations mint like any other + self.assertFalse(afi.is_island_declaration("Qidi", "QD_X4_PLA")) self.assertFalse(afi.is_island_declaration("Qidi", "OF5CgdDq")) self.assertFalse(afi.is_island_declaration("VendorA", "GFL99")) @@ -567,7 +570,7 @@ class TestChecks(SyntheticTreeCase): def test_check6_reserved_namespace_claims(self): for fid, marker in [("GFX99", "owned by BBL"), - ("QD_X_PLA", "owned by Qidi"), + ("QD_X_PLA", "dissolved island"), ("P1a2b3c4", "user-custom"), ("null", "user-custom")]: with self.subTest(fid=fid): @@ -1478,6 +1481,31 @@ class TestRealTree(unittest.TestCase): self.assertEqual(analysis["missing_effective"], []) self.assertEqual(analysis["read_errors"], []) + # Code<->ledger lockstep for the Qidi box (plan v4 SS2): the QD_* literals + # QidiPrinterAgent::map_filament_type_to_setting_id returns must stay + # retired ledger keys whose chains end at a live preset id, because the + # agent resolves them through resolve_filament_id_succession() at runtime. + @unittest.skip("enable with plan v4.2: QD_* ids are not retired yet") + def test_qidi_agent_fallback_ids_resolve_through_ledger(self): + cpp = os.path.join(REPO_ROOT, "src", "slic3r", "Utils", "QidiPrinterAgent.cpp") + with open(cpp, encoding="utf-8") as f: + src = f.read() + m = re.search( + r"map_filament_type_to_setting_id\(const std::string& filament_type\)" + r"\s*\{(.*?)\n\}", src, re.DOTALL) + self.assertIsNotNone(m, "map_filament_type_to_setting_id not found in QidiPrinterAgent.cpp") + qd_ids = re.findall(r'return "(QD_[0-9_]+)";', m.group(1)) + self.assertTrue(qd_ids, "no QD_* literals parsed from map_filament_type_to_setting_id") + ledger = afi.load_ledger(afi.RETIRED_PATH) + live = set(afi.analyze_tree(REAL_PROFILES)["ids"]) + for fid in qd_ids: + self.assertIn(fid, ledger["retired"], f'"{fid}" must be a retired ledger key') + status, node = afi.follow_succession( + fid, set(), ledger["retired"], ledger["hints"], live) + self.assertEqual( + status, "live", + f'"{fid}" succession must end at a live id (got {status} at "{node}")') + # --------------------------------------------------------------------------- # review-fix regressions From f23e5875d5474c7c0cbd7380b7d943ad47e9ad4a Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 21 Aug 2026 18:36:28 +0800 Subject: [PATCH 24/52] filament_id v4.2b: re-mint the Qidi QD_* island (plan v4 SS4) All 264 QD_* declarations re-derive from their family triples via --remint Qidi. Only 8 family ids are new: most QIDI-brand products already carried v3.2-minted ids on older printer series, so the QD-series declarations converge onto them (QD_0..4_1_1 -> OFKIQO2W "QIDI PLA Rapido"), and the six Generic families converge onto the shared generic ids (Generic PLA -> OFDSrzZ8 etc.) by triple math -- no inherits or compatible_printers changes anywhere. --update-snapshot retires all 204 QD_* ids with mode-rule successors. Audit: 204/204 non-null successors, every chain ends at a live id; the four ids hardcoded in QidiPrinterAgent's non-numeric-series fallback resolve to the OFL generics (QD_1_0_1 -> OFDSrzZ8, ...). The v4.1 agent hook translates device-composed QD_* ids through these entries at runtime, so box behavior is preserved on updated clients. Known accepted residue (plan v4 SS4): three case/spelling family splits keep distinct ids for one product line each -- QIDI PC-ABS-FR (series 1-2) vs QIDI PC/ABS-FR (series 3-4) vs Qidi PC-ABS-FR (X-Plus 4), and QIDI TPU 95A-HF vs Qidi TPU 95A-HF. Renames are ruled out; the ledger's per-series successors keep each device slot resolving to the right presets, and a future upstream name unification self-heals through content addressing. The code<->ledger lockstep test is now active (un-skipped). Gates: --check 0; orca_extra_profile_check 0/0; 117 script tests OK (0 skipped); validator base, -f tree-wide, -v Qidi all exit 0; libslic3r_tests green; Qidi profile diff is filament_id-value-only. Qidi.json version bumped. --- resources/profiles/Qidi.json | 2 +- .../Qidi/filament/Q2/Generic ABS @Q2.json | 2 +- .../Qidi/filament/Q2/Generic ABS @Q2C.json | 2 +- .../Qidi/filament/Q2/Generic PC @Q2.json | 2 +- .../Qidi/filament/Q2/Generic PC @Q2C.json | 2 +- .../Qidi/filament/Q2/Generic PETG @Q2.json | 2 +- .../Qidi/filament/Q2/Generic PETG @Q2C.json | 2 +- .../Qidi/filament/Q2/Generic PLA @Q2.json | 2 +- .../Qidi/filament/Q2/Generic PLA @Q2C.json | 2 +- .../filament/Q2/Generic PLA Silk @Q2.json | 2 +- .../filament/Q2/Generic PLA Silk @Q2C.json | 2 +- .../Qidi/filament/Q2/Generic TPU 95A @Q2.json | 2 +- .../filament/Q2/Generic TPU 95A @Q2C.json | 2 +- .../filament/Q2/QIDI ABS Odorless @Q2.json | 2 +- .../filament/Q2/QIDI ABS Odorless @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI ABS Rapido @Q2.json | 2 +- .../filament/Q2/QIDI ABS Rapido @Q2C.json | 2 +- .../Q2/QIDI ABS Rapido Metal @Q2.json | 2 +- .../Q2/QIDI ABS Rapido Metal @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI ABS-GF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI ABS-GF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI ASA @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI ASA @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI ASA-Aero @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI ASA-Aero @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI ASA-CF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI ASA-CF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PA12-CF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PA12-CF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PAHT-CF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PAHT-CF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PAHT-GF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PAHT-GF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PC-ABS-FR @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PC-ABS-FR @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PEBA 95A @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PEBA 95A @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PET-CF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PET-CF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PET-GF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PET-GF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PETG Basic @Q2.json | 2 +- .../filament/Q2/QIDI PETG Basic @Q2C.json | 2 +- .../filament/Q2/QIDI PETG Rapido @Q2.json | 2 +- .../filament/Q2/QIDI PETG Rapido @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PETG Tough @Q2.json | 2 +- .../filament/Q2/QIDI PETG Tough @Q2C.json | 2 +- .../Q2/QIDI PETG Translucent @Q2.json | 2 +- .../Q2/QIDI PETG Translucent @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PETG-CF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PETG-CF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PETG-GF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PETG-GF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PLA Basic @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PLA Basic @Q2C.json | 2 +- .../filament/Q2/QIDI PLA Matte Basic @Q2.json | 2 +- .../Q2/QIDI PLA Matte Basic @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PLA Rapido @Q2.json | 2 +- .../filament/Q2/QIDI PLA Rapido @Q2C.json | 2 +- .../Q2/QIDI PLA Rapido Matte @Q2.json | 2 +- .../Q2/QIDI PLA Rapido Matte @Q2C.json | 2 +- .../Q2/QIDI PLA Rapido Metal @Q2.json | 2 +- .../Q2/QIDI PLA Rapido Metal @Q2C.json | 2 +- .../filament/Q2/QIDI PLA Rapido Silk @Q2.json | 2 +- .../Q2/QIDI PLA Rapido Silk @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PLA-CF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PLA-CF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PPS-CF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PPS-CF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI PPS-GF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI PPS-GF @Q2C.json | 2 +- .../Q2/QIDI Support For PAHT @Q2.json | 2 +- .../Q2/QIDI Support For PAHT @Q2C.json | 2 +- .../Q2/QIDI Support For PET-PA @Q2.json | 2 +- .../Q2/QIDI Support For PET-PA @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI TPU 95A-HF @Q2.json | 2 +- .../filament/Q2/QIDI TPU 95A-HF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI TPU-Aero @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI TPU-Aero @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI TPU-GF @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI TPU-GF @Q2C.json | 2 +- .../Qidi/filament/Q2/QIDI UltraPA @Q2.json | 2 +- .../Qidi/filament/Q2/QIDI UltraPA @Q2C.json | 2 +- .../filament/Q2/QIDI UltraPA-CF25 @Q2.json | 2 +- .../filament/Q2/QIDI UltraPA-CF25 @Q2C.json | 2 +- .../filament/Q2/QIDI WOOD Rapido @Q2.json | 2 +- .../filament/Q2/QIDI WOOD Rapido @Q2C.json | 2 +- .../profiles/Qidi/filament/QIDI ASA-CF.json | 2 +- ...DI PA-Ultra @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...DI PA-Ultra @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...DI PA-Ultra @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...IDI PA12-CF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...IDI PA12-CF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...IDI PA12-CF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...IDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...IDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...IDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...IDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...IDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...IDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PEBA 95A.json | 2 +- ...QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ... PETG Basic @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... PETG Basic @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... PETG Basic @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... PETG Basic @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...PETG Rapido @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...PETG Rapido @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...PETG Rapido @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...PETG Rapido @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ... PETG Tough @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... PETG Tough @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... PETG Tough @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... PETG Tough @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...Translucent @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...Translucent @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...Translucent @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...Translucent @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...IDI PETG-CF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...IDI PETG-CF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...IDI PETG-CF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...IDI PETG-GF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...IDI PETG-GF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...IDI PETG-GF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...I PLA Basic @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...I PLA Basic @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...I PLA Basic @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...I PLA Basic @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...Matte Basic @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...Matte Basic @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...Matte Basic @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...Matte Basic @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ... PLA Rapido @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ... PLA Rapido @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... PLA Rapido @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... PLA Rapido @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...apido Matte @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...apido Matte @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...apido Matte @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...apido Matte @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.2 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...apido Metal @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...Rapido Silk @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...Rapido Silk @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI PPS-GF.json | 2 +- ...rt For PAHT @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...rt For PAHT @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...rt For PAHT @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ... For PET-PA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... For PET-PA @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ... For PET-PA @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...DI TPU-Aero @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...DI TPU-Aero @Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../profiles/Qidi/filament/QIDI TPU-GF.json | 2 +- ...ltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...ltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...ltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...WOOD Rapido @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...WOOD Rapido @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...WOOD Rapido @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ...i PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ...i PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle.json | 2 +- ...i PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle.json | 2 +- ... TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../filament/X4/Generic ABS @X-Max 4.json | 2 +- .../Qidi/filament/X4/Generic PC @X-Max 4.json | 2 +- .../filament/X4/Generic PETG @X-Max 4.json | 2 +- .../filament/X4/Generic PLA @X-Max 4.json | 2 +- .../X4/Generic PLA Silk @X-Max 4.json | 2 +- .../filament/X4/Generic TPU 95A @X-Max 4.json | 2 +- .../X4/QIDI ABS Odorless @X-Max 4.json | 2 +- .../filament/X4/QIDI ABS Rapido @X-Max 4.json | 2 +- .../X4/QIDI ABS Rapido Metal @X-Max 4.json | 2 +- .../filament/X4/QIDI ABS-GF @X-Max 4.json | 2 +- .../Qidi/filament/X4/QIDI ASA @X-Max 4.json | 2 +- .../filament/X4/QIDI ASA-Aero @X-Max 4.json | 2 +- .../filament/X4/QIDI ASA-CF @X-Max 4.json | 2 +- .../filament/X4/QIDI PA12-CF @X-Max 4.json | 2 +- .../filament/X4/QIDI PAHT-CF @X-Max 4.json | 2 +- .../filament/X4/QIDI PAHT-GF @X-Max 4.json | 2 +- .../filament/X4/QIDI PC-ABS-FR @X-Max 4.json | 2 +- .../filament/X4/QIDI PEBA 95A @X-Max 4.json | 2 +- .../filament/X4/QIDI PET-CF @X-Max 4.json | 2 +- .../filament/X4/QIDI PET-GF @X-Max 4.json | 2 +- .../filament/X4/QIDI PETG Basic @X-Max 4.json | 2 +- .../X4/QIDI PETG Rapido @X-Max 4.json | 2 +- .../filament/X4/QIDI PETG Tough @X-Max 4.json | 2 +- .../X4/QIDI PETG Translucent @X-Max 4.json | 2 +- .../filament/X4/QIDI PETG-CF @X-Max 4.json | 2 +- .../filament/X4/QIDI PETG-GF @X-Max 4.json | 2 +- .../filament/X4/QIDI PLA Basic @X-Max 4.json | 2 +- .../X4/QIDI PLA Matte Basic @X-Max 4.json | 2 +- .../filament/X4/QIDI PLA Rapido @X-Max 4.json | 2 +- .../X4/QIDI PLA Rapido Matte @X-Max 4.json | 2 +- .../X4/QIDI PLA Rapido Metal @X-Max 4.json | 2 +- .../X4/QIDI PLA Rapido Silk @X-Max 4.json | 2 +- .../filament/X4/QIDI PLA-CF @X-Max 4.json | 2 +- .../filament/X4/QIDI PPS-CF @X-Max 4.json | 2 +- .../filament/X4/QIDI PPS-GF @X-Max 4.json | 2 +- .../X4/QIDI Support For PAHT @X-Max 4.json | 2 +- .../X4/QIDI Support For PET-PA @X-Max 4.json | 2 +- .../filament/X4/QIDI TPU 95A-HF @X-Max 4.json | 2 +- .../filament/X4/QIDI TPU-Aero @X-Max 4.json | 2 +- .../filament/X4/QIDI TPU-GF @X-Max 4.json | 2 +- .../filament/X4/QIDI UltraPA @X-Max 4.json | 2 +- .../X4/QIDI UltraPA-CF25 @X-Max 4.json | 2 +- .../X4/QIDI WOOD Rapido @X-Max 4.json | 2 +- .../filament/X5/Generic ABS @X-Plus 5.json | 2 +- .../filament/X5/Generic PC @X-Plus 5.json | 2 +- .../filament/X5/Generic PETG @X-Plus 5.json | 2 +- .../filament/X5/Generic PLA @X-Plus 5.json | 2 +- .../X5/Generic PLA Silk @X-Plus 5.json | 2 +- .../X5/Generic TPU 95A @X-Plus 5.json | 2 +- .../X5/QIDI ABS Odorless @X-Plus 5.json | 2 +- .../X5/QIDI ABS Rapido @X-Plus 5.json | 2 +- .../X5/QIDI ABS Rapido Metal @X-Plus 5.json | 2 +- .../filament/X5/QIDI ABS-GF @X-Plus 5.json | 2 +- .../Qidi/filament/X5/QIDI ASA @X-Plus 5.json | 2 +- .../filament/X5/QIDI ASA-Aero @X-Plus 5.json | 2 +- .../filament/X5/QIDI ASA-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PA12-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PA6-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PAHT-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PAHT-GF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PC-ABS-FR @X-Plus 5.json | 2 +- .../filament/X5/QIDI PEBA 95A @X-Plus 5.json | 2 +- .../filament/X5/QIDI PET-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PET-GF @X-Plus 5.json | 2 +- .../X5/QIDI PETG Basic @X-Plus 5.json | 2 +- .../X5/QIDI PETG Rapido @X-Plus 5.json | 2 +- .../X5/QIDI PETG Tough @X-Plus 5.json | 2 +- .../X5/QIDI PETG Translucent @X-Plus 5.json | 2 +- .../filament/X5/QIDI PETG-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PETG-GF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PLA Basic @X-Plus 5.json | 2 +- .../X5/QIDI PLA Matte Basic @X-Plus 5.json | 2 +- .../X5/QIDI PLA Rapido @X-Plus 5.json | 2 +- .../X5/QIDI PLA Rapido Matte @X-Plus 5.json | 2 +- .../X5/QIDI PLA Rapido Metal @X-Plus 5.json | 2 +- .../filament/X5/QIDI PLA Silk @X-Plus 5.json | 2 +- .../filament/X5/QIDI PLA-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PPS-CF @X-Plus 5.json | 2 +- .../filament/X5/QIDI PPS-GF @X-Plus 5.json | 2 +- .../X5/QIDI Support For PAHT @X-Plus 5.json | 2 +- .../X5/QIDI Support For PET-PA @X-Plus 5.json | 2 +- .../X5/QIDI TPU 95A-HF @X-Plus 5.json | 2 +- .../filament/X5/QIDI TPU-Aero @X-Plus 5.json | 2 +- .../filament/X5/QIDI TPU-GF @X-Plus 5.json | 2 +- .../filament/X5/QIDI UltraPA @X-Plus 5.json | 2 +- .../X5/QIDI UltraPA-CF25 @X-Plus 5.json | 2 +- .../X5/QIDI WOOD Rapido @X-Plus 5.json | 2 +- resources/profiles/retired_filament_ids.json | 1224 +++++++++ scripts/filament_id_snapshot.json | 2229 +---------------- scripts/tests/test_filament_id.py | 1 - 268 files changed, 1574 insertions(+), 2410 deletions(-) diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index ecceff5a8a..98f157c9a3 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "02.04.00.11", + "version": "02.04.00.12", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ diff --git a/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2.json index 9e42298338..1dc3825126 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2.json @@ -3,7 +3,7 @@ "name": "Generic ABS@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_0_11", + "filament_id": "OFY9muEs", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2C.json index 88edeb6155..c3641af840 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic ABS @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic ABS@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_0_11", + "filament_id": "OFY9muEs", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PC @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic PC @Q2.json index 90d5f9150f..26abc6179b 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PC @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PC @Q2.json @@ -3,7 +3,7 @@ "name": "Generic PC@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_0_23", + "filament_id": "OFLakOUI", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PC @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic PC @Q2C.json index 55a834093d..148bc80d29 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PC @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PC @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic PC@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_0_23", + "filament_id": "OFLakOUI", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2.json index 5a8d64615a..de56662460 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2.json @@ -3,7 +3,7 @@ "name": "Generic PETG@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_0_41", + "filament_id": "OFYPdQJh", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2C.json index 88c5c926ab..13dc11da37 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PETG @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic PETG@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_0_41", + "filament_id": "OFYPdQJh", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2.json index 21ed221909..f8da1c0008 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2.json @@ -3,7 +3,7 @@ "name": "Generic PLA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_0_1", + "filament_id": "OFDSrzZ8", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2C.json index 82423a614d..b33774304d 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic PLA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_0_1", + "filament_id": "OFDSrzZ8", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2.json index a24a0f4d6f..23d04a049a 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2.json @@ -3,7 +3,7 @@ "name": "Generic PLA Silk@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_0_4", + "filament_id": "OFesA6rF", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2C.json index 1254b1d53a..30588be03e 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic PLA Silk @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic PLA Silk@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_0_4", + "filament_id": "OFesA6rF", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2.json b/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2.json index 107d337155..189c740c72 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2.json @@ -3,7 +3,7 @@ "name": "Generic TPU 95A@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_0_50", + "filament_id": "OFjiXpyf", "instantiation": "false", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2C.json b/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2C.json index 8e867a26f2..bfb84c16de 100644 --- a/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/Generic TPU 95A @Q2C.json @@ -3,7 +3,7 @@ "name": "Generic TPU 95A@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_0_50", + "filament_id": "OFjiXpyf", "instantiation": "false", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2.json index 62dc85146b..19a568850c 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Odorless@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_14", + "filament_id": "OFma5TXH", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2C.json index be98105a39..2c2b667fd7 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS Odorless @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Odorless@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_14", + "filament_id": "OFma5TXH", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2.json index 9d7e3d0e7f..c5cb2aca78 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Rapido@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_11", + "filament_id": "OFT2jon4", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2C.json index da40111dc4..4e68e02cf5 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Rapido@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_11", + "filament_id": "OFT2jon4", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2.json index 46ccb9e691..e123946376 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Rapido Metal@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_13", + "filament_id": "OFeCJqxx", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2C.json index afd2b355cb..6589613879 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS Rapido Metal @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Rapido Metal@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_13", + "filament_id": "OFeCJqxx", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2.json index a20b7bb2c1..298e063e51 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI ABS-GF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_12", + "filament_id": "OFt3HtlG", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2C.json index 5e6df7914d..36ec082dc3 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ABS-GF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI ABS-GF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_12", + "filament_id": "OFt3HtlG", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2.json index 88e5d964e7..4a64191f92 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI ASA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_18", + "filament_id": "OFTsHNQi", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2C.json index c68044bfaf..11cbffc08f 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ASA @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI ASA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_18", + "filament_id": "OFTsHNQi", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json index b449906758..c32a28c5ff 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-Aero@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_19", + "filament_id": "OFu1E4ur", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2C.json index 3c810517f6..30835ce25e 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ASA-Aero @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-Aero@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_19", + "filament_id": "OFu1E4ur", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2.json index 4d2165ffd1..44845f9c1c 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_20", + "filament_id": "OF1W7c76", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2C.json index 99e1043b46..5f100e18e7 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI ASA-CF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_20", + "filament_id": "OF1W7c76", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2.json index c15cf5ca65..454bb935c1 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PA12-CF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_27", + "filament_id": "OFn6WpN7", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2C.json index 3dbd928222..ae7dce989c 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PA12-CF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PA12-CF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_27", + "filament_id": "OFn6WpN7", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2.json index fe908219a5..86d433078a 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PAHT-CF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_30", + "filament_id": "OFKgmsqE", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2C.json index d76e92349e..d456e57eea 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-CF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PAHT-CF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_30", + "filament_id": "OFKgmsqE", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2.json index e694512bc7..2f4d499ddd 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PAHT-GF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_31", + "filament_id": "OFo15hcT", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2C.json index cb8c2640a3..c64465630c 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PAHT-GF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PAHT-GF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_31", + "filament_id": "OFo15hcT", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2.json index d4639142de..67c1da6278 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PC-ABS-FR@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_34", + "filament_id": "OFFAWVf0", "instantiation": "false", "box_temperature_range_high": [ "50" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2C.json index b0e25aa480..b5ccaf706c 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PC-ABS-FR @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PC-ABS-FR@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_34", + "filament_id": "OFFAWVf0", "instantiation": "false", "box_temperature_range_high": [ "50" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2.json index 9dd9600bf9..23717031de 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PEBA 95A@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_36", + "filament_id": "OFhiJE7Y", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2C.json index e1c1441da1..ec065181d8 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PEBA 95A @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PEBA 95A@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_36", + "filament_id": "OFhiJE7Y", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2.json index 211f90a3a6..e6c29cea5c 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PET-CF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_37", + "filament_id": "OFKfJTwL", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2C.json index 59f7315e29..62461cb73a 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PET-CF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PET-CF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_37", + "filament_id": "OFKfJTwL", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2.json index 85fc6f5847..424b78379d 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PET-GF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_38", + "filament_id": "OFhx4uOG", "instantiation": "false", "box_temperature_range_high": [ "50" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2C.json index c7e66b7972..f178094458 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PET-GF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PET-GF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_38", + "filament_id": "OFhx4uOG", "instantiation": "false", "box_temperature_range_high": [ "50" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2.json index ba87c9a3b7..58a0fd7dbf 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Basic@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_39", + "filament_id": "OFuJ49uH", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2C.json index a08ec8af68..8cb18721e2 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Basic @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Basic@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_39", + "filament_id": "OFuJ49uH", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2.json index 9815a8eb64..2e3d793089 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Rapido@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_41", + "filament_id": "OF4S3To3", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2C.json index 1c50f16b51..96a2ec23e6 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Rapido @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Rapido@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_41", + "filament_id": "OF4S3To3", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2.json index b8f8c4ec5f..ed639e45a3 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Tough@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_40", + "filament_id": "OFQ40XeN", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2C.json index 3f272efaee..f3886ffbdd 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Tough @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Tough@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_40", + "filament_id": "OFQ40XeN", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2.json index 64a56ca919..d996077b6e 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Translucent@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_45", + "filament_id": "OFf0MkD5", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2C.json index 6010799fff..31a8543037 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG Translucent @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Translucent@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_45", + "filament_id": "OFf0MkD5", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2.json index 475b8f2a78..8f424ae68d 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PETG-CF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_42", + "filament_id": "OF4iWKrE", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2C.json index 4ba3a94c25..3b0175abd0 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG-CF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PETG-CF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_42", + "filament_id": "OF4iWKrE", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2.json index d510eb7fe8..cb45a7126e 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PETG-GF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_43", + "filament_id": "OFdtPd9h", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2C.json index 353d2eb3ee..2b37be4655 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PETG-GF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PETG-GF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_43", + "filament_id": "OFdtPd9h", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2.json index c2799f2f9e..9681191225 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Basic@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_7", + "filament_id": "OF4nQ62r", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2C.json index 4597470db3..7b5d0b42e9 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Basic @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Basic@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_7", + "filament_id": "OF4nQ62r", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2.json index 4a25bf91f3..86320677b5 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Matte Basic@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_8", + "filament_id": "OFughwKn", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2C.json index 824ff1d846..49a420c205 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Matte Basic @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Matte Basic@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_8", + "filament_id": "OFughwKn", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2.json index 3f57b73a1f..3e61216161 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_1", + "filament_id": "OFKIQO2W", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2C.json index d3afa29ba4..6bcc1465f8 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_1", + "filament_id": "OFKIQO2W", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2.json index e4432822ad..3b0813506f 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Matte@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_2", + "filament_id": "OF3IKafc", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2C.json index b8cf01a822..1fdd0cbfe0 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Matte @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Matte@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_2", + "filament_id": "OF3IKafc", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2.json index 9728e57f4c..b06fcf26cb 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Metal@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_3", + "filament_id": "OFANFm4x", "instantiation": "false", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2C.json index 2e3295cd86..ac5ef39d81 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Metal @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Metal@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_3", + "filament_id": "OFANFm4x", "instantiation": "false", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2.json index ae38a9189f..d74b31e3b6 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Silk@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_4", + "filament_id": "OFW5FqkL", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2C.json index 9d07d3375e..2cd6d5206b 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA Rapido Silk @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Silk@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_4", + "filament_id": "OFW5FqkL", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2.json index 4e1b88726e..68a6fe3591 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PLA-CF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_5", + "filament_id": "OFhWrAuP", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2C.json index 67832cba33..1547635255 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PLA-CF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PLA-CF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_5", + "filament_id": "OFhWrAuP", "instantiation": "false", "filament_adhesiveness_category": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2.json index dc4e1fd221..6f4ec50f8b 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-CF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_44", + "filament_id": "OFZOuWrO", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2C.json index 2f27693f04..b582d662f8 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PPS-CF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-CF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_44", + "filament_id": "OFZOuWrO", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2.json index f1de945749..7d0507a4d7 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_46", + "filament_id": "OFp57RRC", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2C.json index 3fda14c322..0412893632 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI PPS-GF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_46", + "filament_id": "OFp57RRC", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2.json index 7e12181e9d..36ef25367a 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI Support For PAHT@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_32", + "filament_id": "OFXn3Vd9", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2C.json index 1dfffa1bd7..1252ad814e 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI Support For PAHT @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI Support For PAHT@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_32", + "filament_id": "OFXn3Vd9", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2.json index 25dca621ad..16dba7f79a 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI Support For PET/PA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_33", + "filament_id": "OFqcL5UF", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2C.json index f126a37f8e..759e704f3f 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI Support For PET-PA @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI Support For PET/PA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_33", + "filament_id": "OFqcL5UF", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2.json index b31512f047..ca94f5a4d1 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI TPU 95A-HF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_50", + "filament_id": "OFR1XLMN", "instantiation": "false", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2C.json index dd9b428fed..80bde58289 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI TPU 95A-HF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI TPU 95A-HF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_50", + "filament_id": "OFR1XLMN", "instantiation": "false", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2.json index 38a1c1883a..58c2776f6e 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-Aero@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_49", + "filament_id": "OFMDHOcT", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2C.json index 525aebb88f..580060e6fe 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI TPU-Aero @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-Aero@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_49", + "filament_id": "OFMDHOcT", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2.json index 5e995b72be..c4a3c31413 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_15", + "filament_id": "OF9EHUKK", "instantiation": "false", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2C.json index b17c65d3e7..887a0fa639 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI TPU-GF @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_15", + "filament_id": "OF9EHUKK", "instantiation": "false", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2.json index 5b9881cb9f..27942a7e1d 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI UltraPA@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_24", + "filament_id": "OFWDe7YH", "instantiation": "false", "box_temperature_range_high": [ "55" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2C.json index 7f11a52b7c..925c18aa11 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI UltraPA@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_24", + "filament_id": "OFWDe7YH", "instantiation": "false", "box_temperature_range_high": [ "55" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2.json index 194fe42853..3c9c558f77 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI UltraPA-CF25@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_26", + "filament_id": "OF9PELEb", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2C.json index 1593decfea..ebcabb0fa6 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI UltraPA-CF25 @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI UltraPA-CF25@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_26", + "filament_id": "OF9PELEb", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2.json b/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2.json index 380d48bcb1..5b31143e00 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2.json @@ -3,7 +3,7 @@ "name": "QIDI WOOD Rapido@Q2-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_1_1_6", + "filament_id": "OFvdZ2bx", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2C.json b/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2C.json index 5a7882bd68..a4b1c223db 100644 --- a/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2C.json +++ b/resources/profiles/Qidi/filament/Q2/QIDI WOOD Rapido @Q2C.json @@ -3,7 +3,7 @@ "name": "QIDI WOOD Rapido@Q2C-Series", "inherits": "fdm_filament_q_common", "from": "system", - "filament_id": "QD_2_1_6", + "filament_id": "OFvdZ2bx", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/QIDI ASA-CF.json b/resources/profiles/Qidi/filament/QIDI ASA-CF.json index 9e1ac1c012..0b6906338b 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA-CF.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-CF.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "QD_0_1_20", + "filament_id": "OF1W7c76", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle.json index 56512094ca..1d8276e697 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "qdecbUennyPdmB0A", - "filament_id": "QD_0_1_24", + "filament_id": "OFlN6DL1", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle.json index 3b0d9029c2..ebd5a74d26 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "oAp4leYdCEJY771O", - "filament_id": "QD_0_1_24", + "filament_id": "OFlN6DL1", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle.json index 795c6dbbfc..7f36d5973b 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA-Ultra", "from": "system", "setting_id": "d5wSCLXU0dhvtbM5", - "filament_id": "QD_0_1_24", + "filament_id": "OFlN6DL1", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle.json index 14e508b501..271abf03e1 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "e8Lz1jXDuBS8tzvW", - "filament_id": "QD_0_1_27", + "filament_id": "OFn6WpN7", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle.json index 8d024087cf..d82b9caf50 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "2DYXiTX67NfmBSCX", - "filament_id": "QD_0_1_27", + "filament_id": "OFn6WpN7", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle.json index a9f43cdaee..d291f54a00 100644 --- a/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PA12-CF", "from": "system", "setting_id": "Kkj773eEVzhT6B7Q", - "filament_id": "QD_0_1_27", + "filament_id": "OFn6WpN7", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle.json index 66bf7ff727..f8945441a6 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "3HTNW0nsdZy151mm", - "filament_id": "QD_0_1_30", + "filament_id": "OFKgmsqE", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle.json index 0e3da99aed..d403b161f2 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "t9VMvRmLwAT37YHm", - "filament_id": "QD_0_1_30", + "filament_id": "OFKgmsqE", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle.json index 1c5730c874..ab786208f2 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-CF", "from": "system", "setting_id": "F30WpUvosUoiAKry", - "filament_id": "QD_0_1_30", + "filament_id": "OFKgmsqE", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle.json index 0d83c21079..e2c869d923 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "xHG5cy5GGfu88GoC", - "filament_id": "QD_0_1_31", + "filament_id": "OFo15hcT", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle.json index d90f8c3eec..fd0fe1f926 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "z1EQUUwgsLHYgeHG", - "filament_id": "QD_0_1_31", + "filament_id": "OFo15hcT", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle.json index 4d1b97b8fd..3a56d3c6fa 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PAHT-GF", "from": "system", "setting_id": "yTNCP86ycfXgy8zV", - "filament_id": "QD_0_1_31", + "filament_id": "OFo15hcT", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PEBA 95A.json b/resources/profiles/Qidi/filament/QIDI PEBA 95A.json index 4695bcf9ae..937ef89808 100644 --- a/resources/profiles/Qidi/filament/QIDI PEBA 95A.json +++ b/resources/profiles/Qidi/filament/QIDI PEBA 95A.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "qkErLCeMU5ufGB0k", - "filament_id": "QD_0_1_36", + "filament_id": "OFhiJE7Y", "instantiation": "true", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle.json index 5a9f9e7aa5..7ebb044048 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "3k9qy3LCbhnnRRad", - "filament_id": "QD_0_1_37", + "filament_id": "OFKfJTwL", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle.json index a6477c90bb..fcaf24fe9a 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "xYAAeJcC83x4RoIl", - "filament_id": "QD_0_1_37", + "filament_id": "OFKfJTwL", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle.json index 4670fe40bc..6fffac3277 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-CF", "from": "system", "setting_id": "JXE7r9nJqui21eJW", - "filament_id": "QD_0_1_37", + "filament_id": "OFKfJTwL", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle.json index e7131b8b4a..3614aa9ebc 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "zSjGCRFJPKjrnxXj", - "filament_id": "QD_0_1_38", + "filament_id": "OFhx4uOG", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle.json index 62eaf75e85..71d711d7f3 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "qKGOeBEUrafs1H1C", - "filament_id": "QD_0_1_38", + "filament_id": "OFhx4uOG", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle.json index 96112b4283..072689464e 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PET-GF", "from": "system", "setting_id": "S3VakjOmAENmBhoU", - "filament_id": "QD_0_1_38", + "filament_id": "OFhx4uOG", "instantiation": "true", "fan_cooling_layer_time": [ "10" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle.json index dd6e20b2ed..900c3e1f7e 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "SaZRrBNZwbPUxSRv", - "filament_id": "QD_0_1_39", + "filament_id": "OFuJ49uH", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle.json index 853d55b506..8e63d3f56a 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "33Anr90IUQGC3jJZ", - "filament_id": "QD_0_1_39", + "filament_id": "OFuJ49uH", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle.json index 8758f39eb5..2e8f4acbb4 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "l4LT5GPolnkeEEK6", - "filament_id": "QD_0_1_39", + "filament_id": "OFuJ49uH", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle.json index 55db9aa126..741988239b 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Basic", "from": "system", "setting_id": "r6LnysrDaSyIserx", - "filament_id": "QD_0_1_39", + "filament_id": "OFuJ49uH", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle.json index a2098e7af1..c0b3eb3d2d 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "O2SmSJeOq2QkMawy", - "filament_id": "QD_0_1_41", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle.json index c2a930616a..4df839e4d4 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "UkzoaZIuBEwTCUYL", - "filament_id": "QD_0_1_41", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle.json index fc64677656..00b3f5abeb 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "wMG9FBNFTJR3mI2Y", - "filament_id": "QD_0_1_41", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle.json index da2dbce484..480da3bd6a 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Rapido", "from": "system", "setting_id": "WF4EIoqqebSQYJCL", - "filament_id": "QD_0_1_41", + "filament_id": "OF4S3To3", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle.json index 5a24596ad8..6aeaf4d124 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "Mu4RDxD4sVyJwRXc", - "filament_id": "QD_0_1_40", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle.json index 20e2ce8605..0058311761 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "FJryx96xxfATPqls", - "filament_id": "QD_0_1_40", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle.json index f0676efd80..1546b821fe 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "SmywHXjvv1Ju150F", - "filament_id": "QD_0_1_40", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle.json index a669d37ca3..e4d84406f2 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Tough", "from": "system", "setting_id": "BwMkyVGyL0Pmqp1w", - "filament_id": "QD_0_1_40", + "filament_id": "OFQ40XeN", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle.json index 5082d4d9f0..d1fc5490ca 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "6bASygXwTEKR4Twi", - "filament_id": "QD_0_1_45", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_max_volumetric_speed": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle.json index 22d8ffe823..a629cb862f 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "QL7Ob5qH7GBsl9ga", - "filament_id": "QD_0_1_45", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle.json index e1fbad24e9..d6cbc67505 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "wwodlWk71rHgZ323", - "filament_id": "QD_0_1_45", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle.json index 7ad9a35a0c..1ff04f026c 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG Translucent", "from": "system", "setting_id": "Nh88D1u7mMVGhqCU", - "filament_id": "QD_0_1_45", + "filament_id": "OFf0MkD5", "instantiation": "true", "filament_settings_id": [ "QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle.json index 42fe672412..76176b1597 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "OSLMQVT2l2Yert5l", - "filament_id": "QD_0_1_42", + "filament_id": "OF4iWKrE", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle.json index a0b04d61be..fbeb10bf2e 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "rpJAbHlG6bJhJoAs", - "filament_id": "QD_0_1_42", + "filament_id": "OF4iWKrE", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle.json index 91265bb6b3..92fafc92ca 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-CF", "from": "system", "setting_id": "yyB4FvX6mflpfiZd", - "filament_id": "QD_0_1_42", + "filament_id": "OF4iWKrE", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle.json index b7f85630bd..73b3a23fab 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "I6Tg5JVz1Q0RigOW", - "filament_id": "QD_0_1_43", + "filament_id": "OFdtPd9h", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle.json index 4b29595ea8..20d1de619e 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "RmitFKegDy89lNH4", - "filament_id": "QD_0_1_43", + "filament_id": "OFdtPd9h", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle.json index a7a0295a94..a67ef4d5a4 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PETG-GF", "from": "system", "setting_id": "AoO0ihxQmsL2up4w", - "filament_id": "QD_0_1_43", + "filament_id": "OFdtPd9h", "instantiation": "true", "filament_settings_id": [ "QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle.json index e49360108e..34d98b4b1c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "AOa9WW2IN1VHGXGM", - "filament_id": "QD_0_1_7", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle.json index 951227fba2..3dbeaf452f 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "qdagUM7IIKyfHB2g", - "filament_id": "QD_0_1_7", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle.json index c7f30d1c03..183fe2cf8f 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "CwsM4SCrRAhAJVfN", - "filament_id": "QD_0_1_7", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle.json index a255f2e368..878f91711e 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Basic", "from": "system", "setting_id": "HE3KK8QRsGrgLnr5", - "filament_id": "QD_0_1_7", + "filament_id": "OF4nQ62r", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle.json index a6d7f3b66b..4074d5a1cd 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "8JEZpQeq7FEoUQQd", - "filament_id": "QD_0_1_8", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle.json index 90b3876c66..ae55810f39 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "6Z2ery99xHlP2ciV", - "filament_id": "QD_0_1_8", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle.json index 35d11757ce..bb1c7bd1d1 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "27eKOPtsQZIRwQYo", - "filament_id": "QD_0_1_8", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle.json index de7de4d803..59ffd6424f 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Matte Basic", "from": "system", "setting_id": "nf5VwfZ4gpGG5ufO", - "filament_id": "QD_0_1_8", + "filament_id": "OFughwKn", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle.json index 49115068c6..574c3f9f38 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "xaGFbFpbrZ9v3RKy", - "filament_id": "QD_0_1_1", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle.json index 1a17ca5b69..466ff357d7 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "Vy1gTRsTAyLCcyTC", - "filament_id": "QD_0_1_1", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle.json index 03d69431af..35654f4798 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "Rt3UcmwI8R8fxKUa", - "filament_id": "QD_0_1_1", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle.json index e62b729ec9..ba7fd2b4b1 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido", "from": "system", "setting_id": "dWb415VG0AlqTWFD", - "filament_id": "QD_0_1_1", + "filament_id": "OFKIQO2W", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle.json index 28111c4f07..2c89680ccc 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "9YVeedSIviWv3n9F", - "filament_id": "QD_0_1_2", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle.json index dce300b652..5be44f4493 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "M7OXECFdZK4ZAoba", - "filament_id": "QD_0_1_2", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle.json index b95ff5f588..55b3b75f4c 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "zXKa67Oj1qSsHlct", - "filament_id": "QD_0_1_2", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle.json index 14732dfba7..7f9c359004 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Matte", "from": "system", "setting_id": "iJ0geNRlmJkSPQfN", - "filament_id": "QD_0_1_2", + "filament_id": "OF3IKafc", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json index 0ac378e9e8..57af588669 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "PvK39S1OvklDcZiB", - "filament_id": "QD_0_1_3", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json index 171ae933d8..4063f51d06 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "9CsEnbzkLosi8Y4Y", - "filament_id": "QD_0_1_3", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json index 46940dd8b6..7966d19908 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "kQGl05whrHW2T43U", - "filament_id": "QD_0_1_3", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json index b007ae0bf6..8b0517b09b 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Metal", "from": "system", "setting_id": "m2ctHQXA57lyjj4Q", - "filament_id": "QD_0_1_3", + "filament_id": "OFANFm4x", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle.json index 0cb15c1cae..7e53839859 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "X0DxlkkldQnTUfLy", - "filament_id": "QD_0_1_4", + "filament_id": "OFW5FqkL", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle.json index bacf625ed2..4fa2ca7198 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PLA Rapido Silk", "from": "system", "setting_id": "McXMhVyp029M56kU", - "filament_id": "QD_0_1_4", + "filament_id": "OFW5FqkL", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle.json index 890f9d3f5a..85c8e28574 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "Uue4WvW1uAwK2o0Y", - "filament_id": "QD_0_1_5", + "filament_id": "OFhWrAuP", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle.json index ed3f0d52ac..f77049928d 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "3SSQEk5a2vnHKG2g", - "filament_id": "QD_0_1_5", + "filament_id": "OFhWrAuP", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle.json index 29df7c92ea..01650e5b11 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PLA-CF", "from": "system", "setting_id": "jlUhowcsrMLKZBHH", - "filament_id": "QD_0_1_5", + "filament_id": "OFhWrAuP", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle.json index 2060c98114..b0eba4d48b 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "HVN6Bfz9FENqgw14", - "filament_id": "QD_0_1_44", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle.json index 37cd2a368d..ebbadcecbc 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "T5f0IJeUy3XIzrVw", - "filament_id": "QD_0_1_44", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle.json index 2910fe2bd7..eccaa7c066 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI PPS-CF", "from": "system", "setting_id": "eXV1ZPiBolFIU4Ub", - "filament_id": "QD_0_1_44", + "filament_id": "OFZOuWrO", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Qidi/filament/QIDI PPS-GF.json b/resources/profiles/Qidi/filament/QIDI PPS-GF.json index 8688747e35..dcee07928b 100644 --- a/resources/profiles/Qidi/filament/QIDI PPS-GF.json +++ b/resources/profiles/Qidi/filament/QIDI PPS-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pa", "from": "system", "setting_id": "uoOOXPpTEGa9bqhx", - "filament_id": "QD_0_1_46", + "filament_id": "OFp57RRC", "instantiation": "true", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle.json index 7093e58d9e..ad53eb97eb 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI Support For PAHT", "from": "system", "setting_id": "aQUPvUd9uPbi7HEx", - "filament_id": "QD_0_1_32", + "filament_id": "OFXn3Vd9", "instantiation": "true", "filament_settings_id": [ "QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle.json index 2d85b489c1..c214764ce8 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI Support For PAHT", "from": "system", "setting_id": "2RpRJwkUVzHwU6Ts", - "filament_id": "QD_0_1_32", + "filament_id": "OFXn3Vd9", "instantiation": "true", "filament_settings_id": [ "QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle.json index 77b6a34209..3ecffe9c54 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI Support For PAHT", "from": "system", "setting_id": "Arig0uL9inQi0NKf", - "filament_id": "QD_0_1_32", + "filament_id": "OFXn3Vd9", "instantiation": "true", "filament_settings_id": [ "QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.4 nozzle.json index bd6310ae72..c5717ecee8 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI Support For PET/PA", "from": "system", "setting_id": "EzPLJJzV7W1GfAuZ", - "filament_id": "QD_0_1_33", + "filament_id": "OFqcL5UF", "instantiation": "true", "filament_settings_id": [ "QIDI Support For PET/PA @Qidi X-Plus 4 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.6 nozzle.json index 7899b0435f..4282ec8718 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI Support For PET/PA", "from": "system", "setting_id": "Nfu1o1YZL9zK1VNS", - "filament_id": "QD_0_1_33", + "filament_id": "OFqcL5UF", "instantiation": "true", "filament_settings_id": [ "QIDI Support For PET/PA @Qidi X-Plus 4 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.8 nozzle.json index 43ffafb5bb..3791f09e5a 100644 --- a/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI Support For PET-PA @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI Support For PET/PA", "from": "system", "setting_id": "xJQLw0SvSPItH0wa", - "filament_id": "QD_0_1_33", + "filament_id": "OFqcL5UF", "instantiation": "true", "filament_settings_id": [ "QIDI Support For PET/PA @Qidi X-Plus 4 0.8 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle.json index 18134da7e2..193a5d327f 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI TPU-Aero", "from": "system", "setting_id": "6PFep2VmiWoOZLSn", - "filament_id": "QD_0_1_49", + "filament_id": "OFMDHOcT", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle.json index fc9b28c722..9ee1ce187e 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI TPU-Aero", "from": "system", "setting_id": "cqXDJN6nwBX3xVB7", - "filament_id": "QD_0_1_49", + "filament_id": "OFMDHOcT", "instantiation": "true", "filament_settings_id": [ "QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle" diff --git a/resources/profiles/Qidi/filament/QIDI TPU-GF.json b/resources/profiles/Qidi/filament/QIDI TPU-GF.json index af3827eb77..3f2eef6661 100644 --- a/resources/profiles/Qidi/filament/QIDI TPU-GF.json +++ b/resources/profiles/Qidi/filament/QIDI TPU-GF.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_tpu", "from": "system", "setting_id": "r8sdMolKGn3b52NX", - "filament_id": "QD_0_1_15", + "filament_id": "OF9EHUKK", "instantiation": "true", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle.json index 3871891090..fcaa74f9c7 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "5Two6xier5Pt2f8V", - "filament_id": "QD_0_1_26", + "filament_id": "OF9PELEb", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle.json index 31b300d45f..8c8bc9d4f7 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "H011um5zj6afHdTI", - "filament_id": "QD_0_1_26", + "filament_id": "OF9PELEb", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle.json index 8a2ce25ae4..fc03e055ef 100644 --- a/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI UltraPA-CF25", "from": "system", "setting_id": "26BECX2hYZ6JNFRq", - "filament_id": "QD_0_1_26", + "filament_id": "OF9PELEb", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle.json index ec46dd83ff..0bf0bc31f2 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "gfnllytSwMCbiB6b", - "filament_id": "QD_0_1_6", + "filament_id": "OFvdZ2bx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle.json index 1e7359636c..260d987ec0 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "PLrMThf2TXZGtp7N", - "filament_id": "QD_0_1_6", + "filament_id": "OFvdZ2bx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle.json index f184003ac0..d3fd897a93 100644 --- a/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "QIDI WOOD Rapido", "from": "system", "setting_id": "ErWlv0gKexLj8wjB", - "filament_id": "QD_0_1_6", + "filament_id": "OFvdZ2bx", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle.json index 6116b16149..458556f94c 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "WZuAmHHfdACv1F6k", - "filament_id": "QD_0_1_34", + "filament_id": "OFjD3YTW", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle.json index 859df30d32..296581a97a 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "JCCjjewJVs13S08j", - "filament_id": "QD_0_1_34", + "filament_id": "OFjD3YTW", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle.json index 63911a1567..ce939299ba 100644 --- a/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi PC-ABS-FR", "from": "system", "setting_id": "lWfYhsmJo1Q8FmM8", - "filament_id": "QD_0_1_34", + "filament_id": "OFjD3YTW", "instantiation": "true", "activate_chamber_temp_control": [ "0" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle.json index 469f190953..9cce69fc3b 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi TPU 95A-HF", "from": "system", "setting_id": "MQ5o43Gclt9U65x6", - "filament_id": "QD_0_1_50", + "filament_id": "OFzAWsca", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle.json index e56f67abf2..3c1e2d5987 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle.json @@ -4,7 +4,7 @@ "inherits": "Qidi TPU 95A-HF", "from": "system", "setting_id": "wNxGljiKmTzCPgzk", - "filament_id": "QD_0_1_50", + "filament_id": "OFzAWsca", "instantiation": "true", "fan_cooling_layer_time": [ "60" diff --git a/resources/profiles/Qidi/filament/X4/Generic ABS @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic ABS @X-Max 4.json index e01dbb5296..90cac58dbe 100644 --- a/resources/profiles/Qidi/filament/X4/Generic ABS @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic ABS @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic ABS@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_0_11", + "filament_id": "OFY9muEs", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Generic PC @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic PC @X-Max 4.json index 655713b891..6d10f9e6a6 100644 --- a/resources/profiles/Qidi/filament/X4/Generic PC @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic PC @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic PC@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_0_23", + "filament_id": "OFLakOUI", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/Generic PETG @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic PETG @X-Max 4.json index e855840148..3c470bad37 100644 --- a/resources/profiles/Qidi/filament/X4/Generic PETG @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic PETG @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic PETG@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_0_41", + "filament_id": "OFYPdQJh", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/Generic PLA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic PLA @X-Max 4.json index a4ee80e67d..5ce7036913 100644 --- a/resources/profiles/Qidi/filament/X4/Generic PLA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic PLA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic PLA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_0_1", + "filament_id": "OFDSrzZ8", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/Generic PLA Silk @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic PLA Silk @X-Max 4.json index e83be7d908..afa2c0b90b 100644 --- a/resources/profiles/Qidi/filament/X4/Generic PLA Silk @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic PLA Silk @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic PLA Silk@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_0_4", + "filament_id": "OFesA6rF", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/Generic TPU 95A @X-Max 4.json b/resources/profiles/Qidi/filament/X4/Generic TPU 95A @X-Max 4.json index 10a520531d..4f96f760b2 100644 --- a/resources/profiles/Qidi/filament/X4/Generic TPU 95A @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/Generic TPU 95A @X-Max 4.json @@ -3,7 +3,7 @@ "name": "Generic TPU 95A@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_0_50", + "filament_id": "OFjiXpyf", "instantiation": "false", "filament_adhesiveness_category": [ "600" diff --git a/resources/profiles/Qidi/filament/X4/QIDI ABS Odorless @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI ABS Odorless @X-Max 4.json index 0b89883f41..ea38a66fe4 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI ABS Odorless @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI ABS Odorless @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Odorless@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_14", + "filament_id": "OFma5TXH", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido @X-Max 4.json index 3ba45a14dc..89647b53d5 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Rapido@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_11", + "filament_id": "OFT2jon4", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido Metal @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido Metal @X-Max 4.json index 64dc667a44..beb4d8f07b 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido Metal @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI ABS Rapido Metal @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI ABS Rapido Metal@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_13", + "filament_id": "OFeCJqxx", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI ABS-GF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI ABS-GF @X-Max 4.json index 218e883448..e1ddebc083 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI ABS-GF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI ABS-GF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI ABS-GF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_12", + "filament_id": "OFt3HtlG", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI ASA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI ASA @X-Max 4.json index c6937e0080..27a6187a1d 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI ASA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI ASA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI ASA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_18", + "filament_id": "OFTsHNQi", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI ASA-Aero @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI ASA-Aero @X-Max 4.json index 3a66fdea86..8fc3684bfa 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI ASA-Aero @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI ASA-Aero @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-Aero@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_19", + "filament_id": "OFu1E4ur", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI ASA-CF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI ASA-CF @X-Max 4.json index 3cc72406a4..5da0ac2e10 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI ASA-CF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI ASA-CF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI ASA-CF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_20", + "filament_id": "OF1W7c76", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PA12-CF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PA12-CF @X-Max 4.json index e217915579..76a9afd45e 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PA12-CF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PA12-CF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PA12-CF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_27", + "filament_id": "OFn6WpN7", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PAHT-CF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PAHT-CF @X-Max 4.json index 83cd3e27cb..e195621413 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PAHT-CF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PAHT-CF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PAHT-CF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_30", + "filament_id": "OFKgmsqE", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PAHT-GF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PAHT-GF @X-Max 4.json index 8a35c7330b..ad1878ee8b 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PAHT-GF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PAHT-GF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PAHT-GF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_31", + "filament_id": "OFo15hcT", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PC-ABS-FR @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PC-ABS-FR @X-Max 4.json index 7bffaf11b5..a3e381a55c 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PC-ABS-FR @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PC-ABS-FR @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PC/ABS-FR@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_34", + "filament_id": "OFDIrhbu", "instantiation": "false", "box_temperature_range_high": [ "50" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PEBA 95A @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PEBA 95A @X-Max 4.json index 4745e19ad2..a78fefa651 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PEBA 95A @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PEBA 95A @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PEBA 95A@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_36", + "filament_id": "OFhiJE7Y", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PET-CF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PET-CF @X-Max 4.json index 6322639eb3..6573bb507a 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PET-CF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PET-CF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PET-CF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_37", + "filament_id": "OFKfJTwL", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PET-GF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PET-GF @X-Max 4.json index f18e2de950..8ee271de38 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PET-GF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PET-GF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PET-GF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_38", + "filament_id": "OFhx4uOG", "instantiation": "false", "box_temperature_range_high": [ "50" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PETG Basic @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PETG Basic @X-Max 4.json index c7261208cc..5dc9cc4cda 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PETG Basic @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PETG Basic @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Basic@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_39", + "filament_id": "OFuJ49uH", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PETG Rapido @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PETG Rapido @X-Max 4.json index 3050d4abd6..1a888d7bc6 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PETG Rapido @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PETG Rapido @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Rapido@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_41", + "filament_id": "OF4S3To3", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PETG Tough @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PETG Tough @X-Max 4.json index 783925d2b5..885ff3c1c0 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PETG Tough @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PETG Tough @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Tough@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_40", + "filament_id": "OFQ40XeN", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PETG Translucent @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PETG Translucent @X-Max 4.json index 21477a006f..a5f0628a80 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PETG Translucent @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PETG Translucent @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PETG Translucent@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_45", + "filament_id": "OFf0MkD5", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PETG-CF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PETG-CF @X-Max 4.json index f3aabb1ef5..4acccce76b 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PETG-CF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PETG-CF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PETG-CF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_42", + "filament_id": "OF4iWKrE", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PETG-GF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PETG-GF @X-Max 4.json index 9b0379ea52..f1501c1e7e 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PETG-GF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PETG-GF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PETG-GF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_43", + "filament_id": "OFdtPd9h", "instantiation": "false", "box_temperature_range_high": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PLA Basic @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PLA Basic @X-Max 4.json index 2dd1d28dd4..1340cd0d03 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PLA Basic @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PLA Basic @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Basic@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_7", + "filament_id": "OF4nQ62r", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PLA Matte Basic @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PLA Matte Basic @X-Max 4.json index dd407427ce..d23f66eede 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PLA Matte Basic @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PLA Matte Basic @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Matte Basic@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_8", + "filament_id": "OFughwKn", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido @X-Max 4.json index 1e6ea5b8e0..b072ca8019 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_1", + "filament_id": "OFKIQO2W", "instantiation": "false", "cool_plate_temp_initial_layer": [ "45" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Matte @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Matte @X-Max 4.json index 95d0666c1d..9963e2418a 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Matte @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Matte @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Matte@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_2", + "filament_id": "OF3IKafc", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Metal @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Metal @X-Max 4.json index 0f848e6d5b..89e966f907 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Metal @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Metal @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Metal@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_3", + "filament_id": "OFANFm4x", "instantiation": "false", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Silk @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Silk @X-Max 4.json index d5f3d83679..64620cdff7 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Silk @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PLA Rapido Silk @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PLA Rapido Silk@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_4", + "filament_id": "OFW5FqkL", "instantiation": "false", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PLA-CF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PLA-CF @X-Max 4.json index 7331ce75ad..f5a72549cf 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PLA-CF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PLA-CF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PLA-CF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_5", + "filament_id": "OFhWrAuP", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PPS-CF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PPS-CF @X-Max 4.json index c5500bb3c0..a560f6933d 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PPS-CF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PPS-CF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-CF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_44", + "filament_id": "OFZOuWrO", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI PPS-GF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI PPS-GF @X-Max 4.json index 318920501f..de93c9e149 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI PPS-GF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI PPS-GF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI PPS-GF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_46", + "filament_id": "OFp57RRC", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI Support For PAHT @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI Support For PAHT @X-Max 4.json index 2a1eddd8a2..161f9bd4c3 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI Support For PAHT @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI Support For PAHT @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI Support For PAHT@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_32", + "filament_id": "OFXn3Vd9", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI Support For PET-PA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI Support For PET-PA @X-Max 4.json index 64fbb1eb22..c437350e37 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI Support For PET-PA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI Support For PET-PA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI Support For PET/PA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_33", + "filament_id": "OFqcL5UF", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI TPU 95A-HF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI TPU 95A-HF @X-Max 4.json index fea6c771ac..9a1cafaf3c 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI TPU 95A-HF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI TPU 95A-HF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI TPU 95A-HF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_50", + "filament_id": "OFR1XLMN", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/QIDI TPU-Aero @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI TPU-Aero @X-Max 4.json index 7aeb542fec..a19ddd39ea 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI TPU-Aero @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI TPU-Aero @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-Aero@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_49", + "filament_id": "OFMDHOcT", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/QIDI TPU-GF @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI TPU-GF @X-Max 4.json index 25a934fd19..2739b9f1a0 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI TPU-GF @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI TPU-GF @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI TPU-GF@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_15", + "filament_id": "OF9EHUKK", "instantiation": "false", "fan_cooling_layer_time": [ "100" diff --git a/resources/profiles/Qidi/filament/X4/QIDI UltraPA @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI UltraPA @X-Max 4.json index 1194e6c03d..618b506251 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI UltraPA @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI UltraPA @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI UltraPA@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_24", + "filament_id": "OFWDe7YH", "instantiation": "false", "box_temperature_range_high": [ "55" diff --git a/resources/profiles/Qidi/filament/X4/QIDI UltraPA-CF25 @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI UltraPA-CF25 @X-Max 4.json index 21629d63c9..140dd98bdc 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI UltraPA-CF25 @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI UltraPA-CF25 @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI UltraPA-CF25@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_26", + "filament_id": "OF9PELEb", "instantiation": "false", "box_temperature_range_high": [ "65" diff --git a/resources/profiles/Qidi/filament/X4/QIDI WOOD Rapido @X-Max 4.json b/resources/profiles/Qidi/filament/X4/QIDI WOOD Rapido @X-Max 4.json index d62533d44e..a8824c9917 100644 --- a/resources/profiles/Qidi/filament/X4/QIDI WOOD Rapido @X-Max 4.json +++ b/resources/profiles/Qidi/filament/X4/QIDI WOOD Rapido @X-Max 4.json @@ -3,7 +3,7 @@ "name": "QIDI WOOD Rapido@X-Max 4-Series", "inherits": "fdm_filament_x4_common", "from": "system", - "filament_id": "QD_3_1_6", + "filament_id": "OFvdZ2bx", "instantiation": "false", "additional_cooling_fan_speed": [ "100" 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 4bb0cbe387..accf79987f 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_0_11", + "filament_id": "OFY9muEs", "name": "Generic ABS@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 360f0ee803..79745adfce 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_0_23", + "filament_id": "OFLakOUI", "name": "Generic PC@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 ab1b23bb60..0e65fe68f7 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_0_41", + "filament_id": "OFYPdQJh", "name": "Generic PETG@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 e3939b7796..3b7690cc38 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_0_1", + "filament_id": "OFDSrzZ8", "name": "Generic PLA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 1c0d325a37..afa64cc602 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_0_4", + "filament_id": "OFesA6rF", "name": "Generic PLA Silk@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 d5f56d408b..b98a3a0a2f 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_0_50", + "filament_id": "OFjiXpyf", "name": "Generic TPU 95A@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 a2f14984a0..7a80b433df 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_14", + "filament_id": "OFma5TXH", "name": "QIDI ABS Odorless@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 0ecb9c656c..0afffa18f4 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_11", + "filament_id": "OFT2jon4", "name": "QIDI ABS Rapido@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 f3603eda99..9614cab30f 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_13", + "filament_id": "OFeCJqxx", "name": "QIDI ABS Rapido Metal@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 2ab2fbfc84..5336842811 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_12", + "filament_id": "OFt3HtlG", "name": "QIDI ABS-GF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 97127fe57b..b8fe444dd2 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_18", + "filament_id": "OFTsHNQi", "name": "QIDI ASA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 14423fd58c..73fb83834d 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_19", + "filament_id": "OFu1E4ur", "name": "QIDI ASA-Aero@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 9a8958c860..12606c993b 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_20", + "filament_id": "OF1W7c76", "name": "QIDI ASA-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 3464bed9a3..6abc420237 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_27", + "filament_id": "OFn6WpN7", "name": "QIDI PA12-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 9b6a66f61b..1c70ef53a0 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_25", + "filament_id": "OFZ3K2cL", "name": "QIDI PA6-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 fcfccfe0f6..ca5591813d 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_30", + "filament_id": "OFKgmsqE", "name": "QIDI PAHT-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 3c0f1056ed..411ae26214 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_31", + "filament_id": "OFo15hcT", "name": "QIDI PAHT-GF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 b6c6fb3b64..c7e407cd2e 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_34", + "filament_id": "OFDIrhbu", "name": "QIDI PC/ABS-FR@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 43410eabe1..bf56f12203 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_36", + "filament_id": "OFhiJE7Y", "name": "QIDI PEBA 95A@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 162cbec691..9163c3344e 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_37", + "filament_id": "OFKfJTwL", "name": "QIDI PET-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 84310856cc..83e68f579f 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_38", + "filament_id": "OFhx4uOG", "name": "QIDI PET-GF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 46810f49c3..7254fd50bb 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_39", + "filament_id": "OFuJ49uH", "name": "QIDI PETG Basic@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 fd506d8e74..01a3e6cabe 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_41", + "filament_id": "OF4S3To3", "name": "QIDI PETG Rapido@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 3e9f0a1cdf..ed1b218139 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_40", + "filament_id": "OFQ40XeN", "name": "QIDI PETG Tough@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 62ea937028..94792b7a75 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_45", + "filament_id": "OFf0MkD5", "name": "QIDI PETG Translucent@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 fcddc636a8..19f7f473dd 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_42", + "filament_id": "OF4iWKrE", "name": "QIDI PETG-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 fa65907d3d..3bed003091 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_43", + "filament_id": "OFdtPd9h", "name": "QIDI PETG-GF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 0ee194dfb3..30e12990e3 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_7", + "filament_id": "OF4nQ62r", "name": "QIDI PLA Basic@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 7796bf1faa..2843092024 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_8", + "filament_id": "OFughwKn", "name": "QIDI PLA Matte Basic@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 1aa1803258..6327908055 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_1", + "filament_id": "OFKIQO2W", "name": "QIDI PLA Rapido@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 d8cbd06ea1..9e2380faea 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_2", + "filament_id": "OF3IKafc", "name": "QIDI PLA Rapido Matte@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 404b7cd1e8..bc9f655538 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_3", + "filament_id": "OFANFm4x", "name": "QIDI PLA Rapido Metal@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 57c0c3e1dc..2b6574b104 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_4", + "filament_id": "OF2TQpOO", "name": "QIDI PLA Silk@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 1c4d8c99e3..390b331556 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_5", + "filament_id": "OFhWrAuP", "name": "QIDI PLA-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 c6be7046f6..b482042819 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_44", + "filament_id": "OFZOuWrO", "name": "QIDI PPS-CF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 757d4dbf3d..615d895851 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_46", + "filament_id": "OFp57RRC", "name": "QIDI PPS-GF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 ed1222daa9..63941c851b 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_32", + "filament_id": "OFXn3Vd9", "name": "QIDI Support For PAHT@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 346c3cc3eb..969fc2bccc 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_33", + "filament_id": "OFqcL5UF", "name": "QIDI Support For PET/PA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 4721ab171c..7b06c92253 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_50", + "filament_id": "OFR1XLMN", "name": "QIDI TPU 95A-HF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 b6eee90916..4ede2d7d6e 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_49", + "filament_id": "OFMDHOcT", "name": "QIDI TPU-Aero@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 b3f2f71866..90de30cb02 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_15", + "filament_id": "OF9EHUKK", "name": "QIDI TPU-GF@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 9d86c06f95..75a89479e2 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_24", + "filament_id": "OFWDe7YH", "name": "QIDI UltraPA@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 73379541b3..2ea27efa4b 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_26", + "filament_id": "OF9PELEb", "name": "QIDI UltraPA-CF25@X-Plus 5-Series", "from": "system", "instantiation": "false", 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 30428c7422..efbe41d51d 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,6 +1,6 @@ { "type": "filament", - "filament_id": "QD_4_1_6", + "filament_id": "OFvdZ2bx", "name": "QIDI WOOD Rapido@X-Plus 5-Series", "from": "system", "instantiation": "false", diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index 241b4cbb9f..795fa4f768 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -3603,6 +3603,1230 @@ ], "successor": "OFWRITFw" }, + "QD_0_1_1": { + "claims": [ + "Qidi/QIDI PLA Rapido" + ], + "successor": "OFKIQO2W" + }, + "QD_0_1_15": { + "claims": [ + "Qidi/QIDI TPU-GF" + ], + "successor": "OF9EHUKK" + }, + "QD_0_1_2": { + "claims": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "successor": "OF3IKafc" + }, + "QD_0_1_20": { + "claims": [ + "Qidi/QIDI ASA-CF" + ], + "successor": "OF1W7c76" + }, + "QD_0_1_24": { + "claims": [ + "Qidi/QIDI PA-Ultra" + ], + "successor": "OFlN6DL1" + }, + "QD_0_1_26": { + "claims": [ + "Qidi/QIDI UltraPA-CF25" + ], + "successor": "OF9PELEb" + }, + "QD_0_1_27": { + "claims": [ + "Qidi/QIDI PA12-CF" + ], + "successor": "OFn6WpN7" + }, + "QD_0_1_3": { + "claims": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "successor": "OFANFm4x" + }, + "QD_0_1_30": { + "claims": [ + "Qidi/QIDI PAHT-CF" + ], + "successor": "OFKgmsqE" + }, + "QD_0_1_31": { + "claims": [ + "Qidi/QIDI PAHT-GF" + ], + "successor": "OFo15hcT" + }, + "QD_0_1_32": { + "claims": [ + "Qidi/QIDI Support For PAHT" + ], + "successor": "OFXn3Vd9" + }, + "QD_0_1_33": { + "claims": [ + "Qidi/QIDI Support For PET/PA" + ], + "successor": "OFqcL5UF" + }, + "QD_0_1_34": { + "claims": [ + "Qidi/Qidi PC-ABS-FR" + ], + "successor": "OFjD3YTW" + }, + "QD_0_1_36": { + "claims": [ + "Qidi/QIDI PEBA 95A" + ], + "successor": "OFhiJE7Y" + }, + "QD_0_1_37": { + "claims": [ + "Qidi/QIDI PET-CF" + ], + "successor": "OFKfJTwL" + }, + "QD_0_1_38": { + "claims": [ + "Qidi/QIDI PET-GF" + ], + "successor": "OFhx4uOG" + }, + "QD_0_1_39": { + "claims": [ + "Qidi/QIDI PETG Basic" + ], + "successor": "OFuJ49uH" + }, + "QD_0_1_4": { + "claims": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "successor": "OFW5FqkL" + }, + "QD_0_1_40": { + "claims": [ + "Qidi/QIDI PETG Tough" + ], + "successor": "OFQ40XeN" + }, + "QD_0_1_41": { + "claims": [ + "Qidi/QIDI PETG Rapido" + ], + "successor": "OF4S3To3" + }, + "QD_0_1_42": { + "claims": [ + "Qidi/QIDI PETG-CF" + ], + "successor": "OF4iWKrE" + }, + "QD_0_1_43": { + "claims": [ + "Qidi/QIDI PETG-GF" + ], + "successor": "OFdtPd9h" + }, + "QD_0_1_44": { + "claims": [ + "Qidi/QIDI PPS-CF" + ], + "successor": "OFZOuWrO" + }, + "QD_0_1_45": { + "claims": [ + "Qidi/QIDI PETG Translucent" + ], + "successor": "OFf0MkD5" + }, + "QD_0_1_46": { + "claims": [ + "Qidi/QIDI PPS-GF" + ], + "successor": "OFp57RRC" + }, + "QD_0_1_49": { + "claims": [ + "Qidi/QIDI TPU-Aero" + ], + "successor": "OFMDHOcT" + }, + "QD_0_1_5": { + "claims": [ + "Qidi/QIDI PLA-CF" + ], + "successor": "OFhWrAuP" + }, + "QD_0_1_50": { + "claims": [ + "Qidi/Qidi TPU 95A-HF" + ], + "successor": "OFzAWsca" + }, + "QD_0_1_6": { + "claims": [ + "Qidi/QIDI WOOD Rapido" + ], + "successor": "OFvdZ2bx" + }, + "QD_0_1_7": { + "claims": [ + "Qidi/QIDI PLA Basic" + ], + "successor": "OF4nQ62r" + }, + "QD_0_1_8": { + "claims": [ + "Qidi/QIDI PLA Matte Basic" + ], + "successor": "OFughwKn" + }, + "QD_1_0_1": { + "claims": [ + "Qidi/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "QD_1_0_11": { + "claims": [ + "Qidi/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "QD_1_0_23": { + "claims": [ + "Qidi/Generic PC" + ], + "successor": "OFLakOUI" + }, + "QD_1_0_4": { + "claims": [ + "Qidi/Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "QD_1_0_41": { + "claims": [ + "Qidi/Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "QD_1_0_50": { + "claims": [ + "Qidi/Generic TPU 95A" + ], + "successor": "OFjiXpyf" + }, + "QD_1_1_1": { + "claims": [ + "Qidi/QIDI PLA Rapido" + ], + "successor": "OFKIQO2W" + }, + "QD_1_1_11": { + "claims": [ + "Qidi/QIDI ABS Rapido" + ], + "successor": "OFT2jon4" + }, + "QD_1_1_12": { + "claims": [ + "Qidi/QIDI ABS-GF" + ], + "successor": "OFt3HtlG" + }, + "QD_1_1_13": { + "claims": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "successor": "OFeCJqxx" + }, + "QD_1_1_14": { + "claims": [ + "Qidi/QIDI ABS Odorless" + ], + "successor": "OFma5TXH" + }, + "QD_1_1_15": { + "claims": [ + "Qidi/QIDI TPU-GF" + ], + "successor": "OF9EHUKK" + }, + "QD_1_1_18": { + "claims": [ + "Qidi/QIDI ASA" + ], + "successor": "OFTsHNQi" + }, + "QD_1_1_19": { + "claims": [ + "Qidi/QIDI ASA-Aero" + ], + "successor": "OFu1E4ur" + }, + "QD_1_1_2": { + "claims": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "successor": "OF3IKafc" + }, + "QD_1_1_20": { + "claims": [ + "Qidi/QIDI ASA-CF" + ], + "successor": "OF1W7c76" + }, + "QD_1_1_24": { + "claims": [ + "Qidi/QIDI UltraPA" + ], + "successor": "OFWDe7YH" + }, + "QD_1_1_26": { + "claims": [ + "Qidi/QIDI UltraPA-CF25" + ], + "successor": "OF9PELEb" + }, + "QD_1_1_27": { + "claims": [ + "Qidi/QIDI PA12-CF" + ], + "successor": "OFn6WpN7" + }, + "QD_1_1_3": { + "claims": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "successor": "OFANFm4x" + }, + "QD_1_1_30": { + "claims": [ + "Qidi/QIDI PAHT-CF" + ], + "successor": "OFKgmsqE" + }, + "QD_1_1_31": { + "claims": [ + "Qidi/QIDI PAHT-GF" + ], + "successor": "OFo15hcT" + }, + "QD_1_1_32": { + "claims": [ + "Qidi/QIDI Support For PAHT" + ], + "successor": "OFXn3Vd9" + }, + "QD_1_1_33": { + "claims": [ + "Qidi/QIDI Support For PET/PA" + ], + "successor": "OFqcL5UF" + }, + "QD_1_1_34": { + "claims": [ + "Qidi/QIDI PC-ABS-FR" + ], + "successor": "OFFAWVf0" + }, + "QD_1_1_36": { + "claims": [ + "Qidi/QIDI PEBA 95A" + ], + "successor": "OFhiJE7Y" + }, + "QD_1_1_37": { + "claims": [ + "Qidi/QIDI PET-CF" + ], + "successor": "OFKfJTwL" + }, + "QD_1_1_38": { + "claims": [ + "Qidi/QIDI PET-GF" + ], + "successor": "OFhx4uOG" + }, + "QD_1_1_39": { + "claims": [ + "Qidi/QIDI PETG Basic" + ], + "successor": "OFuJ49uH" + }, + "QD_1_1_4": { + "claims": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "successor": "OFW5FqkL" + }, + "QD_1_1_40": { + "claims": [ + "Qidi/QIDI PETG Tough" + ], + "successor": "OFQ40XeN" + }, + "QD_1_1_41": { + "claims": [ + "Qidi/QIDI PETG Rapido" + ], + "successor": "OF4S3To3" + }, + "QD_1_1_42": { + "claims": [ + "Qidi/QIDI PETG-CF" + ], + "successor": "OF4iWKrE" + }, + "QD_1_1_43": { + "claims": [ + "Qidi/QIDI PETG-GF" + ], + "successor": "OFdtPd9h" + }, + "QD_1_1_44": { + "claims": [ + "Qidi/QIDI PPS-CF" + ], + "successor": "OFZOuWrO" + }, + "QD_1_1_45": { + "claims": [ + "Qidi/QIDI PETG Translucent" + ], + "successor": "OFf0MkD5" + }, + "QD_1_1_46": { + "claims": [ + "Qidi/QIDI PPS-GF" + ], + "successor": "OFp57RRC" + }, + "QD_1_1_49": { + "claims": [ + "Qidi/QIDI TPU-Aero" + ], + "successor": "OFMDHOcT" + }, + "QD_1_1_5": { + "claims": [ + "Qidi/QIDI PLA-CF" + ], + "successor": "OFhWrAuP" + }, + "QD_1_1_50": { + "claims": [ + "Qidi/QIDI TPU 95A-HF" + ], + "successor": "OFR1XLMN" + }, + "QD_1_1_6": { + "claims": [ + "Qidi/QIDI WOOD Rapido" + ], + "successor": "OFvdZ2bx" + }, + "QD_1_1_7": { + "claims": [ + "Qidi/QIDI PLA Basic" + ], + "successor": "OF4nQ62r" + }, + "QD_1_1_8": { + "claims": [ + "Qidi/QIDI PLA Matte Basic" + ], + "successor": "OFughwKn" + }, + "QD_2_0_1": { + "claims": [ + "Qidi/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "QD_2_0_11": { + "claims": [ + "Qidi/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "QD_2_0_23": { + "claims": [ + "Qidi/Generic PC" + ], + "successor": "OFLakOUI" + }, + "QD_2_0_4": { + "claims": [ + "Qidi/Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "QD_2_0_41": { + "claims": [ + "Qidi/Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "QD_2_0_50": { + "claims": [ + "Qidi/Generic TPU 95A" + ], + "successor": "OFjiXpyf" + }, + "QD_2_1_1": { + "claims": [ + "Qidi/QIDI PLA Rapido" + ], + "successor": "OFKIQO2W" + }, + "QD_2_1_11": { + "claims": [ + "Qidi/QIDI ABS Rapido" + ], + "successor": "OFT2jon4" + }, + "QD_2_1_12": { + "claims": [ + "Qidi/QIDI ABS-GF" + ], + "successor": "OFt3HtlG" + }, + "QD_2_1_13": { + "claims": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "successor": "OFeCJqxx" + }, + "QD_2_1_14": { + "claims": [ + "Qidi/QIDI ABS Odorless" + ], + "successor": "OFma5TXH" + }, + "QD_2_1_15": { + "claims": [ + "Qidi/QIDI TPU-GF" + ], + "successor": "OF9EHUKK" + }, + "QD_2_1_18": { + "claims": [ + "Qidi/QIDI ASA" + ], + "successor": "OFTsHNQi" + }, + "QD_2_1_19": { + "claims": [ + "Qidi/QIDI ASA-Aero" + ], + "successor": "OFu1E4ur" + }, + "QD_2_1_2": { + "claims": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "successor": "OF3IKafc" + }, + "QD_2_1_20": { + "claims": [ + "Qidi/QIDI ASA-CF" + ], + "successor": "OF1W7c76" + }, + "QD_2_1_24": { + "claims": [ + "Qidi/QIDI UltraPA" + ], + "successor": "OFWDe7YH" + }, + "QD_2_1_26": { + "claims": [ + "Qidi/QIDI UltraPA-CF25" + ], + "successor": "OF9PELEb" + }, + "QD_2_1_27": { + "claims": [ + "Qidi/QIDI PA12-CF" + ], + "successor": "OFn6WpN7" + }, + "QD_2_1_3": { + "claims": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "successor": "OFANFm4x" + }, + "QD_2_1_30": { + "claims": [ + "Qidi/QIDI PAHT-CF" + ], + "successor": "OFKgmsqE" + }, + "QD_2_1_31": { + "claims": [ + "Qidi/QIDI PAHT-GF" + ], + "successor": "OFo15hcT" + }, + "QD_2_1_32": { + "claims": [ + "Qidi/QIDI Support For PAHT" + ], + "successor": "OFXn3Vd9" + }, + "QD_2_1_33": { + "claims": [ + "Qidi/QIDI Support For PET/PA" + ], + "successor": "OFqcL5UF" + }, + "QD_2_1_34": { + "claims": [ + "Qidi/QIDI PC-ABS-FR" + ], + "successor": "OFFAWVf0" + }, + "QD_2_1_36": { + "claims": [ + "Qidi/QIDI PEBA 95A" + ], + "successor": "OFhiJE7Y" + }, + "QD_2_1_37": { + "claims": [ + "Qidi/QIDI PET-CF" + ], + "successor": "OFKfJTwL" + }, + "QD_2_1_38": { + "claims": [ + "Qidi/QIDI PET-GF" + ], + "successor": "OFhx4uOG" + }, + "QD_2_1_39": { + "claims": [ + "Qidi/QIDI PETG Basic" + ], + "successor": "OFuJ49uH" + }, + "QD_2_1_4": { + "claims": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "successor": "OFW5FqkL" + }, + "QD_2_1_40": { + "claims": [ + "Qidi/QIDI PETG Tough" + ], + "successor": "OFQ40XeN" + }, + "QD_2_1_41": { + "claims": [ + "Qidi/QIDI PETG Rapido" + ], + "successor": "OF4S3To3" + }, + "QD_2_1_42": { + "claims": [ + "Qidi/QIDI PETG-CF" + ], + "successor": "OF4iWKrE" + }, + "QD_2_1_43": { + "claims": [ + "Qidi/QIDI PETG-GF" + ], + "successor": "OFdtPd9h" + }, + "QD_2_1_44": { + "claims": [ + "Qidi/QIDI PPS-CF" + ], + "successor": "OFZOuWrO" + }, + "QD_2_1_45": { + "claims": [ + "Qidi/QIDI PETG Translucent" + ], + "successor": "OFf0MkD5" + }, + "QD_2_1_46": { + "claims": [ + "Qidi/QIDI PPS-GF" + ], + "successor": "OFp57RRC" + }, + "QD_2_1_49": { + "claims": [ + "Qidi/QIDI TPU-Aero" + ], + "successor": "OFMDHOcT" + }, + "QD_2_1_5": { + "claims": [ + "Qidi/QIDI PLA-CF" + ], + "successor": "OFhWrAuP" + }, + "QD_2_1_50": { + "claims": [ + "Qidi/QIDI TPU 95A-HF" + ], + "successor": "OFR1XLMN" + }, + "QD_2_1_6": { + "claims": [ + "Qidi/QIDI WOOD Rapido" + ], + "successor": "OFvdZ2bx" + }, + "QD_2_1_7": { + "claims": [ + "Qidi/QIDI PLA Basic" + ], + "successor": "OF4nQ62r" + }, + "QD_2_1_8": { + "claims": [ + "Qidi/QIDI PLA Matte Basic" + ], + "successor": "OFughwKn" + }, + "QD_3_0_1": { + "claims": [ + "Qidi/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "QD_3_0_11": { + "claims": [ + "Qidi/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "QD_3_0_23": { + "claims": [ + "Qidi/Generic PC" + ], + "successor": "OFLakOUI" + }, + "QD_3_0_4": { + "claims": [ + "Qidi/Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "QD_3_0_41": { + "claims": [ + "Qidi/Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "QD_3_0_50": { + "claims": [ + "Qidi/Generic TPU 95A" + ], + "successor": "OFjiXpyf" + }, + "QD_3_1_1": { + "claims": [ + "Qidi/QIDI PLA Rapido" + ], + "successor": "OFKIQO2W" + }, + "QD_3_1_11": { + "claims": [ + "Qidi/QIDI ABS Rapido" + ], + "successor": "OFT2jon4" + }, + "QD_3_1_12": { + "claims": [ + "Qidi/QIDI ABS-GF" + ], + "successor": "OFt3HtlG" + }, + "QD_3_1_13": { + "claims": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "successor": "OFeCJqxx" + }, + "QD_3_1_14": { + "claims": [ + "Qidi/QIDI ABS Odorless" + ], + "successor": "OFma5TXH" + }, + "QD_3_1_15": { + "claims": [ + "Qidi/QIDI TPU-GF" + ], + "successor": "OF9EHUKK" + }, + "QD_3_1_18": { + "claims": [ + "Qidi/QIDI ASA" + ], + "successor": "OFTsHNQi" + }, + "QD_3_1_19": { + "claims": [ + "Qidi/QIDI ASA-Aero" + ], + "successor": "OFu1E4ur" + }, + "QD_3_1_2": { + "claims": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "successor": "OF3IKafc" + }, + "QD_3_1_20": { + "claims": [ + "Qidi/QIDI ASA-CF" + ], + "successor": "OF1W7c76" + }, + "QD_3_1_24": { + "claims": [ + "Qidi/QIDI UltraPA" + ], + "successor": "OFWDe7YH" + }, + "QD_3_1_26": { + "claims": [ + "Qidi/QIDI UltraPA-CF25" + ], + "successor": "OF9PELEb" + }, + "QD_3_1_27": { + "claims": [ + "Qidi/QIDI PA12-CF" + ], + "successor": "OFn6WpN7" + }, + "QD_3_1_3": { + "claims": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "successor": "OFANFm4x" + }, + "QD_3_1_30": { + "claims": [ + "Qidi/QIDI PAHT-CF" + ], + "successor": "OFKgmsqE" + }, + "QD_3_1_31": { + "claims": [ + "Qidi/QIDI PAHT-GF" + ], + "successor": "OFo15hcT" + }, + "QD_3_1_32": { + "claims": [ + "Qidi/QIDI Support For PAHT" + ], + "successor": "OFXn3Vd9" + }, + "QD_3_1_33": { + "claims": [ + "Qidi/QIDI Support For PET/PA" + ], + "successor": "OFqcL5UF" + }, + "QD_3_1_34": { + "claims": [ + "Qidi/QIDI PC/ABS-FR" + ], + "successor": "OFDIrhbu" + }, + "QD_3_1_36": { + "claims": [ + "Qidi/QIDI PEBA 95A" + ], + "successor": "OFhiJE7Y" + }, + "QD_3_1_37": { + "claims": [ + "Qidi/QIDI PET-CF" + ], + "successor": "OFKfJTwL" + }, + "QD_3_1_38": { + "claims": [ + "Qidi/QIDI PET-GF" + ], + "successor": "OFhx4uOG" + }, + "QD_3_1_39": { + "claims": [ + "Qidi/QIDI PETG Basic" + ], + "successor": "OFuJ49uH" + }, + "QD_3_1_4": { + "claims": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "successor": "OFW5FqkL" + }, + "QD_3_1_40": { + "claims": [ + "Qidi/QIDI PETG Tough" + ], + "successor": "OFQ40XeN" + }, + "QD_3_1_41": { + "claims": [ + "Qidi/QIDI PETG Rapido" + ], + "successor": "OF4S3To3" + }, + "QD_3_1_42": { + "claims": [ + "Qidi/QIDI PETG-CF" + ], + "successor": "OF4iWKrE" + }, + "QD_3_1_43": { + "claims": [ + "Qidi/QIDI PETG-GF" + ], + "successor": "OFdtPd9h" + }, + "QD_3_1_44": { + "claims": [ + "Qidi/QIDI PPS-CF" + ], + "successor": "OFZOuWrO" + }, + "QD_3_1_45": { + "claims": [ + "Qidi/QIDI PETG Translucent" + ], + "successor": "OFf0MkD5" + }, + "QD_3_1_46": { + "claims": [ + "Qidi/QIDI PPS-GF" + ], + "successor": "OFp57RRC" + }, + "QD_3_1_49": { + "claims": [ + "Qidi/QIDI TPU-Aero" + ], + "successor": "OFMDHOcT" + }, + "QD_3_1_5": { + "claims": [ + "Qidi/QIDI PLA-CF" + ], + "successor": "OFhWrAuP" + }, + "QD_3_1_50": { + "claims": [ + "Qidi/QIDI TPU 95A-HF" + ], + "successor": "OFR1XLMN" + }, + "QD_3_1_6": { + "claims": [ + "Qidi/QIDI WOOD Rapido" + ], + "successor": "OFvdZ2bx" + }, + "QD_3_1_7": { + "claims": [ + "Qidi/QIDI PLA Basic" + ], + "successor": "OF4nQ62r" + }, + "QD_3_1_8": { + "claims": [ + "Qidi/QIDI PLA Matte Basic" + ], + "successor": "OFughwKn" + }, + "QD_4_0_1": { + "claims": [ + "Qidi/Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "QD_4_0_11": { + "claims": [ + "Qidi/Generic ABS" + ], + "successor": "OFY9muEs" + }, + "QD_4_0_23": { + "claims": [ + "Qidi/Generic PC" + ], + "successor": "OFLakOUI" + }, + "QD_4_0_4": { + "claims": [ + "Qidi/Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "QD_4_0_41": { + "claims": [ + "Qidi/Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "QD_4_0_50": { + "claims": [ + "Qidi/Generic TPU 95A" + ], + "successor": "OFjiXpyf" + }, + "QD_4_1_1": { + "claims": [ + "Qidi/QIDI PLA Rapido" + ], + "successor": "OFKIQO2W" + }, + "QD_4_1_11": { + "claims": [ + "Qidi/QIDI ABS Rapido" + ], + "successor": "OFT2jon4" + }, + "QD_4_1_12": { + "claims": [ + "Qidi/QIDI ABS-GF" + ], + "successor": "OFt3HtlG" + }, + "QD_4_1_13": { + "claims": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "successor": "OFeCJqxx" + }, + "QD_4_1_14": { + "claims": [ + "Qidi/QIDI ABS Odorless" + ], + "successor": "OFma5TXH" + }, + "QD_4_1_15": { + "claims": [ + "Qidi/QIDI TPU-GF" + ], + "successor": "OF9EHUKK" + }, + "QD_4_1_18": { + "claims": [ + "Qidi/QIDI ASA" + ], + "successor": "OFTsHNQi" + }, + "QD_4_1_19": { + "claims": [ + "Qidi/QIDI ASA-Aero" + ], + "successor": "OFu1E4ur" + }, + "QD_4_1_2": { + "claims": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "successor": "OF3IKafc" + }, + "QD_4_1_20": { + "claims": [ + "Qidi/QIDI ASA-CF" + ], + "successor": "OF1W7c76" + }, + "QD_4_1_24": { + "claims": [ + "Qidi/QIDI UltraPA" + ], + "successor": "OFWDe7YH" + }, + "QD_4_1_25": { + "claims": [ + "Qidi/QIDI PA6-CF" + ], + "successor": "OFZ3K2cL" + }, + "QD_4_1_26": { + "claims": [ + "Qidi/QIDI UltraPA-CF25" + ], + "successor": "OF9PELEb" + }, + "QD_4_1_27": { + "claims": [ + "Qidi/QIDI PA12-CF" + ], + "successor": "OFn6WpN7" + }, + "QD_4_1_3": { + "claims": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "successor": "OFANFm4x" + }, + "QD_4_1_30": { + "claims": [ + "Qidi/QIDI PAHT-CF" + ], + "successor": "OFKgmsqE" + }, + "QD_4_1_31": { + "claims": [ + "Qidi/QIDI PAHT-GF" + ], + "successor": "OFo15hcT" + }, + "QD_4_1_32": { + "claims": [ + "Qidi/QIDI Support For PAHT" + ], + "successor": "OFXn3Vd9" + }, + "QD_4_1_33": { + "claims": [ + "Qidi/QIDI Support For PET/PA" + ], + "successor": "OFqcL5UF" + }, + "QD_4_1_34": { + "claims": [ + "Qidi/QIDI PC/ABS-FR" + ], + "successor": "OFDIrhbu" + }, + "QD_4_1_36": { + "claims": [ + "Qidi/QIDI PEBA 95A" + ], + "successor": "OFhiJE7Y" + }, + "QD_4_1_37": { + "claims": [ + "Qidi/QIDI PET-CF" + ], + "successor": "OFKfJTwL" + }, + "QD_4_1_38": { + "claims": [ + "Qidi/QIDI PET-GF" + ], + "successor": "OFhx4uOG" + }, + "QD_4_1_39": { + "claims": [ + "Qidi/QIDI PETG Basic" + ], + "successor": "OFuJ49uH" + }, + "QD_4_1_4": { + "claims": [ + "Qidi/QIDI PLA Silk" + ], + "successor": "OF2TQpOO" + }, + "QD_4_1_40": { + "claims": [ + "Qidi/QIDI PETG Tough" + ], + "successor": "OFQ40XeN" + }, + "QD_4_1_41": { + "claims": [ + "Qidi/QIDI PETG Rapido" + ], + "successor": "OF4S3To3" + }, + "QD_4_1_42": { + "claims": [ + "Qidi/QIDI PETG-CF" + ], + "successor": "OF4iWKrE" + }, + "QD_4_1_43": { + "claims": [ + "Qidi/QIDI PETG-GF" + ], + "successor": "OFdtPd9h" + }, + "QD_4_1_44": { + "claims": [ + "Qidi/QIDI PPS-CF" + ], + "successor": "OFZOuWrO" + }, + "QD_4_1_45": { + "claims": [ + "Qidi/QIDI PETG Translucent" + ], + "successor": "OFf0MkD5" + }, + "QD_4_1_46": { + "claims": [ + "Qidi/QIDI PPS-GF" + ], + "successor": "OFp57RRC" + }, + "QD_4_1_49": { + "claims": [ + "Qidi/QIDI TPU-Aero" + ], + "successor": "OFMDHOcT" + }, + "QD_4_1_5": { + "claims": [ + "Qidi/QIDI PLA-CF" + ], + "successor": "OFhWrAuP" + }, + "QD_4_1_50": { + "claims": [ + "Qidi/QIDI TPU 95A-HF" + ], + "successor": "OFR1XLMN" + }, + "QD_4_1_6": { + "claims": [ + "Qidi/QIDI WOOD Rapido" + ], + "successor": "OFvdZ2bx" + }, + "QD_4_1_7": { + "claims": [ + "Qidi/QIDI PLA Basic" + ], + "successor": "OF4nQ62r" + }, + "QD_4_1_8": { + "claims": [ + "Qidi/QIDI PLA Matte Basic" + ], + "successor": "OFughwKn" + }, "SMCFB001": { "claims": [ "SeeMeCNC/SeeMeCNC ABS" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 14d207b34f..5183acc069 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -889,87 +889,11 @@ "Qidi/QIDI ABS Rapido 0.2 nozzle", "Qidi/QIDI ABS Rapido 0.6 nozzle", "Qidi/QIDI ABS Rapido 0.8 nozzle", - "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle", - "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PETG Tough 0.2 nozzle", "Qidi/QIDI PETG Tough 0.6 nozzle", "Qidi/QIDI PETG Tough 0.8 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI PLA Rapido 0.2 nozzle", "Qidi/QIDI PLA Rapido 0.8 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA-CF @0.6 nozzle", "Qidi/QIDI PLA-CF @0.8 nozzle", "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", @@ -978,38 +902,10 @@ "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle", "Snapmaker/PolyLite Dual PLA @0.2 nozzle", "Snapmaker/PolyLite J1 PLA", "Snapmaker/PolyLite J1 PLA @0.2 nozzle", @@ -1822,6 +1718,9 @@ "OF2RjrWH": [ "Flashforge/FusRock Generic PAHT-GF" ], + "OF2TQpOO": [ + "Qidi/QIDI PLA Silk" + ], "OF2VFe4J": [ "OrcaFilamentLibrary/Bambu PAHT-CF" ], @@ -2391,6 +2290,9 @@ "OFDGigEI": [ "OrcaFilamentLibrary/Bambu PLA Dynamic" ], + "OFDIrhbu": [ + "Qidi/QIDI PC/ABS-FR" + ], "OFDJU6R3": [ "Afinia/Afinia TPU" ], @@ -2411,6 +2313,7 @@ "Flashforge/Generic PLA", "LONGER/Generic PLA", "OrcaFilamentLibrary/Generic PLA", + "Qidi/Generic PLA", "RH3D/Generic PLA", "Sovol/Generic PLA", "Z-Bolt/Generic PLA" @@ -2520,6 +2423,9 @@ "OFF9cgY5": [ "Snapmaker/Snapmaker PLA Matte" ], + "OFFAWVf0": [ + "Qidi/QIDI PC-ABS-FR" + ], "OFFC0VqZ": [ "Ratrig/RatRig BigNozzle PCTG" ], @@ -2895,6 +2801,7 @@ "Custom/Generic PC", "Elegoo/Generic PC", "OrcaFilamentLibrary/Generic PC", + "Qidi/Generic PC", "Sovol/Generic PC" ], "OFLbXwoL": [ @@ -3246,6 +3153,9 @@ "OFR0gODA": [ "SeeMeCNC/SeeMeCNC ABS" ], + "OFR1XLMN": [ + "Qidi/QIDI TPU 95A-HF" + ], "OFRDLNM9": [ "Peopoly/Peopoly Generic PLA" ], @@ -3495,6 +3405,9 @@ "OFW9uIkE": [ "Tiertime/Tiertime Generic HIPS" ], + "OFWDe7YH": [ + "Qidi/QIDI UltraPA" + ], "OFWIr7ZE": [ "CoLiDo/CoLiDo Generic ABS" ], @@ -3629,6 +3542,7 @@ "Elegoo/Generic ABS", "Flashforge/Generic ABS", "OrcaFilamentLibrary/Generic ABS", + "Qidi/Generic ABS", "RH3D/Generic ABS", "Sovol/Generic ABS", "Z-Bolt/Generic ABS" @@ -3654,6 +3568,7 @@ "Flashforge/Generic PETG", "LONGER/Generic PETG", "OrcaFilamentLibrary/Generic PETG", + "Qidi/Generic PETG", "RH3D/Generic PETG", "Sovol/Generic PETG", "Z-Bolt/Generic PETG" @@ -3690,6 +3605,9 @@ "OFZ2LuAi": [ "Wanhao France/YUMI PLA Bowden" ], + "OFZ3K2cL": [ + "Qidi/QIDI PA6-CF" + ], "OFZ4QbfK": [ "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" ], @@ -3963,6 +3881,7 @@ "OFesA6rF": [ "Flashforge/Generic PLA Silk", "OrcaFilamentLibrary/Generic PLA Silk", + "Qidi/Generic PLA Silk", "Sovol/Generic PLA Silk" ], "OFetENFF": [ @@ -4299,6 +4218,9 @@ "OFjcwUEm": [ "Cubicon/Cubicon PLA" ], + "OFjiXpyf": [ + "Qidi/Generic TPU 95A" + ], "OFjkdnyN": [ "Snapmaker/Snapmaker Dual TPU" ], @@ -4889,6 +4811,9 @@ "OFu0fjPJ": [ "LH/LHS PC CF" ], + "OFu1E4ur": [ + "Qidi/QIDI ASA-Aero" + ], "OFu1evlr": [ "Creality/Generic PCTG", "OrcaFilamentLibrary/Generic PCTG" @@ -5192,618 +5117,6 @@ ], "OFzzmK2Q": [ "FLSun/FLSun S1 ABS" - ], - "QD_0_1_1": [ - "Qidi/QIDI PLA Rapido" - ], - "QD_0_1_15": [ - "Qidi/QIDI TPU-GF" - ], - "QD_0_1_2": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "QD_0_1_20": [ - "Qidi/QIDI ASA-CF" - ], - "QD_0_1_24": [ - "Qidi/QIDI PA-Ultra" - ], - "QD_0_1_26": [ - "Qidi/QIDI UltraPA-CF25" - ], - "QD_0_1_27": [ - "Qidi/QIDI PA12-CF" - ], - "QD_0_1_3": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "QD_0_1_30": [ - "Qidi/QIDI PAHT-CF" - ], - "QD_0_1_31": [ - "Qidi/QIDI PAHT-GF" - ], - "QD_0_1_32": [ - "Qidi/QIDI Support For PAHT" - ], - "QD_0_1_33": [ - "Qidi/QIDI Support For PET/PA" - ], - "QD_0_1_34": [ - "Qidi/Qidi PC-ABS-FR" - ], - "QD_0_1_36": [ - "Qidi/QIDI PEBA 95A" - ], - "QD_0_1_37": [ - "Qidi/QIDI PET-CF" - ], - "QD_0_1_38": [ - "Qidi/QIDI PET-GF" - ], - "QD_0_1_39": [ - "Qidi/QIDI PETG Basic" - ], - "QD_0_1_4": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "QD_0_1_40": [ - "Qidi/QIDI PETG Tough" - ], - "QD_0_1_41": [ - "Qidi/QIDI PETG Rapido" - ], - "QD_0_1_42": [ - "Qidi/QIDI PETG-CF" - ], - "QD_0_1_43": [ - "Qidi/QIDI PETG-GF" - ], - "QD_0_1_44": [ - "Qidi/QIDI PPS-CF" - ], - "QD_0_1_45": [ - "Qidi/QIDI PETG Translucent" - ], - "QD_0_1_46": [ - "Qidi/QIDI PPS-GF" - ], - "QD_0_1_49": [ - "Qidi/QIDI TPU-Aero" - ], - "QD_0_1_5": [ - "Qidi/QIDI PLA-CF" - ], - "QD_0_1_50": [ - "Qidi/Qidi TPU 95A-HF" - ], - "QD_0_1_6": [ - "Qidi/QIDI WOOD Rapido" - ], - "QD_0_1_7": [ - "Qidi/QIDI PLA Basic" - ], - "QD_0_1_8": [ - "Qidi/QIDI PLA Matte Basic" - ], - "QD_1_0_1": [ - "Qidi/Generic PLA" - ], - "QD_1_0_11": [ - "Qidi/Generic ABS" - ], - "QD_1_0_23": [ - "Qidi/Generic PC" - ], - "QD_1_0_4": [ - "Qidi/Generic PLA Silk" - ], - "QD_1_0_41": [ - "Qidi/Generic PETG" - ], - "QD_1_0_50": [ - "Qidi/Generic TPU 95A" - ], - "QD_1_1_1": [ - "Qidi/QIDI PLA Rapido" - ], - "QD_1_1_11": [ - "Qidi/QIDI ABS Rapido" - ], - "QD_1_1_12": [ - "Qidi/QIDI ABS-GF" - ], - "QD_1_1_13": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "QD_1_1_14": [ - "Qidi/QIDI ABS Odorless" - ], - "QD_1_1_15": [ - "Qidi/QIDI TPU-GF" - ], - "QD_1_1_18": [ - "Qidi/QIDI ASA" - ], - "QD_1_1_19": [ - "Qidi/QIDI ASA-Aero" - ], - "QD_1_1_2": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "QD_1_1_20": [ - "Qidi/QIDI ASA-CF" - ], - "QD_1_1_24": [ - "Qidi/QIDI UltraPA" - ], - "QD_1_1_26": [ - "Qidi/QIDI UltraPA-CF25" - ], - "QD_1_1_27": [ - "Qidi/QIDI PA12-CF" - ], - "QD_1_1_3": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "QD_1_1_30": [ - "Qidi/QIDI PAHT-CF" - ], - "QD_1_1_31": [ - "Qidi/QIDI PAHT-GF" - ], - "QD_1_1_32": [ - "Qidi/QIDI Support For PAHT" - ], - "QD_1_1_33": [ - "Qidi/QIDI Support For PET/PA" - ], - "QD_1_1_34": [ - "Qidi/QIDI PC-ABS-FR" - ], - "QD_1_1_36": [ - "Qidi/QIDI PEBA 95A" - ], - "QD_1_1_37": [ - "Qidi/QIDI PET-CF" - ], - "QD_1_1_38": [ - "Qidi/QIDI PET-GF" - ], - "QD_1_1_39": [ - "Qidi/QIDI PETG Basic" - ], - "QD_1_1_4": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "QD_1_1_40": [ - "Qidi/QIDI PETG Tough" - ], - "QD_1_1_41": [ - "Qidi/QIDI PETG Rapido" - ], - "QD_1_1_42": [ - "Qidi/QIDI PETG-CF" - ], - "QD_1_1_43": [ - "Qidi/QIDI PETG-GF" - ], - "QD_1_1_44": [ - "Qidi/QIDI PPS-CF" - ], - "QD_1_1_45": [ - "Qidi/QIDI PETG Translucent" - ], - "QD_1_1_46": [ - "Qidi/QIDI PPS-GF" - ], - "QD_1_1_49": [ - "Qidi/QIDI TPU-Aero" - ], - "QD_1_1_5": [ - "Qidi/QIDI PLA-CF" - ], - "QD_1_1_50": [ - "Qidi/QIDI TPU 95A-HF" - ], - "QD_1_1_6": [ - "Qidi/QIDI WOOD Rapido" - ], - "QD_1_1_7": [ - "Qidi/QIDI PLA Basic" - ], - "QD_1_1_8": [ - "Qidi/QIDI PLA Matte Basic" - ], - "QD_2_0_1": [ - "Qidi/Generic PLA" - ], - "QD_2_0_11": [ - "Qidi/Generic ABS" - ], - "QD_2_0_23": [ - "Qidi/Generic PC" - ], - "QD_2_0_4": [ - "Qidi/Generic PLA Silk" - ], - "QD_2_0_41": [ - "Qidi/Generic PETG" - ], - "QD_2_0_50": [ - "Qidi/Generic TPU 95A" - ], - "QD_2_1_1": [ - "Qidi/QIDI PLA Rapido" - ], - "QD_2_1_11": [ - "Qidi/QIDI ABS Rapido" - ], - "QD_2_1_12": [ - "Qidi/QIDI ABS-GF" - ], - "QD_2_1_13": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "QD_2_1_14": [ - "Qidi/QIDI ABS Odorless" - ], - "QD_2_1_15": [ - "Qidi/QIDI TPU-GF" - ], - "QD_2_1_18": [ - "Qidi/QIDI ASA" - ], - "QD_2_1_19": [ - "Qidi/QIDI ASA-Aero" - ], - "QD_2_1_2": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "QD_2_1_20": [ - "Qidi/QIDI ASA-CF" - ], - "QD_2_1_24": [ - "Qidi/QIDI UltraPA" - ], - "QD_2_1_26": [ - "Qidi/QIDI UltraPA-CF25" - ], - "QD_2_1_27": [ - "Qidi/QIDI PA12-CF" - ], - "QD_2_1_3": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "QD_2_1_30": [ - "Qidi/QIDI PAHT-CF" - ], - "QD_2_1_31": [ - "Qidi/QIDI PAHT-GF" - ], - "QD_2_1_32": [ - "Qidi/QIDI Support For PAHT" - ], - "QD_2_1_33": [ - "Qidi/QIDI Support For PET/PA" - ], - "QD_2_1_34": [ - "Qidi/QIDI PC-ABS-FR" - ], - "QD_2_1_36": [ - "Qidi/QIDI PEBA 95A" - ], - "QD_2_1_37": [ - "Qidi/QIDI PET-CF" - ], - "QD_2_1_38": [ - "Qidi/QIDI PET-GF" - ], - "QD_2_1_39": [ - "Qidi/QIDI PETG Basic" - ], - "QD_2_1_4": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "QD_2_1_40": [ - "Qidi/QIDI PETG Tough" - ], - "QD_2_1_41": [ - "Qidi/QIDI PETG Rapido" - ], - "QD_2_1_42": [ - "Qidi/QIDI PETG-CF" - ], - "QD_2_1_43": [ - "Qidi/QIDI PETG-GF" - ], - "QD_2_1_44": [ - "Qidi/QIDI PPS-CF" - ], - "QD_2_1_45": [ - "Qidi/QIDI PETG Translucent" - ], - "QD_2_1_46": [ - "Qidi/QIDI PPS-GF" - ], - "QD_2_1_49": [ - "Qidi/QIDI TPU-Aero" - ], - "QD_2_1_5": [ - "Qidi/QIDI PLA-CF" - ], - "QD_2_1_50": [ - "Qidi/QIDI TPU 95A-HF" - ], - "QD_2_1_6": [ - "Qidi/QIDI WOOD Rapido" - ], - "QD_2_1_7": [ - "Qidi/QIDI PLA Basic" - ], - "QD_2_1_8": [ - "Qidi/QIDI PLA Matte Basic" - ], - "QD_3_0_1": [ - "Qidi/Generic PLA" - ], - "QD_3_0_11": [ - "Qidi/Generic ABS" - ], - "QD_3_0_23": [ - "Qidi/Generic PC" - ], - "QD_3_0_4": [ - "Qidi/Generic PLA Silk" - ], - "QD_3_0_41": [ - "Qidi/Generic PETG" - ], - "QD_3_0_50": [ - "Qidi/Generic TPU 95A" - ], - "QD_3_1_1": [ - "Qidi/QIDI PLA Rapido" - ], - "QD_3_1_11": [ - "Qidi/QIDI ABS Rapido" - ], - "QD_3_1_12": [ - "Qidi/QIDI ABS-GF" - ], - "QD_3_1_13": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "QD_3_1_14": [ - "Qidi/QIDI ABS Odorless" - ], - "QD_3_1_15": [ - "Qidi/QIDI TPU-GF" - ], - "QD_3_1_18": [ - "Qidi/QIDI ASA" - ], - "QD_3_1_19": [ - "Qidi/QIDI ASA-Aero" - ], - "QD_3_1_2": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "QD_3_1_20": [ - "Qidi/QIDI ASA-CF" - ], - "QD_3_1_24": [ - "Qidi/QIDI UltraPA" - ], - "QD_3_1_26": [ - "Qidi/QIDI UltraPA-CF25" - ], - "QD_3_1_27": [ - "Qidi/QIDI PA12-CF" - ], - "QD_3_1_3": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "QD_3_1_30": [ - "Qidi/QIDI PAHT-CF" - ], - "QD_3_1_31": [ - "Qidi/QIDI PAHT-GF" - ], - "QD_3_1_32": [ - "Qidi/QIDI Support For PAHT" - ], - "QD_3_1_33": [ - "Qidi/QIDI Support For PET/PA" - ], - "QD_3_1_34": [ - "Qidi/QIDI PC/ABS-FR" - ], - "QD_3_1_36": [ - "Qidi/QIDI PEBA 95A" - ], - "QD_3_1_37": [ - "Qidi/QIDI PET-CF" - ], - "QD_3_1_38": [ - "Qidi/QIDI PET-GF" - ], - "QD_3_1_39": [ - "Qidi/QIDI PETG Basic" - ], - "QD_3_1_4": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "QD_3_1_40": [ - "Qidi/QIDI PETG Tough" - ], - "QD_3_1_41": [ - "Qidi/QIDI PETG Rapido" - ], - "QD_3_1_42": [ - "Qidi/QIDI PETG-CF" - ], - "QD_3_1_43": [ - "Qidi/QIDI PETG-GF" - ], - "QD_3_1_44": [ - "Qidi/QIDI PPS-CF" - ], - "QD_3_1_45": [ - "Qidi/QIDI PETG Translucent" - ], - "QD_3_1_46": [ - "Qidi/QIDI PPS-GF" - ], - "QD_3_1_49": [ - "Qidi/QIDI TPU-Aero" - ], - "QD_3_1_5": [ - "Qidi/QIDI PLA-CF" - ], - "QD_3_1_50": [ - "Qidi/QIDI TPU 95A-HF" - ], - "QD_3_1_6": [ - "Qidi/QIDI WOOD Rapido" - ], - "QD_3_1_7": [ - "Qidi/QIDI PLA Basic" - ], - "QD_3_1_8": [ - "Qidi/QIDI PLA Matte Basic" - ], - "QD_4_0_1": [ - "Qidi/Generic PLA" - ], - "QD_4_0_11": [ - "Qidi/Generic ABS" - ], - "QD_4_0_23": [ - "Qidi/Generic PC" - ], - "QD_4_0_4": [ - "Qidi/Generic PLA Silk" - ], - "QD_4_0_41": [ - "Qidi/Generic PETG" - ], - "QD_4_0_50": [ - "Qidi/Generic TPU 95A" - ], - "QD_4_1_1": [ - "Qidi/QIDI PLA Rapido" - ], - "QD_4_1_11": [ - "Qidi/QIDI ABS Rapido" - ], - "QD_4_1_12": [ - "Qidi/QIDI ABS-GF" - ], - "QD_4_1_13": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "QD_4_1_14": [ - "Qidi/QIDI ABS Odorless" - ], - "QD_4_1_15": [ - "Qidi/QIDI TPU-GF" - ], - "QD_4_1_18": [ - "Qidi/QIDI ASA" - ], - "QD_4_1_19": [ - "Qidi/QIDI ASA-Aero" - ], - "QD_4_1_2": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "QD_4_1_20": [ - "Qidi/QIDI ASA-CF" - ], - "QD_4_1_24": [ - "Qidi/QIDI UltraPA" - ], - "QD_4_1_25": [ - "Qidi/QIDI PA6-CF" - ], - "QD_4_1_26": [ - "Qidi/QIDI UltraPA-CF25" - ], - "QD_4_1_27": [ - "Qidi/QIDI PA12-CF" - ], - "QD_4_1_3": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "QD_4_1_30": [ - "Qidi/QIDI PAHT-CF" - ], - "QD_4_1_31": [ - "Qidi/QIDI PAHT-GF" - ], - "QD_4_1_32": [ - "Qidi/QIDI Support For PAHT" - ], - "QD_4_1_33": [ - "Qidi/QIDI Support For PET/PA" - ], - "QD_4_1_34": [ - "Qidi/QIDI PC/ABS-FR" - ], - "QD_4_1_36": [ - "Qidi/QIDI PEBA 95A" - ], - "QD_4_1_37": [ - "Qidi/QIDI PET-CF" - ], - "QD_4_1_38": [ - "Qidi/QIDI PET-GF" - ], - "QD_4_1_39": [ - "Qidi/QIDI PETG Basic" - ], - "QD_4_1_4": [ - "Qidi/QIDI PLA Silk" - ], - "QD_4_1_40": [ - "Qidi/QIDI PETG Tough" - ], - "QD_4_1_41": [ - "Qidi/QIDI PETG Rapido" - ], - "QD_4_1_42": [ - "Qidi/QIDI PETG-CF" - ], - "QD_4_1_43": [ - "Qidi/QIDI PETG-GF" - ], - "QD_4_1_44": [ - "Qidi/QIDI PPS-CF" - ], - "QD_4_1_45": [ - "Qidi/QIDI PETG Translucent" - ], - "QD_4_1_46": [ - "Qidi/QIDI PPS-GF" - ], - "QD_4_1_49": [ - "Qidi/QIDI TPU-Aero" - ], - "QD_4_1_5": [ - "Qidi/QIDI PLA-CF" - ], - "QD_4_1_50": [ - "Qidi/QIDI TPU 95A-HF" - ], - "QD_4_1_6": [ - "Qidi/QIDI WOOD Rapido" - ], - "QD_4_1_7": [ - "Qidi/QIDI PLA Basic" - ], - "QD_4_1_8": [ - "Qidi/QIDI PLA Matte Basic" ] }, "instantiated_with_id": [ @@ -8710,6 +8023,13 @@ "FusRock Generic PAHT-GF" ] ], + "OF2TQpOO": [ + [ + "QIDI", + "PLA", + "QIDI PLA Silk" + ] + ], "OF2VFe4J": [ [ "Bambu Lab", @@ -10012,6 +9332,13 @@ "Bambu PLA Dynamic" ] ], + "OFDIrhbu": [ + [ + "QIDI", + "PC-ABS-FR", + "QIDI PC/ABS-FR" + ] + ], "OFDJU6R3": [ [ "Afinia", @@ -10285,6 +9612,13 @@ "Snapmaker PLA Matte" ] ], + "OFFAWVf0": [ + [ + "QIDI", + "PC-ABS-FR", + "QIDI PC-ABS-FR" + ] + ], "OFFC0VqZ": [ [ "Generic", @@ -11909,6 +11243,13 @@ "SeeMeCNC ABS" ] ], + "OFR1XLMN": [ + [ + "QIDI", + "TPU", + "QIDI TPU 95A-HF" + ] + ], "OFRDLNM9": [ [ "Generic", @@ -12476,6 +11817,13 @@ "Tiertime Generic HIPS" ] ], + "OFWDe7YH": [ + [ + "QIDI", + "UltraPA", + "QIDI UltraPA" + ] + ], "OFWIr7ZE": [ [ "CoLiDo", @@ -12875,6 +12223,13 @@ "YUMI PLA Bowden" ] ], + "OFZ3K2cL": [ + [ + "QIDI", + "PA6-CF", + "QIDI PA6-CF" + ] + ], "OFZ4QbfK": [ [ "FilAr", @@ -14226,6 +13581,13 @@ "Cubicon PLA" ] ], + "OFjiXpyf": [ + [ + "Generic", + "TPU", + "Generic TPU 95A" + ] + ], "OFjkdnyN": [ [ "Snapmaker", @@ -15535,6 +14897,13 @@ "LHS PC CF" ] ], + "OFu1E4ur": [ + [ + "QIDI", + "ASA-AERO", + "QIDI ASA-Aero" + ] + ], "OFu1evlr": [ [ "Generic", @@ -16227,1434 +15596,6 @@ "ABS", "FLSun S1 ABS" ] - ], - "QD_0_1_1": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido" - ] - ], - "QD_0_1_15": [ - [ - "QIDI", - "TPU-GF", - "QIDI TPU-GF" - ] - ], - "QD_0_1_2": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Matte" - ] - ], - "QD_0_1_20": [ - [ - "QIDI", - "ASA-CF", - "QIDI ASA-CF" - ] - ], - "QD_0_1_24": [ - [ - "QIDI", - "UltraPA", - "QIDI PA-Ultra" - ] - ], - "QD_0_1_26": [ - [ - "QIDI", - "UltraPA-CF25", - "QIDI UltraPA-CF25" - ] - ], - "QD_0_1_27": [ - [ - "QIDI", - "PA12-CF", - "QIDI PA12-CF" - ] - ], - "QD_0_1_3": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Metal" - ] - ], - "QD_0_1_30": [ - [ - "QIDI", - "PAHT-CF", - "QIDI PAHT-CF" - ] - ], - "QD_0_1_31": [ - [ - "QIDI", - "PAHT-GF", - "QIDI PAHT-GF" - ] - ], - "QD_0_1_32": [ - [ - "QIDI", - "PAHT-S", - "QIDI Support For PAHT" - ] - ], - "QD_0_1_33": [ - [ - "QIDI", - "PA-S", - "QIDI Support For PET/PA" - ] - ], - "QD_0_1_34": [ - [ - "QIDI", - "PC-ABS-FR", - "Qidi PC-ABS-FR" - ] - ], - "QD_0_1_36": [ - [ - "QIDI", - "PEBA", - "QIDI PEBA 95A" - ] - ], - "QD_0_1_37": [ - [ - "QIDI", - "PET-CF", - "QIDI PET-CF" - ] - ], - "QD_0_1_38": [ - [ - "QIDI", - "PET-GF", - "QIDI PET-GF" - ] - ], - "QD_0_1_39": [ - [ - "QIDI", - "PETG", - "QIDI PETG Basic" - ] - ], - "QD_0_1_4": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Silk" - ] - ], - "QD_0_1_40": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough" - ] - ], - "QD_0_1_41": [ - [ - "QIDI", - "PETG", - "QIDI PETG Rapido" - ] - ], - "QD_0_1_42": [ - [ - "QIDI", - "PETG-CF", - "QIDI PETG-CF" - ] - ], - "QD_0_1_43": [ - [ - "QIDI", - "PETG-GF", - "QIDI PETG-GF" - ] - ], - "QD_0_1_44": [ - [ - "QIDI", - "PPS-CF", - "QIDI PPS-CF" - ] - ], - "QD_0_1_45": [ - [ - "QIDI", - "PETG", - "QIDI PETG Translucent" - ] - ], - "QD_0_1_46": [ - [ - "QIDI", - "PPS-GF", - "QIDI PPS-GF" - ] - ], - "QD_0_1_49": [ - [ - "QIDI", - "TPU-AERO", - "QIDI TPU-Aero" - ] - ], - "QD_0_1_5": [ - [ - "QIDI", - "PLA-CF", - "QIDI PLA-CF" - ] - ], - "QD_0_1_50": [ - [ - "QIDI", - "TPU", - "Qidi TPU 95A-HF" - ] - ], - "QD_0_1_6": [ - [ - "QIDI", - "PLA", - "QIDI WOOD Rapido" - ] - ], - "QD_0_1_7": [ - [ - "QIDI", - "PLA", - "QIDI PLA Basic" - ] - ], - "QD_0_1_8": [ - [ - "QIDI", - "PLA", - "QIDI PLA Matte Basic" - ] - ], - "QD_1_0_1": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "QD_1_0_11": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "QD_1_0_23": [ - [ - "Generic", - "PC", - "Generic PC" - ] - ], - "QD_1_0_4": [ - [ - "Generic", - "PLA", - "Generic PLA Silk" - ] - ], - "QD_1_0_41": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "QD_1_0_50": [ - [ - "Generic", - "TPU", - "Generic TPU 95A" - ] - ], - "QD_1_1_1": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido" - ] - ], - "QD_1_1_11": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido" - ] - ], - "QD_1_1_12": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF" - ] - ], - "QD_1_1_13": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido Metal" - ] - ], - "QD_1_1_14": [ - [ - "QIDI", - "ABS", - "QIDI ABS Odorless" - ] - ], - "QD_1_1_15": [ - [ - "QIDI", - "TPU-GF", - "QIDI TPU-GF" - ] - ], - "QD_1_1_18": [ - [ - "QIDI", - "ASA", - "QIDI ASA" - ] - ], - "QD_1_1_19": [ - [ - "QIDI", - "ASA-AERO", - "QIDI ASA-Aero" - ] - ], - "QD_1_1_2": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Matte" - ] - ], - "QD_1_1_20": [ - [ - "QIDI", - "ASA-CF", - "QIDI ASA-CF" - ] - ], - "QD_1_1_24": [ - [ - "QIDI", - "UltraPA", - "QIDI UltraPA" - ] - ], - "QD_1_1_26": [ - [ - "QIDI", - "UltraPA-CF25", - "QIDI UltraPA-CF25" - ] - ], - "QD_1_1_27": [ - [ - "QIDI", - "PA12-CF", - "QIDI PA12-CF" - ] - ], - "QD_1_1_3": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Metal" - ] - ], - "QD_1_1_30": [ - [ - "QIDI", - "PAHT-CF", - "QIDI PAHT-CF" - ] - ], - "QD_1_1_31": [ - [ - "QIDI", - "PAHT-GF", - "QIDI PAHT-GF" - ] - ], - "QD_1_1_32": [ - [ - "QIDI", - "PAHT-S", - "QIDI Support For PAHT" - ] - ], - "QD_1_1_33": [ - [ - "QIDI", - "PA-S", - "QIDI Support For PET/PA" - ] - ], - "QD_1_1_34": [ - [ - "QIDI", - "PC-ABS-FR", - "QIDI PC-ABS-FR" - ] - ], - "QD_1_1_36": [ - [ - "QIDI", - "PEBA", - "QIDI PEBA 95A" - ] - ], - "QD_1_1_37": [ - [ - "QIDI", - "PET-CF", - "QIDI PET-CF" - ] - ], - "QD_1_1_38": [ - [ - "QIDI", - "PET-GF", - "QIDI PET-GF" - ] - ], - "QD_1_1_39": [ - [ - "QIDI", - "PETG", - "QIDI PETG Basic" - ] - ], - "QD_1_1_4": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Silk" - ] - ], - "QD_1_1_40": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough" - ] - ], - "QD_1_1_41": [ - [ - "QIDI", - "PETG", - "QIDI PETG Rapido" - ] - ], - "QD_1_1_42": [ - [ - "QIDI", - "PETG-CF", - "QIDI PETG-CF" - ] - ], - "QD_1_1_43": [ - [ - "QIDI", - "PETG-GF", - "QIDI PETG-GF" - ] - ], - "QD_1_1_44": [ - [ - "QIDI", - "PPS-CF", - "QIDI PPS-CF" - ] - ], - "QD_1_1_45": [ - [ - "QIDI", - "PETG", - "QIDI PETG Translucent" - ] - ], - "QD_1_1_46": [ - [ - "QIDI", - "PPS-GF", - "QIDI PPS-GF" - ] - ], - "QD_1_1_49": [ - [ - "QIDI", - "TPU-AERO", - "QIDI TPU-Aero" - ] - ], - "QD_1_1_5": [ - [ - "QIDI", - "PLA-CF", - "QIDI PLA-CF" - ] - ], - "QD_1_1_50": [ - [ - "QIDI", - "TPU", - "QIDI TPU 95A-HF" - ] - ], - "QD_1_1_6": [ - [ - "QIDI", - "PLA", - "QIDI WOOD Rapido" - ] - ], - "QD_1_1_7": [ - [ - "QIDI", - "PLA", - "QIDI PLA Basic" - ] - ], - "QD_1_1_8": [ - [ - "QIDI", - "PLA", - "QIDI PLA Matte Basic" - ] - ], - "QD_2_0_1": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "QD_2_0_11": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "QD_2_0_23": [ - [ - "Generic", - "PC", - "Generic PC" - ] - ], - "QD_2_0_4": [ - [ - "Generic", - "PLA", - "Generic PLA Silk" - ] - ], - "QD_2_0_41": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "QD_2_0_50": [ - [ - "Generic", - "TPU", - "Generic TPU 95A" - ] - ], - "QD_2_1_1": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido" - ] - ], - "QD_2_1_11": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido" - ] - ], - "QD_2_1_12": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF" - ] - ], - "QD_2_1_13": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido Metal" - ] - ], - "QD_2_1_14": [ - [ - "QIDI", - "ABS", - "QIDI ABS Odorless" - ] - ], - "QD_2_1_15": [ - [ - "QIDI", - "TPU-GF", - "QIDI TPU-GF" - ] - ], - "QD_2_1_18": [ - [ - "QIDI", - "ASA", - "QIDI ASA" - ] - ], - "QD_2_1_19": [ - [ - "QIDI", - "ASA-AERO", - "QIDI ASA-Aero" - ] - ], - "QD_2_1_2": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Matte" - ] - ], - "QD_2_1_20": [ - [ - "QIDI", - "ASA-CF", - "QIDI ASA-CF" - ] - ], - "QD_2_1_24": [ - [ - "QIDI", - "UltraPA", - "QIDI UltraPA" - ] - ], - "QD_2_1_26": [ - [ - "QIDI", - "UltraPA-CF25", - "QIDI UltraPA-CF25" - ] - ], - "QD_2_1_27": [ - [ - "QIDI", - "PA12-CF", - "QIDI PA12-CF" - ] - ], - "QD_2_1_3": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Metal" - ] - ], - "QD_2_1_30": [ - [ - "QIDI", - "PAHT-CF", - "QIDI PAHT-CF" - ] - ], - "QD_2_1_31": [ - [ - "QIDI", - "PAHT-GF", - "QIDI PAHT-GF" - ] - ], - "QD_2_1_32": [ - [ - "QIDI", - "PAHT-S", - "QIDI Support For PAHT" - ] - ], - "QD_2_1_33": [ - [ - "QIDI", - "PA-S", - "QIDI Support For PET/PA" - ] - ], - "QD_2_1_34": [ - [ - "QIDI", - "PC-ABS-FR", - "QIDI PC-ABS-FR" - ] - ], - "QD_2_1_36": [ - [ - "QIDI", - "PEBA", - "QIDI PEBA 95A" - ] - ], - "QD_2_1_37": [ - [ - "QIDI", - "PET-CF", - "QIDI PET-CF" - ] - ], - "QD_2_1_38": [ - [ - "QIDI", - "PET-GF", - "QIDI PET-GF" - ] - ], - "QD_2_1_39": [ - [ - "QIDI", - "PETG", - "QIDI PETG Basic" - ] - ], - "QD_2_1_4": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Silk" - ] - ], - "QD_2_1_40": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough" - ] - ], - "QD_2_1_41": [ - [ - "QIDI", - "PETG", - "QIDI PETG Rapido" - ] - ], - "QD_2_1_42": [ - [ - "QIDI", - "PETG-CF", - "QIDI PETG-CF" - ] - ], - "QD_2_1_43": [ - [ - "QIDI", - "PETG-GF", - "QIDI PETG-GF" - ] - ], - "QD_2_1_44": [ - [ - "QIDI", - "PPS-CF", - "QIDI PPS-CF" - ] - ], - "QD_2_1_45": [ - [ - "QIDI", - "PETG", - "QIDI PETG Translucent" - ] - ], - "QD_2_1_46": [ - [ - "QIDI", - "PPS-GF", - "QIDI PPS-GF" - ] - ], - "QD_2_1_49": [ - [ - "QIDI", - "TPU-AERO", - "QIDI TPU-Aero" - ] - ], - "QD_2_1_5": [ - [ - "QIDI", - "PLA-CF", - "QIDI PLA-CF" - ] - ], - "QD_2_1_50": [ - [ - "QIDI", - "TPU", - "QIDI TPU 95A-HF" - ] - ], - "QD_2_1_6": [ - [ - "QIDI", - "PLA", - "QIDI WOOD Rapido" - ] - ], - "QD_2_1_7": [ - [ - "QIDI", - "PLA", - "QIDI PLA Basic" - ] - ], - "QD_2_1_8": [ - [ - "QIDI", - "PLA", - "QIDI PLA Matte Basic" - ] - ], - "QD_3_0_1": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "QD_3_0_11": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "QD_3_0_23": [ - [ - "Generic", - "PC", - "Generic PC" - ] - ], - "QD_3_0_4": [ - [ - "Generic", - "PLA", - "Generic PLA Silk" - ] - ], - "QD_3_0_41": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "QD_3_0_50": [ - [ - "Generic", - "TPU", - "Generic TPU 95A" - ] - ], - "QD_3_1_1": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido" - ] - ], - "QD_3_1_11": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido" - ] - ], - "QD_3_1_12": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF" - ] - ], - "QD_3_1_13": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido Metal" - ] - ], - "QD_3_1_14": [ - [ - "QIDI", - "ABS", - "QIDI ABS Odorless" - ] - ], - "QD_3_1_15": [ - [ - "QIDI", - "TPU-GF", - "QIDI TPU-GF" - ] - ], - "QD_3_1_18": [ - [ - "QIDI", - "ASA", - "QIDI ASA" - ] - ], - "QD_3_1_19": [ - [ - "QIDI", - "ASA-AERO", - "QIDI ASA-Aero" - ] - ], - "QD_3_1_2": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Matte" - ] - ], - "QD_3_1_20": [ - [ - "QIDI", - "ASA-CF", - "QIDI ASA-CF" - ] - ], - "QD_3_1_24": [ - [ - "QIDI", - "UltraPA", - "QIDI UltraPA" - ] - ], - "QD_3_1_26": [ - [ - "QIDI", - "UltraPA-CF25", - "QIDI UltraPA-CF25" - ] - ], - "QD_3_1_27": [ - [ - "QIDI", - "PA12-CF", - "QIDI PA12-CF" - ] - ], - "QD_3_1_3": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Metal" - ] - ], - "QD_3_1_30": [ - [ - "QIDI", - "PAHT-CF", - "QIDI PAHT-CF" - ] - ], - "QD_3_1_31": [ - [ - "QIDI", - "PAHT-GF", - "QIDI PAHT-GF" - ] - ], - "QD_3_1_32": [ - [ - "QIDI", - "PAHT-S", - "QIDI Support For PAHT" - ] - ], - "QD_3_1_33": [ - [ - "QIDI", - "PA-S", - "QIDI Support For PET/PA" - ] - ], - "QD_3_1_34": [ - [ - "QIDI", - "PC-ABS-FR", - "QIDI PC/ABS-FR" - ] - ], - "QD_3_1_36": [ - [ - "QIDI", - "PEBA", - "QIDI PEBA 95A" - ] - ], - "QD_3_1_37": [ - [ - "QIDI", - "PET-CF", - "QIDI PET-CF" - ] - ], - "QD_3_1_38": [ - [ - "QIDI", - "PET-GF", - "QIDI PET-GF" - ] - ], - "QD_3_1_39": [ - [ - "QIDI", - "PETG", - "QIDI PETG Basic" - ] - ], - "QD_3_1_4": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Silk" - ] - ], - "QD_3_1_40": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough" - ] - ], - "QD_3_1_41": [ - [ - "QIDI", - "PETG", - "QIDI PETG Rapido" - ] - ], - "QD_3_1_42": [ - [ - "QIDI", - "PETG-CF", - "QIDI PETG-CF" - ] - ], - "QD_3_1_43": [ - [ - "QIDI", - "PETG-GF", - "QIDI PETG-GF" - ] - ], - "QD_3_1_44": [ - [ - "QIDI", - "PPS-CF", - "QIDI PPS-CF" - ] - ], - "QD_3_1_45": [ - [ - "QIDI", - "PETG", - "QIDI PETG Translucent" - ] - ], - "QD_3_1_46": [ - [ - "QIDI", - "PPS-GF", - "QIDI PPS-GF" - ] - ], - "QD_3_1_49": [ - [ - "QIDI", - "TPU-AERO", - "QIDI TPU-Aero" - ] - ], - "QD_3_1_5": [ - [ - "QIDI", - "PLA-CF", - "QIDI PLA-CF" - ] - ], - "QD_3_1_50": [ - [ - "QIDI", - "TPU", - "QIDI TPU 95A-HF" - ] - ], - "QD_3_1_6": [ - [ - "QIDI", - "PLA", - "QIDI WOOD Rapido" - ] - ], - "QD_3_1_7": [ - [ - "QIDI", - "PLA", - "QIDI PLA Basic" - ] - ], - "QD_3_1_8": [ - [ - "QIDI", - "PLA", - "QIDI PLA Matte Basic" - ] - ], - "QD_4_0_1": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "QD_4_0_11": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "QD_4_0_23": [ - [ - "Generic", - "PC", - "Generic PC" - ] - ], - "QD_4_0_4": [ - [ - "Generic", - "PLA", - "Generic PLA Silk" - ] - ], - "QD_4_0_41": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "QD_4_0_50": [ - [ - "Generic", - "TPU", - "Generic TPU 95A" - ] - ], - "QD_4_1_1": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido" - ] - ], - "QD_4_1_11": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido" - ] - ], - "QD_4_1_12": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF" - ] - ], - "QD_4_1_13": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido Metal" - ] - ], - "QD_4_1_14": [ - [ - "QIDI", - "ABS", - "QIDI ABS Odorless" - ] - ], - "QD_4_1_15": [ - [ - "QIDI", - "TPU-GF", - "QIDI TPU-GF" - ] - ], - "QD_4_1_18": [ - [ - "QIDI", - "ASA", - "QIDI ASA" - ] - ], - "QD_4_1_19": [ - [ - "QIDI", - "ASA-AERO", - "QIDI ASA-Aero" - ] - ], - "QD_4_1_2": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Matte" - ] - ], - "QD_4_1_20": [ - [ - "QIDI", - "ASA-CF", - "QIDI ASA-CF" - ] - ], - "QD_4_1_24": [ - [ - "QIDI", - "UltraPA", - "QIDI UltraPA" - ] - ], - "QD_4_1_25": [ - [ - "QIDI", - "PA6-CF", - "QIDI PA6-CF" - ] - ], - "QD_4_1_26": [ - [ - "QIDI", - "UltraPA-CF25", - "QIDI UltraPA-CF25" - ] - ], - "QD_4_1_27": [ - [ - "QIDI", - "PA12-CF", - "QIDI PA12-CF" - ] - ], - "QD_4_1_3": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Metal" - ] - ], - "QD_4_1_30": [ - [ - "QIDI", - "PAHT-CF", - "QIDI PAHT-CF" - ] - ], - "QD_4_1_31": [ - [ - "QIDI", - "PAHT-GF", - "QIDI PAHT-GF" - ] - ], - "QD_4_1_32": [ - [ - "QIDI", - "PAHT-S", - "QIDI Support For PAHT" - ] - ], - "QD_4_1_33": [ - [ - "QIDI", - "PA-S", - "QIDI Support For PET/PA" - ] - ], - "QD_4_1_34": [ - [ - "QIDI", - "PC-ABS-FR", - "QIDI PC/ABS-FR" - ] - ], - "QD_4_1_36": [ - [ - "QIDI", - "PEBA", - "QIDI PEBA 95A" - ] - ], - "QD_4_1_37": [ - [ - "QIDI", - "PET-CF", - "QIDI PET-CF" - ] - ], - "QD_4_1_38": [ - [ - "QIDI", - "PET-GF", - "QIDI PET-GF" - ] - ], - "QD_4_1_39": [ - [ - "QIDI", - "PETG", - "QIDI PETG Basic" - ] - ], - "QD_4_1_4": [ - [ - "QIDI", - "PLA", - "QIDI PLA Silk" - ] - ], - "QD_4_1_40": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough" - ] - ], - "QD_4_1_41": [ - [ - "QIDI", - "PETG", - "QIDI PETG Rapido" - ] - ], - "QD_4_1_42": [ - [ - "QIDI", - "PETG-CF", - "QIDI PETG-CF" - ] - ], - "QD_4_1_43": [ - [ - "QIDI", - "PETG-GF", - "QIDI PETG-GF" - ] - ], - "QD_4_1_44": [ - [ - "QIDI", - "PPS-CF", - "QIDI PPS-CF" - ] - ], - "QD_4_1_45": [ - [ - "QIDI", - "PETG", - "QIDI PETG Translucent" - ] - ], - "QD_4_1_46": [ - [ - "QIDI", - "PPS-GF", - "QIDI PPS-GF" - ] - ], - "QD_4_1_49": [ - [ - "QIDI", - "TPU-AERO", - "QIDI TPU-Aero" - ] - ], - "QD_4_1_5": [ - [ - "QIDI", - "PLA-CF", - "QIDI PLA-CF" - ] - ], - "QD_4_1_50": [ - [ - "QIDI", - "TPU", - "QIDI TPU 95A-HF" - ] - ], - "QD_4_1_6": [ - [ - "QIDI", - "PLA", - "QIDI WOOD Rapido" - ] - ], - "QD_4_1_7": [ - [ - "QIDI", - "PLA", - "QIDI PLA Basic" - ] - ], - "QD_4_1_8": [ - [ - "QIDI", - "PLA", - "QIDI PLA Matte Basic" - ] ] } } diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index 0918702017..41df9c582e 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -1485,7 +1485,6 @@ class TestRealTree(unittest.TestCase): # QidiPrinterAgent::map_filament_type_to_setting_id returns must stay # retired ledger keys whose chains end at a live preset id, because the # agent resolves them through resolve_filament_id_succession() at runtime. - @unittest.skip("enable with plan v4.2: QD_* ids are not retired yet") def test_qidi_agent_fallback_ids_resolve_through_ledger(self): cpp = os.path.join(REPO_ROOT, "src", "slic3r", "Utils", "QidiPrinterAgent.cpp") with open(cpp, encoding="utf-8") as f: From 8994ab9f98f8bf5ba4ab14a59d7a48e58997c997 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 30 Aug 2026 20:56:12 +0800 Subject: [PATCH 25/52] make the script executable --- scripts/assign_filament_ids.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/assign_filament_ids.py diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py old mode 100644 new mode 100755 From 5add7a5062beba3c71201a2cdb80cd36ac8f8772 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 31 Aug 2026 16:25:59 +0800 Subject: [PATCH 26/52] Show Orca Filament Library filaments in AMS and calibration dialogs These dialogs treated a filament with no compatible_printers as compatible with nothing, while the rest of the app treats it as compatible with everything, so the entire Orca Filament Library was missing from the AMS material and calibration filament lists. They now resolve compatibility the same way the plater does, and a vendor profile still supersedes the library generic of the same name. --- src/libslic3r/PresetBundle.cpp | 37 ++++ src/libslic3r/PresetBundle.hpp | 7 + src/slic3r/GUI/AMSDryControl.cpp | 42 ++-- src/slic3r/GUI/AMSMaterialsSetting.cpp | 186 +++++++----------- src/slic3r/GUI/CaliHistoryDialog.cpp | 71 ++----- src/slic3r/GUI/ExtrusionCalibration.cpp | 60 +++--- .../libslic3r/test_preset_bundle_loading.cpp | 83 ++++++++ 7 files changed, 251 insertions(+), 235 deletions(-) diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 02c61b8181..c4895a5af7 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -4054,6 +4054,9 @@ std::vector> PresetBundle::get_extruder_filament return filament_infos; } +// ORCA TODO: currently, this function assumes the printer name follows the pattern of " ", e.g. +// printer_type: "Bambu Lab X2D", nozzle_diameter_str: "0.4 nozzle" => printer_name: "Bambu Lab X2D 0.4 nozzle". If the printer name does +// not follow this pattern, the function may not work correctly. std::set PresetBundle::get_printer_names_by_printer_type_and_nozzle(const std::string &printer_type, std::string nozzle_diameter_str, bool system_only) { std::set printer_names; @@ -4084,6 +4087,40 @@ std::set PresetBundle::get_printer_names_by_printer_type_and_nozzle return printer_names; } +std::vector PresetBundle::get_filament_presets_for_machine(const std::string &printer_type, + const std::string &nozzle_diameter_str, + bool include_user_presets) +{ + // Printer model plus nozzle diameter is expected to resolve to a single system printer preset; + // get_printer_names_by_printer_type_and_nozzle asserts as much in debug builds. + const std::set printer_names = get_printer_names_by_printer_type_and_nozzle(printer_type, nozzle_diameter_str); + const Preset *printer = printer_names.empty() ? nullptr : printers.find_preset(*printer_names.begin()); + if (printer == nullptr) + return {}; + + // Preset::is_visible is deliberately not consulted: it tracks what the Configuration Wizard + // installed, while the caller identifies a physically connected machine the user may never + // have installed - gating on it would empty the list for exactly those machines. + const PresetWithVendorProfile active_printer = printers.get_preset_with_vendor_profile(*printer); + // Loop invariant - the two argument is_compatible_with_printer() would rebuild it per preset. + DynamicPrintConfig printer_config; + printer_config.set_key_value("printer_preset", new ConfigOptionString(printer->name)); + if (const ConfigOption *opt = printer->config.option("nozzle_diameter")) + printer_config.set_key_value("num_extruders", new ConfigOptionInt((int) static_cast(opt)->values.size())); + + std::vector compatible; + for (Preset &preset : filaments) { + /* The situation where the preset is not offered is as follows: + 1. Not a root preset + 2. Not a system preset and the printer firmware does not support user presets */ + if (filaments.get_preset_base(preset) != &preset || (!preset.is_system && !include_user_presets)) + continue; + if (is_compatible_with_printer(filaments.get_preset_with_vendor_profile(preset), active_printer, &printer_config)) + compatible.push_back(&preset); + } + return compatible; +} + bool PresetBundle::check_filament_temp_equation_by_printer_type_and_nozzle_for_mas_tray( const std::string &printer_type, std::string& nozzle_diameter_str, std::string &setting_id, std::string &tag_uid, std::string &nozzle_temp_min, std::string &nozzle_temp_max, std::string& preset_setting_id) { diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp index 6e7e07b26e..b927c5ee6f 100644 --- a/src/libslic3r/PresetBundle.hpp +++ b/src/libslic3r/PresetBundle.hpp @@ -350,6 +350,13 @@ public: std::vector> get_extruder_filament_info() const; std::set get_printer_names_by_printer_type_and_nozzle(const std::string &printer_type, std::string nozzle_diameter_str, bool system_only = true); + // Orca: the root filament presets a connected machine can use, resolved with the rule the rest + // of the app applies (is_compatible_with_printer): an empty compatible_printers means every + // printer, minus the alias shadowing exclusions the Orca Filament Library records in + // Preset::m_excluded_from. + std::vector get_filament_presets_for_machine(const std::string &printer_type, + const std::string &nozzle_diameter_str, + bool include_user_presets); bool check_filament_temp_equation_by_printer_type_and_nozzle_for_mas_tray(const std::string &printer_type, std::string & nozzle_diameter_str, std::string & setting_id, diff --git a/src/slic3r/GUI/AMSDryControl.cpp b/src/slic3r/GUI/AMSDryControl.cpp index ddd3380975..dae84cda71 100644 --- a/src/slic3r/GUI/AMSDryControl.cpp +++ b/src/slic3r/GUI/AMSDryControl.cpp @@ -1594,39 +1594,21 @@ int AMSDryCtrWin::update_filament_list(DevAms* dev_ams, MachineObject* obj) } stream << std::fixed << std::setprecision(1) << obj->GetExtderSystem()->GetNozzleDiameter(extruder_id); std::string nozzle_diameter_str = stream.str(); - std::set printer_names = preset_bundle->get_printer_names_by_printer_type_and_nozzle( - DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str); - for (auto filament_it = filaments.begin(); filament_it != filaments.end(); ++filament_it) { - Preset& preset = *filament_it; - // Filter by system preset: root preset and (system preset or user preset is supported) - if (filaments.get_preset_base(*filament_it) != &preset || (!filament_it->is_system && !obj->is_support_user_preset)) { + for (Preset *filament_it : preset_bundle->get_filament_presets_for_machine( + DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) { + if (!filament_id_set.insert(filament_it->filament_id).second) + continue; + const std::string filament_alias = filaments.get_preset_alias(*filament_it, true); + if (filament_alias.empty()) + continue; + auto opt_info = preset_bundle->get_filament_by_filament_id(filament_it->filament_id); + if (!opt_info.has_value()) continue; - } - ConfigOption * printer_opt = filament_it->config.option("compatible_printers"); - ConfigOptionStrings *printer_strs = dynamic_cast(printer_opt); - if (!printer_strs) continue; - - for (auto printer_str : printer_strs->values) { - if (printer_names.find(printer_str) != printer_names.end()) { - if (filament_id_set.find(filament_it->filament_id) != filament_id_set.end()) { - continue; - } - - filament_id_set.insert(filament_it->filament_id); - auto filament_alias = filaments.get_preset_alias(*filament_it, true); - if (!filament_alias.empty()) { - auto opt_info = preset_bundle->get_filament_by_filament_id(filament_it->filament_id); - if (opt_info.has_value()) { - auto real_info = opt_info.value(); - real_info.filament_name = filament_alias; - m_tray_ids.push_back(std::move(real_info)); - m_trays_combo->Append(wxString::FromUTF8(filament_alias)); - } - } - } - } + opt_info->filament_name = filament_alias; + m_tray_ids.push_back(std::move(*opt_info)); + m_trays_combo->Append(wxString::FromUTF8(filament_alias)); } if (m_tray_ids.empty()) { diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 2e436e8462..a2adf3ea5b 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -932,7 +932,6 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi m_input_k_val->GetTextCtrl()->SetValue(k); m_input_n_val->GetTextCtrl()->SetValue(n); - int idx = 0; wxArrayString filament_items; wxString bambu_filament_name; wxString hint_filament_name; // the hint type to be selected @@ -940,6 +939,9 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi std::unordered_map query_filament_types; // std::set filament_id_set; + // The alias keyed map has to start empty: it is a member, so a stale alias left by an earlier + // popup (a different printer, a different nozzle) would resolve to that printer's filament_id. + map_filament_items.clear(); PresetBundle * preset_bundle = wxGetApp().preset_bundle; std::ostringstream stream; // Defensive: this dialog is opened only from StatusPanel (BBL-only) today, so the fallback fires @@ -952,83 +954,48 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi } stream << std::fixed << std::setprecision(1) << machine_diameter; std::string nozzle_diameter_str = stream.str(); - std::set printer_names = preset_bundle->get_printer_names_by_printer_type_and_nozzle(DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str); if (preset_bundle) { BOOST_LOG_TRIVIAL(trace) << "system_preset_bundle filament number=" << preset_bundle->filaments.size(); - for (auto filament_it = preset_bundle->filaments.begin(); filament_it != preset_bundle->filaments.end(); filament_it++) { - //filter by system preset - Preset& preset = *filament_it; - /*The situation where the user preset is not displayed is as follows: - 1. Not a root preset - 2. Not system preset and the printer firmware does not support user preset */ - if (preset_bundle->filaments.get_preset_base(*filament_it) != &preset || (!filament_it->is_system && !obj->is_support_user_preset)) { + for (Preset *filament_it : preset_bundle->get_filament_presets_for_machine( + DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) { + if (!filament_id_set.insert(filament_it->filament_id).second) + continue; + const std::string alias = preset_bundle->filaments.get_preset_alias(*filament_it, true); + if (alias.empty()) continue; - } - ConfigOption * printer_opt = filament_it->config.option("compatible_printers"); - ConfigOptionStrings *printer_strs = dynamic_cast(printer_opt); - for (auto printer_str : printer_strs->values) { - if (printer_names.find(printer_str) != printer_names.end()) { - if (filament_id_set.find(filament_it->filament_id) != filament_id_set.end()) { - continue; - } else { - filament_id_set.insert(filament_it->filament_id); - // name matched - if (filament_it->is_system) { - filament_items.push_back(filament_it->alias); - _collect_filament_info(filament_it->alias, preset, query_filament_vendors, query_filament_types); + filament_items.push_back(alias); + _collect_filament_info(alias, *filament_it, query_filament_vendors, query_filament_types); - FilamentInfos filament_infos; - filament_infos.filament_id = filament_it->filament_id; - filament_infos.setting_id = filament_it->setting_id; - map_filament_items[filament_it->alias] = filament_infos; - } else { - char target = '@'; - size_t pos = filament_it->name.find(target); - if (pos != std::string::npos) { - std::string user_preset_alias = filament_it->name.substr(0, pos - 1); - wxString wx_user_preset_alias = wxString(user_preset_alias.c_str(), wxConvUTF8); - user_preset_alias = wx_user_preset_alias.ToStdString(); + FilamentInfos filament_infos; + filament_infos.filament_id = filament_it->filament_id; + filament_infos.setting_id = filament_it->setting_id; + map_filament_items[alias] = filament_infos; - filament_items.push_back(user_preset_alias); - _collect_filament_info(user_preset_alias, preset, query_filament_vendors, query_filament_types); - - FilamentInfos filament_infos; - filament_infos.filament_id = filament_it->filament_id; - filament_infos.setting_id = filament_it->setting_id; - map_filament_items[user_preset_alias] = filament_infos; - } - } - - if (filament_it->filament_id == ams_filament_id) { - hint_filament_name = from_u8(filament_it->alias); - bambu_filament_name = from_u8(filament_it->alias); + if (filament_it->filament_id == ams_filament_id) { + hint_filament_name = from_u8(alias); + bambu_filament_name = from_u8(alias); - // update if nozzle_temperature_range is found - ConfigOption *opt_min = filament_it->config.option("nozzle_temperature_range_low"); - if (opt_min) { - ConfigOptionInts *opt_min_ints = dynamic_cast(opt_min); - if (opt_min_ints) { - wxString text_nozzle_temp_min = wxString::Format("%d", opt_min_ints->get_at(0)); - m_input_nozzle_min->GetTextCtrl()->SetValue(text_nozzle_temp_min); - } - } - ConfigOption *opt_max = filament_it->config.option("nozzle_temperature_range_high"); - if (opt_max) { - ConfigOptionInts *opt_max_ints = dynamic_cast(opt_max); - if (opt_max_ints) { - wxString text_nozzle_temp_max = wxString::Format("%d", opt_max_ints->get_at(0)); - m_input_nozzle_max->GetTextCtrl()->SetValue(text_nozzle_temp_max); - } - } - } - idx++; + // update if nozzle_temperature_range is found + ConfigOption *opt_min = filament_it->config.option("nozzle_temperature_range_low"); + if (opt_min) { + ConfigOptionInts *opt_min_ints = dynamic_cast(opt_min); + if (opt_min_ints) { + wxString text_nozzle_temp_min = wxString::Format("%d", opt_min_ints->get_at(0)); + m_input_nozzle_min->GetTextCtrl()->SetValue(text_nozzle_temp_min); + } + } + ConfigOption *opt_max = filament_it->config.option("nozzle_temperature_range_high"); + if (opt_max) { + ConfigOptionInts *opt_max_ints = dynamic_cast(opt_max); + if (opt_max_ints) { + wxString text_nozzle_temp_max = wxString::Format("%d", opt_max_ints->get_at(0)); + m_input_nozzle_max->GetTextCtrl()->SetValue(text_nozzle_temp_max); } } } - } } @@ -1251,56 +1218,47 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt) stream << std::fixed << std::setprecision(1) << machine_diameter; } std::string nozzle_diameter_str = stream.str(); - std::set printer_names = preset_bundle->get_printer_names_by_printer_type_and_nozzle(DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), - nozzle_diameter_str); - for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) { - if (!m_comboBox_filament->GetValue().IsEmpty()) { - auto filament_item = map_filament_items[m_comboBox_filament->GetValue().ToStdString()]; - std::string filament_id = filament_item.filament_id; - if (it->filament_id.compare(filament_id) == 0) { - ConfigOption * printer_opt = it->config.option("compatible_printers"); - ConfigOptionStrings *printer_strs = dynamic_cast(printer_opt); - bool has_compatible_printer = false; - for (auto printer_str : printer_strs->values) { - if (printer_names.find(printer_str) != printer_names.end()) { - has_compatible_printer = true; - break; - } + // Resolve the selection against the same list Popup() built the dropdown from, so the two + // halves of the dialog cannot disagree about which filaments this machine can use. + const std::string selected = m_comboBox_filament->GetValue().ToStdString(); + if (!selected.empty()) { + const std::string filament_id = map_filament_items[selected].filament_id; + for (Preset *it : preset_bundle->get_filament_presets_for_machine( + DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) { + if (it->filament_id != filament_id) + continue; + // ) if nozzle_temperature_range is found + ConfigOption* opt_min = it->config.option("nozzle_temperature_range_low"); + if (opt_min) { + ConfigOptionInts* opt_min_ints = dynamic_cast(opt_min); + if (opt_min_ints) { + wxString text_nozzle_temp_min = wxString::Format("%d", opt_min_ints->get_at(0)); + m_input_nozzle_min->GetTextCtrl()->SetValue(text_nozzle_temp_min); } - if (!it->is_system && !has_compatible_printer) continue; - // ) if nozzle_temperature_range is found - ConfigOption* opt_min = it->config.option("nozzle_temperature_range_low"); - if (opt_min) { - ConfigOptionInts* opt_min_ints = dynamic_cast(opt_min); - if (opt_min_ints) { - wxString text_nozzle_temp_min = wxString::Format("%d", opt_min_ints->get_at(0)); - m_input_nozzle_min->GetTextCtrl()->SetValue(text_nozzle_temp_min); - } - } - ConfigOption* opt_max = it->config.option("nozzle_temperature_range_high"); - if (opt_max) { - ConfigOptionInts* opt_max_ints = dynamic_cast(opt_max); - if (opt_max_ints) { - wxString text_nozzle_temp_max = wxString::Format("%d", opt_max_ints->get_at(0)); - m_input_nozzle_max->GetTextCtrl()->SetValue(text_nozzle_temp_max); - } - } - ConfigOption* opt_type = it->config.option("filament_type"); - bool found_filament_type = false; - if (opt_type) { - ConfigOptionStrings* opt_type_strs = dynamic_cast(opt_type); - if (opt_type_strs) { - found_filament_type = true; - //m_filament_type = opt_type_strs->get_at(0); - std::string display_filament_type; - m_filament_type = it->config.get_filament_type(display_filament_type); - } - } - if (!found_filament_type) - m_filament_type = ""; - - break; } + ConfigOption* opt_max = it->config.option("nozzle_temperature_range_high"); + if (opt_max) { + ConfigOptionInts* opt_max_ints = dynamic_cast(opt_max); + if (opt_max_ints) { + wxString text_nozzle_temp_max = wxString::Format("%d", opt_max_ints->get_at(0)); + m_input_nozzle_max->GetTextCtrl()->SetValue(text_nozzle_temp_max); + } + } + ConfigOption* opt_type = it->config.option("filament_type"); + bool found_filament_type = false; + if (opt_type) { + ConfigOptionStrings* opt_type_strs = dynamic_cast(opt_type); + if (opt_type_strs) { + found_filament_type = true; + //m_filament_type = opt_type_strs->get_at(0); + std::string display_filament_type; + m_filament_type = it->config.get_filament_type(display_filament_type); + } + } + if (!found_filament_type) + m_filament_type = ""; + + break; } } } diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 297a70018d..3668d76929 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -708,7 +708,6 @@ wxArrayString NewCalibrationHistoryDialog::get_all_filaments(const MachineObject wxArrayString filament_items; std::set filament_id_set; - std::set printer_names; std::ostringstream stream; // If the machine didn't report a nozzle diameter (0.0 = unknown), fall back to the currently // selected printer preset so the filament list isn't empty. @@ -720,67 +719,21 @@ wxArrayString NewCalibrationHistoryDialog::get_all_filaments(const MachineObject stream << std::fixed << std::setprecision(1) << machine_diameter; std::string nozzle_diameter_str = stream.str(); - for (auto printer_it = preset_bundle->printers.begin(); printer_it != preset_bundle->printers.end(); printer_it++) { - // filter by system preset - if (!printer_it->is_system) - continue; - // get printer_model - ConfigOption * printer_model_opt = printer_it->config.option("printer_model"); - ConfigOptionString *printer_model_str = dynamic_cast(printer_model_opt); - if (!printer_model_str) - continue; - - // use printer_model as printer type - if (printer_model_str->value != DevPrinterConfigUtil::get_printer_display_name(obj->printer_type)) - continue; - - if (printer_it->name.find(nozzle_diameter_str) != std::string::npos) - printer_names.insert(printer_it->name); - } - if (preset_bundle) { BOOST_LOG_TRIVIAL(trace) << "system_preset_bundle filament number=" << preset_bundle->filaments.size(); - for (auto filament_it = preset_bundle->filaments.begin(); filament_it != preset_bundle->filaments.end(); filament_it++) { - // filter by system preset - Preset &preset = *filament_it; - /*The situation where the user preset is not displayed is as follows: - 1. Not a root preset - 2. Not system preset and the printer firmware does not support user preset */ - if (preset_bundle->filaments.get_preset_base(*filament_it) != &preset || (!filament_it->is_system && ! obj->is_support_user_preset)) { continue; } + for (Preset *filament_it : preset_bundle->get_filament_presets_for_machine( + DevPrinterConfigUtil::get_printer_display_name(obj->printer_type), nozzle_diameter_str, obj->is_support_user_preset)) { + if (!filament_id_set.insert(filament_it->filament_id).second) + continue; + const std::string alias = preset_bundle->filaments.get_preset_alias(*filament_it, true); + if (alias.empty()) + continue; - ConfigOption * printer_opt = filament_it->config.option("compatible_printers"); - ConfigOptionStrings *printer_strs = dynamic_cast(printer_opt); - for (auto printer_str : printer_strs->values) { - if (printer_names.find(printer_str) != printer_names.end()) { - if (filament_id_set.find(filament_it->filament_id) != filament_id_set.end()) { - continue; - } else { - filament_id_set.insert(filament_it->filament_id); - // name matched - if (filament_it->is_system) { - filament_items.push_back(filament_it->alias); - FilamentInfos filament_infos; - filament_infos.filament_id = filament_it->filament_id; - filament_infos.setting_id = filament_it->setting_id; - map_filament_items[filament_it->alias] = filament_infos; - } else { - char target = '@'; - size_t pos = filament_it->name.find(target); - if (pos != std::string::npos) { - std::string user_preset_alias = filament_it->name.substr(0, pos - 1); - wxString wx_user_preset_alias = wxString(user_preset_alias.c_str(), wxConvUTF8); - user_preset_alias = wx_user_preset_alias.ToStdString(); - - filament_items.push_back(user_preset_alias); - FilamentInfos filament_infos; - filament_infos.filament_id = filament_it->filament_id; - filament_infos.setting_id = filament_it->setting_id; - map_filament_items[user_preset_alias] = filament_infos; - } - } - } - } - } + filament_items.push_back(alias); + FilamentInfos filament_infos; + filament_infos.filament_id = filament_it->filament_id; + filament_infos.setting_id = filament_it->setting_id; + map_filament_items[alias] = filament_infos; } } return filament_items; diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index cd7f5990a7..933e2ac211 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -2,6 +2,7 @@ #include "GUI_App.hpp" #include "MsgDialog.hpp" #include "libslic3r/Preset.hpp" +#include #include "I18N.hpp" #include #include @@ -599,8 +600,10 @@ void ExtrusionCalibration::update_combobox_filaments() PresetBundle* preset_bundle = wxGetApp().preset_bundle; if (preset_bundle && obj) { BOOST_LOG_TRIVIAL(trace) << "system_preset_bundle filament number=" << preset_bundle->filaments.size(); - std::string printer_type = obj->printer_type; - std::set printer_preset_list; + double nozzle_value = 0.4; + m_comboBox_nozzle_dia->GetValue().ToDouble(&nozzle_value); + + std::vector printer_profiles; for (auto printer_it = preset_bundle->printers.begin(); printer_it != preset_bundle->printers.end(); printer_it++) { // only use system printer preset if (!printer_it->is_system) continue; @@ -610,49 +613,42 @@ void ExtrusionCalibration::update_combobox_filaments() ConfigOptionFloats* printer_nozzle_vals = nullptr; if (printer_nozzle_opt) printer_nozzle_vals = dynamic_cast(printer_nozzle_opt); - double nozzle_value = 0.4; - wxString nozzle_value_str = m_comboBox_nozzle_dia->GetValue(); - try { - nozzle_value_str.ToDouble(&nozzle_value); - } catch(...) { - ; - } if (!model_id.empty() && model_id.compare(obj->printer_type) == 0 && printer_nozzle_vals && abs(printer_nozzle_vals->get_at(0) - nozzle_value) < 1e-3) { - printer_preset_list.insert(printer_it->name); + printer_profiles.push_back(preset_bundle->printers.get_preset_with_vendor_profile(*printer_it)); BOOST_LOG_TRIVIAL(trace) << "extrusion_cali: printer_model = " << model_id; } else { BOOST_LOG_TRIVIAL(error) << "extrusion_cali: printer_model = " << model_id; } } + // Unlike the AMS dialogs this one offers every matching preset by full name rather than one + // root preset per alias, so it filters the collection itself instead of calling + // PresetBundle::get_filament_presets_for_machine(). for (auto filament_it = preset_bundle->filaments.begin(); filament_it != preset_bundle->filaments.end(); filament_it++) { - ConfigOption* printer_opt = filament_it->config.option("compatible_printers"); - ConfigOptionStrings* printer_strs = dynamic_cast(printer_opt); - for (auto printer_str : printer_strs->values) { - if (printer_preset_list.find(printer_str) != printer_preset_list.end()) { - user_filaments.push_back(&(*filament_it)); + const PresetWithVendorProfile filament = preset_bundle->filaments.get_preset_with_vendor_profile(*filament_it); + if (std::none_of(printer_profiles.begin(), printer_profiles.end(), + [&filament](const PresetWithVendorProfile &printer) { return is_compatible_with_printer(filament, printer); })) + continue; - // set default filament id - filament_index++; - if (filament_it->is_system - && !ams_filament_id.empty() - && filament_it->filament_id == ams_filament_id - ) { - curr_selection = filament_index; - } + user_filaments.push_back(&(*filament_it)); - if (filament_it->name == obj->extrusion_cali_filament_name && !obj->extrusion_cali_filament_name.empty()) - { - curr_selection = filament_index; - } - - wxString filament_name = wxString::FromUTF8(filament_it->name); - filament_items.Add(filament_name); - break; - } + // set default filament id + filament_index++; + if (filament_it->is_system + && !ams_filament_id.empty() + && filament_it->filament_id == ams_filament_id + ) { + curr_selection = filament_index; } + + if (filament_it->name == obj->extrusion_cali_filament_name && !obj->extrusion_cali_filament_name.empty()) + { + curr_selection = filament_index; + } + + filament_items.Add(wxString::FromUTF8(filament_it->name)); } m_comboBox_filament->Set(filament_items); m_comboBox_filament->SetSelection(curr_selection); diff --git a/tests/libslic3r/test_preset_bundle_loading.cpp b/tests/libslic3r/test_preset_bundle_loading.cpp index 55c18bfa9e..09f89eb9eb 100644 --- a/tests/libslic3r/test_preset_bundle_loading.cpp +++ b/tests/libslic3r/test_preset_bundle_loading.cpp @@ -1,5 +1,6 @@ #include +#include #include #include @@ -567,6 +568,88 @@ TEST_CASE("A printer specific filament supersedes the generic library filament w } +namespace { + +// One system printer plus the filament presets a machine facing dialog has to choose between: +// an Orca Filament Library generic with no compatible_printers, a same alias vendor filament +// that names the printer, a library filament with no vendor twin, and a vendor filament that +// belongs to a different printer. +struct MachineFilaments +{ + PresetBundle bundle; + VendorProfile library{PresetBundle::ORCA_FILAMENT_LIBRARY}; + VendorProfile vendor{"Vendor"}; + + MachineFilaments() + { + // VendorProfile's constructor takes an id; the library rule keys off the name. + library.name = PresetBundle::ORCA_FILAMENT_LIBRARY; + vendor.name = "Vendor"; + + Preset &printer = add_inmemory_preset(bundle.printers, "Printer A 0.4 nozzle"); + printer.is_system = true; + printer.vendor = &vendor; + printer.config.option("printer_model", true)->value = "Printer A"; + + add_filament(library, "Generic ABS @System", "Generic ABS", {}); + add_filament(vendor, "Generic ABS @Printer A", "Generic ABS", { "Printer A 0.4 nozzle" }); + add_filament(library, "FilAr ABS @System", "FilAr ABS", {}); + add_filament(vendor, "Vendor PLA @Printer B", "Vendor PLA", { "Printer B 0.4 nozzle" }); + + // update_library_profile_excluded_from() is protected and has its own test above; record + // the exclusion it derives from the same alias vendor filament. + Preset *shadowed = bundle.filaments.find_preset("Generic ABS @System"); + REQUIRE(shadowed != nullptr); + shadowed->m_excluded_from.insert("Printer A 0.4 nozzle"); + } + + void add_filament(const VendorProfile &owner, const std::string &name, const std::string &alias, + std::vector compatible_printers) + { + Preset &preset = add_inmemory_preset(bundle.filaments, name); + preset.is_system = true; + preset.alias = alias; + preset.vendor = &owner; + compatible_list(bundle.filaments, name, "compatible_printers") = std::move(compatible_printers); + } + + bool offers(const std::string &preset_name, bool include_user_presets = false) + { + const std::vector offered = + bundle.get_filament_presets_for_machine("Printer A", "0.4", include_user_presets); + return std::any_of(offered.begin(), offered.end(), + [&preset_name](const Preset *p) { return p->name == preset_name; }); + } +}; + +} // namespace + +TEST_CASE("Filaments offered for a machine follow the app's compatibility rule", "[Preset][Bundle]") +{ + MachineFilaments f; + + SECTION("a library filament with no compatible_printers is offered") { + CHECK(f.offers("FilAr ABS @System")); + } + + SECTION("a same alias vendor filament shadows the library generic") { + CHECK(f.offers("Generic ABS @Printer A")); + CHECK_FALSE(f.offers("Generic ABS @System")); + } + + SECTION("a filament naming a different printer is not offered") { + CHECK_FALSE(f.offers("Vendor PLA @Printer B")); + } + + SECTION("a user filament is offered only when the printer supports user presets") { + add_inmemory_preset(f.bundle.filaments, "My PLA"); + + CHECK_FALSE(f.offers("My PLA", /*include_user_presets=*/false)); + CHECK(f.offers("My PLA", /*include_user_presets=*/true)); + } +} + + namespace { const char *kMixedKeys[] = { From 261cc19c592a9aa721e345798a89a84681ffc5b3 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 31 Aug 2026 23:14:03 +0800 Subject: [PATCH 27/52] update doc update doc --- doc/developer-reference/filament_id.md | 211 ----- docs/HLSD/filament_id.md | 383 +++++++++ filament_id_plan.html | 1029 ------------------------ filament_id_plan.md | 397 --------- filament_id_plan_v2.md | 314 -------- filament_id_plan_v3.md | 213 ----- filament_id_plan_v4.md | 224 ------ 7 files changed, 383 insertions(+), 2388 deletions(-) delete mode 100644 doc/developer-reference/filament_id.md create mode 100644 docs/HLSD/filament_id.md delete mode 100644 filament_id_plan.html delete mode 100644 filament_id_plan.md delete mode 100644 filament_id_plan_v2.md delete mode 100644 filament_id_plan_v3.md delete mode 100644 filament_id_plan_v4.md diff --git a/doc/developer-reference/filament_id.md b/doc/developer-reference/filament_id.md deleted file mode 100644 index c17e4e44e4..0000000000 --- a/doc/developer-reference/filament_id.md +++ /dev/null @@ -1,211 +0,0 @@ -# Filament IDs (`filament_id`) - -`filament_id` identifies a **material family**: one commercial product line = one id, shared by -all of that material's per-printer / per-nozzle variants. Devices use it to match a physical -spool or tray to a filament preset. It is never per-color, per-printer, per-nozzle, or -per-preset (per-preset identity is `setting_id`). - -This page is the rule for authoring `filament_id` in system profiles -(`resources/profiles/**`). CI enforces everything below; the short version is: - -> [!IMPORTANT] -> **Never write a `filament_id` value by hand.** New families get their id from -> `python scripts/assign_filament_ids.py`; existing families already have one — inherit it. - -## Who consumes the id - -Every device integration funnels a tray material id (`tray_info_idx`) through the same -matching pipeline (`PresetBundle::sync_ams_list` and friends): - -| Ecosystem | Where the id comes from | -| --- | --- | -| Bambu AMS | device side (RFID / user tray setting) — the `GF*` catalog | -| Qidi box | built from device enums (`QD_*`); needs an exactly matching visible preset | -| Creality CFS | runtime brand/type scoring returns the current preset's id | -| Klipper (AFC / Happy Hare) | runtime lookup by filament type | -| Snapmaker | runtime color/vendor/type match | - -Tray-to-preset matching is printer-scoped, but **several consumers match globally by id alone, -first hit wins**: tray display names, `filament_is_support`, vitrification warnings, and -multi-nozzle filament grouping in the slicing pipeline. Two *different* materials sharing one -id feed wrong data to those consumers even when the presets live in different vendors — so -cross-material id sharing is never safe. Within one printer, duplicate ids silently break AMS -matching (first match wins, the tray-edit dialog hides the second preset); the profile -validator's `-f` check rejects this. - -## Do I need a new id? The one-question test - -> **Would a user consider this a different spool product than anything already in the tree?** - -Different polymer, different sub-brand (Basic / Matte / Silk / HF), fiber-filled sibling, or a -second selectable diameter → **new family, new id**. The same spool tuned for another printer -or nozzle → **join the existing family** (inherit its `@base`, write no id key). Tuning a -generic material → **join the OrcaFilamentLibrary family** (inherit `Generic X @System`, keep -the `Generic X` base name, write no id key). - -| Situation | id | -| --- | --- | -| Per-printer / per-nozzle variant of an existing material | same id (inherit, never write the key) | -| Sub-brand or product line (PLA vs PLA Matte vs PLA Silk vs PLA HF) | new id each | -| Color | never a new id | -| Second diameter selectable on the same printer (1.75 + 2.85) | sibling family, new id | -| "High-speed" tuned for a *different printer model* | same id (it is a printer variant) | -| "High-speed" selectable *alongside* the normal preset on one printer | new id (it is a product line) | - -## Structure rules - -1. **Only family roots carry the key.** Root presets (any preset *not* marked - `"instantiation": "true"`, typically ` @base` with `"instantiation": "false"`) - declare `filament_id`; instantiated variants inherit a root and never - write the key. A family may have several roots (e.g. per-series bases) — all of them must - declare the *identical* id. -2. **The family name is the base name**: the preset name with everything from the first - (optionally space-preceded) `@` stripped. `MyBrand PLA @Orca 3D Fuse1` and `MyBrand PLA@HS` - both belong to family `MyBrand PLA`. -3. **Within a family, variants' `compatible_printers` are pairwise disjoint** — per printer - preset, at most one compatible instantiated preset per id. The C++ validator (`-f`) - enforces this. -4. **Generics belong to OrcaFilamentLibrary.** A vendor tuning a generic material inherits - `Generic X @System`, keeps the `Generic X` base name (that alias is what hides the library - preset on your printers), sets a non-empty `compatible_printers`, and writes no id key. - A vendor-*branded* filament never rides a generic family id. -5. **Ids follow the product identity.** The id is a pure function of the product triple - `(filament_vendor, filament_type, family name)` — correcting any of them re-mints the id - **by design**, and `--update-snapshot` records the old id in the shipped succession ledger - with its successor so device trays, calibration records, and user presets keep resolving - (`renamed_from` still gates preset-*name* compatibility as before). A shipped id is never - recycled for a different material: retired ids are blocked forever. - -## Minting — nobody invents ids - -New ids are deterministic, computed exactly like the `setting_id` precedent -(`scripts/assign_vendor_setting_ids.py`): - -```text -FILAMENT_ID_NAMESPACE = uuid5(setting-id NAMESPACE, "filament_id") - = c4d3ff49-4c32-5534-a3e3-00894157ab97 -filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, - "filament_product///") ) -``` - -`base62_6` is the low 6 base62 digits (alphabet `0-9A-Za-z`) of the UUID taken as a big-endian -integer, most-significant digit first — 8 chars total, within the AMS length limit. The triple -comes from the family root's *flattened* config: `` is the filament -**manufacturer** (`"Polymaker"`, or `"Generic"` for generics — never the printer brand), -`` the material type, `` the root's base name; the two config -values are inheritable list options and the first element counts. The key contains no bundle -name, so the same product mints the same id in every bundle — hoisting a family into -OrcaFilamentLibrary never changes its id. On the rare collision with any existing or retired -id, the minter salts the input (`…/1`, `…/2`, …) until free and the result is frozen in the -file. Example: `Polymaker/PLA/PolyLite PLA` mints `OF5CgdDq`. - -Workflow for a new family: - -```bash -# 1. Author the family with NO filament_id key anywhere. -python scripts/assign_filament_ids.py # 2. mint + insert ids into the family root(s) -python scripts/assign_filament_ids.py --update-snapshot # 3. record the new claims in the ledger -python scripts/assign_filament_ids.py --check # 4. verify — the same checks CI runs -# 5. Commit the profile edits together with scripts/filament_id_snapshot.json. -``` - -`--mint "filament_vendor/filament_type/family_name"` prints the id a triple would mint without -touching anything. The default run is idempotent and never rewrites a valid existing id. -Maintenance modes (normally only used by id migrations): `--remint VENDOR` re-derives a -vendor's declared ids from their triples (a declaration already equal to a salt iteration -of its own triple is conformant and left alone — deliberate salt splits keeping two -presets of one product apart for per-printer AMS matching survive), -`--drop-redundant-ids VENDOR` deletes declarations -that merely re-declare an inherited OFL id, `--add-hint "OLD=NEW"` records a cross-island -succession hint, and `--retire "OLD=NEW"` records succession for a shipped non-island id -that vanished while another declarer kept it alive (lineage the automatic claim vote can no -longer see). - -If you skip the tooling, CI fails and prints the remedy: the expected id for your family, and -the instruction to run `python scripts/assign_filament_ids.py --update-snapshot` and commit -the resulting diff. - -## Reserved namespaces — never mint or hand-write into - -| Space | Owner | Rule | -| --- | --- | --- | -| `GF*` | Bambu AMS/RFID catalog | BBL vendor only; byte-copies elsewhere only where the snapshot already sanctions them | -| `QD_*` | Qidi device protocol | frozen device contract; Qidi vendor only | -| `P` + 7 hex chars (case-insensitive), `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp`) | never appears in system profiles | -| every already-shipped id | grandfather snapshot | frozen as-is; new claims need maintainer sign-off | -| every retired id | `resources/profiles/retired_filament_ids.json` | never used again, for anything | - -## The succession ledger - -`resources/profiles/retired_filament_ids.json` ships with the app. Each retired id maps to -`{"claims": [...], "successor": }` — successor chains are followed to the live end — -and a `hints` map carries the same forwarding for ids Orca cannot retire because another -island owns them (e.g. a `GF*` id whose material also exists as an OFL family). The client -consults the ledger **only on resolution miss** (AMS tray sync, tray-id type lookup, -calibration history, filament-id preset lookup): a live preset always wins first, so BBL -installs resolve `GF*` natively and behavior is unchanged wherever the raw id still exists. -This is what makes identity-driven re-mints (structure rule 5) safe: the old id keeps -resolving to the family's current preset instead of degrading to a `Generic ` fallback. -The file is append-only and maintained exclusively by `--update-snapshot` / `--add-hint` / -`--retire`. - -## How CI enforces this - -Profile CI (`check_profiles.yml` → `scripts/orca_extra_profile_check.py`) runs -`check_filament_ids()` tree-wide. Its ground truth is -**`scripts/filament_id_snapshot.json` — the sanctioned state**: the id state derived from the -tree must equal the snapshot exactly, in both directions. Any change to the id landscape -therefore surfaces as a diff to that file, and **that snapshot diff is what maintainers review -and gate in a PR**. Never edit the snapshot by hand — `--update-snapshot` regenerates it -deterministically (running it twice changes nothing). - -The checks, in brief: - -- **Format** — every id is either in the snapshot, `OF` + 6 base62 chars, BBL's, or Qidi `QD_*`. -- **Snapshot equality** — tree claims == snapshot claims **and** tree triples == snapshot - triples, both directions: any `filament_vendor`/`filament_type`/family-name change surfaces - as a snapshot diff. -- **Mint conformance** — a non-grandfathered `OF*` id must equal the mint (or a salt - iteration) of its declarer's product triple; the error prints the expected id. -- **Retired reuse** — any tree id present in `resources/profiles/retired_filament_ids.json` is an error. - Ids that fully vanish from the tree are appended there by `--update-snapshot`; the file is - **append-only**. -- **Alias hygiene** — any vendor preset riding an OFL family id must keep the library - preset's base name, a non-empty `compatible_printers`, and no own id key (structure rule 4); - the error names the rename as the cause. -- **Triple integrity** — every declarer outside the BBL/`QD_*` islands must resolve a - non-empty `filament_vendor` and `filament_type` (generics use `"Generic"`), and all - declarers of one family within a bundle must agree on the triple. -- **Succession integrity** — retired successor chains terminate at a live id (or null) with - no cycles; `hints` keys are live, island-owned ids. -- **Reserved namespaces** — `GF*` outside BBL, `QD_*` outside Qidi, `P<7-hex>` or `null` - anywhere, unless that exact claim is grandfathered in the snapshot. -- **Structure** — no `filament_id` key on instantiated presets; no declared-vs-inherited id - drift; every instantiated system filament must resolve an effective id through its - `inherits` chain (an id-less one is a hard load error in C++ that discards the whole vendor - bundle). - -Sharing a **reserved-catalog** id with a new family or vendor (e.g. shipping a Bambu-cataloged -product under another vendor with its authentic `GF*` id) is refused by `--update-snapshot` -unless you pass `--allow-shared-catalog` — and it still lands in the snapshot diff for -maintainer review. Any other new sharing of an existing id is caught by the mint-conformance -check instead. - -## FAQ - -- **A new color of an existing product?** Never a new id — colors are not families. -- **A second diameter (1.75 mm and 2.85 mm) of the same product?** A sibling family with its - own id: two diameters are separately selectable spool products. -- **A high-speed tune of an existing material for another printer model?** Same family: - inherit the family's root, write no id key. -- **A tuned generic ("our profile for Generic PLA")?** Inherit `Generic PLA @System`, keep the - `Generic PLA` base name, set `compatible_printers`, write no id key. -- **I need to rename a family (or fix its `filament_vendor`/`filament_type`).** Add - `renamed_from` for the name, run `--remint ` then `--update-snapshot`: the id - re-derives from the corrected identity and the old id lands in the succession ledger - pointing at the new one. Commit the profile, snapshot, and ledger diffs together. -- **CI says my family needs an id.** Run `python scripts/assign_filament_ids.py`, then - `--update-snapshot`, and commit both diffs. Do not type an id by hand. - -For general profile authoring, see the profile development guide on the -[OrcaSlicer wiki](https://www.orcaslicer.com/wiki). diff --git a/docs/HLSD/filament_id.md b/docs/HLSD/filament_id.md new file mode 100644 index 0000000000..0dfc5471b0 --- /dev/null +++ b/docs/HLSD/filament_id.md @@ -0,0 +1,383 @@ +# Filament IDs (`filament_id`) + +`filament_id` identifies a **material family**: one commercial product line = one id, shared by +all of that material's per-printer / per-nozzle variants, in every profile bundle that ships it. +Devices use it to match a physical spool or tray to a filament preset. It is never per-color, +per-printer, per-nozzle, or per-preset (per-preset identity is `setting_id`), and it is never +per-bundle either — PolyLite PLA carries the same id whether the preset lives in the +OrcaFilamentLibrary (OFL), Qidi, or Snapmaker bundle. + +**How it is generated:** an id is computed, never invented. `scripts/assign_filament_ids.py` +mints it as a deterministic hash of the product's identity — the triple +`(filament_vendor, filament_type, family name)`, where the family name is the preset name +with its `@...` variant suffix stripped — producing an 8-character `OF*` code that is the +same for that product in every bundle, in every PR, on every machine. For example, Polymaker's +PolyLite PLA presets (`PolyLite PLA @base`, `PolyLite PLA@Q2-Series`, …) resolve +`filament_vendor` `Polymaker`, `filament_type` `PLA`, and family name `PolyLite PLA`; hashing +`filament_product/Polymaker/PLA/PolyLite PLA` yields `OF5CgdDq`, and that is the id the +OrcaFilamentLibrary, OrcaArena, Qidi, and Snapmaker bundles all arrive at independently +(derivation details in the Minting section). + +**How it is used:** at runtime the id is the join key between hardware and profiles. +When a printer reports what a tray holds (Bambu AMS, Qidi box, Creality CFS, +Klipper, Snapmaker), OrcaSlicer matches the reported id against the filament presets +compatible with that printer to select the right profile; other features — tray display +names, support-material detection, vitrification warnings, multi-nozzle filament grouping — +look up material properties by id alone. When an id has been retired, a shipped succession +ledger forwards it to its successor so old trays and records keep resolving. + +This page is the rule for authoring `filament_id` in system profiles +(`resources/profiles/**`). CI enforces everything below; the short version is: + +> [!IMPORTANT] +> **Never write a `filament_id` value by hand.** New families get their id from +> `python scripts/assign_filament_ids.py`; existing families already have one — inherit it. + +## The design, in three pieces + +Because several consumers match **globally by id alone, first hit wins** (see the next +section), any two materials sharing one id feed wrong data somewhere — a wrong tray name, a +wrong support-material flag, a wrong nozzle grouping — and inside one printer a duplicated id +makes AMS spool matching a coin toss. Hand-written ids produce such collisions constantly, so +the system is built to make them impossible and to make identity corrections safe: + +1. **Deterministic minting.** An id is a pure hash of the product's identity — no registry to + maintain, no next-free-number ceremony, no way for two concurrent PRs to race for the same + number, and no way to get it wrong by hand, because you never write it by hand. +2. **A sanctioned snapshot.** The complete id landscape derived from the tree must equal + `scripts/filament_id_snapshot.json` exactly, so every change to ids, claims (which bundles + ship which id, and for which family), or product identity surfaces as a reviewable diff to + one file — the maintainer gate. +3. **A shipped succession ledger.** Ids live outside the tree too — on device trays, in + calibration records, in user presets, in project files. When an id is retired, the ledger + forwards it to its successor so none of those references degrade to a generic fallback. + +## Who consumes the id + +The canonical consumer is tray-to-preset matching: a device reports a tray material id +(`tray_info_idx`), and the shared matching pipeline (`PresetBundle::sync_ams_list` and +friends) resolves it to a preset. The matcher is printer-scoped and first-match-wins: +scanning only compatible family roots — system roots plus user-made custom filaments, which +are user roots carrying their own `P*` ids; a preset derived from another resolves through +its root and never matches directly — it picks the first one whose `filament_id` equals the +tray's and retries once through the succession ledger on a miss. Only then does it fall back +by filament type: a system `Generic ` preset (matched by name, then by type +similarity), else the slot's previous selection, else any compatible system generic or, +failing that, any compatible system preset, else the slot is skipped — every fallback +selection surfaces a user-visible notice. + +Today only the Bambu AMS integration follows this pattern end to end — the device itself +reports the id, and the pipeline does all the matching. The other device integrations still +synthesize a preset id client-side in their agents (by type, brand, or color lookups against +the loaded presets) before the pipeline runs; they are intended to converge on the same +pattern, with the device-reported tray material id flowing through the shared matcher. + +| Ecosystem | Where the tray id comes from today | +| --- | --- | +| Bambu AMS | the device itself (RFID / user tray setting) — the `GF*` catalog | +| Qidi box | composed at runtime as `QD___` — vendor and type indices from the device's per-slot saved variables, the series digit inferred client-side from the printer model/name — then translated through the succession ledger to the family's minted id (the `QD_*` values themselves no longer exist as preset ids — see the reserved-namespaces section) | +| Creality CFS | runtime brand/type scoring returns the winning preset's id | +| Klipper (AFC / Happy Hare) | runtime lookup by filament type | +| Snapmaker | runtime color/vendor/type match | + +Tray-to-preset matching is printer-scoped, but **several consumers match globally by id alone, +first hit wins**: tray display names, `filament_is_support`, vitrification warnings, and +multi-nozzle filament grouping in the slicing pipeline (`FilamentGroup::try_merge_filaments` +merges plate slots sharing one `(filament_id, color)` pair, with matching +extruder-printability, onto one nozzle group; the engine is implemented but no grouping path +calls it yet). +Two *different* materials sharing one id +feed wrong data to those consumers even when the presets live in different vendors — so +cross-material id sharing is never safe. Within one printer, duplicate ids break AMS matching: +the matcher picks whichever preset loads first (it now logs an "Ambiguous AMS filament match" +warning, but the pick is still arbitrary) and the tray-edit dialog, which lists one entry per +id, hides the second preset entirely. The profile validator's `-f` check +(`check_filament_subtypes` → `PresetBundle::check_duplicate_filament_subtypes`) rejects this +per printer, and CI runs it tree-wide. + +Two more consumer-side facts worth knowing: + +- The machine-facing dialogs (AMS tray edit, AMS dry control, calibration history, extrusion + calibration) offer the filaments a connected printer can use by the same compatibility rule + the plater uses (an empty `compatible_printers` means *every* printer). Alias shadowing + still applies: a vendor's same-name profile supersedes the library generic. That is what + puts Orca Filament Library materials in those lists — deduplicated to one entry per + `filament_id` in the AMS and calibration-history dialogs, while extrusion calibration + deliberately lists every matching preset by full name. +- The id is load-bearing at startup: an instantiated system filament (one marked + `"instantiation": "true"` — see the structure rules) that resolves **no** + `filament_id` anywhere in its `inherits` chain is a hard load error in the C++ loader + (`Can not find filament_id for `) that discards the entire vendor bundle (for the + OrcaFilamentLibrary itself the failure is messier: library presets loaded before the + failing one survive, and every vendor bundle whose filaments inherit from the library is + then discarded for want of a base). CI's structure check catches this before it ships. + +## Do I need a new id? The one-question test + +> **Would a user consider this a different spool product than anything already in the tree?** + +Different polymer, different sub-brand (Basic / Matte / Silk / HF), fiber-filled sibling, or a +second selectable diameter → **new family, new id**. The same spool tuned for another printer +or nozzle → **join the existing family** (inherit its `@base`, write no id key). Tuning a +generic material → **join the OrcaFilamentLibrary family** (inherit `Generic X @System`, keep +the `Generic X` base name, write no id key). + +| Situation | id | +| --- | --- | +| Per-printer / per-nozzle variant of an existing material | same id (inherit, never write the key) | +| Sub-brand or product line (PLA vs PLA Matte vs PLA Silk vs PLA HF) | new id each | +| Color | never a new id | +| Second diameter of the same product (1.75 + 2.85) | sibling family, new id | +| "High-speed" tuned for a *different printer model* | same id (it is a printer variant) | +| "High-speed" selectable *alongside* the normal preset on one printer | new id (it is a product line) | + +## Structure rules + +1. **Only family roots carry the key.** Root presets (any preset *not* marked + `"instantiation": "true"`, typically ` @base` with `"instantiation": "false"`) + declare `filament_id`; instantiated variants inherit a root and never write the key. + A family may have several roots — Qidi's PolyLite PLA has four per-series roots + (`PolyLite PLA@Q2-Series`, `@Q2C-Series`, `@X-Max 4-Series`, `@X-Plus 5-Series`) — and all + of them must declare the *identical* id. This is the authoring rule for new work; a large + grandfathered tail of older presets breaks it in two ways — keys written on instantiated + presets (frozen in the snapshot's `instantiated_with_id` list) and keys that override the + id the preset would inherit from its family (frozen in `id_overrides`) — and CI ratchets + so no new preset joins either tail. +2. **The family name is the base name**: the preset name with everything from the first + (optionally space-preceded) `@` stripped. `MyBrand PLA @Orca 3D Fuse1` and `MyBrand PLA@HS` + both belong to family `MyBrand PLA`. +3. **Within a family, variants' `compatible_printers` are pairwise disjoint** — per printer, + at most one compatible instantiated preset per id, or AMS matching turns ambiguous. The + C++ validator's `-f` check enforces this. +4. **Generics belong to OrcaFilamentLibrary.** A vendor tuning a generic material inherits + `Generic X @System`, keeps the `Generic X` base name (that alias is what hides the library + preset on your printers), sets a non-empty `compatible_printers`, and writes no id key — + e.g. `Generic PLA @Sovol SV08 MAX` inherits `Generic PLA @System` and lists three Sovol + nozzles. A vendor-*branded* filament never rides a generic family id. +5. **Ids follow the product identity.** The id is a pure function of the product triple + `(filament_vendor, filament_type, family name)` — correcting any of them re-mints the id + **by design** (via `--remint `; the exact sequence is in the FAQ), and + `--update-snapshot` records the old id in the shipped succession ledger with its successor + so device trays, calibration records, and user presets keep resolving (`renamed_from` + still gates preset-*name* compatibility as before). A shipped id is never recycled for a + different material: retired ids are blocked forever. + +## Minting — nobody invents ids + +New ids are deterministic, computed exactly like the `setting_id` precedent +(`scripts/assign_vendor_setting_ids.py`): + +```text +FILAMENT_ID_NAMESPACE = uuid5(setting-id NAMESPACE, "filament_id") + = c4d3ff49-4c32-5534-a3e3-00894157ab97 +filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, + "filament_product///") ) +``` + +`base62_6` is the low 6 base62 digits (alphabet `0-9A-Za-z`) of the UUID taken as a big-endian +integer, most-significant digit first; with the `OF` prefix the full id is 8 chars, within the +AMS length limit. The triple comes from the family root's *flattened* config: +`` is the filament +**manufacturer** (`"Polymaker"`, or `"Generic"` for generics — never the printer brand), +`` the material type, `` the root's base name; the two config +values are inheritable list options and the first element counts. + +Content-addressing on that triple is what makes the whole system converge. The key contains no +bundle name, so the same product mints the same id in every bundle — hoisting a family into +OrcaFilamentLibrary never changes its id, and two vendors independently shipping the same +product arrive at the same id without coordinating. `Polymaker/PLA/PolyLite PLA` mints +`OF5CgdDq`, and that one id is declared by the OrcaFilamentLibrary, OrcaArena, Qidi, and +Snapmaker bundles alike; the OFL generic `Generic/PLA/Generic PLA` mints `OFDSrzZ8`, claimed +by ten bundles — most by independent declarations converging on the same mint, the rest +purely through inheritance from the OFL family. + +On the rare collision with any existing or retired id, the minter salts the input (`…/1`, +`…/2`, …) until free, and the result is frozen in the profile file. Salting is also used +deliberately: a *salt split* keeps two presets of one product on distinct ids where a single +id would be AMS-ambiguous on the same printer — the "selectable alongside" situation from the +table above, resolved without inventing a second family name. The tooling recognizes salt +iterations of a triple as conformant and preserves such splits across re-mints. + +Workflow for a new family: + +```bash +# 1. Author the family with NO filament_id key anywhere. +python scripts/assign_filament_ids.py # 2. mint + insert ids into the family root(s) +python scripts/assign_filament_ids.py --update-snapshot # 3. record the new claims in the snapshot +python scripts/assign_filament_ids.py --check # 4. verify — the same checks CI runs +# 5. Commit the profile edits together with scripts/filament_id_snapshot.json. +``` + +The default run is idempotent and never rewrites a valid existing id; it edits profile files +byte-preservingly (indentation, BOM, and line endings intact) and re-parses them to fail +loudly. `--mint "filament_vendor/filament_type/family_name"` prints the id a **new** mint of +that triple would get, without touching anything — note that for a triple whose id already +exists it prints the next *free* salt iteration, not the live id (asking for +`Polymaker/PLA/PolyLite PLA` today prints the salt-1 id, because `OF5CgdDq` is taken). + +Maintenance modes (`--remint` is also the step for identity fixes — see the FAQ; the rest are +normally only used by id migrations): + +- `--remint VENDOR` re-derives a vendor's declared ids from their triples. A declaration + already equal to a salt iteration of its own triple is conformant and left alone, so + deliberate salt splits survive; convergence onto an id another bundle already uses for the + *same* triple is legal by design — that is the point. +- `--drop-redundant-ids VENDOR` deletes declarations that merely re-declare an inherited + OrcaFilamentLibrary id. +- `--add-hint "OLD=NEW"` records a succession hint for an id a foreign catalog owns + (`GF*` only — see the ledger section). +- `--retire "OLD=NEW"` records succession for a shipped id that vanished while another + declarer kept it alive — lineage the automatic claim vote (see the succession-ledger + section) can no longer see. +- `--forget-never-shipped FILE` (with `--update-snapshot`) — given a JSON list of ids that + never shipped in any release, drops them from the lineage entirely (no retirement entry) + and splices succession chains that pointed through them. +- `--profiles DIR` points the tooling at a different profile tree (default + `resources/profiles`). + +If you skip the tooling, CI fails and prints the remedy: the expected id for your family and +the instruction to run `python scripts/assign_filament_ids.py`; once the id is minted, the +snapshot checks likewise point at `--update-snapshot` and tell you to commit the resulting +diff. + +## Reserved namespaces — never mint or hand-write into + +An **island** is a frozen id namespace exempt from the mint rule because an external catalog +or device contract owns it. + +| Space | Status | Rule | +| --- | --- | --- | +| `GF*` | Bambu AMS/RFID catalog — the one remaining *island* | BBL vendor only; a claim by anyone else is refused unless the snapshot sanctions that exact claim (via `--allow-shared-catalog` — see the CI section) | +| `QD_*` | Qidi device protocol — *dissolved island* | declarable by **nobody**, Qidi included; every shipped `QD_*` id is retired in the ledger with a live successor | +| `P` + 7 hex chars (case-insensitive), `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp`) | never appears in system profiles | +| every already-shipped id | frozen in the snapshot (grandfathered) | frozen as-is; new claims need maintainer sign-off | +| every retired id | `resources/profiles/retired_filament_ids.json` | never used again, for anything | + +The two device namespaces, in detail: + +- **BBL (`GF*`).** Bambu's device/RFID/cloud catalog is external and opaque, so BBL + declarations are frozen as-is and never re-minted. BBL also carries several dozen + grandfathered legacy codes that are neither `GF*` nor `OF*` (the `BETA` family's `B*` ids, + plus `Generic SBS`'s legacy `BFLSBS99`) — frozen the same way, via the snapshot. +- **Qidi (`QD_*`) — dissolved.** `QD_*` is a device-*protocol* namespace, not a preset id + space: the Qidi box path composes `QD___` ids at runtime (slot + vendor and type indices reported by the device, the series digit inferred client-side + from the printer model/name), and the Qidi agent translates a composed id through the + succession ledger to the family's minted id. Qidi presets themselves carry ordinary minted + `OF*` ids (generics share the OFL ids), and all 204 `QD_*` ids that ever shipped sit in + the ledger as retired entries with live successors — which is also what makes CI refuse + any future `QD_*` occurrence permanently. The alternative — treating per-series protocol ids + as preset ids — would put one product under five ids (`QIDI PLA Rapido` would be `QD_0_1_1` + through `QD_4_1_1`), exactly the fragmentation the mint rule removes. + +## The succession ledger + +`resources/profiles/retired_filament_ids.json` ships with the app and has two maps: + +- **`retired`** — ids Orca owned and withdrew. Each maps to + `{"claims": [...], "successor": }`; successor chains are followed to the live end. + When `--update-snapshot` retires a vanished id, it picks the successor by an automatic + *claim vote*: every old claim whose family still exists votes for that family's current id, + most votes wins. Alongside the deliberate re-mints, this map carries the whole pre-rule + legacy — old ad-hoc vendor codes, Creality's and Snapmaker's numeric ids, and the 204 + `QD_*` protocol ids. +- **`hints`** — the same forwarding for ids Orca *cannot* retire because a foreign island owns + them and may legitimately keep shipping them. That means `GF*` only: e.g. + `GFL99 → OFDSrzZ8` forwards Bambu's Generic PLA catalog id to the OFL generic family on + installs where no live preset carries `GFL99`. + +The client consults the ledger **only on resolution miss** — AMS tray sync and the sync-AMS +dialog's filament listing, the sidebar AMS dropdown, tray-id type lookup, calibration +history, the global filament-id preset lookup, and the Qidi box path. A live preset always +wins first, so BBL installs resolve `GF*` natively and behavior is unchanged wherever the +raw id still exists. This on-miss rule is what makes +identity-driven re-mints (structure rule 5) safe: the old id keeps resolving to the family's +current preset instead of degrading to a `Generic ` fallback. The file is append-only in +its keys — entries are never removed and a retired id never returns — and maintained +exclusively by `--update-snapshot` / `--add-hint` / `--retire` (`--forget-never-shipped`, an +`--update-snapshot` mode, may rewrite an existing entry's successor when splicing chains). + +## How CI enforces this + +Profile CI (`check_profiles.yml`) runs `check_filament_ids()` tree-wide via +`scripts/orca_extra_profile_check.py`. Its ground truth is +**`scripts/filament_id_snapshot.json` — the sanctioned state**: the id state derived from the +tree must equal the snapshot exactly, in both directions. Any change to the id landscape +therefore surfaces as a diff to that file, and **that snapshot diff is what maintainers review +and gate in a PR**. Never edit the snapshot by hand — `--update-snapshot` regenerates it +deterministically (running it twice changes nothing). Besides the live `ids` and `triples` +maps, the snapshot carries grandfather lists (`instantiated_with_id`, `id_overrides`, +`alias_exceptions`, `triple_exceptions`) that freeze pre-existing structure debt while the +checks ratchet all new profiles to the clean rules. + +The checks, in brief: + +- **Format** — every id is either in the snapshot, `OF` + 6 base62 chars, or BBL's. +- **Snapshot equality** — tree claims == snapshot claims **and** tree triples == snapshot + triples, both directions: any `filament_vendor`/`filament_type`/family-name change surfaces + as a snapshot diff. +- **Mint conformance** — a non-grandfathered `OF*` id must equal the mint (or a low salt + iteration) of its declarer's product triple; the error prints the expected id to paste into + the family root. +- **Retired reuse** — any tree id present in the `retired` map of + `resources/profiles/retired_filament_ids.json` is an error, with no grandfathering (keys in + the same file's `hints` map may legitimately stay live — BBL still ships them). Ids that + fully vanish from the tree are appended to the `retired` map by `--update-snapshot`; ids + are only ever added there, never removed or reused. +- **Alias hygiene** — a vendor preset riding an OFL family id must keep the library preset's + base name (a rename re-exposes the library preset, since alias shadowing is name-based), + a non-empty `compatible_printers` (an empty one shadows nothing), and no own id key + (structure rule 4). +- **Triple integrity** — every declarer outside the BBL island must resolve a non-empty + `filament_vendor` and `filament_type` (generics use `"Generic"`), and all declarers of one + family within a bundle must agree on the triple. +- **Succession integrity** — retired successor chains terminate at a live id (or null) with + no cycles; `hints` keys stay in the island namespace (`GF*`), are never also retired, and + their chains end at a live tree id. +- **Reserved namespaces** — `GF*` outside BBL, `P<7-hex>` or `"null"` anywhere, unless that + exact claim is grandfathered in the snapshot; `QD_*` anywhere, with no exception (all are + retired). +- **Structure** — no `filament_id` key on newly instantiated presets; no new + declared-vs-inherited id drift; every instantiated system filament must resolve an + effective id through its `inherits` chain (recall: an id-less one is a hard load error in + C++ that discards the whole vendor bundle). + +Sharing a **reserved-catalog** id with a new family or vendor (e.g. shipping a Bambu-cataloged +product under another vendor with its authentic `GF*` id) is refused by `--update-snapshot` +unless you pass `--allow-shared-catalog` — and it still lands in the snapshot diff for +maintainer review. Any other new sharing via a *declared* id is caught by the mint-conformance +check; sharing through inheritance carries no declaration to check and surfaces only as a new +claim in the snapshot diff — which is exactly why that diff is the gate. + +Complementing the Python checks, CI also runs the C++ profile validator with `-f` +(`check_filament_subtypes`): it loads the bundle exactly as the app does and flags any printer +for which two or more compatible filament presets share one `filament_id` — the runtime-shaped +ambiguity check behind structure rule 3. + +## FAQ + +- **A new color of an existing product?** Never a new id — colors are not families. +- **A second diameter (1.75 mm and 2.85 mm) of the same product?** A sibling family with its + own id: two diameters are separately selectable spool products. +- **A high-speed tune of an existing material for another printer model?** Same family: + inherit the family's root, write no id key. +- **A tuned generic ("our profile for Generic PLA")?** Inherit `Generic PLA @System`, keep the + `Generic PLA` base name, set `compatible_printers`, write no id key. +- **I need to fix a family's `filament_vendor` or `filament_type`.** Fix the config, run + `--remint ` then `--update-snapshot`: the id re-derives from the corrected identity + and the old id lands in the succession ledger pointing at the new one. Commit the profile, + snapshot, and ledger diffs together. +- **I need to rename a family.** Renames need one extra step, because the succession vote + follows family names (`renamed_from` gates preset-name compatibility but is not read by the + id tooling): rename the presets (adding `renamed_from`), run `--update-snapshot` once to + sanction the renamed claims on the old id, then `--remint `, then `--update-snapshot` + again — the old id now lands in the ledger pointing at the new one. Re-minting first would + retire the old id *heirless* (successor `null`), which cannot be repaired afterwards. +- **Can I reuse a `QD_*` id for a Qidi profile?** No — nobody can. The namespace is a + dissolved island: the device still composes those ids at runtime, and the succession ledger + translates them to the families' minted ids. Author Qidi filaments like any other vendor's. +- **CI says my family needs an id.** Run `python scripts/assign_filament_ids.py`, then + `--update-snapshot`, and commit both diffs. Do not type an id by hand. + +For general profile authoring, see the profile development guide on the +[OrcaSlicer wiki](https://www.orcaslicer.com/wiki). diff --git a/filament_id_plan.html b/filament_id_plan.html deleted file mode 100644 index 08f4a06b74..0000000000 --- a/filament_id_plan.html +++ /dev/null @@ -1,1029 +0,0 @@ - - - - - -filament_id — design & migration plan · OrcaSlicer - - - - - - -
- - -
-
DESIGN REVIEW resources/profiles · filament_id
-

One id, one material — on every printer, exactly once.

-

A filament_id names a material family: one commercial product line, shared by all of its - per-printer variants. Devices match spools by filament_id + printer compatibility. - That only works if, for any one printer, at most one compatible preset carries a given id. Bambu keeps this - invariant; the other 64 vendor bundles broke it 1,256 times.

- -
- id anatomy — Bambu's grammar - - - - GF - A - 00 - - - - - - - - - - - - prefix — Bambu's namespace - frozen: AMS RFID tags carry these bytes - family letter — A: Bambu PLA - B ABS/ASA · C PC · G PETG · L generic/3rd-party PLA - N PA · P PP/PE · S support · T PET/PPS · U TPU - tier number - 00–49 branded · 50–59 fiber-filled - 60–70 partners · 95–99 generic, desc. - - - - shared by every variant: - - - Bambu PLA Basic @BBL X1C - - Bambu PLA Basic @BBL P1P - - Bambu PLA Basic @BBL X1C 0.2 nozzle - - - -
- -
-
1,256
printer-level ambiguity errors (validator -f, tree-wide)
-
356
logical collision groups after de-duplication
-
30 / 65
vendor bundles affected / total
-
0
violations in BBL — cleaned in PR #14459, CI-gated
-
-

Every number in this document is reproducible: an independent loader-faithful audit re-derives the - validator's output exactly (1256 = 1256), and every code claim carries a file:line reference.

-
- - -
-
§0 overview
-

The plan in one screen

-

Two deliverables: a generation rule so ids can never become ambiguous again (goal 1), and a - migration that fixes the 356 existing collisions without breaking users (goal 2).

- -
- the whole plan - - - - - - - - - TODAY - 7+ ad-hoc id schemes - 356 collision groups - zero written rules - CI covers BBL only - - - RULE + TOOLING §3 §6 - deterministic OF* mint - id lives on @base only - CI ratchets + snapshot - no profile changes yet - - - MIGRATION §5 - fresh ids only, ever - OFL first, then per vendor - names never change - one reviewable PR each - - - DONE - invariant holds - tree-wide, - by construction - - - - - - - BBL profiles are never touched · Qidi QD_* device ids are never touched · no preset is renamed or deleted - -
- -
- Why migration is safe — verified in code: user presets re-derive filament_id from their parent on - every load Preset.cpp:1658-1682; 3mf projects resolve presets by name + config, not id - Preset.cpp:2490-2576; Klipper, Creality and Snapmaker derive tray ids at runtime from the - installed bundle. Fresh, never-reused ids on non-BBL system presets break nothing. -
-
- - -
-
§1 how matching works
-

Every ecosystem funnels through this one id

-

Not just Bambu. Five device ecosystems put a filament_id into the same pipeline; the slicer then - picks the single preset that matches the id and is compatible with the active printer.

- -
- runtime — device → preset - - - - - - - - - - BBL AMS - from device RFID — frozen - - Qidi box - QD_<series>_<v>_<t> — frozen - - Creality CFS - scored at runtime — safe - - Klipper AFC/HH - by filament type — safe - - Snapmaker - color/type match — safe - - - - - - - - - - - - tray_info_idx (MQTT / agent) - - filament_ams_list["filament_id"] - - find_if( f.is_compatible && base(f)==f && f.filament_id == id ) - - - - - - - - Plater.cpp:3440 - PresetBundle.cpp:3132/3233 - - - → the ONE matching preset - two matches? find_if silently returns whichever sorts first — no log, no warning; the AMS edit dialog even hides the second preset - -
- -

The invariant, drawn

-
- per printer × per id -
-
-

✓ Correct — Bambu PLA Basic, id GFA00

- - - - - -
printer presetcompatible presets with GFA00
X1C…@BBL X1C 1
X1C 0.2 nozzle…@BBL X1C 0.2 nozzle 1
P1P…@BBL P1P 1
-

Variants share the id; their compatible_printers are disjoint. Each printer sees the id exactly once.

-
-
-

✗ Broken — Qidi, id GFB99 (real case)

- - - -
printer presetcompatible presets with GFB99
X-Max 3 0.4 nozzleBambu ABS · HATCHBOX ABS · Overture ABS · PolyLite ABS · QIDI ABS Rapido · QIDI ABS-GF · QIDI ASA · ASA-Aero · PC-ABS-FR · Generic ABS … 16
-

Sixteen different materials answer to one id on one printer. A spool tagged “generic ABS” matches - whichever preset sorts first — and GFB99 was stamped into 317 Qidi files.

-
-
-
- -

Two consumers you can't see from the profiles

-

Most matching is printer-scoped, but several code paths match globally, by id alone — tray display name, - temperature_vitrification warnings, calibration history, and the multi-nozzle grouping key - FilamentGroup.cpp:513. So two different materials must never share an id even across - vendors: the first preset in the whole installed collection supplies the name, type and temperature data.

-
Two identity systems. The library (OFL) hides its global presets per printer by - alias (name before  @) — Preset.cpp:3684 — while devices match by - filament_id. When a vendor tunes Generic PLA but renames it - Flashforge PLA Basic, the alias no longer matches, shadowing fails, and both presets are - visible with the same id. The rule in §3 aligns the two systems: one family = one alias = one id.
-
- - -
-
§2 the landscape today
-

Seven schemes, zero rules, one epidemic

-

The only guidance that ever existed was “≤ 8 characters”, checked for BBL only. Every other - convention was one contributor's invention, merged without comment, then imitated.

- -
- who uses which id shape — 5,866 instantiated presets - - - GF<letter><NN> (Bambu classic, mass-copied) - 2,921 - free-form ("GFPLA Silk", "LHF_pla", 36-char names…) - 2,241 - GF<BRAND><NNN> (Bambu partner ids) - 395 - O-prefixed (OGF* — OrcaFilamentLibrary mirrors) - 211 - GF<x>##_## (Afinia/Tiertime suffix) + other GF-shaped - 43 + 55 - - -
- Bambu's space, used outside Bambu - invented, unowned - deliberate Orca convention -
-
- -

How it got here

-
- convention timeline - - - - - - - - - - 2025-01 - OrcaFilamentLibrary - created - - 2025-03 - OGF* prefix born - direct commit, no rationale - - 2025-05 - “≤ 8 chars” check - BBL-only · PR #9574 - - 2025-06 - _## suffix invented - PR #9739, imitated since - - 2025-11 - profile wiki removed - its example taught copy-paste - - 2026-06 - validator -f · BBL → 0 - PR #14459 - - now - this plan - - -
- -

Beyond the validator's reach

-

The -f check compares a printer only against its own vendor's filaments. Three further ledgers exist:

-
-
16
OFL-internal ids covering several materials — visible on every printer (e.g. OEPLAB00 = 14 Elegoo PLA products)
-
42
OFL×vendor same-id pairs — 32 already neutralized by alias shadowing, 10 live
-
67
ids meaning different materials in different vendors (GFU99 also covers a PEBA; Anycubic's GFL95 “Matte” ≠ Bambu's GFL95 “High Speed”)
-
-
- - -
-
§3 the rule
-

Nobody invents ids. Structure carries the rest.

-

Chosen by a 3-design → 2-judge → 3-attacker adversarial process. Deterministic minting won on - ambiguity-prevention, contributor simplicity and enforceability; every “breaks” finding from the attack pass is - folded in below.

- -

The one-question test

-
- decision — same id or new id? - - - - - - - - Would a user call this a different spool product - than anything already in the tree? - - - - - - - YES — polymer, sub-brand, - fiber-filled, 2nd diameter - NO — same spool, tuned for - another printer / nozzle - it's a GENERIC - material - - - NEW FAMILY - create «Family @base», not instantiated - write NO filament_id anywhere - run the mint script — or paste the id - that CI prints for you - - JOIN THE FAMILY - inherit the existing @base - never write the filament_id key - keep compatible_printers disjoint - from the other variants - - JOIN THE OFL FAMILY - inherit «Generic X @System» - KEEP the «Generic X» name/alias - (alias shadowing then hides the OFL - preset on your printers) · no id key - color → never a new id · “high-speed” for a different printer → same family - “high-speed” selectable alongside the normal preset on one printer → new family - second selectable diameter on the same printer → sibling family with its own id - -
- -

Minted ids — the setting_id precedent, applied to families

-
- id anatomy — the new namespace - - - OF - q3xT9k - - - - - - - - - OF — Orca Family namespace - disjoint from GF · QD_ · P· at two chars - base62_6( uuid5( NS, "filament_family/<Vendor>/<Family>" ) ) - e.g. filament_family/Elegoo/Elegoo PLA Matte → OFq3xT9k - same derivation as setting_id · 8 chars total (AMS limit) - - - same input → same id: - no “next number” races · a fork mints the id upstream expects · CI recomputes and verifies - renamed family? - the id does not change — immutable once shipped; renamed_from covers the name - - -
-

Author workflow is two lines: commit the family with no id anywhere; run - python scripts/assign_filament_ids.py (or read the id CI prints in its failure message and paste it). - A --mint "<Vendor>/<Family>" one-shot prints an id without touching the tree.

- -

Structure: the id lives in exactly one place

-
- family shape - - - Elegoo PLA Matte @base - instantiation:false · filament_id: "OFq3xT9k" ← only here - - - - - - …@Centauri Carbon - inherits @base · no id key - compat: {CC 0.4} - - …@CC 0.2 nozzle - inherits @base · no id key - compat: {CC 0.2} - - …@Neptune 4 - inherits @base · no id key - compat: {N4, N4 Pro} - - disjoint compatible_printers = the PR #14459 invariant, by construction - family identity is DECLARED — an optional "filament_family" key on the root overrides name derivation - multi-root families are legal (Qidi's per-series bases) — every root must declare the identical id - -
- -

Reserved namespaces — never mint or hand-write into

-
- the id space, partitioned - - - - - - - - - GF* - Bambu AMS / RFID — frozen - - QD_* - Qidi device — frozen - - P[0-9A-Fa-f]{7} · "null" - user-custom presets - - OGF* + legacy shapes - grandfathered, closed - - OF[0-9A-Za-z]{6} - open — minted only - - Byte-copies of authentic Bambu ids stay legal where the checked-in shared_catalog sanctions the family (BBL, OFL, Fiberon). - Everything already shipped and unambiguous is snapshot-frozen exactly as-is — the migration touches only colliding families. - -
-
Accepted trade-off: minted ids are opaque — OFq3xT9k doesn't say “PLA”. - The family name sits in the same file; in exchange there is no registry, no “next free number” ceremony, no PR races, - and forks mint the same id upstream expects. The mnemonic registry-grammar runner-up is preserved in §8 if you prefer it — - everything else in this plan works under either format.
-
- - -
-
§4 error taxonomy — goal 2
-

Eleven patterns explain all 356 groups

-

Classified group-by-group against the actual profile files, then independently spot-checked - (1 substantive disagreement in 14 samples, corrected). The task's two known patterns cover about half; the rest - are new findings.

- -
- what's actually wrong — classified groups - - - P1 copy_paste_id — different materials share an id verbatim - 167 - P2 wrong_inherits / id-less product line - ~87 - P3 generic_family_overlap — branded preset rides a generic id - 68 - P4 overclaim_compat — broader variant claims a dedicated printer - 24 - other — deliberate coexistence, hygiene, one true duplicate - 21 - - -

Fixes across all groups: 319 × mint a fresh id · 21 × trim compatible_printers · - 21 × split compat-or-id · 5 × re-point inherits · 1 × merge. Which preset keeps a contested id follows a - mechanical precedence: Bambu-catalog material → OFL generic family → historical first owner.

-
- -
-
P1copy_paste_id~167
-

The id came along when a profile was copied. Qidi stamped GFB99 into 317 files; - Peopoly put PLA-Silk's id on ABS.

-
fix — impostor families get minted ids on their roots; the owner keeps the id.
-
P2wrong_inherits / no root~87
-

A product line never got its own @base — every variant inherits another family's id. - Flashforge's umbrella collapses ~140 presets into one id.

-
fix — create per-family roots with minted ids; re-point inherits. Never delete the old - shadow files — convert them (they carry real config).
-
P3generic_family_overlap~68
-

A vendor-branded filament rides a generic family id via inheritance, colliding with the true generic - on the same printer.

-
fix — branded → minted id. True generic tunings instead join the OFL family with matching alias. - Sovol is the elegant case: just delete its wrong id lines and inherit OFL's.
-
P4overclaim_compat~24
-

Same material; the broad variant claims a printer that a dedicated variant covers — the BBL H2DP pattern - from PR #14459.

-
fix — trim the broader preset's compatible_printers. Ids untouched.
-
P5template-carried idin P1/P2
-

The id sits on a shared settings template (fdm_filament_*), so every family that inherits - the template collapses onto it (Prusa, Ginger Additive).

-
fix — move ids off templates onto family roots.
-
P6OFL-internal collision16 ids
-

One OFL id spans several materials — and OFL presets are visible on every printer. - OGFL06 = eSUN PLA-Marble and Fiberon PETG-ESD.

-
fix — fix OFL first: it's the base bundle every vendor resolves against.
-
P7alias-mismatch re-exposure10 live
-

A vendor tunes a generic but renames it; alias shadowing fails and the OFL preset resurfaces beside it - (Snapmaker PolyTerra J1 PLA).

-
fix — rename-to-alias where it's genuinely the same family, else mint.
-
P8per-variant ids~210 presets
-

The opposite failure: every nozzle variant has its own id (Prusa, SeeMeCNC, Afinia _##). - No ambiguity — but devices can't recognize the material across nozzles.

-
fix — grandfather (they're unambiguous); converge opportunistically; document as anti-pattern.
-
P9format violationshygiene
-

Ids with spaces ("GFPLA Silk"), 11-char ids, invented GF-shaped ids colliding with - Bambu's real allocations.

-
fix — disappears as a byproduct of re-minting; the unambiguous rest is snapshot-frozen.
-
P10cross-vendor semantic67 ids
-

Same id, different material, different vendors — feeds wrong name/type/temperature data to the globally-matching - consumers (§1).

-
fix — mostly eliminated by P1–P3 re-minting; benign same-material generic sharing is legalized - by the snapshot.
-
P11deliberate coexistence4
-

Snapmaker “Benchy” demo presets coexist on purpose (gated by compatible_prints, which the id check - can't see); one preset lists the same printer three times.

-
fix — mint ids for demo presets; de-duplicate list entries; add a lint.
-
-
- - -
-
§5 migration plan
-

Fresh ids only, family-atomic, names never change

-

The persistence analysis makes one strategy provably safe — and everything else forbidden.

- -

What survives an id change

- - - - - - - - - - -
surfacebehavior across releasesverdict
User presets that inherit a system presetfilament_id re-derived from the parent on every load Preset.cpp:1658-1682safe
Saved 3mf projectspresets resolve by name + config equality, never by id Preset.cpp:2490-2576safe
Klipper / Creality / Snapmaker synctray ids derived at runtime from the installed bundlesafe
User root custom presetscopied a system id at creation and persist it forever — AMS auto-match falls back to generic-by-typelow residue
Qidi QD_* idsencode the device protocol QidiPrinterAgent.cpp:146 — an exact-match contractfrozen
BBL GF* idslive on RFID tags and printer-side records; hardcoded k-values in C++frozen
Recycling an old id for a different materialstale ids in user roots / old 3mfs would silently match the wrong materialforbidden, forever
Renaming / deleting preset namesuser presets whose inherits no longer resolves are dropped at load Preset.cpp:1687-1691forbidden (use renamed_from if unavoidable)
- -

Phases

-
-
0
-

Tooling + snapshot — no profile changes

-

Land scripts/assign_filament_ids.py, the extended CI checks in ratchet mode, the validator OFL - cross-check and the runtime warning. Generate filament_id_snapshot.json (id→families multimap over main) - and an empty retired_ids.json; both are checked in and append-only.

-
-
1
-

OrcaFilamentLibrary first

-

OFL is the base bundle every vendor resolves against. Fix its 16 internal collisions and give - Generic PETG HF/PETG-CF/PP-CF/… @System their own family roots instead of collapsing into their - parent generic. Unambiguous ids stay byte-identical.

-
-
2
-

Per-vendor PRs, worst first — each widens the CI ratchet

-

Qidi → Flashforge → Elegoo → Prusa → Cubicon → Anycubic → InfiMech → Snapmaker → long tail (22 vendors, - mostly 1–8 one-line fixes). Each merged PR appends its vendor to the workflow's -f -v scope - (today: -v BBL -f); when all are in, drop -v and run tree-wide.

-
-
3
-

Delete the allowlists

-

Once tree-wide zero holds, the ratchet allowlists disappear and every check becomes a hard rule for anything - born after the snapshot.

-
-
- -
- where the work is — collision groups per vendor - - - Qidi97 - Flashforge69 - Elegoo37 - Prusa31 - Cubicon17 - Anycubic14 - InfiMech14 - Snapmaker11 - Artillery8 - Creality8 - FlyingBear8 - Sovol6 - 18 more40 total (Volumic 6 · Ratrig 5 · Chuanying 4 · Dremel 3 · 4×2 · 10×1) - - -

Vendor observations show these are systematic mistakes, not hundreds of independent bugs: Qidi is one - blanket-stamp in three profile generations; Elegoo is a single inherit-the-class-base habit; Sovol is fixed by deleting - six wrong lines.

-
- -

The migration script's contract (hardened by the adversarial pass)

- - - - - - - -
rulewhy
Re-mint everything — id literals in analysis notes are ignored; only group membership, fix category and keep-id precedence are consumed. Assert no emitted id matches ^(GF|QD_|P[0-9A-Fa-f]{7}$).~40% of classification notes suggested ids in the old invented-GF culture; CI would reject them.
Family-atomic — re-idding any preset re-ids every same-family sibling in the same commit, even outside the collision group.Otherwise a family splits across two ids (FlyingBear GFB99 @S1 vs @Ghost7) — worse than the bug being fixed.
Bounded diff — a vendor PR may only touch collision-group files + same-family siblings; every id that is unambiguous today stays byte-identical.Makes each PR mechanically auditable.
Config-equivalence gate — flattened effective config of every preset must be identical before/after, except the prescribed id/inherits/compat edits.Makes structural conversions provably behavior-neutral (Flashforge's id-less shadow files become named family roots carrying their config byte-for-byte).
No deletions, no renames — redundant twins are re-minted, not dropped; consolidation via renamed_from is a separate human-reviewed cleanup.Deleting a name silently drops users' derived presets at load.
-
- - -
-
§6 enforcement
-

Ratchets, not absolutes

-

The grandfathered landscape keeps today's benign sharing legal; the checks forbid anything new. - All checks import the same mint function — the setting_id precedent.

- - - - - - - - - - - -
#checkwhere
1Format — valid iff OF[0-9A-Za-z]{6} or in the snapshot or vendor==BBL or QD_* in Qidi. The legacy set is closed.orca_extra_profile_check.py
drop BBL-only gate :292, OFL skip :601
2Uniqueness ratchet — tree-wide id→families multimap; no id may gain a family claim not recorded in the snapshot (shared_catalog is the sanctioned exception).
3Structure ratchet — id key only on roots; every instantiated preset resolves an effective id (simulated loader walk); all family members resolve identically; no preset may override its inherited id (the Generic SBS drift class).
4Mint conformance — a new id must equal the mint (or a salt iteration); the failure message prints the expected value so hand-editors can paste it.
5Stability — an (id, family) pair on main may not change or vanish, following renamed_from chains, unless listed in a maintainer-gated migrations file. Retired ids go to an append-only ledger and are never redefined.
6Alias hygiene — a preset inheriting an OFL Generic * @System (no own id in its chain) must keep the OFL base name and non-empty compatible_printers; the error names the rename as the cause.
7OFL cross-check — extend check_duplicate_filament_subtypes to include OFL presets in every vendor's per-printer check, minus alias-excluded ones. m_excluded_from is already populated in validator context, so the 32 shadowed pairs won't false-positive and the 10 live ones are caught. Widen CI's -f per vendor.C++ validator
PresetBundle.cpp:5654 · :2302
8Runtime backstop — log a warning when the AMS-sync find_if sees 2+ compatible presets for one id. The only layer that can see side-loaded and forked bundles. One line.runtime
PresetBundle.cpp:3132/3233
- -

Plus: the rule document ships in-repo (doc/developer-reference/filament_id.md) so CI messages - have a stable link, and the profile-PR template gets one checkbox: “new materials: no filament_id key anywhere — - CI prints the minted id.”

-
- - -
-
§7 evidence
-

How this was verified

-

The analysis was run as a 52-agent pipeline over the real tree and real git history, with an - adversarial design phase — findings were attacked before being adopted.

- -
- methodology - - - - - - - - - 5 code analysts - runtime · persistence · loader - Bambu grammar · git history - - 38 classifiers - every collision group, read - from the actual profile files - - ground truth - audit script = validator - 1256 = 1256 · exact - - - 3 designs - deterministic mint - registry grammar - structure-only - - - 2 judges - both chose the mint - 58 / 50 / 56 - 60 / 54 / 56 - - - 3 attackers - 35 scenarios - authors · runtime · - migration mechanics - every “breaks” → - an amendment §3–§5 - spot-check: 1/14 - - - - - - - - - -

Amendments that came out of the attack pass: family identity declared on roots (not name-derived — - Afinia PLA@HS has no space before @); multi-root families legalized; checks 2–3 as - ratchets, not absolutes; the no-deletion rule; shadow-file conversion instead of deletion; classification id - literals quarantined; diameter siblings; case-insensitive reservation of the user id space.

-
- -
- Key discoveries that reshaped the design (with sources) -
-

· The “26 Flashforge presets with no id” were a false alarm — the loader resolves them through the OFL base-bundle - fallback to OGFL99/OGFG99 PresetBundle.cpp:4904-4909. The real bug is - ~10 different Flashforge PLA products sharing one id.

-

· A missing id can never ship: it's a hard load error that discards the whole vendor bundle - PresetBundle.cpp:5072, :5141.

-

· Qidi's QD_* ids are a device-protocol contract, discovered in - QidiPrinterAgent.cpp:146-152 — a second frozen namespace nobody had documented.

-

· User-custom ids occupy P + 7 hex CreatePresetsDialog.cpp:533, and - "null" is a sentinel — both reserved.

-

· OFL shadowing is keyed by alias, not id Preset.cpp:3684-3714, and is already active in - validator context PresetBundle.cpp:2302 — which is what makes check #7 precise.

-
-
-
- - -
-
§8 open decisions
-

Five calls that are yours to make

-

Everything else in the plan holds under any of these answers. → marks the recommendation.

- -
-
D1id format
-
Opaque deterministic mint OFq3xT9k — no registry, no races, fork-friendly; judges 2/2.
-
Mnemonic registry grammar <NS><FAM><SEQ> — readable ids, but someone allocates numbers forever.
-
D2multi-vendor brands
-
shared_catalog list — sanction authentic Bambu ids for byte-matching families (Snapmaker's Fiberon), low churn.
-
Hoist those families into OFL — cleaner long-term, more restructuring now.
-
D3demo presets
-
Mint ids for Benchy-style presets — simple, keeps the validator strict.
-
Teach the validator compatible_prints gating — more machinery for 3 presets.
-
D4the 10 live OFL duplicates
-
Rename-to-alias where it's truly the same family (with renamed_from) — restores shadowing.
-
Mint vendor ids everywhere — safer mechanically, more ids in the world.
-
D5where the rule doc lives
-
In-repo doc/developer-reference/filament_id.md — CI messages need a stable link.
-
Wiki-only — discoverable, but drifts from the checks that enforce it.
-
- -
- Suggested first step: land phase 0 (tooling + snapshot, zero profile changes). It is entirely additive, - makes every later PR mechanically checkable, and turns the 356-group backlog into a shrinking allowlist that CI - reports on every profile PR. -
-
- -
- - - - diff --git a/filament_id_plan.md b/filament_id_plan.md deleted file mode 100644 index 7dc4b43d04..0000000000 --- a/filament_id_plan.md +++ /dev/null @@ -1,397 +0,0 @@ -# filament_id: generation rule + system-profile fix plan - -Follow-up to PR #14459 (commit `c2e91cb8`, validator `-f` / `check_duplicate_filament_subtypes`). -Goal 1: a filament_id generation rule for all vendors. Goal 2: an error-pattern taxonomy and a -migration plan that removes every ambiguous filament_id, without touching Bambu (BBL) profiles. - -All numbers below are reproducible: a loader-faithful audit script re-derives the validator's -output **exactly** (1256/1256 printer-level errors, 356 logical collision groups, 30 vendors). -Every code claim was verified against source with `file:line` references. - ---- - -## 0. Executive summary - -- `filament_id` is a **material-family id**: one id per commercial product line, shared by all - of that material's per-printer/per-nozzle variants. Matching is always `(filament_id + - printer compatibility)`; the invariant from PR #14459 is *per printer preset, at most one - compatible instantiated filament preset per id*. -- Every modern device ecosystem funnels through this id — not just Bambu AMS: Qidi box, - Creality CFS, Klipper AFC/Happy Hare, Snapmaker all emit/consume `tray_info_idx` - (see §1). Several consumers match **globally, without printer scoping**, so two *different - materials* sharing one id is unsafe even across vendors. -- **Proposed rule (§3):** deterministic, script-minted ids — `OF` + 6 base62 chars from - `uuid5(vendor + family)`, declared **only on family-root (`@base`) presets**; variants inherit. - Nobody ever invents an id by hand; CI prints the expected id when one is missing. Existing - unambiguous ids are grandfathered and frozen; `GF*` (Bambu), `QD_*` (Qidi device protocol), - and `P<7-hex>` (user custom presets) are reserved namespaces that must never be minted into. - This was selected by an adversarial design/judge process over a registry-grammar alternative - and a structure-only alternative, then stress-tested; amendments from that stress test are - folded in below. -- **Migration (§5):** fresh-never-reused ids only, family-atomic, names never changed. This is - provably safe: user presets re-derive `filament_id` from their parent on every load - (`Preset.cpp:1658-1682`), 3mf resolves presets by name+config (`Preset.cpp:2490-2576`), and - Klipper/Creality/Snapmaker derive tray ids at runtime. One PR per vendor; CI's `-f` scope - ratchets per vendor until tree-wide. - ---- - -## 1. How filament_id actually works (verified) - -### Consumers and scoping - -All device integrations converge on one pipeline: device/agent sets `tray_info_idx` → -`DevAmsTray.setting_id` → `Sidebar::build_filament_ams_list` (`Plater.cpp:3423-3493`) → -`PresetBundle::sync_ams_list` / `get_ams_cobox_infos` (`PresetBundle.cpp:3112-3308`) match it -against filament presets. - -| Ecosystem | Where the id comes from | Effect of changing a system id | -|---|---|---| -| BBL AMS | device-side (RFID / user tray setting), `DeviceManager.cpp:3823+` | breaks matching — **frozen by mandate** | -| Qidi box | built from device enums: `"QD_" + series + "_" + vendor + "_" + type_idx`, `QidiPrinterAgent.cpp:146-152`; needs an exactly-matching visible preset | breaks matching — **`QD_*` ids are a frozen device contract** | -| Creality CFS | runtime brand/type scoring returns current preset's id (`CrealityPrintAgent.cpp:46-118`) | invisible | -| Klipper (AFC / Happy Hare) | runtime `filament_id_by_type` (`MoonrakerPrinterAgent.cpp:808,936`) | invisible | -| Snapmaker | runtime color/vendor/type match (`SnapmakerPrinterAgent.cpp:22-64`) | invisible | - -Matching is printer-scoped (`is_compatible`) in the AMS sync paths and all printer agents — this -is what makes the per-printer invariant sufficient there. But several consumers match -**globally by id alone**, first match wins: - -- `get_filament_by_filament_id("")` — tray display name, `filament_is_support`, - `temperature_vitrification` warnings (`PresetBundle.cpp:690-733`; callers - `DevFilaBlackList.cpp:70`, `Plater.cpp:3453`, `SelectMachine.cpp:3560,4623`). The code - comment at `:695` states the assumption outright: an id maps to ONE material globally. -- `MachineObject::setting_id_to_type` (`DeviceManager.cpp:2538`), calibration-history name - lookup (`CaliHistoryDialog.cpp:62`), custom-filament cloud grouping (`Preset.cpp:2839`). -- The slicing pipeline itself: multi-nozzle filament grouping merges project filaments whose - `(filament_id, color)` match (`FilamentGroup.cpp:513-528` via `ToolOrdering.cpp:1164`). - -**Consequence:** within one printer, duplicate ids break AMS matching (silent first-wins, -`find_if` at `PresetBundle.cpp:3132/3233`; the AMS tray-edit dialog even *hides* the second -preset, `AMSMaterialsSetting.cpp:894-897`). Across vendors, the same id on *different -materials* feeds wrong name/type/vitrification data to the global consumers and can merge -different materials into one nozzle group. Same id on the *same* material (e.g. `GFL99` = -Generic PLA in 29 vendors) is comparatively benign — those attributes agree. - -### Identity machinery - -- **Effective id resolution** (`PresetBundle.cpp:4842-5080`): own `filament_id` key → vendor - `filament_id_maps[inherits]` (file order in the vendor index is load-bearing) → - OrcaFilamentLibrary base-bundle map. An instantiated system filament that resolves *no* id is - a hard load error that discards the whole vendor bundle (`:5072`, throw at `:5141-5147`) — - so "missing id" cannot ship; what looked like 26 id-less Flashforge presets actually resolve - to OFL's `OGFL99`/`OGFG99` through the base-bundle fallback. -- **Two family-identity systems exist**: `filament_id` (device matching) and `alias` (name - before `" @"`). OFL shadowing is keyed on **alias**: `update_library_profile_excluded_from` - (`Preset.cpp:3684-3714`) hides an OFL preset (empty `compatible_printers` = compatible with - everything, `Preset.cpp:837`) on printers claimed by a same-alias vendor preset. There is - **no id-based shadowing**. A vendor preset that tunes an OFL generic but renames it - re-exposes the OFL preset and creates a live duplicate. The rule below aligns the two - systems: one family = one alias = one id. -- **User-custom id space**: user-created filaments get `"P" + md5(name)[0:7]` (8 chars, - `CreatePresetsDialog.cpp:533`), or *reuse a system id* when the base name matches an existing - preset (`:510-528`). `"null"` is used as a sentinel. Root user presets persist their id - forever; inheriting user presets re-derive it on every load. - -## 2. The id landscape today - -**Bambu's grammar** (derived from all 1970 BBL instantiated presets; BBL is internally clean — -181 id definitions, 0 duplicates): - -- Classic `GF`: letter = family (A Bambu-PLA, B ABS/ASA, C PC, G PETG/PCTG, - L third-party+generic PLA, N PA/PPA, P PP/PE, R misc, S support, T PET/PPS, U TPU). - Numbers: 00-49 branded ascending, 50-59 fiber-filled, 60-70 partner block, **95-99 generic - tier descending** (99 = the family's plain generic). -- Brand partners `GF`: GFPM Polymaker, GFOT Overture, GFSNL SUNLU, GFNMK - Numakers. One id per product line; never per color, never per printer/nozzle/diameter. -- Structural rule: the id lives on the material's `@base`; every variant inherits it. -- Hardcoded in C++: `GFS00/GFS01` support check (`DeviceManager.cpp:4739`), per-family PA - defaults `GFU01/03/04` (`CalibUtils.cpp:54-75`) — `GF*` is Bambu's space, byte-frozen. - -**Everything else is ad-hoc, invented by individual contributors and imitated** (full history -in §7): OFL's `O`-prefix mirrors (`OGFA00`; introduced 2025-03-31, commit `8c4a65e3e1`), -Tiertime/Afinia `GFx##_##` per-printer-line suffixes, SeeMeCNC per-nozzle ids, LH `LHF_pla`, -LONGER 11-char pseudo-GF ids, Anycubic ids **with spaces** (`"GFPLA Silk"`), Prusa ids that are -entire preset names (36 chars), and mass copy-paste of `GFL99/GFB99/GFG99` onto everything -(Qidi alone stamped `GFB99` into **317 files** across all materials). The only guidance that -ever existed was "≤ 8 chars" — enforced for BBL only (`orca_extra_profile_check.py:292,320`), -and the (now removed) profile wiki's own examples *taught* id copy-pasting. - -**The damage, quantified** (audit reproduces validator 1256/1256): - -| Ledger | Count | -|---|---| -| Within-vendor logical collision groups (validator `-f`) | **356** across 30 vendors (1256 printer-level errors) | -| OFL×vendor same-id groups (validator blind spot) | 42 — of which **10 are live** (alias mismatch defeats shadowing); 32 already neutralized by alias shadowing | -| OFL-internal: one id, several materials, visible on every printer | **16 ids** (e.g. `OEPLAB00` = 14 distinct Elegoo PLA products; `OGFL06` = eSUN PLA-Marble *and* Fiberon PETG-ESD) | -| Cross-vendor semantic collisions (same id, different materials) | **67 ids** (e.g. `GFU99` also covers a PEBA; Anycubic minted `GFL95` "Matte" ≠ Bambu `GFL95` "High Speed") | - -Worst vendors by groups: Qidi 97, Flashforge 69, Elegoo 37, Prusa 31, Cubicon 17, -Anycubic 14, InfiMech 14, Snapmaker 11, Artillery 8, Creality 8, FlyingBear 8. - ---- - -## 3. The rule (proposal) - -Selected by a 3-design / 2-judge adversarial process (deterministic-mint won over -registry-grammar and structure-only on ambiguity-prevention, contributor simplicity, and -enforceability), then hardened by three adversarial review passes. This section is written as -the future authoring doc. - -### 3.1 The one-question test - -> **Would a user consider this a different spool product than anything already in the tree?** -> Different polymer, different sub-brand (Basic / Matte / Silk / HF), fiber-filled sibling, or -> a second selectable diameter → **new family, new id**. The same spool tuned for another -> printer or nozzle → **join the existing family** (inherit its `@base`, no id key). Tuning a -> generic material → **join the OFL family** (inherit the `Generic X @System` preset, keep the -> `Generic X` base name, add no id). - -Same id / new id at a glance: - -| Situation | id | -|---|---| -| Per-printer / per-nozzle variant of an existing material | same id (inherit, never write the key) | -| Sub-brand or product line (PLA vs PLA Matte vs PLA Silk vs PLA HF) | new id each | -| Color | never a new id | -| Second diameter selectable on the same printer (1.75 + 2.85) | sibling family, new id | -| "High-speed" tuned for a *different printer model* | same id (it's a printer variant) | -| "High-speed" selectable *alongside* the normal preset on one printer | new id (it's a product line) | - -### 3.2 Structure - -1. **One family = one root.** Each material family has root preset(s) (`instantiation:false`, - typically ` @base`) and only roots carry the `filament_id` key. Instantiated - variants inherit a root and never write `filament_id`. (A family MAY have several roots — - e.g. Qidi's per-series bases — but they must all declare the *identical* id.) -2. **Family identity is declared, not name-derived.** Default: the family name is the - instantiated presets' base name (name with `/\s?@.*$/` stripped — note *optional* space, - because `Afinia PLA@HS`-style names exist). When vendor naming makes that ambiguous, the - root declares an explicit `"filament_family"` key that overrides derivation; tooling errors - loudly when a root's derived family differs from its children's. -3. **Within a family, variants' `compatible_printers` are pairwise disjoint** — that *is* the - PR #14459 invariant, enforced by the validator. -4. **Generics belong to OFL.** A vendor tuning `Generic PLA` inherits - `Generic PLA @System`, keeps the `Generic PLA` base name/alias (so alias shadowing excludes - the OFL preset on those printers, `Preset.cpp:3684`), sets non-empty `compatible_printers`, - and writes no id. A vendor-*branded* filament never rides a generic family id. -5. **Ids are immutable once shipped.** Renaming a family does not change its id (use - `renamed_from`). No id is ever recycled for a different material — stale ids live on in - user root presets and old 3mfs, and a recycled id would silently match the wrong material. - -### 3.3 Minting — nobody invents ids - -New family ids are computed, exactly like the `setting_id` precedent -(`scripts/assign_vendor_setting_ids.py` / `Slic3r::generate_preset_setting_id`): - -``` -filament_id = "OF" + base62_6( uuid5( NAMESPACE, "filament_family//" ) ) -``` - -8 chars total (satisfies the AMS length limit), same base62 derivation and a dedicated -namespace constant. On the astronomically rare collision with an existing id, the minter salts -the input (`.../1`, `/2`, …) until free; the result is simply frozen in the file. - -- **Script path:** author commits the family with *no id anywhere*; - `python scripts/assign_filament_ids.py` inserts the minted id into the root(s). Idempotent; - never rewrites a valid existing id. A `--mint "/"` one-shot prints the id - without touching the tree. -- **No-script path:** CI fails with the exact line to paste: - `family "MyBrand PLA" (vendor X) needs filament_id "OFq3xT9k" in "MyBrand PLA @base.json"`. - -**Reserved namespaces — never mint or hand-write into:** - -| Space | Owner | Status | -|---|---|---| -| `GF*` | Bambu AMS/RFID catalog | byte-copies of authentic Bambu ids only, and only where a checked-in `shared_catalog` list sanctions the family (BBL bundle; OFL mirrors; byte-matching families in other vendors, e.g. Snapmaker's Fiberon) | -| `QD_*` | Qidi device protocol | frozen; Qidi-only; exempt from family-shape checks | -| `P[0-9A-Fa-f]{7}`, `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp:533`) | never emitted for system presets (reserve case-insensitively) | -| everything already shipped | grandfather snapshot | frozen as-is (§5) | - -Trade-off accepted: minted ids are opaque (`OFq3xT9k` carries no "PLA" mnemonic — the family -name in the same file provides that). The judges preferred this over a Bambu-style extended -grammar because it removes the "who allocates the next number" ceremony, cannot race between -concurrent PRs, and needs no registry maintenance. If mnemonic ids are strongly preferred, the -runner-up design (`` + registry file) is documented in the workflow -records; everything else in this plan is unchanged under either format. - -### 3.4 What CI enforces (all vendors, ratcheted) - -Extend `scripts/orca_extra_profile_check.py` (it imports the same mint function; setting_id -precedent) and the C++ validator: - -1. **Format**: an id is valid iff `OF[0-9A-Za-z]{6}` **or** in the grandfather snapshot **or** - vendor==BBL **or** `QD_*` in Qidi. No whitespace/ASCII/length checks needed outside the - grandfather set — new ids are minted, and the grandfather set is closed. -2. **Uniqueness ratchet**: id→families multimap computed tree-wide; no id may acquire a family - claim not recorded in the snapshot (snapshot legalizes today's benign `GFL99`-style sharing; - new multi-claims are errors; `shared_catalog` entries are the sanctioned exception). -3. **Structure ratchet**: `filament_id` key only on roots; every instantiated filament must - resolve an effective id via the simulated loader walk; all members of one family resolve the - same id; **a preset may not declare an id different from its inherited effective id** (the - `Generic SBS` drift bug class). Pre-existing violations are snapshot-frozen; new ones error. -4. **Mint conformance**: an id new relative to the snapshot must equal the mint (or a salt - iteration); the error message prints the expected value. -5. **Stability**: an `(id, family)` pair on main may not change or vanish, *following - `renamed_from` chains* (so an honest rename passes), unless listed in a maintainer-gated - migrations file. Retired ids go to an append-only `retired_ids` ledger; a retired id may - never be defined again for any family. -6. **Alias hygiene for tuned generics**: a preset inheriting an OFL `Generic * @System` (with - no own id anywhere in its vendor chain) must keep the OFL base name and have non-empty - `compatible_printers` — error message names the rename as the cause. -7. **C++ validator**: extend `check_duplicate_filament_subtypes` (`PresetBundle.cpp:5654`) to - include OFL presets in every vendor's per-printer check, *minus* alias-excluded ones — - `m_excluded_from` is already populated in the validator context (`update_system_maps` at - `PresetBundle.cpp:2302`), so the 32 shadowed pairs won't false-positive and the 10 live ones - will be caught. Run `-f` per vendor in CI, widening as vendors are cleaned (§5). -8. **Runtime backstop** (one-line change): log a warning when the AMS-sync `find_if` - (`PresetBundle.cpp:3132/3233`) finds 2+ compatible presets for one id — the only layer that - can see side-loaded/forked bundles. - ---- - -## 4. Error-pattern taxonomy (goal 2) — with counts and fixes - -356 groups were classified by 37 agents reading the actual profiles, spot-checked -independently (1 substantive disagreement in 14 samples). Counts below fold the spot-check -corrections in. **Fix rule for all patterns: replacement id values are always freshly minted -`OF*`; the "which preset keeps the id" decision uses the precedence _Bambu-catalog material > -OFL generic family > family that historically introduced the id_.** - -| # | Pattern | Groups | Fix | -|---|---|---|---| -| P1 | `copy_paste_id` — different materials share an id verbatim (task's error 1). Qidi's `GFB99`×317-files epidemic; Anycubic's three id "eras"; Peopoly `GFSL99` on ABS | ~167 | impostor families get minted ids on their roots; owner keeps the id | -| P2 | `wrong_inherits` / id-less product lines — a variant inherits another family's root (PR #14459's Panchroma case) or a product line never got its own root (Prusa HF; Flashforge's ~140-preset `FFG01` umbrella) | ~87 | create per-family roots with minted ids; re-point `inherits`; **never** delete the id-less shadow/base files — convert them (they carry real config: Flashforge `fdm_filament_pla` differs materially from OFL's) | -| P3 | `generic_family_overlap` — vendor-*branded* preset rides a generic family id via inheritance (task's error 2, generalized). Includes the 10 live OFL duplicates | ~68 | branded presets get minted family ids; true generic tunings instead adopt the OFL family *with matching alias* (rule 3.2.4); Sovol is the elegant case — just **delete** its wrong own-id lines and let OFL ids flow through inheritance | -| P4 | `overclaim_compat` — same material, broader variant claims a printer that a dedicated variant covers (the BBL H2DP pattern fixed in #14459) | ~24 | trim `compatible_printers` of the broader preset (Dremel, Cubicon `@base`s that are also instantiated, Wanhao France Bowden/Direct) | -| P5 | template-carried id — id declared on a shared settings template (`fdm_filament_*`, `fdm_filament_common`) so every family inheriting it collapses (Prusa, Ginger Additive, Snapmaker TPU base) | inside P1/P2 counts | move ids off templates onto family roots | -| P6 | OFL-internal collisions — 16 ids spanning several materials, visible on every printer (Elegoo blocks, Elas `OGFA00`×3, `OGFL06` polymer mismatch, `Generic PETG HF/PETG-CF @System` missing own ids) | 16 ids | fix inside OFL first (it's the base bundle every vendor resolves against) | -| P7 | alias-mismatch re-exposure — vendor tunes a generic under a different name, OFL preset resurfaces (Snapmaker `PolyTerra J1 PLA` vs OFL `PolyTerra PLA`) | 10 live | rename-to-alias where it's genuinely the same family, else mint | -| P8 | per-variant ids — no ambiguity, but family semantics broken: every variant has its own id (Prusa name-ids, SeeMeCNC nozzle suffixes, Afinia/Tiertime `_##`, iQ) so device matching can't identify the material across nozzles | ~210 presets | grandfather (they're unambiguous); converge opportunistically; document as anti-pattern | -| P9 | format violations — spaces (`"GFPLA Silk"`), >8 chars (LONGER, SeeMeCNC, LH), GF-shaped inventions (Anycubic `GFL93-97`, CoLiDo `GFA99`) | in the above | fixed as a byproduct of re-minting; snapshot freezes the unambiguous rest | -| P10 | cross-vendor semantic collisions — 67 ids meaning different materials in different vendors (dangerous via the global unscoped consumers, §1) | 67 ids | mostly eliminated by P1-P3 re-minting; the remaining same-material generic sharing is legalized by the snapshot | -| P11 | deliberate coexistence & data hygiene — Snapmaker "Benchy" demo presets (gated by `compatible_prints`, which the id check can't see) and a self-collision from duplicate `compatible_printers` entries | 4 | give demo presets own minted ids; dedupe list entries; add a lint for duplicate array entries | - -New patterns beyond the two in the task (goal 2.3): P5-P11. - ---- - -## 5. Migration plan - -### Safety foundation (verified, §1/§7) - -Safe: fresh never-used ids, family-consistent; trims of `compatible_printers`; inherits -re-pointing; OFL id changes (children re-derive). Unsafe: touching `BBL`/`QD_*`; recycling or -swapping ids; splitting a family's id; **deleting or renaming preset names** (user presets -whose `inherits` no longer resolves are dropped at load, `Preset.cpp:1687-1691`) — if a name -must go, `renamed_from` coverage is mandatory. - -### Phases - -0. **Land the rule + tooling first** (no profile changes): `scripts/assign_filament_ids.py` - (mint + insert + `--mint`), the extended `orca_extra_profile_check.py` checks in - snapshot-ratchet mode, the C++ validator OFL cross-check, the runtime warning, the rule doc. - Generate `filament_id_snapshot.json` (id→families multimap over main) and empty - `retired_ids.json` — both checked in. -1. **OFL first** (it's the base bundle every vendor resolves against): fix the 16 internal - collisions (Elas/eSUN/DREMC copy-pastes get mints; `Generic PETG HF/PETG-CF/PP-CF/PP-GF/ - PE-CF/PLA Matte @System` get their own family roots+ids instead of collapsing into their - parent generic), keeping every current effective id that is unambiguous. -2. **Per-vendor PRs, worst-first**: Qidi → Flashforge → Elegoo → Prusa → Cubicon → Anycubic → - InfiMech → Snapmaker → the long tail (22 vendors, mostly 1-8 one-line fixes). Each PR flips - that vendor into CI's `-f` scope (`check_profiles.yml` currently `-v BBL -f`; append - vendors as they reach zero; when all are in, drop `-v` and run tree-wide). -3. **Delete the ratchet allowlists** once tree-wide zero holds; checks become hard rules for - everything born after the snapshot. - -### Migration-script contract (from the adversarial pass — important) - -- Consumes from the classification only: group membership, fix category, keep-id precedence, - inherits-repoint targets. **All replacement id values are recomputed via the mint** — id - literals in analysis notes (e.g. `GFA00_02`, `GFS98`, `GFG96`) are legacy-culture artifacts - and are ignored with a warning; assert no emitted id matches `^(GF|QD_|P[0-9A-Fa-f]{7}$)`. -- **Family-atomic**: re-idding any preset re-ids every same-family sibling in the same commit, - even siblings outside the collision group (FlyingBear `GFB99 @S1` vs `@Ghost7`); Prusa is - family-atomic per material (its HF/CF families span frozen `_N`-suffix ids — freeze what's - unambiguous, mint once per family for the colliding members). -- **Diff bound**: a vendor migration PR may only touch collision-group files + same-family - siblings of re-idded presets; every id that is per-printer-unambiguous today stays - byte-identical. -- **Config-equivalence gate**: dump every instantiated preset's flattened effective config on - main and on the PR head; the diff must be empty except `filament_id`/`inherits`/ - `compatible_printers` edits the plan prescribes (this is what makes the Flashforge - shadow-file conversions safe: each id-less `fdm_filament_*` shadow becomes a named vendor - family root carrying its config byte-for-byte, children re-pointed, then the shadow name - retired). -- **No deletions**: redundant presets (Flashforge's byte-identical `Generic X`/`Flashforge X` - twins) are re-minted, not dropped; consolidation with `renamed_from` is a separate, - human-reviewed cleanup. -- Expected user impact: none for inheriting user presets, 3mfs, Klipper/Creality/Snapmaker - sync. Residue: user *root* presets that copied an old system id keep it forever - (AMS auto-match falls back to generic-by-type — low severity, unavoidable from the repo). - -### Vendor-specific notes (from classification) - -- **Qidi (97)**: three profile generations. `QD_*` generics are correct and frozen; the fix is - the brand families (Bambu/HATCHBOX/Overture/PolyLite/Tinmorry/QIDI-brand) that all carry - `GFB99/GFG99/GFL99`. Multi-root families are the norm (`...@Q2-Series` / `@Q2C-Series` / - `@X-Max 4-Series` bases) — same mint lands in every series root of one family. -- **Flashforge (69)**: two umbrellas (`FFG01` ~140 presets; `GFB99/GFG99/GFL99` G3U-era) + - OFL-riding branded presets + shadow-file conversion (above). -- **Elegoo (37)**: single mistake — every commercial variant inherits the material-class - `@base` (`EB00`); mint one id per product line (Silk/Matte/PRO/Rapid/…), roots exist. -- **Prusa (31)**: HF product lines need their own roots; ids move off `fdm_filament_*` - templates; frozen name-shaped and `_N` ids stay. -- **Sovol (6)**: delete the wrong own-id lines; correct ids flow from OFL by inheritance. -- **Cubicon (17)**: `@base` presets are themselves instantiated + over-claiming; 9 file edits. - ---- - -## 6. Concrete work items (PR-sized) - -1. `scripts/assign_filament_ids.py` + mint function + tests (incl. the 14-group regression set - from the adversarial pass). *(new)* -2. `orca_extra_profile_check.py`: checks §3.4-1..6 in ratchet mode + snapshot/ledger files; - drop the BBL/OFL-only gate at `:292` and the OFL skip at `:601`. *(extend)* -3. C++ validator: OFL-aware `check_duplicate_filament_subtypes`; runtime ambiguity warning at - the two `find_if` sites. *(small)* -4. Rule documentation: `doc/developer-reference/filament_id.md` (recreate the path; wiki - cross-link) + profile-PR template checkbox ("new materials: no filament_id key anywhere; CI - prints the minted id"). *(new)* -5. OFL migration PR (phase 1). -6. Per-vendor migration PRs (phase 2), each widening CI `-f` scope. - -The audit tooling from this analysis (loader-faithful resolver; reproduces the validator -1256/1256) is in this session's scratchpad (`audit_filament_ids.py`) and is the natural seed -for items 1-2. - -## 7. Evidence & methodology - -- Validator ground truth: `OrcaSlicer_profile_validator -f` tree-wide → 1256 errors; audit - script reproduces exactly (356 logical groups after dedup by (vendor, id, preset-set)). -- Code analysis: 5 parallel agents over runtime consumers, persistence/migration surface, - loader semantics, Bambu grammar, and convention history — all claims carry `file:line`. -- Classification: 37 agents (one per vendor chunk) reading actual profile JSONs; 14-sample - independent re-derivation found 1 substantive error (a Flashforge group mislabeled - `missing_id`; corrected — the loader resolves those ids from OFL). -- Design: 3 independent designs → 2 judges (both chose the deterministic mint; scores 58/50/56 - and 60/54/56) → 3 adversarial attackers (35 scenarios; every `breaks` finding is folded into - §3.2-3.4/§5 as an amendment: declared families, multi-root support, ratchet-not-absolute - checks, no-deletion rule, shadow-file conversion, classification-id-literal quarantine, - diameter siblings, case-insensitive P-hex reservation, fork guidance). -- Key history: `OGF*` born 2025-03-31 (`8c4a65e3e1`, no PR); `_##` suffix born PR #9739; - 8-char check born PR #9574; wiki (with the id-copy-paste example) removed 2025-11-24 - (`f0d79b99eb`). - -## 8. Open decisions for maintainers - -1. **Id format**: opaque deterministic `OF*` mint (recommended, judges 2/2) vs mnemonic - registry grammar (runner-up). Everything else in the plan is format-agnostic. -2. **Multi-vendor brands** (Snapmaker ships Fiberon with authentic `GF*` ids): sanction via - `shared_catalog` (recommended, low churn) vs hoisting those families into OFL. -3. **Benchy-style demo presets**: mint ids per demo preset (recommended) vs teaching the - validator `compatible_prints` gating. -4. **Alias alignment**: fix the 10 live alias-mismatch OFL duplicates by rename-to-alias - (better long-term, needs `renamed_from`) vs minting vendor ids (safer, more ids). -5. **Where the rule doc lives**: in-repo `doc/` (recommended — CI messages need a stable link) - vs wiki-only. diff --git a/filament_id_plan_v2.md b/filament_id_plan_v2.md deleted file mode 100644 index b5bf0f1c65..0000000000 --- a/filament_id_plan_v2.md +++ /dev/null @@ -1,314 +0,0 @@ -# filament_id plan v2: the `get_filament_id` (P+md5) proposal, validated - -> **Status note:** the verdict in §0-§4 and §7-§8 stands. The work items in §5 are -> superseded by `filament_id_plan_v3.md` (OFL-as-catalog, content-addressed triple key, -> succession ledger): W1/W3 are carried into v3.0, W2/W5 carry unchanged, W4 is dropped. - -Follow-up to `filament_id_plan.md` (v1, implemented on `feature/filament_id`: deterministic -`OF*` mint + snapshot ledger + 30-vendor migration, tree-wide validator `-f` = 0). - -**Proposal under review:** mint system `filament_id`s with the scheme of -`static std::string get_filament_id(std::string vendor_typr_serial)` -(`src/slic3r/GUI/CreatePresetsDialog.cpp:487-552`) — Bambu's user-custom-filament id -allocator — so system ids are "compatible with Bambu AMS sync". - -Every claim below was verified in source (`file:line`), against upstream BambuStudio, or in -primary online sources (URLs in §8). Verdict first, evidence after. - ---- - -## 0. Executive summary — the verdict - -**Do not re-mint system ids as `P+md5(name)`. Keep the v1 `OF*` mint.** Three facts decide it: - -1. **The AMS/device path never validates id *shape*.** `tray_info_idx` is an opaque string - end-to-end: sent verbatim (`DeviceManager.cpp:1642`), parsed verbatim - (`DevFilaSystem.cpp:512-514`), and firmware persists arbitrary bytes — an A1 stored and - echoed a *corrupted* id `Pde2\xea58c` (bambulab/BambuStudio#5436). A P-shaped system id - is not "more acceptable" to the device than an `OF*` one. -2. **P-shape buys zero recognition.** The printer resolves tray ids only against its built-in - `GF*` catalog plus the *account's* cloud custom-filament cache (official Bambu wiki); ids - it cannot resolve round-trip as `?`. Orca can never upload system presets into that cache - (`Preset.cpp:2071` gates cloud upload on `is_user()`), so an Orca system `P` id shows `?` - exactly like an `OF` id. The public catalog id space is 100% `GF*` (ha-bambulab - `filaments.json`: 86/86 ids). -3. **P-shape is the one shape the codebase punishes.** The *only* id-shape dispatch in the - entire tree is `MachineObject::check_ams_filament_valid` + `update_filament_list` - (`DeviceManager.cpp:5335/5352/5395/5410`, gate `setting_id.size()==8 && [0]=='P'`), a - user-custom lifecycle reconciler that **remotely wipes an AMS tray** - (`command_ams_filament_settings(..., "", "", white, "", 0, 0)` at `:5345`) or rewrites its - temps (`:5361-5367`) when a P-shaped tray id drops out of the user-root preset list - (`:5219`, armed at `:5268`). Name-keyed minting makes system id == user-custom id *by - design* (same name → same id), so "user deletes their now-redundant custom after the - system preset ships" becomes a remote tray wipe. `GF*` (wrong length) and `OF*` (wrong - first char) are structurally immune. - -The proposal's *real* value lives in two places, and v2 captures both without the re-mint: - -- **The adopt step** (the function's first branch, `:509-511/:526-528`): same base name → - same id. In-app, this already gives Orca-local convergence today — a user custom named - like a system family adopts the system id *whatever its shape*. At authoring time, the - same semantics = the v1 `shared_catalog` mechanism; §5/W4 extends it (curated, optional) - to let byte-authentic Bambu-catalog families carry authentic `GF*` ids. -- **The hash step belongs to user space.** `P+md5(name)` is Bambu's allocator for *user* - presets; the community is already asking for it there (OrcaSlicer PR #13315, unique ids - for inherited user presets). §5/W5 endorses that lane. System profiles stay out of the - `P` namespace — and v2 adds client hardening (W1) because ten *already-shipped* system - P-hex ids (Cubicon `P510cf**`×8, Ginger `P510eff9`, Artillery `Pfcf9c4c`) sit inside the - wipe-gate's shape match today. - -Judge panel (3 independent lenses over 4 variants; §7): keep-`OF*` won 23/40 aggregate -(device-ecosystem 6, identity-semantics 8, migration-enforceability 9) vs full Bambu -emulation 11, hash-only name-keyed 12, vendor-scoped P-hash 12. The single dissent -(device-ecosystem, favoring adoption) is honored by W4; its own verdict on the shape was -"adopt the semantics, not the costume". - ---- - -## 1. What the proposed generator actually is (verified) - -`get_filament_id(vendor_typr_serial)` (`CreatePresetsDialog.cpp:487-552`), called with -`" "` (`:1128`, `PLA-AERO`→`"PLA Aero"`), and per-preset with the -display base name when cloning presets for a user-created printer -(`Preset.cpp:2785-2803` → `:2798-2800`): - -1. **Adopt:** scan a temp bundle of *every* vendor bundle on disk - (`PresetBundle::load_system_filaments_json`, `PresetBundle.cpp:2342-2391`) plus the - user's presets, then the live bundle (`Preset.cpp:2831-2842`); if any preset's base name - (`name.substr(0, first('@') - 1)`) equals the input and its id ≠ `"null"`, **return that - id** — which can be `GF*`, `QD_*`, `OF*`, or another user's P-hex. -2. **Mint:** `"P" + md5(input)[0:7]`, lowercase hex over the raw UTF-8 bytes (`:533`, - `:480`). -3. **Collide:** if the id is held by a *different* name, re-hash with a local wall-clock - salt (`md5(input + get_curr_time())`, `:547`) — non-deterministic by construction. - -Upstream parity: the function and its caller input construction are **byte-identical** in -BambuStudio master (`CreatePresetsDialog.cpp` L434-499 / L1061; diff empty, fetched -2026-07-03). So identical dialog inputs in BBS and Orca yield identical ids — the kernel of -the proposal's compatibility claim. - -Reproduction limits (why "exactly the approach" cannot be ported to system minting anyway): - -- The base-name parser truncates names lacking a space before `@` (`"Afinia PLA@HS"` → - `"Afinia PL"`); 48 shipped presets hit this, and the *clone* path parses differently - (`" @"` two-char, `Preset.cpp:2792`), so the app itself is internally inconsistent. -- 597 presets (361 whole families, e.g. all of Anker) contain no `@` and are invisible to - the adopt scan and its collision map (`:505-508`). -- The collision salt is wall-clock time — unreproducible across machines, so id values - cannot be CI-verified from names; a ledger would still be the sole source of truth. -- Shipped P-hex ids don't round-trip from names today: Cubicon `P510cfb0` ≠ - `P+md5("Cubicon ABS")` = `Pc624b68` (verified) — so even Bambu-lineage P ids are not - name-derivable in practice. - -## 2. What Bambu AMS sync actually consumes (verified) - -- Send: `command_ams_filament_settings` puts the preset's `filament_id` verbatim into - `tray_info_idx` (`DeviceManager.cpp:1642`); cloud vs LAN differ only in transport - (`:2502-2536`). No client- or firmware-side rejection path exists; the ack parse stores - whatever the printer echoes (`:3808-3860`). -- Resolve (slicer side): tray id → first compatible root preset with equal `filament_id` — - system *and* user roots, no shape filter (`PresetBundle.cpp:3151`, `:3252-3254`); misses - fall back by `"Generic "` name, then similarity, then keep-previous - (`:3157-3169`, `:3260-3305`). `setting_id_to_type` resolves against `is_system` presets - only (`DeviceManager.cpp:2538-2559`) — a system preset resolves *because it is system*, - never because of its id shape. -- Resolve (device side): built-in `GF*` catalog + the account's cloud custom cache; - custom-filament sync is **cloud-only** (not LAN), and an id the printer has no data for - displays `?` until opened once on the printer screen (official wiki, §8). Third-party - consumers see customs as "unknown" (ha-bambulab #466/#540). -- Since Jan 2025, AMS configuration is gated behind Bambu-signed clients on new firmware - (Developer Mode / older firmware exempt) — any AMS-sync benefit for Orca is conditional - on that regardless of id scheme (Bambu authorization blog, §8). -- Orca already ships non-`GF`/non-`P` shapes to Bambu trays in the field: OFL presets are - compatible with every printer (`PresetBundle.cpp:5681-5684`) and carry `OGF*`/`OFL*` ids - (e.g. `OFLSBS99`, hardcoded in `MoonrakerPrinterAgent.cpp:654`). The premise "the - ecosystem has only ever seen `GF*`/P-hex" is already false, with no observed rejection. - -**Cross-client reality check.** The name-keyed benefit ("a BBS-created custom named like an -Orca system preset lands on the same id, so Orca's sync matches the system preset") is -mechanically true but narrow: it needs byte-exact names (including the `PLA Aero` mapping -and single spacing), the unsalted hash path, cloud mode, and permissive firmware. The -symmetric case already works in Orca *without* any re-mint: an Orca user creating a custom -named like a system family **adopts the system id** via the in-app adopt branch, so local -custom ↔ system ↔ tray matching is shape-independent today. - -## 3. The disqualifying finding, in mechanism form - -`update_filament_list` (`DeviceManager.cpp:5208-5272`) snapshots `{filament_id → temps}` -over **user root presets only** (`preset.is_user() && preset.inherits() == ""`, `:5219`); -ids that vanish or change temps between snapshots are armed into `checked_filament` -(`:5268`). `check_ams_filament_valid` (`:5311-5445`) then, for every AMS/virtual tray whose -`setting_id` matches `size()==8 && [0]=='P'`: - -- id armed and **not** in the current user-root list → remotely **clears the tray** - (`:5335-5349`, `:5395-5408`); -- id armed and in the list with unequal temps → **rewrites tray temps from the user - preset**, ignoring same-id system presets (`:5352-5374`; `PresetBundle.cpp:3719` skips - non-user presets; unguarded `find()->second` at `:3717`). - -Failure scenario under the proposal: system `"PolyLite PLA"` ships with -`P+md5("PolyLite PLA")`. A user's same-named custom (BBS- or Orca-created — same id by -design) is on an AMS tray. The user deletes the now-redundant custom. Next status refresh: -the id is armed, absent from user roots → Orca wipes the tray, even though the system -preset still resolves that id perfectly. Runs continuously (`StatusPanel.cpp:3275-3277`). - -Two corollaries independent of the proposal (→ W1): - -- The ten shipped P-hex **system** ids (Cubicon/Ginger/Artillery) already pass the shape - gate; only the "id must transit a user root" arming condition protects them, and the - in-app adopt branch can create exactly that transit today. -- `assert(it->first.size() == 8 && it->first[0] == 'P')` (`:5252`) is violable today: a - user custom named `"Bambu PLA Basic"` adopts `GFA00` onto a user root and aborts debug - builds. - -## 4. Identity costs the re-mint would add (quantified, tree dry-run) - -- 1148 distinct family base names; **198** appear in 2+ vendors; **159** groups carry ≥2 - distinct ids today and would silently merge under name-keying (Generic PETG alone: 15 - ids today). 112 involve BBL; 82 are `GF↔OGF` mirror pairs. -- **4** cross-vendor groups share a name across materially different `filament_type` - (Generic PLA Silk, Generic PETG-CF, Generic PA6-CF, Generic PE-CF) — one merged id would - feed wrong type/name/vitrification to the global unscoped consumers - (`PresetBundle.cpp:690-733`; `DeviceManager.cpp:2538`; `FilamentGroup.cpp:513-519`) (→ W3). -- 33 deliberately-split families on the branch would re-merge (25 Elegoo-vs-OFL pairs, 7 - FlyingBear-vs-InfiMech "Other *" pairs, the salted Cubicon PC pair) — undoing v1 - decisions that the fixture gate forced. -- Renames become id migrations: name-keyed ids re-key on any marketing rename; the ledger - can freeze them, but then name-derivability — the scheme's selling point — dies family - by family. The `OF*` key (`vendor/family`) survives display-name churn. -- Entropy drops 35.7 → 28 bits (still 0 collisions at today's 1148 names; ~0.75 expected - at 20k). Re-mint surface: 391 unshipped ids across 1327 files, 13 hardcoded tests, the - reserved-namespace policy inversion, and a retired-ledger rebuild. - -## 5. Work items (delta from `feature/filament_id` HEAD) - -**W1 — client hardening (C++, small, ships with the migration PR train).** - a. Skip the tray-reset and temp-rewrite in `check_ams_filament_valid` when **any - `is_system` filament preset carries the tray's id** — no compatibility filter, - mirroring the semantics of the global consumers (`get_filament_by_filament_id`, - `setting_id_to_type`). This protects the ten shipped P-hex system ids and any BBS - custom colliding with them, while ids resolving only to user presets (or to nothing) - keep today's cleanup behavior. - b. Relax the debug assert `DeviceManager.cpp:5252` to a log (user roots legitimately - carry adopted `GF*`/`OF*` ids). - c. Guard `PresetBundle.cpp:3717` (`find()` unchecked before `->second`). - d. Regression-check that AMS sync never clears trays whose id it merely cannot resolve - (OrcaSlicer#4431 class): the keep-previous fallbacks at `PresetBundle.cpp:3163-3169`, - `:3296-3305` must cover the UI paths. - -**W2 — tooling + doc guardrails.** - a. Document `^OF[0-9A-Za-z]{6}$` as the system-mint namespace. **Do not add it to - `reserved_space_owner`** (`scripts/assign_filament_ids.py:394-402`): check 6 exempts - only snapshot-grandfathered claims and the `--update-snapshot` refusal gate - (`:596-621`) would then reject every *future* mint. The space is already enforced — - check 3 (mint conformance, `:488-509`) errors on any OF-shaped id that does not equal - its own family's mint (covered by `test_check3_of_id_must_match_mint`), and the - snapshot diff is the human gate. Add one doc paragraph + a test asserting a foreign - vendor claiming another family's OF id fails check 3. - b. `doc/developer-reference/filament_id.md`: add a "why not P-hex" section citing the - `DeviceManager.cpp:5335` gate and the account-cache resolution model — community - pressure toward `P+md5` exists (PR #13315) and will recur. - c. Document that user roots may legitimately hold adopted system ids (incl. what that - means for cloud upload, `Preset.cpp:1874-1876`), matching BBS behavior. - -**W3 — data hygiene: the 4 same-name-different-type groups.** Audit each (they confuse - name-based fallback matching and any future interop even under vendor-scoped ids): - verify whether the divergent `filament_type` is a data bug (e.g. OFL `Generic PETG-CF` - resolving `PETG`, OFL `Generic PE-CF` resolving `PE`, Flashforge `Generic PLA Silk` - mixing `SILK`+`PLA`, Creality-vs-Elegoo `Generic PA6-CF` as `PA-CF`/`PA6-CF`) or - intentional; fix by type alignment or rename with evidence, gated by - config-equivalence (only `filament_type` diffs as prescribed) + full validator suite. - -**W4 — optional, curated GF adoption (the proposal's adopt step, done safely).** Extend the - v1 `--allow-shared-catalog` mechanism into an explicit per-family adoption worksheet: a - family may carry a byte-authentic Bambu catalog id iff (i) it is verifiably the same - commercial product as the BBL family (vendor evidence + equal `filament_type`), (ii) - validator `-f` stays 0 tree-wide (alias shadowing covers BBL/OFL overlaps), (iii) the - fixture gate passes, (iv) the snapshot diff records the adoption. Candidates: the 13 - actionable BBL-overlapping families minted `OF*` in v1 (e.g. Qidi `Bambu ABS`→`GFB00`, - `PolyLite PLA`→`GFL00`, `Overture PLA`→`GFL04`, `PolyLite ABS`→`GFB60`; `OFLSBS99` is - shipped and frozen; the two type-hazard OFL families are excluded until W3 lands). - **Honest benefit statement:** these presets are compatible only with non-Bambu printers, - so no Bambu device resolves their ids today; the payoff is one-product-one-id coherence - for the global consumers, project portability, and readiness for W6. Recommended seed: - the four Qidi brand families; generics deferred. - -**W5 — user-preset lane (where the proposal's hash belongs).** Support unique ids for - inherited user presets (the PR #13315 pain: children share the parent's id, so AMS always - resolves the generic parent). `P + md5(preset name)` matching - `CreatePresetsDialog::get_filament_id` is correct *in user space*: adopt-first against - existing ids, then hash; ids frozen per preset after mint. Constraints: never emitted - into system profiles (W2a makes that mechanical); W1 must land first so shared-id - lifecycles can't wipe trays. - -**W6 — recorded future option:** SoftFever's "upload OrcaSlicer's filament database - (especially the filament ID) to the printer" (PR #12724 comment). If pursued, Orca ids - become first-class device-visible artifacts and the P-mimicry question is permanently - moot; the `OF*` scheme is the *better* citizen there (collision-free vendor-scoped ids, - no user-custom masquerade). - -Unchanged from v1: mint rule, snapshot/retired ledgers (no OF retirement — nothing is -re-minted), CI wiring, migration commits. `filament_id_plan.md` remains the implemented -baseline; this document records the v2 decision and its follow-on work. - -## 6. Gates (per work item) - -Same battery as v1, all local: `python scripts/orca_extra_profile_check.py` exit 0; -`assign_filament_ids.py --check` exit 0 (46+ unit tests green; new tests for W2a -reservation and, when implemented, W4 adoption sanctioning); validator `-l 2` exit 0, -`-f` tree-wide exit 0, `-r` BBL+Qidi exit 0; custom-preset fixture overlays (the W1/W4 -changes touch exactly the preset-visibility machinery the fixtures exist to protect); -config-equivalence: flattened effective configs differ only in prescribed keys -(`filament_id` for W4, `filament_type` for W3, none for W1/W2). W1 additionally needs a -manual AMS smoke test on a live Bambu printer (tray set/clear round-trip) — a release -checklist item, not CI (the workflows have no hardware runners). - -## 7. Scheme comparison (judge panel record) - -| Variant | Device lens | Identity lens | Migration lens | Σ | -|---|---|---|---|---| -| V1 full Bambu emulation (adopt incl. `GF*` + P+md5 + salt) | 7 | 2 | 2 | 11 | -| V2 hash-only name-keyed `P+md5(base name)` | 4 | 4 | 4 | 12 | -| V3 vendor-scoped P-hash (`P+md5(vendor/family)`) | 2 | 5 | 5 | 12 | -| **V4 keep `OF*` uuid5 vendor-scoped (chosen)** | 6 | 8 | 9 | **23** | - -All three judges answered the pivotal question the same way: the P-hex **shape** confers no -device/cloud benefit (resolution is by value against catalog + account cache; the path is -otherwise shape-agnostic) and is the only shape with a destructive client-side gate. V3 is -strictly dominated (all of the re-mint cost, none of the name-keyed benefit). V1's genuine -half — GF adoption — is captured by W4 at zero re-mint cost. - -## 8. Evidence index - -Code (this branch): `CreatePresetsDialog.cpp:487-552,1128,2798-2800` (generator + callers); -`DeviceManager.cpp:1642` (verbatim send), `:2538-2559` (system-only type resolve), -`:5208-5272` (user-root snapshot, `:5219`, `:5252` assert, `:5268` arming), `:5311-5445` -(P-shape gate + tray wipe `:5335/:5345`, temp rewrite `:5352-5374`, virtual tray -`:5395-5435`); `DevFilaSystem.cpp:512-524`; `PresetBundle.cpp:690-733,3116-3128,3151, -3252-3254,3709-3767,5674-5753`; `Preset.cpp:1874-1876,2071,2785-2842`; -`AMSMaterialsSetting.cpp:886,894-897`; `WebGuideDialog.cpp:67`; -`PresetComboBoxes.cpp:1952-1966`; `MoonrakerPrinterAgent.cpp:654`; -`scripts/assign_filament_ids.py:69,71-72,118-144,394-402,596-621`. - -Online (fetched 2026-07-03): BambuStudio master `CreatePresetsDialog.cpp` L434-499 -(byte-identical generator); wiki.bambulab.com `create-filament` (custom filaments AMS-able -from firmware 1.6.6; only dialog-created presets sync) and `custom-filament-issue` -(cloud-only sync; unknown ids show `?`); blog.bambulab.com authorization-control (Jan-2025 -AMS-config gating); bambulab/BambuStudio#5436 (firmware persists corrupted id); -OrcaSlicer #4431 (tray clobber to `?`), #3874 (cloud-only confirmation), PR #14459 -(the `-f` invariant), PR #14423 + PR #12724 + PR #13315 (maintainer statements / community -P+md5 pressure); greghesp/ha-bambulab `filaments.json` (86/86 `GF*`) + #466/#540. - -Method: 6 parallel evidence agents (generator semantics; AMS/device path; exhaustive -shape-dispatch sweep; upstream/online; tree-wide dry-run over 5892 presets / 1455 families; -branch change inventory) → 3-judge panel (device-ecosystem, identity-semantics, -migration-enforceability lenses). Dry-run artifacts: session scratchpad -`phex_dryrun_{summary,details,followup}.json`. - -## 9. Open decisions for maintainers - -1. **W4 scope**: none / 4 Qidi brand families (recommended) / + generic-tier re-adoption. -2. **W5 timing**: implement in-repo vs review upstream PR #13315 with the W1 hardening as a - prerequisite either way. -3. **W6**: pursue the filament-database-upload design (makes Orca ids device-visible and - ends the mimicry debate for good). diff --git a/filament_id_plan_v3.md b/filament_id_plan_v3.md deleted file mode 100644 index 14b547600f..0000000000 --- a/filament_id_plan_v3.md +++ /dev/null @@ -1,213 +0,0 @@ -# filament_id plan v3: OFL as the catalog, content-addressed product ids - -Supersedes §5 of `filament_id_plan_v2.md` (whose P+md5 verdict stands unchanged) and -revises the mint rule of `filament_id_plan.md` (v1, implemented on `feature/filament_id`). -Decision driver: v1's mint key scoped families to the *profile bundle* (printer brand), so -one commercial product tuned in N bundles carries N ids — e.g. PolyLite PLA ships in five -bundles (`BBL`, `OrcaFilamentLibrary`, `OrcaArena`, `Qidi`, `Snapmaker`), all with -`filament_vendor: "Polymaker"`, under up to five different ids (`GFL00`, `OFceJcLf`, …). -That contradicts what `filament_id` means: one id per commercial product line. - -## 0. The architecture - -Three tiers, two frozen islands: - -1. **BBL island — untouched.** Bambu profiles keep their `GF*` catalog ids byte-for-byte - (device/RFID/cloud contract). No convergence between GF and OFL ids is attempted: the - same product may permanently carry `GFL00` on the BBL side and an `OF*` id everywhere - else. This is a deliberate trade for simplicity; v2's curated-GF-adoption (old W4) is - dropped. -2. **`QD_*` island — untouched.** Qidi's box builds `QD___` from - device enums and requires exactly-matching presets (`QidiPrinterAgent.cpp:146-152`). - Qidi presets carrying `QD_*` are exempt from re-minting, forever. -3. **Everything else converges on OrcaFilamentLibrary.** OFL is the product catalog: a - material family's id is declared once, on its OFL family root. Vendor bundles carry - only per-printer *specializations* of OFL families — same base name, non-empty - `compatible_printers`, **no `filament_id` key** — which (a) alias-shadow the OFL preset - on the printers they claim (`Preset.cpp:3684-3714`: "Generic PLA @Qidi Q2 0.4mm nozzle" - hides "Generic PLA @System" on that machine) and (b) resolve the OFL family's id - through the loader's inherits/base-bundle walk (`PresetBundle.cpp:4842-5080`). Products - OFL does not (yet) carry mint their id in the vendor bundle **with the same rule**; - because the key is bundle-independent (§1), later hoisting the family into OFL never - changes its id. - -Convergence therefore happens by *single declaration point*, not by copying ids across -bundles — no adoption registry, no cross-bundle id claims to curate. - -## 1. The mint rule - -``` -triple = (filament_vendor, filament_type, family_name) # from the family ROOT's flattened config -key = "filament_product///" -id = "OF" + base62_6( uuid5( FILAMENT_ID_NAMESPACE, key ) ) # namespace unchanged: - # c4d3ff49-4c32-5534-a3e3-00894157ab97 -``` - -- **Triple resolution.** All three values come from the family root preset's *flattened - effective config* (`filament_vendor` and `filament_type` are inheritable list options — - take the first element; family_name = the root's base name, `\s?@.*` stripped once). - For own-key-layout families (no root), each declaring preset's flattened config is used - and CI requires all declarers of one family to agree on the triple. A root that resolves - an empty `filament_vendor` or `filament_type` is a CI error (generics use `"Generic"`). - Values enter the key verbatim (UTF-8, no case folding). -- **Bundle-independent by design.** The key contains no bundle name, so the same product - yields the same id whether minted in OFL or in a vendor bundle; migrating a family into - OFL (§0.3) is id-stable. Two bundles independently adding the same triple converge - automatically — and that is correct, because equal (vendor, type, name) *is* the - definition of "same product" here. The known look-alike hazards stay separated by the - type component: the 4 same-name-different-type groups (Flashforge `Generic PLA Silk` as - SILK, OFL `Generic PETG-CF` as PETG, `Generic PA6-CF`, `Generic PE-CF`) hash apart until - their type bugs are fixed (§5, W3) and converge automatically after — self-healing that - pure name-keying (rejected in v2) could not provide. -- **Format and salt unchanged from v1**: 8 chars, `OF` + 6 base62; deterministic `/1`, - `/2`… salt past any taken or retired id (the O+7 widening was evaluated and rejected: - 62⁶ expects 1.9×10⁻⁵ collisions at today's 1,455 families, and `^O.{7}$` would sweep 35 - legacy ids into the conformance gate vs. one today). -- **Content-addressed, deliberately.** If any triple component changes — a family rename, - a `filament_vendor` correction, a `filament_type` fix — the id changes with it. This - *replaces* v1's "ids are immutable once shipped" with "ids are derivable from the - product identity, and identity changes are migrations" — made safe by the succession - ledger (§2). `renamed_from` still gates preset-name compatibility as before. -- CLI: `--mint "Polymaker/PLA/PolyLite PLA"` prints without touching the tree; running - the script plain inserts missing ids; CI errors print the expected id. - -## 2. The succession ledger (the amendment that makes this safe) - -Shipped ids are referenced outside the tree: AFC/Klipper lane data, Bambu AMS trays -holding OFL-only materials, on-device PA-calibration records, user-root preset copies, -3mf `slice_info`. Retiring an id without a forwarding pointer downgrades all of those to -`Generic ` fallbacks. Therefore: - -- **Schema.** `scripts/retired_filament_ids.json` entries become objects: - `{"retired": {"OGFL99": {"claims": [...], "successor": "OFxxxxxx"}}}`. Append-only as - before; a successor may itself be retired later (chains allowed, cycle-checked, and - followed to the live end). A retired id may never be minted again (check 4 unchanged). - Cross-island *hint* entries are permitted for ids Orca cannot retire because another - island owns them (e.g. `GFL99 → `): consulted only when no live - preset matches, so BBL installs still resolve `GFL99` natively first. By the same - principle, an id in a foreign island's space (`GF*`/`QD_*`) that vanishes from the tree - is **released with a hint, never retired** — the island's catalog owns it and may - legitimately (re)ship it later, which check 4 must never block. (Implementation - amendment, v3.0: `--update-snapshot` routes such ids to `hints` automatically; hint - keys may be absent from the tree.) -- **Shipped and consulted at runtime.** The ledger ships in `resources/`; a small helper - (`resolve_filament_id_succession(id)`) follows the chain and is consulted **only on - resolution miss**, before the `Generic ` name fallback, in: - `PresetBundle::get_filament_by_filament_id` (covers `DevFilaBlackList`, `SelectMachine` - warnings, `Plater` tray configs in one place), the AMS sync match predicates - (`PresetBundle.cpp:3151`, `:3252-3254` miss paths at `:3157-3169`/`:3260-3305`), - `PresetComboBoxes::add_ams_filaments`, `MachineObject::setting_id_to_type` - (`DeviceManager.cpp:2545` miss branch), calibration-history name lookup - (`CaliHistoryDialog.cpp:62`), and the #14423 Moonraker lane matching when it lands. - With this in place the OFL re-mint is near-residue-free and every future - content-addressed rename stays safe. -- **Kill the hardcoded generic map.** `MoonrakerPrinterAgent::map_filament_type_to_generic_id` - (`MoonrakerPrinterAgent.cpp:608-658`) hardcodes 23 OFL ids (`OGFL99`… `OFLSBS99`). - Replace it with a runtime lookup of the OFL generic preset by name ("Generic PLA - @System" → its current id), removing the code↔profile lockstep permanently. (This also - releases `OFLSBS99`, v2's one frozen OF-shaped legacy id, for normal re-minting.) - -## 3. Validation rule changes - -- **Check 3 (mint conformance)** becomes a pure function of the root's triple: a non-BBL, - non-`QD_*` id must equal `mint(triple)` ± salt, or be snapshot-grandfathered (the - grandfather set shrinks to ≈ nothing for non-BBL once migration completes). -- **Check 5 (alias hygiene) generalizes and becomes load-bearing.** For *every* - OFL-carried family (not just `Generic * @System`): a vendor specialization must keep the - OFL base name (else the OFL preset un-shadows and creates a live per-printer duplicate — - v1's P7 pattern) and non-empty `compatible_printers`, and must not declare an id. The - C++ validator's OFL-aware `-f` (`PresetBundle.cpp:5674-5753`) already enforces the - runtime consequence; the script check names the rename as the cause. -- **New check 8 (triple integrity):** every id-declaring family resolves a complete, - family-consistent triple; roots missing `filament_vendor`/`filament_type` error. -- **New check 9 (succession integrity):** every retired entry's successor chain ends at a - live tree id (or a documented cross-island hint target); no cycles; retired ids absent - from the tree. -- Snapshot mechanism, reserved spaces (`GF*`→BBL, `QD_*`→Qidi, `P`-hex/`null`→user-custom; - v2's do-not-reserve-`OF*` note stands), and check 1/2/4/7 are unchanged. - -## 4. Migration phases - -**v3.0 — tooling + prerequisites (no profile changes).** New mint + triple resolver -(reuse the flatten machinery), succession schema migration + C++ lookup helper wired into -the §2 miss paths, Moonraker map → runtime lookup, checks 3/5/8/9, tests. Carry v2's W1 -client hardening (skip tray-wipe/temp-rewrite when a system preset holds the id; relax -the `DeviceManager.cpp:5252` assert; guard the `PresetBundle.cpp:3717` deref) — it ships -first regardless. **W3 type fixes land here**, *before* any re-mint: type is now a key -component, so minting before fixing OFL `Generic PETG-CF`/`Generic PE-CF` would re-id -those families twice. - -**v3.1 — OFL re-mint.** Every OFL-declared id re-derives from its triple (mirrors like -`OGFA00`, generics like `OGFL99`, blocks like `OEPLAB00` — all of it); each old shipped id -gains a succession entry pointing at its replacement; the 26 GF-shaped ids OFL declares -(measured at v3.0: only one of them, `GFOT001`, is also declared by BBL) are released to -the BBL island space with hints at the re-minted families — two-island purity. Snapshot -regenerated; full gate battery + fixture overlays (this phase touches preset-visibility -machinery only via ids, but the fixtures are cheap insurance). Implementation notes -(v3.1, executed): OFL generic ids relocate from the fdm_filament_* template bases onto -the product-named "Generic X @System" presets first, so their triples carry the product -name; `fdm_filament_pc` keeps a (transitional) declaration because 7 Prusa presets -inherit it directly — the v3.2 Prusa worksheet re-homes them and deletes it. - -**v3.2 — vendor bundles, worksheet-per-vendor (v1 machinery).** Three sub-cases: - (a) the **391 unshipped v1 `OF*` mints** re-derive under the triple key — no succession - entries (they never shipped; a documented one-time `--forget-never-shipped ` drops - them from the ledger lineage instead of retiring them, since the ledger's rationale — - ids live on in user presets and 3mfs — cannot apply to unreleased ids); - (b) **true generic tunings** riding copied legacy ids (`GFL99`-class) drop their own id - and re-point to the OFL generic family (the v1 Sovol pattern) — their old ids get - cross-island hints where BBL owns them, succession entries otherwise; - (c) remaining **shipped legacy ids** (numeric, name-shaped, pseudo-GF, the 57 - multi-vendor GF residue, the 10 P-hex — everything non-BBL/non-`QD_*`, ~800 ids) - re-mint with succession entries. Retiring the 10 P-hex system ids also removes the last - system ids from `check_ams_filament_valid`'s destructive P-gate. - -**v3.3 — ongoing consolidation (optional, per-vendor, id-stable).** Hoist vendor-unique -products into OFL where a family is genuinely multi-vendor material; thanks to the -bundle-independent key this never changes ids, so it can proceed opportunistically. - -## 5. Gates (every phase) - -`python scripts/orca_extra_profile_check.py` exit 0; `assign_filament_ids.py --check` -exit 0; unit tests green (existing 46 + new triple/succession/adoption tests); validator -`-l 2` exit 0, `-f` tree-wide exit 0, `-r` BBL+Qidi exit 0; custom-preset fixture -archives; config-equivalence — flattened effective configs differ only in `filament_id` -(re-mints), `inherits`/`compatible_printers` (re-points, as prescribed per worksheet), and -the W3 `filament_type` corrections. New for v3: a C++ test that a retired id resolves -through the succession chain in the sync miss path, and a Moonraker test that the generic -map lookup matches the shipped OFL presets. Manual AMS smoke test (tray set → old-id -resolve → clear) stays a release-checklist item. - -## 6. Accepted costs (explicit) - -- **GF ↔ OFL divergence is permanent** for products in both catalogs (PolyLite PLA ≠ - `GFL00` outside BBL). The forward-looking fix is PR #12724-style filament-database - upload, where Orca ids become first-class device artifacts. -- **Renames/type-fixes re-id families** (by design); the succession ledger absorbs the - device/user residue, but each one is still a ledger entry and a snapshot diff to review. -- **User roots** keep whatever id they copied at creation; with succession lookup in - `get_filament_by_filament_id` they now *resolve* instead of dangling — strictly better - than v1's accepted residue. -- **One-time field transition**: devices holding pre-v3 ids (AFC lanes, AMS trays, cali - records) resolve via succession on updated clients; *older* Orca versions and - BambuStudio never resolved OFL-only ids anyway (`?`/generic fallback — unchanged for - them). - -## 7. Open decisions - -1. Whether v3.2(b)'s cross-island hints (`GFL99` → OFL generic) are wanted at launch or - deferred (pure-miss-path feature; zero risk to BBL installs, small review surface). -2. v3.3 pacing: per-vendor PRs opportunistically vs. a dedicated consolidation train. -3. Whether to fold v2's W5 (P+md5 ids for inherited *user* presets, PR #13315) into v3.0's - C++ work or keep it a separate PR (recommended: separate; W1 is its only prerequisite). - -## 8. Evidence - -Carried from v2 §8 (all re-verified this session), plus: `filament_vendor` audit — 49 -distinct strings tree-wide, `"Polymaker"` byte-consistent across all five PolyLite-PLA -bundles; multi-vendor different-family GF residue = 57 ids; `MoonrakerPrinterAgent.cpp: -608-658` = 23 hardcoded OFL ids; mint examples verified live (`Qidi/PolyLite PLA` → -`OFceJcLf` under the v1 key — the fragmentation this plan removes; salt determinism -`OF8afiMO`). Alias shadowing and the OFL id fallback verified at `Preset.cpp:3684-3714` -and `PresetBundle.cpp:4842-5080` during the v1 audit; per-printer `-f` semantics at -`PresetBundle.cpp:5674-5753`. diff --git a/filament_id_plan_v4.md b/filament_id_plan_v4.md deleted file mode 100644 index 046a7cae1c..0000000000 --- a/filament_id_plan_v4.md +++ /dev/null @@ -1,224 +0,0 @@ -# filament_id plan v4: dissolve the Qidi `QD_*` island - -Supersedes §0.2 of `filament_id_plan_v3.md` (the "`QD_*` island — untouched, forever" -decision) and amends every v3 section that carved out `QD_*`. Everything else in v3 — -the mint rule, the succession ledger, the BBL island, checks 1–9 — stands as -implemented (v3.0–v3.2, all gates green at commit `f7c1b290fd`). - -Decision driver: the island contradicts the catalog architecture v3 built. Qidi presets -carry 204 `QD___` ids over 264 declarations (49 families, -measured 2026-08-21) — one commercial product carries up to *five* ids (one per printer -series: `QIDI PLA Rapido` = `QD_0_1_1` … `QD_4_1_1`), which is exactly the -fragmentation v3 exists to remove. The island was frozen because Qidi's filament box -composes these ids from device enums and requires exactly-matching presets -(`QidiPrinterAgent.cpp:146-152`). But v3.0 shipped the machinery that makes freezing -unnecessary: the succession ledger already translates retired ids on resolution miss. -`QD_*` stops being a *preset id space* and becomes a *device protocol namespace*, -translated once at the agent edge. - -## 0. The architecture change - -Two tiers, **one** frozen island: - -1. **BBL island — untouched, unchanged.** All v3 reasoning holds (device/RFID/cloud - contract is external and opaque). -2. **Everything else converges on OFL product ids — now including Qidi.** All 204 - `QD_*` ids re-mint from their family triples and gain **retired** ledger entries - (not cross-island hints: after dissolution there is no island to own them, and - check 4's "never again" is exactly the guard we want against upstream re-adding - them). The box keeps working because `QidiPrinterAgent` resolves its composed - `QD_*` id through `resolve_filament_id_succession()` on miss — the same mechanism - every other retired id already uses. - -Why retire rather than hint (the one real design choice here): hints exist for ids a -*foreign catalog* owns and may legitimately re-ship (`GF*`). Post-dissolution, nothing -may ever re-ship a `QD_*` id in the profile tree — the device composes them at -runtime, the tree translates them. Retired entries make CI enforce that permanently -(`--update-snapshot` refuses resurrections, check 4 refuses occurrences); hints would -permit re-shipping, which is now always a regression. The QD→family mapping is -strictly 1:1 (verified: no `QD_*` id is claimed by more than one family), so the -mode-rule successor is unambiguous for every entry. - -## 1. What the dissolution consists of - -Three independent work packages, ordered for bisectability: - -- **(A) Re-converge the drifted tree** — prerequisite, not Qidi-specific. The - 2026-07 main merge (`f3fa3a34bd`) brought upstream vendor updates in pre-v3 style: - `--check` currently exits with **243 errors** (123 unsanctioned new ids, 46 new - instantiated own-key presets, 31 override drifts, 18 reserved-space claims, 5 - hint-keys re-declared — Qidi re-added `GFB99`/`GFG99`/`GFL99`, Snapmaker re-added - `GFG96`/`GFU99` and even four *retired* ids incl. `OGFL99`, plus Snapmaker U1 - triple errors and a GreenGate3D rename). This is the standing WF-B maintenance - pass; the dissolution's gates cannot go green on a red base. -- **(B) C++ succession hook in the Qidi agent** — safe to land before any data - changes (pure miss-path: while `QD_*` presets still exist, the hook never fires). -- **(C) The dissolution proper** — tooling flip + Qidi data fixes + re-mint + - snapshot/ledger regeneration, one vendor worksheet in the v3.2 mold. - -## 2. Runtime translation (work package B) - -`QidiPrinterAgent.cpp:183-192` currently: compose `setting_id` → keep it if a visible -base preset declares it → else degrade to `filament_id_by_type(tray_type)` (i.e. every -QIDI-brand box slot silently becomes Generic once the ids re-mint). Insert the -succession walk between those two steps: - -```cpp -} else if (!setting_id.empty() && has_visible_base_preset(bundle->filaments, setting_id)) { - tray.tray_info_idx = setting_id; -} else { - // Retired QD_* protocol ids forward to their minted successors via the shipped ledger. - const std::string successor = setting_id.empty() ? std::string() - : resolve_filament_id_succession(setting_id); - if (!successor.empty() && has_visible_base_preset(bundle->filaments, successor)) - tray.tray_info_idx = successor; - else - tray.tray_info_idx = bundle->filaments.filament_id_by_type(tray.tray_type); -} -``` - -`resolve_filament_id_succession` is `Preset.hpp:119` (loads once, cycle-guarded, -empty-safe) — no new includes needed beyond what the file already reaches through -`PresetBundle`. This one hook covers both composition paths: the numeric-series -`build_setting_id` lambda *and* the non-numeric fallback -`map_filament_type_to_setting_id` (`:325-342`), whose four hardcoded returns -(`QD_1_0_1`/`_11`/`_41`/`_50` = Generic PLA/ABS/PETG/TPU 95A) become ledger keys in -package C. Keep that function as-is but extend its comment: the returned ids are -retired ledger keys by design, and `scripts/tests/test_filament_id.py` parses the -initializer (see §4 tests) — the Moonraker treatment (`MoonrakerPrinterAgent.cpp: -619-627`) of replacing the table with name lookups was considered and not taken: the -table already routes through the same ledger as the composed ids, and two translation -mechanisms in one agent is worse than one. - -Tests (same commit): - -- `tests/libslic3r/test_filament_id_succession.cpp`: add a section asserting a - `QD_`-shaped key forwards like any other (`{"QD_2_1_11", "OFnew001"}` resolves to - `"OFnew001"`) — pins that the walk is prefix-agnostic. -- `scripts/tests/test_filament_id.py`: new test parsing the four `QD_` literals out of - `QidiPrinterAgent.cpp::map_filament_type_to_setting_id` (mirror the parser in - `scripts/test_moonraker_lane_data.py`) and asserting each is a ledger key whose - chain terminates at a live tree id. **Add it marked expected-fail/skipped until - package C lands, then flip it on** — it is the permanent code↔ledger lockstep guard. - -## 3. Tooling and validation flip (work package C, first commit) - -All in `scripts/assign_filament_ids.py`; every touched line measured 2026-08-21: - -- `is_island_declaration` (`:327-329`) → `return vendor == "BBL"`. This single change - pulls every `QD_*` declarer into the triple bookkeeping (`:385`) and thus into - checks 3 and 8, into `--remint`'s domain (`:1464`), and out of the hint-key - tolerances (`:877`, `:1100`). -- `reserved_space_owner` (`:596-604`): `QD_*` returns `(True, None)` — reserved, - ownerless, exactly like the P-hex/user-custom space. Consequences, all wanted: - check 6 refuses any future vendor claim; the `--update-snapshot` sanction gate - (`:938-963`) refuses new `QD_*` ids outright; the vanish path (`:994`) routes - `QD_*` to **retired** (owner `None` ≠ island), not released-with-hint. Update the - two message sites that render `owner is None` as "reserved for user-custom presets" - (`:628` docstring, `:958`, and check 6's copy) to name the space generically or - special-case `QD_*` ("Qidi device protocol; dissolved island — retired, never - declarable"). -- Check 1 (`:667-668`): delete the `vendor == "Qidi" and fid.startswith("QD_")` - exemption. -- Module docstring (`:27-45`): rewrite the `QD_*` bullet — reserved space stays - listed, but as "device protocol namespace, translated via the succession ledger; - dissolved as a catalog island in v4, may never be declared". -- `scripts/tests/test_filament_id.py`: update the three island assertions — - `reserved_space_owner("QD_X4_PLA")` → `(True, None)` (`:403`), - `is_island_declaration("Qidi", "QD_X4_PLA")` → `False` (`:413`), and the - reserved-space message case (`:570`). - -No changes to the ledger schema, the C++ checks, `--retire` (post-flip it accepts -`QD_*` olds automatically — they are non-island now), or the validator: check 3's -"non-BBL, non-`QD_*`" phrasing in v3 §3 was always implemented as "non-island", so the -flip *is* the spec change. - -## 4. Migration phases - -**v4.0 — re-converge the drifted tree (package A).** Per-vendor WF-B worksheets over -the 243 errors: Snapmaker U1 (triple divergence `Generic|Snapmaker|snapmaker`, empty -vendors, four resurrected retired ids — these force re-mints since retirement is -permanent), BBL/addnorth `GF_AN*` overrides (BBL island: grandfather via snapshot, -they are BBL-internal), Qidi/Snapmaker re-declared hint keys (re-mint those declarers, -the check's own prescription), GreenGate3D rename, then `--update-snapshot` (new -upstream `QD_*` ids sanction cleanly — the island is still intact in this phase) and -the full v3 §5 gate battery. Bump `version` in every touched -`resources/profiles/.json`. **Do not start v4.2 until `--check` exits 0.** - -**v4.1 — the agent hook (package B).** §2 as written; `libslic3r_tests` + -`scripts/tests/test_filament_id.py` green; behavior-neutral by construction (no `QD_*` -ledger entries exist yet). - -**v4.2 — the dissolution (package C).** One Qidi worksheet, v3.2 machinery: - -1. Tooling flip commit (§3). `--check` now reports the Qidi island as - non-conformant — expected, red only between commits of this phase. -2. Data fixes, before any re-mint (the v3 "W3 lands first" lesson — type/vendor are - key components): add `filament_vendor: ["QIDI"]` at each QIDI-brand family's - inheritance apex so all declarers resolve it (39 of 49 families currently resolve - none — check 8a would refuse the mint). Verify the six Generic families - (`Generic PLA/ABS/PETG/PC/TPU 95A/PLA Silk`) resolve triples identical to their - OFL counterparts (vendor `Generic`, OFL's `filament_type`) so they *converge onto - the OFL ids* by triple math — the whole point; any mismatch is a W3-style data fix - here, not a fork. No `inherits`/`compatible_printers` re-pointing anywhere: the - series intermediates (`Generic PLA@Q2-Series` etc., all `instantiation: false`) - simply keep declarations whose values become the OFL ids. -3. `python scripts/assign_filament_ids.py --remint Qidi` — rewrites all 264 - declarations in place to their family mints (same triple ⇒ same id across a - family's series intermediates and per-nozzle declarers; convergence with OFL ids - is legal by design, `want_id` already permits same-triple collisions `:1447`). -4. `--update-snapshot` — retires every vanished `QD_*` id with its mode-rule - successor. **Audit the ledger diff: all ~204 new entries must be `QD_*`→non-null.** - A null successor (possible only for a declared-only id with zero instantiated - claims) gets an explicit `--retire "QD_x=OFy"` with the family's minted id. -5. Un-skip the §2 lockstep test. Bump `resources/profiles/Qidi.json` version. Full - gate battery (§5). - -Known residue, accepted: `QIDI PC-ABS-FR` (series 1–2) vs `QIDI PC/ABS-FR` -(series 3–4) are two preset-name families for one product → two ids. Renames were -ruled out in v3 (`renamed_from` rejected for migrations); if upstream ever unifies the -name, content-addressing re-ids and the ledger absorbs it — self-healing, no action -now. - -**v4.3 — OFL consolidation (unchanged).** v3.3 stays optional and id-stable; QIDI-brand -families are vendor-unique and stay in the Qidi bundle. - -## 5. Gates (per phase, delta from v3 §5) - -Unchanged battery: `orca_extra_profile_check.py` exit 0, `assign_filament_ids.py ---check` exit 0, `scripts/tests/test_filament_id.py` all green, `libslic3r_tests` -green, validator `-l 2` tree-wide + `-f` tree-wide + `-v Qidi` exit 0, custom-preset -fixture archives (v4.2 touches no preset visibility, but they are cheap insurance — -run them for v4.0, which touches instantiation-adjacent upstream drift), flatten -config-equivalence. New for v4.2: equivalence diff may contain **only** `filament_id` -value changes (QD→OF) and the added `filament_vendor` keys on QIDI-brand families; -ledger diff audit per §4.4; the map-literal lockstep test. Manual release-checklist -item: Qidi box smoke test — slot holding a QIDI-brand material must surface the brand -preset (not Generic) on an updated client, via the memory-documented local Klipper -test rig. - -## 6. Accepted costs (explicit, new relative to v3) - -- **Every Qidi box slot resolves through the ledger miss-path forever** (one hash-map - walk per slot per status poll — negligible, and structurally identical to how - every retired id already resolves). The QD→OF translation table is maintained by - the retirement machinery, not by hand. -- **Older Orca clients** (pre-v4 profiles) paired with re-minted profile trees lose - QIDI-brand slot matching (they look up `QD_*` and fall back generic-by-type — the - degradation the hook removes for updated clients). Same one-time field-transition - shape v3 §6 already accepted for AMS/AFC ids. -- **Two ids for PC-ABS-FR** until upstream unifies the family name (§4 residue). - -## 7. Evidence - -Measured on this tree 2026-08-21 unless cited to v3: 204 distinct `QD_*` ids / 264 -declaring presets / 49 families, QD→family strictly 1:1, per-series id sets -(`QD_0..4_1_1` = `QIDI PLA Rapido` etc.); 39 families resolve no `filament_vendor`; -declarations live on `instantiation:false` series intermediates (Q2/Q2C/X5/X4) and -per-nozzle X-Plus-4 presets; composition + miss-fallback at -`QidiPrinterAgent.cpp:146-152, 183-192`, hardcoded fallback table `:325-342`; -succession helpers `Preset.hpp:109-119`; ledger = 575 retired + 194 hints, zero `QD_*` -entries; snapshot holds 160 of the 204 (the 44 newcomers are post-merge drift); -`--check` = 243 errors, categorized in §1(A); island exemption mechanics at -`assign_filament_ids.py:327-329, 385, 596-604, 667, 877, 994, 1464, 1514`; `--remint` -same-triple convergence guard `:1447-1453`; retirement-permanence gate `:965-976`. From 417a6d7c30068c2c3e8b48037b20015fb93c41c4 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 1 Sep 2026 11:41:53 +0800 Subject: [PATCH 28/52] add log --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index a2adf3ea5b..ed532e91a8 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -681,6 +681,19 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event) } + // Orca: log the tray payload this dialog hands the printer, so the filament_id resolved from the + // dropdown selection can be checked against the tray_info_idx the AMS actually receives. A + // BBL-tagged (RFID) tray is read-only here, so nothing is published for it. + BOOST_LOG_TRIVIAL(info) << "ams_materials_setting: " << (m_is_third ? "sending" : "NOT sending (BBL RFID tray, read-only)") + << ", ams_id = " << ams_id << ", slot_id = " << slot_id + << ", selected = " << m_comboBox_filament->GetValue().ToStdString() + << ", tray_info_idx (filament_id) = " << ams_filament_id + << ", setting_id = " << ams_setting_id + << ", tray_type = " << m_filament_type + << ", tray_color = " << col_buf + << ", nozzle_temp_min = " << nozzle_temp_min_int + << ", nozzle_temp_max = " << nozzle_temp_max_int; + // set filament if (m_is_third) { obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int); From 6ec904074b1630b2571e493ea2829acbd27b6837 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 1 Sep 2026 16:24:33 +0800 Subject: [PATCH 29/52] Give generic filaments one name and one identity across every vendor --- resources/profiles/Anker.json | 170 +- .../Anker Generic PLA Silk 0.2 nozzle.json | 16 - .../Anker Generic PLA Silk 0.25 nozzle.json | 16 - .../filament/Anker Generic PLA Silk.json | 16 - .../Anker Generic PLA+ 0.2 nozzle.json | 16 - .../Anker Generic PLA+ 0.25 nozzle.json | 16 - .../Anker/filament/Anker Generic PLA+.json | 16 - .../Anker/filament/Anker Generic PLA-CF.json | 16 - .../Anker/filament/Anker Generic PLA.json | 16 - .../Anker/filament/Anker Generic PVA.json | 16 - .../Anker/filament/Anker Generic TPU.json | 16 - ...son => Generic ABS @Anker 0.2 nozzle.json} | 7 +- ...on => Generic ABS @Anker 0.25 nozzle.json} | 7 +- .../filament/Generic ABS @Anker base.json} | 4 +- ...neric ASA.json => Generic ABS @Anker.json} | 7 +- ...son => Generic ASA @Anker 0.2 nozzle.json} | 7 +- ...on => Generic ASA @Anker 0.25 nozzle.json} | 7 +- ...base.json => Generic ASA @Anker base.json} | 4 +- ...c PETG-CF.json => Generic ASA @Anker.json} | 7 +- ...json => Generic PA @Anker 0.2 nozzle.json} | 7 +- ...son => Generic PA @Anker 0.25 nozzle.json} | 7 +- .../filament/Generic PA @Anker base.json} | 4 +- ...Generic PC.json => Generic PA @Anker.json} | 7 +- ...se.json => Generic PA-CF @Anker base.json} | 4 +- ...eric PA.json => Generic PA-CF @Anker.json} | 7 +- ...json => Generic PC @Anker 0.2 nozzle.json} | 7 +- ...son => Generic PC @Anker 0.25 nozzle.json} | 7 +- ...@base.json => Generic PC @Anker base.json} | 4 +- ...eric PA-CF.json => Generic PC @Anker.json} | 7 +- ...on => Generic PETG @Anker 0.2 nozzle.json} | 7 +- ...n => Generic PETG @Anker 0.25 nozzle.json} | 7 +- ...ase.json => Generic PETG @Anker base.json} | 4 +- .../Anker/filament/Generic PETG @Anker.json | 17 + ....json => Generic PETG-CF @Anker base.json} | 4 +- .../filament/Generic PETG-CF @Anker.json | 17 + ...son => Generic PLA @Anker 0.2 nozzle.json} | 7 +- ...on => Generic PLA @Anker 0.25 nozzle.json} | 7 +- ...base.json => Generic PLA @Anker base.json} | 4 +- ...eric PETG.json => Generic PLA @Anker.json} | 7 +- .../Generic PLA Silk @Anker 0.2 nozzle.json | 17 + .../Generic PLA Silk @Anker 0.25 nozzle.json | 17 + ...json => Generic PLA Silk @Anker base.json} | 4 +- .../filament/Generic PLA Silk @Anker.json | 17 + .../Generic PLA+ @Anker 0.2 nozzle.json | 17 + .../Generic PLA+ @Anker 0.25 nozzle.json | 17 + ...ase.json => Generic PLA+ @Anker base.json} | 4 +- .../Anker/filament/Generic PLA+ @Anker.json | 17 + ...e.json => Generic PLA-CF @Anker base.json} | 4 +- .../Anker/filament/Generic PLA-CF @Anker.json | 17 + ...base.json => Generic PVA @Anker base.json} | 4 +- ...neric ABS.json => Generic PVA @Anker.json} | 7 +- ...base.json => Generic TPU @Anker base.json} | 4 +- .../Anker/filament/Generic TPU @Anker.json | 17 + .../Anker/machine/Anker M5 0.2 nozzle.json | 2 +- .../Anker/machine/Anker M5 0.25 nozzle.json | 2 +- .../Anker/machine/Anker M5 0.4 nozzle.json | 2 +- .../Anker/machine/Anker M5 0.6 nozzle.json | 2 +- .../Anker M5 All-Metal 0.2 nozzle.json | 2 +- .../Anker M5 All-Metal 0.25 nozzle.json | 2 +- .../Anker M5 All-Metal 0.4 nozzle.json | 2 +- .../Anker M5 All-Metal 0.6 nozzle.json | 2 +- .../machine/Anker M5 All-Metal Hot End.json | 2 +- .../profiles/Anker/machine/Anker M5.json | 2 +- .../Anker/machine/Anker M5C 0.2 nozzle.json | 2 +- .../Anker/machine/Anker M5C 0.25 nozzle.json | 2 +- .../Anker/machine/Anker M5C 0.4 nozzle.json | 2 +- .../Anker/machine/Anker M5C 0.6 nozzle.json | 2 +- .../profiles/Anker/machine/Anker M5C.json | 2 +- resources/profiles/Anycubic.json | 2468 +++++----- ...ubic ASA @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...bic PETG @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Max 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json | 2 +- ...PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json | 2 +- ... PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.2 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.6 nozzle.json | 2 +- ...ubic PLA @Anycubic Kobra 3 0.8 nozzle.json | 2 +- ...ic PLA @Anycubic Kobra Neo 0.4 nozzle.json | 2 +- ...PLA Glow @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...low @Anycubic Kobra S1 Max 0.4 nozzle.json | 678 +-- ...low @Anycubic Kobra S1 Max 0.6 nozzle.json | 702 +-- ...low @Anycubic Kobra S1 Max 0.8 nozzle.json | 702 +-- ...gh Speed @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...LA Matte @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...c PLA SE @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...PLA Slik @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...bic PLA+ @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...-CF @Anycubic Kobra S1 Max 0.4 nozzle.json | 672 +-- ...-CF @Anycubic Kobra S1 Max 0.6 nozzle.json | 702 +-- ...-CF @Anycubic Kobra S1 Max 0.8 nozzle.json | 702 +-- ...eric ABS @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...ic ABS.json => Generic ABS @Anycubic.json} | 8 +- ...ic ASA.json => Generic ASA @Anycubic.json} | 7 +- ...eric PA.json => Generic PA @Anycubic.json} | 7 +- ...A-CF.json => Generic PA-CF @Anycubic.json} | 7 +- ...eric PC.json => Generic PC @Anycubic.json} | 7 +- ... PETG.json => Generic PETG @Anycubic.json} | 7 +- ...ic PLA.json => Generic PLA @Anycubic.json} | 7 +- ...-CF.json => Generic PLA-CF @Anycubic.json} | 7 +- ...ic PVA.json => Generic PVA @Anycubic.json} | 7 +- ...eric TPU @Anycubic Kobra 3 0.4 nozzle.json | 2 +- ...ic TPU.json => Generic TPU @Anycubic.json} | 8 +- .../Anycubic 4Max Pro 2 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic 4Max Pro 2.json | 2 +- .../Anycubic/machine/Anycubic 4Max Pro.json | 2 +- .../machine/Anycubic Chiron 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic Chiron.json | 2 +- .../machine/Anycubic Kobra 0.4 nozzle.json | 2 +- .../machine/Anycubic Kobra 2 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic Kobra 2.json | 2 +- .../Anycubic Kobra Max 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic Kobra Max.json | 2 +- .../Anycubic Kobra Neo 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic Kobra Neo.json | 2 +- .../Anycubic Kobra Plus 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic Kobra Plus.json | 2 +- .../Anycubic/machine/Anycubic Kobra.json | 2 +- .../Anycubic/machine/Anycubic Predator.json | 2 +- .../machine/Anycubic Vyper 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic Vyper.json | 2 +- .../Anycubic i3 Mega S 0.4 nozzle.json | 2 +- .../Anycubic/machine/Anycubic i3 Mega S.json | 2 +- resources/profiles/Artillery.json | 26 +- ...lery ABS @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../Artillery/filament/Artillery ABS.json | 2 +- ...lery ASA @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...llery PA @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...ry PA-CF @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...llery PC @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery PET @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...ery PETG @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...TG Basic @Artillery M1 Pro 0.4 nozzle.json | 2 +- ... PETG-CF @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../Artillery/filament/Artillery PETG.json | 2 +- ...LA Basic @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...A Basic+ @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../filament/Artillery PLA Basic.json | 2 +- ...LA Matte @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../filament/Artillery PLA Matte.json | 2 +- ...PLA Silk @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../filament/Artillery PLA Silk.json | 2 +- .../filament/Artillery PLA Tough.json | 2 +- ...y PLA-CF @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery PVA @Artillery M1 Pro 0.4 nozzle.json | 2 +- ...lery TPU @Artillery M1 Pro 0.4 nozzle.json | 2 +- .../Artillery/filament/Artillery TPU.json | 2 +- ...c ABS.json => Generic ABS @Artillery.json} | 7 +- ...c ASA.json => Generic ASA @Artillery.json} | 7 +- ...PETG.json => Generic PETG @Artillery.json} | 7 +- ...c PLA.json => Generic PLA @Artillery.json} | 7 +- ...CF.json => Generic PLA-CF @Artillery.json} | 7 +- ...c TPU.json => Generic TPU @Artillery.json} | 7 +- .../machine/Artillery Genius 0.4 nozzle.json | 2 +- .../Artillery Genius Pro 0.4 nozzle.json | 2 +- .../machine/Artillery Genius Pro.json | 2 +- .../Artillery/machine/Artillery Genius.json | 2 +- .../machine/Artillery Hornet 0.4 nozzle.json | 2 +- .../Artillery/machine/Artillery Hornet.json | 2 +- .../Artillery Sidewinder X1 0.4 nozzle.json | 2 +- .../machine/Artillery Sidewinder X1.json | 2 +- .../Artillery Sidewinder X2 0.4 nozzle.json | 2 +- .../machine/Artillery Sidewinder X2.json | 2 +- resources/profiles/Blocks.json | 46 +- ...eric ABS.json => Generic ABS @Blocks.json} | 7 +- ...eric ASA.json => Generic ASA @Blocks.json} | 7 +- ...SA-CF.json => Generic ASA-CF @Blocks.json} | 10 +- ...eneric PA.json => Generic PA @Blocks.json} | 7 +- ... PA-CF.json => Generic PA-CF @Blocks.json} | 7 +- ...eneric PC.json => Generic PC @Blocks.json} | 7 +- ...ic PETG.json => Generic PETG @Blocks.json} | 7 +- ...eric PLA.json => Generic PLA @Blocks.json} | 7 +- ...LA-CF.json => Generic PLA-CF @Blocks.json} | 7 +- ...eric PVA.json => Generic PVA @Blocks.json} | 7 +- ...eric TPU.json => Generic TPU @Blocks.json} | 7 +- .../Blocks/machine/BLOCKS Pro S100.json | 2 +- .../Blocks/machine/BLOCKS RD50 V2.json | 2 +- .../profiles/Blocks/machine/BLOCKS RF50.json | 2 +- .../Blocks/machine/fdm_klipper_common.json | 2 +- resources/profiles/CONSTRUCT3D.json | 14 +- ...G.json => Generic High Flow PETG @C1.json} | 7 +- ...eneric PETG.json => Generic PETG @C1.json} | 7 +- ... Generic PLA.json => Generic PLA @C1.json} | 7 +- .../CONSTRUCT3D/machine/Construct 1 XL.json | 2 +- .../CONSTRUCT3D/machine/Construct 1.json | 2 +- resources/profiles/Chuanying.json | 46 +- ...uanying ABS @Chuanying X1 0.25 Nozzle.json | 2 +- ...uanying ASA @Chuanying X1 0.25 Nozzle.json | 2 +- ...ying HS PLA @Chuanying X1 0.25 Nozzle.json | 2 +- ...anying PETG @Chuanying X1 0.25 Nozzle.json | 2 +- ...uanying PLA @Chuanying X1 0.25 Nozzle.json | 2 +- ...ng PLA-SILK @Chuanying X1 0.25 Nozzle.json | 2 +- ...c ABS.json => Generic ABS @Chuanying.json} | 7 +- ...c ASA.json => Generic ASA @Chuanying.json} | 7 +- ...HIPS.json => Generic HIPS @Chuanying.json} | 11 +- ...LA.json => Generic HS PLA @Chuanying.json} | 7 +- ...PETG.json => Generic PETG @Chuanying.json} | 7 +- ...json => Generic PETG-CF10 @Chuanying.json} | 7 +- ...c PLA.json => Generic PLA @Chuanying.json} | 7 +- ....json => Generic PLA-CF10 @Chuanying.json} | 7 +- ....json => Generic PLA-Silk @Chuanying.json} | 7 +- ...c PVA.json => Generic PVA @Chuanying.json} | 11 +- ...c TPU.json => Generic TPU @Chuanying.json} | 7 +- .../Chuanying/machine/Chuanying X1.json | 2 +- .../machine/fdm_chuanying_common.json | 2 +- .../Chuanying/machine/fdm_klipper_common.json | 2 +- .../Chuanying/machine/fdm_x1_common.json | 2 +- resources/profiles/Co Print.json | 18 +- ...ric ABS.json => Generic ABS @CoPrint.json} | 9 +- ...c PETG.json => Generic PETG @CoPrint.json} | 9 +- ...ric PLA.json => Generic PLA @CoPrint.json} | 10 +- ...ric TPU.json => Generic TPU @CoPrint.json} | 9 +- ...hromaSet 0.4 nozzle - Ender-3 V3 Plus.json | 2 +- ...int ChromaSet 0.4 nozzle - Ender-3 V3.json | 2 +- .../Co Print ChromaSet 0.4 nozzle fast.json | 2 +- .../Co Print ChromaSet 0.4 nozzle.json | 2 +- .../Co Print/machine/Co Print ChromaSet.json | 2 +- .../Co Print/machine/fdm_coprint_common.json | 2 +- resources/profiles/CoLiDo.json | 34 +- ....json => Generic ABS @CoLiDo DIY 4.0.json} | 9 +- ... X16.json => Generic ABS @CoLiDo X16.json} | 9 +- ...json => Generic PETG @CoLiDo DIY 4.0.json} | 9 +- ...X16.json => Generic PETG @CoLiDo X16.json} | 9 +- ....json => Generic PLA @CoLiDo DIY 4.0.json} | 9 +- ... X16.json => Generic PLA @CoLiDo X16.json} | 9 +- ....json => Generic TPU @CoLiDo DIY 4.0.json} | 9 +- ... X16.json => Generic TPU @CoLiDo X16.json} | 9 +- .../machine/CoLiDo 160 V2 0.4 nozzle.json | 2 +- .../CoLiDo/machine/CoLiDo 160 V2.json | 2 +- .../machine/CoLiDo DIY 4.0 0.4 nozzle.json | 2 +- .../CoLiDo/machine/CoLiDo DIY 4.0.json | 2 +- .../CoLiDo/machine/CoLiDo X16 0.4 nozzle.json | 2 +- .../profiles/CoLiDo/machine/CoLiDo X16.json | 2 +- resources/profiles/Comgrow.json | 14 +- .../Comgrow/filament/Comgrow T300 PLA.json | 2 +- ...ric ABS.json => Generic ABS @Comgrow.json} | 7 +- ...c PETG.json => Generic PETG @Comgrow.json} | 7 +- ...ric PLA.json => Generic PLA @Comgrow.json} | 7 +- .../Comgrow/machine/Comgrow T500.json | 2 +- .../Comgrow/machine/fdm_comgrow_common.json | 2 +- resources/profiles/Creality.json | 230 +- .../Creality Generic ASA-CF @Hi-all.json | 19 - .../Creality Generic PETG-CF @Hi-all.json | 19 - .../Creality Generic PLA @Hi-all.json | 2 +- .../Creality Generic PLA-CF @Hi-all.json | 15 - ... Generic ABS @Creality Ender-3V3-all.json} | 7 +- ...Generic ABS @Creality Ender-5Max-all.json} | 7 +- ...json => Generic ABS @Creality Hi-all.json} | 8 +- ...json => Generic ABS @Creality K1-all.json} | 11 +- ...json => Generic ABS @Creality K2-all.json} | 12 +- ...ic ABS.json => Generic ABS @Creality.json} | 7 +- ... Generic ASA @Creality Ender-3V3-all.json} | 7 +- ...Generic ASA @Creality Ender-5Max-all.json} | 7 +- ...json => Generic ASA @Creality Hi-all.json} | 7 +- ...json => Generic ASA @Creality K1-all.json} | 11 +- ...json => Generic ASA @Creality K2-all.json} | 10 +- ...ic ASA.json => Generic ASA @Creality.json} | 7 +- .../Generic ASA-CF @Creality Hi-all.json | 23 + ... Generic PA @Creality Ender-5Max-all.json} | 7 +- ...eneric PA-CF @Creality Ender-3V3-all.json} | 7 +- ...on => Generic PA-CF @Creality K1-all.json} | 8 +- ...on => Generic PA-CF @Creality K2-all.json} | 10 +- ...A-CF.json => Generic PA-CF @Creality.json} | 7 +- ....json => Generic PC @Creality K1-all.json} | 8 +- ...eric PC.json => Generic PC @Creality.json} | 4 +- ...Generic PETG @Creality Ender-3V3-all.json} | 7 +- ...eneric PETG @Creality Ender-5Max-all.json} | 7 +- ...son => Generic PETG @Creality Hi-all.json} | 8 +- ...son => Generic PETG @Creality K1-all.json} | 11 +- ...son => Generic PETG @Creality K2-all.json} | 12 +- ... PETG.json => Generic PETG @Creality.json} | 7 +- .../Generic PETG-CF @Creality Hi-all.json | 23 + ... Generic PLA @Creality Ender-3V3-all.json} | 7 +- ...Generic PLA @Creality Ender-5Max-all.json} | 7 +- ...json => Generic PLA @Creality K1-all.json} | 11 +- ...json => Generic PLA @Creality K2-all.json} | 12 +- ...ic PLA.json => Generic PLA @Creality.json} | 7 +- ...PLA.json => Generic PLA HF @Creality.json} | 7 +- ...A High Speed @Creality Ender-3V3-all.json} | 9 +- ...eric PLA High Speed @Creality Hi-all.json} | 7 +- ...eric PLA High Speed @Creality K1-all.json} | 9 +- ...eric PLA High Speed @Creality K2-all.json} | 9 +- ...ic PLA Matte @Creality Ender-3V3-all.json} | 9 +- ...> Generic PLA Matte @Creality Hi-all.json} | 7 +- ...> Generic PLA Matte @Creality K1-all.json} | 9 +- ...> Generic PLA Matte @Creality K2-all.json} | 9 +- ...ric PLA Silk @Creality Ender-3V3-all.json} | 9 +- ...=> Generic PLA Silk @Creality Hi-all.json} | 7 +- ...=> Generic PLA Silk @Creality K1-all.json} | 9 +- ...=> Generic PLA Silk @Creality K2-all.json} | 9 +- ...=> Generic PLA Wood @Creality Hi-all.json} | 7 +- .../Generic PLA-CF @Creality Hi-all.json | 16 + ...n => Generic PLA-CF @Creality K1-all.json} | 9 +- ...n => Generic PLA-CF @Creality K2-all.json} | 10 +- ...-CF.json => Generic PLA-CF @Creality.json} | 7 +- ...on => Generic Speed PLA @Creality HF.json} | 7 +- ... Generic TPU @Creality Ender-3V3-all.json} | 7 +- ...Generic TPU @Creality Ender-5Max-all.json} | 7 +- ...json => Generic TPU @Creality Hi-all.json} | 7 +- ...json => Generic TPU @Creality K1-all.json} | 11 +- ...json => Generic TPU @Creality K2-all.json} | 10 +- ...ic TPU.json => Generic TPU @Creality.json} | 7 +- .../Creality CR-10 Max 0.4 nozzle.json | 2 +- .../Creality/machine/Creality CR-10 Max.json | 2 +- .../machine/Creality CR-10 SE 0.2 nozzle.json | 2 +- .../machine/Creality CR-10 SE 0.4 nozzle.json | 2 +- .../machine/Creality CR-10 SE 0.6 nozzle.json | 2 +- .../machine/Creality CR-10 SE 0.8 nozzle.json | 2 +- .../Creality/machine/Creality CR-10 SE.json | 2 +- .../machine/Creality CR-10 V2 0.4 nozzle.json | 2 +- .../Creality/machine/Creality CR-10 V2.json | 2 +- .../machine/Creality CR-10 V3 0.4 nozzle.json | 2 +- .../machine/Creality CR-10 V3 0.6 nozzle.json | 2 +- .../Creality/machine/Creality CR-10 V3.json | 2 +- .../machine/Creality CR-6 Max 0.2 nozzle.json | 2 +- .../machine/Creality CR-6 Max 0.4 nozzle.json | 2 +- .../machine/Creality CR-6 Max 0.6 nozzle.json | 2 +- .../machine/Creality CR-6 Max 0.8 nozzle.json | 2 +- .../Creality/machine/Creality CR-6 Max.json | 2 +- .../machine/Creality CR-6 SE 0.2 nozzle.json | 2 +- .../machine/Creality CR-6 SE 0.4 nozzle.json | 2 +- .../machine/Creality CR-6 SE 0.6 nozzle.json | 2 +- .../machine/Creality CR-6 SE 0.8 nozzle.json | 2 +- .../Creality/machine/Creality CR-6 SE.json | 2 +- .../machine/Creality CR-M4 0.4 nozzle.json | 2 +- .../Creality/machine/Creality CR-M4.json | 2 +- .../machine/Creality Ender-3 0.2 nozzle.json | 2 +- .../machine/Creality Ender-3 0.4 nozzle.json | 2 +- .../machine/Creality Ender-3 0.6 nozzle.json | 2 +- .../machine/Creality Ender-3 0.8 nozzle.json | 2 +- .../Creality Ender-3 Pro 0.2 nozzle.json | 2 +- .../Creality Ender-3 Pro 0.4 nozzle.json | 2 +- .../Creality Ender-3 Pro 0.6 nozzle.json | 2 +- .../Creality Ender-3 Pro 0.8 nozzle.json | 2 +- .../machine/Creality Ender-3 Pro.json | 2 +- .../Creality Ender-3 S1 0.4 nozzle.json | 2 +- .../Creality Ender-3 S1 Plus 0.2 nozzle.json | 2 +- .../Creality Ender-3 S1 Plus 0.4 nozzle.json | 2 +- .../Creality Ender-3 S1 Plus 0.6 nozzle.json | 2 +- .../Creality Ender-3 S1 Plus 0.8 nozzle.json | 2 +- .../machine/Creality Ender-3 S1 Plus.json | 2 +- .../Creality Ender-3 S1 Pro 0.4 nozzle.json | 2 +- .../machine/Creality Ender-3 S1 Pro.json | 2 +- .../Creality/machine/Creality Ender-3 S1.json | 2 +- .../Creality Ender-3 V2 0.4 nozzle.json | 2 +- .../Creality Ender-3 V2 Neo 0.4 nozzle.json | 2 +- .../machine/Creality Ender-3 V2 Neo.json | 2 +- .../Creality/machine/Creality Ender-3 V2.json | 2 +- .../Creality Ender-3 V3 0.4 nozzle.json | 2 +- .../Creality Ender-3 V3 0.6 nozzle.json | 2 +- .../Creality Ender-3 V3 KE 0.2 nozzle.json | 2 +- .../Creality Ender-3 V3 KE 0.4 nozzle.json | 2 +- .../Creality Ender-3 V3 KE 0.6 nozzle.json | 2 +- .../Creality Ender-3 V3 KE 0.8 nozzle.json | 2 +- .../machine/Creality Ender-3 V3 KE.json | 2 +- .../Creality Ender-3 V3 Plus 0.4 nozzle.json | 2 +- .../Creality Ender-3 V3 Plus 0.6 nozzle.json | 2 +- .../machine/Creality Ender-3 V3 Plus.json | 2 +- .../Creality Ender-3 V3 SE 0.2 nozzle.json | 2 +- .../Creality Ender-3 V3 SE 0.4 nozzle.json | 2 +- .../Creality Ender-3 V3 SE 0.6 nozzle.json | 2 +- .../Creality Ender-3 V3 SE 0.8 nozzle.json | 2 +- .../machine/Creality Ender-3 V3 SE.json | 2 +- .../Creality/machine/Creality Ender-3 V3.json | 2 +- .../Creality/machine/Creality Ender-3.json | 2 +- .../machine/Creality Ender-5 0.4 nozzle.json | 2 +- .../machine/Creality Ender-5 Max.json | 2 +- .../Creality Ender-5 Plus 0.4 nozzle.json | 2 +- .../machine/Creality Ender-5 Plus.json | 2 +- ...reality Ender-5 Pro (2019) 0.2 nozzle.json | 2 +- ...eality Ender-5 Pro (2019) 0.25 nozzle.json | 2 +- ...reality Ender-5 Pro (2019) 0.3 nozzle.json | 2 +- ...reality Ender-5 Pro (2019) 0.4 nozzle.json | 2 +- ...reality Ender-5 Pro (2019) 0.5 nozzle.json | 2 +- ...reality Ender-5 Pro (2019) 0.6 nozzle.json | 2 +- ...reality Ender-5 Pro (2019) 0.8 nozzle.json | 2 +- ...reality Ender-5 Pro (2019) 1.0 nozzle.json | 2 +- .../machine/Creality Ender-5 Pro (2019).json | 2 +- .../Creality Ender-5 S1 0.4 nozzle.json | 2 +- .../Creality/machine/Creality Ender-5 S1.json | 2 +- .../Creality/machine/Creality Ender-5.json | 2 +- .../machine/Creality Ender-5S 0.4 nozzle.json | 2 +- .../Creality/machine/Creality Ender-5S.json | 2 +- .../machine/Creality Ender-6 0.4 nozzle.json | 2 +- .../Creality/machine/Creality Ender-6.json | 2 +- .../Creality/machine/Creality Hi.json | 2 +- .../machine/Creality K1 (0.4 nozzle).json | 2 +- .../machine/Creality K1 (0.6 nozzle).json | 2 +- .../machine/Creality K1 (0.8 nozzle).json | 2 +- .../machine/Creality K1 Max (0.4 nozzle).json | 2 +- .../machine/Creality K1 Max (0.6 nozzle).json | 2 +- .../machine/Creality K1 Max (0.8 nozzle).json | 2 +- .../Creality/machine/Creality K1 Max.json | 2 +- .../Creality K1 Max_CFS-C 0.4 nozzle.json | 2 +- .../machine/Creality K1 Max_CFS-C.json | 2 +- .../machine/Creality K1 SE 0.4 nozzle.json | 2 +- .../machine/Creality K1 SE 0.6 nozzle.json | 2 +- .../machine/Creality K1 SE 0.8 nozzle.json | 2 +- .../Creality/machine/Creality K1 SE.json | 2 +- .../Creality K1 SE_CFS-C 0.4 nozzle.json | 2 +- .../machine/Creality K1 SE_CFS-C.json | 2 +- .../Creality/machine/Creality K1.json | 2 +- .../machine/Creality K1C 0.4 nozzle.json | 2 +- .../machine/Creality K1C 0.6 nozzle.json | 2 +- .../machine/Creality K1C 0.8 nozzle.json | 2 +- .../Creality/machine/Creality K1C.json | 2 +- .../Creality K1C_CFS-C 0.4 nozzle.json | 2 +- .../Creality/machine/Creality K1C_CFS-C.json | 2 +- .../machine/Creality K1_CFS-C 0.4 nozzle.json | 2 +- .../Creality/machine/Creality K1_CFS-C.json | 2 +- .../machine/Creality K2 0.2 nozzle.json | 2 +- .../machine/Creality K2 0.4 nozzle.json | 2 +- .../machine/Creality K2 0.6 nozzle.json | 2 +- .../machine/Creality K2 0.8 nozzle.json | 2 +- .../machine/Creality K2 Plus 0.2 nozzle.json | 2 +- .../machine/Creality K2 Plus 0.4 nozzle.json | 2 +- .../machine/Creality K2 Plus 0.6 nozzle.json | 2 +- .../machine/Creality K2 Plus 0.8 nozzle.json | 2 +- .../Creality/machine/Creality K2 Plus.json | 2 +- .../machine/Creality K2 Pro 0.2 nozzle.json | 2 +- .../machine/Creality K2 Pro 0.4 nozzle.json | 2 +- .../machine/Creality K2 Pro 0.6 nozzle.json | 2 +- .../machine/Creality K2 Pro 0.8 nozzle.json | 2 +- .../Creality/machine/Creality K2 Pro.json | 2 +- .../machine/Creality K2 SE 0.4 nozzle.json | 2 +- .../Creality/machine/Creality K2 SE.json | 2 +- .../Creality/machine/Creality K2.json | 2 +- .../Creality Sermoon V1 0.4 nozzle.json | 2 +- .../Creality/machine/Creality Sermoon V1.json | 2 +- .../Creality/machine/fdm_creality_common.json | 2 +- resources/profiles/DeltaMaker.json | 14 +- ...ETG.json => Generic PETG @DeltaMaker.json} | 7 +- ... PLA.json => Generic PLA @DeltaMaker.json} | 7 +- ... TPU.json => Generic TPU @DeltaMaker.json} | 7 +- .../machine/DeltaMaker 2 0.35 nozzle.json | 2 +- .../DeltaMaker/machine/DeltaMaker 2.json | 2 +- .../machine/DeltaMaker 2T 0.5 nozzle.json | 2 +- .../DeltaMaker/machine/DeltaMaker 2T.json | 2 +- .../machine/DeltaMaker 2XT 0.5 nozzle.json | 2 +- .../DeltaMaker/machine/DeltaMaker 2XT.json | 2 +- .../machine/fdm_klipper_common.json | 2 +- resources/profiles/Dremel.json | 18 +- ...json => Generic PLA @Dremel 3D20 all.json} | 9 +- ...json => Generic PLA @Dremel 3D40 all.json} | 9 +- ...json => Generic PLA @Dremel 3D45 all.json} | 9 +- ...eric PLA.json => Generic PLA @Dremel.json} | 7 +- .../machine/Dremel 3D20 0.4 nozzle.json | 2 +- .../profiles/Dremel/machine/Dremel 3D20.json | 2 +- .../machine/Dremel 3D40 0.4 nozzle.json | 2 +- .../profiles/Dremel/machine/Dremel 3D40.json | 2 +- .../machine/Dremel 3D45 0.4 nozzle.json | 2 +- .../profiles/Dremel/machine/Dremel 3D45.json | 2 +- .../Dremel/machine/fdm_dremel_common.json | 2 +- resources/profiles/FLSun.json | 50 +- .../profiles/FLSun/filament/FLSun S1 ABS.json | 2 +- .../profiles/FLSun/filament/FLSun S1 ASA.json | 2 +- .../FLSun/filament/FLSun S1 PETG.json | 2 +- .../filament/FLSun S1 PLA High Speed.json | 2 +- .../FLSun/filament/FLSun S1 PLA Silk.json | 2 +- .../profiles/FLSun/filament/FLSun S1 TPU.json | 2 +- .../profiles/FLSun/filament/FLSun T1 ABS.json | 2 +- .../profiles/FLSun/filament/FLSun T1 ASA.json | 2 +- .../FLSun/filament/FLSun T1 PETG.json | 2 +- .../filament/FLSun T1 PLA High Speed.json | 2 +- .../FLSun/filament/FLSun T1 PLA Silk.json | 2 +- .../profiles/FLSun/filament/FLSun T1 TPU.json | 2 +- ...neric ABS.json => Generic ABS @FLSun.json} | 7 +- ...neric ASA.json => Generic ASA @FLSun.json} | 7 +- ...Generic PA.json => Generic PA @FLSun.json} | 7 +- ...c PA-CF.json => Generic PA-CF @FLSun.json} | 7 +- ...Generic PC.json => Generic PC @FLSun.json} | 7 +- ...ric PETG.json => Generic PETG @FLSun.json} | 7 +- ...eneric.json => Generic PLA @FLSun S1.json} | 9 +- ...eneric.json => Generic PLA @FLSun T1.json} | 9 +- ...neric PLA.json => Generic PLA @FLSun.json} | 7 +- ...PLA-CF.json => Generic PLA-CF @FLSun.json} | 7 +- ...neric PVA.json => Generic PVA @FLSun.json} | 7 +- ...neric TPU.json => Generic TPU @FLSun.json} | 7 +- .../FLSun/machine/FLSun Q5 0.4 nozzle.json | 2 +- .../profiles/FLSun/machine/FLSun Q5.json | 2 +- .../machine/FLSun QQ-S Pro 0.4 nozzle.json | 2 +- .../FLSun/machine/FLSun QQ-S Pro.json | 2 +- .../profiles/FLSun/machine/FLSun S1.json | 2 +- .../FLSun/machine/FLSun SR 0.4 nozzle.json | 2 +- .../profiles/FLSun/machine/FLSun SR.json | 2 +- .../profiles/FLSun/machine/FLSun T1.json | 2 +- .../profiles/FLSun/machine/FLSun V400.json | 2 +- resources/profiles/Flashforge.json | 190 +- .../FlashForge PC @FF G4 0.6 HF nozzle.json | 5 +- .../FlashForge PC @FF G4 0.6 nozzle.json | 5 +- .../FlashForge PC @FF G4 0.8 HF nozzle.json | 5 +- .../FlashForge PC @FF G4P 0.6 HF nozzle.json | 5 +- .../FlashForge PC @FF G4P 0.6 nozzle.json | 5 +- .../FlashForge PC @FF G4P 0.8 HF nozzle.json | 5 +- .../FlashForge PPS @FF G4 0.6 HF nozzle.json | 5 +- .../FlashForge PPS @FF G4 0.6 nozzle.json | 5 +- .../FlashForge PPS @FF G4 0.8 HF nozzle.json | 5 +- .../FlashForge PPS @FF G4P 0.6 HF nozzle.json | 5 +- .../FlashForge PPS @FF G4P 0.6 nozzle.json | 5 +- .../FlashForge PPS @FF G4P 0.8 HF nozzle.json | 5 +- .../FlashForge PPS-CF @FF G4 0.6 nozzle.json | 5 +- .../FlashForge PPS-CF @FF G4P 0.6 nozzle.json | 5 +- .../Flashforge ABS @FF AD5M 0.25 Nozzle.json | 2 +- ...shforge ABS Basic @FF AD5X 0.6 nozzle.json | 2 +- ...shforge ABS Basic @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge ABS Basic @FF AD5X.json | 2 +- ...hforge ABS Basic @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge ABS Basic @FF G4 0.6 nozzle.json | 2 +- ...hforge ABS Basic @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge ABS Basic @FF G4 HF.json | 2 +- .../filament/Flashforge ABS Basic @FF G4.json | 2 +- ...forge ABS Basic @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge ABS Basic @FF G4P 0.6 nozzle.json | 2 +- ...forge ABS Basic @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge ABS Basic @FF G4P HF.json | 2 +- .../Flashforge ABS Basic @FF G4P.json | 2 +- .../filament/Flashforge ABS Basic.json | 2 +- .../Flashforge ABS-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/Flashforge ABS-CF @FF G4.json | 2 +- .../Flashforge ABS-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/Flashforge ABS-CF @FF G4P.json | 2 +- .../Flashforge ASA @FF AD5M 0.25 Nozzle.json | 2 +- ...shforge ASA Basic @FF AD5X 0.6 nozzle.json | 2 +- ...shforge ASA Basic @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge ASA Basic @FF AD5X.json | 2 +- ...hforge ASA Basic @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge ASA Basic @FF G4 0.6 nozzle.json | 2 +- ...hforge ASA Basic @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge ASA Basic @FF G4 HF.json | 2 +- .../filament/Flashforge ASA Basic @FF G4.json | 2 +- ...forge ASA Basic @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge ASA Basic @FF G4P 0.6 nozzle.json | 2 +- ...forge ASA Basic @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge ASA Basic @FF G4P HF.json | 2 +- .../Flashforge ASA Basic @FF G4P.json | 2 +- .../filament/Flashforge ASA Basic.json | 2 +- .../filament/Flashforge ASA-CF @FF G4.json | 2 +- .../filament/Flashforge ASA-CF @FF G4P.json | 2 +- .../filament/Flashforge ASA-CF.json | 2 +- .../Flashforge HIPS @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HIPS @FF G4 0.6 nozzle.json | 2 +- .../Flashforge HIPS @FF G4 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HIPS @FF G4 HF.json | 2 +- .../filament/Flashforge HIPS @FF G4.json | 2 +- ...Flashforge HIPS @FF G4P 0.6 HF nozzle.json | 2 +- .../Flashforge HIPS @FF G4P 0.6 nozzle.json | 2 +- ...Flashforge HIPS @FF G4P 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HIPS @FF G4P HF.json | 2 +- .../filament/Flashforge HIPS @FF G4P.json | 2 +- ...lashforge HS PETG @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge HS PETG @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge HS PETG @FF AD5X.json | 2 +- ...ashforge HS PETG @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HS PETG @FF G4 0.6 nozzle.json | 2 +- ...ashforge HS PETG @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge HS PETG @FF G4 HF.json | 2 +- .../filament/Flashforge HS PETG @FF G4.json | 2 +- ...shforge HS PETG @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge HS PETG @FF G4P 0.6 nozzle.json | 2 +- ...shforge HS PETG @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge HS PETG @FF G4P HF.json | 2 +- .../filament/Flashforge HS PETG @FF G4P.json | 2 +- .../filament/Flashforge HS PETG.json | 2 +- ...lashforge HS PLA @FF AD5M 0.25 Nozzle.json | 2 +- ...Flashforge HS PLA @FF AD5X 0.6 nozzle.json | 2 +- ...Flashforge HS PLA @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge HS PLA @FF AD5X.json | 2 +- ...lashforge HS PLA @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HS PLA @FF G4 0.6 nozzle.json | 2 +- ...lashforge HS PLA @FF G4 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HS PLA @FF G4 HF.json | 2 +- .../filament/Flashforge HS PLA @FF G4.json | 2 +- ...ashforge HS PLA @FF G4P 0.6 HF nozzle.json | 2 +- .../Flashforge HS PLA @FF G4P 0.6 nozzle.json | 2 +- ...ashforge HS PLA @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge HS PLA @FF G4P HF.json | 2 +- .../filament/Flashforge HS PLA @FF G4P.json | 2 +- ... HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge HS PLA Burnt Ti @FF G4 HF.json | 2 +- ...HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge HS PLA Burnt Ti @FF G4P HF.json | 2 +- ...orge HS PLA Burnt Ti@FF G4 0.6 nozzle.json | 2 +- ...e HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json | 2 +- ...rge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json | 2 +- ... HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json | 2 +- .../filament/Flashforge HS PLA.json | 2 +- .../Flashforge PA @FF G4 0.6 HF nozzle.json | 2 +- .../filament/Flashforge PA @FF G4 HF.json | 2 +- .../filament/Flashforge PA @FF G4.json | 2 +- .../Flashforge PA @FF G4P 0.6 HF nozzle.json | 2 +- .../filament/Flashforge PA @FF G4P HF.json | 2 +- .../filament/Flashforge PA @FF G4P.json | 2 +- .../filament/Flashforge PA-CF @FF G4.json | 2 +- .../filament/Flashforge PA-CF @FF G4P.json | 2 +- .../filament/Flashforge PA12-CF.json | 2 +- .../filament/Flashforge PA6-CF.json | 2 +- .../filament/Flashforge PA66-CF.json | 2 +- .../filament/Flashforge PAHT-CF @FF G4.json | 2 +- .../filament/Flashforge PAHT-CF @FF G4P.json | 2 +- .../filament/Flashforge PET-CF.json | 2 +- .../Flashforge PETG @FF AD5M 0.25 Nozzle.json | 2 +- .../filament/Flashforge PETG Basic.json | 2 +- ...ashforge PETG Pro @FF AD5X 0.6 nozzle.json | 2 +- ...ashforge PETG Pro @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PETG Pro @FF AD5X.json | 2 +- ...shforge PETG Pro @FF G4 0.6 HF nozzle.json | 2 +- ...Flashforge PETG Pro @FF G4 0.6 nozzle.json | 2 +- ...shforge PETG Pro @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PETG Pro @FF G4 HF.json | 2 +- .../filament/Flashforge PETG Pro @FF G4.json | 2 +- ...hforge PETG Pro @FF G4P 0.6 HF nozzle.json | 2 +- ...lashforge PETG Pro @FF G4P 0.6 nozzle.json | 2 +- ...hforge PETG Pro @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PETG Pro @FF G4P HF.json | 2 +- .../filament/Flashforge PETG Pro @FF G4P.json | 2 +- .../filament/Flashforge PETG Pro.json | 2 +- ... PETG Transparent @FF AD5X 0.6 nozzle.json | 2 +- ... PETG Transparent @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PETG Transparent @FF AD5X.json | 2 +- ...PETG Transparent @FF G4 0.6 HF nozzle.json | 2 +- ...ge PETG Transparent @FF G4 0.6 nozzle.json | 2 +- ...PETG Transparent @FF G4 0.8 HF nozzle.json | 2 +- ...Flashforge PETG Transparent @FF G4 HF.json | 2 +- .../Flashforge PETG Transparent @FF G4.json | 2 +- ...ETG Transparent @FF G4P 0.6 HF nozzle.json | 2 +- ...e PETG Transparent @FF G4P 0.6 nozzle.json | 2 +- ...ETG Transparent @FF G4P 0.8 HF nozzle.json | 2 +- ...lashforge PETG Transparent @FF G4P HF.json | 2 +- .../Flashforge PETG Transparent @FF G4P.json | 2 +- .../filament/Flashforge PETG Transparent.json | 2 +- ...lashforge PETG-CF @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge PETG-CF @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge PETG-CF @FF AD5X.json | 2 +- .../Flashforge PETG-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/Flashforge PETG-CF @FF G4.json | 2 +- ...Flashforge PETG-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/Flashforge PETG-CF @FF G4P.json | 2 +- .../filament/Flashforge PETG-CF.json | 2 +- .../Flashforge PLA @FF AD5M 0.25 Nozzle.json | 2 +- ...shforge PLA Basic @FF AD5X 0.6 nozzle.json | 2 +- ...shforge PLA Basic @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Basic @FF AD5X.json | 2 +- ...hforge PLA Basic @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge PLA Basic @FF G4 0.6 nozzle.json | 2 +- ...hforge PLA Basic @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Basic @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Basic @FF G4.json | 2 +- ...forge PLA Basic @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge PLA Basic @FF G4P 0.6 nozzle.json | 2 +- ...forge PLA Basic @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Basic @FF G4P HF.json | 2 +- .../Flashforge PLA Basic @FF G4P.json | 2 +- .../filament/Flashforge PLA Basic.json | 2 +- ...hforge PLA Buint Ti @FF G4 0.8 nozzle.json | 2 +- ...forge PLA Buint Ti @FF G4P 0.8 nozzle.json | 2 +- ... PLA Color Change @FF AD5X 0.6 nozzle.json | 2 +- ... PLA Color Change @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Color Change @FF AD5X.json | 2 +- ...PLA Color Change @FF G4 0.6 HF nozzle.json | 2 +- ...ge PLA Color Change @FF G4 0.6 nozzle.json | 2 +- ...PLA Color Change @FF G4 0.8 HF nozzle.json | 2 +- ...Flashforge PLA Color Change @FF G4 HF.json | 2 +- .../Flashforge PLA Color Change @FF G4.json | 2 +- ...LA Color Change @FF G4P 0.6 HF nozzle.json | 2 +- ...e PLA Color Change @FF G4P 0.6 nozzle.json | 2 +- ...LA Color Change @FF G4P 0.8 HF nozzle.json | 2 +- ...lashforge PLA Color Change @FF G4P HF.json | 2 +- .../Flashforge PLA Color Change @FF G4P.json | 2 +- .../filament/Flashforge PLA Color Change.json | 2 +- ...hforge PLA Galaxy @FF AD5X 0.6 nozzle.json | 2 +- ...hforge PLA Galaxy @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Galaxy @FF AD5X.json | 2 +- ...forge PLA Galaxy @FF G4 0.6 HF nozzle.json | 2 +- ...ashforge PLA Galaxy @FF G4 0.6 nozzle.json | 2 +- ...forge PLA Galaxy @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Galaxy @FF G4 HF.json | 2 +- .../Flashforge PLA Galaxy @FF G4.json | 2 +- ...orge PLA Galaxy @FF G4P 0.6 HF nozzle.json | 2 +- ...shforge PLA Galaxy @FF G4P 0.6 nozzle.json | 2 +- ...orge PLA Galaxy @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Galaxy @FF G4P HF.json | 2 +- .../Flashforge PLA Galaxy @FF G4P.json | 2 +- .../filament/Flashforge PLA Galaxy.json | 2 +- ...orge PLA Luminous @FF AD5X 0.6 nozzle.json | 2 +- ...orge PLA Luminous @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Luminous @FF AD5X.json | 2 +- ...rge PLA Luminous @FF G4 0.6 HF nozzle.json | 2 +- ...rge PLA Luminous @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Luminous @FF G4 HF.json | 2 +- .../Flashforge PLA Luminous @FF G4.json | 2 +- ...ge PLA Luminous @FF G4P 0.6 HF nozzle.json | 2 +- ...ge PLA Luminous @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Luminous @FF G4P HF.json | 2 +- .../Flashforge PLA Luminous @FF G4P.json | 2 +- .../filament/Flashforge PLA Luminous.json | 2 +- ...shforge PLA Matte @FF AD5X 0.6 nozzle.json | 2 +- ...shforge PLA Matte @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Matte @FF AD5X.json | 2 +- ...hforge PLA Matte @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge PLA Matte @FF G4 0.6 nozzle.json | 2 +- ...hforge PLA Matte @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Matte @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Matte @FF G4.json | 2 +- ...forge PLA Matte @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge PLA Matte @FF G4P 0.6 nozzle.json | 2 +- ...forge PLA Matte @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Matte @FF G4P HF.json | 2 +- .../Flashforge PLA Matte @FF G4P.json | 2 +- .../filament/Flashforge PLA Matte.json | 2 +- ...shforge PLA Metal @FF AD5X 0.6 nozzle.json | 2 +- ...shforge PLA Metal @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Metal @FF AD5X.json | 2 +- ...hforge PLA Metal @FF G4 0.6 HF nozzle.json | 2 +- ...lashforge PLA Metal @FF G4 0.6 nozzle.json | 2 +- ...hforge PLA Metal @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Metal @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Metal @FF G4.json | 2 +- ...forge PLA Metal @FF G4P 0.6 HF nozzle.json | 2 +- ...ashforge PLA Metal @FF G4P 0.6 nozzle.json | 2 +- ...forge PLA Metal @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Metal @FF G4P HF.json | 2 +- .../Flashforge PLA Metal @FF G4P.json | 2 +- .../filament/Flashforge PLA Metal.json | 2 +- ...lashforge PLA Pro @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge PLA Pro @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge PLA Pro @FF AD5X.json | 2 +- ...ashforge PLA Pro @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge PLA Pro @FF G4 0.6 nozzle.json | 2 +- ...ashforge PLA Pro @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Pro @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Pro @FF G4.json | 2 +- ...shforge PLA Pro @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge PLA Pro @FF G4P 0.6 nozzle.json | 2 +- ...shforge PLA Pro @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Pro @FF G4P HF.json | 2 +- .../filament/Flashforge PLA Pro @FF G4P.json | 2 +- .../filament/Flashforge PLA Pro.json | 2 +- ...ashforge PLA Silk @FF AD5X 0.6 nozzle.json | 2 +- ...ashforge PLA Silk @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Silk @FF AD5X.json | 2 +- ...shforge PLA Silk @FF G4 0.6 HF nozzle.json | 2 +- ...Flashforge PLA Silk @FF G4 0.6 nozzle.json | 2 +- ...shforge PLA Silk @FF G4 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Silk @FF G4 HF.json | 2 +- .../filament/Flashforge PLA Silk @FF G4.json | 2 +- ...hforge PLA Silk @FF G4P 0.6 HF nozzle.json | 2 +- ...lashforge PLA Silk @FF G4P 0.6 nozzle.json | 2 +- ...hforge PLA Silk @FF G4P 0.8 HF nozzle.json | 2 +- .../Flashforge PLA Silk @FF G4P HF.json | 2 +- .../filament/Flashforge PLA Silk @FF G4P.json | 2 +- .../filament/Flashforge PLA Silk.json | 2 +- ...forge PLA Sparkle @FF AD5X 0.6 nozzle.json | 2 +- ...forge PLA Sparkle @FF AD5X 0.8 nozzle.json | 2 +- .../Flashforge PLA Sparkle @FF AD5X.json | 2 +- ...orge PLA Sparkle @FF G4 0.6 HF nozzle.json | 2 +- ...shforge PLA Sparkle @FF G4 0.6 nozzle.json | 2 +- .../Flashforge PLA Sparkle @FF G4 HF.json | 2 +- .../Flashforge PLA Sparkle @FF G4.json | 2 +- ...rge PLA Sparkle @FF G4P 0.6 HF nozzle.json | 2 +- ...hforge PLA Sparkle @FF G4P 0.6 nozzle.json | 2 +- .../Flashforge PLA Sparkle @FF G4P HF.json | 2 +- .../Flashforge PLA Sparkle @FF G4P.json | 2 +- .../filament/Flashforge PLA Sparkle.json | 2 +- ...Flashforge PLA-CF @FF AD5X 0.6 nozzle.json | 2 +- ...Flashforge PLA-CF @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge PLA-CF @FF AD5X.json | 2 +- .../Flashforge PLA-CF @FF G4 0.6 nozzle.json | 2 +- .../filament/Flashforge PLA-CF @FF G4.json | 2 +- .../Flashforge PLA-CF @FF G4P 0.6 nozzle.json | 2 +- .../filament/Flashforge PLA-CF @FF G4P.json | 2 +- .../filament/Flashforge PLA-CF.json | 2 +- ...shforge PLA-SILK @FF AD5M 0.25 Nozzle.json | 2 +- .../filament/Flashforge PPA-CF.json | 2 +- .../filament/Flashforge PPA-GF.json | 2 +- .../filament/Flashforge PPS @FF G4.json | 2 +- .../filament/Flashforge PPS @FF G4P.json | 2 +- .../filament/Flashforge PPS-CF @FF G4.json | 2 +- .../filament/Flashforge PPS-CF @FF G4P.json | 2 +- .../filament/Flashforge PPS-CF.json | 2 +- ...ashforge TPU 65D @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge TPU 65D @FF G4 0.6 nozzle.json | 2 +- ...ashforge TPU 65D @FF G4 0.8 HF nozzle.json | 2 +- ...shforge TPU 65D @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge TPU 65D @FF G4P 0.6 nozzle.json | 2 +- ...shforge TPU 65D @FF G4P 0.8 HF nozzle.json | 2 +- ...lashforge TPU 95A @FF AD5X 0.6 nozzle.json | 2 +- ...lashforge TPU 95A @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Flashforge TPU 95A @FF AD5X.json | 2 +- ...ashforge TPU 95A @FF G4 0.6 HF nozzle.json | 2 +- .../Flashforge TPU 95A @FF G4 0.6 nozzle.json | 2 +- ...ashforge TPU 95A @FF G4 0.8 HF nozzle.json | 2 +- .../filament/Flashforge TPU 95A @FF G4.json | 2 +- ...shforge TPU 95A @FF G4P 0.6 HF nozzle.json | 2 +- ...Flashforge TPU 95A @FF G4P 0.6 nozzle.json | 2 +- ...shforge TPU 95A @FF G4P 0.8 HF nozzle.json | 2 +- .../filament/Flashforge TPU 95A @FF G4P.json | 2 +- .../filament/Flashforge TPU 95A.json | 2 +- .../FusRock PAHT @FF G4 0.6 HF nozzle.json | 4 +- .../FusRock PAHT @FF G4 0.6 nozzle.json | 4 +- .../FusRock PAHT @FF G4 0.8 HF nozzle.json | 4 +- .../FusRock PAHT @FF G4P 0.6 HF nozzle.json | 4 +- .../FusRock PAHT @FF G4P 0.6 nozzle.json | 4 +- .../FusRock PAHT @FF G4P 0.8 HF nozzle.json | 4 +- .../filament/FusRock PAHT-CF @FF C5.json | 5 +- .../filament/FusRock PAHT-CF @FF C5P.json | 5 +- .../FusRock PAHT-CF @FF G4 0.6 nozzle.json | 4 +- .../filament/FusRock PAHT-CF @FF G4.json | 7 +- .../FusRock PAHT-CF @FF G4P 0.6 nozzle.json | 4 +- .../filament/FusRock PAHT-CF @FF G4P.json | 7 +- .../FusRock PET @FF G4P 0.8 HF nozzle.json | 4 +- .../FusRock PET-CF @FF G4 0.6 nozzle.json | 4 +- .../filament/FusRock PET-CF @FF G4.json | 7 +- .../FusRock PET-CF @FF G4P 0.6 nozzle.json | 4 +- .../filament/FusRock PET-CF @FF G4P.json | 7 +- .../filament/FusRock S-Multi @FF C5.json | 7 +- .../filament/FusRock S-Multi @FF C5P.json | 7 +- .../filament/FusRock S-PAHT @FF C5.json | 7 +- .../filament/FusRock S-PAHT @FF C5P.json | 7 +- ...exPA-CF25.json => FusRock NexPA-CF25.json} | 11 +- ...n => FusRock PAHT-CF @G3U 0.6 Nozzle.json} | 14 +- ...eric PAHT-CF.json => FusRock PAHT-CF.json} | 13 +- ...eric PAHT-GF.json => FusRock PAHT-GF.json} | 11 +- ...on => FusRock PET-CF @G3U 0.6 Nozzle.json} | 14 +- ...eneric PET-CF.json => FusRock PET-CF.json} | 13 +- ...eneric PET-GF.json => FusRock PET-GF.json} | 11 +- ...n => FusRock S-Multi @G3U 0.6 Nozzle.json} | 14 +- ...eric S-Multi.json => FusRock S-Multi.json} | 13 +- ...on => FusRock S-PAHT @G3U 0.6 Nozzle.json} | 14 +- ...eneric S-PAHT.json => FusRock S-PAHT.json} | 13 +- ... => Generic ABS @FF AD5M 0.25 Nozzle.json} | 12 +- .../filament/Generic ABS @Flashforge AD4.json | 2 +- ...neric ABS @Flashforge G3U 0.6 Nozzle.json} | 11 +- ....json => Generic ABS @Flashforge G3U.json} | 11 +- ... ABS.json => Generic ABS @Flashforge.json} | 7 +- ... => Generic ASA @FF AD5M 0.25 Nozzle.json} | 12 +- .../filament/Generic ASA @Flashforge AD4.json | 2 +- ...neric ASA @Flashforge G3U 0.6 Nozzle.json} | 11 +- ....json => Generic ASA @Flashforge G3U.json} | 11 +- ... ASA.json => Generic ASA @Flashforge.json} | 7 +- ...eric HIPS @Flashforge G3U 0.6 Nozzle.json} | 11 +- ...IPS.json => Generic HIPS @Flashforge.json} | 11 +- ... Generic HS PLA @FF AD5M 0.25 Nozzle.json} | 12 +- ...A.json => Generic HS PLA @Flashforge.json} | 7 +- .../Generic PET @FF G4 0.6 HF nozzle.json | 5 +- .../Generic PET @FF G4 0.6 nozzle.json | 5 +- .../Generic PET @FF G4 0.8 HF nozzle.json | 5 +- .../filament/Generic PET @FF G4.json | 2 +- .../Generic PET @FF G4P 0.6 HF nozzle.json | 5 +- .../Generic PET @FF G4P 0.6 nozzle.json | 5 +- .../Generic PET @FF G4P 0.8 HF nozzle.json | 5 +- .../filament/Generic PET @FF G4P.json | 2 +- ...=> Generic PETG @FF AD5M 0.25 Nozzle.json} | 12 +- .../Generic PETG @Flashforge AD4.json | 2 +- ...eric PETG @Flashforge G3U 0.6 Nozzle.json} | 11 +- ...eric PETG @Flashforge G3U 0.8 Nozzle.json} | 11 +- ...json => Generic PETG @Flashforge G3U.json} | 11 +- ...ETG.json => Generic PETG @Flashforge.json} | 7 +- ...c PETG-CF @Flashforge G3U 0.6 Nozzle.json} | 11 +- ...c PETG-CF @Flashforge G3U 0.8 Nozzle.json} | 11 +- ...n => Generic PETG-CF @Flashforge G3U.json} | 11 +- .../Generic PETG-CF10 @Flashforge AD4.json | 2 +- ...son => Generic PETG-CF10 @Flashforge.json} | 7 +- ... => Generic PLA @FF AD5M 0.25 Nozzle.json} | 10 +- .../filament/Generic PLA @Flashforge AD4.json | 2 +- ...neric PLA @Flashforge G3U 0.6 Nozzle.json} | 6 +- ...neric PLA @Flashforge G3U 0.8 Nozzle.json} | 6 +- ....json => Generic PLA @Flashforge G3U.json} | 11 +- ... PLA.json => Generic PLA @Flashforge.json} | 7 +- ...eneric PLA High Speed @Flashforge AD4.json | 2 +- .../Generic PLA Silk @Flashforge AD4.json | 2 +- ...ic PLA-CF @Flashforge G3U 0.6 Nozzle.json} | 11 +- ...ic PLA-CF @Flashforge G3U 0.8 Nozzle.json} | 11 +- ...on => Generic PLA-CF @Flashforge G3U.json} | 11 +- .../Generic PLA-CF10 @Flashforge AD4.json | 2 +- ...json => Generic PLA-CF10 @Flashforge.json} | 7 +- ...eneric PLA-SILK @FF AD5M 0.25 Nozzle.json} | 12 +- ...json => Generic PLA-Silk @Flashforge.json} | 7 +- ... PVA.json => Generic PVA @Flashforge.json} | 11 +- .../Generic TPU 85A @FF AD5X 0.6 nozzle.json | 2 +- .../Generic TPU 85A @FF AD5X 0.8 nozzle.json | 2 +- .../filament/Generic TPU 85A @FF AD5X.json | 2 +- .../filament/Generic TPU @Flashforge AD4.json | 2 +- ... TPU.json => Generic TPU @Flashforge.json} | 7 +- .../Polymaker CoPA @FF G4 0.6 HF nozzle.json | 7 +- .../Polymaker CoPA @FF G4 0.6 nozzle.json | 7 +- .../Polymaker CoPA @FF G4 0.8 HF nozzle.json | 7 +- .../Polymaker CoPA @FF G4P 0.6 HF nozzle.json | 7 +- .../Polymaker CoPA @FF G4P 0.6 nozzle.json | 7 +- .../Polymaker CoPA @FF G4P 0.8 HF nozzle.json | 7 +- ... Generic CoPA.json => Polymaker CoPA.json} | 11 +- ...aker Generic S1.json => Polymaker S1.json} | 11 +- .../SUNLU/SUNLU PLA Marble @base.json | 1 - .../machine/FlashForge AD5X 0.25 nozzle.json | 2 +- .../machine/Flashforge AD5X 0.4 nozzle.json | 2 +- .../machine/Flashforge AD5X 0.6 nozzle.json | 2 +- .../machine/Flashforge AD5X 0.8 nozzle.json | 2 +- .../Flashforge/machine/Flashforge AD5X.json | 2 +- .../machine/Flashforge Adventurer 5M Pro.json | 2 +- .../machine/Flashforge Adventurer 5M.json | 2 +- .../machine/Flashforge Artemis.json | 2 +- .../Flashforge Creator 5 0.4 nozzle.json | 2 +- .../Flashforge Creator 5 0.6 nozzle.json | 2 +- .../Flashforge Creator 5 0.8 nozzle.json | 2 +- .../Flashforge Creator 5 Pro 0.4 nozzle.json | 2 +- .../Flashforge Creator 5 Pro 0.6 nozzle.json | 2 +- .../Flashforge Creator 5 Pro 0.8 nozzle.json | 2 +- .../Flashforge Guider 2s 0.4 nozzle.json | 2 +- .../machine/Flashforge Guider 2s.json | 2 +- .../Flashforge Guider 3 Ultra 0.4 Nozzle.json | 2 +- .../Flashforge Guider 3 Ultra 0.6 Nozzle.json | 2 +- .../Flashforge Guider 3 Ultra 0.8 Nozzle.json | 2 +- .../machine/Flashforge Guider 3 Ultra.json | 2 +- .../Flashforge Guider4 0.25 nozzle.json | 2 +- .../Flashforge Guider4 0.4 HF nozzle.json | 2 +- .../Flashforge Guider4 0.4 nozzle.json | 2 +- .../Flashforge Guider4 0.6 HF nozzle.json | 2 +- .../Flashforge Guider4 0.6 nozzle.json | 2 +- .../Flashforge Guider4 0.8 HF nozzle.json | 2 +- .../Flashforge Guider4 Pro 0.25 nozzle.json | 2 +- .../Flashforge Guider4 Pro 0.4 HF nozzle.json | 2 +- .../Flashforge Guider4 Pro 0.4 nozzle.json | 2 +- .../Flashforge Guider4 Pro 0.6 HF nozzle.json | 2 +- .../Flashforge Guider4 Pro 0.6 nozzle.json | 2 +- .../Flashforge Guider4 Pro 0.8 HF nozzle.json | 2 +- .../machine/Flashforge Guider4 Pro.json | 2 +- .../machine/Flashforge Guider4.json | 2 +- .../machine/fdm_adventurer5m_common.json | 2 +- .../machine/fdm_flashforge_common.json | 2 +- .../machine/fdm_klipper_common.json | 2 +- resources/profiles/FlyingBear.json | 26 +- ... ABS.json => Generic ABS @FlyingBear.json} | 10 +- ...CF.json => Generic PA-CF @FlyingBear.json} | 10 +- ...ic PC.json => Generic PC @FlyingBear.json} | 10 +- ...ETG.json => Generic PETG @FlyingBear.json} | 10 +- ... PLA.json => Generic PLA @FlyingBear.json} | 10 +- ... TPU.json => Generic TPU @FlyingBear.json} | 10 +- .../FlyingBear Ghost 6 0.4 nozzle.json | 2 +- .../machine/FlyingBear Ghost 6.json | 2 +- .../machine/FlyingBear Reborn3.json | 2 +- .../machine/Ghost7/FlyingBear Ghost7.json | 2 +- .../FlyingBear/machine/S1/FlyingBear S1.json | 2 +- .../machine/fdm_klipper_common.json | 2 +- .../machine/fdm_machine_common.json | 2 +- resources/profiles/Ginger Additive.json | 10 +- ...ic PETG.json => Generic PETG @Ginger.json} | 8 +- ...eric PLA.json => Generic PLA @Ginger.json} | 8 +- .../Ginger Additive/machine/Ginger G1.json | 2 +- .../machine/Ginger_G1_common.json | 3 +- resources/profiles/InfiMech.json | 26 +- ...ic ABS.json => Generic ABS @InfiMech.json} | 10 +- ...A-CF.json => Generic PA-CF @InfiMech.json} | 10 +- ...eric PC.json => Generic PC @InfiMech.json} | 10 +- ... PETG.json => Generic PETG @InfiMech.json} | 10 +- ...ic PLA.json => Generic PLA @InfiMech.json} | 10 +- ...ic TPU.json => Generic TPU @InfiMech.json} | 10 +- .../InfiMech TX Hardened Steel Nozzle.json | 2 +- .../machine/HSN/fdm_klipper_common.json | 2 +- .../machine/HSN/fdm_machine_common.json | 2 +- .../InfiMech/machine/InfiMech TX.json | 2 +- .../InfiMech/machine/fdm_klipper_common.json | 2 +- .../InfiMech/machine/fdm_machine_common.json | 2 +- resources/profiles/MagicMaker.json | 6 +- ...eneric PEEK.json => Generic PEEK @MM.json} | 7 +- .../MagicMaker/machine/MM BoneKing.json | 2 +- resources/profiles/OrcaArena.json | 110 +- .../Generic ABS @OrcaArena 0.2 nozzle.json | 15 + ....json => Generic ABS @OrcaArena base.json} | 4 +- ...c ASA.json => Generic ABS @OrcaArena.json} | 7 +- .../Generic ASA @OrcaArena 0.2 nozzle.json | 15 + ....json => Generic ASA @OrcaArena base.json} | 4 +- ...ic PC.json => Generic ASA @OrcaArena.json} | 7 +- ...ric PA.json => Generic PA @OrcaArena.json} | 7 +- ...-CF.json => Generic PA-CF @OrcaArena.json} | 7 +- .../Generic PC @OrcaArena 0.2 nozzle.json | 15 + ...e.json => Generic PC @OrcaArena base.json} | 4 +- ...ic ABS.json => Generic PC @OrcaArena.json} | 7 +- .../Generic PETG @OrcaArena 0.2 nozzle.json | 15 + ...json => Generic PETG @OrcaArena base.json} | 4 +- .../filament/Generic PETG @OrcaArena.json | 14 + .../filament/Generic PETG-CF @Arena X1C.json | 14 + ...n => Generic PETG-CF @OrcaArena base.json} | 6 +- ...=> Generic PLA @OrcaArena 0.2 nozzle.json} | 7 +- ....json => Generic PLA @OrcaArena base.json} | 4 +- ...a X1C.json => Generic PLA @OrcaArena.json} | 7 +- ... => Generic PLA Silk @OrcaArena base.json} | 4 +- ....json => Generic PLA Silk @OrcaArena.json} | 7 +- ...on => Generic PLA-CF @OrcaArena base.json} | 4 +- .../filament/Generic PLA-CF @OrcaArena.json | 14 + .../Generic PVA @OrcaArena 0.2 nozzle.json | 15 + ....json => Generic PVA @OrcaArena base.json} | 4 +- .../filament/Generic PVA @OrcaArena.json | 14 + ...c TPU.json => Generic TPU @OrcaArena.json} | 7 +- .../OrcaArena Generic ABS @0.2 nozzle.json | 14 - .../OrcaArena Generic ASA @0.2 nozzle.json | 14 - .../OrcaArena Generic PC @0.2 nozzle.json | 14 - .../OrcaArena Generic PETG @0.2 nozzle.json | 14 - .../filament/OrcaArena Generic PETG.json | 13 - .../filament/OrcaArena Generic PLA-CF.json | 13 - .../filament/OrcaArena Generic PLA.json | 13 - .../OrcaArena Generic PVA @0.2 nozzle.json | 14 - .../filament/OrcaArena Generic PVA.json | 13 - .../machine/Orca Arena X1 Carbon.json | 2 +- resources/profiles/OrcaFilamentLibrary.json | 2 +- .../filament/Generic PP-GF @base.json | 7 +- .../Polymaker/Panchroma PLA Satin @base.json | 1 - resources/profiles/Peopoly.json | 14 +- ...ric ABS.json => Generic ABS @Peopoly.json} | 7 +- ...c PETG.json => Generic PETG @Peopoly.json} | 7 +- ...ric PLA.json => Generic PLA @Peopoly.json} | 8 +- .../Peopoly/machine/Peopoly Magneto X.json | 2 +- .../Peopoly/machine/fdm_klipper_common.json | 2 +- resources/profiles/Prusa.json | 874 ++-- .../Generic ABS @Prusa CORE One 0.6.json | 13 + .../Generic ABS @Prusa CORE One 0.8.json | 16 + ...> Generic ABS @Prusa CORE One HF 0.4.json} | 9 +- ...> Generic ABS @Prusa CORE One HF 0.5.json} | 9 +- ...> Generic ABS @Prusa CORE One HF 0.6.json} | 9 +- ...> Generic ABS @Prusa CORE One HF 0.8.json} | 9 +- ....json => Generic ABS @Prusa CORE One.json} | 7 +- ...on => Generic ABS @Prusa MINIIS 0.25.json} | 7 +- ...son => Generic ABS @Prusa MINIIS 0.6.json} | 7 +- ...son => Generic ABS @Prusa MINIIS 0.8.json} | 7 +- ...IS.json => Generic ABS @Prusa MINIIS.json} | 7 +- ...son => Generic ABS @Prusa MK3.5 0.25.json} | 7 +- ...json => Generic ABS @Prusa MK3.5 0.6.json} | 7 +- ...json => Generic ABS @Prusa MK3.5 0.8.json} | 7 +- ...3.5.json => Generic ABS @Prusa MK3.5.json} | 7 +- ... @MK4.json => Generic ABS @Prusa MK4.json} | 7 +- .../filament/Generic ABS @Prusa MK4S 0.6.json | 13 + .../filament/Generic ABS @Prusa MK4S 0.8.json | 13 + ...son => Generic ABS @Prusa MK4S HF0.4.json} | 9 +- .../Generic ABS @Prusa MK4S HF0.5.json | 16 + .../Generic ABS @Prusa MK4S HF0.6.json | 16 + .../Generic ABS @Prusa MK4S HF0.8.json | 18 + ...MK4S.json => Generic ABS @Prusa MK4S.json} | 7 +- ... 5T.json => Generic ABS @Prusa XL 5T.json} | 7 +- ...BS @XL.json => Generic ABS @Prusa XL.json} | 7 +- .../filament/Generic ABS @Prusa base.json} | 4 +- ...neric ABS.json => Generic ABS @Prusa.json} | 7 +- ... => Generic ABS HF @Prusa MINIIS 0.6.json} | 7 +- ... => Generic ABS HF @Prusa MINIIS 0.8.json} | 7 +- ...json => Generic ABS HF @Prusa MINIIS.json} | 7 +- ...n => Generic ABS HF @Prusa MK3.5 0.6.json} | 7 +- ...n => Generic ABS HF @Prusa MK3.5 0.8.json} | 7 +- ....json => Generic ABS HF @Prusa MK3.5.json} | 7 +- ...e.json => Generic ABS HF @Prusa base.json} | 4 +- .../Generic ASA @Prusa CORE One 0.6.json | 19 + ...n => Generic ASA @Prusa CORE One 0.8.json} | 9 +- ...> Generic ASA @Prusa CORE One HF 0.4.json} | 9 +- ...> Generic ASA @Prusa CORE One HF 0.5.json} | 9 +- ...> Generic ASA @Prusa CORE One HF 0.6.json} | 9 +- ...> Generic ASA @Prusa CORE One HF 0.8.json} | 9 +- ....json => Generic ASA @Prusa CORE One.json} | 7 +- ...on => Generic ASA @Prusa MINIIS 0.25.json} | 7 +- ...son => Generic ASA @Prusa MINIIS 0.6.json} | 7 +- ...son => Generic ASA @Prusa MINIIS 0.8.json} | 7 +- ...IS.json => Generic ASA @Prusa MINIIS.json} | 7 +- ...son => Generic ASA @Prusa MK3.5 0.25.json} | 7 +- ...json => Generic ASA @Prusa MK3.5 0.6.json} | 7 +- ...json => Generic ASA @Prusa MK3.5 0.8.json} | 7 +- ...3.5.json => Generic ASA @Prusa MK3.5.json} | 7 +- ... @MK4.json => Generic ASA @Prusa MK4.json} | 7 +- .../filament/Generic ASA @Prusa MK4S 0.6.json | 15 + .../filament/Generic ASA @Prusa MK4S 0.8.json | 16 + ...son => Generic ASA @Prusa MK4S HF0.4.json} | 9 +- .../Generic ASA @Prusa MK4S HF0.5.json | 16 + .../Generic ASA @Prusa MK4S HF0.6.json | 18 + ...son => Generic ASA @Prusa MK4S HF0.8.json} | 9 +- ...MK4S.json => Generic ASA @Prusa MK4S.json} | 7 +- ...neric ASA.json => Generic ASA @Prusa.json} | 7 +- ... => Generic ASA HF @Prusa MINIIS 0.6.json} | 7 +- ... => Generic ASA HF @Prusa MINIIS 0.8.json} | 7 +- ...json => Generic ASA HF @Prusa MINIIS.json} | 7 +- ...n => Generic ASA HF @Prusa MK3.5 0.6.json} | 7 +- ...n => Generic ASA HF @Prusa MK3.5 0.8.json} | 7 +- ....json => Generic ASA HF @Prusa MK3.5.json} | 7 +- ...e.json => Generic ASA HF @Prusa base.json} | 4 +- ...5T.json => Generic FLEX @Prusa XL 5T.json} | 7 +- ...X @XL.json => Generic FLEX @Prusa XL.json} | 7 +- ...son => Generic PA @Prusa MINIIS 0.25.json} | 7 +- ...json => Generic PA @Prusa MINIIS 0.6.json} | 7 +- ...json => Generic PA @Prusa MINIIS 0.8.json} | 7 +- ...IIS.json => Generic PA @Prusa MINIIS.json} | 7 +- ...json => Generic PA @Prusa MK3.5 0.25.json} | 7 +- ....json => Generic PA @Prusa MK3.5 0.6.json} | 7 +- ....json => Generic PA @Prusa MK3.5 0.8.json} | 7 +- ...K3.5.json => Generic PA @Prusa MK3.5.json} | 7 +- .../filament/Generic PA @Prusa base.json} | 4 +- ...Generic PA.json => Generic PA @Prusa.json} | 7 +- ... => Generic PA-CF @Prusa MINIIS 0.25.json} | 7 +- ...n => Generic PA-CF @Prusa MINIIS 0.6.json} | 7 +- ...n => Generic PA-CF @Prusa MINIIS 0.8.json} | 7 +- ....json => Generic PA-CF @Prusa MINIIS.json} | 7 +- ...n => Generic PA-CF @Prusa MK3.5 0.25.json} | 7 +- ...on => Generic PA-CF @Prusa MK3.5 0.6.json} | 7 +- ...on => Generic PA-CF @Prusa MK3.5 0.8.json} | 7 +- ...5.json => Generic PA-CF @Prusa MK3.5.json} | 7 +- ...se.json => Generic PA-CF @Prusa base.json} | 4 +- ...c PA-CF.json => Generic PA-CF @Prusa.json} | 7 +- ...son => Generic PC @Prusa MINIIS 0.25.json} | 7 +- ...json => Generic PC @Prusa MINIIS 0.6.json} | 7 +- ...json => Generic PC @Prusa MINIIS 0.8.json} | 7 +- ...IIS.json => Generic PC @Prusa MINIIS.json} | 7 +- ...json => Generic PC @Prusa MK3.5 0.25.json} | 7 +- ....json => Generic PC @Prusa MK3.5 0.6.json} | 7 +- ....json => Generic PC @Prusa MK3.5 0.8.json} | 7 +- ...K3.5.json => Generic PC @Prusa MK3.5.json} | 7 +- ...Generic PC.json => Generic PC @Prusa.json} | 7 +- ...n => Generic PC HF @Prusa MINIIS 0.6.json} | 7 +- ...n => Generic PC HF @Prusa MINIIS 0.8.json} | 7 +- ....json => Generic PC HF @Prusa MINIIS.json} | 7 +- ...on => Generic PC HF @Prusa MK3.5 0.6.json} | 7 +- ...on => Generic PC HF @Prusa MK3.5 0.8.json} | 7 +- ...5.json => Generic PC HF @Prusa MK3.5.json} | 7 +- ...se.json => Generic PC HF @Prusa base.json} | 4 +- ... => Generic PETG @Prusa CORE One 0.6.json} | 9 +- ... => Generic PETG @Prusa CORE One 0.8.json} | 9 +- ... Generic PETG @Prusa CORE One HF 0.4.json} | 9 +- ... Generic PETG @Prusa CORE One HF 0.5.json} | 9 +- ... Generic PETG @Prusa CORE One HF 0.6.json} | 9 +- ... Generic PETG @Prusa CORE One HF 0.8.json} | 9 +- ...json => Generic PETG @Prusa CORE One.json} | 7 +- ...n => Generic PETG @Prusa MINIIS 0.25.json} | 7 +- ...on => Generic PETG @Prusa MINIIS 0.6.json} | 7 +- ...on => Generic PETG @Prusa MINIIS 0.8.json} | 7 +- ...S.json => Generic PETG @Prusa MINIIS.json} | 9 +- ...on => Generic PETG @Prusa MK3.5 0.25.json} | 7 +- ...son => Generic PETG @Prusa MK3.5 0.6.json} | 7 +- ...son => Generic PETG @Prusa MK3.5 0.8.json} | 7 +- ....5.json => Generic PETG @Prusa MK3.5.json} | 7 +- ...@MK4.json => Generic PETG @Prusa MK4.json} | 7 +- ...json => Generic PETG @Prusa MK4S 0.6.json} | 9 +- ...json => Generic PETG @Prusa MK4S 0.8.json} | 9 +- ...on => Generic PETG @Prusa MK4S HF0.4.json} | 9 +- .../Generic PETG @Prusa MK4S HF0.5.json | 16 + ...on => Generic PETG @Prusa MK4S HF0.6.json} | 9 +- ...on => Generic PETG @Prusa MK4S HF0.8.json} | 9 +- ...K4S.json => Generic PETG @Prusa MK4S.json} | 7 +- ...5T.json => Generic PETG @Prusa XL 5T.json} | 7 +- ...G @XL.json => Generic PETG @Prusa XL.json} | 7 +- ...ase.json => Generic PETG @Prusa base.json} | 4 +- ...ric PETG.json => Generic PETG @Prusa.json} | 7 +- ...=> Generic PETG HF @Prusa MINIIS 0.6.json} | 7 +- ...=> Generic PETG HF @Prusa MINIIS 0.8.json} | 7 +- ...son => Generic PETG HF @Prusa MINIIS.json} | 9 +- ... => Generic PETG HF @Prusa MK3.5 0.6.json} | 7 +- ... => Generic PETG HF @Prusa MK3.5 0.8.json} | 7 +- ...json => Generic PETG HF @Prusa MK3.5.json} | 7 +- ....json => Generic PETG HF @Prusa base.json} | 4 +- .../Generic PLA @Prusa CORE One 0.6.json | 19 + ...n => Generic PLA @Prusa CORE One 0.8.json} | 9 +- ...> Generic PLA @Prusa CORE One HF 0.4.json} | 9 +- ...> Generic PLA @Prusa CORE One HF 0.5.json} | 9 +- ...> Generic PLA @Prusa CORE One HF 0.6.json} | 9 +- ...> Generic PLA @Prusa CORE One HF 0.8.json} | 9 +- ....json => Generic PLA @Prusa CORE One.json} | 7 +- ...on => Generic PLA @Prusa MINIIS 0.25.json} | 7 +- ...son => Generic PLA @Prusa MINIIS 0.6.json} | 7 +- ...son => Generic PLA @Prusa MINIIS 0.8.json} | 7 +- ...IS.json => Generic PLA @Prusa MINIIS.json} | 7 +- ...son => Generic PLA @Prusa MK3.5 0.25.json} | 7 +- ...json => Generic PLA @Prusa MK3.5 0.6.json} | 7 +- ...json => Generic PLA @Prusa MK3.5 0.8.json} | 7 +- ...3.5.json => Generic PLA @Prusa MK3.5.json} | 7 +- ... @MK4.json => Generic PLA @Prusa MK4.json} | 7 +- ....json => Generic PLA @Prusa MK4S 0.6.json} | 9 +- ....json => Generic PLA @Prusa MK4S 0.8.json} | 9 +- ...son => Generic PLA @Prusa MK4S HF0.4.json} | 9 +- ...son => Generic PLA @Prusa MK4S HF0.5.json} | 9 +- ...son => Generic PLA @Prusa MK4S HF0.6.json} | 9 +- ...son => Generic PLA @Prusa MK4S HF0.8.json} | 9 +- ...MK4S.json => Generic PLA @Prusa MK4S.json} | 7 +- ... 5T.json => Generic PLA @Prusa XL 5T.json} | 7 +- ...LA @XL.json => Generic PLA @Prusa XL.json} | 7 +- ...base.json => Generic PLA @Prusa base.json} | 4 +- ...neric PLA.json => Generic PLA @Prusa.json} | 7 +- ... => Generic PLA HF @Prusa MINIIS 0.6.json} | 7 +- ... => Generic PLA HF @Prusa MINIIS 0.8.json} | 7 +- ...json => Generic PLA HF @Prusa MINIIS.json} | 7 +- ...n => Generic PLA HF @Prusa MK3.5 0.6.json} | 7 +- ...n => Generic PLA HF @Prusa MK3.5 0.8.json} | 7 +- ....json => Generic PLA HF @Prusa MK3.5.json} | 7 +- ...e.json => Generic PLA HF @Prusa base.json} | 4 +- ...Generic PLA Silk @Prusa CORE One 0.6.json} | 9 +- .../Generic PLA Silk @Prusa CORE One 0.8.json | 20 + ... => Generic PLA Silk @Prusa CORE One.json} | 7 +- ... => Generic PLA Silk @Prusa MK4S 0.6.json} | 9 +- ... => Generic PLA Silk @Prusa MK4S 0.8.json} | 9 +- ...json => Generic PLA Silk @Prusa MK4S.json} | 9 +- ...=> Generic PLA-CF @Prusa MINIIS 0.25.json} | 7 +- ... => Generic PLA-CF @Prusa MINIIS 0.6.json} | 7 +- ... => Generic PLA-CF @Prusa MINIIS 0.8.json} | 7 +- ...json => Generic PLA-CF @Prusa MINIIS.json} | 7 +- ... => Generic PLA-CF @Prusa MK3.5 0.25.json} | 7 +- ...n => Generic PLA-CF @Prusa MK3.5 0.6.json} | 7 +- ...n => Generic PLA-CF @Prusa MK3.5 0.8.json} | 7 +- ....json => Generic PLA-CF @Prusa MK3.5.json} | 7 +- ...e.json => Generic PLA-CF @Prusa base.json} | 4 +- ...PLA-CF.json => Generic PLA-CF @Prusa.json} | 7 +- ...on => Generic PVA @Prusa MINIIS 0.25.json} | 7 +- ...son => Generic PVA @Prusa MINIIS 0.6.json} | 7 +- ...son => Generic PVA @Prusa MINIIS 0.8.json} | 7 +- ...IS.json => Generic PVA @Prusa MINIIS.json} | 7 +- ...son => Generic PVA @Prusa MK3.5 0.25.json} | 7 +- ...json => Generic PVA @Prusa MK3.5 0.6.json} | 7 +- ...json => Generic PVA @Prusa MK3.5 0.8.json} | 7 +- ...3.5.json => Generic PVA @Prusa MK3.5.json} | 7 +- ...base.json => Generic PVA @Prusa base.json} | 4 +- ...neric PVA.json => Generic PVA @Prusa.json} | 7 +- ... => Generic PVA HF @Prusa MINIIS 0.6.json} | 7 +- ... => Generic PVA HF @Prusa MINIIS 0.8.json} | 7 +- ...json => Generic PVA HF @Prusa MINIIS.json} | 7 +- ...n => Generic PVA HF @Prusa MK3.5 0.6.json} | 7 +- ...n => Generic PVA HF @Prusa MK3.5 0.8.json} | 7 +- ....json => Generic PVA HF @Prusa MK3.5.json} | 7 +- ...e.json => Generic PVA HF @Prusa base.json} | 4 +- ...n => Generic TPU @Prusa CORE One 0.6.json} | 9 +- ...n => Generic TPU @Prusa CORE One 0.8.json} | 9 +- ....json => Generic TPU @Prusa CORE One.json} | 7 +- ...IS.json => Generic TPU @Prusa MINIIS.json} | 7 +- ...3.5.json => Generic TPU @Prusa MK3.5.json} | 7 +- ... @MK4.json => Generic TPU @Prusa MK4.json} | 7 +- .../filament/Generic TPU @Prusa MK4S 0.6.json | 17 + .../filament/Generic TPU @Prusa MK4S 0.8.json | 17 + ...MK4S.json => Generic TPU @Prusa MK4S.json} | 7 +- ...base.json => Generic TPU @Prusa base.json} | 4 +- ...neric TPU.json => Generic TPU @Prusa.json} | 7 +- ...json => Generic TPU HF @Prusa MINIIS.json} | 7 +- ....json => Generic TPU HF @Prusa MK3.5.json} | 7 +- ...e.json => Generic TPU HF @Prusa base.json} | 4 +- .../Prusa Generic ABS @CORE One 0.6.json | 12 - .../Prusa Generic ABS @CORE One 0.8.json | 15 - .../filament/Prusa Generic ABS @MK4S 0.6.json | 12 - .../filament/Prusa Generic ABS @MK4S 0.8.json | 12 - .../Prusa Generic ABS @MK4S HF0.5.json | 15 - .../Prusa Generic ABS @MK4S HF0.6.json | 15 - .../Prusa Generic ABS @MK4S HF0.8.json | 17 - .../Prusa Generic ASA @CORE One 0.6.json | 18 - .../filament/Prusa Generic ASA @MK4S 0.6.json | 14 - .../filament/Prusa Generic ASA @MK4S 0.8.json | 15 - .../Prusa Generic ASA @MK4S HF0.5.json | 15 - .../Prusa Generic ASA @MK4S HF0.6.json | 17 - .../Prusa Generic PETG @MK4S HF0.5.json | 15 - .../Prusa Generic PLA @CORE One 0.6.json | 18 - .../Prusa Generic PLA Silk @CORE One 0.8.json | 19 - .../filament/Prusa Generic TPU @MK4S 0.6.json | 16 - .../filament/Prusa Generic TPU @MK4S 0.8.json | 16 - .../Prusa/machine/Prusa CORE One HF.json | 2 +- .../Prusa/machine/Prusa CORE One L HF.json | 2 +- .../Prusa/machine/Prusa CORE One L.json | 2 +- .../Prusa/machine/Prusa CORE One.json | 2 +- .../Prusa/machine/Prusa MINI 0.25 nozzle.json | 2 +- .../Prusa/machine/Prusa MINI 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa MINI 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa MINI 0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa MINI.json | 2 +- .../machine/Prusa MINIIS 0.25 nozzle.json | 2 +- .../machine/Prusa MINIIS 0.4 nozzle.json | 2 +- .../machine/Prusa MINIIS 0.6 nozzle.json | 2 +- .../machine/Prusa MINIIS 0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa MINIIS.json | 2 +- .../machine/Prusa MK3.5 0.25 nozzle.json | 2 +- .../Prusa/machine/Prusa MK3.5 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa MK3.5 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa MK3.5 0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa MK3.5.json | 2 +- .../Prusa/machine/Prusa MK3S 0.25 nozzle.json | 2 +- .../Prusa/machine/Prusa MK3S 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa MK3S 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa MK3S 0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa MK3S.json | 2 +- .../Prusa/machine/Prusa MK4 0.25 nozzle.json | 2 +- .../Prusa/machine/Prusa MK4 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa MK4 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa MK4 0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa MK4.json | 2 +- .../Prusa/machine/Prusa MK4S 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa MK4S 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa MK4S 0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa MK4S HF.json | 2 +- .../machine/Prusa MK4S HF0.4 nozzle.json | 2 +- .../machine/Prusa MK4S HF0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa MK4S.json | 2 +- .../Prusa/machine/Prusa XL 0.25 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 0.3 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 0.5 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 0.8 nozzle.json | 2 +- .../machine/Prusa XL 5T 0.25 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 5T 0.3 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 5T 0.4 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 5T 0.5 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 5T 0.6 nozzle.json | 2 +- .../Prusa/machine/Prusa XL 5T 0.8 nozzle.json | 2 +- .../profiles/Prusa/machine/Prusa XL 5T.json | 2 +- .../profiles/Prusa/machine/Prusa XL.json | 2 +- .../machine/fdm_machine_common_mk4s.json | 2 +- resources/profiles/Qidi.json | 406 +- ... Generic ABS @Qidi Q1 Pro 0.2 nozzle.json} | 9 +- ... Generic ABS @Qidi Q1 Pro 0.4 nozzle.json} | 11 +- ... Generic ABS @Qidi Q1 Pro 0.6 nozzle.json} | 9 +- ... Generic ABS @Qidi Q1 Pro 0.8 nozzle.json} | 9 +- ...Generic ABS @Qidi X-Max 3 0.2 nozzle.json} | 9 +- ...eneric ABS @Qidi X-Plus 3 0.2 nozzle.json} | 9 +- ...eneric ABS @Qidi X-Plus 4 0.2 nozzle.json} | 9 +- ...eneric ABS @Qidi X-Plus 4 0.4 nozzle.json} | 11 +- ...eneric ABS @Qidi X-Plus 4 0.6 nozzle.json} | 9 +- ...eneric ABS @Qidi X-Plus 4 0.8 nozzle.json} | 9 +- ...neric ABS @Qidi X-Smart 3 0.2 nozzle.json} | 9 +- ...eneric ABS.json => Generic ABS @Qidi.json} | 7 +- ... Generic ASA @Qidi Q1 Pro 0.2 nozzle.json} | 9 +- ... Generic ASA @Qidi Q1 Pro 0.4 nozzle.json} | 11 +- ... Generic ASA @Qidi Q1 Pro 0.6 nozzle.json} | 11 +- ... Generic ASA @Qidi Q1 Pro 0.8 nozzle.json} | 11 +- ...Generic ASA @Qidi X-Max 3 0.2 nozzle.json} | 9 +- ...eneric ASA @Qidi X-Plus 3 0.2 nozzle.json} | 9 +- ...eneric ASA @Qidi X-Plus 4 0.2 nozzle.json} | 9 +- ...eneric ASA @Qidi X-Plus 4 0.4 nozzle.json} | 11 +- ...eneric ASA @Qidi X-Plus 4 0.6 nozzle.json} | 11 +- ...eneric ASA @Qidi X-Plus 4 0.8 nozzle.json} | 11 +- ...neric ASA @Qidi X-Smart 3 0.2 nozzle.json} | 9 +- ...eneric ASA.json => Generic ASA @Qidi.json} | 7 +- ... Generic PA.json => Generic PA @Qidi.json} | 7 +- ...ic PA-CF.json => Generic PA-CF @Qidi.json} | 7 +- ....json => Generic PC @Qidi 0.2 nozzle.json} | 9 +- ....json => Generic PC @Qidi 0.8 nozzle.json} | 9 +- ...> Generic PC @Qidi Q1 Pro 0.2 nozzle.json} | 9 +- ...> Generic PC @Qidi Q1 Pro 0.4 nozzle.json} | 9 +- ...> Generic PC @Qidi Q1 Pro 0.6 nozzle.json} | 9 +- ...> Generic PC @Qidi Q1 Pro 0.8 nozzle.json} | 9 +- ...Generic PC @Qidi X-Plus 4 0.2 nozzle.json} | 9 +- ...Generic PC @Qidi X-Plus 4 0.4 nozzle.json} | 9 +- ...Generic PC @Qidi X-Plus 4 0.6 nozzle.json} | 9 +- ...Generic PC @Qidi X-Plus 4 0.8 nozzle.json} | 9 +- ... Generic PC.json => Generic PC @Qidi.json} | 7 +- ...Generic PETG @Qidi Q1 Pro 0.2 nozzle.json} | 9 +- ...Generic PETG @Qidi Q1 Pro 0.4 nozzle.json} | 11 +- ...Generic PETG @Qidi Q1 Pro 0.6 nozzle.json} | 9 +- ...Generic PETG @Qidi Q1 Pro 0.8 nozzle.json} | 9 +- ...eneric PETG @Qidi X-Max 3 0.2 nozzle.json} | 9 +- ...neric PETG @Qidi X-Plus 3 0.2 nozzle.json} | 9 +- ...neric PETG @Qidi X-Plus 4 0.2 nozzle.json} | 9 +- ...neric PETG @Qidi X-Plus 4 0.4 nozzle.json} | 11 +- ...neric PETG @Qidi X-Plus 4 0.6 nozzle.json} | 9 +- ...neric PETG @Qidi X-Plus 4 0.8 nozzle.json} | 9 +- ...eric PETG @Qidi X-Smart 3 0.2 nozzle.json} | 9 +- ...eric PETG.json => Generic PETG @Qidi.json} | 7 +- ...ETG-CF.json => Generic PETG-CF @Qidi.json} | 7 +- ... Generic PLA @Qidi Q1 Pro 0.2 nozzle.json} | 9 +- ... Generic PLA @Qidi Q1 Pro 0.4 nozzle.json} | 11 +- ... Generic PLA @Qidi Q1 Pro 0.6 nozzle.json} | 9 +- ... Generic PLA @Qidi Q1 Pro 0.8 nozzle.json} | 9 +- ...Generic PLA @Qidi X-Max 3 0.2 nozzle.json} | 9 +- .../Generic PLA @Qidi X-Max 3 0.6 nozzle.json | 16 + .../Generic PLA @Qidi X-Max 3 0.8 nozzle.json | 16 + ...eneric PLA @Qidi X-Plus 3 0.2 nozzle.json} | 9 +- ...Generic PLA @Qidi X-Plus 3 0.6 nozzle.json | 16 + ...Generic PLA @Qidi X-Plus 3 0.8 nozzle.json | 16 + ...eneric PLA @Qidi X-Plus 4 0.2 nozzle.json} | 9 +- ...eneric PLA @Qidi X-Plus 4 0.4 nozzle.json} | 11 +- ...eneric PLA @Qidi X-Plus 4 0.6 nozzle.json} | 9 +- ...eneric PLA @Qidi X-Plus 4 0.8 nozzle.json} | 9 +- ...neric PLA @Qidi X-Smart 3 0.2 nozzle.json} | 9 +- ...eneric PLA @Qidi X-Smart 3 0.6 nozzle.json | 16 + ...eneric PLA @Qidi X-Smart 3 0.8 nozzle.json | 16 + ...eneric PLA.json => Generic PLA @Qidi.json} | 7 +- ... High Speed @Qidi X-Plus 4 0.2 nozzle.json | 25 + ... High Speed @Qidi X-Plus 4 0.4 nozzle.json | 25 + ...High Speed @Qidi X-Plus 4 0.6 nozzle.json} | 9 +- ...High Speed @Qidi X-Plus 4 0.8 nozzle.json} | 9 +- ...ric PLA Silk @Qidi Q1 Pro 0.4 nozzle.json} | 9 +- ...c PLA Silk @Qidi X-Plus 4 0.4 nozzle.json} | 9 +- ... Silk.json => Generic PLA Silk @Qidi.json} | 7 +- ...Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json} | 9 +- ...Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json} | 11 +- ...Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json} | 9 +- ...Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json} | 9 +- ...eneric PLA+ @Qidi X-Max 3 0.2 nozzle.json} | 9 +- ...Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json | 16 + ...Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json | 16 + ...neric PLA+ @Qidi X-Plus 3 0.2 nozzle.json} | 9 +- ...eneric PLA+ @Qidi X-Plus 3 0.6 nozzle.json | 16 + ...eneric PLA+ @Qidi X-Plus 3 0.8 nozzle.json | 16 + ...neric PLA+ @Qidi X-Plus 4 0.2 nozzle.json} | 9 +- ...neric PLA+ @Qidi X-Plus 4 0.4 nozzle.json} | 11 +- ...neric PLA+ @Qidi X-Plus 4 0.6 nozzle.json} | 9 +- ...neric PLA+ @Qidi X-Plus 4 0.8 nozzle.json} | 9 +- ...eric PLA+ @Qidi X-Smart 3 0.2 nozzle.json} | 9 +- ...neric PLA+ @Qidi X-Smart 3 0.6 nozzle.json | 16 + ...neric PLA+ @Qidi X-Smart 3 0.8 nozzle.json | 16 + ...eric PLA+.json => Generic PLA+ @Qidi.json} | 7 +- ... PLA-CF.json => Generic PLA-CF @Qidi.json} | 7 +- ...eneric PVA.json => Generic PVA @Qidi.json} | 7 +- ...eric TPU 95A @Qidi Q1 Pro 0.8 nozzle.json} | 11 +- ...ic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json} | 11 +- ...PU 95A.json => Generic TPU 95A @Qidi.json} | 7 +- ... Generic TPU @Qidi Q1 Pro 0.4 nozzle.json} | 11 +- ...eneric TPU @Qidi X-Plus 4 0.4 nozzle.json} | 11 +- ...eneric TPU.json => Generic TPU @Qidi.json} | 7 +- .../QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json | 2 +- ... Generic PLA @Qidi X-Max 3 0.6 nozzle.json | 15 - ... Generic PLA @Qidi X-Max 3 0.8 nozzle.json | 15 - ...Generic PLA @Qidi X-Plus 3 0.6 nozzle.json | 15 - ...Generic PLA @Qidi X-Plus 3 0.8 nozzle.json | 15 - ...eneric PLA @Qidi X-Smart 3 0.6 nozzle.json | 15 - ...eneric PLA @Qidi X-Smart 3 0.8 nozzle.json | 15 - ... High Speed @Qidi X-Plus 4 0.2 nozzle.json | 24 - ... High Speed @Qidi X-Plus 4 0.4 nozzle.json | 24 - ...Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json | 15 - ...Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json | 15 - ...eneric PLA+ @Qidi X-Plus 3 0.6 nozzle.json | 15 - ...eneric PLA+ @Qidi X-Plus 3 0.8 nozzle.json | 15 - ...neric PLA+ @Qidi X-Smart 3 0.6 nozzle.json | 15 - ...neric PLA+ @Qidi X-Smart 3 0.8 nozzle.json | 15 - .../Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json | 2 +- .../Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json | 2 +- .../profiles/Qidi/machine/Qidi Q1 Pro.json | 2 +- .../machine/Qidi X-CF Pro 0.4 nozzle.json | 2 +- .../profiles/Qidi/machine/Qidi X-CF Pro.json | 2 +- .../Qidi/machine/Qidi X-Max 0.4 nozzle.json | 2 +- .../Qidi/machine/Qidi X-Max 3 0.2 nozzle.json | 2 +- .../Qidi/machine/Qidi X-Max 3 0.4 nozzle.json | 2 +- .../Qidi/machine/Qidi X-Max 3 0.6 nozzle.json | 2 +- .../Qidi/machine/Qidi X-Max 3 0.8 nozzle.json | 2 +- .../profiles/Qidi/machine/Qidi X-Max 3.json | 2 +- .../profiles/Qidi/machine/Qidi X-Max.json | 2 +- .../Qidi/machine/Qidi X-Plus 0.4 nozzle.json | 2 +- .../machine/Qidi X-Plus 3 0.2 nozzle.json | 2 +- .../machine/Qidi X-Plus 3 0.4 nozzle.json | 2 +- .../machine/Qidi X-Plus 3 0.6 nozzle.json | 2 +- .../machine/Qidi X-Plus 3 0.8 nozzle.json | 2 +- .../profiles/Qidi/machine/Qidi X-Plus 3.json | 2 +- .../machine/Qidi X-Plus 4 0.2 nozzle.json | 2 +- .../machine/Qidi X-Plus 4 0.4 nozzle.json | 2 +- .../machine/Qidi X-Plus 4 0.6 nozzle.json | 2 +- .../machine/Qidi X-Plus 4 0.8 nozzle.json | 2 +- .../profiles/Qidi/machine/Qidi X-Plus 4.json | 2 +- .../profiles/Qidi/machine/Qidi X-Plus.json | 2 +- .../machine/Qidi X-Smart 3 0.2 nozzle.json | 2 +- .../machine/Qidi X-Smart 3 0.4 nozzle.json | 2 +- .../machine/Qidi X-Smart 3 0.6 nozzle.json | 2 +- .../machine/Qidi X-Smart 3 0.8 nozzle.json | 2 +- .../profiles/Qidi/machine/Qidi X-Smart 3.json | 2 +- .../Qidi/machine/fdm_qidi_common.json | 2 +- resources/profiles/Ratrig.json | 46 +- ...eric ABS.json => Generic ABS @RatRig.json} | 7 +- ...eric ASA.json => Generic ASA @RatRig.json} | 7 +- ...eneric PA.json => Generic PA @RatRig.json} | 7 +- ... PA-CF.json => Generic PA-CF @RatRig.json} | 7 +- ...eneric PC.json => Generic PC @RatRig.json} | 7 +- ...ic PCTG.json => Generic PCTG @RatRig.json} | 10 +- ...ic PETG.json => Generic PETG @RatRig.json} | 7 +- ...eric PLA.json => Generic PLA @RatRig.json} | 7 +- ...LA-CF.json => Generic PLA-CF @RatRig.json} | 7 +- ...eric PVA.json => Generic PVA @RatRig.json} | 7 +- ...eric TPU.json => Generic TPU @RatRig.json} | 7 +- .../Ratrig/machine/RatRig V-Cast.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 200.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 300.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 400.json | 2 +- .../Ratrig/machine/RatRig V-Core 3 500.json | 2 +- .../Ratrig/machine/RatRig V-Core 4 300.json | 2 +- .../Ratrig/machine/RatRig V-Core 4 400.json | 2 +- .../Ratrig/machine/RatRig V-Core 4 500.json | 2 +- .../machine/RatRig V-Core 4 HYBRID 300.json | 2 +- .../machine/RatRig V-Core 4 HYBRID 400.json | 2 +- .../machine/RatRig V-Core 4 HYBRID 500.json | 2 +- .../RatRig V-Core 4 IDEX 300 COPY MODE.json | 2 +- .../RatRig V-Core 4 IDEX 300 MIRROR MODE.json | 2 +- .../machine/RatRig V-Core 4 IDEX 300.json | 2 +- .../RatRig V-Core 4 IDEX 400 COPY MODE.json | 2 +- .../RatRig V-Core 4 IDEX 400 MIRROR MODE.json | 2 +- .../machine/RatRig V-Core 4 IDEX 400.json | 2 +- .../RatRig V-Core 4 IDEX 500 COPY MODE.json | 2 +- .../RatRig V-Core 4 IDEX 500 MIRROR MODE.json | 2 +- .../machine/RatRig V-Core 4 IDEX 500.json | 2 +- .../Ratrig/machine/RatRig V-Minion.json | 2 +- .../Ratrig/machine/fdm_klipper_common.json | 2 +- resources/profiles/SecKit.json | 42 +- ...eric ABS.json => Generic ABS @SecKit.json} | 7 +- ...eric ASA.json => Generic ASA @SecKit.json} | 7 +- ...eneric PA.json => Generic PA @SecKit.json} | 7 +- ... PA-CF.json => Generic PA-CF @SecKit.json} | 7 +- ...eneric PC.json => Generic PC @SecKit.json} | 7 +- ...ic PETG.json => Generic PETG @SecKit.json} | 7 +- ...eric PLA.json => Generic PLA @SecKit.json} | 7 +- ...LA-CF.json => Generic PLA-CF @SecKit.json} | 7 +- ...eric PVA.json => Generic PVA @SecKit.json} | 7 +- ...eric TPU.json => Generic TPU @SecKit.json} | 7 +- .../SecKit/machine/SecKit SK-Tank.json | 2 +- .../profiles/SecKit/machine/Seckit Go3.json | 2 +- .../SecKit/machine/fdm_klipper_common.json | 2 +- resources/profiles/Tiertime.json | 226 +- ....json => Generic ABS @Tiertime 300HS.json} | 7 +- ...ic ABS.json => Generic ABS @Tiertime.json} | 7 +- ....json => Generic ASA @Tiertime 300HS.json} | 7 +- ...ic ASA.json => Generic ASA @Tiertime.json} | 7 +- ...json => Generic BVOH @Tiertime 300HS.json} | 7 +- ... BVOH.json => Generic BVOH @Tiertime.json} | 7 +- ....json => Generic EVA @Tiertime 300HS.json} | 7 +- ...ic EVA.json => Generic EVA @Tiertime.json} | 7 +- ...json => Generic HIPS @Tiertime 300HS.json} | 7 +- ... HIPS.json => Generic HIPS @Tiertime.json} | 7 +- ...S.json => Generic PA @Tiertime 300HS.json} | 7 +- ...eric PA.json => Generic PA @Tiertime.json} | 7 +- ...son => Generic PA-CF @Tiertime 300HS.json} | 7 +- ...A-CF.json => Generic PA-CF @Tiertime.json} | 7 +- ...S.json => Generic PC @Tiertime 300HS.json} | 7 +- ...eric PC.json => Generic PC @Tiertime.json} | 7 +- ...json => Generic PCTG @Tiertime 300HS.json} | 7 +- ... PCTG.json => Generic PCTG @Tiertime.json} | 7 +- ...S.json => Generic PE @Tiertime 300HS.json} | 7 +- ...eric PE.json => Generic PE @Tiertime.json} | 7 +- ...son => Generic PE-CF @Tiertime 300HS.json} | 7 +- ...E-CF.json => Generic PE-CF @Tiertime.json} | 7 +- ...json => Generic PETG @Tiertime 300HS.json} | 7 +- ... PETG.json => Generic PETG @Tiertime.json} | 7 +- ...n => Generic PETG-CF @Tiertime 300HS.json} | 7 +- ...CF.json => Generic PETG-CF @Tiertime.json} | 7 +- ....json => Generic PHA @Tiertime 300HS.json} | 7 +- ...ic PHA.json => Generic PHA @Tiertime.json} | 7 +- ....json => Generic PLA @Tiertime 300HS.json} | 7 +- ...ic PLA.json => Generic PLA @Tiertime.json} | 7 +- ...neric PLA High Speed @Tiertime 300HS.json} | 7 +- ... => Generic PLA High Speed @Tiertime.json} | 7 +- ... => Generic PLA Silk @Tiertime 300HS.json} | 7 +- ...k.json => Generic PLA Silk @Tiertime.json} | 7 +- ...on => Generic PLA-CF @Tiertime 300HS.json} | 7 +- ...-CF.json => Generic PLA-CF @Tiertime.json} | 7 +- ...S.json => Generic PP @Tiertime 300HS.json} | 7 +- ...eric PP.json => Generic PP @Tiertime.json} | 7 +- ...son => Generic PP-CF @Tiertime 300HS.json} | 7 +- ...P-CF.json => Generic PP-CF @Tiertime.json} | 7 +- ...son => Generic PP-GF @Tiertime 300HS.json} | 7 +- ...P-GF.json => Generic PP-GF @Tiertime.json} | 7 +- ...on => Generic PPA-CF @Tiertime 300HS.json} | 7 +- ...-CF.json => Generic PPA-CF @Tiertime.json} | 7 +- ...on => Generic PPA-GF @Tiertime 300HS.json} | 7 +- ...-GF.json => Generic PPA-GF @Tiertime.json} | 7 +- ....json => Generic PPS @Tiertime 300HS.json} | 7 +- ...ic PPS.json => Generic PPS @Tiertime.json} | 7 +- ...on => Generic PPS-CF @Tiertime 300HS.json} | 7 +- ...-CF.json => Generic PPS-CF @Tiertime.json} | 7 +- ....json => Generic PVA @Tiertime 300HS.json} | 7 +- ...ic PVA.json => Generic PVA @Tiertime.json} | 7 +- ....json => Generic SBS @Tiertime 300HS.json} | 7 +- ...ic SBS.json => Generic SBS @Tiertime.json} | 7 +- ....json => Generic TPU @Tiertime 300HS.json} | 7 +- ...ic TPU.json => Generic TPU @Tiertime.json} | 7 +- resources/profiles/TwoTrees.json | 10 +- ...son => Generic 95A TPU @TwoTrees SK1.json} | 7 +- ...json => Generic HS PLA @TwoTrees SK1.json} | 7 +- .../TwoTrees/machine/TwoTrees SK1.json | 2 +- resources/profiles/Vzbot.json | 42 +- ...neric ABS.json => Generic ABS @Vzbot.json} | 7 +- ...neric ASA.json => Generic ASA @Vzbot.json} | 7 +- ...Generic PA.json => Generic PA @Vzbot.json} | 7 +- ...c PA-CF.json => Generic PA-CF @Vzbot.json} | 7 +- ...Generic PC.json => Generic PC @Vzbot.json} | 7 +- ...ric PETG.json => Generic PETG @Vzbot.json} | 7 +- ...neric PLA.json => Generic PLA @Vzbot.json} | 7 +- ...PLA-CF.json => Generic PLA-CF @Vzbot.json} | 7 +- ...neric PVA.json => Generic PVA @Vzbot.json} | 7 +- ...neric TPU.json => Generic TPU @Vzbot.json} | 7 +- .../profiles/Vzbot/machine/Vzbot 235 AWD.json | 2 +- .../profiles/Vzbot/machine/Vzbot 330 AWD.json | 2 +- .../Vzbot/machine/fdm_klipper_common.json | 2 +- resources/profiles/Wanhao France.json | 10 +- ...eric PETG.json => Generic PETG @Yumi.json} | 4 +- ...eneric PLA.json => Generic PLA @Yumi.json} | 4 +- .../Wanhao France/filament/YUMI PETG.json | 2 +- .../filament/YUMI PLA Bowden.json | 2 +- .../filament/YUMI PLA Direct Drive.json | 2 +- .../filament/Generic ABS @Z-Bolt Base.json | 1 - .../filament/Generic ABS HT @Z-Bolt Base.json | 1 - .../filament/Generic PA @Z-Bolt Base.json | 1 - .../filament/Generic PETG @Z-Bolt Base.json | 1 - .../filament/Generic PLA @Z-Bolt Base.json | 1 - resources/profiles/retired_filament_ids.json | 1570 +++++++ scripts/filament_id_snapshot.json | 4128 ++++------------- 1585 files changed, 11776 insertions(+), 11606 deletions(-) delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA Silk 0.2 nozzle.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA Silk 0.25 nozzle.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA Silk.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA+ 0.2 nozzle.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA+ 0.25 nozzle.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA+.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA-CF.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PLA.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic PVA.json delete mode 100644 resources/profiles/Anker/filament/Anker Generic TPU.json rename resources/profiles/Anker/filament/{Anker Generic ABS 0.2 nozzle.json => Generic ABS @Anker 0.2 nozzle.json} (58%) rename resources/profiles/Anker/filament/{Anker Generic PETG 0.25 nozzle.json => Generic ABS @Anker 0.25 nozzle.json} (58%) rename resources/profiles/{Prusa/filament/Prusa Generic ABS @base.json => Anker/filament/Generic ABS @Anker base.json} (61%) rename resources/profiles/Anker/filament/{Anker Generic ASA.json => Generic ABS @Anker.json} (65%) rename resources/profiles/Anker/filament/{Anker Generic PETG 0.2 nozzle.json => Generic ASA @Anker 0.2 nozzle.json} (58%) rename resources/profiles/Anker/filament/{Anker Generic ABS 0.25 nozzle.json => Generic ASA @Anker 0.25 nozzle.json} (58%) rename resources/profiles/Anker/filament/{Anker Generic ASA @base.json => Generic ASA @Anker base.json} (61%) rename resources/profiles/Anker/filament/{Anker Generic PETG-CF.json => Generic ASA @Anker.json} (65%) rename resources/profiles/Anker/filament/{Anker Generic PA 0.2 nozzle.json => Generic PA @Anker 0.2 nozzle.json} (55%) rename resources/profiles/Anker/filament/{Anker Generic PA 0.25 nozzle.json => Generic PA @Anker 0.25 nozzle.json} (55%) rename resources/profiles/{Prusa/filament/Prusa Generic PA @base.json => Anker/filament/Generic PA @Anker base.json} (61%) rename resources/profiles/Anker/filament/{Anker Generic PC.json => Generic PA @Anker.json} (60%) rename resources/profiles/Anker/filament/{Anker Generic PA-CF @base.json => Generic PA-CF @Anker base.json} (79%) rename resources/profiles/Anker/filament/{Anker Generic PA.json => Generic PA-CF @Anker.json} (59%) rename resources/profiles/Anker/filament/{Anker Generic PC 0.2 nozzle.json => Generic PC @Anker 0.2 nozzle.json} (55%) rename resources/profiles/Anker/filament/{Anker Generic PC 0.25 nozzle.json => Generic PC @Anker 0.25 nozzle.json} (55%) rename resources/profiles/Anker/filament/{Anker Generic PC @base.json => Generic PC @Anker base.json} (61%) rename resources/profiles/Anker/filament/{Anker Generic PA-CF.json => Generic PC @Anker.json} (60%) rename resources/profiles/Anker/filament/{Anker Generic PLA 0.2 nozzle.json => Generic PETG @Anker 0.2 nozzle.json} (57%) rename resources/profiles/Anker/filament/{Anker Generic ASA 0.25 nozzle.json => Generic PETG @Anker 0.25 nozzle.json} (57%) rename resources/profiles/Anker/filament/{Anker Generic PETG @base.json => Generic PETG @Anker base.json} (83%) create mode 100644 resources/profiles/Anker/filament/Generic PETG @Anker.json rename resources/profiles/Anker/filament/{Anker Generic PETG-CF @base.json => Generic PETG-CF @Anker base.json} (86%) create mode 100644 resources/profiles/Anker/filament/Generic PETG-CF @Anker.json rename resources/profiles/Anker/filament/{Anker Generic ASA 0.2 nozzle.json => Generic PLA @Anker 0.2 nozzle.json} (58%) rename resources/profiles/Anker/filament/{Anker Generic PLA 0.25 nozzle.json => Generic PLA @Anker 0.25 nozzle.json} (58%) rename resources/profiles/Anker/filament/{Anker Generic PLA @base.json => Generic PLA @Anker base.json} (61%) rename resources/profiles/Anker/filament/{Anker Generic PETG.json => Generic PLA @Anker.json} (65%) create mode 100644 resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.2 nozzle.json create mode 100644 resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.25 nozzle.json rename resources/profiles/Anker/filament/{Anker Generic PLA Silk @base.json => Generic PLA Silk @Anker base.json} (87%) create mode 100644 resources/profiles/Anker/filament/Generic PLA Silk @Anker.json create mode 100644 resources/profiles/Anker/filament/Generic PLA+ @Anker 0.2 nozzle.json create mode 100644 resources/profiles/Anker/filament/Generic PLA+ @Anker 0.25 nozzle.json rename resources/profiles/Anker/filament/{Anker Generic PLA+ @base.json => Generic PLA+ @Anker base.json} (82%) create mode 100644 resources/profiles/Anker/filament/Generic PLA+ @Anker.json rename resources/profiles/Anker/filament/{Anker Generic PLA-CF @base.json => Generic PLA-CF @Anker base.json} (88%) create mode 100644 resources/profiles/Anker/filament/Generic PLA-CF @Anker.json rename resources/profiles/Anker/filament/{Anker Generic PVA @base.json => Generic PVA @Anker base.json} (61%) rename resources/profiles/Anker/filament/{Anker Generic ABS.json => Generic PVA @Anker.json} (65%) rename resources/profiles/Anker/filament/{Anker Generic TPU @base.json => Generic TPU @Anker base.json} (81%) create mode 100644 resources/profiles/Anker/filament/Generic TPU @Anker.json rename resources/profiles/Anycubic/filament/{Anycubic Generic ABS.json => Generic ABS @Anycubic.json} (80%) rename resources/profiles/Anycubic/filament/{Anycubic Generic ASA.json => Generic ASA @Anycubic.json} (81%) rename resources/profiles/Anycubic/filament/{Anycubic Generic PA.json => Generic PA @Anycubic.json} (80%) rename resources/profiles/Anycubic/filament/{Anycubic Generic PA-CF.json => Generic PA-CF @Anycubic.json} (80%) rename resources/profiles/Anycubic/filament/{Anycubic Generic PC.json => Generic PC @Anycubic.json} (79%) rename resources/profiles/Anycubic/filament/{Anycubic Generic PETG.json => Generic PETG @Anycubic.json} (87%) rename resources/profiles/Anycubic/filament/{Anycubic Generic PLA.json => Generic PLA @Anycubic.json} (84%) rename resources/profiles/Anycubic/filament/{Anycubic Generic PLA-CF.json => Generic PLA-CF @Anycubic.json} (80%) rename resources/profiles/Anycubic/filament/{Anycubic Generic PVA.json => Generic PVA @Anycubic.json} (81%) rename resources/profiles/Anycubic/filament/{Anycubic Generic TPU.json => Generic TPU @Anycubic.json} (78%) rename resources/profiles/Artillery/filament/{Artillery Generic ABS.json => Generic ABS @Artillery.json} (74%) rename resources/profiles/Artillery/filament/{Artillery Generic ASA.json => Generic ASA @Artillery.json} (74%) rename resources/profiles/Artillery/filament/{Artillery Generic PETG.json => Generic PETG @Artillery.json} (84%) rename resources/profiles/Artillery/filament/{Artillery Generic PLA.json => Generic PLA @Artillery.json} (81%) rename resources/profiles/Artillery/filament/{Artillery Generic PLA-CF.json => Generic PLA-CF @Artillery.json} (81%) rename resources/profiles/Artillery/filament/{Artillery Generic TPU.json => Generic TPU @Artillery.json} (72%) rename resources/profiles/Blocks/filament/{Blocks Generic ABS.json => Generic ABS @Blocks.json} (90%) rename resources/profiles/Blocks/filament/{Blocks Generic ASA.json => Generic ASA @Blocks.json} (90%) rename resources/profiles/Blocks/filament/{Blocks Generic ASA-CF.json => Generic ASA-CF @Blocks.json} (88%) rename resources/profiles/Blocks/filament/{Blocks Generic PA.json => Generic PA @Blocks.json} (74%) rename resources/profiles/Blocks/filament/{Blocks Generic PA-CF.json => Generic PA-CF @Blocks.json} (91%) rename resources/profiles/Blocks/filament/{Blocks Generic PC.json => Generic PC @Blocks.json} (74%) rename resources/profiles/Blocks/filament/{Blocks Generic PETG.json => Generic PETG @Blocks.json} (91%) rename resources/profiles/Blocks/filament/{Blocks Generic PLA.json => Generic PLA @Blocks.json} (87%) rename resources/profiles/Blocks/filament/{Blocks Generic PLA-CF.json => Generic PLA-CF @Blocks.json} (76%) rename resources/profiles/Blocks/filament/{Blocks Generic PVA.json => Generic PVA @Blocks.json} (74%) rename resources/profiles/Blocks/filament/{Blocks Generic TPU.json => Generic TPU @Blocks.json} (89%) rename resources/profiles/CONSTRUCT3D/filament/{C1 Generic High Flow PETG.json => Generic High Flow PETG @C1.json} (84%) rename resources/profiles/CONSTRUCT3D/filament/{C1 Generic PETG.json => Generic PETG @C1.json} (83%) rename resources/profiles/CONSTRUCT3D/filament/{C1 Generic PLA.json => Generic PLA @C1.json} (75%) rename resources/profiles/Chuanying/filament/{Chuanying Generic ABS.json => Generic ABS @Chuanying.json} (85%) rename resources/profiles/Chuanying/filament/{Chuanying Generic ASA.json => Generic ASA @Chuanying.json} (95%) rename resources/profiles/Chuanying/filament/{Chuanying Generic HIPS.json => Generic HIPS @Chuanying.json} (94%) rename resources/profiles/Chuanying/filament/{Chuanying Generic HS PLA.json => Generic HS PLA @Chuanying.json} (96%) rename resources/profiles/Chuanying/filament/{Chuanying Generic PETG.json => Generic PETG @Chuanying.json} (90%) rename resources/profiles/Chuanying/filament/{Chuanying Generic PETG-CF10.json => Generic PETG-CF10 @Chuanying.json} (94%) rename resources/profiles/Chuanying/filament/{Chuanying Generic PLA.json => Generic PLA @Chuanying.json} (87%) rename resources/profiles/Chuanying/filament/{Chuanying Generic PLA-CF10.json => Generic PLA-CF10 @Chuanying.json} (96%) rename resources/profiles/Chuanying/filament/{Chuanying Generic PLA-Silk.json => Generic PLA-Silk @Chuanying.json} (87%) rename resources/profiles/Chuanying/filament/{Chuanying Generic PVA.json => Generic PVA @Chuanying.json} (94%) rename resources/profiles/Chuanying/filament/{Chuanying Generic TPU.json => Generic TPU @Chuanying.json} (95%) rename resources/profiles/Co Print/filament/{CoPrint Generic ABS.json => Generic ABS @CoPrint.json} (86%) rename resources/profiles/Co Print/filament/{CoPrint Generic PETG.json => Generic PETG @CoPrint.json} (79%) rename resources/profiles/Co Print/filament/{CoPrint Generic PLA.json => Generic PLA @CoPrint.json} (68%) rename resources/profiles/Co Print/filament/{CoPrint Generic TPU.json => Generic TPU @CoPrint.json} (81%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic ABS @CoLiDo DIY 4.0.json => Generic ABS @CoLiDo DIY 4.0.json} (73%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic ABS @CoLiDo X16.json => Generic ABS @CoLiDo X16.json} (75%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic PETG @CoLiDo DIY 4.0.json => Generic PETG @CoLiDo DIY 4.0.json} (84%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic PETG @CoLiDo X16.json => Generic PETG @CoLiDo X16.json} (85%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic PLA @CoLiDo DIY 4.0.json => Generic PLA @CoLiDo DIY 4.0.json} (77%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic PLA @CoLiDo X16.json => Generic PLA @CoLiDo X16.json} (78%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic TPU @CoLiDo DIY 4.0.json => Generic TPU @CoLiDo DIY 4.0.json} (74%) rename resources/profiles/CoLiDo/filament/{CoLiDo Generic TPU @CoLiDo X16.json => Generic TPU @CoLiDo X16.json} (76%) rename resources/profiles/Comgrow/filament/{Comgrow Generic ABS.json => Generic ABS @Comgrow.json} (72%) rename resources/profiles/Comgrow/filament/{Comgrow Generic PETG.json => Generic PETG @Comgrow.json} (85%) rename resources/profiles/Comgrow/filament/{Comgrow Generic PLA.json => Generic PLA @Comgrow.json} (73%) delete mode 100644 resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json delete mode 100644 resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json delete mode 100644 resources/profiles/Creality/filament/Creality Generic PLA-CF @Hi-all.json rename resources/profiles/Creality/filament/{Creality Generic ABS @Ender-3V3-all.json => Generic ABS @Creality Ender-3V3-all.json} (71%) rename resources/profiles/Creality/filament/{Creality Generic ABS @Ender-5Max-all.json => Generic ABS @Creality Ender-5Max-all.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic ABS @Hi-all.json => Generic ABS @Creality Hi-all.json} (67%) rename resources/profiles/Creality/filament/{Creality Generic ABS @K1-all.json => Generic ABS @Creality K1-all.json} (53%) rename resources/profiles/Creality/filament/{Creality Generic ABS @K2-all.json => Generic ABS @Creality K2-all.json} (70%) rename resources/profiles/Creality/filament/{Creality Generic ABS.json => Generic ABS @Creality.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic ASA @Ender-3V3-all.json => Generic ASA @Creality Ender-3V3-all.json} (71%) rename resources/profiles/Creality/filament/{Creality Generic ASA @Ender-5Max-all.json => Generic ASA @Creality Ender-5Max-all.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic ASA @Hi-all.json => Generic ASA @Creality Hi-all.json} (68%) rename resources/profiles/Creality/filament/{Creality Generic ASA @K1-all.json => Generic ASA @Creality K1-all.json} (53%) rename resources/profiles/Creality/filament/{Creality Generic ASA @K2-all.json => Generic ASA @Creality K2-all.json} (77%) rename resources/profiles/Creality/filament/{Creality Generic ASA.json => Generic ASA @Creality.json} (92%) create mode 100644 resources/profiles/Creality/filament/Generic ASA-CF @Creality Hi-all.json rename resources/profiles/Creality/filament/{Creality Generic PA @Ender-5Max-all.json => Generic PA @Creality Ender-5Max-all.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic PA-CF @Ender-3V3-all.json => Generic PA-CF @Creality Ender-3V3-all.json} (53%) rename resources/profiles/Creality/filament/{Creality Generic PA-CF @K1-all.json => Generic PA-CF @Creality K1-all.json} (65%) rename resources/profiles/Creality/filament/{Creality Generic PA-CF @K2-all.json => Generic PA-CF @Creality K2-all.json} (75%) rename resources/profiles/Creality/filament/{Creality Generic PA-CF.json => Generic PA-CF @Creality.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic PC @K1-all.json => Generic PC @Creality K1-all.json} (69%) rename resources/profiles/Creality/filament/{Creality Generic PC.json => Generic PC @Creality.json} (75%) rename resources/profiles/Creality/filament/{Creality Generic PETG @Ender-3V3-all.json => Generic PETG @Creality Ender-3V3-all.json} (81%) rename resources/profiles/Creality/filament/{Creality Generic PETG @Ender-5Max-all.json => Generic PETG @Creality Ender-5Max-all.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic PETG @Hi-all.json => Generic PETG @Creality Hi-all.json} (80%) rename resources/profiles/Creality/filament/{Creality Generic PETG @K1-all.json => Generic PETG @Creality K1-all.json} (75%) rename resources/profiles/Creality/filament/{Creality Generic PETG @K2-all.json => Generic PETG @Creality K2-all.json} (79%) rename resources/profiles/Creality/filament/{Creality Generic PETG.json => Generic PETG @Creality.json} (94%) create mode 100644 resources/profiles/Creality/filament/Generic PETG-CF @Creality Hi-all.json rename resources/profiles/Creality/filament/{Creality Generic PLA @Ender-3V3-all.json => Generic PLA @Creality Ender-3V3-all.json} (80%) rename resources/profiles/Creality/filament/{Creality Generic PLA @Ender-5Max-all.json => Generic PLA @Creality Ender-5Max-all.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic PLA @K1-all.json => Generic PLA @Creality K1-all.json} (72%) rename resources/profiles/Creality/filament/{Creality Generic PLA @K2-all.json => Generic PLA @Creality K2-all.json} (78%) rename resources/profiles/Creality/filament/{Creality Generic PLA.json => Generic PLA @Creality.json} (94%) rename resources/profiles/Creality/filament/{Creality HF Generic PLA.json => Generic PLA HF @Creality.json} (81%) rename resources/profiles/Creality/filament/{Creality Generic PLA High Speed @Ender-3V3-all.json => Generic PLA High Speed @Creality Ender-3V3-all.json} (63%) rename resources/profiles/Creality/filament/{Creality Generic PLA High Speed @Hi-all.json => Generic PLA High Speed @Creality Hi-all.json} (57%) rename resources/profiles/Creality/filament/{Creality Generic PLA High Speed @K1-all.json => Generic PLA High Speed @Creality K1-all.json} (63%) rename resources/profiles/Creality/filament/{Creality Generic PLA High Speed @K2-all.json => Generic PLA High Speed @Creality K2-all.json} (66%) rename resources/profiles/Creality/filament/{Creality Generic PLA Matte @Ender-3V3-all.json => Generic PLA Matte @Creality Ender-3V3-all.json} (64%) rename resources/profiles/Creality/filament/{Creality Generic PLA Matte @Hi-all.json => Generic PLA Matte @Creality Hi-all.json} (55%) rename resources/profiles/Creality/filament/{Creality Generic PLA Matte @K1-all.json => Generic PLA Matte @Creality K1-all.json} (65%) rename resources/profiles/Creality/filament/{Creality Generic PLA Matte @K2-all.json => Generic PLA Matte @Creality K2-all.json} (67%) rename resources/profiles/Creality/filament/{Creality Generic PLA Silk @Ender-3V3-all.json => Generic PLA Silk @Creality Ender-3V3-all.json} (64%) rename resources/profiles/Creality/filament/{Creality Generic PLA Silk @Hi-all.json => Generic PLA Silk @Creality Hi-all.json} (59%) rename resources/profiles/Creality/filament/{Creality Generic PLA Silk @K1-all.json => Generic PLA Silk @Creality K1-all.json} (65%) rename resources/profiles/Creality/filament/{Creality Generic PLA Silk @K2-all.json => Generic PLA Silk @Creality K2-all.json} (68%) rename resources/profiles/Creality/filament/{Creality Generic PLA Wood @Hi-all.json => Generic PLA Wood @Creality Hi-all.json} (59%) create mode 100644 resources/profiles/Creality/filament/Generic PLA-CF @Creality Hi-all.json rename resources/profiles/Creality/filament/{Creality Generic PLA-CF @K1-all.json => Generic PLA-CF @Creality K1-all.json} (65%) rename resources/profiles/Creality/filament/{Creality Generic PLA-CF @K2-all.json => Generic PLA-CF @Creality K2-all.json} (70%) rename resources/profiles/Creality/filament/{Creality Generic PLA-CF.json => Generic PLA-CF @Creality.json} (92%) rename resources/profiles/Creality/filament/{Creality HF Generic Speed PLA.json => Generic Speed PLA @Creality HF.json} (79%) rename resources/profiles/Creality/filament/{Creality Generic TPU @Ender-3V3-all.json => Generic TPU @Creality Ender-3V3-all.json} (78%) rename resources/profiles/Creality/filament/{Creality Generic TPU @Ender-5Max-all.json => Generic TPU @Creality Ender-5Max-all.json} (93%) rename resources/profiles/Creality/filament/{Creality Generic TPU @Hi-all.json => Generic TPU @Creality Hi-all.json} (77%) rename resources/profiles/Creality/filament/{Creality Generic TPU @K1-all.json => Generic TPU @Creality K1-all.json} (69%) rename resources/profiles/Creality/filament/{Creality Generic TPU @K2-all.json => Generic TPU @Creality K2-all.json} (81%) rename resources/profiles/Creality/filament/{Creality Generic TPU.json => Generic TPU @Creality.json} (83%) rename resources/profiles/DeltaMaker/filament/{DeltaMaker Generic PETG.json => Generic PETG @DeltaMaker.json} (82%) rename resources/profiles/DeltaMaker/filament/{DeltaMaker Generic PLA.json => Generic PLA @DeltaMaker.json} (70%) rename resources/profiles/DeltaMaker/filament/{DeltaMaker Generic TPU.json => Generic TPU @DeltaMaker.json} (68%) rename resources/profiles/Dremel/filament/{Dremel Generic PLA @3D20 all.json => Generic PLA @Dremel 3D20 all.json} (66%) rename resources/profiles/Dremel/filament/{Dremel Generic PLA @3D40 all.json => Generic PLA @Dremel 3D40 all.json} (70%) rename resources/profiles/Dremel/filament/{Dremel Generic PLA @3D45 all.json => Generic PLA @Dremel 3D45 all.json} (74%) rename resources/profiles/Dremel/filament/{Dremel Generic PLA.json => Generic PLA @Dremel.json} (71%) rename resources/profiles/FLSun/filament/{FLSun Generic ABS.json => Generic ABS @FLSun.json} (71%) rename resources/profiles/FLSun/filament/{FLSun Generic ASA.json => Generic ASA @FLSun.json} (71%) rename resources/profiles/FLSun/filament/{FLSun Generic PA.json => Generic PA @FLSun.json} (74%) rename resources/profiles/FLSun/filament/{FLSun Generic PA-CF.json => Generic PA-CF @FLSun.json} (75%) rename resources/profiles/FLSun/filament/{FLSun Generic PC.json => Generic PC @FLSun.json} (71%) rename resources/profiles/FLSun/filament/{FLSun Generic PETG.json => Generic PETG @FLSun.json} (84%) rename resources/profiles/FLSun/filament/{FLSun S1 PLA Generic.json => Generic PLA @FLSun S1.json} (83%) rename resources/profiles/FLSun/filament/{FLSun T1 PLA Generic.json => Generic PLA @FLSun T1.json} (83%) rename resources/profiles/FLSun/filament/{FLSun Generic PLA.json => Generic PLA @FLSun.json} (73%) rename resources/profiles/FLSun/filament/{FLSun Generic PLA-CF.json => Generic PLA-CF @FLSun.json} (74%) rename resources/profiles/FLSun/filament/{FLSun Generic PVA.json => Generic PVA @FLSun.json} (75%) rename resources/profiles/FLSun/filament/{FLSun Generic TPU.json => Generic TPU @FLSun.json} (69%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic NexPA-CF25.json => FusRock NexPA-CF25.json} (94%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json => FusRock PAHT-CF @G3U 0.6 Nozzle.json} (78%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic PAHT-CF.json => FusRock PAHT-CF.json} (94%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic PAHT-GF.json => FusRock PAHT-GF.json} (72%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic PET-CF @G3U 0.6 Nozzle.json => FusRock PET-CF @G3U 0.6 Nozzle.json} (78%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic PET-CF.json => FusRock PET-CF.json} (94%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic PET-GF.json => FusRock PET-GF.json} (69%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic S-Multi @G3U 0.6 Nozzle.json => FusRock S-Multi @G3U 0.6 Nozzle.json} (77%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic S-Multi.json => FusRock S-Multi.json} (94%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic S-PAHT @G3U 0.6 Nozzle.json => FusRock S-PAHT @G3U 0.6 Nozzle.json} (77%) rename resources/profiles/Flashforge/filament/FusRock/{FusRock Generic S-PAHT.json => FusRock S-PAHT.json} (94%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json => Generic ABS @FF AD5M 0.25 Nozzle.json} (60%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ABS @G3U 0.6 Nozzle.json => Generic ABS @Flashforge G3U 0.6 Nozzle.json} (73%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ABS @G3U.json => Generic ABS @Flashforge G3U.json} (93%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ABS.json => Generic ABS @Flashforge.json} (88%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json => Generic ASA @FF AD5M 0.25 Nozzle.json} (64%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ASA @G3U 0.6 Nozzle.json => Generic ASA @Flashforge G3U 0.6 Nozzle.json} (76%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ASA @G3U.json => Generic ASA @Flashforge G3U.json} (93%) rename resources/profiles/Flashforge/filament/{Flashforge Generic ASA.json => Generic ASA @Flashforge.json} (95%) rename resources/profiles/Flashforge/filament/{Flashforge Generic HIPS @G3U 0.6 Nozzle.json => Generic HIPS @Flashforge G3U 0.6 Nozzle.json} (75%) rename resources/profiles/Flashforge/filament/{Flashforge Generic HIPS.json => Generic HIPS @Flashforge.json} (94%) rename resources/profiles/Flashforge/filament/{Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json => Generic HS PLA @FF AD5M 0.25 Nozzle.json} (71%) rename resources/profiles/Flashforge/filament/{Flashforge Generic HS PLA.json => Generic HS PLA @Flashforge.json} (96%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json => Generic PETG @FF AD5M 0.25 Nozzle.json} (58%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG @G3U 0.6 Nozzle.json => Generic PETG @Flashforge G3U 0.6 Nozzle.json} (72%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG @G3U 0.8 Nozzle.json => Generic PETG @Flashforge G3U 0.8 Nozzle.json} (73%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG @G3U.json => Generic PETG @Flashforge G3U.json} (93%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG.json => Generic PETG @Flashforge.json} (91%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json => Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json} (74%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json => Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json} (74%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG-CF @G3U.json => Generic PETG-CF @Flashforge G3U.json} (93%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PETG-CF10.json => Generic PETG-CF10 @Flashforge.json} (95%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA @FF AD5M 0.25 Nozzle.json => Generic PLA @FF AD5M 0.25 Nozzle.json} (73%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA @G3U 0.6 Nozzle.json => Generic PLA @Flashforge G3U 0.6 Nozzle.json} (84%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA @G3U 0.8 Nozzle.json => Generic PLA @Flashforge G3U 0.8 Nozzle.json} (86%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA @G3U.json => Generic PLA @Flashforge G3U.json} (93%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA.json => Generic PLA @Flashforge.json} (89%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json => Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json} (73%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json => Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json} (73%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA-CF @G3U.json => Generic PLA-CF @Flashforge G3U.json} (93%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA-CF10.json => Generic PLA-CF10 @Flashforge.json} (96%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json => Generic PLA-SILK @FF AD5M 0.25 Nozzle.json} (71%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PLA-Silk.json => Generic PLA-Silk @Flashforge.json} (89%) rename resources/profiles/Flashforge/filament/{Flashforge Generic PVA.json => Generic PVA @Flashforge.json} (94%) rename resources/profiles/Flashforge/filament/{Flashforge Generic TPU.json => Generic TPU @Flashforge.json} (95%) rename resources/profiles/Flashforge/filament/Polymaker/{Polymaker Generic CoPA.json => Polymaker CoPA.json} (95%) rename resources/profiles/Flashforge/filament/Polymaker/{Polymaker Generic S1.json => Polymaker S1.json} (95%) rename resources/profiles/FlyingBear/filament/{FlyingBear Generic ABS.json => Generic ABS @FlyingBear.json} (69%) rename resources/profiles/FlyingBear/filament/{FlyingBear Generic PA-CF.json => Generic PA-CF @FlyingBear.json} (72%) rename resources/profiles/FlyingBear/filament/{FlyingBear Generic PC.json => Generic PC @FlyingBear.json} (67%) rename resources/profiles/FlyingBear/filament/{FlyingBear Generic PETG.json => Generic PETG @FlyingBear.json} (80%) rename resources/profiles/FlyingBear/filament/{FlyingBear Generic PLA.json => Generic PLA @FlyingBear.json} (69%) rename resources/profiles/FlyingBear/filament/{FlyingBear Generic TPU.json => Generic TPU @FlyingBear.json} (66%) rename resources/profiles/Ginger Additive/filament/{Ginger Generic PETG.json => Generic PETG @Ginger.json} (92%) rename resources/profiles/Ginger Additive/filament/{Ginger Generic PLA.json => Generic PLA @Ginger.json} (92%) rename resources/profiles/InfiMech/filament/{InfiMech Generic ABS.json => Generic ABS @InfiMech.json} (67%) rename resources/profiles/InfiMech/filament/{InfiMech Generic PA-CF.json => Generic PA-CF @InfiMech.json} (70%) rename resources/profiles/InfiMech/filament/{InfiMech Generic PC.json => Generic PC @InfiMech.json} (64%) rename resources/profiles/InfiMech/filament/{InfiMech Generic PETG.json => Generic PETG @InfiMech.json} (80%) rename resources/profiles/InfiMech/filament/{InfiMech Generic PLA.json => Generic PLA @InfiMech.json} (67%) rename resources/profiles/InfiMech/filament/{InfiMech Generic TPU.json => Generic TPU @InfiMech.json} (64%) rename resources/profiles/MagicMaker/filament/{MM Generic PEEK.json => Generic PEEK @MM.json} (84%) create mode 100644 resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena 0.2 nozzle.json rename resources/profiles/OrcaArena/filament/{OrcaArena Generic ABS @base.json => Generic ABS @OrcaArena base.json} (73%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic ASA.json => Generic ABS @OrcaArena.json} (57%) create mode 100644 resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena 0.2 nozzle.json rename resources/profiles/OrcaArena/filament/{OrcaArena Generic ASA @base.json => Generic ASA @OrcaArena base.json} (73%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PC.json => Generic ASA @OrcaArena.json} (57%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PA.json => Generic PA @OrcaArena.json} (74%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PA-CF.json => Generic PA-CF @OrcaArena.json} (81%) create mode 100644 resources/profiles/OrcaArena/filament/Generic PC @OrcaArena 0.2 nozzle.json rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PC @base.json => Generic PC @OrcaArena base.json} (73%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic ABS.json => Generic PC @OrcaArena.json} (57%) create mode 100644 resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena 0.2 nozzle.json rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PETG @base.json => Generic PETG @OrcaArena base.json} (94%) create mode 100644 resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json create mode 100644 resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PETG-CF @base.json => Generic PETG-CF @OrcaArena base.json} (92%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PLA @0.2 nozzle.json => Generic PLA @OrcaArena 0.2 nozzle.json} (69%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PLA @base.json => Generic PLA @OrcaArena base.json} (88%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PETG-CF @Arena X1C.json => Generic PLA @OrcaArena.json} (57%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PLA Silk @base.json => Generic PLA Silk @OrcaArena base.json} (88%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PLA Silk.json => Generic PLA Silk @OrcaArena.json} (63%) rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PLA-CF @base.json => Generic PLA-CF @OrcaArena base.json} (92%) create mode 100644 resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json create mode 100644 resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena 0.2 nozzle.json rename resources/profiles/OrcaArena/filament/{OrcaArena Generic PVA @base.json => Generic PVA @OrcaArena base.json} (79%) create mode 100644 resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json rename resources/profiles/OrcaArena/filament/{OrcaArena Generic TPU.json => Generic TPU @OrcaArena.json} (80%) delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json delete mode 100644 resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json rename resources/profiles/Peopoly/filament/{Peopoly Generic ABS.json => Generic ABS @Peopoly.json} (73%) rename resources/profiles/Peopoly/filament/{Peopoly Generic PETG.json => Generic PETG @Peopoly.json} (80%) rename resources/profiles/Peopoly/filament/{Peopoly Generic PLA.json => Generic PLA @Peopoly.json} (79%) create mode 100644 resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.6.json create mode 100644 resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.8.json rename resources/profiles/Prusa/filament/{Prusa Generic ABS @CORE One HF 0.4.json => Generic ABS @Prusa CORE One HF 0.4.json} (71%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @CORE One HF 0.5.json => Generic ABS @Prusa CORE One HF 0.5.json} (71%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @CORE One HF 0.6.json => Generic ABS @Prusa CORE One HF 0.6.json} (71%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @CORE One HF 0.8.json => Generic ABS @Prusa CORE One HF 0.8.json} (74%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @CORE One.json => Generic ABS @Prusa CORE One.json} (92%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MINIIS 0.25.json => Generic ABS @Prusa MINIIS 0.25.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MINIIS 0.6.json => Generic ABS @Prusa MINIIS 0.6.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MINIIS 0.8.json => Generic ABS @Prusa MINIIS 0.8.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MINIIS.json => Generic ABS @Prusa MINIIS.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MK3.5 0.25.json => Generic ABS @Prusa MK3.5 0.25.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MK3.5 0.6.json => Generic ABS @Prusa MK3.5 0.6.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MK3.5 0.8.json => Generic ABS @Prusa MK3.5 0.8.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MK3.5.json => Generic ABS @Prusa MK3.5.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MK4.json => Generic ABS @Prusa MK4.json} (86%) create mode 100644 resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.6.json create mode 100644 resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.8.json rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MK4S HF0.4.json => Generic ABS @Prusa MK4S HF0.4.json} (75%) create mode 100644 resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.5.json create mode 100644 resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.6.json create mode 100644 resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.8.json rename resources/profiles/Prusa/filament/{Prusa Generic ABS @MK4S.json => Generic ABS @Prusa MK4S.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @XL 5T.json => Generic ABS @Prusa XL 5T.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS @XL.json => Generic ABS @Prusa XL.json} (90%) rename resources/profiles/{Anker/filament/Anker Generic ABS @base.json => Prusa/filament/Generic ABS @Prusa base.json} (61%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS.json => Generic ABS @Prusa.json} (87%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS HF @MINIIS 0.6.json => Generic ABS HF @Prusa MINIIS 0.6.json} (77%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS HF @MINIIS 0.8.json => Generic ABS HF @Prusa MINIIS 0.8.json} (77%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS HF @MINIIS.json => Generic ABS HF @Prusa MINIIS.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS HF @MK3.5 0.6.json => Generic ABS HF @Prusa MK3.5 0.6.json} (77%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS HF @MK3.5 0.8.json => Generic ABS HF @Prusa MK3.5 0.8.json} (77%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS HF @MK3.5.json => Generic ABS HF @Prusa MK3.5.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ABS HF @base.json => Generic ABS HF @Prusa base.json} (60%) create mode 100644 resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.6.json rename resources/profiles/Prusa/filament/{Prusa Generic ASA @CORE One 0.8.json => Generic ASA @Prusa CORE One 0.8.json} (50%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @CORE One HF 0.4.json => Generic ASA @Prusa CORE One HF 0.4.json} (74%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @CORE One HF 0.5.json => Generic ASA @Prusa CORE One HF 0.5.json} (74%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @CORE One HF 0.6.json => Generic ASA @Prusa CORE One HF 0.6.json} (75%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @CORE One HF 0.8.json => Generic ASA @Prusa CORE One HF 0.8.json} (76%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @CORE One.json => Generic ASA @Prusa CORE One.json} (92%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MINIIS 0.25.json => Generic ASA @Prusa MINIIS 0.25.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MINIIS 0.6.json => Generic ASA @Prusa MINIIS 0.6.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MINIIS 0.8.json => Generic ASA @Prusa MINIIS 0.8.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MINIIS.json => Generic ASA @Prusa MINIIS.json} (80%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK3.5 0.25.json => Generic ASA @Prusa MK3.5 0.25.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK3.5 0.6.json => Generic ASA @Prusa MK3.5 0.6.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK3.5 0.8.json => Generic ASA @Prusa MK3.5 0.8.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK3.5.json => Generic ASA @Prusa MK3.5.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK4.json => Generic ASA @Prusa MK4.json} (86%) create mode 100644 resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.6.json create mode 100644 resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.8.json rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK4S HF0.4.json => Generic ASA @Prusa MK4S HF0.4.json} (72%) create mode 100644 resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.5.json create mode 100644 resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.6.json rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK4S HF0.8.json => Generic ASA @Prusa MK4S HF0.8.json} (58%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA @MK4S.json => Generic ASA @Prusa MK4S.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA.json => Generic ASA @Prusa.json} (88%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA HF @MINIIS 0.6.json => Generic ASA HF @Prusa MINIIS 0.6.json} (76%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA HF @MINIIS 0.8.json => Generic ASA HF @Prusa MINIIS 0.8.json} (76%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA HF @MINIIS.json => Generic ASA HF @Prusa MINIIS.json} (77%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA HF @MK3.5 0.6.json => Generic ASA HF @Prusa MK3.5 0.6.json} (77%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA HF @MK3.5 0.8.json => Generic ASA HF @Prusa MK3.5 0.8.json} (77%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA HF @MK3.5.json => Generic ASA HF @Prusa MK3.5.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic ASA HF @base.json => Generic ASA HF @Prusa base.json} (60%) rename resources/profiles/Prusa/filament/{Prusa Generic FLEX @XL 5T.json => Generic FLEX @Prusa XL 5T.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic FLEX @XL.json => Generic FLEX @Prusa XL.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MINIIS 0.25.json => Generic PA @Prusa MINIIS 0.25.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MINIIS 0.6.json => Generic PA @Prusa MINIIS 0.6.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MINIIS 0.8.json => Generic PA @Prusa MINIIS 0.8.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MINIIS.json => Generic PA @Prusa MINIIS.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MK3.5 0.25.json => Generic PA @Prusa MK3.5 0.25.json} (69%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MK3.5 0.6.json => Generic PA @Prusa MK3.5 0.6.json} (69%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MK3.5 0.8.json => Generic PA @Prusa MK3.5 0.8.json} (69%) rename resources/profiles/Prusa/filament/{Prusa Generic PA @MK3.5.json => Generic PA @Prusa MK3.5.json} (70%) rename resources/profiles/{Anker/filament/Anker Generic PA @base.json => Prusa/filament/Generic PA @Prusa base.json} (61%) rename resources/profiles/Prusa/filament/{Prusa Generic PA.json => Generic PA @Prusa.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MINIIS 0.25.json => Generic PA-CF @Prusa MINIIS 0.25.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MINIIS 0.6.json => Generic PA-CF @Prusa MINIIS 0.6.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MINIIS 0.8.json => Generic PA-CF @Prusa MINIIS 0.8.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MINIIS.json => Generic PA-CF @Prusa MINIIS.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MK3.5 0.25.json => Generic PA-CF @Prusa MK3.5 0.25.json} (69%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MK3.5 0.6.json => Generic PA-CF @Prusa MK3.5 0.6.json} (70%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MK3.5 0.8.json => Generic PA-CF @Prusa MK3.5 0.8.json} (70%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @MK3.5.json => Generic PA-CF @Prusa MK3.5.json} (71%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF @base.json => Generic PA-CF @Prusa base.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PA-CF.json => Generic PA-CF @Prusa.json} (79%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MINIIS 0.25.json => Generic PC @Prusa MINIIS 0.25.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MINIIS 0.6.json => Generic PC @Prusa MINIIS 0.6.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MINIIS 0.8.json => Generic PC @Prusa MINIIS 0.8.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MINIIS.json => Generic PC @Prusa MINIIS.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MK3.5 0.25.json => Generic PC @Prusa MK3.5 0.25.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MK3.5 0.6.json => Generic PC @Prusa MK3.5 0.6.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MK3.5 0.8.json => Generic PC @Prusa MK3.5 0.8.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PC @MK3.5.json => Generic PC @Prusa MK3.5.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PC.json => Generic PC @Prusa.json} (85%) rename resources/profiles/Prusa/filament/{Prusa Generic PC HF @MINIIS 0.6.json => Generic PC HF @Prusa MINIIS 0.6.json} (58%) rename resources/profiles/Prusa/filament/{Prusa Generic PC HF @MINIIS 0.8.json => Generic PC HF @Prusa MINIIS 0.8.json} (58%) rename resources/profiles/Prusa/filament/{Prusa Generic PC HF @MINIIS.json => Generic PC HF @Prusa MINIIS.json} (59%) rename resources/profiles/Prusa/filament/{Prusa Generic PC HF @MK3.5 0.6.json => Generic PC HF @Prusa MK3.5 0.6.json} (62%) rename resources/profiles/Prusa/filament/{Prusa Generic PC HF @MK3.5 0.8.json => Generic PC HF @Prusa MK3.5 0.8.json} (62%) rename resources/profiles/Prusa/filament/{Prusa Generic PC HF @MK3.5.json => Generic PC HF @Prusa MK3.5.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PC HF @base.json => Generic PC HF @Prusa base.json} (60%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @CORE One 0.6.json => Generic PETG @Prusa CORE One 0.6.json} (51%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @CORE One 0.8.json => Generic PETG @Prusa CORE One 0.8.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @CORE One HF 0.4.json => Generic PETG @Prusa CORE One HF 0.4.json} (74%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @CORE One HF 0.5.json => Generic PETG @Prusa CORE One HF 0.5.json} (75%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @CORE One HF 0.6.json => Generic PETG @Prusa CORE One HF 0.6.json} (73%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @CORE One HF 0.8.json => Generic PETG @Prusa CORE One HF 0.8.json} (78%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @CORE One.json => Generic PETG @Prusa CORE One.json} (92%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MINIIS 0.25.json => Generic PETG @Prusa MINIIS 0.25.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MINIIS 0.6.json => Generic PETG @Prusa MINIIS 0.6.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MINIIS 0.8.json => Generic PETG @Prusa MINIIS 0.8.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG HF @MINIIS.json => Generic PETG @Prusa MINIIS.json} (85%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK3.5 0.25.json => Generic PETG @Prusa MK3.5 0.25.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK3.5 0.6.json => Generic PETG @Prusa MK3.5 0.6.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK3.5 0.8.json => Generic PETG @Prusa MK3.5 0.8.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK3.5.json => Generic PETG @Prusa MK3.5.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK4.json => Generic PETG @Prusa MK4.json} (89%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK4S 0.6.json => Generic PETG @Prusa MK4S 0.6.json} (54%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK4S 0.8.json => Generic PETG @Prusa MK4S 0.8.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK4S HF0.4.json => Generic PETG @Prusa MK4S HF0.4.json} (76%) create mode 100644 resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.5.json rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK4S HF0.6.json => Generic PETG @Prusa MK4S HF0.6.json} (59%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK4S HF0.8.json => Generic PETG @Prusa MK4S HF0.8.json} (61%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MK4S.json => Generic PETG @Prusa MK4S.json} (92%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @XL 5T.json => Generic PETG @Prusa XL 5T.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @XL.json => Generic PETG @Prusa XL.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @base.json => Generic PETG @Prusa base.json} (61%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG.json => Generic PETG @Prusa.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG HF @MINIIS 0.6.json => Generic PETG HF @Prusa MINIIS 0.6.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG HF @MINIIS 0.8.json => Generic PETG HF @Prusa MINIIS 0.8.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG @MINIIS.json => Generic PETG HF @Prusa MINIIS.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG HF @MK3.5 0.6.json => Generic PETG HF @Prusa MK3.5 0.6.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG HF @MK3.5 0.8.json => Generic PETG HF @Prusa MK3.5 0.8.json} (81%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG HF @MK3.5.json => Generic PETG HF @Prusa MK3.5.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PETG HF @base.json => Generic PETG HF @Prusa base.json} (60%) create mode 100644 resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json rename resources/profiles/Prusa/filament/{Prusa Generic PLA @CORE One 0.8.json => Generic PLA @Prusa CORE One 0.8.json} (51%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @CORE One HF 0.4.json => Generic PLA @Prusa CORE One HF 0.4.json} (73%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @CORE One HF 0.5.json => Generic PLA @Prusa CORE One HF 0.5.json} (74%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @CORE One HF 0.6.json => Generic PLA @Prusa CORE One HF 0.6.json} (75%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @CORE One HF 0.8.json => Generic PLA @Prusa CORE One HF 0.8.json} (75%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @CORE One.json => Generic PLA @Prusa CORE One.json} (92%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MINIIS 0.25.json => Generic PLA @Prusa MINIIS 0.25.json} (62%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MINIIS 0.6.json => Generic PLA @Prusa MINIIS 0.6.json} (62%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MINIIS 0.8.json => Generic PLA @Prusa MINIIS 0.8.json} (62%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MINIIS.json => Generic PLA @Prusa MINIIS.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK3.5 0.25.json => Generic PLA @Prusa MK3.5 0.25.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK3.5 0.6.json => Generic PLA @Prusa MK3.5 0.6.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK3.5 0.8.json => Generic PLA @Prusa MK3.5 0.8.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK3.5.json => Generic PLA @Prusa MK3.5.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4.json => Generic PLA @Prusa MK4.json} (87%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4S 0.6.json => Generic PLA @Prusa MK4S 0.6.json} (50%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4S 0.8.json => Generic PLA @Prusa MK4S 0.8.json} (57%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4S HF0.4.json => Generic PLA @Prusa MK4S HF0.4.json} (75%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4S HF0.5.json => Generic PLA @Prusa MK4S HF0.5.json} (50%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4S HF0.6.json => Generic PLA @Prusa MK4S HF0.6.json} (53%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4S HF0.8.json => Generic PLA @Prusa MK4S HF0.8.json} (55%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @MK4S.json => Generic PLA @Prusa MK4S.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @XL 5T.json => Generic PLA @Prusa XL 5T.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @XL.json => Generic PLA @Prusa XL.json} (90%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA @base.json => Generic PLA @Prusa base.json} (61%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA.json => Generic PLA @Prusa.json} (87%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA HF @MINIIS 0.6.json => Generic PLA HF @Prusa MINIIS 0.6.json} (60%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA HF @MINIIS 0.8.json => Generic PLA HF @Prusa MINIIS 0.8.json} (60%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA HF @MINIIS.json => Generic PLA HF @Prusa MINIIS.json} (62%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA HF @MK3.5 0.6.json => Generic PLA HF @Prusa MK3.5 0.6.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA HF @MK3.5 0.8.json => Generic PLA HF @Prusa MK3.5 0.8.json} (65%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA HF @MK3.5.json => Generic PLA HF @Prusa MK3.5.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA HF @base.json => Generic PLA HF @Prusa base.json} (60%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA Silk @CORE One 0.6.json => Generic PLA Silk @Prusa CORE One 0.6.json} (52%) create mode 100644 resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.8.json rename resources/profiles/Prusa/filament/{Prusa Generic PLA Silk @CORE One.json => Generic PLA Silk @Prusa CORE One.json} (91%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA Silk @MK4S 0.6.json => Generic PLA Silk @Prusa MK4S 0.6.json} (55%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA Silk @MK4S 0.8.json => Generic PLA Silk @Prusa MK4S 0.8.json} (54%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA Silk @MK4S.json => Generic PLA Silk @Prusa MK4S.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MINIIS 0.25.json => Generic PLA-CF @Prusa MINIIS 0.25.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MINIIS 0.6.json => Generic PLA-CF @Prusa MINIIS 0.6.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MINIIS 0.8.json => Generic PLA-CF @Prusa MINIIS 0.8.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MINIIS.json => Generic PLA-CF @Prusa MINIIS.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MK3.5 0.25.json => Generic PLA-CF @Prusa MK3.5 0.25.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MK3.5 0.6.json => Generic PLA-CF @Prusa MK3.5 0.6.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MK3.5 0.8.json => Generic PLA-CF @Prusa MK3.5 0.8.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @MK3.5.json => Generic PLA-CF @Prusa MK3.5.json} (68%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF @base.json => Generic PLA-CF @Prusa base.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PLA-CF.json => Generic PLA-CF @Prusa.json} (82%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MINIIS 0.25.json => Generic PVA @Prusa MINIIS 0.25.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA HF @MINIIS 0.6.json => Generic PVA @Prusa MINIIS 0.6.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA HF @MINIIS 0.8.json => Generic PVA @Prusa MINIIS 0.8.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA HF @MINIIS.json => Generic PVA @Prusa MINIIS.json} (66%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MK3.5 0.25.json => Generic PVA @Prusa MK3.5 0.25.json} (68%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MK3.5 0.6.json => Generic PVA @Prusa MK3.5 0.6.json} (68%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MK3.5 0.8.json => Generic PVA @Prusa MK3.5 0.8.json} (68%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA HF @MK3.5.json => Generic PVA @Prusa MK3.5.json} (69%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @base.json => Generic PVA @Prusa base.json} (61%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA.json => Generic PVA @Prusa.json} (80%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MINIIS 0.6.json => Generic PVA HF @Prusa MINIIS 0.6.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MINIIS 0.8.json => Generic PVA HF @Prusa MINIIS 0.8.json} (63%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MINIIS.json => Generic PVA HF @Prusa MINIIS.json} (64%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA HF @MK3.5 0.6.json => Generic PVA HF @Prusa MK3.5 0.6.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA HF @MK3.5 0.8.json => Generic PVA HF @Prusa MK3.5 0.8.json} (67%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA @MK3.5.json => Generic PVA HF @Prusa MK3.5.json} (68%) rename resources/profiles/Prusa/filament/{Prusa Generic PVA HF @base.json => Generic PVA HF @Prusa base.json} (60%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU @CORE One 0.6.json => Generic TPU @Prusa CORE One 0.6.json} (51%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU @CORE One 0.8.json => Generic TPU @Prusa CORE One 0.8.json} (51%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU @CORE One.json => Generic TPU @Prusa CORE One.json} (90%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU @MINIIS.json => Generic TPU @Prusa MINIIS.json} (87%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU @MK3.5.json => Generic TPU @Prusa MK3.5.json} (87%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU @MK4.json => Generic TPU @Prusa MK4.json} (62%) create mode 100644 resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.6.json create mode 100644 resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.8.json rename resources/profiles/Prusa/filament/{Prusa Generic TPU @MK4S.json => Generic TPU @Prusa MK4S.json} (87%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU @base.json => Generic TPU @Prusa base.json} (61%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU.json => Generic TPU @Prusa.json} (71%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU HF @MINIIS.json => Generic TPU HF @Prusa MINIIS.json} (86%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU HF @MK3.5.json => Generic TPU HF @Prusa MK3.5.json} (87%) rename resources/profiles/Prusa/filament/{Prusa Generic TPU HF @base.json => Generic TPU HF @Prusa base.json} (60%) delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json delete mode 100644 resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json => Generic ABS @Qidi Q1 Pro 0.2 nozzle.json} (62%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json => Generic ABS @Qidi Q1 Pro 0.4 nozzle.json} (63%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json => Generic ABS @Qidi Q1 Pro 0.6 nozzle.json} (62%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json => Generic ABS @Qidi Q1 Pro 0.8 nozzle.json} (62%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json => Generic ABS @Qidi X-Max 3 0.2 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json => Generic ABS @Qidi X-Plus 3 0.2 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle.json => Generic ABS @Qidi X-Plus 4 0.2 nozzle.json} (62%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle.json => Generic ABS @Qidi X-Plus 4 0.4 nozzle.json} (62%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle.json => Generic ABS @Qidi X-Plus 4 0.6 nozzle.json} (62%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle.json => Generic ABS @Qidi X-Plus 4 0.8 nozzle.json} (62%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json => Generic ABS @Qidi X-Smart 3 0.2 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic ABS.json => Generic ABS @Qidi.json} (89%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json => Generic ASA @Qidi Q1 Pro 0.2 nozzle.json} (60%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json => Generic ASA @Qidi Q1 Pro 0.4 nozzle.json} (68%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json => Generic ASA @Qidi Q1 Pro 0.6 nozzle.json} (68%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json => Generic ASA @Qidi Q1 Pro 0.8 nozzle.json} (68%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json => Generic ASA @Qidi X-Max 3 0.2 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json => Generic ASA @Qidi X-Plus 3 0.2 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json => Generic ASA @Qidi X-Plus 4 0.2 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json => Generic ASA @Qidi X-Plus 4 0.4 nozzle.json} (67%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json => Generic ASA @Qidi X-Plus 4 0.6 nozzle.json} (67%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json => Generic ASA @Qidi X-Plus 4 0.8 nozzle.json} (67%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json => Generic ASA @Qidi X-Smart 3 0.2 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic ASA.json => Generic ASA @Qidi.json} (87%) rename resources/profiles/Qidi/filament/{Qidi Generic PA.json => Generic PA @Qidi.json} (89%) rename resources/profiles/Qidi/filament/{Qidi Generic PA-CF.json => Generic PA-CF @Qidi.json} (90%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @0.2 nozzle.json => Generic PC @Qidi 0.2 nozzle.json} (56%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @0.8 nozzle.json => Generic PC @Qidi 0.8 nozzle.json} (51%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json => Generic PC @Qidi Q1 Pro 0.2 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json => Generic PC @Qidi Q1 Pro 0.4 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json => Generic PC @Qidi Q1 Pro 0.6 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json => Generic PC @Qidi Q1 Pro 0.8 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle.json => Generic PC @Qidi X-Plus 4 0.2 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle.json => Generic PC @Qidi X-Plus 4 0.4 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle.json => Generic PC @Qidi X-Plus 4 0.6 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle.json => Generic PC @Qidi X-Plus 4 0.8 nozzle.json} (50%) rename resources/profiles/Qidi/filament/{Qidi Generic PC.json => Generic PC @Qidi.json} (88%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json => Generic PETG @Qidi Q1 Pro 0.2 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json => Generic PETG @Qidi Q1 Pro 0.4 nozzle.json} (68%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json => Generic PETG @Qidi Q1 Pro 0.6 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json => Generic PETG @Qidi Q1 Pro 0.8 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json => Generic PETG @Qidi X-Max 3 0.2 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json => Generic PETG @Qidi X-Plus 3 0.2 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle.json => Generic PETG @Qidi X-Plus 4 0.2 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json => Generic PETG @Qidi X-Plus 4 0.4 nozzle.json} (68%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle.json => Generic PETG @Qidi X-Plus 4 0.6 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle.json => Generic PETG @Qidi X-Plus 4 0.8 nozzle.json} (71%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json => Generic PETG @Qidi X-Smart 3 0.2 nozzle.json} (70%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG.json => Generic PETG @Qidi.json} (89%) rename resources/profiles/Qidi/filament/{Qidi Generic PETG-CF.json => Generic PETG-CF @Qidi.json} (92%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json => Generic PLA @Qidi Q1 Pro 0.2 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json => Generic PLA @Qidi Q1 Pro 0.4 nozzle.json} (55%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json => Generic PLA @Qidi Q1 Pro 0.6 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json => Generic PLA @Qidi Q1 Pro 0.8 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json => Generic PLA @Qidi X-Max 3 0.2 nozzle.json} (56%) create mode 100644 resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.8 nozzle.json rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json => Generic PLA @Qidi X-Plus 3 0.2 nozzle.json} (56%) create mode 100644 resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.8 nozzle.json rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle.json => Generic PLA @Qidi X-Plus 4 0.2 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json => Generic PLA @Qidi X-Plus 4 0.4 nozzle.json} (54%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle.json => Generic PLA @Qidi X-Plus 4 0.6 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle.json => Generic PLA @Qidi X-Plus 4 0.8 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json => Generic PLA @Qidi X-Smart 3 0.2 nozzle.json} (56%) create mode 100644 resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.8 nozzle.json rename resources/profiles/Qidi/filament/{Qidi Generic PLA.json => Generic PLA @Qidi.json} (81%) create mode 100644 resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json rename resources/profiles/Qidi/filament/{Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json => Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json} (51%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json => Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json} (51%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json => Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json} (60%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json => Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json} (60%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA Silk.json => Generic PLA Silk @Qidi.json} (89%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json => Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json} (55%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json => Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json} (51%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json => Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json} (55%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json => Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json} (55%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json => Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json} (56%) create mode 100644 resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json => Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json} (56%) create mode 100644 resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json => Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json} (59%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json => Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json} (51%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json => Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json} (56%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json => Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json} (56%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json => Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json} (55%) create mode 100644 resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json create mode 100644 resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json rename resources/profiles/Qidi/filament/{Qidi Generic PLA+.json => Generic PLA+ @Qidi.json} (83%) rename resources/profiles/Qidi/filament/{Qidi Generic PLA-CF.json => Generic PLA-CF @Qidi.json} (89%) rename resources/profiles/Qidi/filament/{Qidi Generic PVA.json => Generic PVA @Qidi.json} (89%) rename resources/profiles/Qidi/filament/{Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json => Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json} (57%) rename resources/profiles/Qidi/filament/{Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json => Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json} (56%) rename resources/profiles/Qidi/filament/{Qidi Generic TPU 95A.json => Generic TPU 95A @Qidi.json} (87%) rename resources/profiles/Qidi/filament/{Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json => Generic TPU @Qidi Q1 Pro 0.4 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json => Generic TPU @Qidi X-Plus 4 0.4 nozzle.json} (53%) rename resources/profiles/Qidi/filament/{Qidi Generic TPU.json => Generic TPU @Qidi.json} (87%) delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json delete mode 100644 resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json rename resources/profiles/Ratrig/filament/{RatRig Generic ABS.json => Generic ABS @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig Generic ASA.json => Generic ASA @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig Generic PA.json => Generic PA @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig Generic PA-CF.json => Generic PA-CF @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig Generic PC.json => Generic PC @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig Generic PCTG.json => Generic PCTG @RatRig.json} (92%) rename resources/profiles/Ratrig/filament/{RatRig Generic PETG.json => Generic PETG @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig Generic PLA.json => Generic PLA @RatRig.json} (92%) rename resources/profiles/Ratrig/filament/{RatRig Generic PLA-CF.json => Generic PLA-CF @RatRig.json} (92%) rename resources/profiles/Ratrig/filament/{RatRig Generic PVA.json => Generic PVA @RatRig.json} (92%) rename resources/profiles/Ratrig/filament/{RatRig Generic TPU.json => Generic TPU @RatRig.json} (92%) rename resources/profiles/SecKit/filament/{SecKit Generic ABS.json => Generic ABS @SecKit.json} (83%) rename resources/profiles/SecKit/filament/{SecKit Generic ASA.json => Generic ASA @SecKit.json} (81%) rename resources/profiles/SecKit/filament/{SecKit Generic PA.json => Generic PA @SecKit.json} (81%) rename resources/profiles/SecKit/filament/{SecKit Generic PA-CF.json => Generic PA-CF @SecKit.json} (81%) rename resources/profiles/SecKit/filament/{SecKit Generic PC.json => Generic PC @SecKit.json} (80%) rename resources/profiles/SecKit/filament/{SecKit Generic PETG.json => Generic PETG @SecKit.json} (86%) rename resources/profiles/SecKit/filament/{SecKit Generic PLA.json => Generic PLA @SecKit.json} (79%) rename resources/profiles/SecKit/filament/{SecKit Generic PLA-CF.json => Generic PLA-CF @SecKit.json} (79%) rename resources/profiles/SecKit/filament/{SecKit Generic PVA.json => Generic PVA @SecKit.json} (77%) rename resources/profiles/SecKit/filament/{SecKit Generic TPU.json => Generic TPU @SecKit.json} (76%) rename resources/profiles/Tiertime/filament/{Tiertime Generic ABS@300HS.json => Generic ABS @Tiertime 300HS.json} (77%) rename resources/profiles/Tiertime/filament/{Tiertime Generic ABS.json => Generic ABS @Tiertime.json} (81%) rename resources/profiles/Tiertime/filament/{Tiertime Generic ASA@300HS.json => Generic ASA @Tiertime 300HS.json} (74%) rename resources/profiles/Tiertime/filament/{Tiertime Generic ASA.json => Generic ASA @Tiertime.json} (79%) rename resources/profiles/Tiertime/filament/{Tiertime Generic BVOH@300HS.json => Generic BVOH @Tiertime 300HS.json} (59%) rename resources/profiles/Tiertime/filament/{Tiertime Generic BVOH.json => Generic BVOH @Tiertime.json} (66%) rename resources/profiles/Tiertime/filament/{Tiertime Generic EVA@300HS.json => Generic EVA @Tiertime 300HS.json} (91%) rename resources/profiles/Tiertime/filament/{Tiertime Generic EVA.json => Generic EVA @Tiertime.json} (93%) rename resources/profiles/Tiertime/filament/{Tiertime Generic HIPS@300HS.json => Generic HIPS @Tiertime 300HS.json} (62%) rename resources/profiles/Tiertime/filament/{Tiertime Generic HIPS.json => Generic HIPS @Tiertime.json} (68%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PA@300HS.json => Generic PA @Tiertime 300HS.json} (82%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PA.json => Generic PA @Tiertime.json} (85%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PA-CF@300HS.json => Generic PA-CF @Tiertime 300HS.json} (75%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PA-CF.json => Generic PA-CF @Tiertime.json} (79%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PC@300HS.json => Generic PC @Tiertime 300HS.json} (67%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PC.json => Generic PC @Tiertime.json} (72%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PCTG@300HS.json => Generic PCTG @Tiertime 300HS.json} (89%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PCTG.json => Generic PCTG @Tiertime.json} (91%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PE@300HS.json => Generic PE @Tiertime 300HS.json} (87%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PE.json => Generic PE @Tiertime.json} (89%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PE-CF@300HS.json => Generic PE-CF @Tiertime 300HS.json} (86%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PE-CF.json => Generic PE-CF @Tiertime.json} (89%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PETG@300HS.json => Generic PETG @Tiertime 300HS.json} (88%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PETG.json => Generic PETG @Tiertime.json} (91%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PETG-CF@300HS.json => Generic PETG-CF @Tiertime 300HS.json} (89%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PETG-CF.json => Generic PETG-CF @Tiertime.json} (91%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PHA@300HS.json => Generic PHA @Tiertime 300HS.json} (60%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PHA.json => Generic PHA @Tiertime.json} (66%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA@300HS.json => Generic PLA @Tiertime 300HS.json} (82%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA.json => Generic PLA @Tiertime.json} (85%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA High Speed@300HS.json => Generic PLA High Speed @Tiertime 300HS.json} (65%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA High Speed.json => Generic PLA High Speed @Tiertime.json} (71%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA Silk@300HS.json => Generic PLA Silk @Tiertime 300HS.json} (82%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA Silk.json => Generic PLA Silk @Tiertime.json} (86%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA-CF@300HS.json => Generic PLA-CF @Tiertime 300HS.json} (88%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PLA-CF.json => Generic PLA-CF @Tiertime.json} (90%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PP@300HS.json => Generic PP @Tiertime 300HS.json} (60%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PP.json => Generic PP @Tiertime.json} (66%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PP-CF@300HS.json => Generic PP-CF @Tiertime 300HS.json} (69%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PP-CF.json => Generic PP-CF @Tiertime.json} (74%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PP-GF@300HS.json => Generic PP-GF @Tiertime 300HS.json} (69%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PP-GF.json => Generic PP-GF @Tiertime.json} (74%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPA-CF@300HS.json => Generic PPA-CF @Tiertime 300HS.json} (69%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPA-CF.json => Generic PPA-CF @Tiertime.json} (74%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPA-GF@300HS.json => Generic PPA-GF @Tiertime 300HS.json} (65%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPA-GF.json => Generic PPA-GF @Tiertime.json} (70%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPS@300HS.json => Generic PPS @Tiertime 300HS.json} (60%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPS.json => Generic PPS @Tiertime.json} (66%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPS-CF@300HS.json => Generic PPS-CF @Tiertime 300HS.json} (74%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PPS-CF.json => Generic PPS-CF @Tiertime.json} (79%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PVA@300HS.json => Generic PVA @Tiertime 300HS.json} (70%) rename resources/profiles/Tiertime/filament/{Tiertime Generic PVA.json => Generic PVA @Tiertime.json} (75%) rename resources/profiles/Tiertime/filament/{Tiertime Generic SBS@300HS.json => Generic SBS @Tiertime 300HS.json} (82%) rename resources/profiles/Tiertime/filament/{Tiertime Generic SBS.json => Generic SBS @Tiertime.json} (85%) rename resources/profiles/Tiertime/filament/{Tiertime Generic TPU@300HS.json => Generic TPU @Tiertime 300HS.json} (81%) rename resources/profiles/Tiertime/filament/{Tiertime Generic TPU.json => Generic TPU @Tiertime.json} (84%) rename resources/profiles/TwoTrees/filament/{TwoTrees Generic 95A TPU @SK1.json => Generic 95A TPU @TwoTrees SK1.json} (74%) rename resources/profiles/TwoTrees/filament/{TwoTrees Generic HS PLA @SK1.json => Generic HS PLA @TwoTrees SK1.json} (83%) rename resources/profiles/Vzbot/filament/{Vzbot Generic ABS.json => Generic ABS @Vzbot.json} (75%) rename resources/profiles/Vzbot/filament/{Vzbot Generic ASA.json => Generic ASA @Vzbot.json} (75%) rename resources/profiles/Vzbot/filament/{Vzbot Generic PA.json => Generic PA @Vzbot.json} (77%) rename resources/profiles/Vzbot/filament/{Vzbot Generic PA-CF.json => Generic PA-CF @Vzbot.json} (77%) rename resources/profiles/Vzbot/filament/{Vzbot Generic PC.json => Generic PC @Vzbot.json} (75%) rename resources/profiles/Vzbot/filament/{Vzbot Generic PETG.json => Generic PETG @Vzbot.json} (85%) rename resources/profiles/Vzbot/filament/{Vzbot Generic PLA.json => Generic PLA @Vzbot.json} (76%) rename resources/profiles/Vzbot/filament/{Vzbot Generic PLA-CF.json => Generic PLA-CF @Vzbot.json} (77%) rename resources/profiles/Vzbot/filament/{Vzbot Generic PVA.json => Generic PVA @Vzbot.json} (78%) rename resources/profiles/Vzbot/filament/{Vzbot Generic TPU.json => Generic TPU @Vzbot.json} (73%) rename resources/profiles/Wanhao France/filament/{Yumi Generic PETG.json => Generic PETG @Yumi.json} (91%) rename resources/profiles/Wanhao France/filament/{Yumi Generic PLA.json => Generic PLA @Yumi.json} (81%) diff --git a/resources/profiles/Anker.json b/resources/profiles/Anker.json index 544d889b4f..098b1df003 100644 --- a/resources/profiles/Anker.json +++ b/resources/profiles/Anker.json @@ -1,6 +1,6 @@ { "name": "Anker", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "Anker configurations", "machine_model_list": [ @@ -161,172 +161,172 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Anker Generic ABS @base", - "sub_path": "filament/Anker Generic ABS @base.json" + "name": "Generic ABS @Anker base", + "sub_path": "filament/Generic ABS @Anker base.json" }, { - "name": "Anker Generic ASA @base", - "sub_path": "filament/Anker Generic ASA @base.json" + "name": "Generic ASA @Anker base", + "sub_path": "filament/Generic ASA @Anker base.json" }, { - "name": "Anker Generic PA @base", - "sub_path": "filament/Anker Generic PA @base.json" + "name": "Generic PA @Anker base", + "sub_path": "filament/Generic PA @Anker base.json" }, { - "name": "Anker Generic PA-CF @base", - "sub_path": "filament/Anker Generic PA-CF @base.json" + "name": "Generic PA-CF @Anker base", + "sub_path": "filament/Generic PA-CF @Anker base.json" }, { - "name": "Anker Generic PC @base", - "sub_path": "filament/Anker Generic PC @base.json" + "name": "Generic PC @Anker base", + "sub_path": "filament/Generic PC @Anker base.json" }, { - "name": "Anker Generic PETG @base", - "sub_path": "filament/Anker Generic PETG @base.json" + "name": "Generic PETG @Anker base", + "sub_path": "filament/Generic PETG @Anker base.json" }, { - "name": "Anker Generic PETG-CF @base", - "sub_path": "filament/Anker Generic PETG-CF @base.json" + "name": "Generic PETG-CF @Anker base", + "sub_path": "filament/Generic PETG-CF @Anker base.json" }, { - "name": "Anker Generic PLA @base", - "sub_path": "filament/Anker Generic PLA @base.json" + "name": "Generic PLA @Anker base", + "sub_path": "filament/Generic PLA @Anker base.json" }, { - "name": "Anker Generic PLA Silk @base", - "sub_path": "filament/Anker Generic PLA Silk @base.json" + "name": "Generic PLA Silk @Anker base", + "sub_path": "filament/Generic PLA Silk @Anker base.json" }, { - "name": "Anker Generic PLA+ @base", - "sub_path": "filament/Anker Generic PLA+ @base.json" + "name": "Generic PLA+ @Anker base", + "sub_path": "filament/Generic PLA+ @Anker base.json" }, { - "name": "Anker Generic PLA-CF @base", - "sub_path": "filament/Anker Generic PLA-CF @base.json" + "name": "Generic PLA-CF @Anker base", + "sub_path": "filament/Generic PLA-CF @Anker base.json" }, { - "name": "Anker Generic PVA @base", - "sub_path": "filament/Anker Generic PVA @base.json" + "name": "Generic PVA @Anker base", + "sub_path": "filament/Generic PVA @Anker base.json" }, { - "name": "Anker Generic TPU @base", - "sub_path": "filament/Anker Generic TPU @base.json" + "name": "Generic TPU @Anker base", + "sub_path": "filament/Generic TPU @Anker base.json" }, { - "name": "Anker Generic ABS", - "sub_path": "filament/Anker Generic ABS.json" + "name": "Generic ABS @Anker", + "sub_path": "filament/Generic ABS @Anker.json" }, { - "name": "Anker Generic ABS 0.2 nozzle", - "sub_path": "filament/Anker Generic ABS 0.2 nozzle.json" + "name": "Generic ABS @Anker 0.2 nozzle", + "sub_path": "filament/Generic ABS @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic ABS 0.25 nozzle", - "sub_path": "filament/Anker Generic ABS 0.25 nozzle.json" + "name": "Generic ABS @Anker 0.25 nozzle", + "sub_path": "filament/Generic ABS @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic ASA", - "sub_path": "filament/Anker Generic ASA.json" + "name": "Generic ASA @Anker", + "sub_path": "filament/Generic ASA @Anker.json" }, { - "name": "Anker Generic ASA 0.2 nozzle", - "sub_path": "filament/Anker Generic ASA 0.2 nozzle.json" + "name": "Generic ASA @Anker 0.2 nozzle", + "sub_path": "filament/Generic ASA @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic ASA 0.25 nozzle", - "sub_path": "filament/Anker Generic ASA 0.25 nozzle.json" + "name": "Generic ASA @Anker 0.25 nozzle", + "sub_path": "filament/Generic ASA @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic PA", - "sub_path": "filament/Anker Generic PA.json" + "name": "Generic PA @Anker", + "sub_path": "filament/Generic PA @Anker.json" }, { - "name": "Anker Generic PA 0.2 nozzle", - "sub_path": "filament/Anker Generic PA 0.2 nozzle.json" + "name": "Generic PA @Anker 0.2 nozzle", + "sub_path": "filament/Generic PA @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic PA 0.25 nozzle", - "sub_path": "filament/Anker Generic PA 0.25 nozzle.json" + "name": "Generic PA @Anker 0.25 nozzle", + "sub_path": "filament/Generic PA @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic PA-CF", - "sub_path": "filament/Anker Generic PA-CF.json" + "name": "Generic PA-CF @Anker", + "sub_path": "filament/Generic PA-CF @Anker.json" }, { - "name": "Anker Generic PC", - "sub_path": "filament/Anker Generic PC.json" + "name": "Generic PC @Anker", + "sub_path": "filament/Generic PC @Anker.json" }, { - "name": "Anker Generic PC 0.2 nozzle", - "sub_path": "filament/Anker Generic PC 0.2 nozzle.json" + "name": "Generic PC @Anker 0.2 nozzle", + "sub_path": "filament/Generic PC @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic PC 0.25 nozzle", - "sub_path": "filament/Anker Generic PC 0.25 nozzle.json" + "name": "Generic PC @Anker 0.25 nozzle", + "sub_path": "filament/Generic PC @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic PETG", - "sub_path": "filament/Anker Generic PETG.json" + "name": "Generic PETG @Anker", + "sub_path": "filament/Generic PETG @Anker.json" }, { - "name": "Anker Generic PETG 0.2 nozzle", - "sub_path": "filament/Anker Generic PETG 0.2 nozzle.json" + "name": "Generic PETG @Anker 0.2 nozzle", + "sub_path": "filament/Generic PETG @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic PETG 0.25 nozzle", - "sub_path": "filament/Anker Generic PETG 0.25 nozzle.json" + "name": "Generic PETG @Anker 0.25 nozzle", + "sub_path": "filament/Generic PETG @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic PETG-CF", - "sub_path": "filament/Anker Generic PETG-CF.json" + "name": "Generic PETG-CF @Anker", + "sub_path": "filament/Generic PETG-CF @Anker.json" }, { - "name": "Anker Generic PLA", - "sub_path": "filament/Anker Generic PLA.json" + "name": "Generic PLA @Anker", + "sub_path": "filament/Generic PLA @Anker.json" }, { - "name": "Anker Generic PLA 0.2 nozzle", - "sub_path": "filament/Anker Generic PLA 0.2 nozzle.json" + "name": "Generic PLA @Anker 0.2 nozzle", + "sub_path": "filament/Generic PLA @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic PLA 0.25 nozzle", - "sub_path": "filament/Anker Generic PLA 0.25 nozzle.json" + "name": "Generic PLA @Anker 0.25 nozzle", + "sub_path": "filament/Generic PLA @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic PLA Silk", - "sub_path": "filament/Anker Generic PLA Silk.json" + "name": "Generic PLA Silk @Anker", + "sub_path": "filament/Generic PLA Silk @Anker.json" }, { - "name": "Anker Generic PLA Silk 0.2 nozzle", - "sub_path": "filament/Anker Generic PLA Silk 0.2 nozzle.json" + "name": "Generic PLA Silk @Anker 0.2 nozzle", + "sub_path": "filament/Generic PLA Silk @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic PLA Silk 0.25 nozzle", - "sub_path": "filament/Anker Generic PLA Silk 0.25 nozzle.json" + "name": "Generic PLA Silk @Anker 0.25 nozzle", + "sub_path": "filament/Generic PLA Silk @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic PLA+", - "sub_path": "filament/Anker Generic PLA+.json" + "name": "Generic PLA+ @Anker", + "sub_path": "filament/Generic PLA+ @Anker.json" }, { - "name": "Anker Generic PLA+ 0.2 nozzle", - "sub_path": "filament/Anker Generic PLA+ 0.2 nozzle.json" + "name": "Generic PLA+ @Anker 0.2 nozzle", + "sub_path": "filament/Generic PLA+ @Anker 0.2 nozzle.json" }, { - "name": "Anker Generic PLA+ 0.25 nozzle", - "sub_path": "filament/Anker Generic PLA+ 0.25 nozzle.json" + "name": "Generic PLA+ @Anker 0.25 nozzle", + "sub_path": "filament/Generic PLA+ @Anker 0.25 nozzle.json" }, { - "name": "Anker Generic PLA-CF", - "sub_path": "filament/Anker Generic PLA-CF.json" + "name": "Generic PLA-CF @Anker", + "sub_path": "filament/Generic PLA-CF @Anker.json" }, { - "name": "Anker Generic PVA", - "sub_path": "filament/Anker Generic PVA.json" + "name": "Generic PVA @Anker", + "sub_path": "filament/Generic PVA @Anker.json" }, { - "name": "Anker Generic TPU", - "sub_path": "filament/Anker Generic TPU.json" + "name": "Generic TPU @Anker", + "sub_path": "filament/Generic TPU @Anker.json" } ], "machine_list": [ diff --git a/resources/profiles/Anker/filament/Anker Generic PLA Silk 0.2 nozzle.json b/resources/profiles/Anker/filament/Anker Generic PLA Silk 0.2 nozzle.json deleted file mode 100644 index 90c78475bd..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA Silk 0.2 nozzle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA Silk 0.2 nozzle", - "inherits": "Anker Generic PLA Silk @base", - "from": "system", - "setting_id": "A1l6NiwRrasdV556", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "2" - ], - "compatible_printers": [ - "Anker M5 0.2 nozzle", - "Anker M5 All-Metal 0.2 nozzle", - "Anker M5C 0.2 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA Silk 0.25 nozzle.json b/resources/profiles/Anker/filament/Anker Generic PLA Silk 0.25 nozzle.json deleted file mode 100644 index 45032d46c3..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA Silk 0.25 nozzle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA Silk 0.25 nozzle", - "inherits": "Anker Generic PLA Silk @base", - "from": "system", - "setting_id": "yzHmKTOtA9JamlNf", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "3" - ], - "compatible_printers": [ - "Anker M5 0.25 nozzle", - "Anker M5 All-Metal 0.25 nozzle", - "Anker M5C 0.25 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA Silk.json b/resources/profiles/Anker/filament/Anker Generic PLA Silk.json deleted file mode 100644 index df8b1d7cdb..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA Silk.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA Silk", - "inherits": "Anker Generic PLA Silk @base", - "from": "system", - "setting_id": "BGttYO9m2rGcnrEG", - "instantiation": "true", - "compatible_printers": [ - "Anker M5 0.4 nozzle", - "Anker M5 0.6 nozzle", - "Anker M5 All-Metal 0.4 nozzle", - "Anker M5 All-Metal 0.6 nozzle", - "Anker M5C 0.4 nozzle", - "Anker M5C 0.6 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA+ 0.2 nozzle.json b/resources/profiles/Anker/filament/Anker Generic PLA+ 0.2 nozzle.json deleted file mode 100644 index 9923efcd6f..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA+ 0.2 nozzle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA+ 0.2 nozzle", - "inherits": "Anker Generic PLA+ @base", - "from": "system", - "setting_id": "6IcMSjyxt0szdUuY", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "2" - ], - "compatible_printers": [ - "Anker M5 0.2 nozzle", - "Anker M5 All-Metal 0.2 nozzle", - "Anker M5C 0.2 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA+ 0.25 nozzle.json b/resources/profiles/Anker/filament/Anker Generic PLA+ 0.25 nozzle.json deleted file mode 100644 index 809b57ef69..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA+ 0.25 nozzle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA+ 0.25 nozzle", - "inherits": "Anker Generic PLA+ @base", - "from": "system", - "setting_id": "a2Rf07ZUhpTPONN1", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "3" - ], - "compatible_printers": [ - "Anker M5 0.25 nozzle", - "Anker M5 All-Metal 0.25 nozzle", - "Anker M5C 0.25 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA+.json b/resources/profiles/Anker/filament/Anker Generic PLA+.json deleted file mode 100644 index 4c4ded7c11..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA+.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA+", - "inherits": "Anker Generic PLA+ @base", - "from": "system", - "setting_id": "0yQN44WNvLVjQu2b", - "instantiation": "true", - "compatible_printers": [ - "Anker M5 0.4 nozzle", - "Anker M5 0.6 nozzle", - "Anker M5 All-Metal 0.4 nozzle", - "Anker M5 All-Metal 0.6 nozzle", - "Anker M5C 0.4 nozzle", - "Anker M5C 0.6 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA-CF.json b/resources/profiles/Anker/filament/Anker Generic PLA-CF.json deleted file mode 100644 index 7a2d6d5e97..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA-CF.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA-CF", - "inherits": "Anker Generic PLA-CF @base", - "from": "system", - "setting_id": "diNUVM7UcHLnOr9J", - "instantiation": "true", - "compatible_printers": [ - "Anker M5 0.4 nozzle", - "Anker M5 0.6 nozzle", - "Anker M5 All-Metal 0.4 nozzle", - "Anker M5 All-Metal 0.6 nozzle", - "Anker M5C 0.4 nozzle", - "Anker M5C 0.6 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA.json b/resources/profiles/Anker/filament/Anker Generic PLA.json deleted file mode 100644 index 1c4b7bc5fb..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PLA.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PLA", - "inherits": "Anker Generic PLA @base", - "from": "system", - "setting_id": "qfKC91VAAFZSExhm", - "instantiation": "true", - "compatible_printers": [ - "Anker M5 0.4 nozzle", - "Anker M5 0.6 nozzle", - "Anker M5 All-Metal 0.4 nozzle", - "Anker M5 All-Metal 0.6 nozzle", - "Anker M5C 0.4 nozzle", - "Anker M5C 0.6 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic PVA.json b/resources/profiles/Anker/filament/Anker Generic PVA.json deleted file mode 100644 index 97039a12d6..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic PVA.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic PVA", - "inherits": "Anker Generic PVA @base", - "from": "system", - "setting_id": "GRtdOKUkQfZ5eDH4", - "instantiation": "true", - "compatible_printers": [ - "Anker M5 0.4 nozzle", - "Anker M5 0.6 nozzle", - "Anker M5 All-Metal 0.4 nozzle", - "Anker M5 All-Metal 0.6 nozzle", - "Anker M5C 0.4 nozzle", - "Anker M5C 0.6 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic TPU.json b/resources/profiles/Anker/filament/Anker Generic TPU.json deleted file mode 100644 index fb99d95f0d..0000000000 --- a/resources/profiles/Anker/filament/Anker Generic TPU.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Anker Generic TPU", - "inherits": "Anker Generic TPU @base", - "from": "system", - "setting_id": "YyTaPGGiEyAzmh9A", - "instantiation": "true", - "compatible_printers": [ - "Anker M5 0.4 nozzle", - "Anker M5 0.6 nozzle", - "Anker M5 All-Metal 0.4 nozzle", - "Anker M5 All-Metal 0.6 nozzle", - "Anker M5C 0.4 nozzle", - "Anker M5C 0.6 nozzle" - ] -} diff --git a/resources/profiles/Anker/filament/Anker Generic ABS 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic ABS @Anker 0.2 nozzle.json similarity index 58% rename from resources/profiles/Anker/filament/Anker Generic ABS 0.2 nozzle.json rename to resources/profiles/Anker/filament/Generic ABS @Anker 0.2 nozzle.json index aaa175bacd..c3e47c80a3 100644 --- a/resources/profiles/Anker/filament/Anker Generic ABS 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ABS @Anker 0.2 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic ABS 0.2 nozzle", - "inherits": "Anker Generic ABS @base", + "name": "Generic ABS @Anker 0.2 nozzle", + "inherits": "Generic ABS @Anker base", + "renamed_from": "Anker Generic ABS 0.2 nozzle", "from": "system", - "setting_id": "BD5ODYVM90Ig44C5", + "setting_id": "iOCt7x95XbWYMe5q", "instantiation": "true", "filament_max_volumetric_speed": [ "2" diff --git a/resources/profiles/Anker/filament/Anker Generic PETG 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic ABS @Anker 0.25 nozzle.json similarity index 58% rename from resources/profiles/Anker/filament/Anker Generic PETG 0.25 nozzle.json rename to resources/profiles/Anker/filament/Generic ABS @Anker 0.25 nozzle.json index 689836eae3..64fd62eb64 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ABS @Anker 0.25 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PETG 0.25 nozzle", - "inherits": "Anker Generic PETG @base", + "name": "Generic ABS @Anker 0.25 nozzle", + "inherits": "Generic ABS @Anker base", + "renamed_from": "Anker Generic ABS 0.25 nozzle", "from": "system", - "setting_id": "UgKfPuleh1xnoJLT", + "setting_id": "7Q2pr70SpSjK7v7Y", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json b/resources/profiles/Anker/filament/Generic ABS @Anker base.json similarity index 61% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @base.json rename to resources/profiles/Anker/filament/Generic ABS @Anker base.json index c64feecc6d..fe24d081e4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @base.json +++ b/resources/profiles/Anker/filament/Generic ABS @Anker base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic ABS @base", + "name": "Generic ABS @Anker base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OFvGc67v", + "filament_id": "OFY9muEs", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic ASA.json b/resources/profiles/Anker/filament/Generic ABS @Anker.json similarity index 65% rename from resources/profiles/Anker/filament/Anker Generic ASA.json rename to resources/profiles/Anker/filament/Generic ABS @Anker.json index 66041c0463..978bc00e31 100644 --- a/resources/profiles/Anker/filament/Anker Generic ASA.json +++ b/resources/profiles/Anker/filament/Generic ABS @Anker.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic ASA", - "inherits": "Anker Generic ASA @base", + "name": "Generic ABS @Anker", + "inherits": "Generic ABS @Anker base", + "renamed_from": "Anker Generic ABS", "from": "system", - "setting_id": "QiFoBW5WuDUJGmFZ", + "setting_id": "x3IBYtgKBx6Mszzk", "instantiation": "true", "compatible_printers": [ "Anker M5 0.4 nozzle", diff --git a/resources/profiles/Anker/filament/Anker Generic PETG 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic ASA @Anker 0.2 nozzle.json similarity index 58% rename from resources/profiles/Anker/filament/Anker Generic PETG 0.2 nozzle.json rename to resources/profiles/Anker/filament/Generic ASA @Anker 0.2 nozzle.json index 18686402e1..1a40e93730 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ASA @Anker 0.2 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PETG 0.2 nozzle", - "inherits": "Anker Generic PETG @base", + "name": "Generic ASA @Anker 0.2 nozzle", + "inherits": "Generic ASA @Anker base", + "renamed_from": "Anker Generic ASA 0.2 nozzle", "from": "system", - "setting_id": "VItvDP6zmenWXwPO", + "setting_id": "lTR8QLbuttyVs5UW", "instantiation": "true", "filament_max_volumetric_speed": [ "2" diff --git a/resources/profiles/Anker/filament/Anker Generic ABS 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic ASA @Anker 0.25 nozzle.json similarity index 58% rename from resources/profiles/Anker/filament/Anker Generic ABS 0.25 nozzle.json rename to resources/profiles/Anker/filament/Generic ASA @Anker 0.25 nozzle.json index 76c10b1018..0b85eef27c 100644 --- a/resources/profiles/Anker/filament/Anker Generic ABS 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic ASA @Anker 0.25 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic ABS 0.25 nozzle", - "inherits": "Anker Generic ABS @base", + "name": "Generic ASA @Anker 0.25 nozzle", + "inherits": "Generic ASA @Anker base", + "renamed_from": "Anker Generic ASA 0.25 nozzle", "from": "system", - "setting_id": "WS5wXckNuiQqSVwO", + "setting_id": "FU4BiMydEyo7zxq5", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/Anker/filament/Anker Generic ASA @base.json b/resources/profiles/Anker/filament/Generic ASA @Anker base.json similarity index 61% rename from resources/profiles/Anker/filament/Anker Generic ASA @base.json rename to resources/profiles/Anker/filament/Generic ASA @Anker base.json index 585c1d0079..f2349d13ab 100644 --- a/resources/profiles/Anker/filament/Anker Generic ASA @base.json +++ b/resources/profiles/Anker/filament/Generic ASA @Anker base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Anker Generic ASA @base", + "name": "Generic ASA @Anker base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OFRiyes1", + "filament_id": "OFLPAxz3", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PETG-CF.json b/resources/profiles/Anker/filament/Generic ASA @Anker.json similarity index 65% rename from resources/profiles/Anker/filament/Anker Generic PETG-CF.json rename to resources/profiles/Anker/filament/Generic ASA @Anker.json index 3f0dd59e94..53b84223df 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG-CF.json +++ b/resources/profiles/Anker/filament/Generic ASA @Anker.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PETG-CF", - "inherits": "Anker Generic PETG-CF @base", + "name": "Generic ASA @Anker", + "inherits": "Generic ASA @Anker base", + "renamed_from": "Anker Generic ASA", "from": "system", - "setting_id": "j8PLF6AZD0R0oVs8", + "setting_id": "aDADuxiEKt2dVKOJ", "instantiation": "true", "compatible_printers": [ "Anker M5 0.4 nozzle", diff --git a/resources/profiles/Anker/filament/Anker Generic PA 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PA @Anker 0.2 nozzle.json similarity index 55% rename from resources/profiles/Anker/filament/Anker Generic PA 0.2 nozzle.json rename to resources/profiles/Anker/filament/Generic PA @Anker 0.2 nozzle.json index 3e7a0b85d1..6460721e2f 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PA @Anker 0.2 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PA 0.2 nozzle", - "inherits": "Anker Generic PA @base", + "name": "Generic PA @Anker 0.2 nozzle", + "inherits": "Generic PA @Anker base", + "renamed_from": "Anker Generic PA 0.2 nozzle", "from": "system", - "setting_id": "NZB26MSD9WbOeY2S", + "setting_id": "tYAT7xnNFD6gY84A", "instantiation": "true", "filament_max_volumetric_speed": [ "2" diff --git a/resources/profiles/Anker/filament/Anker Generic PA 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PA @Anker 0.25 nozzle.json similarity index 55% rename from resources/profiles/Anker/filament/Anker Generic PA 0.25 nozzle.json rename to resources/profiles/Anker/filament/Generic PA @Anker 0.25 nozzle.json index 8c0233d67e..ee2514e92c 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PA @Anker 0.25 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PA 0.25 nozzle", - "inherits": "Anker Generic PA @base", + "name": "Generic PA @Anker 0.25 nozzle", + "inherits": "Generic PA @Anker base", + "renamed_from": "Anker Generic PA 0.25 nozzle", "from": "system", - "setting_id": "Wj7oXTGUxo8lie1B", + "setting_id": "Zlv65wLA94PbevRG", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @base.json b/resources/profiles/Anker/filament/Generic PA @Anker base.json similarity index 61% rename from resources/profiles/Prusa/filament/Prusa Generic PA @base.json rename to resources/profiles/Anker/filament/Generic PA @Anker base.json index 08528488af..b4a45b1e66 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @base.json +++ b/resources/profiles/Anker/filament/Generic PA @Anker base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PA @base", + "name": "Generic PA @Anker base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFIy3kLw", + "filament_id": "OFg8ndtj", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PC.json b/resources/profiles/Anker/filament/Generic PA @Anker.json similarity index 60% rename from resources/profiles/Anker/filament/Anker Generic PC.json rename to resources/profiles/Anker/filament/Generic PA @Anker.json index 3be5d34b71..e9acc2d7f6 100644 --- a/resources/profiles/Anker/filament/Anker Generic PC.json +++ b/resources/profiles/Anker/filament/Generic PA @Anker.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PC", - "inherits": "Anker Generic PC @base", + "name": "Generic PA @Anker", + "inherits": "Generic PA @Anker base", + "renamed_from": "Anker Generic PA", "from": "system", - "setting_id": "xY25QcIsR9pWai3n", + "setting_id": "sLWVtBxpAC53eUwo", "instantiation": "true", "compatible_printers": [ "Anker M5 All-Metal 0.4 nozzle", diff --git a/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json b/resources/profiles/Anker/filament/Generic PA-CF @Anker base.json similarity index 79% rename from resources/profiles/Anker/filament/Anker Generic PA-CF @base.json rename to resources/profiles/Anker/filament/Generic PA-CF @Anker base.json index ef1343cd5a..fc0740ee53 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json +++ b/resources/profiles/Anker/filament/Generic PA-CF @Anker base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Anker Generic PA-CF @base", + "name": "Generic PA-CF @Anker base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OF7uE5KB", + "filament_id": "OFQLcbps", "instantiation": "false", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Anker/filament/Anker Generic PA.json b/resources/profiles/Anker/filament/Generic PA-CF @Anker.json similarity index 59% rename from resources/profiles/Anker/filament/Anker Generic PA.json rename to resources/profiles/Anker/filament/Generic PA-CF @Anker.json index 43f3724ea9..6c3b2d1860 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA.json +++ b/resources/profiles/Anker/filament/Generic PA-CF @Anker.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PA", - "inherits": "Anker Generic PA @base", + "name": "Generic PA-CF @Anker", + "inherits": "Generic PA-CF @Anker base", + "renamed_from": "Anker Generic PA-CF", "from": "system", - "setting_id": "QbIiX554Yee6vb32", + "setting_id": "K4LcpR0zBp5klSpb", "instantiation": "true", "compatible_printers": [ "Anker M5 All-Metal 0.4 nozzle", diff --git a/resources/profiles/Anker/filament/Anker Generic PC 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PC @Anker 0.2 nozzle.json similarity index 55% rename from resources/profiles/Anker/filament/Anker Generic PC 0.2 nozzle.json rename to resources/profiles/Anker/filament/Generic PC @Anker 0.2 nozzle.json index 87f09622b9..0126f9f893 100644 --- a/resources/profiles/Anker/filament/Anker Generic PC 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PC @Anker 0.2 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PC 0.2 nozzle", - "inherits": "Anker Generic PC @base", + "name": "Generic PC @Anker 0.2 nozzle", + "inherits": "Generic PC @Anker base", + "renamed_from": "Anker Generic PC 0.2 nozzle", "from": "system", - "setting_id": "GhIOAidtgDkzh9Aj", + "setting_id": "2sSOgctcnVh9bGbQ", "instantiation": "true", "filament_max_volumetric_speed": [ "2" diff --git a/resources/profiles/Anker/filament/Anker Generic PC 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PC @Anker 0.25 nozzle.json similarity index 55% rename from resources/profiles/Anker/filament/Anker Generic PC 0.25 nozzle.json rename to resources/profiles/Anker/filament/Generic PC @Anker 0.25 nozzle.json index 38794a6a44..50aca840aa 100644 --- a/resources/profiles/Anker/filament/Anker Generic PC 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PC @Anker 0.25 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PC 0.25 nozzle", - "inherits": "Anker Generic PC @base", + "name": "Generic PC @Anker 0.25 nozzle", + "inherits": "Generic PC @Anker base", + "renamed_from": "Anker Generic PC 0.25 nozzle", "from": "system", - "setting_id": "TQm9EPdenyGJMvgP", + "setting_id": "h7IRuq5uekjNw4vg", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/Anker/filament/Anker Generic PC @base.json b/resources/profiles/Anker/filament/Generic PC @Anker base.json similarity index 61% rename from resources/profiles/Anker/filament/Anker Generic PC @base.json rename to resources/profiles/Anker/filament/Generic PC @Anker base.json index 85eb21469c..90ded72d2f 100644 --- a/resources/profiles/Anker/filament/Anker Generic PC @base.json +++ b/resources/profiles/Anker/filament/Generic PC @Anker base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Anker Generic PC @base", + "name": "Generic PC @Anker base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OFGPJxnt", + "filament_id": "OFLakOUI", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PA-CF.json b/resources/profiles/Anker/filament/Generic PC @Anker.json similarity index 60% rename from resources/profiles/Anker/filament/Anker Generic PA-CF.json rename to resources/profiles/Anker/filament/Generic PC @Anker.json index b821bede88..5433518c5a 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA-CF.json +++ b/resources/profiles/Anker/filament/Generic PC @Anker.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PA-CF", - "inherits": "Anker Generic PA-CF @base", + "name": "Generic PC @Anker", + "inherits": "Generic PC @Anker base", + "renamed_from": "Anker Generic PC", "from": "system", - "setting_id": "qdsEps11ugFHJkn7", + "setting_id": "ffufXVvW95sunH1B", "instantiation": "true", "compatible_printers": [ "Anker M5 All-Metal 0.4 nozzle", diff --git a/resources/profiles/Anker/filament/Anker Generic PLA 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PETG @Anker 0.2 nozzle.json similarity index 57% rename from resources/profiles/Anker/filament/Anker Generic PLA 0.2 nozzle.json rename to resources/profiles/Anker/filament/Generic PETG @Anker 0.2 nozzle.json index 6c31b3949c..2ff7eca4d1 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PETG @Anker 0.2 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PLA 0.2 nozzle", - "inherits": "Anker Generic PLA @base", + "name": "Generic PETG @Anker 0.2 nozzle", + "inherits": "Generic PETG @Anker base", + "renamed_from": "Anker Generic PETG 0.2 nozzle", "from": "system", - "setting_id": "j6QmCITPJoP7bWHq", + "setting_id": "67ZHuiXPyCP6Tdtr", "instantiation": "true", "filament_max_volumetric_speed": [ "2" diff --git a/resources/profiles/Anker/filament/Anker Generic ASA 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PETG @Anker 0.25 nozzle.json similarity index 57% rename from resources/profiles/Anker/filament/Anker Generic ASA 0.25 nozzle.json rename to resources/profiles/Anker/filament/Generic PETG @Anker 0.25 nozzle.json index fad3cb2a20..9f9ae2da35 100644 --- a/resources/profiles/Anker/filament/Anker Generic ASA 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PETG @Anker 0.25 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic ASA 0.25 nozzle", - "inherits": "Anker Generic ASA @base", + "name": "Generic PETG @Anker 0.25 nozzle", + "inherits": "Generic PETG @Anker base", + "renamed_from": "Anker Generic PETG 0.25 nozzle", "from": "system", - "setting_id": "ErUUDTQ7h1wNHAKT", + "setting_id": "aLuRALDt0Otbd2So", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/Anker/filament/Anker Generic PETG @base.json b/resources/profiles/Anker/filament/Generic PETG @Anker base.json similarity index 83% rename from resources/profiles/Anker/filament/Anker Generic PETG @base.json rename to resources/profiles/Anker/filament/Generic PETG @Anker base.json index 8bd93439b8..9a0ccc2fe4 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG @base.json +++ b/resources/profiles/Anker/filament/Generic PETG @Anker base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Anker Generic PETG @base", + "name": "Generic PETG @Anker base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFgvOmM2", + "filament_id": "OFYPdQJh", "instantiation": "false", "filament_type": [ "PETG" diff --git a/resources/profiles/Anker/filament/Generic PETG @Anker.json b/resources/profiles/Anker/filament/Generic PETG @Anker.json new file mode 100644 index 0000000000..cdb08f8671 --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PETG @Anker.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PETG @Anker", + "inherits": "Generic PETG @Anker base", + "renamed_from": "Anker Generic PETG", + "from": "system", + "setting_id": "hvV0rmnzRHJk9sMz", + "instantiation": "true", + "compatible_printers": [ + "Anker M5 0.4 nozzle", + "Anker M5 0.6 nozzle", + "Anker M5 All-Metal 0.4 nozzle", + "Anker M5 All-Metal 0.6 nozzle", + "Anker M5C 0.4 nozzle", + "Anker M5C 0.6 nozzle" + ] +} diff --git a/resources/profiles/Anker/filament/Anker Generic PETG-CF @base.json b/resources/profiles/Anker/filament/Generic PETG-CF @Anker base.json similarity index 86% rename from resources/profiles/Anker/filament/Anker Generic PETG-CF @base.json rename to resources/profiles/Anker/filament/Generic PETG-CF @Anker base.json index c39b36f841..3c0f59949a 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG-CF @base.json +++ b/resources/profiles/Anker/filament/Generic PETG-CF @Anker base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Anker Generic PETG-CF @base", + "name": "Generic PETG-CF @Anker base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OF1daEUW", + "filament_id": "OFoYSJKi", "instantiation": "false", "filament_type": [ "PETG-CF" diff --git a/resources/profiles/Anker/filament/Generic PETG-CF @Anker.json b/resources/profiles/Anker/filament/Generic PETG-CF @Anker.json new file mode 100644 index 0000000000..e5a265c40f --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PETG-CF @Anker.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @Anker", + "inherits": "Generic PETG-CF @Anker base", + "renamed_from": "Anker Generic PETG-CF", + "from": "system", + "setting_id": "vCAuQeQLoXUk28ph", + "instantiation": "true", + "compatible_printers": [ + "Anker M5 0.4 nozzle", + "Anker M5 0.6 nozzle", + "Anker M5 All-Metal 0.4 nozzle", + "Anker M5 All-Metal 0.6 nozzle", + "Anker M5C 0.4 nozzle", + "Anker M5C 0.6 nozzle" + ] +} diff --git a/resources/profiles/Anker/filament/Anker Generic ASA 0.2 nozzle.json b/resources/profiles/Anker/filament/Generic PLA @Anker 0.2 nozzle.json similarity index 58% rename from resources/profiles/Anker/filament/Anker Generic ASA 0.2 nozzle.json rename to resources/profiles/Anker/filament/Generic PLA @Anker 0.2 nozzle.json index b13a09de2a..e8ffdb8c57 100644 --- a/resources/profiles/Anker/filament/Anker Generic ASA 0.2 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA @Anker 0.2 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic ASA 0.2 nozzle", - "inherits": "Anker Generic ASA @base", + "name": "Generic PLA @Anker 0.2 nozzle", + "inherits": "Generic PLA @Anker base", + "renamed_from": "Anker Generic PLA 0.2 nozzle", "from": "system", - "setting_id": "G7pzEyyhPFDnae3R", + "setting_id": "rCvmCzPgi4KA6nmI", "instantiation": "true", "filament_max_volumetric_speed": [ "2" diff --git a/resources/profiles/Anker/filament/Anker Generic PLA 0.25 nozzle.json b/resources/profiles/Anker/filament/Generic PLA @Anker 0.25 nozzle.json similarity index 58% rename from resources/profiles/Anker/filament/Anker Generic PLA 0.25 nozzle.json rename to resources/profiles/Anker/filament/Generic PLA @Anker 0.25 nozzle.json index d3775b07e2..5e4e3e0f0b 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA 0.25 nozzle.json +++ b/resources/profiles/Anker/filament/Generic PLA @Anker 0.25 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PLA 0.25 nozzle", - "inherits": "Anker Generic PLA @base", + "name": "Generic PLA @Anker 0.25 nozzle", + "inherits": "Generic PLA @Anker base", + "renamed_from": "Anker Generic PLA 0.25 nozzle", "from": "system", - "setting_id": "uKfcnPWdXxAGB5Ls", + "setting_id": "C0hNEbEueKrcYojS", "instantiation": "true", "filament_max_volumetric_speed": [ "3" diff --git a/resources/profiles/Anker/filament/Anker Generic PLA @base.json b/resources/profiles/Anker/filament/Generic PLA @Anker base.json similarity index 61% rename from resources/profiles/Anker/filament/Anker Generic PLA @base.json rename to resources/profiles/Anker/filament/Generic PLA @Anker base.json index bfe79d7ec5..d9cc2b2641 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA @base.json +++ b/resources/profiles/Anker/filament/Generic PLA @Anker base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Anker Generic PLA @base", + "name": "Generic PLA @Anker base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFndmfJ1", + "filament_id": "OFDSrzZ8", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic PETG.json b/resources/profiles/Anker/filament/Generic PLA @Anker.json similarity index 65% rename from resources/profiles/Anker/filament/Anker Generic PETG.json rename to resources/profiles/Anker/filament/Generic PLA @Anker.json index ed70b54983..5049571bcb 100644 --- a/resources/profiles/Anker/filament/Anker Generic PETG.json +++ b/resources/profiles/Anker/filament/Generic PLA @Anker.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic PETG", - "inherits": "Anker Generic PETG @base", + "name": "Generic PLA @Anker", + "inherits": "Generic PLA @Anker base", + "renamed_from": "Anker Generic PLA", "from": "system", - "setting_id": "FMnK9qOMiqDcGqhd", + "setting_id": "GfVhcxRmt6mHSemI", "instantiation": "true", "compatible_printers": [ "Anker M5 0.4 nozzle", 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 new file mode 100644 index 0000000000..e28ab1c79a --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.2 nozzle.json @@ -0,0 +1,17 @@ +{ + "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", + "from": "system", + "setting_id": "NWGiPWYmLVktDMJt", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2" + ], + "compatible_printers": [ + "Anker M5 0.2 nozzle", + "Anker M5 All-Metal 0.2 nozzle", + "Anker M5C 0.2 nozzle" + ] +} 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 new file mode 100644 index 0000000000..2699cb1aea --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PLA Silk @Anker 0.25 nozzle.json @@ -0,0 +1,17 @@ +{ + "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", + "from": "system", + "setting_id": "4thKBCnYgDtnAtF5", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3" + ], + "compatible_printers": [ + "Anker M5 0.25 nozzle", + "Anker M5 All-Metal 0.25 nozzle", + "Anker M5C 0.25 nozzle" + ] +} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA Silk @base.json b/resources/profiles/Anker/filament/Generic PLA Silk @Anker base.json similarity index 87% rename from resources/profiles/Anker/filament/Anker Generic PLA Silk @base.json rename to resources/profiles/Anker/filament/Generic PLA Silk @Anker base.json index aa3c69e034..2db35d21c1 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA Silk @base.json +++ b/resources/profiles/Anker/filament/Generic PLA Silk @Anker base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Anker Generic PLA Silk @base", + "name": "Generic PLA Silk @Anker base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFXyyfX6", + "filament_id": "OFesA6rF", "instantiation": "false", "filament_cost": [ "20" diff --git a/resources/profiles/Anker/filament/Generic PLA Silk @Anker.json b/resources/profiles/Anker/filament/Generic PLA Silk @Anker.json new file mode 100644 index 0000000000..9629ba4f0b --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PLA Silk @Anker.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @Anker", + "inherits": "Generic PLA Silk @Anker base", + "renamed_from": "Anker Generic PLA Silk", + "from": "system", + "setting_id": "URRIeNXIiIPjxbKL", + "instantiation": "true", + "compatible_printers": [ + "Anker M5 0.4 nozzle", + "Anker M5 0.6 nozzle", + "Anker M5 All-Metal 0.4 nozzle", + "Anker M5 All-Metal 0.6 nozzle", + "Anker M5C 0.4 nozzle", + "Anker M5C 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..f32fb75a92 --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.2 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PLA+ @Anker 0.2 nozzle", + "inherits": "Generic PLA+ @Anker base", + "renamed_from": "Anker Generic PLA+ 0.2 nozzle", + "from": "system", + "setting_id": "5m3xLxdReqLlE2Jp", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2" + ], + "compatible_printers": [ + "Anker M5 0.2 nozzle", + "Anker M5 All-Metal 0.2 nozzle", + "Anker M5C 0.2 nozzle" + ] +} 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 new file mode 100644 index 0000000000..291773e546 --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PLA+ @Anker 0.25 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PLA+ @Anker 0.25 nozzle", + "inherits": "Generic PLA+ @Anker base", + "renamed_from": "Anker Generic PLA+ 0.25 nozzle", + "from": "system", + "setting_id": "wwkWVDsg6SoeCS0F", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "3" + ], + "compatible_printers": [ + "Anker M5 0.25 nozzle", + "Anker M5 All-Metal 0.25 nozzle", + "Anker M5C 0.25 nozzle" + ] +} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA+ @base.json b/resources/profiles/Anker/filament/Generic PLA+ @Anker base.json similarity index 82% rename from resources/profiles/Anker/filament/Anker Generic PLA+ @base.json rename to resources/profiles/Anker/filament/Generic PLA+ @Anker base.json index 23906759c9..0ec8e81392 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA+ @base.json +++ b/resources/profiles/Anker/filament/Generic PLA+ @Anker base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Anker Generic PLA+ @base", + "name": "Generic PLA+ @Anker base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFIYTy8S", + "filament_id": "OFEWYR89", "instantiation": "false", "filament_cost": [ "25" diff --git a/resources/profiles/Anker/filament/Generic PLA+ @Anker.json b/resources/profiles/Anker/filament/Generic PLA+ @Anker.json new file mode 100644 index 0000000000..1381c839da --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PLA+ @Anker.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PLA+ @Anker", + "inherits": "Generic PLA+ @Anker base", + "renamed_from": "Anker Generic PLA+", + "from": "system", + "setting_id": "MDb4CH02FxbgPNjS", + "instantiation": "true", + "compatible_printers": [ + "Anker M5 0.4 nozzle", + "Anker M5 0.6 nozzle", + "Anker M5 All-Metal 0.4 nozzle", + "Anker M5 All-Metal 0.6 nozzle", + "Anker M5C 0.4 nozzle", + "Anker M5C 0.6 nozzle" + ] +} diff --git a/resources/profiles/Anker/filament/Anker Generic PLA-CF @base.json b/resources/profiles/Anker/filament/Generic PLA-CF @Anker base.json similarity index 88% rename from resources/profiles/Anker/filament/Anker Generic PLA-CF @base.json rename to resources/profiles/Anker/filament/Generic PLA-CF @Anker base.json index cd7b72c3af..d1faf47a16 100644 --- a/resources/profiles/Anker/filament/Anker Generic PLA-CF @base.json +++ b/resources/profiles/Anker/filament/Generic PLA-CF @Anker base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Anker Generic PLA-CF @base", + "name": "Generic PLA-CF @Anker base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFB0a3hT", + "filament_id": "OFWbdGsC", "instantiation": "false", "filament_type": [ "PLA-CF" diff --git a/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json b/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json new file mode 100644 index 0000000000..7be034702f --- /dev/null +++ b/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @Anker", + "inherits": "Generic PLA-CF @Anker base", + "renamed_from": "Anker Generic PLA-CF", + "from": "system", + "setting_id": "5AdjHUxRi8LCU4E9", + "instantiation": "true", + "compatible_printers": [ + "Anker M5 0.4 nozzle", + "Anker M5 0.6 nozzle", + "Anker M5 All-Metal 0.4 nozzle", + "Anker M5 All-Metal 0.6 nozzle", + "Anker M5C 0.4 nozzle", + "Anker M5C 0.6 nozzle" + ] +} diff --git a/resources/profiles/Anker/filament/Anker Generic PVA @base.json b/resources/profiles/Anker/filament/Generic PVA @Anker base.json similarity index 61% rename from resources/profiles/Anker/filament/Anker Generic PVA @base.json rename to resources/profiles/Anker/filament/Generic PVA @Anker base.json index 68c9fce25b..d52cd9b729 100644 --- a/resources/profiles/Anker/filament/Anker Generic PVA @base.json +++ b/resources/profiles/Anker/filament/Generic PVA @Anker base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Anker Generic PVA @base", + "name": "Generic PVA @Anker base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "OFsCbVbN", + "filament_id": "OFDvXujf", "instantiation": "false" } diff --git a/resources/profiles/Anker/filament/Anker Generic ABS.json b/resources/profiles/Anker/filament/Generic PVA @Anker.json similarity index 65% rename from resources/profiles/Anker/filament/Anker Generic ABS.json rename to resources/profiles/Anker/filament/Generic PVA @Anker.json index 5588d39ff3..35a7dd456a 100644 --- a/resources/profiles/Anker/filament/Anker Generic ABS.json +++ b/resources/profiles/Anker/filament/Generic PVA @Anker.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Anker Generic ABS", - "inherits": "Anker Generic ABS @base", + "name": "Generic PVA @Anker", + "inherits": "Generic PVA @Anker base", + "renamed_from": "Anker Generic PVA", "from": "system", - "setting_id": "axEspGzFJnrnidm4", + "setting_id": "HXERDaP3AgzWtmiu", "instantiation": "true", "compatible_printers": [ "Anker M5 0.4 nozzle", diff --git a/resources/profiles/Anker/filament/Anker Generic TPU @base.json b/resources/profiles/Anker/filament/Generic TPU @Anker base.json similarity index 81% rename from resources/profiles/Anker/filament/Anker Generic TPU @base.json rename to resources/profiles/Anker/filament/Generic TPU @Anker base.json index 1399cfa459..233d7c8bc6 100644 --- a/resources/profiles/Anker/filament/Anker Generic TPU @base.json +++ b/resources/profiles/Anker/filament/Generic TPU @Anker base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Anker Generic TPU @base", + "name": "Generic TPU @Anker base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OF6tKa1Z", + "filament_id": "OFgbpcy9", "instantiation": "false", "filament_retraction_speed": "90", "filament_deretraction_speed": "50", diff --git a/resources/profiles/Anker/filament/Generic TPU @Anker.json b/resources/profiles/Anker/filament/Generic TPU @Anker.json new file mode 100644 index 0000000000..44204f1113 --- /dev/null +++ b/resources/profiles/Anker/filament/Generic TPU @Anker.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic TPU @Anker", + "inherits": "Generic TPU @Anker base", + "renamed_from": "Anker Generic TPU", + "from": "system", + "setting_id": "5YigkBBSP2RM1MbK", + "instantiation": "true", + "compatible_printers": [ + "Anker M5 0.4 nozzle", + "Anker M5 0.6 nozzle", + "Anker M5 All-Metal 0.4 nozzle", + "Anker M5 All-Metal 0.6 nozzle", + "Anker M5C 0.4 nozzle", + "Anker M5C 0.6 nozzle" + ] +} diff --git a/resources/profiles/Anker/machine/Anker M5 0.2 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.2 nozzle.json index e4543fa084..6389fba7bc 100644 --- a/resources/profiles/Anker/machine/Anker M5 0.2 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 0.2 nozzle.json @@ -16,7 +16,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.10mm Standard 0.2mm nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 0.25 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.25 nozzle.json index 88662e7bab..3feda012a3 100644 --- a/resources/profiles/Anker/machine/Anker M5 0.25 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 0.25 nozzle.json @@ -16,7 +16,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.10mm Standard 0.25mm nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json index 42810014ea..593cc53888 100644 --- a/resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 0.4 nozzle.json @@ -13,7 +13,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.20mm Standard @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 0.6 nozzle.json b/resources/profiles/Anker/machine/Anker M5 0.6 nozzle.json index 11d8b3cf62..3e3dc25c62 100644 --- a/resources/profiles/Anker/machine/Anker M5 0.6 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 0.6 nozzle.json @@ -19,7 +19,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.30mm Standard 0.6 nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.2 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.2 nozzle.json index 0240748426..ba4083b2be 100644 --- a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.2 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.2 nozzle.json @@ -16,7 +16,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.10mm Standard 0.2mm nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.25 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.25 nozzle.json index 8a5600df05..21201c4147 100644 --- a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.25 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.25 nozzle.json @@ -16,7 +16,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.10mm Standard 0.25mm nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.4 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.4 nozzle.json index 6434e3c76b..948cc7a3b8 100644 --- a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.4 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.4 nozzle.json @@ -13,7 +13,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.20mm Standard @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.6 nozzle.json b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.6 nozzle.json index 4c5c7a82ef..2dcb107d93 100644 --- a/resources/profiles/Anker/machine/Anker M5 All-Metal 0.6 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5 All-Metal 0.6 nozzle.json @@ -19,7 +19,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.30mm Standard 0.6 nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5 All-Metal Hot End.json b/resources/profiles/Anker/machine/Anker M5 All-Metal Hot End.json index e6944177ad..7fade72381 100644 --- a/resources/profiles/Anker/machine/Anker M5 All-Metal Hot End.json +++ b/resources/profiles/Anker/machine/Anker M5 All-Metal Hot End.json @@ -7,5 +7,5 @@ "family": "Anker", "machine_tech": "FFF", "model_id": "V8111v2", - "default_materials": "Anker Generic PLA;Anker Generic PLA+;Anker Generic PLA Silk;Anker Generic TPU;Anker Generic PETG" + "default_materials": "Generic PLA @Anker;Generic PLA+ @Anker;Generic PLA Silk @Anker;Generic TPU @Anker;Generic PETG @Anker" } diff --git a/resources/profiles/Anker/machine/Anker M5.json b/resources/profiles/Anker/machine/Anker M5.json index 489151a669..5c9839d1ff 100644 --- a/resources/profiles/Anker/machine/Anker M5.json +++ b/resources/profiles/Anker/machine/Anker M5.json @@ -7,5 +7,5 @@ "family": "Anker", "machine_tech": "FFF", "model_id": "V8111", - "default_materials": "Anker Generic PLA;Anker Generic PLA+;Anker Generic PLA Silk;Anker Generic TPU;Anker Generic PETG" + "default_materials": "Generic PLA @Anker;Generic PLA+ @Anker;Generic PLA Silk @Anker;Generic TPU @Anker;Generic PETG @Anker" } diff --git a/resources/profiles/Anker/machine/Anker M5C 0.2 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.2 nozzle.json index b88d21dae3..a5db1517a7 100644 --- a/resources/profiles/Anker/machine/Anker M5C 0.2 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5C 0.2 nozzle.json @@ -16,7 +16,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.10mm Standard 0.2mm nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5C 0.25 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.25 nozzle.json index 7aec134ac4..fd5c40ea05 100644 --- a/resources/profiles/Anker/machine/Anker M5C 0.25 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5C 0.25 nozzle.json @@ -16,7 +16,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.10mm Standard 0.25mm nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json index 573784f2f3..7dd6f8036b 100644 --- a/resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5C 0.4 nozzle.json @@ -13,7 +13,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.20mm Standard @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5C 0.6 nozzle.json b/resources/profiles/Anker/machine/Anker M5C 0.6 nozzle.json index d6d1212b63..5323967ae2 100644 --- a/resources/profiles/Anker/machine/Anker M5C 0.6 nozzle.json +++ b/resources/profiles/Anker/machine/Anker M5C 0.6 nozzle.json @@ -19,7 +19,7 @@ "auxiliary_fan": "0", "bed_exclude_area": [], "default_filament_profile": [ - "Anker Generic PLA+" + "Generic PLA+ @Anker" ], "default_print_profile": "0.30mm Standard 0.6 nozzle @Anker", "extruder_clearance_height_to_lid": "250", diff --git a/resources/profiles/Anker/machine/Anker M5C.json b/resources/profiles/Anker/machine/Anker M5C.json index d709bfc4c3..cf539851e5 100644 --- a/resources/profiles/Anker/machine/Anker M5C.json +++ b/resources/profiles/Anker/machine/Anker M5C.json @@ -7,5 +7,5 @@ "family": "Anker", "machine_tech": "FFF", "model_id": "V81101C3", - "default_materials": "Anker Generic PLA;Anker Generic PLA+;Anker Generic PLA Silk;Anker Generic TPU;Anker Generic PETG" + "default_materials": "Generic PLA @Anker;Generic PLA+ @Anker;Generic PLA Silk @Anker;Generic TPU @Anker;Generic PETG @Anker" } diff --git a/resources/profiles/Anycubic.json b/resources/profiles/Anycubic.json index d0a5ad0852..205fd359d8 100644 --- a/resources/profiles/Anycubic.json +++ b/resources/profiles/Anycubic.json @@ -1,1234 +1,1234 @@ -{ - "name": "Anycubic", - "version": "02.04.00.02", - "force_update": "0", - "description": "Anycubic configurations", - "machine_model_list": [ - { - "name": "Anycubic 4Max Pro", - "sub_path": "machine/Anycubic 4Max Pro.json" - }, - { - "name": "Anycubic 4Max Pro 2", - "sub_path": "machine/Anycubic 4Max Pro 2.json" - }, - { - "name": "Anycubic Chiron", - "sub_path": "machine/Anycubic Chiron.json" - }, - { - "name": "Anycubic Kobra", - "sub_path": "machine/Anycubic Kobra.json" - }, - { - "name": "Anycubic Kobra 2", - "sub_path": "machine/Anycubic Kobra 2.json" - }, - { - "name": "Anycubic Kobra 2 Max", - "sub_path": "machine/Anycubic Kobra 2 Max.json" - }, - { - "name": "Anycubic Kobra 2 Neo", - "sub_path": "machine/Anycubic Kobra 2 Neo.json" - }, - { - "name": "Anycubic Kobra 2 Plus", - "sub_path": "machine/Anycubic Kobra 2 Plus.json" - }, - { - "name": "Anycubic Kobra 2 Pro", - "sub_path": "machine/Anycubic Kobra 2 Pro.json" - }, - { - "name": "Anycubic Kobra 3", - "sub_path": "machine/Anycubic Kobra 3.json" - }, - { - "name": "Anycubic Kobra 3 Max", - "sub_path": "machine/Anycubic Kobra 3 Max.json" - }, - { - "name": "Anycubic Kobra Max", - "sub_path": "machine/Anycubic Kobra Max.json" - }, - { - "name": "Anycubic Kobra Neo", - "sub_path": "machine/Anycubic Kobra Neo.json" - }, - { - "name": "Anycubic Kobra Plus", - "sub_path": "machine/Anycubic Kobra Plus.json" - }, - { - "name": "Anycubic Kobra S1", - "sub_path": "machine/Anycubic Kobra S1.json" - }, - { - "name": "Anycubic Kobra S1 Max", - "sub_path": "machine/Anycubic Kobra S1 Max.json" - }, - { - "name": "Anycubic Kobra X", - "sub_path": "machine/Anycubic Kobra X.json" - }, - { - "name": "Anycubic Predator", - "sub_path": "machine/Anycubic Predator.json" - }, - { - "name": "Anycubic Vyper", - "sub_path": "machine/Anycubic Vyper.json" - }, - { - "name": "Anycubic i3 Mega S", - "sub_path": "machine/Anycubic i3 Mega S.json" - } - ], - "process_list": [ - { - "name": "fdm_process_common", - "sub_path": "process/fdm_process_common.json" - }, - { - "name": "0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "0.08mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "process/0.08mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "0.08mm Standard @Anycubic Kobra X", - "sub_path": "process/0.08mm Standard @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.10mm Detail @Anycubic Kobra 3 0.2 nozzle", - "sub_path": "process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json" - }, - { - "name": "0.12mm Detail @Anycubic Kobra 2 Neo 0.4 nozzle", - "sub_path": "process/0.12mm Detail @Anycubic Kobra 2 Neo 0.4 nozzle.json" - }, - { - "name": "0.12mm Detail @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "0.12mm Detail @Anycubic Kobra Neo 0.4 nozzle", - "sub_path": "process/0.12mm Detail @Anycubic Kobra Neo 0.4 nozzle.json" - }, - { - "name": "0.12mm High Quality @Anycubic Kobra X", - "sub_path": "process/0.12mm High Quality @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.12mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "process/0.12mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "0.12mm Standard @Anycubic Kobra X", - "sub_path": "process/0.12mm Standard @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.15mm Optimal @Anycubic 4MaxPro2", - "sub_path": "process/0.15mm Optimal @Anycubic 4MaxPro2.json" - }, - { - "name": "0.15mm Optimal @Anycubic Chiron", - "sub_path": "process/0.15mm Optimal @Anycubic Chiron.json" - }, - { - "name": "0.15mm Optimal @Anycubic Kobra", - "sub_path": "process/0.15mm Optimal @Anycubic Kobra.json" - }, - { - "name": "0.15mm Optimal @Anycubic Kobra2", - "sub_path": "process/0.15mm Optimal @Anycubic Kobra2.json" - }, - { - "name": "0.15mm Optimal @Anycubic KobraMax", - "sub_path": "process/0.15mm Optimal @Anycubic KobraMax.json" - }, - { - "name": "0.15mm Optimal @Anycubic KobraPlus", - "sub_path": "process/0.15mm Optimal @Anycubic KobraPlus.json" - }, - { - "name": "0.15mm Optimal @Anycubic Vyper", - "sub_path": "process/0.15mm Optimal @Anycubic Vyper.json" - }, - { - "name": "0.15mm Optimal @Anycubic i3MegaS", - "sub_path": "process/0.15mm Optimal @Anycubic i3MegaS.json" - }, - { - "name": "0.16mm High Quality @Anycubic Kobra X", - "sub_path": "process/0.16mm High Quality @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle", - "sub_path": "process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json" - }, - { - "name": "0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle", - "sub_path": "process/0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json" - }, - { - "name": "0.16mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "process/0.16mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "0.16mm Standard @Anycubic Kobra Neo 0.4 nozzle", - "sub_path": "process/0.16mm Standard @Anycubic Kobra Neo 0.4 nozzle.json" - }, - { - "name": "0.16mm Standard @Anycubic Kobra X", - "sub_path": "process/0.16mm Standard @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.18mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "process/0.18mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "0.20mm High Quality @Anycubic Kobra X", - "sub_path": "process/0.20mm High Quality @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic 4MaxPro", - "sub_path": "process/0.20mm Standard @Anycubic 4MaxPro.json" - }, - { - "name": "0.20mm Standard @Anycubic 4MaxPro2", - "sub_path": "process/0.20mm Standard @Anycubic 4MaxPro2.json" - }, - { - "name": "0.20mm Standard @Anycubic Chiron", - "sub_path": "process/0.20mm Standard @Anycubic Chiron.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra", - "sub_path": "process/0.20mm Standard @Anycubic Kobra.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra Neo 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra Neo 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra X", - "sub_path": "process/0.20mm Standard @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra2", - "sub_path": "process/0.20mm Standard @Anycubic Kobra2.json" - }, - { - "name": "0.20mm Standard @Anycubic KobraMax", - "sub_path": "process/0.20mm Standard @Anycubic KobraMax.json" - }, - { - "name": "0.20mm Standard @Anycubic KobraPlus", - "sub_path": "process/0.20mm Standard @Anycubic KobraPlus.json" - }, - { - "name": "0.20mm Standard @Anycubic Predator", - "sub_path": "process/0.20mm Standard @Anycubic Predator.json" - }, - { - "name": "0.20mm Standard @Anycubic Vyper", - "sub_path": "process/0.20mm Standard @Anycubic Vyper.json" - }, - { - "name": "0.20mm Standard @Anycubic i3MegaS", - "sub_path": "process/0.20mm Standard @Anycubic i3MegaS.json" - }, - { - "name": "0.24mm Draft @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "0.24mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "0.24mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "0.24mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "0.24mm Standard @Anycubic Kobra X", - "sub_path": "process/0.24mm Standard @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle", - "sub_path": "process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json" - }, - { - "name": "0.28mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle", - "sub_path": "process/0.28mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json" - }, - { - "name": "0.28mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "process/0.28mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "0.28mm Standard @Anycubic Kobra Neo 0.4 nozzle", - "sub_path": "process/0.28mm Standard @Anycubic Kobra Neo 0.4 nozzle.json" - }, - { - "name": "0.28mm Standard @Anycubic Kobra X", - "sub_path": "process/0.28mm Standard @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "0.30mm Draft @Anycubic 4MaxPro2", - "sub_path": "process/0.30mm Draft @Anycubic 4MaxPro2.json" - }, - { - "name": "0.30mm Draft @Anycubic Chiron", - "sub_path": "process/0.30mm Draft @Anycubic Chiron.json" - }, - { - "name": "0.30mm Draft @Anycubic Kobra", - "sub_path": "process/0.30mm Draft @Anycubic Kobra.json" - }, - { - "name": "0.30mm Draft @Anycubic Kobra2", - "sub_path": "process/0.30mm Draft @Anycubic Kobra2.json" - }, - { - "name": "0.30mm Draft @Anycubic KobraMax", - "sub_path": "process/0.30mm Draft @Anycubic KobraMax.json" - }, - { - "name": "0.30mm Draft @Anycubic KobraPlus", - "sub_path": "process/0.30mm Draft @Anycubic KobraPlus.json" - }, - { - "name": "0.30mm Draft @Anycubic Vyper", - "sub_path": "process/0.30mm Draft @Anycubic Vyper.json" - }, - { - "name": "0.30mm Draft @Anycubic i3MegaS", - "sub_path": "process/0.30mm Draft @Anycubic i3MegaS.json" - }, - { - "name": "0.30mm Standard @Anycubic Kobra 3 0.6 nozzle", - "sub_path": "process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json" - }, - { - "name": "0.30mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "process/0.30mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "0.32mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "process/0.32mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "0.36mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "process/0.36mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "0.40mm Standard @Anycubic Kobra 3 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json" - }, - { - "name": "0.40mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "0.42mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "process/0.42mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "0.48mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "process/0.48mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "0.08mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.08mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "0.12mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.12mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "0.16mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.16mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "0.16mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.16mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "0.20mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.20mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "0.20mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "0.24mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.24mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "0.28mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "process/0.28mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - - { - "name": "0.10mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "process/0.10mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "0.06mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "process/0.06mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "0.08mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "process/0.08mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "0.12mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "process/0.12mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "0.14mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "process/0.14mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - - { - "name": "0.30mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "process/0.30mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "0.18mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "process/0.18mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "0.24mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "process/0.24mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "0.36mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "process/0.36mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "0.42mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "process/0.42mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - - { - "name": "0.40mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "process/0.40mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "0.24mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "process/0.24mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "0.32mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "process/0.32mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "0.48mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "process/0.48mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "0.56mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "process/0.56mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" - } - - ], - "filament_list": [ - { - "name": "fdm_filament_common", - "sub_path": "filament/fdm_filament_common.json" - }, - { - "name": "fdm_filament_abs", - "sub_path": "filament/fdm_filament_abs.json" - }, - { - "name": "fdm_filament_asa", - "sub_path": "filament/fdm_filament_asa.json" - }, - { - "name": "fdm_filament_pa", - "sub_path": "filament/fdm_filament_pa.json" - }, - { - "name": "fdm_filament_pc", - "sub_path": "filament/fdm_filament_pc.json" - }, - { - "name": "fdm_filament_pet", - "sub_path": "filament/fdm_filament_pet.json" - }, - { - "name": "fdm_filament_pla", - "sub_path": "filament/fdm_filament_pla.json" - }, - { - "name": "fdm_filament_pva", - "sub_path": "filament/fdm_filament_pva.json" - }, - { - "name": "fdm_filament_tpu", - "sub_path": "filament/fdm_filament_tpu.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic Generic ABS", - "sub_path": "filament/Anycubic Generic ABS.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic Generic ASA", - "sub_path": "filament/Anycubic Generic ASA.json" - }, - { - "name": "Anycubic Generic PA", - "sub_path": "filament/Anycubic Generic PA.json" - }, - { - "name": "Anycubic Generic PA-CF", - "sub_path": "filament/Anycubic Generic PA-CF.json" - }, - { - "name": "Fiberon PA6-CF20 @Anycubic Kobra S1", - "sub_path": "filament/Polymaker/Fiberon PA6-CF20 @Anycubic Kobra S1.json" - }, - { - "name": "Anycubic Generic PC", - "sub_path": "filament/Anycubic Generic PC.json" - }, - { - "name": "Anycubic Generic PETG", - "sub_path": "filament/Anycubic Generic PETG.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Generic PETG @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Generic PETG @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic Generic PLA", - "sub_path": "filament/Anycubic Generic PLA.json" - }, - { - "name": "Anycubic Generic PLA-CF", - "sub_path": "filament/Anycubic Generic PLA-CF.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Panchroma PLA @Anycubic Kobra S1", - "sub_path": "filament/Polymaker/Panchroma PLA @Anycubic Kobra S1.json" - }, - { - "name": "Polymaker PLA Pro @Anycubic Kobra S1", - "sub_path": "filament/Polymaker/Polymaker PLA Pro @Anycubic Kobra S1.json" - }, - { - "name": "Polymaker PLA Pro Metallic @Anycubic Kobra S1", - "sub_path": "filament/Polymaker/Polymaker PLA Pro Metallic @Anycubic Kobra S1.json" - }, - { - "name": "Anycubic Generic PVA", - "sub_path": "filament/Anycubic Generic PVA.json" - }, - { - "name": "Anycubic PVA @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic PVA @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic Generic TPU", - "sub_path": "filament/Anycubic Generic TPU.json" - }, - { - "name": "Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic TPU @Anycubic Kobra S1 0.4 nozzle", - "sub_path": "filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle", - "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Generic ABS @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 3 0.2 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Generic TPU @Anycubic Kobra 3 0.4 nozzle", - "sub_path": "filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "filament/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - - { - "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - - { - "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - - { - "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle.json" - } - - ], - "machine_list": [ - { - "name": "fdm_machine_common", - "sub_path": "machine/fdm_machine_common.json" - }, - { - "name": "Anycubic 4Max Pro 0.4 nozzle", - "sub_path": "machine/Anycubic 4Max Pro 0.4 nozzle.json" - }, - { - "name": "Anycubic 4Max Pro 2 0.4 nozzle", - "sub_path": "machine/Anycubic 4Max Pro 2 0.4 nozzle.json" - }, - { - "name": "Anycubic Chiron 0.4 nozzle", - "sub_path": "machine/Anycubic Chiron 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 2 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 2 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 2 Max 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 2 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 2 Neo 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 2 Neo 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 2 Plus 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 2 Plus 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 2 Pro 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 2 Pro 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 3 0.2 nozzle", - "sub_path": "machine/Anycubic Kobra 3 0.2 nozzle.json" - }, - { - "name": "Anycubic Kobra 3 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 3 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 3 0.6 nozzle", - "sub_path": "machine/Anycubic Kobra 3 0.6 nozzle.json" - }, - { - "name": "Anycubic Kobra 3 0.8 nozzle", - "sub_path": "machine/Anycubic Kobra 3 0.8 nozzle.json" - }, - { - "name": "Anycubic Kobra 3 Max 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra 3 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra 3 Max 0.6 nozzle", - "sub_path": "machine/Anycubic Kobra 3 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic Kobra 3 Max 0.8 nozzle", - "sub_path": "machine/Anycubic Kobra 3 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic Kobra Max 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra Max 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra Neo 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra Neo 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra Plus 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra Plus 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra S1 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra S1 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra S1 Max 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra S1 Max 0.4 nozzle.json" - }, - { - "name": "Anycubic Kobra S1 Max 0.25 nozzle", - "sub_path": "machine/Anycubic Kobra S1 Max 0.25 nozzle.json" - }, - { - "name": "Anycubic Kobra S1 Max 0.6 nozzle", - "sub_path": "machine/Anycubic Kobra S1 Max 0.6 nozzle.json" - }, - { - "name": "Anycubic Kobra S1 Max 0.8 nozzle", - "sub_path": "machine/Anycubic Kobra S1 Max 0.8 nozzle.json" - }, - { - "name": "Anycubic Kobra X 0.4 nozzle", - "sub_path": "machine/Anycubic Kobra X 0.4 nozzle.json" - }, - { - "name": "Anycubic Predator 0.4 nozzle", - "sub_path": "machine/Anycubic Predator 0.4 nozzle.json" - }, - { - "name": "Anycubic Vyper 0.4 nozzle", - "sub_path": "machine/Anycubic Vyper 0.4 nozzle.json" - }, - { - "name": "Anycubic i3 Mega S 0.4 nozzle", - "sub_path": "machine/Anycubic i3 Mega S 0.4 nozzle.json" - } - ] -} +{ + "name": "Anycubic", + "version": "02.04.00.03", + "force_update": "0", + "description": "Anycubic configurations", + "machine_model_list": [ + { + "name": "Anycubic 4Max Pro", + "sub_path": "machine/Anycubic 4Max Pro.json" + }, + { + "name": "Anycubic 4Max Pro 2", + "sub_path": "machine/Anycubic 4Max Pro 2.json" + }, + { + "name": "Anycubic Chiron", + "sub_path": "machine/Anycubic Chiron.json" + }, + { + "name": "Anycubic Kobra", + "sub_path": "machine/Anycubic Kobra.json" + }, + { + "name": "Anycubic Kobra 2", + "sub_path": "machine/Anycubic Kobra 2.json" + }, + { + "name": "Anycubic Kobra 2 Max", + "sub_path": "machine/Anycubic Kobra 2 Max.json" + }, + { + "name": "Anycubic Kobra 2 Neo", + "sub_path": "machine/Anycubic Kobra 2 Neo.json" + }, + { + "name": "Anycubic Kobra 2 Plus", + "sub_path": "machine/Anycubic Kobra 2 Plus.json" + }, + { + "name": "Anycubic Kobra 2 Pro", + "sub_path": "machine/Anycubic Kobra 2 Pro.json" + }, + { + "name": "Anycubic Kobra 3", + "sub_path": "machine/Anycubic Kobra 3.json" + }, + { + "name": "Anycubic Kobra 3 Max", + "sub_path": "machine/Anycubic Kobra 3 Max.json" + }, + { + "name": "Anycubic Kobra Max", + "sub_path": "machine/Anycubic Kobra Max.json" + }, + { + "name": "Anycubic Kobra Neo", + "sub_path": "machine/Anycubic Kobra Neo.json" + }, + { + "name": "Anycubic Kobra Plus", + "sub_path": "machine/Anycubic Kobra Plus.json" + }, + { + "name": "Anycubic Kobra S1", + "sub_path": "machine/Anycubic Kobra S1.json" + }, + { + "name": "Anycubic Kobra S1 Max", + "sub_path": "machine/Anycubic Kobra S1 Max.json" + }, + { + "name": "Anycubic Kobra X", + "sub_path": "machine/Anycubic Kobra X.json" + }, + { + "name": "Anycubic Predator", + "sub_path": "machine/Anycubic Predator.json" + }, + { + "name": "Anycubic Vyper", + "sub_path": "machine/Anycubic Vyper.json" + }, + { + "name": "Anycubic i3 Mega S", + "sub_path": "machine/Anycubic i3 Mega S.json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "0.08mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "process/0.08mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "0.08mm Standard @Anycubic Kobra X", + "sub_path": "process/0.08mm Standard @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.10mm Detail @Anycubic Kobra 3 0.2 nozzle", + "sub_path": "process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json" + }, + { + "name": "0.12mm Detail @Anycubic Kobra 2 Neo 0.4 nozzle", + "sub_path": "process/0.12mm Detail @Anycubic Kobra 2 Neo 0.4 nozzle.json" + }, + { + "name": "0.12mm Detail @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "0.12mm Detail @Anycubic Kobra Neo 0.4 nozzle", + "sub_path": "process/0.12mm Detail @Anycubic Kobra Neo 0.4 nozzle.json" + }, + { + "name": "0.12mm High Quality @Anycubic Kobra X", + "sub_path": "process/0.12mm High Quality @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.12mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "process/0.12mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "0.12mm Standard @Anycubic Kobra X", + "sub_path": "process/0.12mm Standard @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.15mm Optimal @Anycubic 4MaxPro2", + "sub_path": "process/0.15mm Optimal @Anycubic 4MaxPro2.json" + }, + { + "name": "0.15mm Optimal @Anycubic Chiron", + "sub_path": "process/0.15mm Optimal @Anycubic Chiron.json" + }, + { + "name": "0.15mm Optimal @Anycubic Kobra", + "sub_path": "process/0.15mm Optimal @Anycubic Kobra.json" + }, + { + "name": "0.15mm Optimal @Anycubic Kobra2", + "sub_path": "process/0.15mm Optimal @Anycubic Kobra2.json" + }, + { + "name": "0.15mm Optimal @Anycubic KobraMax", + "sub_path": "process/0.15mm Optimal @Anycubic KobraMax.json" + }, + { + "name": "0.15mm Optimal @Anycubic KobraPlus", + "sub_path": "process/0.15mm Optimal @Anycubic KobraPlus.json" + }, + { + "name": "0.15mm Optimal @Anycubic Vyper", + "sub_path": "process/0.15mm Optimal @Anycubic Vyper.json" + }, + { + "name": "0.15mm Optimal @Anycubic i3MegaS", + "sub_path": "process/0.15mm Optimal @Anycubic i3MegaS.json" + }, + { + "name": "0.16mm High Quality @Anycubic Kobra X", + "sub_path": "process/0.16mm High Quality @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle", + "sub_path": "process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json" + }, + { + "name": "0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle", + "sub_path": "process/0.16mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json" + }, + { + "name": "0.16mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "process/0.16mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "0.16mm Standard @Anycubic Kobra Neo 0.4 nozzle", + "sub_path": "process/0.16mm Standard @Anycubic Kobra Neo 0.4 nozzle.json" + }, + { + "name": "0.16mm Standard @Anycubic Kobra X", + "sub_path": "process/0.16mm Standard @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.18mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "process/0.18mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "0.20mm High Quality @Anycubic Kobra X", + "sub_path": "process/0.20mm High Quality @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic 4MaxPro", + "sub_path": "process/0.20mm Standard @Anycubic 4MaxPro.json" + }, + { + "name": "0.20mm Standard @Anycubic 4MaxPro2", + "sub_path": "process/0.20mm Standard @Anycubic 4MaxPro2.json" + }, + { + "name": "0.20mm Standard @Anycubic Chiron", + "sub_path": "process/0.20mm Standard @Anycubic Chiron.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra", + "sub_path": "process/0.20mm Standard @Anycubic Kobra.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra Neo 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra Neo 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra X", + "sub_path": "process/0.20mm Standard @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra2", + "sub_path": "process/0.20mm Standard @Anycubic Kobra2.json" + }, + { + "name": "0.20mm Standard @Anycubic KobraMax", + "sub_path": "process/0.20mm Standard @Anycubic KobraMax.json" + }, + { + "name": "0.20mm Standard @Anycubic KobraPlus", + "sub_path": "process/0.20mm Standard @Anycubic KobraPlus.json" + }, + { + "name": "0.20mm Standard @Anycubic Predator", + "sub_path": "process/0.20mm Standard @Anycubic Predator.json" + }, + { + "name": "0.20mm Standard @Anycubic Vyper", + "sub_path": "process/0.20mm Standard @Anycubic Vyper.json" + }, + { + "name": "0.20mm Standard @Anycubic i3MegaS", + "sub_path": "process/0.20mm Standard @Anycubic i3MegaS.json" + }, + { + "name": "0.24mm Draft @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra X", + "sub_path": "process/0.24mm Standard @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle", + "sub_path": "process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json" + }, + { + "name": "0.28mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle", + "sub_path": "process/0.28mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json" + }, + { + "name": "0.28mm Standard @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "process/0.28mm Standard @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "0.28mm Standard @Anycubic Kobra Neo 0.4 nozzle", + "sub_path": "process/0.28mm Standard @Anycubic Kobra Neo 0.4 nozzle.json" + }, + { + "name": "0.28mm Standard @Anycubic Kobra X", + "sub_path": "process/0.28mm Standard @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "0.30mm Draft @Anycubic 4MaxPro2", + "sub_path": "process/0.30mm Draft @Anycubic 4MaxPro2.json" + }, + { + "name": "0.30mm Draft @Anycubic Chiron", + "sub_path": "process/0.30mm Draft @Anycubic Chiron.json" + }, + { + "name": "0.30mm Draft @Anycubic Kobra", + "sub_path": "process/0.30mm Draft @Anycubic Kobra.json" + }, + { + "name": "0.30mm Draft @Anycubic Kobra2", + "sub_path": "process/0.30mm Draft @Anycubic Kobra2.json" + }, + { + "name": "0.30mm Draft @Anycubic KobraMax", + "sub_path": "process/0.30mm Draft @Anycubic KobraMax.json" + }, + { + "name": "0.30mm Draft @Anycubic KobraPlus", + "sub_path": "process/0.30mm Draft @Anycubic KobraPlus.json" + }, + { + "name": "0.30mm Draft @Anycubic Vyper", + "sub_path": "process/0.30mm Draft @Anycubic Vyper.json" + }, + { + "name": "0.30mm Draft @Anycubic i3MegaS", + "sub_path": "process/0.30mm Draft @Anycubic i3MegaS.json" + }, + { + "name": "0.30mm Standard @Anycubic Kobra 3 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json" + }, + { + "name": "0.30mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "0.32mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "0.36mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "process/0.36mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "0.40mm Standard @Anycubic Kobra 3 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "0.42mm Standard @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "process/0.42mm Standard @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "0.48mm Standard @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "process/0.48mm Standard @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "0.08mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.08mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "0.12mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.12mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "0.16mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.16mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "0.16mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.16mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "0.20mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.20mm High Quality @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "0.20mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "0.28mm Standard @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "process/0.28mm Standard @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + + { + "name": "0.10mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "process/0.10mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "0.06mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "process/0.06mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "0.08mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "process/0.08mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "0.12mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "process/0.12mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "0.14mm Standard @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "process/0.14mm Standard @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + + { + "name": "0.30mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "0.18mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "process/0.18mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "0.36mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "process/0.36mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "0.42mm Standard @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "process/0.42mm Standard @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + + { + "name": "0.40mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "0.32mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "0.48mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "process/0.48mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "0.56mm Standard @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "process/0.56mm Standard @Anycubic Kobra S1 Max 0.8 nozzle.json" + } + + ], + "filament_list": [ + { + "name": "fdm_filament_common", + "sub_path": "filament/fdm_filament_common.json" + }, + { + "name": "fdm_filament_abs", + "sub_path": "filament/fdm_filament_abs.json" + }, + { + "name": "fdm_filament_asa", + "sub_path": "filament/fdm_filament_asa.json" + }, + { + "name": "fdm_filament_pa", + "sub_path": "filament/fdm_filament_pa.json" + }, + { + "name": "fdm_filament_pc", + "sub_path": "filament/fdm_filament_pc.json" + }, + { + "name": "fdm_filament_pet", + "sub_path": "filament/fdm_filament_pet.json" + }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, + { + "name": "fdm_filament_pva", + "sub_path": "filament/fdm_filament_pva.json" + }, + { + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Generic ABS @Anycubic", + "sub_path": "filament/Generic ABS @Anycubic.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Generic ASA @Anycubic", + "sub_path": "filament/Generic ASA @Anycubic.json" + }, + { + "name": "Generic PA @Anycubic", + "sub_path": "filament/Generic PA @Anycubic.json" + }, + { + "name": "Generic PA-CF @Anycubic", + "sub_path": "filament/Generic PA-CF @Anycubic.json" + }, + { + "name": "Fiberon PA6-CF20 @Anycubic Kobra S1", + "sub_path": "filament/Polymaker/Fiberon PA6-CF20 @Anycubic Kobra S1.json" + }, + { + "name": "Generic PC @Anycubic", + "sub_path": "filament/Generic PC @Anycubic.json" + }, + { + "name": "Generic PETG @Anycubic", + "sub_path": "filament/Generic PETG @Anycubic.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Generic PETG @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Generic PETG @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Generic PLA @Anycubic", + "sub_path": "filament/Generic PLA @Anycubic.json" + }, + { + "name": "Generic PLA-CF @Anycubic", + "sub_path": "filament/Generic PLA-CF @Anycubic.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Panchroma PLA @Anycubic Kobra S1", + "sub_path": "filament/Polymaker/Panchroma PLA @Anycubic Kobra S1.json" + }, + { + "name": "Polymaker PLA Pro @Anycubic Kobra S1", + "sub_path": "filament/Polymaker/Polymaker PLA Pro @Anycubic Kobra S1.json" + }, + { + "name": "Polymaker PLA Pro Metallic @Anycubic Kobra S1", + "sub_path": "filament/Polymaker/Polymaker PLA Pro Metallic @Anycubic Kobra S1.json" + }, + { + "name": "Generic PVA @Anycubic", + "sub_path": "filament/Generic PVA @Anycubic.json" + }, + { + "name": "Anycubic PVA @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic PVA @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Generic TPU @Anycubic", + "sub_path": "filament/Generic TPU @Anycubic.json" + }, + { + "name": "Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "filament/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "filament/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "filament/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic TPU @Anycubic Kobra S1 0.4 nozzle", + "sub_path": "filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle", + "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Generic ABS @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 0.2 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Generic TPU @Anycubic Kobra 3 0.4 nozzle", + "sub_path": "filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + + { + "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + + { + "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + + { + "name": "Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "filament/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle.json" + } + + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "Anycubic 4Max Pro 0.4 nozzle", + "sub_path": "machine/Anycubic 4Max Pro 0.4 nozzle.json" + }, + { + "name": "Anycubic 4Max Pro 2 0.4 nozzle", + "sub_path": "machine/Anycubic 4Max Pro 2 0.4 nozzle.json" + }, + { + "name": "Anycubic Chiron 0.4 nozzle", + "sub_path": "machine/Anycubic Chiron 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 2 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 2 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 2 Max 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 2 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 2 Neo 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 2 Neo 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 2 Plus 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 2 Plus 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 2 Pro 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 2 Pro 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 0.2 nozzle", + "sub_path": "machine/Anycubic Kobra 3 0.2 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 3 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 0.6 nozzle", + "sub_path": "machine/Anycubic Kobra 3 0.6 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 0.8 nozzle", + "sub_path": "machine/Anycubic Kobra 3 0.8 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 Max 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 3 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 Max 0.6 nozzle", + "sub_path": "machine/Anycubic Kobra 3 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 Max 0.8 nozzle", + "sub_path": "machine/Anycubic Kobra 3 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic Kobra Max 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra Max 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra Neo 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra Neo 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra Plus 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra Plus 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra S1 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra S1 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra S1 Max 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra S1 Max 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra S1 Max 0.25 nozzle", + "sub_path": "machine/Anycubic Kobra S1 Max 0.25 nozzle.json" + }, + { + "name": "Anycubic Kobra S1 Max 0.6 nozzle", + "sub_path": "machine/Anycubic Kobra S1 Max 0.6 nozzle.json" + }, + { + "name": "Anycubic Kobra S1 Max 0.8 nozzle", + "sub_path": "machine/Anycubic Kobra S1 Max 0.8 nozzle.json" + }, + { + "name": "Anycubic Kobra X 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra X 0.4 nozzle.json" + }, + { + "name": "Anycubic Predator 0.4 nozzle", + "sub_path": "machine/Anycubic Predator 0.4 nozzle.json" + }, + { + "name": "Anycubic Vyper 0.4 nozzle", + "sub_path": "machine/Anycubic Vyper 0.4 nozzle.json" + }, + { + "name": "Anycubic i3 Mega S 0.4 nozzle", + "sub_path": "machine/Anycubic i3 Mega S 0.4 nozzle.json" + } + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json index c726bbcca0..790d365ee5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic ASA", + "inherits": "Generic ASA @Anycubic", "from": "system", "setting_id": "U66DGcpZeZ24VfPe", "filament_id": "OF0yFLkY", diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json index d44a266643..213ee1ce70 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PETG", + "inherits": "Generic PETG @Anycubic", "from": "system", "setting_id": "qe2wYLf7CEMjmfxj", "filament_id": "OFo6n2pB", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json index 30589ac8d1..7faa84782c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "XIq1GeZdHqOl9Gtr", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json index 5b11a287e2..583473ed30 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "EaVdXQHAyocYUCez", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json index 8dd7f867ec..8e531b88a4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "UpC1Qut0kjYRD9po", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json index de37d66f03..01b3d45f23 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "ELCOJflyY3DfpPAH", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json index 6110cf1fe4..2898403b36 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 3 0.2 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "enkHPcq0yYHsRk7g", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json index 81f8dbb4dd..a4e34756ec 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "qw4uL96miCLTNE7b", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json index f03141136c..af7e374dc7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "KrlWgkC2kVdSRNUx", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json index 02b0a7f46b..5c8936316f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "gK0NhTnxz1VBNHbu", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json index f63d778029..80c120870e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "GblA3LvgCL63V7Qx", "filament_id": "OFmjN2bc", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json index ca56418084..9cb1eef59f 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "m7o0ek6sbOavVUpG", "filament_id": "OF5PtjTp", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json index d4805c6bde..968eba0ec4 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -1,339 +1,339 @@ -{ - "type": "filament", - "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", - "inherits": "Anycubic Generic PLA", - "from": "system", - "setting_id": "NVrxrFGYkHRyzrFq", - "filament_id": "OF5PtjTp", - "instantiation": "true", - "filament_settings_id": [ - "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle" - ], - "filament_vendor": [ - "Anycubic" - ], - "filament_type": [ - "PLA" - ], - "compatible_printers": [ - "Anycubic Kobra S1 Max 0.4 nozzle" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "activate_air_filtration": [ - "1" - ], - "activate_chamber_temp_control": [ - "0" - ], - "adaptive_pressure_advance": [ - "0" - ], - "adaptive_pressure_advance_bridges": [ - "0" - ], - "adaptive_pressure_advance_model": [ - "0,0,0\n0,0,0" - ], - "adaptive_pressure_advance_overhangs": [ - "0" - ], - "additional_cooling_fan_speed": [ - "85" - ], - "chamber_temperature": [ - "0" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "compatible_printers_condition": "", - "compatible_prints": [], - "compatible_prints_condition": "", - "complete_print_exhaust_fan_speed": [ - "0" - ], - "cool_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "default_filament_colour": [ - "" - ], - "dont_slow_down_outer_wall": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "30" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "100" - ], - "fan_cooling_layer_time_BRASS": [ - "100" - ], - "fan_cooling_layer_time_HS": [ - "100" - ], - "fan_max_speed": [ - "100" - ], - "fan_max_speed_BRASS": [ - "100" - ], - "fan_max_speed_HS": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "fan_min_speed_BRASS": [ - "100" - ], - "fan_min_speed_HS": [ - "100" - ], - "fan_p2_speed_before_x_layers": [ - "50" - ], - "filament_adhesiveness_category": [ - "100" - ], - "filament_cooling_final_speed": [ - "0" - ], - "filament_cooling_initial_speed": [ - "0" - ], - "filament_cooling_moves": [ - "0" - ], - "filament_cost": [ - "20" - ], - "filament_density": [ - "1.24" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_diameter": [ - "1.75" - ], - "filament_end_gcode": [ - "; filament end gcode " - ], - "filament_is_support": [ - "0" - ], - "filament_loading_speed": [ - "0" - ], - "filament_loading_speed_start": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "nil" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "0" - ], - "filament_multitool_ramming_volume": [ - "0" - ], - "filament_notes": [ - "" - ], - "filament_ramming_parameters": [ - "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_lift_enforce": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_distances_when_cut": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_shrink": [ - "100%" - ], - "filament_shrinkage_compensation_z": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "filament_stamping_distance": [ - "0" - ], - "filament_stamping_loading_speed": [ - "0" - ], - "filament_start_gcode": [ - "; filament start gcode" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "0" - ], - "filament_unloading_speed_start": [ - "0" - ], - "filament_wipe": [ - "nil" - ], - "filament_wipe_distance": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_z_hop_types": [ - "nil" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "55" - ], - "hot_plate_temp_initial_layer": [ - "55" - ], - "idle_temperature": [ - "0" - ], - "internal_bridge_fan_speed": [ - "-1" - ], - "nozzle_temperature": [ - "190" - ], - "nozzle_temperature_BRASS": [ - "220" - ], - "nozzle_temperature_HS": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "210" - ], - "nozzle_temperature_initial_layer_BRASS": [ - "220" - ], - "nozzle_temperature_initial_layer_HS": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "pellet_flow_coefficient": [ - "0.4157" - ], - "pressure_advance": [ - "0.03" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "8" - ], - "slow_down_layer_time_BRASS": [ - "8" - ], - "slow_down_layer_time_HS": [ - "8" - ], - "slow_down_min_speed": [ - "20" - ], - "supertack_plate_temp": [ - "35" - ], - "supertack_plate_temp_initial_layer": [ - "35" - ], - "support_material_interface_fan_speed": [ - "-1" - ], - "temperature_vitrification": [ - "45" - ], - "textured_cool_plate_temp": [ - "40" - ], - "textured_cool_plate_temp_initial_layer": [ - "40" - ], - "textured_plate_temp": [ - "55" - ], - "textured_plate_temp_initial_layer": [ - "55" - ] -} +{ + "type": "filament", + "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", + "inherits": "Generic PLA @Anycubic", + "from": "system", + "setting_id": "NVrxrFGYkHRyzrFq", + "filament_id": "OF5PtjTp", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra S1 Max 0.4 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "1" + ], + "activate_chamber_temp_control": [ + "0" + ], + "adaptive_pressure_advance": [ + "0" + ], + "adaptive_pressure_advance_bridges": [ + "0" + ], + "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0" + ], + "adaptive_pressure_advance_overhangs": [ + "0" + ], + "additional_cooling_fan_speed": [ + "85" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "0" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "30" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_cooling_layer_time_BRASS": [ + "100" + ], + "fan_cooling_layer_time_HS": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_max_speed_HS": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "fan_min_speed_BRASS": [ + "100" + ], + "fan_min_speed_HS": [ + "100" + ], + "fan_p2_speed_before_x_layers": [ + "50" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_end_gcode": [ + "; filament end gcode " + ], + "filament_is_support": [ + "0" + ], + "filament_loading_speed": [ + "0" + ], + "filament_loading_speed_start": [ + "0" + ], + "filament_long_retractions_when_cut": [ + "nil" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "0" + ], + "filament_notes": [ + "" + ], + "filament_ramming_parameters": [ + "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_shrink": [ + "100%" + ], + "filament_shrinkage_compensation_z": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_stamping_distance": [ + "0" + ], + "filament_stamping_loading_speed": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "idle_temperature": [ + "0" + ], + "internal_bridge_fan_speed": [ + "-1" + ], + "nozzle_temperature": [ + "190" + ], + "nozzle_temperature_BRASS": [ + "220" + ], + "nozzle_temperature_HS": [ + "220" + ], + "nozzle_temperature_initial_layer": [ + "210" + ], + "nozzle_temperature_initial_layer_BRASS": [ + "220" + ], + "nozzle_temperature_initial_layer_HS": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pellet_flow_coefficient": [ + "0.4157" + ], + "pressure_advance": [ + "0.03" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_layer_time_BRASS": [ + "8" + ], + "slow_down_layer_time_HS": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "45" + ], + "textured_cool_plate_temp": [ + "40" + ], + "textured_cool_plate_temp_initial_layer": [ + "40" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json index 16034c2b27..7d8be15657 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -1,351 +1,351 @@ -{ - "type": "filament", - "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", - "inherits": "Anycubic Generic PLA", - "from": "system", - "setting_id": "swLSkqq7X3PhbRiQ", - "filament_id": "OF5PtjTp", - "instantiation": "true", - "filament_settings_id": [ - "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle" - ], - "filament_vendor": [ - "Anycubic" - ], - "filament_type": [ - "PLA" - ], - "compatible_printers": [ - "Anycubic Kobra S1 Max 0.6 nozzle" - ], - "filament_flow_ratio": [ - "0.97" - ], - "filament_max_volumetric_speed": [ - "10" - ], - "activate_air_filtration": [ - "0" - ], - "activate_chamber_temp_control": [ - "0" - ], - "adaptive_pressure_advance": [ - "0" - ], - "adaptive_pressure_advance_bridges": [ - "0" - ], - "adaptive_pressure_advance_model": [ - "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" - ], - "adaptive_pressure_advance_overhangs": [ - "0" - ], - "additional_cooling_fan_speed": [ - "60" - ], - "chamber_temperature": [ - "0" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "compatible_printers_condition": "", - "compatible_prints": [], - "compatible_prints_condition": "", - "complete_print_exhaust_fan_speed": [ - "5" - ], - "cool_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "default_filament_colour": [ - "" - ], - "dont_slow_down_outer_wall": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "5" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "100" - ], - "fan_cooling_layer_time_BRASS": [ - "100" - ], - "fan_cooling_layer_time_HS": [ - "100" - ], - "fan_max_speed": [ - "100" - ], - "fan_max_speed_BRASS": [ - "100" - ], - "fan_max_speed_HS": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "fan_min_speed_BRASS": [ - "100" - ], - "fan_min_speed_HS": [ - "100" - ], - "filament_adhesiveness_category": [ - "100" - ], - "filament_change_length": [ - "10" - ], - "filament_cooling_final_speed": [ - "0" - ], - "filament_cooling_initial_speed": [ - "0" - ], - "filament_cooling_moves": [ - "0" - ], - "filament_cost": [ - "20" - ], - "filament_density": [ - "1.24" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_diameter": [ - "1.75" - ], - "filament_end_gcode": [ - "; filament end gcode\n" - ], - "filament_flush_temp": [ - "nil" - ], - "filament_flush_volumetric_speed": [ - "nil" - ], - "filament_is_support": [ - "0" - ], - "filament_loading_speed": [ - "0" - ], - "filament_loading_speed_start": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "nil" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "0" - ], - "filament_multitool_ramming_volume": [ - "0" - ], - "filament_notes": [ - "" - ], - "filament_prime_volume": [ - "45" - ], - "filament_ramming_parameters": [ - "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" - ], - "filament_ramming_volumetric_speed": [ - "-1" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_lift_enforce": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_distances_when_cut": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_shrink": [ - "100%" - ], - "filament_shrinkage_compensation_z": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "filament_stamping_distance": [ - "0" - ], - "filament_stamping_loading_speed": [ - "0" - ], - "filament_start_gcode": [ - "; filament start gcode" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "0" - ], - "filament_unloading_speed_start": [ - "0" - ], - "filament_wipe": [ - "nil" - ], - "filament_wipe_distance": [ - "1" - ], - "filament_z_hop": [ - "nil" - ], - "filament_z_hop_types": [ - "nil" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "idle_temperature": [ - "0" - ], - "internal_bridge_fan_speed": [ - "100" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_BRASS": [ - "210" - ], - "nozzle_temperature_HS": [ - "210" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_initial_layer_BRASS": [ - "220" - ], - "nozzle_temperature_initial_layer_HS": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "pellet_flow_coefficient": [ - "0.4157" - ], - "pressure_advance": [ - "0.03" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "8" - ], - "slow_down_layer_time_BRASS": [ - "8" - ], - "slow_down_layer_time_HS": [ - "8" - ], - "slow_down_min_speed": [ - "20" - ], - "supertack_plate_temp": [ - "35" - ], - "supertack_plate_temp_initial_layer": [ - "35" - ], - "support_material_interface_fan_speed": [ - "-1" - ], - "temperature_vitrification": [ - "55" - ], - "textured_cool_plate_temp": [ - "40" - ], - "textured_cool_plate_temp_initial_layer": [ - "40" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ] -} +{ + "type": "filament", + "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", + "inherits": "Generic PLA @Anycubic", + "from": "system", + "setting_id": "swLSkqq7X3PhbRiQ", + "filament_id": "OF5PtjTp", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra S1 Max 0.6 nozzle" + ], + "filament_flow_ratio": [ + "0.97" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "adaptive_pressure_advance": [ + "0" + ], + "adaptive_pressure_advance_bridges": [ + "0" + ], + "adaptive_pressure_advance_model": [ + "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" + ], + "adaptive_pressure_advance_overhangs": [ + "0" + ], + "additional_cooling_fan_speed": [ + "60" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "5" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "5" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_cooling_layer_time_BRASS": [ + "100" + ], + "fan_cooling_layer_time_HS": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_max_speed_HS": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "fan_min_speed_BRASS": [ + "100" + ], + "fan_min_speed_HS": [ + "100" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_change_length": [ + "10" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_end_gcode": [ + "; filament end gcode\n" + ], + "filament_flush_temp": [ + "nil" + ], + "filament_flush_volumetric_speed": [ + "nil" + ], + "filament_is_support": [ + "0" + ], + "filament_loading_speed": [ + "0" + ], + "filament_loading_speed_start": [ + "0" + ], + "filament_long_retractions_when_cut": [ + "nil" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "0" + ], + "filament_notes": [ + "" + ], + "filament_prime_volume": [ + "45" + ], + "filament_ramming_parameters": [ + "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" + ], + "filament_ramming_volumetric_speed": [ + "-1" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_shrink": [ + "100%" + ], + "filament_shrinkage_compensation_z": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_stamping_distance": [ + "0" + ], + "filament_stamping_loading_speed": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "idle_temperature": [ + "0" + ], + "internal_bridge_fan_speed": [ + "100" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_BRASS": [ + "210" + ], + "nozzle_temperature_HS": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_initial_layer_BRASS": [ + "220" + ], + "nozzle_temperature_initial_layer_HS": [ + "220" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pellet_flow_coefficient": [ + "0.4157" + ], + "pressure_advance": [ + "0.03" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_layer_time_BRASS": [ + "8" + ], + "slow_down_layer_time_HS": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "55" + ], + "textured_cool_plate_temp": [ + "40" + ], + "textured_cool_plate_temp_initial_layer": [ + "40" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json index 64832c85ab..26181302ec 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -1,351 +1,351 @@ -{ - "type": "filament", - "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", - "inherits": "Anycubic Generic PLA", - "from": "system", - "setting_id": "rsOyKXt6G37Ze51l", - "filament_id": "OF5PtjTp", - "instantiation": "true", - "filament_settings_id": [ - "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle" - ], - "filament_vendor": [ - "Anycubic" - ], - "filament_type": [ - "PLA" - ], - "compatible_printers": [ - "Anycubic Kobra S1 Max 0.8 nozzle" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "10" - ], - "activate_air_filtration": [ - "0" - ], - "activate_chamber_temp_control": [ - "0" - ], - "adaptive_pressure_advance": [ - "0" - ], - "adaptive_pressure_advance_bridges": [ - "0" - ], - "adaptive_pressure_advance_model": [ - "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" - ], - "adaptive_pressure_advance_overhangs": [ - "0" - ], - "additional_cooling_fan_speed": [ - "60" - ], - "chamber_temperature": [ - "0" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "compatible_printers_condition": "", - "compatible_prints": [], - "compatible_prints_condition": "", - "complete_print_exhaust_fan_speed": [ - "5" - ], - "cool_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "default_filament_colour": [ - "" - ], - "dont_slow_down_outer_wall": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "5" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "100" - ], - "fan_cooling_layer_time_BRASS": [ - "100" - ], - "fan_cooling_layer_time_HS": [ - "100" - ], - "fan_max_speed": [ - "100" - ], - "fan_max_speed_BRASS": [ - "100" - ], - "fan_max_speed_HS": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "fan_min_speed_BRASS": [ - "100" - ], - "fan_min_speed_HS": [ - "100" - ], - "filament_adhesiveness_category": [ - "100" - ], - "filament_change_length": [ - "10" - ], - "filament_cooling_final_speed": [ - "0" - ], - "filament_cooling_initial_speed": [ - "0" - ], - "filament_cooling_moves": [ - "0" - ], - "filament_cost": [ - "20" - ], - "filament_density": [ - "1.24" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_diameter": [ - "1.75" - ], - "filament_end_gcode": [ - "; filament end gcode\n" - ], - "filament_flush_temp": [ - "nil" - ], - "filament_flush_volumetric_speed": [ - "nil" - ], - "filament_is_support": [ - "0" - ], - "filament_loading_speed": [ - "0" - ], - "filament_loading_speed_start": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "nil" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "0" - ], - "filament_multitool_ramming_volume": [ - "0" - ], - "filament_notes": [ - "" - ], - "filament_prime_volume": [ - "45" - ], - "filament_ramming_parameters": [ - "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" - ], - "filament_ramming_volumetric_speed": [ - "-1" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_lift_enforce": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_distances_when_cut": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_shrink": [ - "100%" - ], - "filament_shrinkage_compensation_z": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "filament_stamping_distance": [ - "0" - ], - "filament_stamping_loading_speed": [ - "0" - ], - "filament_start_gcode": [ - "; filament start gcode" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "0" - ], - "filament_unloading_speed_start": [ - "0" - ], - "filament_wipe": [ - "nil" - ], - "filament_wipe_distance": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_z_hop_types": [ - "nil" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "55" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "idle_temperature": [ - "0" - ], - "internal_bridge_fan_speed": [ - "100" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_BRASS": [ - "210" - ], - "nozzle_temperature_HS": [ - "210" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_initial_layer_BRASS": [ - "210" - ], - "nozzle_temperature_initial_layer_HS": [ - "210" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "pellet_flow_coefficient": [ - "0.4157" - ], - "pressure_advance": [ - "0.03" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "8" - ], - "slow_down_layer_time_BRASS": [ - "8" - ], - "slow_down_layer_time_HS": [ - "8" - ], - "slow_down_min_speed": [ - "20" - ], - "supertack_plate_temp": [ - "35" - ], - "supertack_plate_temp_initial_layer": [ - "35" - ], - "support_material_interface_fan_speed": [ - "-1" - ], - "temperature_vitrification": [ - "45" - ], - "textured_cool_plate_temp": [ - "40" - ], - "textured_cool_plate_temp_initial_layer": [ - "40" - ], - "textured_plate_temp": [ - "55" - ], - "textured_plate_temp_initial_layer": [ - "60" - ] -} +{ + "type": "filament", + "name": "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", + "inherits": "Generic PLA @Anycubic", + "from": "system", + "setting_id": "rsOyKXt6G37Ze51l", + "filament_id": "OF5PtjTp", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra S1 Max 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "adaptive_pressure_advance": [ + "0" + ], + "adaptive_pressure_advance_bridges": [ + "0" + ], + "adaptive_pressure_advance_model": [ + "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" + ], + "adaptive_pressure_advance_overhangs": [ + "0" + ], + "additional_cooling_fan_speed": [ + "60" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "5" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "5" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_cooling_layer_time_BRASS": [ + "100" + ], + "fan_cooling_layer_time_HS": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_max_speed_HS": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "fan_min_speed_BRASS": [ + "100" + ], + "fan_min_speed_HS": [ + "100" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_change_length": [ + "10" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_end_gcode": [ + "; filament end gcode\n" + ], + "filament_flush_temp": [ + "nil" + ], + "filament_flush_volumetric_speed": [ + "nil" + ], + "filament_is_support": [ + "0" + ], + "filament_loading_speed": [ + "0" + ], + "filament_loading_speed_start": [ + "0" + ], + "filament_long_retractions_when_cut": [ + "nil" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "0" + ], + "filament_notes": [ + "" + ], + "filament_prime_volume": [ + "45" + ], + "filament_ramming_parameters": [ + "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" + ], + "filament_ramming_volumetric_speed": [ + "-1" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_shrink": [ + "100%" + ], + "filament_shrinkage_compensation_z": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_stamping_distance": [ + "0" + ], + "filament_stamping_loading_speed": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "idle_temperature": [ + "0" + ], + "internal_bridge_fan_speed": [ + "100" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_BRASS": [ + "210" + ], + "nozzle_temperature_HS": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_initial_layer_BRASS": [ + "210" + ], + "nozzle_temperature_initial_layer_HS": [ + "210" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pellet_flow_coefficient": [ + "0.4157" + ], + "pressure_advance": [ + "0.03" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_layer_time_BRASS": [ + "8" + ], + "slow_down_layer_time_HS": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "45" + ], + "textured_cool_plate_temp": [ + "40" + ], + "textured_cool_plate_temp_initial_layer": [ + "40" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json index 725a9d3f90..5b069135b3 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "Sio4qE22N2krNjx1", "filament_id": "OFjVOWfJ", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json index 2c25648b80..474deb3deb 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "kVOaVF3YyfGrXTdW", "filament_id": "OFIE3vOf", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json index 99b2c3672d..d7832ced4c 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "1EID0A7FceyLzja5", "filament_id": "OFCp3Bgo", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json index 8365eee514..0ea21e81ed 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "zAUNjIY9cGOO3Np5", "filament_id": "OFrGJ4tR", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json index 1733e1c10a..59fd701496 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic PLA", + "inherits": "Generic PLA @Anycubic", "from": "system", "setting_id": "1va1bLu3J0b5GQt3", "filament_id": "OFnmp6rt", diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json index 149b3da021..bbee6ae226 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle.json @@ -1,336 +1,336 @@ -{ - "type": "filament", - "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "inherits": "Anycubic Generic PLA-CF", - "from": "system", - "setting_id": "Y9mFng36B2vAnP19", - "filament_id": "OFZ0mR5b", - "instantiation": "true", - "filament_settings_id": [ - "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle" - ], - "filament_vendor": [ - "Anycubic" - ], - "filament_type": [ - "PLA-CF" - ], - "compatible_printers": [ - "Anycubic Kobra S1 Max 0.4 nozzle" - ], - "filament_flow_ratio": [ - "0.94" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "activate_air_filtration": [ - "0" - ], - "activate_chamber_temp_control": [ - "0" - ], - "adaptive_pressure_advance": [ - "0" - ], - "adaptive_pressure_advance_bridges": [ - "0" - ], - "adaptive_pressure_advance_model": [ - "0,0,0\n0,0,0" - ], - "adaptive_pressure_advance_overhangs": [ - "0" - ], - "additional_cooling_fan_speed": [ - "85" - ], - "chamber_temperature": [ - "0" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "compatible_printers_condition": "", - "compatible_prints": [], - "compatible_prints_condition": "", - "complete_print_exhaust_fan_speed": [ - "5" - ], - "cool_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "default_filament_colour": [ - "" - ], - "dont_slow_down_outer_wall": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "5" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "100" - ], - "fan_cooling_layer_time_BRASS": [ - "100" - ], - "fan_cooling_layer_time_HS": [ - "100" - ], - "fan_max_speed": [ - "100" - ], - "fan_max_speed_BRASS": [ - "100" - ], - "fan_max_speed_HS": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "fan_min_speed_BRASS": [ - "100" - ], - "fan_min_speed_HS": [ - "100" - ], - "filament_adhesiveness_category": [ - "100" - ], - "filament_cooling_final_speed": [ - "0" - ], - "filament_cooling_initial_speed": [ - "0" - ], - "filament_cooling_moves": [ - "0" - ], - "filament_cost": [ - "20" - ], - "filament_density": [ - "1.24" - ], - "filament_deretraction_speed": [ - "0" - ], - "filament_diameter": [ - "1.75" - ], - "filament_end_gcode": [ - "; filament end gcode\n" - ], - "filament_is_support": [ - "0" - ], - "filament_loading_speed": [ - "0" - ], - "filament_loading_speed_start": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "nil" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "0" - ], - "filament_multitool_ramming_volume": [ - "0" - ], - "filament_notes": [ - "" - ], - "filament_ramming_parameters": [ - "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" - ], - "filament_retract_before_wipe": [ - "0%" - ], - "filament_retract_lift_above": [ - "0" - ], - "filament_retract_lift_below": [ - "349" - ], - "filament_retract_lift_enforce": [ - "All Surfaces" - ], - "filament_retract_restart_extra": [ - "0" - ], - "filament_retract_when_changing_layer": [ - "1" - ], - "filament_retraction_distances_when_cut": [ - "nil" - ], - "filament_retraction_length": [ - "0.4" - ], - "filament_retraction_minimum_travel": [ - "1" - ], - "filament_retraction_speed": [ - "40" - ], - "filament_shrink": [ - "100%" - ], - "filament_shrinkage_compensation_z": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "filament_stamping_distance": [ - "0" - ], - "filament_stamping_loading_speed": [ - "0" - ], - "filament_start_gcode": [ - "; filament start gcode\n" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "0" - ], - "filament_unloading_speed_start": [ - "0" - ], - "filament_wipe": [ - "1" - ], - "filament_wipe_distance": [ - "1" - ], - "filament_z_hop": [ - "0.4" - ], - "filament_z_hop_types": [ - "Auto Lift" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "55" - ], - "hot_plate_temp_initial_layer": [ - "55" - ], - "idle_temperature": [ - "0" - ], - "internal_bridge_fan_speed": [ - "-1" - ], - "nozzle_temperature": [ - "225" - ], - "nozzle_temperature_BRASS": [ - "230" - ], - "nozzle_temperature_HS": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "235" - ], - "nozzle_temperature_initial_layer_BRASS": [ - "240" - ], - "nozzle_temperature_initial_layer_HS": [ - "240" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "pellet_flow_coefficient": [ - "0.4157" - ], - "pressure_advance": [ - "0.03" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "4" - ], - "slow_down_layer_time_BRASS": [ - "8" - ], - "slow_down_layer_time_HS": [ - "8" - ], - "slow_down_min_speed": [ - "20" - ], - "supertack_plate_temp": [ - "35" - ], - "supertack_plate_temp_initial_layer": [ - "35" - ], - "support_material_interface_fan_speed": [ - "-1" - ], - "temperature_vitrification": [ - "45" - ], - "textured_cool_plate_temp": [ - "40" - ], - "textured_cool_plate_temp_initial_layer": [ - "40" - ], - "textured_plate_temp": [ - "55" - ], - "textured_plate_temp_initial_layer": [ - "55" - ] -} +{ + "type": "filament", + "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", + "inherits": "Generic PLA-CF @Anycubic", + "from": "system", + "setting_id": "Y9mFng36B2vAnP19", + "filament_id": "OFZ0mR5b", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA-CF" + ], + "compatible_printers": [ + "Anycubic Kobra S1 Max 0.4 nozzle" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "adaptive_pressure_advance": [ + "0" + ], + "adaptive_pressure_advance_bridges": [ + "0" + ], + "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0" + ], + "adaptive_pressure_advance_overhangs": [ + "0" + ], + "additional_cooling_fan_speed": [ + "85" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "5" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "5" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_cooling_layer_time_BRASS": [ + "100" + ], + "fan_cooling_layer_time_HS": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_max_speed_HS": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "fan_min_speed_BRASS": [ + "100" + ], + "fan_min_speed_HS": [ + "100" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "0" + ], + "filament_diameter": [ + "1.75" + ], + "filament_end_gcode": [ + "; filament end gcode\n" + ], + "filament_is_support": [ + "0" + ], + "filament_loading_speed": [ + "0" + ], + "filament_loading_speed_start": [ + "0" + ], + "filament_long_retractions_when_cut": [ + "nil" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "0" + ], + "filament_notes": [ + "" + ], + "filament_ramming_parameters": [ + "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" + ], + "filament_retract_before_wipe": [ + "0%" + ], + "filament_retract_lift_above": [ + "0" + ], + "filament_retract_lift_below": [ + "349" + ], + "filament_retract_lift_enforce": [ + "All Surfaces" + ], + "filament_retract_restart_extra": [ + "0" + ], + "filament_retract_when_changing_layer": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_shrinkage_compensation_z": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_stamping_distance": [ + "0" + ], + "filament_stamping_loading_speed": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop": [ + "0.4" + ], + "filament_z_hop_types": [ + "Auto Lift" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "idle_temperature": [ + "0" + ], + "internal_bridge_fan_speed": [ + "-1" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_BRASS": [ + "230" + ], + "nozzle_temperature_HS": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "235" + ], + "nozzle_temperature_initial_layer_BRASS": [ + "240" + ], + "nozzle_temperature_initial_layer_HS": [ + "240" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pellet_flow_coefficient": [ + "0.4157" + ], + "pressure_advance": [ + "0.03" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_layer_time_BRASS": [ + "8" + ], + "slow_down_layer_time_HS": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "45" + ], + "textured_cool_plate_temp": [ + "40" + ], + "textured_cool_plate_temp_initial_layer": [ + "40" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json index 26753fc994..ab96e9fca8 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle.json @@ -1,351 +1,351 @@ -{ - "type": "filament", - "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "inherits": "Anycubic Generic PLA-CF", - "from": "system", - "setting_id": "9XGVjrGzNa4Br8kB", - "filament_id": "OFZ0mR5b", - "instantiation": "true", - "filament_settings_id": [ - "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle" - ], - "filament_vendor": [ - "Anycubic" - ], - "filament_type": [ - "PLA-CF" - ], - "compatible_printers": [ - "Anycubic Kobra S1 Max 0.6 nozzle" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "activate_air_filtration": [ - "0" - ], - "activate_chamber_temp_control": [ - "0" - ], - "adaptive_pressure_advance": [ - "0" - ], - "adaptive_pressure_advance_bridges": [ - "0" - ], - "adaptive_pressure_advance_model": [ - "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" - ], - "adaptive_pressure_advance_overhangs": [ - "0" - ], - "additional_cooling_fan_speed": [ - "60" - ], - "chamber_temperature": [ - "0" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "compatible_printers_condition": "", - "compatible_prints": [], - "compatible_prints_condition": "", - "complete_print_exhaust_fan_speed": [ - "5" - ], - "cool_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "default_filament_colour": [ - "" - ], - "dont_slow_down_outer_wall": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "5" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "100" - ], - "fan_cooling_layer_time_BRASS": [ - "100" - ], - "fan_cooling_layer_time_HS": [ - "100" - ], - "fan_max_speed": [ - "100" - ], - "fan_max_speed_BRASS": [ - "100" - ], - "fan_max_speed_HS": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "fan_min_speed_BRASS": [ - "100" - ], - "fan_min_speed_HS": [ - "100" - ], - "filament_adhesiveness_category": [ - "100" - ], - "filament_change_length": [ - "10" - ], - "filament_cooling_final_speed": [ - "0" - ], - "filament_cooling_initial_speed": [ - "0" - ], - "filament_cooling_moves": [ - "0" - ], - "filament_cost": [ - "20" - ], - "filament_density": [ - "1.24" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_diameter": [ - "1.75" - ], - "filament_end_gcode": [ - "; filament end gcode\n" - ], - "filament_flush_temp": [ - "nil" - ], - "filament_flush_volumetric_speed": [ - "nil" - ], - "filament_is_support": [ - "0" - ], - "filament_loading_speed": [ - "0" - ], - "filament_loading_speed_start": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "nil" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "0" - ], - "filament_multitool_ramming_volume": [ - "0" - ], - "filament_notes": [ - "" - ], - "filament_prime_volume": [ - "45" - ], - "filament_ramming_parameters": [ - "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" - ], - "filament_ramming_volumetric_speed": [ - "-1" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_lift_enforce": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_distances_when_cut": [ - "nil" - ], - "filament_retraction_length": [ - "0.6" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_shrink": [ - "100%" - ], - "filament_shrinkage_compensation_z": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "filament_stamping_distance": [ - "0" - ], - "filament_stamping_loading_speed": [ - "0" - ], - "filament_start_gcode": [ - "; filament start gcode" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "0" - ], - "filament_unloading_speed_start": [ - "0" - ], - "filament_wipe": [ - "nil" - ], - "filament_wipe_distance": [ - "1" - ], - "filament_z_hop": [ - "nil" - ], - "filament_z_hop_types": [ - "nil" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "idle_temperature": [ - "0" - ], - "internal_bridge_fan_speed": [ - "100" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_BRASS": [ - "230" - ], - "nozzle_temperature_HS": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_initial_layer_BRASS": [ - "230" - ], - "nozzle_temperature_initial_layer_HS": [ - "230" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "nozzle_temperature_range_low": [ - "210" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "pellet_flow_coefficient": [ - "0.4157" - ], - "pressure_advance": [ - "0.025" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "8" - ], - "slow_down_layer_time_BRASS": [ - "8" - ], - "slow_down_layer_time_HS": [ - "8" - ], - "slow_down_min_speed": [ - "20" - ], - "supertack_plate_temp": [ - "35" - ], - "supertack_plate_temp_initial_layer": [ - "35" - ], - "support_material_interface_fan_speed": [ - "-1" - ], - "temperature_vitrification": [ - "55" - ], - "textured_cool_plate_temp": [ - "40" - ], - "textured_cool_plate_temp_initial_layer": [ - "40" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ] -} +{ + "type": "filament", + "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", + "inherits": "Generic PLA-CF @Anycubic", + "from": "system", + "setting_id": "9XGVjrGzNa4Br8kB", + "filament_id": "OFZ0mR5b", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA-CF" + ], + "compatible_printers": [ + "Anycubic Kobra S1 Max 0.6 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "adaptive_pressure_advance": [ + "0" + ], + "adaptive_pressure_advance_bridges": [ + "0" + ], + "adaptive_pressure_advance_model": [ + "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" + ], + "adaptive_pressure_advance_overhangs": [ + "0" + ], + "additional_cooling_fan_speed": [ + "60" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "5" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "5" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_cooling_layer_time_BRASS": [ + "100" + ], + "fan_cooling_layer_time_HS": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_max_speed_HS": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "fan_min_speed_BRASS": [ + "100" + ], + "fan_min_speed_HS": [ + "100" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_change_length": [ + "10" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_end_gcode": [ + "; filament end gcode\n" + ], + "filament_flush_temp": [ + "nil" + ], + "filament_flush_volumetric_speed": [ + "nil" + ], + "filament_is_support": [ + "0" + ], + "filament_loading_speed": [ + "0" + ], + "filament_loading_speed_start": [ + "0" + ], + "filament_long_retractions_when_cut": [ + "nil" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "0" + ], + "filament_notes": [ + "" + ], + "filament_prime_volume": [ + "45" + ], + "filament_ramming_parameters": [ + "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" + ], + "filament_ramming_volumetric_speed": [ + "-1" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "0.6" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_shrink": [ + "100%" + ], + "filament_shrinkage_compensation_z": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_stamping_distance": [ + "0" + ], + "filament_stamping_loading_speed": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "1" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "idle_temperature": [ + "0" + ], + "internal_bridge_fan_speed": [ + "100" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_BRASS": [ + "230" + ], + "nozzle_temperature_HS": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_initial_layer_BRASS": [ + "230" + ], + "nozzle_temperature_initial_layer_HS": [ + "230" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "210" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pellet_flow_coefficient": [ + "0.4157" + ], + "pressure_advance": [ + "0.025" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_layer_time_BRASS": [ + "8" + ], + "slow_down_layer_time_HS": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "55" + ], + "textured_cool_plate_temp": [ + "40" + ], + "textured_cool_plate_temp_initial_layer": [ + "40" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json index ee21e1359e..b1db8876da 100644 --- a/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle.json @@ -1,351 +1,351 @@ -{ - "type": "filament", - "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "inherits": "Anycubic Generic PLA-CF", - "from": "system", - "setting_id": "vPSse40nqlQ0xBnp", - "filament_id": "OFZ0mR5b", - "instantiation": "true", - "filament_settings_id": [ - "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle" - ], - "filament_vendor": [ - "Anycubic" - ], - "filament_type": [ - "PLA-CF" - ], - "compatible_printers": [ - "Anycubic Kobra S1 Max 0.8 nozzle" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "activate_air_filtration": [ - "0" - ], - "activate_chamber_temp_control": [ - "0" - ], - "adaptive_pressure_advance": [ - "0" - ], - "adaptive_pressure_advance_bridges": [ - "0" - ], - "adaptive_pressure_advance_model": [ - "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" - ], - "adaptive_pressure_advance_overhangs": [ - "0" - ], - "additional_cooling_fan_speed": [ - "60" - ], - "chamber_temperature": [ - "0" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "compatible_printers_condition": "", - "compatible_prints": [], - "compatible_prints_condition": "", - "complete_print_exhaust_fan_speed": [ - "5" - ], - "cool_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "default_filament_colour": [ - "" - ], - "dont_slow_down_outer_wall": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "5" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "fan_cooling_layer_time": [ - "100" - ], - "fan_cooling_layer_time_BRASS": [ - "100" - ], - "fan_cooling_layer_time_HS": [ - "100" - ], - "fan_max_speed": [ - "100" - ], - "fan_max_speed_BRASS": [ - "100" - ], - "fan_max_speed_HS": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "fan_min_speed_BRASS": [ - "100" - ], - "fan_min_speed_HS": [ - "100" - ], - "filament_adhesiveness_category": [ - "0" - ], - "filament_change_length": [ - "10" - ], - "filament_cooling_final_speed": [ - "0" - ], - "filament_cooling_initial_speed": [ - "0" - ], - "filament_cooling_moves": [ - "0" - ], - "filament_cost": [ - "20" - ], - "filament_density": [ - "1.24" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_diameter": [ - "1.75" - ], - "filament_end_gcode": [ - "; filament end gcode\n" - ], - "filament_flush_temp": [ - "nil" - ], - "filament_flush_volumetric_speed": [ - "nil" - ], - "filament_is_support": [ - "0" - ], - "filament_loading_speed": [ - "0" - ], - "filament_loading_speed_start": [ - "0" - ], - "filament_long_retractions_when_cut": [ - "nil" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_multitool_ramming": [ - "0" - ], - "filament_multitool_ramming_flow": [ - "0" - ], - "filament_multitool_ramming_volume": [ - "0" - ], - "filament_notes": [ - "" - ], - "filament_prime_volume": [ - "45" - ], - "filament_ramming_parameters": [ - "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" - ], - "filament_ramming_volumetric_speed": [ - "-1" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_lift_above": [ - "nil" - ], - "filament_retract_lift_below": [ - "nil" - ], - "filament_retract_lift_enforce": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_distances_when_cut": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_shrink": [ - "100%" - ], - "filament_shrinkage_compensation_z": [ - "100%" - ], - "filament_soluble": [ - "0" - ], - "filament_stamping_distance": [ - "0" - ], - "filament_stamping_loading_speed": [ - "0" - ], - "filament_start_gcode": [ - "; filament start gcode" - ], - "filament_toolchange_delay": [ - "0" - ], - "filament_unloading_speed": [ - "0" - ], - "filament_unloading_speed_start": [ - "0" - ], - "filament_wipe": [ - "nil" - ], - "filament_wipe_distance": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_z_hop_types": [ - "nil" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "55" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "idle_temperature": [ - "0" - ], - "internal_bridge_fan_speed": [ - "100" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_BRASS": [ - "220" - ], - "nozzle_temperature_HS": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_initial_layer_BRASS": [ - "220" - ], - "nozzle_temperature_initial_layer_HS": [ - "230" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "nozzle_temperature_range_low": [ - "210" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "pellet_flow_coefficient": [ - "0.4157" - ], - "pressure_advance": [ - "0.025" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "required_nozzle_HRC": [ - "3" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_layer_time": [ - "8" - ], - "slow_down_layer_time_BRASS": [ - "8" - ], - "slow_down_layer_time_HS": [ - "8" - ], - "slow_down_min_speed": [ - "20" - ], - "supertack_plate_temp": [ - "35" - ], - "supertack_plate_temp_initial_layer": [ - "35" - ], - "support_material_interface_fan_speed": [ - "-1" - ], - "temperature_vitrification": [ - "55" - ], - "textured_cool_plate_temp": [ - "40" - ], - "textured_cool_plate_temp_initial_layer": [ - "40" - ], - "textured_plate_temp": [ - "55" - ], - "textured_plate_temp_initial_layer": [ - "60" - ] -} +{ + "type": "filament", + "name": "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", + "inherits": "Generic PLA-CF @Anycubic", + "from": "system", + "setting_id": "vPSse40nqlQ0xBnp", + "filament_id": "OFZ0mR5b", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA-CF" + ], + "compatible_printers": [ + "Anycubic Kobra S1 Max 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "adaptive_pressure_advance": [ + "0" + ], + "adaptive_pressure_advance_bridges": [ + "0" + ], + "adaptive_pressure_advance_model": [ + "0.042,0.72,5000\n0.044,1.44,5000\n0.045,2.16,5000\n0.045,2.88,5000\n0.045,3.58,5000\n0.044,4.3,5000\n0.045,5.02,5000\n0.043,5.73,5000\n0.045,6.45,5000\n0.041,7.17,5000\n0.039,7.89,5000\n0.038,8.61,5000\n0.036,9.33,5000\n0.033,10.05,5000\n0.032,10.77,5000\n0.034,11.49,5000\n0.033,12.21,5000" + ], + "adaptive_pressure_advance_overhangs": [ + "0" + ], + "additional_cooling_fan_speed": [ + "60" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "5" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "during_print_exhaust_fan_speed": [ + "5" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_cooling_layer_time_BRASS": [ + "100" + ], + "fan_cooling_layer_time_HS": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_max_speed_HS": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "fan_min_speed_BRASS": [ + "100" + ], + "fan_min_speed_HS": [ + "100" + ], + "filament_adhesiveness_category": [ + "0" + ], + "filament_change_length": [ + "10" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_end_gcode": [ + "; filament end gcode\n" + ], + "filament_flush_temp": [ + "nil" + ], + "filament_flush_volumetric_speed": [ + "nil" + ], + "filament_is_support": [ + "0" + ], + "filament_loading_speed": [ + "0" + ], + "filament_loading_speed_start": [ + "0" + ], + "filament_long_retractions_when_cut": [ + "nil" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_flow": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "0" + ], + "filament_notes": [ + "" + ], + "filament_prime_volume": [ + "45" + ], + "filament_ramming_parameters": [ + "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" + ], + "filament_ramming_volumetric_speed": [ + "-1" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_lift_above": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_shrink": [ + "100%" + ], + "filament_shrinkage_compensation_z": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_stamping_distance": [ + "0" + ], + "filament_stamping_loading_speed": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "idle_temperature": [ + "0" + ], + "internal_bridge_fan_speed": [ + "100" + ], + "nozzle_temperature": [ + "220" + ], + "nozzle_temperature_BRASS": [ + "220" + ], + "nozzle_temperature_HS": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_initial_layer_BRASS": [ + "220" + ], + "nozzle_temperature_initial_layer_HS": [ + "230" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "nozzle_temperature_range_low": [ + "210" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pellet_flow_coefficient": [ + "0.4157" + ], + "pressure_advance": [ + "0.025" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "3" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_layer_time_BRASS": [ + "8" + ], + "slow_down_layer_time_HS": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "55" + ], + "textured_cool_plate_temp": [ + "40" + ], + "textured_cool_plate_temp_initial_layer": [ + "40" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json index dcc4102b46..988340c1eb 100644 --- a/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic ABS @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic ABS", + "inherits": "Generic ABS @Anycubic", "from": "system", "setting_id": "W3GiC5YLzxbbjXLY", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json similarity index 80% rename from resources/profiles/Anycubic/filament/Anycubic Generic ABS.json rename to resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json index d4495f172c..cc7334fa34 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json +++ b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic ABS", + "name": "Generic ABS @Anycubic", "inherits": "fdm_filament_abs", + "renamed_from": "Anycubic Generic ABS", "from": "system", - "setting_id": "az6wmXeWSCKcUEsK", - "filament_id": "OF5Zk4e1", + "setting_id": "jKvjWU6rcHvWblWC", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.926" @@ -22,7 +23,6 @@ "Anycubic 4Max Pro 0.4 nozzle", "Anycubic 4Max Pro 2 0.4 nozzle", "Anycubic Kobra 2 0.4 nozzle", - "Anycubic Kobra 3 0.4 nozzle", "Anycubic Kobra 3 Max 0.4 nozzle" ] } diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json b/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json similarity index 81% rename from resources/profiles/Anycubic/filament/Anycubic Generic ASA.json rename to resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json index d352fde30a..282f590739 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json +++ b/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic ASA", + "name": "Generic ASA @Anycubic", "inherits": "fdm_filament_asa", + "renamed_from": "Anycubic Generic ASA", "from": "system", - "setting_id": "qKcef8t7nj8nBjPu", - "filament_id": "OFI80Hct", + "setting_id": "o2Cr8cBtE4OKsTqm", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json b/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json similarity index 80% rename from resources/profiles/Anycubic/filament/Anycubic Generic PA.json rename to resources/profiles/Anycubic/filament/Generic PA @Anycubic.json index 761cfb146b..da5d2424e2 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json +++ b/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic PA", + "name": "Generic PA @Anycubic", "inherits": "fdm_filament_pa", + "renamed_from": "Anycubic Generic PA", "from": "system", - "setting_id": "xzI6EgoKa3DFYyoZ", - "filament_id": "OFB1Tv1E", + "setting_id": "5MJsYpJIimshIDZm", + "filament_id": "OFg8ndtj", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json b/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json similarity index 80% rename from resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json rename to resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json index 44984af3bf..a360cfea1a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json +++ b/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic PA-CF", + "name": "Generic PA-CF @Anycubic", "inherits": "fdm_filament_pa", + "renamed_from": "Anycubic Generic PA-CF", "from": "system", - "setting_id": "j2PXsJyI9YyoE8lc", - "filament_id": "OFPdhDlK", + "setting_id": "j1uioy0lCnm4AKrm", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json b/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json similarity index 79% rename from resources/profiles/Anycubic/filament/Anycubic Generic PC.json rename to resources/profiles/Anycubic/filament/Generic PC @Anycubic.json index 766455b1ad..e2da18b155 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json +++ b/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic PC", + "name": "Generic PC @Anycubic", "inherits": "fdm_filament_pc", + "renamed_from": "Anycubic Generic PC", "from": "system", - "setting_id": "3zgBtEkj1fQpDkxO", - "filament_id": "OFWY6vBh", + "setting_id": "3jP8aWkWw2dT2fNM", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json similarity index 87% rename from resources/profiles/Anycubic/filament/Anycubic Generic PETG.json rename to resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json index 1ca3b27d9c..697caad9d7 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json +++ b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic PETG", + "name": "Generic PETG @Anycubic", "inherits": "fdm_filament_pet", + "renamed_from": "Anycubic Generic PETG", "from": "system", - "setting_id": "CEd987NP90bPdkW7", - "filament_id": "OFWzr7m0", + "setting_id": "ddafY4oOvEc6L6Ej", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json b/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json similarity index 84% rename from resources/profiles/Anycubic/filament/Anycubic Generic PLA.json rename to resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json index 76852ec8aa..e7fe864b7e 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json +++ b/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic PLA", + "name": "Generic PLA @Anycubic", "inherits": "fdm_filament_pla", + "renamed_from": "Anycubic Generic PLA", "from": "system", - "setting_id": "2MiX54GMiZjFzwBI", - "filament_id": "OFKyCgaK", + "setting_id": "qoYfeBQCSt15O9ye", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json b/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json similarity index 80% rename from resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json rename to resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json index ff449f9c86..0f0bd4462a 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json +++ b/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic PLA-CF", + "name": "Generic PLA-CF @Anycubic", "inherits": "fdm_filament_pla", + "renamed_from": "Anycubic Generic PLA-CF", "from": "system", - "setting_id": "9gFgyEJelaCIVwAH", - "filament_id": "OFNcdCrm", + "setting_id": "mLENUT39vBcQiLpm", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json b/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json similarity index 81% rename from resources/profiles/Anycubic/filament/Anycubic Generic PVA.json rename to resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json index f583d7776a..7f6603b6db 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json +++ b/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic PVA", + "name": "Generic PVA @Anycubic", "inherits": "fdm_filament_pva", + "renamed_from": "Anycubic Generic PVA", "from": "system", - "setting_id": "I1GMbOsMYktU7EbM", - "filament_id": "OFSGbf2I", + "setting_id": "ae5ljmDsW7uauLz8", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json index d701c6243d..369198b146 100644 --- a/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic Kobra 3 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic TPU @Anycubic Kobra 3 0.4 nozzle", - "inherits": "Anycubic Generic TPU", + "inherits": "Generic TPU @Anycubic", "from": "system", "setting_id": "kHB2rrxkyz4Clu3N", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json similarity index 78% rename from resources/profiles/Anycubic/filament/Anycubic Generic TPU.json rename to resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json index 0cd40e9b50..d52428e4e5 100644 --- a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json +++ b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Anycubic Generic TPU", + "name": "Generic TPU @Anycubic", "inherits": "fdm_filament_tpu", + "renamed_from": "Anycubic Generic TPU", "from": "system", - "setting_id": "xrbLc7y1AInpumtv", - "filament_id": "OFGKLoUm", + "setting_id": "z0FSikhD8ZHv2UYt", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" @@ -19,7 +20,6 @@ "Anycubic 4Max Pro 0.4 nozzle", "Anycubic 4Max Pro 2 0.4 nozzle", "Anycubic Kobra 2 0.4 nozzle", - "Anycubic Kobra 3 0.4 nozzle", "Anycubic Kobra 3 Max 0.4 nozzle" ] } diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json index 40b4613eb8..fde1113344 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M601", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "G21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 X0 Y0 ; home X and Y\nG28 Z0 ; home Z\nG1 Z30 F{machine_max_speed_z[0]*60} ; move Z a bit down to not blow on the bed edge while heating\nG1 X10 F3900 ; let some space on x to prevent the filament cooling exhaust from beeing blocked by the servo motor\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM106 S80 ; turn on fan to prevent air nozzle melt while heating up\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nM107 ; start with the fan off\nG28 X0 ; goto X home again\nG92 E0 ; zero the extruded length\nG1 Z0.2 F360 ; move plattform upwards\n; extrude material next to the plattform (comment or remove following lines to disable)\nG1 F180 E20 ; extrude some material next to the plattform\nG92 E0 ; zero the extruded length\nG1 E-[retraction_length] F{retraction_speed[0]*60} ; do a filament retract\nG92 E0 ; zero the extruded length again\nG1 X5 F3900 ; move sideways to get rid of that string\nG1 E[retraction_length] F{retraction_speed[0]*60} ; do a filament deretract with retract parameters\nG92 E0 ; zero the extruded length again\n; draw intro line (comment or remove following lines to disable)\nG1 X30 E5 F700 ; draw intro line\nG92 E0 ; zero the extruded length\nG1 E-[retraction_length] F{retraction_speed[0]*60} ; do a filament retract\nG1 X40 Z2.0 ; move away from the introline\nG92 E0 ; zero the extruded length again\nG1 E[retraction_length] F{retraction_speed[0]*60} ; do a filament deretract with retract parameters\n; end of intro line code\nM117 Printing...\nG5", "machine_end_gcode": "M104 S0 ; turn off extruder heating\nM140 S0 ; turn off bed heating\nM107 ; turn off fans\nG91 ; relative positioning\nG0 Z+0.5 ; move Z up a tiny bit\nG90 ; absolute positioning\nG0 X135 Y105 F{machine_max_speed_x[0]*60} ; move extruder to center position\nG0 Z190.5 F{machine_max_speed_z[0]*60} ; lower the plattform to Z min\nM84 ; steppers off\nG90 ; absolute positioning\n", diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json index e54851b41c..56f6c5332d 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro 2.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_4maxpro2_buildplate_model.stl", "bed_texture": "anycubic_4maxpro2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json index 95144dab59..54ee3a238d 100644 --- a/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json +++ b/resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_4maxpro_buildplate_model.stl", "bed_texture": "anycubic_4maxpro_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json index d79bebdf71..9222ef6619 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Chiron 0.4 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M601", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "M104 S140;start the nozzle preheat and don't wait\nG21;metric values\nG90;absolute positioning\nM82;set extruder to absolute mode\nM107 ;start with the fan off\nG28;home all\nM190 S[bed_temperature_initial_layer_single]; set wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG1 Z15.0 F3600 ;move the platform down 15mm\nG92 E0;zero the extruded length\nG1 F200 E40;extrude 40mm of feed stock\nG92 E0;zero the extruded length again\nG1 F3600", "machine_end_gcode": "M104 S0;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91;relative positioning\nG1 E-4 F300;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 F3600 ;move Z up a bit\nG90;absolute positioning\nG1 X-10 F3000; get the head off the bed\nG1 F3000 Y400;kick the bed out\nM84;steppers off", diff --git a/resources/profiles/Anycubic/machine/Anycubic Chiron.json b/resources/profiles/Anycubic/machine/Anycubic Chiron.json index 2772464526..d7b1303de6 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Chiron.json +++ b/resources/profiles/Anycubic/machine/Anycubic Chiron.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_chiron_buildplate_model.stl", "bed_texture": "anycubic_chiron_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 0.4 nozzle.json index e32ed5b2fb..d529794295 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M601", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 P[machine_max_acceleration_extruding] R[machine_max_acceleration_retracting] T[machine_max_acceleration_travel]\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nG28 ; home all\nG1 Y1.0 Z0.3 F{travel_speed*60} ; move print head up\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG92 E0.0\n; initial load\nG1 X205.0 E19 F1000\nG1 Y1.6\nG1 X5.0 E19 F1000\nG92 E0.0\n; intro line\nG1 Y2.0 Z0.2 F1000\nG1 X65.0 E9.0 F1000\nG1 X105.0 E12.5 F1000\nG92 E0.0", "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1 X0{if max_layer_z < printable_height} Z{z_offset+min(max_layer_z+30, printable_height)}{endif} E-34.0 F{travel_speed*60} ; 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 F{travel_speed*60} ; park print head\nM84 ; disable motors", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json index cadcce6d5a..a804761c28 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M601", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "G90 ;Use absolute coordinates\nM83 ;Extruder relative mode\nM104 S[first_layer_temperature] ;Set extruder temp\nM140 S[first_layer_bed_temperature] ;Set bed temp\nM190 S[first_layer_bed_temperature] ;Wait for bed temp\nM109 S[first_layer_temperature] ;Wait for extruder temp\nG28 ;Move X/Y/Z to min endstops\nG1 Z0.28 ;Lift nozzle a bit\nG92 E0 ;Specify current extruder position as zero\nG1 Y3 F1800 ;Move Y to purge point\nG1 X60 E25 F500 ;Extrude 25mm of filament in a 5cm line\nG92 E0 ;Zero the extruded length again\nG1 E-2 F500 ;Retract a little\nG1 X70 F4000 ;Quickly wipe away from the filament line\nM117", "machine_end_gcode": "M104 S0 ;Extruder off\nM140 S0 ;Heatbed off\nM107 ;Fan off\nG91 ;Relative positioning\nG1 E-5 F3000 ;Retract filament\nG1 Z+0.3 F3000 ;Lift print head\nG28 X0 F3000 ;Home X axis\nM84 ;Disable stepper motors", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json index 545ea61e1d..9f2e29a0d9 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 2.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_kobra2_buildplate_model.stl", "bed_texture": "anycubic_kobra2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json index 58ce426f05..36033222d7 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json @@ -108,7 +108,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M601", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "M104 S140;start the nozzle preheat and don't wait\nG21;metric values\nG90;absolute positioning\nM82;set extruder to absolute mode\nM107;start with the fan off\nG28;home all\nM190 S[bed_temperature_initial_layer_single] ; set wait for bed temp\nM355 S1;turn on the case light\nM109 S[nozzle_temperature_initial_layer]; wait for extruder temp\nG1 Z15.0 F1000 ;move the nozzle up 15mm\nG92 E0;zero the extruded length\nG1 F100 E60;extrude 60mm of feed stock\nG92 E0;zero the extruded length again", "machine_end_gcode": "M104 S0;extruder heater off\nM140 S0;heated bed heater off (if you have it)\nG91;relative positioning\nG1 Z+10 F3600 ;move Z up a bit\nG90;absolute positioning\nG1 X10 F3000; get the head off the bed\nG1 F3000 Y400 ;kick the bed out\nM84;steppers off\nM355 S0;turn off the case light", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json index fd3939620e..b4b0c4f17b 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Max.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_kobramax_buildplate_model.stl", "bed_texture": "anycubic_kobramax_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Neo 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Neo 0.4 nozzle.json index ab8a4a0e2b..41b6e7b3e1 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Neo 0.4 nozzle.json @@ -14,7 +14,7 @@ ], "default_print_profile": "0.20mm Standard @Anycubic Kobra Neo 0.4 nozzle", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "disable_m73": "1", "gcode_flavor": "marlin2", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json index 80effe6e8b..25a16805e1 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Neo.json @@ -8,5 +8,5 @@ "bed_model": "Anycubic Kobra Neo_buildplate_model.stl", "bed_texture": "Anycubic Kobra Neo_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic PLA" + "default_materials": "Generic PLA @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Plus 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Plus 0.4 nozzle.json index 9b700b7a5f..1ab26d5c8c 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Plus 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Plus 0.4 nozzle.json @@ -108,7 +108,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M601", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "M104 S140;start the nozzle preheat and don't wait\nG21;metric values\nG90;absolute positioning\nM82;set extruder to absolute mode\nM107;start with the fan off\nG28;home all\nM190 S[bed_temperature_initial_layer_single] ; set wait for bed temp\nM355 S1;turn on the case light\nM109 S[nozzle_temperature_initial_layer]; wait for extruder temp\nG1 Z15.0 F1000 ;move the nozzle up 15mm\nG92 E0;zero the extruded length\nG1 F100 E60;extrude 60mm of feed stock\nG92 E0;zero the extruded length again", "machine_end_gcode": "M104 S0;extruder heater off\nM140 S0;heated bed heater off (if you have it)\nG91;relative positioning\nG1 Z+10 F3600 ;move Z up a bit\nG90;absolute positioning\nG1 X10 F3000; get the head off the bed\nG1 F3000 Y400 ;kick the bed out\nM84;steppers off\nM355 S0;turn off the case light", diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json b/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json index 6a30264849..cf90e73021 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra Plus.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_kobraplus_buildplate_model.stl", "bed_texture": "anycubic_kobraplus_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra.json b/resources/profiles/Anycubic/machine/Anycubic Kobra.json index bbc1f460c3..6309b569e0 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_kobra_buildplate_model.stl", "bed_texture": "anycubic_kobra_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Predator.json b/resources/profiles/Anycubic/machine/Anycubic Predator.json index 4b6076ee89..a3b100c166 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Predator.json +++ b/resources/profiles/Anycubic/machine/Anycubic Predator.json @@ -8,5 +8,5 @@ "bed_model": "Anycubic Predator_buildplate_model.stl", "bed_texture": "Anycubic Predator_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json index 5bcd1fd942..03da852642 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Vyper 0.4 nozzle.json @@ -108,7 +108,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M601", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG0 Z0.2 F1800 ; move nozzle to print position\nG92 E0 ; specify current extruder position as zero\nG1 Y10 X180 E50 F1200 ; extrude a line in front of the printer\nG92 E0 ; specify current extruder position as zero\nG0 Z20 F6000 ; move head up\nG1 E-7 F2400 ; retract\nG04 S2 ; wait 2s\nG0 X0 F6000 ; wipe from oozed filament\nG1 E-1 F2400 ; undo some of the retraction to avoid oozing\nG1 F6000 ; set travel speed to move to start printing point\nM117", "machine_end_gcode": "G4 ; wait\nG92 E0\nG1{if max_layer_z < printable_height} Z{z_offset+min(max_layer_z+30, printable_height)}{endif} ; move print head up\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors", diff --git a/resources/profiles/Anycubic/machine/Anycubic Vyper.json b/resources/profiles/Anycubic/machine/Anycubic Vyper.json index 862af26c4a..75a16dbca5 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Vyper.json +++ b/resources/profiles/Anycubic/machine/Anycubic Vyper.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_vyper_buildplate_model.stl", "bed_texture": "anycubic_vyper_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json index 9d35099001..d3b14b475c 100644 --- a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S 0.4 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Anycubic Generic PLA" + "Generic PLA @Anycubic" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 P[machine_max_acceleration_extruding] R[machine_max_acceleration_retracting] T[machine_max_acceleration_travel]\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nG28 ; home all\nG1 Y1.0 Z0.3 F{travel_speed*60} ; move print head up\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG92 E0.0\n; initial load\nG1 X205.0 E19 F1000\nG1 Y1.6\nG1 X5.0 E19 F1000\nG92 E0.0\n; intro line\nG1 Y2.0 Z0.2 F1000\nG1 X65.0 E9.0 F1000\nG1 X105.0 E12.5 F1000\nG92 E0.0", "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1 X0{if max_layer_z < printable_height} Z{z_offset+min(max_layer_z+30, printable_height)}{endif} E-34.0 F{travel_speed*60} ; 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 F{travel_speed*60} ; park print head\nM84 ; disable motors", diff --git a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json index 76192d1e21..a98cd9ac46 100644 --- a/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json +++ b/resources/profiles/Anycubic/machine/Anycubic i3 Mega S.json @@ -8,5 +8,5 @@ "bed_model": "anycubic_i3megas_buildplate_model.stl", "bed_texture": "anycubic_i3megas_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Anycubic Generic ABS;Anycubic Generic PLA;Anycubic Generic PLA-CF;Anycubic Generic PETG;Anycubic Generic TPU;Anycubic Generic ASA;Anycubic Generic PC;Anycubic Generic PVA;Anycubic Generic PA;Anycubic Generic PA-CF" + "default_materials": "Generic ABS @Anycubic;Generic PLA @Anycubic;Generic PLA-CF @Anycubic;Generic PETG @Anycubic;Generic TPU @Anycubic;Generic ASA @Anycubic;Generic PC @Anycubic;Generic PVA @Anycubic;Generic PA @Anycubic;Generic PA-CF @Anycubic" } diff --git a/resources/profiles/Artillery.json b/resources/profiles/Artillery.json index a610fdbaf6..66a3a05247 100644 --- a/resources/profiles/Artillery.json +++ b/resources/profiles/Artillery.json @@ -1,6 +1,6 @@ { "name": "Artillery", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Artillery configurations", "machine_model_list": [ @@ -389,28 +389,28 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Artillery Generic ABS", - "sub_path": "filament/Artillery Generic ABS.json" + "name": "Generic ABS @Artillery", + "sub_path": "filament/Generic ABS @Artillery.json" }, { - "name": "Artillery Generic ASA", - "sub_path": "filament/Artillery Generic ASA.json" + "name": "Generic ASA @Artillery", + "sub_path": "filament/Generic ASA @Artillery.json" }, { - "name": "Artillery Generic PETG", - "sub_path": "filament/Artillery Generic PETG.json" + "name": "Generic PETG @Artillery", + "sub_path": "filament/Generic PETG @Artillery.json" }, { - "name": "Artillery Generic PLA", - "sub_path": "filament/Artillery Generic PLA.json" + "name": "Generic PLA @Artillery", + "sub_path": "filament/Generic PLA @Artillery.json" }, { - "name": "Artillery Generic PLA-CF", - "sub_path": "filament/Artillery Generic PLA-CF.json" + "name": "Generic PLA-CF @Artillery", + "sub_path": "filament/Generic PLA-CF @Artillery.json" }, { - "name": "Artillery Generic TPU", - "sub_path": "filament/Artillery Generic TPU.json" + "name": "Generic TPU @Artillery", + "sub_path": "filament/Generic TPU @Artillery.json" }, { "name": "Artillery ABS", diff --git a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json index 1a3a7e4834..2c9940db39 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ABS @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery ABS @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "QGbNWGw8rqvq025W", "filament_id": "OFgXgt98", diff --git a/resources/profiles/Artillery/filament/Artillery ABS.json b/resources/profiles/Artillery/filament/Artillery ABS.json index 8ad00f3bde..006b37ca31 100644 --- a/resources/profiles/Artillery/filament/Artillery ABS.json +++ b/resources/profiles/Artillery/filament/Artillery ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery ABS", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "fsbfMiamVemzRxkG", "filament_id": "OFgXgt98", diff --git a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json index 634a2f46c8..3f353f3784 100644 --- a/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery ASA @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery ASA @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "eSwM3ZfSBWqR8Gcf", "filament_id": "OF5YVJXH", diff --git a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json index 2910031a1d..18c889b939 100644 --- a/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PA @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "lOsH1teHe8Pgzx2g", "filament_id": "OFMSvS8z", diff --git a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json index d12faf0b94..abef802ea7 100644 --- a/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "b4BKJMUxArvLuEOh", "filament_id": "OFtGC1ye", diff --git a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json index 8c726cb639..24fd12b55c 100644 --- a/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PC @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PC @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "WawbnfhWn4MT6Hz7", "filament_id": "OFfb10SK", diff --git a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json index 1c56ccb925..078786ed5f 100644 --- a/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PET @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PET @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "QeiSAakfMW7HyhJ7", "filament_id": "OFb5EEM3", diff --git a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json index cb62e565ee..9cc9fa81ac 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PETG @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "g7UIfJTOPzMQzfrH", "filament_id": "OFilnglt", diff --git a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json index 470b5e89f1..8ae5612c31 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "RTQvSwJBWnut5aBo", "filament_id": "OF8wE5l7", diff --git a/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json index a917f9551b..8321236cb4 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "JvmeW29kHCp7HiA6", "filament_id": "OFOnSNt3", diff --git a/resources/profiles/Artillery/filament/Artillery PETG.json b/resources/profiles/Artillery/filament/Artillery PETG.json index 11bc5b0831..bb2227c04a 100644 --- a/resources/profiles/Artillery/filament/Artillery PETG.json +++ b/resources/profiles/Artillery/filament/Artillery PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PETG", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "1MyhYGMxJCmZnJRP", "filament_id": "OFilnglt", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json index 18c8c42d76..b892fd3101 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "zBUD1JyuZF9MOncA", "filament_id": "OFXk1emJ", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json index cb20dc9405..0544a27107 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "2VIrSoq3kufjHMXj", "filament_id": "OF4Nhggz", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Basic.json b/resources/profiles/Artillery/filament/Artillery PLA Basic.json index 5e777a701b..1a54f28da4 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Basic.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Basic.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Basic", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "DcGBMRjdcgLx6pWG", "filament_id": "OFXk1emJ", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json index 77fbb84757..cee07d65d7 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "9zqAIfywiv9zm77X", "filament_id": "OFAC7Wyu", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Matte.json b/resources/profiles/Artillery/filament/Artillery PLA Matte.json index 4ef84538fb..c74c1d0717 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Matte.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Matte.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Matte", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "kt8uKXpMqxrFrHaG", "filament_id": "OFAC7Wyu", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json index ed36227a9e..f0a8424a18 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "BWMjPUWXwumQoY5H", "filament_id": "OFLbXwoL", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Silk.json b/resources/profiles/Artillery/filament/Artillery PLA Silk.json index 897e98f45c..024d9b885f 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Silk.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Silk.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Silk", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "rd0U4uP6mM8S8lDg", "filament_id": "OFLbXwoL", diff --git a/resources/profiles/Artillery/filament/Artillery PLA Tough.json b/resources/profiles/Artillery/filament/Artillery PLA Tough.json index cce5b7fc0a..9fc7df83be 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA Tough.json +++ b/resources/profiles/Artillery/filament/Artillery PLA Tough.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA Tough", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "hLFvQXsyyUrguGEp", "filament_id": "OF0R5Wc7", diff --git a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json index 33aea1f4fc..10df36a947 100644 --- a/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "oT12s9CEV1CTD6eB", "filament_id": "OFAZllAN", diff --git a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json index 00b7642e7c..5fb34feb1f 100644 --- a/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery PVA @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery PVA @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "r2q4QIlfTUCIz43f", "filament_id": "OFkx5MEe", diff --git a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json index 09c0c766ad..730690bba2 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json +++ b/resources/profiles/Artillery/filament/Artillery TPU @Artillery M1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "p6vnCneuwtM0PzL7", "filament_id": "OFcJDtTx", diff --git a/resources/profiles/Artillery/filament/Artillery TPU.json b/resources/profiles/Artillery/filament/Artillery TPU.json index 5d71a93448..407051c138 100644 --- a/resources/profiles/Artillery/filament/Artillery TPU.json +++ b/resources/profiles/Artillery/filament/Artillery TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Artillery TPU", - "inherits": "Artillery Generic PLA", + "inherits": "Generic PLA @Artillery", "from": "system", "setting_id": "IcV1jLJaS5rmdNOY", "filament_id": "OFcJDtTx", diff --git a/resources/profiles/Artillery/filament/Artillery Generic ABS.json b/resources/profiles/Artillery/filament/Generic ABS @Artillery.json similarity index 74% rename from resources/profiles/Artillery/filament/Artillery Generic ABS.json rename to resources/profiles/Artillery/filament/Generic ABS @Artillery.json index 6db4ca98bc..caf687b95e 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ABS.json +++ b/resources/profiles/Artillery/filament/Generic ABS @Artillery.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "OFwMFLAm", - "setting_id": "C4oiu2SBLwfTEcXu", - "name": "Artillery Generic ABS", + "filament_id": "OFY9muEs", + "setting_id": "DNgTEZpEz8bJoobJ", + "name": "Generic ABS @Artillery", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", + "renamed_from": "Artillery Generic ABS", "filament_flow_ratio": [ "0.926" ], diff --git a/resources/profiles/Artillery/filament/Artillery Generic ASA.json b/resources/profiles/Artillery/filament/Generic ASA @Artillery.json similarity index 74% rename from resources/profiles/Artillery/filament/Artillery Generic ASA.json rename to resources/profiles/Artillery/filament/Generic ASA @Artillery.json index 5acf3d49f2..74ef4c775f 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic ASA.json +++ b/resources/profiles/Artillery/filament/Generic ASA @Artillery.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "OF6vKLaU", - "setting_id": "1gls4zCclgN68Hlc", - "name": "Artillery Generic ASA", + "filament_id": "OFLPAxz3", + "setting_id": "xWHuScm0fPJCqjVx", + "name": "Generic ASA @Artillery", "from": "system", "instantiation": "true", "inherits": "fdm_filament_asa", + "renamed_from": "Artillery Generic ASA", "filament_flow_ratio": [ "0.93" ], diff --git a/resources/profiles/Artillery/filament/Artillery Generic PETG.json b/resources/profiles/Artillery/filament/Generic PETG @Artillery.json similarity index 84% rename from resources/profiles/Artillery/filament/Artillery Generic PETG.json rename to resources/profiles/Artillery/filament/Generic PETG @Artillery.json index d1bafe2688..aa354e517d 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PETG.json +++ b/resources/profiles/Artillery/filament/Generic PETG @Artillery.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "OFyK5Lt9", - "setting_id": "Ou4NR5DVvalg5kCe", - "name": "Artillery Generic PETG", + "filament_id": "OFYPdQJh", + "setting_id": "6wZKfV2XvuJSUSwl", + "name": "Generic PETG @Artillery", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", + "renamed_from": "Artillery Generic PETG", "reduce_fan_stop_start_freq": [ "1" ], diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA.json b/resources/profiles/Artillery/filament/Generic PLA @Artillery.json similarity index 81% rename from resources/profiles/Artillery/filament/Artillery Generic PLA.json rename to resources/profiles/Artillery/filament/Generic PLA @Artillery.json index 4133075578..d691a9b470 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA.json +++ b/resources/profiles/Artillery/filament/Generic PLA @Artillery.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "OFnfBvn5", - "setting_id": "Bpy4tAvspysDWosL", - "name": "Artillery Generic PLA", + "filament_id": "OFDSrzZ8", + "setting_id": "T0sW3uMBr94Y1X1G", + "name": "Generic PLA @Artillery", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", + "renamed_from": "Artillery Generic PLA", "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json b/resources/profiles/Artillery/filament/Generic PLA-CF @Artillery.json similarity index 81% rename from resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json rename to resources/profiles/Artillery/filament/Generic PLA-CF @Artillery.json index 2324bd6ae2..08fd583e18 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic PLA-CF.json +++ b/resources/profiles/Artillery/filament/Generic PLA-CF @Artillery.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "OFUtGagr", - "setting_id": "h23GL00BFCliLh9N", - "name": "Artillery Generic PLA-CF", + "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", "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Artillery/filament/Artillery Generic TPU.json b/resources/profiles/Artillery/filament/Generic TPU @Artillery.json similarity index 72% rename from resources/profiles/Artillery/filament/Artillery Generic TPU.json rename to resources/profiles/Artillery/filament/Generic TPU @Artillery.json index 522cc0fbfb..f1270d0afb 100644 --- a/resources/profiles/Artillery/filament/Artillery Generic TPU.json +++ b/resources/profiles/Artillery/filament/Generic TPU @Artillery.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "OFEE1Dld", - "setting_id": "u8YE6r4sGJ0jvqBn", - "name": "Artillery Generic TPU", + "filament_id": "OFgbpcy9", + "setting_id": "dWhysRiE5GrAGyME", + "name": "Generic TPU @Artillery", "from": "system", "instantiation": "true", "inherits": "fdm_filament_tpu", + "renamed_from": "Artillery Generic TPU", "filament_max_volumetric_speed": [ "3.2" ], 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 d9b85067a1..fec7ef73d3 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Genius 0.4 nozzle.json @@ -111,7 +111,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Artillery Generic PLA" + "Generic PLA @Artillery" ], "machine_start_gcode": "M83; extruder relative mode\nG28; home all axes\nM109 S[nozzle_temperature_initial_layer]; hotend temperature\nM140 S[bed_temperature_initial_layer_single]; heatbed temperature\nM190 S[bed_temperature_initial_layer_single]; wait for the bed to heat up\nM109 S[nozzle_temperature_initial_layer]; wait for the extruder to heat up\nG92 E0; reset extruder\nG1 X20 Y5 Z0.3 F5000.0; move to start-line position\nG1 Z0.3 F1000; print height\nG1 X200 Y5 F1500.0 E15; draw 1st line\nG1 X200 Y5.3 Z0.3 F5000.0; move to side a little\nG1 X5.3 Y5.3 Z0.3 F1500.0 E30; draw 2nd line\nG1 Z3 F3000; move z up little to prevent scratching of surface", "machine_end_gcode": "G91; Relative positionning\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 Y100; 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", 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 07beadf546..abac060832 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 @@ -111,7 +111,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Artillery Generic PLA" + "Generic PLA @Artillery" ], "machine_start_gcode": "M83; extruder relative mode\nG28; home all axes\nG29 S12000; bed mesh leveling\nM104 S[nozzle_temperature_initial_layer]; set hotend temperature\nM140 S[bed_temperature_initial_layer_single]; set heatbed temperature\nG90; Absolute Positioning\nG1 Y0 F5000; Move to front\nG1 X0 F5000; Move to origin\nM190 S[bed_temperature_initial_layer_single]; wait for the bed to heat up\nM109 S[nozzle_temperature_initial_layer]; wait for the extruder to heat up\nG92 E0; reset extruder\nG1 X20 Y5 Z0.3 F5000.0; move to start-line position\nG1 Z0.3 F1000; print height\nG1 X200 Y5 F1500.0 E15; draw 1st line\nG1 X200 Y5.3 Z0.3 F5000.0; move to side a little\nG1 X5.3 Y5.3 Z0.3 F1500.0 E30; draw 2nd line\nG1 Z3 F3000; move z up little to prevent scratching of surface", "machine_end_gcode": "G91; Relative positionning\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 Y100; 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", diff --git a/resources/profiles/Artillery/machine/Artillery Genius Pro.json b/resources/profiles/Artillery/machine/Artillery Genius Pro.json index 6af35f73a6..6581266380 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius Pro.json +++ b/resources/profiles/Artillery/machine/Artillery Genius Pro.json @@ -8,5 +8,5 @@ "bed_model": "artillery_geniuspro_buildplate_model.stl", "bed_texture": "artillery_geniuspro_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" + "default_materials": "Generic ABS @Artillery;Generic PLA @Artillery;Generic PLA-CF @Artillery;Generic PETG @Artillery;Generic TPU @Artillery;Generic ASA @Artillery" } diff --git a/resources/profiles/Artillery/machine/Artillery Genius.json b/resources/profiles/Artillery/machine/Artillery Genius.json index 31c021230b..27fe494d24 100644 --- a/resources/profiles/Artillery/machine/Artillery Genius.json +++ b/resources/profiles/Artillery/machine/Artillery Genius.json @@ -8,5 +8,5 @@ "bed_model": "artillery_genius_buildplate_model.stl", "bed_texture": "artillery_genius_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" + "default_materials": "Generic ABS @Artillery;Generic PLA @Artillery;Generic PLA-CF @Artillery;Generic PETG @Artillery;Generic TPU @Artillery;Generic ASA @Artillery" } 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 4aa9f9d9a4..232b68d62e 100644 --- a/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json +++ b/resources/profiles/Artillery/machine/Artillery Hornet 0.4 nozzle.json @@ -108,7 +108,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Artillery Generic PLA" + "Generic PLA @Artillery" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S{hot_plate_temp_initial_layer[0]} ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis\nG29 ; auto bed levelling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S{nozzle_temperature_initial_layer[0]} ; set final nozzle temp\nM190 S{hot_plate_temp_initial_layer[0]} ; wait for bed temp to stabilize\nM109 S{nozzle_temperature_initial_layer[0]} ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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.85} 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 < printable_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", diff --git a/resources/profiles/Artillery/machine/Artillery Hornet.json b/resources/profiles/Artillery/machine/Artillery Hornet.json index c0e680e039..79e48b3487 100644 --- a/resources/profiles/Artillery/machine/Artillery Hornet.json +++ b/resources/profiles/Artillery/machine/Artillery Hornet.json @@ -8,5 +8,5 @@ "bed_model": "artillery_hornet_buildplate_model.stl", "bed_texture": "artillery_hornet_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" + "default_materials": "Generic ABS @Artillery;Generic PLA @Artillery;Generic PLA-CF @Artillery;Generic PETG @Artillery;Generic TPU @Artillery;Generic ASA @Artillery" } 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 81e96a2593..ab83e7d429 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 @@ -111,7 +111,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Artillery Generic PLA" + "Generic PLA @Artillery" ], "machine_start_gcode": "; Initial setups\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM220 S100 ; reset speed factor to 100%\nM221 S100 ; reset extrusion rate to 100%\n\n; Set the heating\nM190 S[bed_temperature_initial_layer_single] ; wait for bed to heat up\nM104 S[nozzle_temperature_initial_layer] ; start nozzle heating but don't wait\n\n; Home\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG28 ; home all axes\nG1 X3 Y3 F5000 ; move to corner of the bed to avoid ooze over centre\n\n; Wait for final heating\nM109 S[nozzle_temperature_initial_layer] ; wait for the nozzle to heat up\nM190 S[bed_temperature_initial_layer_single] ; wait for the bed to heat up\n\n; Return to prime position, Prime line routine\nG92 E0 ; Reset Extruder\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG1 X10 Y.5 Z0.25 F5000.0 ; Move to start position\nG1 X100 Y.5 Z0.25 F1500.0 E15 ; Draw the first line\nG1 X100 Y.2 Z0.25 F5000.0 ; Move to side a little\nG1 X10 Y.2 Z0.25 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM221 S{if layer_height<0.075}100{else}95{endif}", "machine_end_gcode": "G4 ; wait\nG92 E0 ; prepare to retract\nG1 E-0.5 F3000; retract to avoid stringing\n\n; Anti-stringing end wiggle\nG91 ; use relative coordinates\nG1 X1 Y1 F1200\n\n; Raise nozzle and present bed\n{if layer_z < printable_height}G1 Z{z_offset+min(layer_z+120, printable_height)}{endif} ; Move print head up\nG90 ; use absolute coordinates\n\n; Reset print setting overrides\nM200 D0 ; disable volumetric e\nM220 S100 ; reset speed factor to 100%\nM221 S100 ; reset extrusion rate to 100%\n\n; Shut down printer\nM106 S0 ; turn-off fan\nM104 S0 ; turn-off hotend\nM140 S0 ; turn-off bed\nM150 P0 ; turn off led\nM85 S0 ; deactivate idle timeout\nM84 ; disable motors\n", diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json index 5d5f13f511..195b01f873 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X1.json @@ -8,5 +8,5 @@ "bed_model": "artillery_sidewinderx1_buildplate_model.stl", "bed_texture": "artillery_sidewinderx1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" + "default_materials": "Generic ABS @Artillery;Generic PLA @Artillery;Generic PLA-CF @Artillery;Generic PETG @Artillery;Generic TPU @Artillery;Generic ASA @Artillery" } 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 b3100851fb..416ddfb056 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 @@ -111,7 +111,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Artillery Generic PLA" + "Generic PLA @Artillery" ], "machine_start_gcode": "; Initial setups\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM900 K0.12 ; K factor\nM900 W[line_width] H[layer_height] D[filament_diameter]\nM200 D0 ; disable volumetric e\nM220 S100 ; reset speed factor to 100%\nM221 S100 ; reset extrusion rate to 100%\n\n; Set the heating\nM190 S[bed_temperature_initial_layer_single] ; wait for bed to heat up\nM104 S[nozzle_temperature_initial_layer] ; start nozzle heating but don't wait\n\n; Home\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG28 ; home all axes\nG1 X3 Y3 F5000 ; move to corner of the bed to avoid ooze over centre\n\n; Wait for final heating\nM109 S[nozzle_temperature_initial_layer] ; wait for the nozzle to heat up\nM190 S[bed_temperature_initial_layer_single] ; wait for the bed to heat up\n\n;Auto bed Leveling\n@BEDLEVELVISUALIZER\nG29 ; ABL T\nM420 S1 Z3 ; reload and fade mesh bed leveling until it reach 3mm Z\n\n; Return to prime position, Prime line routine\nG92 E0 ; Reset Extruder\nG1 Z3 F3000 ; move z up little to prevent scratching of surface\nG1 X10 Y.5 Z0.25 F5000.0 ; Move to start position\nG1 X100 Y.5 Z0.25 F1500.0 E15 ; Draw the first line\nG1 X100 Y.2 Z0.25 F5000.0 ; Move to side a little\nG1 X10 Y.2 Z0.25 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM221 S{if layer_height<0.075}100{else}95{endif}", "machine_end_gcode": "G4 ; wait\nG92 E0 ; prepare to retract\nG1 E-0.5 F3000; retract to avoid stringing\n\n; Anti-stringing end wiggle\nG91 ; use relative coordinates\nG1 X1 Y1 F1200\n\n; Raise nozzle and present bed\n{if layer_z < printable_height}G1 Z{z_offset+min(layer_z+120, printable_height)}{endif} ; Move print head up\nG90 ; use absolute coordinates\n\n; Reset print setting overrides\nM200 D0 ; disable volumetric e\nM220 S100 ; reset speed factor to 100%\nM221 S100 ; reset extrusion rate to 100%\n\n; Shut down printer\nM106 S0 ; turn-off fan\nM104 S0 ; turn-off hotend\nM140 S0 ; turn-off bed\nM150 P0 ; turn off led\nM85 S0 ; deactivate idle timeout\nM84 ; disable motors\n", diff --git a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json index 79922cfe8b..2009958308 100644 --- a/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json +++ b/resources/profiles/Artillery/machine/Artillery Sidewinder X2.json @@ -8,5 +8,5 @@ "bed_model": "artillery_sidewinderx2_buildplate_model.stl", "bed_texture": "artillery_sidewinderx2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Artillery Generic ABS;Artillery Generic PLA;Artillery Generic PLA-CF;Artillery Generic PETG;Artillery Generic TPU;Artillery Generic ASA" + "default_materials": "Generic ABS @Artillery;Generic PLA @Artillery;Generic PLA-CF @Artillery;Generic PETG @Artillery;Generic TPU @Artillery;Generic ASA @Artillery" } diff --git a/resources/profiles/Blocks.json b/resources/profiles/Blocks.json index 269391c4c3..f8243c252d 100644 --- a/resources/profiles/Blocks.json +++ b/resources/profiles/Blocks.json @@ -1,6 +1,6 @@ { "name": "Blocks", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Blocks configurations", "machine_model_list": [ @@ -249,48 +249,48 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Blocks Generic ABS", - "sub_path": "filament/Blocks Generic ABS.json" + "name": "Generic ABS @Blocks", + "sub_path": "filament/Generic ABS @Blocks.json" }, { - "name": "Blocks Generic ASA", - "sub_path": "filament/Blocks Generic ASA.json" + "name": "Generic ASA @Blocks", + "sub_path": "filament/Generic ASA @Blocks.json" }, { - "name": "Blocks Generic ASA-CF", - "sub_path": "filament/Blocks Generic ASA-CF.json" + "name": "Generic ASA-CF @Blocks", + "sub_path": "filament/Generic ASA-CF @Blocks.json" }, { - "name": "Blocks Generic PA", - "sub_path": "filament/Blocks Generic PA.json" + "name": "Generic PA @Blocks", + "sub_path": "filament/Generic PA @Blocks.json" }, { - "name": "Blocks Generic PA-CF", - "sub_path": "filament/Blocks Generic PA-CF.json" + "name": "Generic PA-CF @Blocks", + "sub_path": "filament/Generic PA-CF @Blocks.json" }, { - "name": "Blocks Generic PC", - "sub_path": "filament/Blocks Generic PC.json" + "name": "Generic PC @Blocks", + "sub_path": "filament/Generic PC @Blocks.json" }, { - "name": "Blocks Generic PETG", - "sub_path": "filament/Blocks Generic PETG.json" + "name": "Generic PETG @Blocks", + "sub_path": "filament/Generic PETG @Blocks.json" }, { - "name": "Blocks Generic PLA", - "sub_path": "filament/Blocks Generic PLA.json" + "name": "Generic PLA @Blocks", + "sub_path": "filament/Generic PLA @Blocks.json" }, { - "name": "Blocks Generic PLA-CF", - "sub_path": "filament/Blocks Generic PLA-CF.json" + "name": "Generic PLA-CF @Blocks", + "sub_path": "filament/Generic PLA-CF @Blocks.json" }, { - "name": "Blocks Generic PVA", - "sub_path": "filament/Blocks Generic PVA.json" + "name": "Generic PVA @Blocks", + "sub_path": "filament/Generic PVA @Blocks.json" }, { - "name": "Blocks Generic TPU", - "sub_path": "filament/Blocks Generic TPU.json" + "name": "Generic TPU @Blocks", + "sub_path": "filament/Generic TPU @Blocks.json" } ], "machine_list": [ diff --git a/resources/profiles/Blocks/filament/Blocks Generic ABS.json b/resources/profiles/Blocks/filament/Generic ABS @Blocks.json similarity index 90% rename from resources/profiles/Blocks/filament/Blocks Generic ABS.json rename to resources/profiles/Blocks/filament/Generic ABS @Blocks.json index 122469f7f5..c3d09cfd18 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic ABS.json +++ b/resources/profiles/Blocks/filament/Generic ABS @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic ABS", + "name": "Generic ABS @Blocks", "inherits": "fdm_filament_abs", + "renamed_from": "Blocks Generic ABS", "from": "system", - "setting_id": "QhLaLEkxhvIMa3Ik", - "filament_id": "OFma52eS", + "setting_id": "TL1Q1kA4t36GGObG", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic ASA.json b/resources/profiles/Blocks/filament/Generic ASA @Blocks.json similarity index 90% rename from resources/profiles/Blocks/filament/Blocks Generic ASA.json rename to resources/profiles/Blocks/filament/Generic ASA @Blocks.json index ed190d385b..0c1ee32085 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic ASA.json +++ b/resources/profiles/Blocks/filament/Generic ASA @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic ASA", + "name": "Generic ASA @Blocks", "inherits": "fdm_filament_asa", + "renamed_from": "Blocks Generic ASA", "from": "system", - "setting_id": "DcgqA071S6MRVbKI", - "filament_id": "OFB9dx27", + "setting_id": "xP7cB4RHgbm4cYDD", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json b/resources/profiles/Blocks/filament/Generic ASA-CF @Blocks.json similarity index 88% rename from resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json rename to resources/profiles/Blocks/filament/Generic ASA-CF @Blocks.json index a7fa66375d..0d9f0aa862 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json +++ b/resources/profiles/Blocks/filament/Generic ASA-CF @Blocks.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "Blocks Generic ASA-CF", + "name": "Generic ASA-CF @Blocks", "inherits": "fdm_filament_asa", + "renamed_from": "Blocks Generic ASA-CF", "from": "system", - "setting_id": "FF6D7i492XTrb8AO", - "filament_id": "OFctbSkL", + "setting_id": "ju4ue7yJoz3ujny6", + "filament_id": "OF53eLVD", "instantiation": "true", + "filament_type": [ + "ASA-CF" + ], "filament_flow_ratio": [ "0.95" ], diff --git a/resources/profiles/Blocks/filament/Blocks Generic PA.json b/resources/profiles/Blocks/filament/Generic PA @Blocks.json similarity index 74% rename from resources/profiles/Blocks/filament/Blocks Generic PA.json rename to resources/profiles/Blocks/filament/Generic PA @Blocks.json index a25c3e2b13..e624226ded 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PA.json +++ b/resources/profiles/Blocks/filament/Generic PA @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic PA", + "name": "Generic PA @Blocks", "inherits": "fdm_filament_pa", + "renamed_from": "Blocks Generic PA", "from": "system", - "setting_id": "3L5IYVTlkt8V0EiW", - "filament_id": "OFiUSDih", + "setting_id": "hL3p8gAeciwDkjNK", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json b/resources/profiles/Blocks/filament/Generic PA-CF @Blocks.json similarity index 91% rename from resources/profiles/Blocks/filament/Blocks Generic PA-CF.json rename to resources/profiles/Blocks/filament/Generic PA-CF @Blocks.json index b527976973..7ec957f6d1 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json +++ b/resources/profiles/Blocks/filament/Generic PA-CF @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic PA-CF", + "name": "Generic PA-CF @Blocks", "inherits": "fdm_filament_pa", + "renamed_from": "Blocks Generic PA-CF", "from": "system", - "setting_id": "B254XDRQzysz7YUd", - "filament_id": "OF8bLDu7", + "setting_id": "T6SO0WRdnG6wcyG8", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PC.json b/resources/profiles/Blocks/filament/Generic PC @Blocks.json similarity index 74% rename from resources/profiles/Blocks/filament/Blocks Generic PC.json rename to resources/profiles/Blocks/filament/Generic PC @Blocks.json index 2a0500e435..7b5df77bc5 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PC.json +++ b/resources/profiles/Blocks/filament/Generic PC @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic PC", + "name": "Generic PC @Blocks", "inherits": "fdm_filament_pc", + "renamed_from": "Blocks Generic PC", "from": "system", - "setting_id": "VUPeelf61TmTQrun", - "filament_id": "OFahE7HP", + "setting_id": "Xhs8PjtmwwVj0ksE", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PETG.json b/resources/profiles/Blocks/filament/Generic PETG @Blocks.json similarity index 91% rename from resources/profiles/Blocks/filament/Blocks Generic PETG.json rename to resources/profiles/Blocks/filament/Generic PETG @Blocks.json index 068fc32774..45a2a13e9b 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PETG.json +++ b/resources/profiles/Blocks/filament/Generic PETG @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic PETG", + "name": "Generic PETG @Blocks", "inherits": "fdm_filament_petg", + "renamed_from": "Blocks Generic PETG", "from": "system", - "setting_id": "FKkbjL1V4ZEjXB0H", - "filament_id": "OFrgGex8", + "setting_id": "NgzPlYItKHbmGgv3", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PLA.json b/resources/profiles/Blocks/filament/Generic PLA @Blocks.json similarity index 87% rename from resources/profiles/Blocks/filament/Blocks Generic PLA.json rename to resources/profiles/Blocks/filament/Generic PLA @Blocks.json index f900b91225..3a5c942899 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PLA.json +++ b/resources/profiles/Blocks/filament/Generic PLA @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic PLA", + "name": "Generic PLA @Blocks", "inherits": "fdm_filament_pla", + "renamed_from": "Blocks Generic PLA", "from": "system", - "setting_id": "N3wDUqmBETfelOoG", - "filament_id": "OFNYewRS", + "setting_id": "kjhuttx4T8OtTNmV", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json b/resources/profiles/Blocks/filament/Generic PLA-CF @Blocks.json similarity index 76% rename from resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json rename to resources/profiles/Blocks/filament/Generic PLA-CF @Blocks.json index af0f0c80b9..3a3ac5daba 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json +++ b/resources/profiles/Blocks/filament/Generic PLA-CF @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic PLA-CF", + "name": "Generic PLA-CF @Blocks", "inherits": "fdm_filament_pla", + "renamed_from": "Blocks Generic PLA-CF", "from": "system", - "setting_id": "RHKPeXZiv4E2p4lP", - "filament_id": "OFupq0tY", + "setting_id": "oKUqzwAWMrpiyGLf", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Blocks/filament/Blocks Generic PVA.json b/resources/profiles/Blocks/filament/Generic PVA @Blocks.json similarity index 74% rename from resources/profiles/Blocks/filament/Blocks Generic PVA.json rename to resources/profiles/Blocks/filament/Generic PVA @Blocks.json index 850a5cd246..5b6a3ad368 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic PVA.json +++ b/resources/profiles/Blocks/filament/Generic PVA @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic PVA", + "name": "Generic PVA @Blocks", "inherits": "fdm_filament_pva", + "renamed_from": "Blocks Generic PVA", "from": "system", - "setting_id": "J74KgdSzf503Tk9p", - "filament_id": "OFiorRtJ", + "setting_id": "tNw3oe7VovLkgUbB", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Blocks/filament/Blocks Generic TPU.json b/resources/profiles/Blocks/filament/Generic TPU @Blocks.json similarity index 89% rename from resources/profiles/Blocks/filament/Blocks Generic TPU.json rename to resources/profiles/Blocks/filament/Generic TPU @Blocks.json index e8e043b174..8b5873a745 100644 --- a/resources/profiles/Blocks/filament/Blocks Generic TPU.json +++ b/resources/profiles/Blocks/filament/Generic TPU @Blocks.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Blocks Generic TPU", + "name": "Generic TPU @Blocks", "inherits": "fdm_filament_tpu", + "renamed_from": "Blocks Generic TPU", "from": "system", - "setting_id": "xFRwN8ZEwEGlLFwo", - "filament_id": "OFMEbuBE", + "setting_id": "6iVYOCZo8ugs4JA0", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "4" diff --git a/resources/profiles/Blocks/machine/BLOCKS Pro S100.json b/resources/profiles/Blocks/machine/BLOCKS Pro S100.json index abd474d3f1..de9ea3756c 100644 --- a/resources/profiles/Blocks/machine/BLOCKS Pro S100.json +++ b/resources/profiles/Blocks/machine/BLOCKS Pro S100.json @@ -8,5 +8,5 @@ "bed_model": "PRO S100 HotBed model.stl", "bed_texture": "PRO S100 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", - "default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU" + "default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json b/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json index b3b82c876c..76dafd429e 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json +++ b/resources/profiles/Blocks/machine/BLOCKS RD50 V2.json @@ -8,5 +8,5 @@ "bed_model": "RD50 V2 HotBed model.stl", "bed_texture": "RD50 V2 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", - "default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU" + "default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks" } diff --git a/resources/profiles/Blocks/machine/BLOCKS RF50.json b/resources/profiles/Blocks/machine/BLOCKS RF50.json index acc4e95f63..14ae8bc5f4 100644 --- a/resources/profiles/Blocks/machine/BLOCKS RF50.json +++ b/resources/profiles/Blocks/machine/BLOCKS RF50.json @@ -8,5 +8,5 @@ "bed_model": "RF50 HotBed model.stl", "bed_texture": "RF50 HotBed texture.svg", "hotend_model": "BLOCKS PrintCore.stl", - "default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU" + "default_materials": "Generic PLA @Blocks;Generic PETG @Blocks;Generic TPU @Blocks" } diff --git a/resources/profiles/Blocks/machine/fdm_klipper_common.json b/resources/profiles/Blocks/machine/fdm_klipper_common.json index 7415366d39..1756ac178a 100644 --- a/resources/profiles/Blocks/machine/fdm_klipper_common.json +++ b/resources/profiles/Blocks/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Blocks Generic PLA" + "Generic PLA @Blocks" ], "bed_exclude_area": [ "0x0" diff --git a/resources/profiles/CONSTRUCT3D.json b/resources/profiles/CONSTRUCT3D.json index ba2652f724..efc7c78972 100644 --- a/resources/profiles/CONSTRUCT3D.json +++ b/resources/profiles/CONSTRUCT3D.json @@ -1,6 +1,6 @@ { "name": "CONSTRUCT3D", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "Construct3D configurations", "machine_model_list": [ @@ -65,16 +65,16 @@ "sub_path": "filament/fdm_filament_pla.json" }, { - "name": "C1 Generic High Flow PETG", - "sub_path": "filament/C1 Generic High Flow PETG.json" + "name": "Generic High Flow PETG @C1", + "sub_path": "filament/Generic High Flow PETG @C1.json" }, { - "name": "C1 Generic PETG", - "sub_path": "filament/C1 Generic PETG.json" + "name": "Generic PETG @C1", + "sub_path": "filament/Generic PETG @C1.json" }, { - "name": "C1 Generic PLA", - "sub_path": "filament/C1 Generic PLA.json" + "name": "Generic PLA @C1", + "sub_path": "filament/Generic PLA @C1.json" } ], "machine_list": [ diff --git a/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json b/resources/profiles/CONSTRUCT3D/filament/Generic High Flow PETG @C1.json similarity index 84% rename from resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json rename to resources/profiles/CONSTRUCT3D/filament/Generic High Flow PETG @C1.json index 1a1f01b3d9..11a7df0903 100644 --- a/resources/profiles/CONSTRUCT3D/filament/C1 Generic High Flow PETG.json +++ b/resources/profiles/CONSTRUCT3D/filament/Generic High Flow PETG @C1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "C1 Generic High Flow PETG", + "name": "Generic High Flow PETG @C1", "inherits": "fdm_filament_pet", + "renamed_from": "C1 Generic High Flow PETG", "from": "system", - "setting_id": "3IxBZSWFfFGmKAQ7", - "filament_id": "OFZ4fTO8", + "setting_id": "STRDBlNRWBGfRctE", + "filament_id": "OFNjku08", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.json b/resources/profiles/CONSTRUCT3D/filament/Generic PETG @C1.json similarity index 83% rename from resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.json rename to resources/profiles/CONSTRUCT3D/filament/Generic PETG @C1.json index fc011cc9bc..dfb510e993 100644 --- a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PETG.json +++ b/resources/profiles/CONSTRUCT3D/filament/Generic PETG @C1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "C1 Generic PETG", + "name": "Generic PETG @C1", "inherits": "fdm_filament_pet", + "renamed_from": "C1 Generic PETG", "from": "system", - "setting_id": "jZBfhlf6VX5r3KHb", - "filament_id": "OFz3q5Xz", + "setting_id": "v0b4nWyzRw5z5EfK", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.json b/resources/profiles/CONSTRUCT3D/filament/Generic PLA @C1.json similarity index 75% rename from resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.json rename to resources/profiles/CONSTRUCT3D/filament/Generic PLA @C1.json index 4b2cd9bbea..4c8a90b1de 100644 --- a/resources/profiles/CONSTRUCT3D/filament/C1 Generic PLA.json +++ b/resources/profiles/CONSTRUCT3D/filament/Generic PLA @C1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "C1 Generic PLA", + "name": "Generic PLA @C1", "inherits": "fdm_filament_pla", + "renamed_from": "C1 Generic PLA", "from": "system", - "setting_id": "Uv3kcMO5qNwkrMPV", - "filament_id": "OF51XQar", + "setting_id": "mCKOBqN6Y92a9nHV", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL.json b/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL.json index bee8ab1e73..7d6ad32ce1 100644 --- a/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL.json +++ b/resources/profiles/CONSTRUCT3D/machine/Construct 1 XL.json @@ -6,5 +6,5 @@ "machine_tech": "FFF", "family": "CONSTRUCT3D", "bed_model": "construct_1_xl_buildplate_model.stl", - "default_materials": "C1 Generic PLA;C1 Generic PETG;C1 Generic High Flow PETG" + "default_materials": "Generic PLA @C1;Generic PETG @C1;Generic High Flow PETG @C1" } diff --git a/resources/profiles/CONSTRUCT3D/machine/Construct 1.json b/resources/profiles/CONSTRUCT3D/machine/Construct 1.json index 152a1e5bb2..4839166da6 100644 --- a/resources/profiles/CONSTRUCT3D/machine/Construct 1.json +++ b/resources/profiles/CONSTRUCT3D/machine/Construct 1.json @@ -6,5 +6,5 @@ "machine_tech": "FFF", "family": "CONSTRUCT3D", "bed_model": "construct_1_buildplate_model.stl", - "default_materials": "C1 Generic PLA;C1 Generic PETG;C1 Generic High Flow PETG" + "default_materials": "Generic PLA @C1;Generic PETG @C1;Generic High Flow PETG @C1" } diff --git a/resources/profiles/Chuanying.json b/resources/profiles/Chuanying.json index 19d5c9b7b5..746a31e334 100644 --- a/resources/profiles/Chuanying.json +++ b/resources/profiles/Chuanying.json @@ -1,7 +1,7 @@ { "name": "Chuanying", "url": "", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Chuanying configurations", "machine_model_list": [ @@ -46,36 +46,36 @@ ], "filament_list": [ { - "name": "Chuanying Generic ABS", - "sub_path": "filament/Chuanying Generic ABS.json" + "name": "Generic ABS @Chuanying", + "sub_path": "filament/Generic ABS @Chuanying.json" }, { - "name": "Chuanying Generic ASA", - "sub_path": "filament/Chuanying Generic ASA.json" + "name": "Generic ASA @Chuanying", + "sub_path": "filament/Generic ASA @Chuanying.json" }, { - "name": "Chuanying Generic HS PLA", - "sub_path": "filament/Chuanying Generic HS PLA.json" + "name": "Generic HS PLA @Chuanying", + "sub_path": "filament/Generic HS PLA @Chuanying.json" }, { - "name": "Chuanying Generic PETG", - "sub_path": "filament/Chuanying Generic PETG.json" + "name": "Generic PETG @Chuanying", + "sub_path": "filament/Generic PETG @Chuanying.json" }, { - "name": "Chuanying Generic PLA", - "sub_path": "filament/Chuanying Generic PLA.json" + "name": "Generic PLA @Chuanying", + "sub_path": "filament/Generic PLA @Chuanying.json" }, { - "name": "Chuanying Generic PLA-Silk", - "sub_path": "filament/Chuanying Generic PLA-Silk.json" + "name": "Generic PLA-Silk @Chuanying", + "sub_path": "filament/Generic PLA-Silk @Chuanying.json" }, { "name": "Chuanying ABS @Chuanying X1 0.25 Nozzle", "sub_path": "filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json" }, { - "name": "Chuanying Generic HIPS", - "sub_path": "filament/Chuanying Generic HIPS.json" + "name": "Generic HIPS @Chuanying", + "sub_path": "filament/Generic HIPS @Chuanying.json" }, { "name": "Chuanying ASA @Chuanying X1 0.25 Nozzle", @@ -90,8 +90,8 @@ "sub_path": "filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json" }, { - "name": "Chuanying Generic PVA", - "sub_path": "filament/Chuanying Generic PVA.json" + "name": "Generic PVA @Chuanying", + "sub_path": "filament/Generic PVA @Chuanying.json" }, { "name": "Chuanying PLA @Chuanying X1 0.25 Nozzle", @@ -102,16 +102,16 @@ "sub_path": "filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json" }, { - "name": "Chuanying Generic PETG-CF10", - "sub_path": "filament/Chuanying Generic PETG-CF10.json" + "name": "Generic PETG-CF10 @Chuanying", + "sub_path": "filament/Generic PETG-CF10 @Chuanying.json" }, { - "name": "Chuanying Generic PLA-CF10", - "sub_path": "filament/Chuanying Generic PLA-CF10.json" + "name": "Generic PLA-CF10 @Chuanying", + "sub_path": "filament/Generic PLA-CF10 @Chuanying.json" }, { - "name": "Chuanying Generic TPU", - "sub_path": "filament/Chuanying Generic TPU.json" + "name": "Generic TPU @Chuanying", + "sub_path": "filament/Generic TPU @Chuanying.json" } ], "machine_list": [ diff --git a/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json index f6df5c7924..8a2a02e2f6 100644 --- a/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Chuanying ABS @Chuanying X1 0.25 Nozzle", - "inherits": "Chuanying Generic ABS", + "inherits": "Generic ABS @Chuanying", "from": "system", "setting_id": "VkCgo0e4KR24DX28", "filament_id": "OFs1sNLz", diff --git a/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json index e7f023b4a2..018b418f50 100644 --- a/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Chuanying ASA @Chuanying X1 0.25 Nozzle", - "inherits": "Chuanying Generic ASA", + "inherits": "Generic ASA @Chuanying", "from": "system", "setting_id": "px1EPCDgOG8eE81V", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json index fb874cdb9f..2cf18e831f 100644 --- a/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle", - "inherits": "Chuanying Generic HS PLA", + "inherits": "Generic HS PLA @Chuanying", "from": "system", "setting_id": "CAdli5S8JIFafvRG", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json index a1ca25e1a7..e41bc4221b 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Chuanying PETG @Chuanying X1 0.25 Nozzle", - "inherits": "Chuanying Generic PETG", + "inherits": "Generic PETG @Chuanying", "from": "system", "setting_id": "9xxP8YWj4hnWQoVZ", "filament_id": "OFlXJxX1", diff --git a/resources/profiles/Chuanying/filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json index c8ba7cc5e6..7bdab64af6 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Chuanying PLA @Chuanying X1 0.25 Nozzle", - "inherits": "Chuanying Generic PLA", + "inherits": "Generic PLA @Chuanying", "from": "system", "setting_id": "3WDFe1uKTOTiRtPE", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json index 4e3a0391dc..d04fcc6f38 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle", - "inherits": "Chuanying Generic PLA-Silk", + "inherits": "Generic PLA-Silk @Chuanying", "from": "system", "setting_id": "kph5feBjhPi0oo0G", "instantiation": "true", diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic ABS.json b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying.json similarity index 85% rename from resources/profiles/Chuanying/filament/Chuanying Generic ABS.json rename to resources/profiles/Chuanying/filament/Generic ABS @Chuanying.json index c98af61d3d..570cd814df 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic ABS.json +++ b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic ABS", + "name": "Generic ABS @Chuanying", "inherits": "fdm_filament_abs", + "renamed_from": "Chuanying Generic ABS", "from": "system", - "setting_id": "XslWGeEo1Okicu28", - "filament_id": "OFZPlCck", + "setting_id": "iOgVkaYF0sixbb9x", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json b/resources/profiles/Chuanying/filament/Generic ASA @Chuanying.json similarity index 95% rename from resources/profiles/Chuanying/filament/Chuanying Generic ASA.json rename to resources/profiles/Chuanying/filament/Generic ASA @Chuanying.json index 6c3dd293d6..f5cc9c8419 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic ASA.json +++ b/resources/profiles/Chuanying/filament/Generic ASA @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic ASA", + "name": "Generic ASA @Chuanying", "inherits": "fdm_filament_asa", + "renamed_from": "Chuanying Generic ASA", "from": "system", - "setting_id": "wBBQiy8JV2LrnIav", - "filament_id": "OFBIadjM", + "setting_id": "39OBrSE3RugtTPPR", + "filament_id": "OFLPAxz3", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json b/resources/profiles/Chuanying/filament/Generic HIPS @Chuanying.json similarity index 94% rename from resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json rename to resources/profiles/Chuanying/filament/Generic HIPS @Chuanying.json index f0dcbdaf77..4d8edd7298 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic HIPS.json +++ b/resources/profiles/Chuanying/filament/Generic HIPS @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic HIPS", - "inherits": "Chuanying Generic ABS", + "name": "Generic HIPS @Chuanying", + "inherits": "Generic ABS @Chuanying", + "renamed_from": "Chuanying Generic HIPS", "from": "system", - "setting_id": "bBNozld07rP6mV3d", - "filament_id": "OFDeTsJw", + "setting_id": "TV3UktlnP0aTLsOZ", + "filament_id": "OFsFon5l", "instantiation": "true", "activate_air_filtration": [ "0" @@ -153,7 +154,7 @@ "nil" ], "filament_settings_id": [ - "Chuanying Generic HIPS" + "Generic HIPS @Chuanying" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json b/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying.json similarity index 96% rename from resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json rename to resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying.json index a5d4cab7eb..8b0529814e 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic HS PLA.json +++ b/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic HS PLA", + "name": "Generic HS PLA @Chuanying", "inherits": "fdm_filament_pla", + "renamed_from": "Chuanying Generic HS PLA", "from": "system", - "setting_id": "YZT1Uv73b8ArVoX3", - "filament_id": "OFdXgp2K", + "setting_id": "uw7SQpFnhFiO8i1N", + "filament_id": "OFvxghTE", "instantiation": "true", "bed_temperature_difference": [ "10" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PETG.json b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying.json similarity index 90% rename from resources/profiles/Chuanying/filament/Chuanying Generic PETG.json rename to resources/profiles/Chuanying/filament/Generic PETG @Chuanying.json index c4dad7d095..ae84fb2982 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PETG.json +++ b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic PETG", + "name": "Generic PETG @Chuanying", "inherits": "fdm_filament_pet", + "renamed_from": "Chuanying Generic PETG", "from": "system", - "setting_id": "judDupafROrSnVv8", - "filament_id": "OFfxFQf9", + "setting_id": "Mq3uwHDMub81SuRG", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json b/resources/profiles/Chuanying/filament/Generic PETG-CF10 @Chuanying.json similarity index 94% rename from resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json rename to resources/profiles/Chuanying/filament/Generic PETG-CF10 @Chuanying.json index 42865bb8af..85d42dad84 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PETG-CF10.json +++ b/resources/profiles/Chuanying/filament/Generic PETG-CF10 @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic PETG-CF10", + "name": "Generic PETG-CF10 @Chuanying", "inherits": "fdm_filament_pet", + "renamed_from": "Chuanying Generic PETG-CF10", "from": "system", - "setting_id": "S2vCGI7sqN8FwodT", - "filament_id": "OFXXUHSG", + "setting_id": "Pr70SnbXDjOF9EvU", + "filament_id": "OFO5djrM", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA.json b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying.json similarity index 87% rename from resources/profiles/Chuanying/filament/Chuanying Generic PLA.json rename to resources/profiles/Chuanying/filament/Generic PLA @Chuanying.json index bf0db17fb4..3fcf7cf873 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA.json +++ b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic PLA", + "name": "Generic PLA @Chuanying", "inherits": "fdm_filament_pla", + "renamed_from": "Chuanying Generic PLA", "from": "system", - "setting_id": "nnyBm7dlrz3OsVQz", - "filament_id": "OF5vzBhb", + "setting_id": "PRk8NAihEzwi5Dqd", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json b/resources/profiles/Chuanying/filament/Generic PLA-CF10 @Chuanying.json similarity index 96% rename from resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json rename to resources/profiles/Chuanying/filament/Generic PLA-CF10 @Chuanying.json index cf2993ee62..c76c4de977 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-CF10.json +++ b/resources/profiles/Chuanying/filament/Generic PLA-CF10 @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic PLA-CF10", + "name": "Generic PLA-CF10 @Chuanying", "inherits": "fdm_filament_pla", + "renamed_from": "Chuanying Generic PLA-CF10", "from": "system", - "setting_id": "EZA59VPwew1cpyUJ", - "filament_id": "OFFxZ7hZ", + "setting_id": "I4FjaXNkWl8Mr4ie", + "filament_id": "OFX2zcrM", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying.json similarity index 87% rename from resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json rename to resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying.json index 90409c864e..0739646658 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PLA-Silk.json +++ b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic PLA-Silk", + "name": "Generic PLA-Silk @Chuanying", "inherits": "fdm_filament_pla", + "renamed_from": "Chuanying Generic PLA-Silk", "from": "system", - "setting_id": "M9wzNVOPRQlayQH1", - "filament_id": "OFeK2vkS", + "setting_id": "tSCou6bWg8eY1TFn", + "filament_id": "OFi6PfUM", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json b/resources/profiles/Chuanying/filament/Generic PVA @Chuanying.json similarity index 94% rename from resources/profiles/Chuanying/filament/Chuanying Generic PVA.json rename to resources/profiles/Chuanying/filament/Generic PVA @Chuanying.json index 3e89ad7c6b..a38af95d65 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic PVA.json +++ b/resources/profiles/Chuanying/filament/Generic PVA @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic PVA", - "inherits": "Chuanying Generic PLA", + "name": "Generic PVA @Chuanying", + "inherits": "Generic PLA @Chuanying", + "renamed_from": "Chuanying Generic PVA", "from": "system", - "setting_id": "ePZFnkgBiyFuKvji", - "filament_id": "OFRusgEn", + "setting_id": "UTutnObeQqlZxe0B", + "filament_id": "OFDvXujf", "instantiation": "true", "activate_air_filtration": [ "0" @@ -153,7 +154,7 @@ "nil" ], "filament_settings_id": [ - "Chuanying Generic PVA" + "Generic PVA @Chuanying" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json b/resources/profiles/Chuanying/filament/Generic TPU @Chuanying.json similarity index 95% rename from resources/profiles/Chuanying/filament/Chuanying Generic TPU.json rename to resources/profiles/Chuanying/filament/Generic TPU @Chuanying.json index 719fbec4d8..9bea6c388d 100644 --- a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json +++ b/resources/profiles/Chuanying/filament/Generic TPU @Chuanying.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Chuanying Generic TPU", + "name": "Generic TPU @Chuanying", "inherits": "fdm_filament_tpu", + "renamed_from": "Chuanying Generic TPU", "from": "system", - "setting_id": "HYciEf4160uMYGnH", - "filament_id": "OFYlZMmy", + "setting_id": "gYsq1HqkgyfmVpvz", + "filament_id": "OFgbpcy9", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Chuanying/machine/Chuanying X1.json b/resources/profiles/Chuanying/machine/Chuanying X1.json index c3debcfa76..9e9c3f015d 100644 --- a/resources/profiles/Chuanying/machine/Chuanying X1.json +++ b/resources/profiles/Chuanying/machine/Chuanying X1.json @@ -8,5 +8,5 @@ "bed_model": "chuanying_x1_buildplate_model.STL", "bed_texture": "chuanying_x1_buildplate_texture.svg", "hotend_model": "chuanying_x1_hotend.STL", - "default_materials": "Chuanying Generic PETG;Chuanying Generic PLA" + "default_materials": "Generic PETG @Chuanying;Generic PLA @Chuanying" } diff --git a/resources/profiles/Chuanying/machine/fdm_chuanying_common.json b/resources/profiles/Chuanying/machine/fdm_chuanying_common.json index 7e6cf041bd..41d7339cf0 100644 --- a/resources/profiles/Chuanying/machine/fdm_chuanying_common.json +++ b/resources/profiles/Chuanying/machine/fdm_chuanying_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Chuanying Generic PLA" + "Generic PLA @Chuanying" ], "default_print_profile": "0.20mm Standard @Chuanying X1", "bed_exclude_area": [ diff --git a/resources/profiles/Chuanying/machine/fdm_klipper_common.json b/resources/profiles/Chuanying/machine/fdm_klipper_common.json index fc879d8977..16fb20b900 100644 --- a/resources/profiles/Chuanying/machine/fdm_klipper_common.json +++ b/resources/profiles/Chuanying/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Chuanying Generic ABS" + "Generic ABS @Chuanying" ], "default_print_profile": "0.20mm Standard @Chuanying X1", "bed_exclude_area": [ diff --git a/resources/profiles/Chuanying/machine/fdm_x1_common.json b/resources/profiles/Chuanying/machine/fdm_x1_common.json index 0d2b163b3b..a32177b1d2 100644 --- a/resources/profiles/Chuanying/machine/fdm_x1_common.json +++ b/resources/profiles/Chuanying/machine/fdm_x1_common.json @@ -93,7 +93,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Chuanying Generic PLA" + "Generic PLA @Chuanying" ], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-0.2 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", diff --git a/resources/profiles/Co Print.json b/resources/profiles/Co Print.json index 8e7d9ec990..e6f9fe967c 100644 --- a/resources/profiles/Co Print.json +++ b/resources/profiles/Co Print.json @@ -1,6 +1,6 @@ { "name": "Co Print", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "CoPrint configurations", "machine_model_list": [ @@ -37,20 +37,20 @@ "sub_path": "filament/fdm_filament_pla.json" }, { - "name": "CoPrint Generic PLA", - "sub_path": "filament/CoPrint Generic PLA.json" + "name": "Generic PLA @CoPrint", + "sub_path": "filament/Generic PLA @CoPrint.json" }, { - "name": "CoPrint Generic ABS", - "sub_path": "filament/CoPrint Generic ABS.json" + "name": "Generic ABS @CoPrint", + "sub_path": "filament/Generic ABS @CoPrint.json" }, { - "name": "CoPrint Generic PETG", - "sub_path": "filament/CoPrint Generic PETG.json" + "name": "Generic PETG @CoPrint", + "sub_path": "filament/Generic PETG @CoPrint.json" }, { - "name": "CoPrint Generic TPU", - "sub_path": "filament/CoPrint Generic TPU.json" + "name": "Generic TPU @CoPrint", + "sub_path": "filament/Generic TPU @CoPrint.json" } ], "machine_list": [ diff --git a/resources/profiles/Co Print/filament/CoPrint Generic ABS.json b/resources/profiles/Co Print/filament/Generic ABS @CoPrint.json similarity index 86% rename from resources/profiles/Co Print/filament/CoPrint Generic ABS.json rename to resources/profiles/Co Print/filament/Generic ABS @CoPrint.json index 9b8e5c7995..f047afc265 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic ABS.json +++ b/resources/profiles/Co Print/filament/Generic ABS @CoPrint.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoPrint Generic ABS", - "inherits": "CoPrint Generic PLA", + "name": "Generic ABS @CoPrint", + "inherits": "Generic PLA @CoPrint", + "renamed_from": "CoPrint Generic ABS", "from": "system", - "setting_id": "xW2rHuxT9o7MG8qB", - "filament_id": "OFU6fjbi", + "setting_id": "T6mJwfI7n1YDmDzv", + "filament_id": "OFY9muEs", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic PETG.json b/resources/profiles/Co Print/filament/Generic PETG @CoPrint.json similarity index 79% rename from resources/profiles/Co Print/filament/CoPrint Generic PETG.json rename to resources/profiles/Co Print/filament/Generic PETG @CoPrint.json index 51dcfb2fff..dd2d03af04 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic PETG.json +++ b/resources/profiles/Co Print/filament/Generic PETG @CoPrint.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoPrint Generic PETG", - "inherits": "CoPrint Generic PLA", + "name": "Generic PETG @CoPrint", + "inherits": "Generic PLA @CoPrint", + "renamed_from": "CoPrint Generic PETG", "from": "system", - "setting_id": "k4m484S1samBGEVb", - "filament_id": "OFXuwtnq", + "setting_id": "99zIrGIXC9RUGDlM", + "filament_id": "OFYPdQJh", "instantiation": "true", "fan_max_speed": [ "90" diff --git a/resources/profiles/Co Print/filament/CoPrint Generic PLA.json b/resources/profiles/Co Print/filament/Generic PLA @CoPrint.json similarity index 68% rename from resources/profiles/Co Print/filament/CoPrint Generic PLA.json rename to resources/profiles/Co Print/filament/Generic PLA @CoPrint.json index 265f8ba442..2a8510b3ab 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic PLA.json +++ b/resources/profiles/Co Print/filament/Generic PLA @CoPrint.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "CoPrint Generic PLA", + "name": "Generic PLA @CoPrint", "inherits": "fdm_filament_pla", + "renamed_from": "CoPrint Generic PLA", "from": "system", - "setting_id": "Hv40GsmNozxOJ38T", - "filament_id": "OF6KELDx", + "setting_id": "9tNsM3FhIDgKJ05R", + "filament_id": "OFDSrzZ8", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_load_time": [ "9.75" ], diff --git a/resources/profiles/Co Print/filament/CoPrint Generic TPU.json b/resources/profiles/Co Print/filament/Generic TPU @CoPrint.json similarity index 81% rename from resources/profiles/Co Print/filament/CoPrint Generic TPU.json rename to resources/profiles/Co Print/filament/Generic TPU @CoPrint.json index fc2fc69008..c25896fe55 100644 --- a/resources/profiles/Co Print/filament/CoPrint Generic TPU.json +++ b/resources/profiles/Co Print/filament/Generic TPU @CoPrint.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoPrint Generic TPU", - "inherits": "CoPrint Generic PLA", + "name": "Generic TPU @CoPrint", + "inherits": "Generic PLA @CoPrint", + "renamed_from": "CoPrint Generic TPU", "from": "system", - "setting_id": "2mWqeih012I5D2CK", - "filament_id": "OF7g2vYQ", + "setting_id": "0V6UoaCfNUIwYwah", + "filament_id": "OFgbpcy9", "instantiation": "true", "fan_max_speed": [ "80" 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 355ba1eca8..f032c9bf6e 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 @@ -108,7 +108,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "CoPrint Generic PLA" + "Generic PLA @CoPrint" ], "extruder_clearance_radius": [ "65" 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 52fa36bc5d..a36e231d94 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 @@ -108,7 +108,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "CoPrint Generic PLA" + "Generic PLA @CoPrint" ], "extruder_clearance_radius": [ "65" 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 57f2e507c4..2d206c1734 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 @@ -108,7 +108,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "CoPrint Generic PLA" + "Generic PLA @CoPrint" ], "extruder_clearance_radius": [ "65" 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 efa52a34f4..72116fcd70 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 @@ -108,7 +108,7 @@ "machine_end_gcode": "end_print", "change_filament_gcode": "FILAMENT_CHANGE LAYER_NUM=[layer_num] NEXT_EXTRUDER=[next_extruder]", "default_filament_profile": [ - "CoPrint Generic PLA" + "Generic PLA @CoPrint" ], "extruder_clearance_radius": [ "65" diff --git a/resources/profiles/Co Print/machine/Co Print ChromaSet.json b/resources/profiles/Co Print/machine/Co Print ChromaSet.json index 883ee91c93..5ce0287757 100644 --- a/resources/profiles/Co Print/machine/Co Print ChromaSet.json +++ b/resources/profiles/Co Print/machine/Co Print ChromaSet.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "Co_Print_ChromaSet_buildplate_texture.svg", "hotend_model": "", - "default_materials": "CoPrint Generic PLA" + "default_materials": "Generic PLA @CoPrint" } diff --git a/resources/profiles/Co Print/machine/fdm_coprint_common.json b/resources/profiles/Co Print/machine/fdm_coprint_common.json index f7911c2a94..ecb6bd1ac2 100644 --- a/resources/profiles/Co Print/machine/fdm_coprint_common.json +++ b/resources/profiles/Co Print/machine/fdm_coprint_common.json @@ -100,7 +100,7 @@ "machine_start_gcode": "start_print EXTRUDER=[initial_extruder] EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", "machine_end_gcode": "end_print", "default_filament_profile": [ - "CoPrint Generic PLA" + "Generic PLA @CoPrint" ], "extruder_clearance_radius": [ "65" diff --git a/resources/profiles/CoLiDo.json b/resources/profiles/CoLiDo.json index 972ffd396b..d0c395b348 100644 --- a/resources/profiles/CoLiDo.json +++ b/resources/profiles/CoLiDo.json @@ -1,6 +1,6 @@ { "name": "CoLiDo", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "CoLiDo configurations", "machine_model_list": [ @@ -189,32 +189,32 @@ "sub_path": "filament/CoLiDo ABS @CoLiDo SR1.json" }, { - "name": "CoLiDo Generic ABS @CoLiDo DIY 4.0", - "sub_path": "filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json" + "name": "Generic ABS @CoLiDo DIY 4.0", + "sub_path": "filament/Generic ABS @CoLiDo DIY 4.0.json" }, { - "name": "CoLiDo Generic ABS @CoLiDo X16", - "sub_path": "filament/CoLiDo Generic ABS @CoLiDo X16.json" + "name": "Generic ABS @CoLiDo X16", + "sub_path": "filament/Generic ABS @CoLiDo X16.json" }, { - "name": "CoLiDo Generic PETG @CoLiDo DIY 4.0", - "sub_path": "filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json" + "name": "Generic PETG @CoLiDo DIY 4.0", + "sub_path": "filament/Generic PETG @CoLiDo DIY 4.0.json" }, { - "name": "CoLiDo Generic PETG @CoLiDo X16", - "sub_path": "filament/CoLiDo Generic PETG @CoLiDo X16.json" + "name": "Generic PETG @CoLiDo X16", + "sub_path": "filament/Generic PETG @CoLiDo X16.json" }, { "name": "CoLiDo PETG @CoLiDo SR1", "sub_path": "filament/CoLiDo PETG @CoLiDo SR1.json" }, { - "name": "CoLiDo Generic PLA @CoLiDo DIY 4.0", - "sub_path": "filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json" + "name": "Generic PLA @CoLiDo DIY 4.0", + "sub_path": "filament/Generic PLA @CoLiDo DIY 4.0.json" }, { - "name": "CoLiDo Generic PLA @CoLiDo X16", - "sub_path": "filament/CoLiDo Generic PLA @CoLiDo X16.json" + "name": "Generic PLA @CoLiDo X16", + "sub_path": "filament/Generic PLA @CoLiDo X16.json" }, { "name": "CoLiDo PLA @CoLiDo SR1", @@ -229,12 +229,12 @@ "sub_path": "filament/CoLiDo PLA+ @CoLiDo DIY 4.0 V2.json" }, { - "name": "CoLiDo Generic TPU @CoLiDo DIY 4.0", - "sub_path": "filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json" + "name": "Generic TPU @CoLiDo DIY 4.0", + "sub_path": "filament/Generic TPU @CoLiDo DIY 4.0.json" }, { - "name": "CoLiDo Generic TPU @CoLiDo X16", - "sub_path": "filament/CoLiDo Generic TPU @CoLiDo X16.json" + "name": "Generic TPU @CoLiDo X16", + "sub_path": "filament/Generic TPU @CoLiDo X16.json" } ], "machine_list": [ diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo DIY 4.0.json similarity index 73% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json rename to resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo DIY 4.0.json index 84469a0d15..acb6033883 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo DIY 4.0.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic ABS @CoLiDo DIY 4.0", + "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", "from": "system", - "setting_id": "acWqrAFyi2SIkNwa", - "filament_id": "OFWIr7ZE", + "setting_id": "XLTLGUPGcCZnX5XA", + "filament_id": "OFY9muEs", "instantiation": "true", "fan_max_speed": [ "80" @@ -16,7 +17,7 @@ "16" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "hot_plate_temp": [ "100" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo X16.json similarity index 75% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo X16.json rename to resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo X16.json index 3ee0390bfd..aa567b7ba8 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic ABS @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic ABS @CoLiDo X16.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic ABS @CoLiDo X16", + "name": "Generic ABS @CoLiDo X16", "inherits": "fdm_filament_abs", + "renamed_from": "CoLiDo Generic ABS @CoLiDo X16;CoLiDo Generic ABS CoLiDo X16", "from": "system", - "setting_id": "l44ioMidpUECbGYF", - "filament_id": "OFWIr7ZE", + "setting_id": "LE7jeYUNsBZEKQpJ", + "filament_id": "OFY9muEs", "instantiation": "true", "fan_max_speed": [ "20" @@ -16,7 +17,7 @@ "16" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "hot_plate_temp": [ "95" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo DIY 4.0.json similarity index 84% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json rename to resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo DIY 4.0.json index 1a3839374a..d70dd4d511 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo DIY 4.0.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic PETG @CoLiDo DIY 4.0", + "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", "from": "system", - "setting_id": "IBtIS8bwcIWhiCow", - "filament_id": "OF3wxlw9", + "setting_id": "FV2MjDSWlg3kolp3", + "filament_id": "OFYPdQJh", "instantiation": "true", "cool_plate_temp": [ "0" @@ -40,7 +41,7 @@ "; filament start gcode\n" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo X16.json similarity index 85% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo X16.json rename to resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo X16.json index 7b532e7dfa..5f68b5600b 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PETG @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic PETG @CoLiDo X16.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic PETG @CoLiDo X16", + "name": "Generic PETG @CoLiDo X16", "inherits": "fdm_filament_pet", + "renamed_from": "CoLiDo Generic PETG @CoLiDo X16;CoLiDo Generic PETG CoLiDo X16", "from": "system", - "setting_id": "AovAvrEzGiZqFRpc", - "filament_id": "OF3wxlw9", + "setting_id": "eX4i0rDwO3rAlQ2y", + "filament_id": "OFYPdQJh", "instantiation": "true", "cool_plate_temp": [ "0" @@ -40,7 +41,7 @@ "; filament start gcode\n" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo DIY 4.0.json similarity index 77% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json rename to resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo DIY 4.0.json index bb5c3d8dc7..9bd8db3357 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo DIY 4.0.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic PLA @CoLiDo DIY 4.0", + "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", "from": "system", - "setting_id": "foEeUk6PK78QXleQ", - "filament_id": "OFeDfaCh", + "setting_id": "POF6nKughZF8OsBF", + "filament_id": "OFDSrzZ8", "instantiation": "true", "fan_cooling_layer_time": [ "80" @@ -22,7 +23,7 @@ "19.5" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "hot_plate_temp": [ "60" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo X16.json similarity index 78% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo X16.json rename to resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo X16.json index d0e36e8146..f437702111 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic PLA @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic PLA @CoLiDo X16.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic PLA @CoLiDo X16", + "name": "Generic PLA @CoLiDo X16", "inherits": "fdm_filament_pla", + "renamed_from": "CoLiDo Generic PLA @CoLiDo X16;CoLiDo Generic PLA CoLiDo X16", "from": "system", - "setting_id": "HY8RFWOKRptC2YVt", - "filament_id": "OFeDfaCh", + "setting_id": "38SFNLJEVBeAVL3B", + "filament_id": "OFDSrzZ8", "instantiation": "true", "fan_cooling_layer_time": [ "80" @@ -22,7 +23,7 @@ "12" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "hot_plate_temp": [ "60" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo DIY 4.0.json similarity index 74% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json rename to resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo DIY 4.0.json index e4fd40ea60..0422f6b4c6 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo DIY 4.0.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic TPU @CoLiDo DIY 4.0", + "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", "from": "system", - "setting_id": "ZgbaHhRSK8AW38MB", - "filament_id": "OFdlGycb", + "setting_id": "5tJNn6c6RXqJUT2z", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_density": [ "1.22" @@ -16,7 +17,7 @@ "; filament start gcode\n" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "hot_plate_temp": [ "45" diff --git a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo X16.json b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo X16.json similarity index 76% rename from resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo X16.json rename to resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo X16.json index 9fb7c570e9..ccf0d405b1 100644 --- a/resources/profiles/CoLiDo/filament/CoLiDo Generic TPU @CoLiDo X16.json +++ b/resources/profiles/CoLiDo/filament/Generic TPU @CoLiDo X16.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "CoLiDo Generic TPU @CoLiDo X16", + "name": "Generic TPU @CoLiDo X16", "inherits": "fdm_filament_tpu", + "renamed_from": "CoLiDo Generic TPU @CoLiDo X16;CoLiDo Generic TPU CoLiDo X16", "from": "system", - "setting_id": "f6yTiUiYYLckJBTQ", - "filament_id": "OFdlGycb", + "setting_id": "wylEuYSIKlzSVnoQ", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_density": [ "1.22" @@ -16,7 +17,7 @@ "; filament start gcode\n" ], "filament_vendor": [ - "CoLiDo" + "Generic" ], "hot_plate_temp": [ "40" 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 65f2db78eb..8e9b4b34c5 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 @@ -23,7 +23,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "CoLiDo Generic PLA @CoLiDo X16" + "Generic PLA @CoLiDo X16" ], "default_print_profile": "0.20mm Standard @CoLiDo X16", "deretraction_speed": [ diff --git a/resources/profiles/CoLiDo/machine/CoLiDo 160 V2.json b/resources/profiles/CoLiDo/machine/CoLiDo 160 V2.json index 4c18236e07..6f6985d46e 100644 --- a/resources/profiles/CoLiDo/machine/CoLiDo 160 V2.json +++ b/resources/profiles/CoLiDo/machine/CoLiDo 160 V2.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "", "hotend_model": "", - "default_materials": "CoLiDo Generic PLA @CoLiDo X16;CoLiDo Generic ABS @CoLiDo X16;CoLiDo Generic PETG @CoLiDo X16;CoLiDo Generic TPU @CoLiDo X16" + "default_materials": "Generic PLA @CoLiDo X16;Generic ABS @CoLiDo X16;Generic PETG @CoLiDo X16;Generic TPU @CoLiDo X16" } diff --git a/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0 0.4 nozzle.json b/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0 0.4 nozzle.json index d0e1a2abc6..bbecec1d48 100644 --- a/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0 0.4 nozzle.json +++ b/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "CoLiDo Generic PLA @CoLiDo DIY 4.0" + "Generic PLA @CoLiDo DIY 4.0" ], "default_print_profile": "0.20mm Standard @CoLiDo DIY 4.0", "deretraction_speed": [ diff --git a/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0.json b/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0.json index f774672974..693937a8cb 100644 --- a/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0.json +++ b/resources/profiles/CoLiDo/machine/CoLiDo DIY 4.0.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "", "hotend_model": "", - "default_materials": "CoLiDo Generic PLA @CoLiDo DIY 4.0;CoLiDo Generic ABS @CoLiDo DIY 4.0;CoLiDo Generic PETG @CoLiDo DIY 4.0;CoLiDo Generic TPU @CoLiDo DIY 4.0" + "default_materials": "Generic PLA @CoLiDo DIY 4.0;Generic ABS @CoLiDo DIY 4.0;Generic PETG @CoLiDo DIY 4.0;Generic TPU @CoLiDo DIY 4.0" } 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 cfdfd38571..228580eece 100644 --- a/resources/profiles/CoLiDo/machine/CoLiDo X16 0.4 nozzle.json +++ b/resources/profiles/CoLiDo/machine/CoLiDo X16 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "CoLiDo Generic PLA @CoLiDo X16" + "Generic PLA @CoLiDo X16" ], "default_print_profile": "0.20mm Standard @CoLiDo X16", "deretraction_speed": [ diff --git a/resources/profiles/CoLiDo/machine/CoLiDo X16.json b/resources/profiles/CoLiDo/machine/CoLiDo X16.json index e95b6ea56b..e1633e083f 100644 --- a/resources/profiles/CoLiDo/machine/CoLiDo X16.json +++ b/resources/profiles/CoLiDo/machine/CoLiDo X16.json @@ -8,5 +8,5 @@ "bed_model": "", "bed_texture": "", "hotend_model": "", - "default_materials": "CoLiDo Generic PLA @CoLiDo X16;CoLiDo Generic ABS @CoLiDo X16;CoLiDo Generic PETG @CoLiDo X16;CoLiDo Generic TPU @CoLiDo X16" + "default_materials": "Generic PLA @CoLiDo X16;Generic ABS @CoLiDo X16;Generic PETG @CoLiDo X16;Generic TPU @CoLiDo X16" } diff --git a/resources/profiles/Comgrow.json b/resources/profiles/Comgrow.json index da7d0e29f6..107ef2b3ba 100644 --- a/resources/profiles/Comgrow.json +++ b/resources/profiles/Comgrow.json @@ -1,6 +1,6 @@ { "name": "Comgrow", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Comgrow configurations", "machine_model_list": [ @@ -105,16 +105,16 @@ "sub_path": "filament/fdm_filament_pla.json" }, { - "name": "Comgrow Generic ABS", - "sub_path": "filament/Comgrow Generic ABS.json" + "name": "Generic ABS @Comgrow", + "sub_path": "filament/Generic ABS @Comgrow.json" }, { - "name": "Comgrow Generic PETG", - "sub_path": "filament/Comgrow Generic PETG.json" + "name": "Generic PETG @Comgrow", + "sub_path": "filament/Generic PETG @Comgrow.json" }, { - "name": "Comgrow Generic PLA", - "sub_path": "filament/Comgrow Generic PLA.json" + "name": "Generic PLA @Comgrow", + "sub_path": "filament/Generic PLA @Comgrow.json" }, { "name": "Comgrow T300 PLA", diff --git a/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json b/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json index a88573aa26..965e2985ee 100644 --- a/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json +++ b/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Comgrow T300 PLA", - "inherits": "Comgrow Generic PLA", + "inherits": "Generic PLA @Comgrow", "from": "system", "setting_id": "TnHaf2TSHVfuwbVg", "filament_id": "OFNWcJsM", diff --git a/resources/profiles/Comgrow/filament/Comgrow Generic ABS.json b/resources/profiles/Comgrow/filament/Generic ABS @Comgrow.json similarity index 72% rename from resources/profiles/Comgrow/filament/Comgrow Generic ABS.json rename to resources/profiles/Comgrow/filament/Generic ABS @Comgrow.json index 6a1ff9248e..0494418d88 100644 --- a/resources/profiles/Comgrow/filament/Comgrow Generic ABS.json +++ b/resources/profiles/Comgrow/filament/Generic ABS @Comgrow.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Comgrow Generic ABS", + "name": "Generic ABS @Comgrow", "inherits": "fdm_filament_abs", + "renamed_from": "Comgrow Generic ABS", "from": "system", - "setting_id": "7xmGiJHgiD5KKTXt", - "filament_id": "OFsoQ12i", + "setting_id": "jprGDn9oZEZu4N97", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json b/resources/profiles/Comgrow/filament/Generic PETG @Comgrow.json similarity index 85% rename from resources/profiles/Comgrow/filament/Comgrow Generic PETG.json rename to resources/profiles/Comgrow/filament/Generic PETG @Comgrow.json index 44dad83ceb..12b29d0b1d 100644 --- a/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json +++ b/resources/profiles/Comgrow/filament/Generic PETG @Comgrow.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Comgrow Generic PETG", + "name": "Generic PETG @Comgrow", "inherits": "fdm_filament_pet", + "renamed_from": "Comgrow Generic PETG", "from": "system", - "setting_id": "FJjkU2RhAZD10Cw8", - "filament_id": "OF6Fpw1E", + "setting_id": "xi0S7KdXD7lwr3H8", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Comgrow/filament/Comgrow Generic PLA.json b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow.json similarity index 73% rename from resources/profiles/Comgrow/filament/Comgrow Generic PLA.json rename to resources/profiles/Comgrow/filament/Generic PLA @Comgrow.json index 4674b2b60a..21b8e19d42 100644 --- a/resources/profiles/Comgrow/filament/Comgrow Generic PLA.json +++ b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Comgrow Generic PLA", + "name": "Generic PLA @Comgrow", "inherits": "fdm_filament_pla", + "renamed_from": "Comgrow Generic PLA", "from": "system", - "setting_id": "sGAn6RP69saYSqcY", - "filament_id": "OFVKADz5", + "setting_id": "oxIMSlkJ8C40mJIv", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Comgrow/machine/Comgrow T500.json b/resources/profiles/Comgrow/machine/Comgrow T500.json index e7945de67a..6714a5a4b0 100644 --- a/resources/profiles/Comgrow/machine/Comgrow T500.json +++ b/resources/profiles/Comgrow/machine/Comgrow T500.json @@ -8,5 +8,5 @@ "bed_model": "comgrow_t500_buildplate_model.stl", "bed_texture": "comgrow_t500_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Comgrow Generic PLA;Comgrow Generic PETG;Comgrow Generic ABS" + "default_materials": "Generic PLA @Comgrow;Generic PETG @Comgrow;Generic ABS @Comgrow" } diff --git a/resources/profiles/Comgrow/machine/fdm_comgrow_common.json b/resources/profiles/Comgrow/machine/fdm_comgrow_common.json index b256b09306..ef8ce3ba93 100644 --- a/resources/profiles/Comgrow/machine/fdm_comgrow_common.json +++ b/resources/profiles/Comgrow/machine/fdm_comgrow_common.json @@ -131,7 +131,7 @@ "thumbnails_format": "PNG", "nozzle_type": "hardened_steel", "default_filament_profile": [ - "Comgrow Generic PETG" + "Generic PETG @Comgrow" ], "default_print_profile": "0.20mm Standard @Comgrow T500", "bed_exclude_area": [ diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index 077ee827e5..29399dcade 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "02.03.02.76", + "version": "02.03.02.77", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ @@ -1633,28 +1633,28 @@ "sub_path": "filament/fdm_filament_common.json" }, { - "name": "Creality Generic ABS @Ender-5Max-all", - "sub_path": "filament/Creality Generic ABS @Ender-5Max-all.json" + "name": "Generic ABS @Creality Ender-5Max-all", + "sub_path": "filament/Generic ABS @Creality Ender-5Max-all.json" }, { - "name": "Creality Generic ASA @Ender-5Max-all", - "sub_path": "filament/Creality Generic ASA @Ender-5Max-all.json" + "name": "Generic ASA @Creality Ender-5Max-all", + "sub_path": "filament/Generic ASA @Creality Ender-5Max-all.json" }, { - "name": "Creality Generic PA @Ender-5Max-all", - "sub_path": "filament/Creality Generic PA @Ender-5Max-all.json" + "name": "Generic PA @Creality Ender-5Max-all", + "sub_path": "filament/Generic PA @Creality Ender-5Max-all.json" }, { - "name": "Creality Generic PETG @Ender-5Max-all", - "sub_path": "filament/Creality Generic PETG @Ender-5Max-all.json" + "name": "Generic PETG @Creality Ender-5Max-all", + "sub_path": "filament/Generic PETG @Creality Ender-5Max-all.json" }, { - "name": "Creality Generic PLA @Ender-5Max-all", - "sub_path": "filament/Creality Generic PLA @Ender-5Max-all.json" + "name": "Generic PLA @Creality Ender-5Max-all", + "sub_path": "filament/Generic PLA @Creality Ender-5Max-all.json" }, { - "name": "Creality Generic TPU @Ender-5Max-all", - "sub_path": "filament/Creality Generic TPU @Ender-5Max-all.json" + "name": "Generic TPU @Creality Ender-5Max-all", + "sub_path": "filament/Generic TPU @Creality Ender-5Max-all.json" }, { "name": "Creality Hyper ABS @Ender-5Max-all", @@ -1701,212 +1701,212 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Creality Generic ABS", - "sub_path": "filament/Creality Generic ABS.json" + "name": "Generic ABS @Creality", + "sub_path": "filament/Generic ABS @Creality.json" }, { - "name": "Creality Generic ASA", - "sub_path": "filament/Creality Generic ASA.json" + "name": "Generic ASA @Creality", + "sub_path": "filament/Generic ASA @Creality.json" }, { - "name": "Creality Generic PA-CF", - "sub_path": "filament/Creality Generic PA-CF.json" + "name": "Generic PA-CF @Creality", + "sub_path": "filament/Generic PA-CF @Creality.json" }, { - "name": "Creality Generic PC", - "sub_path": "filament/Creality Generic PC.json" + "name": "Generic PC @Creality", + "sub_path": "filament/Generic PC @Creality.json" }, { - "name": "Creality Generic PETG", - "sub_path": "filament/Creality Generic PETG.json" + "name": "Generic PETG @Creality", + "sub_path": "filament/Generic PETG @Creality.json" }, { - "name": "Creality Generic PLA", - "sub_path": "filament/Creality Generic PLA.json" + "name": "Generic PLA @Creality", + "sub_path": "filament/Generic PLA @Creality.json" }, { - "name": "Creality Generic PLA-CF", - "sub_path": "filament/Creality Generic PLA-CF.json" + "name": "Generic PLA-CF @Creality", + "sub_path": "filament/Generic PLA-CF @Creality.json" }, { - "name": "Creality HF Generic PLA", - "sub_path": "filament/Creality HF Generic PLA.json" + "name": "Generic PLA HF @Creality", + "sub_path": "filament/Generic PLA HF @Creality.json" }, { - "name": "Creality HF Generic Speed PLA", - "sub_path": "filament/Creality HF Generic Speed PLA.json" + "name": "Generic Speed PLA @Creality HF", + "sub_path": "filament/Generic Speed PLA @Creality HF.json" }, { - "name": "Creality Generic TPU", - "sub_path": "filament/Creality Generic TPU.json" + "name": "Generic TPU @Creality", + "sub_path": "filament/Generic TPU @Creality.json" }, { - "name": "Creality Generic ABS @Ender-3V3-all", - "sub_path": "filament/Creality Generic ABS @Ender-3V3-all.json" + "name": "Generic ABS @Creality Ender-3V3-all", + "sub_path": "filament/Generic ABS @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic ABS @Hi-all", - "sub_path": "filament/Creality Generic ABS @Hi-all.json" + "name": "Generic ABS @Creality Hi-all", + "sub_path": "filament/Generic ABS @Creality Hi-all.json" }, { - "name": "Creality Generic ABS @K1-all", - "sub_path": "filament/Creality Generic ABS @K1-all.json" + "name": "Generic ABS @Creality K1-all", + "sub_path": "filament/Generic ABS @Creality K1-all.json" }, { - "name": "Creality Generic ABS @K2-all", - "sub_path": "filament/Creality Generic ABS @K2-all.json" + "name": "Generic ABS @Creality K2-all", + "sub_path": "filament/Generic ABS @Creality K2-all.json" }, { - "name": "Creality Generic ASA @Ender-3V3-all", - "sub_path": "filament/Creality Generic ASA @Ender-3V3-all.json" + "name": "Generic ASA @Creality Ender-3V3-all", + "sub_path": "filament/Generic ASA @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic ASA @Hi-all", - "sub_path": "filament/Creality Generic ASA @Hi-all.json" + "name": "Generic ASA @Creality Hi-all", + "sub_path": "filament/Generic ASA @Creality Hi-all.json" }, { - "name": "Creality Generic ASA @K1-all", - "sub_path": "filament/Creality Generic ASA @K1-all.json" + "name": "Generic ASA @Creality K1-all", + "sub_path": "filament/Generic ASA @Creality K1-all.json" }, { - "name": "Creality Generic ASA @K2-all", - "sub_path": "filament/Creality Generic ASA @K2-all.json" + "name": "Generic ASA @Creality K2-all", + "sub_path": "filament/Generic ASA @Creality K2-all.json" }, { - "name": "Creality Generic PA-CF @Ender-3V3-all", - "sub_path": "filament/Creality Generic PA-CF @Ender-3V3-all.json" + "name": "Generic PA-CF @Creality Ender-3V3-all", + "sub_path": "filament/Generic PA-CF @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic PA-CF @K1-all", - "sub_path": "filament/Creality Generic PA-CF @K1-all.json" + "name": "Generic PA-CF @Creality K1-all", + "sub_path": "filament/Generic PA-CF @Creality K1-all.json" }, { - "name": "Creality Generic PA-CF @K2-all", - "sub_path": "filament/Creality Generic PA-CF @K2-all.json" + "name": "Generic PA-CF @Creality K2-all", + "sub_path": "filament/Generic PA-CF @Creality K2-all.json" }, { - "name": "Creality Generic PC @K1-all", - "sub_path": "filament/Creality Generic PC @K1-all.json" + "name": "Generic PC @Creality K1-all", + "sub_path": "filament/Generic PC @Creality K1-all.json" }, { - "name": "Creality Generic PETG @Ender-3V3-all", - "sub_path": "filament/Creality Generic PETG @Ender-3V3-all.json" + "name": "Generic PETG @Creality Ender-3V3-all", + "sub_path": "filament/Generic PETG @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic PETG @Hi-all", - "sub_path": "filament/Creality Generic PETG @Hi-all.json" + "name": "Generic PETG @Creality Hi-all", + "sub_path": "filament/Generic PETG @Creality Hi-all.json" }, { - "name": "Creality Generic PETG @K1-all", - "sub_path": "filament/Creality Generic PETG @K1-all.json" + "name": "Generic PETG @Creality K1-all", + "sub_path": "filament/Generic PETG @Creality K1-all.json" }, { - "name": "Creality Generic PETG @K2-all", - "sub_path": "filament/Creality Generic PETG @K2-all.json" + "name": "Generic PETG @Creality K2-all", + "sub_path": "filament/Generic PETG @Creality K2-all.json" }, { - "name": "Creality Generic PLA @Ender-3V3-all", - "sub_path": "filament/Creality Generic PLA @Ender-3V3-all.json" + "name": "Generic PLA @Creality Ender-3V3-all", + "sub_path": "filament/Generic PLA @Creality Ender-3V3-all.json" }, { "name": "Creality Generic PLA @Hi-all", "sub_path": "filament/Creality Generic PLA @Hi-all.json" }, { - "name": "Creality Generic PLA @K1-all", - "sub_path": "filament/Creality Generic PLA @K1-all.json" + "name": "Generic PLA @Creality K1-all", + "sub_path": "filament/Generic PLA @Creality K1-all.json" }, { - "name": "Creality Generic PLA @K2-all", - "sub_path": "filament/Creality Generic PLA @K2-all.json" + "name": "Generic PLA @Creality K2-all", + "sub_path": "filament/Generic PLA @Creality K2-all.json" }, { - "name": "Creality Generic PLA-CF @Hi-all", - "sub_path": "filament/Creality Generic PLA-CF @Hi-all.json" + "name": "Generic PLA-CF @Creality Hi-all", + "sub_path": "filament/Generic PLA-CF @Creality Hi-all.json" }, { - "name": "Creality Generic PLA-CF @K1-all", - "sub_path": "filament/Creality Generic PLA-CF @K1-all.json" + "name": "Generic PLA-CF @Creality K1-all", + "sub_path": "filament/Generic PLA-CF @Creality K1-all.json" }, { - "name": "Creality Generic PLA-CF @K2-all", - "sub_path": "filament/Creality Generic PLA-CF @K2-all.json" + "name": "Generic PLA-CF @Creality K2-all", + "sub_path": "filament/Generic PLA-CF @Creality K2-all.json" }, { - "name": "Creality Generic TPU @Ender-3V3-all", - "sub_path": "filament/Creality Generic TPU @Ender-3V3-all.json" + "name": "Generic TPU @Creality Ender-3V3-all", + "sub_path": "filament/Generic TPU @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic TPU @Hi-all", - "sub_path": "filament/Creality Generic TPU @Hi-all.json" + "name": "Generic TPU @Creality Hi-all", + "sub_path": "filament/Generic TPU @Creality Hi-all.json" }, { - "name": "Creality Generic TPU @K1-all", - "sub_path": "filament/Creality Generic TPU @K1-all.json" + "name": "Generic TPU @Creality K1-all", + "sub_path": "filament/Generic TPU @Creality K1-all.json" }, { - "name": "Creality Generic TPU @K2-all", - "sub_path": "filament/Creality Generic TPU @K2-all.json" + "name": "Generic TPU @Creality K2-all", + "sub_path": "filament/Generic TPU @Creality K2-all.json" }, { - "name": "Creality Generic ASA-CF @Hi-all", - "sub_path": "filament/Creality Generic ASA-CF @Hi-all.json" + "name": "Generic ASA-CF @Creality Hi-all", + "sub_path": "filament/Generic ASA-CF @Creality Hi-all.json" }, { - "name": "Creality Generic PETG-CF @Hi-all", - "sub_path": "filament/Creality Generic PETG-CF @Hi-all.json" + "name": "Generic PETG-CF @Creality Hi-all", + "sub_path": "filament/Generic PETG-CF @Creality Hi-all.json" }, { - "name": "Creality Generic PLA High Speed @Ender-3V3-all", - "sub_path": "filament/Creality Generic PLA High Speed @Ender-3V3-all.json" + "name": "Generic PLA High Speed @Creality Ender-3V3-all", + "sub_path": "filament/Generic PLA High Speed @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic PLA Matte @Ender-3V3-all", - "sub_path": "filament/Creality Generic PLA Matte @Ender-3V3-all.json" + "name": "Generic PLA Matte @Creality Ender-3V3-all", + "sub_path": "filament/Generic PLA Matte @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic PLA Silk @Ender-3V3-all", - "sub_path": "filament/Creality Generic PLA Silk @Ender-3V3-all.json" + "name": "Generic PLA Silk @Creality Ender-3V3-all", + "sub_path": "filament/Generic PLA Silk @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic PLA High Speed @Hi-all", - "sub_path": "filament/Creality Generic PLA High Speed @Hi-all.json" + "name": "Generic PLA High Speed @Creality Hi-all", + "sub_path": "filament/Generic PLA High Speed @Creality Hi-all.json" }, { - "name": "Creality Generic PLA Matte @Hi-all", - "sub_path": "filament/Creality Generic PLA Matte @Hi-all.json" + "name": "Generic PLA Matte @Creality Hi-all", + "sub_path": "filament/Generic PLA Matte @Creality Hi-all.json" }, { - "name": "Creality Generic PLA Silk @Hi-all", - "sub_path": "filament/Creality Generic PLA Silk @Hi-all.json" + "name": "Generic PLA Silk @Creality Hi-all", + "sub_path": "filament/Generic PLA Silk @Creality Hi-all.json" }, { - "name": "Creality Generic PLA Wood @Hi-all", - "sub_path": "filament/Creality Generic PLA Wood @Hi-all.json" + "name": "Generic PLA Wood @Creality Hi-all", + "sub_path": "filament/Generic PLA Wood @Creality Hi-all.json" }, { - "name": "Creality Generic PLA High Speed @K1-all", - "sub_path": "filament/Creality Generic PLA High Speed @K1-all.json" + "name": "Generic PLA High Speed @Creality K1-all", + "sub_path": "filament/Generic PLA High Speed @Creality K1-all.json" }, { - "name": "Creality Generic PLA Matte @K1-all", - "sub_path": "filament/Creality Generic PLA Matte @K1-all.json" + "name": "Generic PLA Matte @Creality K1-all", + "sub_path": "filament/Generic PLA Matte @Creality K1-all.json" }, { - "name": "Creality Generic PLA Silk @K1-all", - "sub_path": "filament/Creality Generic PLA Silk @K1-all.json" + "name": "Generic PLA Silk @Creality K1-all", + "sub_path": "filament/Generic PLA Silk @Creality K1-all.json" }, { - "name": "Creality Generic PLA High Speed @K2-all", - "sub_path": "filament/Creality Generic PLA High Speed @K2-all.json" + "name": "Generic PLA High Speed @Creality K2-all", + "sub_path": "filament/Generic PLA High Speed @Creality K2-all.json" }, { - "name": "Creality Generic PLA Matte @K2-all", - "sub_path": "filament/Creality Generic PLA Matte @K2-all.json" + "name": "Generic PLA Matte @Creality K2-all", + "sub_path": "filament/Generic PLA Matte @Creality K2-all.json" }, { - "name": "Creality Generic PLA Silk @K2-all", - "sub_path": "filament/Creality Generic PLA Silk @K2-all.json" + "name": "Generic PLA Silk @Creality K2-all", + "sub_path": "filament/Generic PLA Silk @Creality K2-all.json" }, { "name": "fdm_filament_pp", diff --git a/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json deleted file mode 100644 index ff2a1eb68c..0000000000 --- a/resources/profiles/Creality/filament/Creality Generic ASA-CF @Hi-all.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "name": "Creality Generic ASA-CF @Hi-all", - "inherits": "Creality Generic ASA @Hi-all", - "from": "system", - "setting_id": "C7IB6HSJxW598zFA", - "filament_id": "OFLuczRG", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "9" - ], - "slow_down_layer_time": [ - "5" - ], - "compatible_printers": [ - "Creality Hi 0.4 nozzle", - "Creality Hi 0.6 nozzle" - ] -} diff --git a/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json deleted file mode 100644 index d914f2eb4b..0000000000 --- a/resources/profiles/Creality/filament/Creality Generic PETG-CF @Hi-all.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "name": "Creality Generic PETG-CF @Hi-all", - "inherits": "Creality Generic PETG @Hi-all", - "from": "system", - "setting_id": "G4ZIJDNOpQvutOfs", - "filament_id": "OFqKmLJe", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "9" - ], - "filament_flow_ratio": [ - "0.95" - ], - "compatible_printers": [ - "Creality Hi 0.4 nozzle", - "Creality Hi 0.6 nozzle" - ] -} diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json index 3247f38500..63f51623a0 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Creality Generic PLA @Hi-all", - "inherits": "Creality Generic PLA", + "inherits": "Generic PLA @Creality", "from": "system", "setting_id": "3gf0CImK4nJwfXrB", "instantiation": "true", diff --git a/resources/profiles/Creality/filament/Creality Generic PLA-CF @Hi-all.json b/resources/profiles/Creality/filament/Creality Generic PLA-CF @Hi-all.json deleted file mode 100644 index 42eaf2c36c..0000000000 --- a/resources/profiles/Creality/filament/Creality Generic PLA-CF @Hi-all.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Creality Generic PLA-CF @Hi-all", - "inherits": "Creality Generic PLA-CF", - "from": "system", - "setting_id": "9nAovlPz0SEUcovr", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "18" - ], - "compatible_printers": [ - "Creality Hi 0.4 nozzle", - "Creality Hi 0.6 nozzle" - ] -} diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json similarity index 71% rename from resources/profiles/Creality/filament/Creality Generic ABS @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json index ef6884e069..fcd8548620 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality Ender-3V3-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ABS @Ender-3V3-all", - "inherits": "Creality Generic ABS", + "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", "from": "system", - "setting_id": "Jvnq628y3IlGGHK6", + "setting_id": "RqMPGyaU3l17zFrA", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality Ender-5Max-all.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json rename to resources/profiles/Creality/filament/Generic ABS @Creality Ender-5Max-all.json index fb07f6a231..5a6f7a93c9 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality Ender-5Max-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic ABS @Ender-5Max-all", + "name": "Generic ABS @Creality Ender-5Max-all", "inherits": "fdm_filament_common", + "renamed_from": "Creality Generic ABS @Ender-5Max-all;Creality Generic ABS Ender-5Max-all", "from": "system", - "setting_id": "mriWPwWZUKmr7ws0", - "filament_id": "OFYPdJ7t", + "setting_id": "qurtvw5OhkVfgpaC", + "filament_id": "OFY9muEs", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json similarity index 67% rename from resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json rename to resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json index 10fe49d23e..aba8475a20 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality Hi-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ABS @Hi-all", - "inherits": "Creality Generic ABS", + "name": "Generic ABS @Creality Hi-all", + "inherits": "Generic ABS @Creality", + "renamed_from": "Creality Generic ABS @Hi-all;Creality Generic ABS Hi-all", "from": "system", - "setting_id": "mKgdNahVCaxQLMJE", + "setting_id": "W2NhLx7Lw4NxWJY6", "instantiation": "true", "filament_max_volumetric_speed": [ "9" @@ -15,7 +16,6 @@ "; filament start gcode\n{if (position[2] > first_layer_height) }\nM104 S[nozzle_temperature]\n{else}\nM104 S[first_layer_temperature]\n{endif}\n" ], "compatible_printers": [ - "Creality Hi 0.4 nozzle", "Creality Hi 0.6 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json similarity index 53% rename from resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json rename to resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json index 369b92c304..0ea7629f24 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality K1-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ABS @K1-all", - "inherits": "Creality Generic ABS", + "name": "Generic ABS @Creality K1-all", + "inherits": "Generic ABS @Creality", + "renamed_from": "Creality Generic ABS @K1-all;Creality Generic ABS K1-all", "from": "system", - "setting_id": "lbMWwEM2Rb9ylrkA", + "setting_id": "9hr2XywDT7lTehYd", "instantiation": "true", "filament_max_volumetric_speed": [ "14" @@ -15,9 +16,7 @@ "20" ], "compatible_printers": [ - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", - "Creality K1C 0.8 nozzle", - "Creality K1 SE 0.4 nozzle" + "Creality K1C 0.8 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @K2-all.json b/resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json similarity index 70% rename from resources/profiles/Creality/filament/Creality Generic ABS @K2-all.json rename to resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json index 15229ac4eb..4aab7d7d0d 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @K2-all.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality K2-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ABS @K2-all", - "inherits": "Creality Generic ABS", + "name": "Generic ABS @Creality K2-all", + "inherits": "Generic ABS @Creality", + "renamed_from": "Creality Generic ABS @K2-all;Creality Generic ABS K2-all", "from": "system", - "setting_id": "jl0usGdbqac1xcGN", + "setting_id": "39krWtacUjDnf03V", "instantiation": "true", "filament_flow_ratio": [ "0.95" @@ -22,15 +23,10 @@ ], "compatible_printers": [ "Creality K2 0.2 nozzle", - "Creality K2 0.4 nozzle", "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle", "Creality K2 Plus 0.2 nozzle", - "Creality K2 Plus 0.4 nozzle", - "Creality K2 Plus 0.6 nozzle", - "Creality K2 Plus 0.8 nozzle", "Creality K2 Pro 0.2 nozzle", - "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/Creality Generic ABS.json b/resources/profiles/Creality/filament/Generic ABS @Creality.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic ABS.json rename to resources/profiles/Creality/filament/Generic ABS @Creality.json index 00bcd95e19..cb2c1a6f9c 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS.json +++ b/resources/profiles/Creality/filament/Generic ABS @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic ABS", + "name": "Generic ABS @Creality", "inherits": "fdm_filament_abs", + "renamed_from": "Creality Generic ABS", "from": "system", - "setting_id": "fv5g33ofjgyjVexC", - "filament_id": "OFYPdJ7t", + "setting_id": "My3UvJeg30wW7hLq", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json similarity index 71% rename from resources/profiles/Creality/filament/Creality Generic ASA @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json index 3da4bd0531..27ee572384 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality Ender-3V3-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ASA @Ender-3V3-all", - "inherits": "Creality Generic ASA", + "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", "from": "system", - "setting_id": "3KXcINpeRKqx9Hhw", + "setting_id": "LXPKRyWzBzo9nU8k", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality Ender-5Max-all.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json rename to resources/profiles/Creality/filament/Generic ASA @Creality Ender-5Max-all.json index fa85c2a3ec..0fa424b522 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality Ender-5Max-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic ASA @Ender-5Max-all", + "name": "Generic ASA @Creality Ender-5Max-all", "inherits": "fdm_filament_common", + "renamed_from": "Creality Generic ASA @Ender-5Max-all;Creality Generic ASA Ender-5Max-all", "from": "system", - "setting_id": "4muzPKAzy8FJKM5D", - "filament_id": "OFpAaY6w", + "setting_id": "7qyRWm8KXa1YUPpl", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @Hi-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json similarity index 68% rename from resources/profiles/Creality/filament/Creality Generic ASA @Hi-all.json rename to resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json index aff57be93d..e706078d18 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality Hi-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ASA @Hi-all", - "inherits": "Creality Generic ASA", + "name": "Generic ASA @Creality Hi-all", + "inherits": "Generic ASA @Creality", + "renamed_from": "Creality Generic ASA @Hi-all;Creality Generic ASA Hi-all", "from": "system", - "setting_id": "DaPUW1rMtWyZLo3H", + "setting_id": "kcMcMJUiRgTRFe8P", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json similarity index 53% rename from resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json rename to resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json index 2248ac6818..91feecf436 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality K1-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ASA @K1-all", - "inherits": "Creality Generic ASA", + "name": "Generic ASA @Creality K1-all", + "inherits": "Generic ASA @Creality", + "renamed_from": "Creality Generic ASA @K1-all;Creality Generic ASA K1-all", "from": "system", - "setting_id": "nq4sPDBNWLOnU5pD", + "setting_id": "GQVdb7ZBWA55Ld0m", "instantiation": "true", "filament_max_volumetric_speed": [ "12" @@ -15,9 +16,7 @@ "20" ], "compatible_printers": [ - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", - "Creality K1C 0.8 nozzle", - "Creality K1 SE 0.4 nozzle" + "Creality K1C 0.8 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @K2-all.json b/resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json similarity index 77% rename from resources/profiles/Creality/filament/Creality Generic ASA @K2-all.json rename to resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json index 5e1f0c9a18..510e1d7660 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @K2-all.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality K2-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic ASA @K2-all", - "inherits": "Creality Generic ASA", + "name": "Generic ASA @Creality K2-all", + "inherits": "Generic ASA @Creality", + "renamed_from": "Creality Generic ASA @K2-all;Creality Generic ASA K2-all", "from": "system", - "setting_id": "OAYGhucg52H8nPIF", + "setting_id": "XJKLmHYbW2ReKSKs", "instantiation": "true", "filament_flow_ratio": [ "0.95" @@ -22,15 +23,12 @@ ], "compatible_printers": [ "Creality K2 0.2 nozzle", - "Creality K2 0.4 nozzle", "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle", "Creality K2 Plus 0.2 nozzle", - "Creality K2 Plus 0.4 nozzle", "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle", "Creality K2 Pro 0.2 nozzle", - "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/Creality Generic ASA.json b/resources/profiles/Creality/filament/Generic ASA @Creality.json similarity index 92% rename from resources/profiles/Creality/filament/Creality Generic ASA.json rename to resources/profiles/Creality/filament/Generic ASA @Creality.json index 53ca8f06df..0ef5d15433 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA.json +++ b/resources/profiles/Creality/filament/Generic ASA @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic ASA", + "name": "Generic ASA @Creality", "inherits": "fdm_filament_asa", + "renamed_from": "Creality Generic ASA", "from": "system", - "setting_id": "jHgcISP1UXOPsGH0", - "filament_id": "OFpAaY6w", + "setting_id": "dCUxfG2JXDg56zTK", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.926" 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 new file mode 100644 index 0000000000..7a462cc250 --- /dev/null +++ b/resources/profiles/Creality/filament/Generic ASA-CF @Creality Hi-all.json @@ -0,0 +1,23 @@ +{ + "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", + "from": "system", + "setting_id": "MwKV8Lh4XzvMUVYA", + "filament_id": "OF53eLVD", + "instantiation": "true", + "filament_type": [ + "ASA-CF" + ], + "filament_max_volumetric_speed": [ + "9" + ], + "slow_down_layer_time": [ + "5" + ], + "compatible_printers": [ + "Creality Hi 0.4 nozzle", + "Creality Hi 0.6 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Generic PA @Creality Ender-5Max-all.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json rename to resources/profiles/Creality/filament/Generic PA @Creality Ender-5Max-all.json index 53b1a95c72..500722f1e9 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Generic PA @Creality Ender-5Max-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PA @Ender-5Max-all", + "name": "Generic PA @Creality Ender-5Max-all", "inherits": "fdm_filament_common", + "renamed_from": "Creality Generic PA @Ender-5Max-all;Creality Generic PA Ender-5Max-all", "from": "system", - "setting_id": "8caHexyoeQW9p1NF", - "filament_id": "OFMqYusc", + "setting_id": "ChQOX6JlKujFwFcB", + "filament_id": "OFg8ndtj", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json similarity index 53% rename from resources/profiles/Creality/filament/Creality Generic PA-CF @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json index f7990f9e99..a73077a6e9 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA-CF @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality Ender-3V3-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PA-CF @Ender-3V3-all", - "inherits": "Creality Generic PA-CF", + "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", "from": "system", - "setting_id": "PxYQg8A9aHBV0wKU", + "setting_id": "L9lg0gKfwuz9xcs4", "instantiation": "true", "compatible_printers": [ "Creality Ender-3 V3 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json similarity index 65% rename from resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json rename to resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json index 80ff499716..72519b07f2 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality K1-all.json @@ -1,15 +1,15 @@ { "type": "filament", - "name": "Creality Generic PA-CF @K1-all", - "inherits": "Creality Generic PA-CF", + "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", "from": "system", - "setting_id": "3j6MMw59d8UigcH7", + "setting_id": "BkM0CVxYrvFPAbpQ", "instantiation": "true", "compatible_printers": [ "Creality K1 (0.4 nozzle)", "Creality K1 (0.6 nozzle)", "Creality K1 (0.8 nozzle)", - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle", "Creality K1 SE 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF @K2-all.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json similarity index 75% rename from resources/profiles/Creality/filament/Creality Generic PA-CF @K2-all.json rename to resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json index 04ace3d4f4..932c37b2a2 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality K2-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PA-CF @K2-all", - "inherits": "Creality Generic PA-CF", + "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", "from": "system", - "setting_id": "08QXVyyDDpDPhOoJ", + "setting_id": "jCFh6dGbNQt7YHNB", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" @@ -23,9 +24,6 @@ "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle", "Creality K2 Plus 0.2 nozzle", - "Creality K2 Plus 0.4 nozzle", - "Creality K2 Plus 0.6 nozzle", - "Creality K2 Plus 0.8 nozzle", "Creality K2 Pro 0.2 nozzle", "Creality K2 Pro 0.4 nozzle", "Creality K2 Pro 0.6 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF.json b/resources/profiles/Creality/filament/Generic PA-CF @Creality.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic PA-CF.json rename to resources/profiles/Creality/filament/Generic PA-CF @Creality.json index c9aee7e056..964672343a 100644 --- a/resources/profiles/Creality/filament/Creality Generic PA-CF.json +++ b/resources/profiles/Creality/filament/Generic PA-CF @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PA-CF", + "name": "Generic PA-CF @Creality", "inherits": "fdm_filament_pa", + "renamed_from": "Creality Generic PA-CF", "from": "system", - "setting_id": "hBNsuwMzm7ZZn15D", - "filament_id": "OFUWRqwb", + "setting_id": "JDbda1VeHrPKR0NN", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Creality/filament/Creality Generic PC @K1-all.json b/resources/profiles/Creality/filament/Generic PC @Creality K1-all.json similarity index 69% rename from resources/profiles/Creality/filament/Creality Generic PC @K1-all.json rename to resources/profiles/Creality/filament/Generic PC @Creality K1-all.json index 9098360594..a73499e2e9 100644 --- a/resources/profiles/Creality/filament/Creality Generic PC @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PC @Creality K1-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PC @K1-all", - "inherits": "Creality Generic PC", + "name": "Generic PC @Creality K1-all", + "inherits": "Generic PC @Creality", + "renamed_from": "Creality Generic PC @K1-all;Creality Generic PC K1-all", "from": "system", - "setting_id": "NZ93pDkjFnCyAVZW", + "setting_id": "Jk9yNMEqu4M92edj", "instantiation": "true", "chamber_temperatures": [ "60" @@ -12,7 +13,6 @@ "Creality K1 (0.4 nozzle)", "Creality K1 (0.6 nozzle)", "Creality K1 (0.8 nozzle)", - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle", "Creality K1 SE 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic PC.json b/resources/profiles/Creality/filament/Generic PC @Creality.json similarity index 75% rename from resources/profiles/Creality/filament/Creality Generic PC.json rename to resources/profiles/Creality/filament/Generic PC @Creality.json index 9297344a75..5212f6c052 100644 --- a/resources/profiles/Creality/filament/Creality Generic PC.json +++ b/resources/profiles/Creality/filament/Generic PC @Creality.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Creality Generic PC", + "name": "Generic PC @Creality", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OFe8UJXH", + "filament_id": "OFLakOUI", "instantiation": "false", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json similarity index 81% rename from resources/profiles/Creality/filament/Creality Generic PETG @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json index b1e47e12c9..9d2c3a5529 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality Ender-3V3-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PETG @Ender-3V3-all", - "inherits": "Creality Generic PETG", + "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", "from": "system", - "setting_id": "VsfDu1bl3N1EaXrw", + "setting_id": "sX2aMXNynDp6VKSR", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality Ender-5Max-all.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json rename to resources/profiles/Creality/filament/Generic PETG @Creality Ender-5Max-all.json index 6aeba98a01..df6509395f 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality Ender-5Max-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PETG @Ender-5Max-all", + "name": "Generic PETG @Creality Ender-5Max-all", "inherits": "fdm_filament_common", + "renamed_from": "Creality Generic PETG @Ender-5Max-all;Creality Generic PETG Ender-5Max-all", "from": "system", - "setting_id": "vRVsTatkrE46rzRB", - "filament_id": "OF4Mf5Gz", + "setting_id": "TFS4Fi1PuE7WgnPr", + "filament_id": "OFYPdQJh", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @Hi-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json similarity index 80% rename from resources/profiles/Creality/filament/Creality Generic PETG @Hi-all.json rename to resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json index 6889cf3cf3..0092cf5d12 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality Hi-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PETG @Hi-all", - "inherits": "Creality Generic PETG", + "name": "Generic PETG @Creality Hi-all", + "inherits": "Generic PETG @Creality", + "renamed_from": "Creality Generic PETG @Hi-all;Creality Generic PETG Hi-all", "from": "system", - "setting_id": "ZGI0yhD4lB10uUOd", + "setting_id": "QcMkrViYBKh4oISG", "instantiation": "true", "filament_max_volumetric_speed": [ "9" @@ -45,7 +46,6 @@ "; filament start gcode\n{if (position[2] > first_layer_height) }\nM104 S[nozzle_temperature]\n{else}\nM104 S[first_layer_temperature]\n{endif}\n" ], "compatible_printers": [ - "Creality Hi 0.4 nozzle", "Creality Hi 0.6 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json similarity index 75% rename from resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json rename to resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json index 67a901d8db..06fb485fd0 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality K1-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PETG @K1-all", - "inherits": "Creality Generic PETG", + "name": "Generic PETG @Creality K1-all", + "inherits": "Generic PETG @Creality", + "renamed_from": "Creality Generic PETG @K1-all;Creality Generic PETG K1-all", "from": "system", - "setting_id": "zk1Typ98hZMZLn68", + "setting_id": "YEB1keha4rhCSmq8", "instantiation": "true", "filament_max_volumetric_speed": [ "9" @@ -48,9 +49,7 @@ "0" ], "compatible_printers": [ - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", - "Creality K1C 0.8 nozzle", - "Creality K1 SE 0.4 nozzle" + "Creality K1C 0.8 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @K2-all.json b/resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json similarity index 79% rename from resources/profiles/Creality/filament/Creality Generic PETG @K2-all.json rename to resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json index 55ab9051b4..87e82d3eb5 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality K2-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PETG @K2-all", - "inherits": "Creality Generic PETG", + "name": "Generic PETG @Creality K2-all", + "inherits": "Generic PETG @Creality", + "renamed_from": "Creality Generic PETG @K2-all;Creality Generic PETG K2-all", "from": "system", - "setting_id": "FhtlimihjuAe2pbs", + "setting_id": "IrbPRxkyhiUXaPEu", "instantiation": "true", "filament_max_volumetric_speed": [ "18" @@ -55,15 +56,10 @@ ], "compatible_printers": [ "Creality K2 0.2 nozzle", - "Creality K2 0.4 nozzle", "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle", "Creality K2 Plus 0.2 nozzle", - "Creality K2 Plus 0.4 nozzle", - "Creality K2 Plus 0.6 nozzle", - "Creality K2 Plus 0.8 nozzle", "Creality K2 Pro 0.2 nozzle", - "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/Creality Generic PETG.json b/resources/profiles/Creality/filament/Generic PETG @Creality.json similarity index 94% rename from resources/profiles/Creality/filament/Creality Generic PETG.json rename to resources/profiles/Creality/filament/Generic PETG @Creality.json index e09d44758c..7bd45cd910 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG.json +++ b/resources/profiles/Creality/filament/Generic PETG @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PETG", + "name": "Generic PETG @Creality", "inherits": "fdm_filament_pet", + "renamed_from": "Creality Generic PETG", "from": "system", - "setting_id": "ixhOwyMvBCpI8nQs", - "filament_id": "OF4Mf5Gz", + "setting_id": "B8lWG3jJQ4ar4j70", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" 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 new file mode 100644 index 0000000000..5049c12c57 --- /dev/null +++ b/resources/profiles/Creality/filament/Generic PETG-CF @Creality Hi-all.json @@ -0,0 +1,23 @@ +{ + "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", + "from": "system", + "setting_id": "dWEGZoSVFzj7e9m1", + "filament_id": "OFoYSJKi", + "instantiation": "true", + "filament_type": [ + "PETG-CF" + ], + "filament_max_volumetric_speed": [ + "9" + ], + "filament_flow_ratio": [ + "0.95" + ], + "compatible_printers": [ + "Creality Hi 0.4 nozzle", + "Creality Hi 0.6 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json similarity index 80% rename from resources/profiles/Creality/filament/Creality Generic PLA @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json index 5e28b48844..4bc29d5df2 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality Ender-3V3-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PLA @Ender-3V3-all", - "inherits": "Creality Generic PLA", + "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", "from": "system", - "setting_id": "d9awwT21ZLo1iXoh", + "setting_id": "uGq3aWYUI2sLJORU", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality Ender-5Max-all.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json rename to resources/profiles/Creality/filament/Generic PLA @Creality Ender-5Max-all.json index 8198b078e4..ff55c41e81 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality Ender-5Max-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA @Ender-5Max-all", + "name": "Generic PLA @Creality Ender-5Max-all", "inherits": "fdm_filament_common", + "renamed_from": "Creality Generic PLA @Ender-5Max-all;Creality Generic PLA Ender-5Max-all", "from": "system", - "setting_id": "zQiwnlxGlX4pFOHR", - "filament_id": "OFACSw9O", + "setting_id": "xGTd14Qwc0JbI6kg", + "filament_id": "OFDSrzZ8", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json similarity index 72% rename from resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json rename to resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json index d5ea668c68..ac6f727f02 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality K1-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PLA @K1-all", - "inherits": "Creality Generic PLA", + "name": "Generic PLA @Creality K1-all", + "inherits": "Generic PLA @Creality", + "renamed_from": "Creality Generic PLA @K1-all;Creality Generic PLA K1-all", "from": "system", - "setting_id": "c5ArCv3qjuKjBwEQ", + "setting_id": "oO2HaneRPfqxNQsP", "instantiation": "true", "filament_max_volumetric_speed": [ "18" @@ -39,9 +40,7 @@ "0" ], "compatible_printers": [ - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", - "Creality K1C 0.8 nozzle", - "Creality K1 SE 0.4 nozzle" + "Creality K1C 0.8 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @K2-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json similarity index 78% rename from resources/profiles/Creality/filament/Creality Generic PLA @K2-all.json rename to resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json index 2c6000111f..bf98b76c5a 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality K2-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PLA @K2-all", - "inherits": "Creality Generic PLA", + "name": "Generic PLA @Creality K2-all", + "inherits": "Generic PLA @Creality", + "renamed_from": "Creality Generic PLA @K2-all;Creality Generic PLA K2-all", "from": "system", - "setting_id": "bnqvzgmJYbLraBWC", + "setting_id": "EC0PPocMp0c4O0dK", "instantiation": "true", "filament_flow_ratio": [ "0.95" @@ -49,15 +50,10 @@ ], "compatible_printers": [ "Creality K2 0.2 nozzle", - "Creality K2 0.4 nozzle", "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle", "Creality K2 Plus 0.2 nozzle", - "Creality K2 Plus 0.4 nozzle", - "Creality K2 Plus 0.6 nozzle", - "Creality K2 Plus 0.8 nozzle", "Creality K2 Pro 0.2 nozzle", - "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/Creality Generic PLA.json b/resources/profiles/Creality/filament/Generic PLA @Creality.json similarity index 94% rename from resources/profiles/Creality/filament/Creality Generic PLA.json rename to resources/profiles/Creality/filament/Generic PLA @Creality.json index fe82530a7c..f3d807d76b 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA", + "name": "Generic PLA @Creality", "inherits": "fdm_filament_pla", + "renamed_from": "Creality Generic PLA", "from": "system", - "setting_id": "rUYYpB3GkiNCVyfY", - "filament_id": "OFACSw9O", + "setting_id": "UNUCEjCpe1e4ICT9", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/Creality HF Generic PLA.json b/resources/profiles/Creality/filament/Generic PLA HF @Creality.json similarity index 81% rename from resources/profiles/Creality/filament/Creality HF Generic PLA.json rename to resources/profiles/Creality/filament/Generic PLA HF @Creality.json index 7b2558d207..235e113a59 100644 --- a/resources/profiles/Creality/filament/Creality HF Generic PLA.json +++ b/resources/profiles/Creality/filament/Generic PLA HF @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality HF Generic PLA", + "name": "Generic PLA HF @Creality", "inherits": "fdm_filament_pla", + "renamed_from": "Creality HF Generic PLA", "from": "system", - "setting_id": "p07b7w0HDxavGLdd", - "filament_id": "OFmhWhEf", + "setting_id": "YXqIFmq63jGbN8aZ", + "filament_id": "OFZr862X", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json similarity index 63% rename from resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json index 513d2bd088..21d1029a5d 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Ender-3V3-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA High Speed @Ender-3V3-all", - "inherits": "Creality Generic PLA @Ender-3V3-all", + "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", "from": "system", - "setting_id": "4F3dZWvsniH9QHtr", - "filament_id": "OFrO2zyn", + "setting_id": "MOH1B7U4Ipv8jw0s", + "filament_id": "OFmpMwxS", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json similarity index 57% rename from resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json rename to resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json index 50305f2dd2..0e64943dd5 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA High Speed @Hi-all", + "name": "Generic PLA High Speed @Creality Hi-all", "inherits": "Creality Generic PLA @Hi-all", + "renamed_from": "Creality Generic PLA High Speed @Hi-all;Creality Generic PLA High Speed Hi-all", "from": "system", - "setting_id": "KzaopZGQPw5OJFFD", - "filament_id": "OFrO2zyn", + "setting_id": "KJZ1ztg3jL2Cg4fi", + "filament_id": "OFmpMwxS", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json similarity index 63% rename from resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json rename to resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json index f5f509897a..c7b2bbb03a 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K1-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA High Speed @K1-all", - "inherits": "Creality Generic PLA @K1-all", + "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", "from": "system", - "setting_id": "ptxV78rC6wevH916", - "filament_id": "OFrO2zyn", + "setting_id": "5HgGIzGuma2z6vD8", + "filament_id": "OFmpMwxS", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json similarity index 66% rename from resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json rename to resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json index 8a0f79495f..9df651b17d 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality K2-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA High Speed @K2-all", - "inherits": "Creality Generic PLA @K2-all", + "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", "from": "system", - "setting_id": "ozHstwkc3N5LGWLV", - "filament_id": "OFrO2zyn", + "setting_id": "Lxp4EwuEZKFHZXWR", + "filament_id": "OFmpMwxS", "instantiation": "true", "filament_max_volumetric_speed": [ "23" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json similarity index 64% rename from resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json index 3aa8f60c48..2e561af6b5 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Ender-3V3-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Matte @Ender-3V3-all", - "inherits": "Creality Generic PLA @Ender-3V3-all", + "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", "from": "system", - "setting_id": "xF1B593frol5PWVw", - "filament_id": "OFpSYJLI", + "setting_id": "JlvUB8GxzpAOlgkz", + "filament_id": "OFmY0l6t", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json similarity index 55% rename from resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json rename to resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json index 05b1d2afc7..c657630c40 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Matte @Hi-all", + "name": "Generic PLA Matte @Creality Hi-all", "inherits": "Creality Generic PLA @Hi-all", + "renamed_from": "Creality Generic PLA Matte @Hi-all;Creality Generic PLA Matte Hi-all", "from": "system", - "setting_id": "R7Jo7NhjsR1iU2Fd", - "filament_id": "OFpSYJLI", + "setting_id": "pFxJgjam0WAeSKqf", + "filament_id": "OFmY0l6t", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json similarity index 65% rename from resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json rename to resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json index 3d3c0276dc..2a584450f8 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K1-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Matte @K1-all", - "inherits": "Creality Generic PLA @K1-all", + "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", "from": "system", - "setting_id": "3hreTG3DjcgmwZC2", - "filament_id": "OFpSYJLI", + "setting_id": "JJRpJQcHUhelwD02", + "filament_id": "OFmY0l6t", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json similarity index 67% rename from resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json rename to resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json index d1723b25ba..27607938a5 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality K2-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Matte @K2-all", - "inherits": "Creality Generic PLA @K2-all", + "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", "from": "system", - "setting_id": "fxZf5E6IHWWq3dsu", - "filament_id": "OFpSYJLI", + "setting_id": "VVcXNl0Y6B0mLlrb", + "filament_id": "OFmY0l6t", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json similarity index 64% rename from resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json index 1942508586..1f528f79fb 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Ender-3V3-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Silk @Ender-3V3-all", - "inherits": "Creality Generic PLA @Ender-3V3-all", + "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", "from": "system", - "setting_id": "uPFnSMh7WoXmMAoy", - "filament_id": "OFp8gtPH", + "setting_id": "vPrmBiuBCC8843Jb", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json similarity index 59% rename from resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json rename to resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json index c79ddb8933..bd41fff189 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Silk @Hi-all", + "name": "Generic PLA Silk @Creality Hi-all", "inherits": "Creality Generic PLA @Hi-all", + "renamed_from": "Creality Generic PLA Silk @Hi-all;Creality Generic PLA Silk Hi-all", "from": "system", - "setting_id": "RPDVqZcn8EZizd1U", - "filament_id": "OFp8gtPH", + "setting_id": "k1ofgUXqhHGSPDPY", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_flow_ratio": [ "0.97" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json similarity index 65% rename from resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json rename to resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json index b9be0b8f93..4e8adb2b35 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K1-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Silk @K1-all", - "inherits": "Creality Generic PLA @K1-all", + "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", "from": "system", - "setting_id": "pxvc0ICvqc0M3wYV", - "filament_id": "OFp8gtPH", + "setting_id": "JcSq9nar8x5BjFss", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json similarity index 68% rename from resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json rename to resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json index ed5b560d12..850ea2704b 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality K2-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Silk @K2-all", - "inherits": "Creality Generic PLA @K2-all", + "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", "from": "system", - "setting_id": "qS0Mlt24iz1k4P7n", - "filament_id": "OFp8gtPH", + "setting_id": "fRyhLWAQiCOaAxKA", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_max_volumetric_speed": [ "10" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json similarity index 59% rename from resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json rename to resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json index 8381e376bb..b272cb185a 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Wood @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA Wood @Hi-all", + "name": "Generic PLA Wood @Creality Hi-all", "inherits": "Creality Generic PLA @Hi-all", + "renamed_from": "Creality Generic PLA Wood @Hi-all;Creality Generic PLA Wood Hi-all", "from": "system", - "setting_id": "OEc7Bc7WG99tuO5D", - "filament_id": "OFNW4ZTC", + "setting_id": "PNqfF5ecYqqpobdh", + "filament_id": "OFIKZxPF", "instantiation": "true", "filament_flow_ratio": [ "0.88" 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 new file mode 100644 index 0000000000..9bbc7a4433 --- /dev/null +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality Hi-all.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "MH2pm9wTHLgX9fyq", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "18" + ], + "compatible_printers": [ + "Creality Hi 0.4 nozzle", + "Creality Hi 0.6 nozzle" + ] +} diff --git a/resources/profiles/Creality/filament/Creality Generic PLA-CF @K1-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json similarity index 65% rename from resources/profiles/Creality/filament/Creality Generic PLA-CF @K1-all.json rename to resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json index 7eca9d5dc0..2e3ed94cb7 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA-CF @K1-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K1-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PLA-CF @K1-all", - "inherits": "Creality Generic PLA-CF", + "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", "from": "system", - "setting_id": "zCnOLIfwhfZIDYLC", + "setting_id": "DoyvqW51z3o1vBSa", "instantiation": "true", "additional_cooling_fan_speed": [ "0" @@ -12,10 +13,8 @@ "Creality K1 (0.4 nozzle)", "Creality K1 (0.6 nozzle)", "Creality K1 (0.8 nozzle)", - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle", - "Creality K1 SE 0.4 nozzle", "Creality K1 Max (0.4 nozzle)", "Creality K1 Max (0.6 nozzle)", "Creality K1 Max (0.8 nozzle)" diff --git a/resources/profiles/Creality/filament/Creality Generic PLA-CF @K2-all.json b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json similarity index 70% rename from resources/profiles/Creality/filament/Creality Generic PLA-CF @K2-all.json rename to resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json index 7b2b7212e8..4cc99c0ff5 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA-CF @K2-all.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality K2-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PLA-CF @K2-all", - "inherits": "Creality Generic PLA-CF", + "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", "from": "system", - "setting_id": "wfZgLrH8dafxsNyZ", + "setting_id": "6KqkLBBYBA59h5TA", "instantiation": "true", "filament_max_volumetric_speed": [ "18" @@ -16,15 +17,12 @@ ], "compatible_printers": [ "Creality K2 0.2 nozzle", - "Creality K2 0.4 nozzle", "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle", "Creality K2 Plus 0.2 nozzle", - "Creality K2 Plus 0.4 nozzle", "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle", "Creality K2 Pro 0.2 nozzle", - "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/Creality Generic PLA-CF.json b/resources/profiles/Creality/filament/Generic PLA-CF @Creality.json similarity index 92% rename from resources/profiles/Creality/filament/Creality Generic PLA-CF.json rename to resources/profiles/Creality/filament/Generic PLA-CF @Creality.json index 7c09aa8e4e..e35a839035 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA-CF.json +++ b/resources/profiles/Creality/filament/Generic PLA-CF @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic PLA-CF", + "name": "Generic PLA-CF @Creality", "inherits": "fdm_filament_pla", + "renamed_from": "Creality Generic PLA-CF", "from": "system", - "setting_id": "DCCWPQGMsvDOucwx", - "filament_id": "OFSDFYs4", + "setting_id": "Fn5Z3ccrrRYFkiwT", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json b/resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json similarity index 79% rename from resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json rename to resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json index 9090224d19..80e07cfff0 100644 --- a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json +++ b/resources/profiles/Creality/filament/Generic Speed PLA @Creality HF.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality HF Generic Speed PLA", + "name": "Generic Speed PLA @Creality HF", "inherits": "fdm_filament_pla", + "renamed_from": "Creality HF Generic Speed PLA", "from": "system", - "setting_id": "Jp93uqYennsWVAKe", - "filament_id": "OFMIurFh", + "setting_id": "pklu1YSwmDOj6gRq", + "filament_id": "OFXmv5p0", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-3V3-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json similarity index 78% rename from resources/profiles/Creality/filament/Creality Generic TPU @Ender-3V3-all.json rename to resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json index 11b24086b2..89fa6b290b 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality Ender-3V3-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic TPU @Ender-3V3-all", - "inherits": "Creality Generic TPU", + "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", "from": "system", - "setting_id": "0fDkYNB91MiqbAS0", + "setting_id": "ZufJdJseoFNQC66B", "instantiation": "true", "hot_plate_temp": [ "30" diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality Ender-5Max-all.json similarity index 93% rename from resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json rename to resources/profiles/Creality/filament/Generic TPU @Creality Ender-5Max-all.json index 2787b4e7ea..62f4916a99 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-5Max-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality Ender-5Max-all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic TPU @Ender-5Max-all", + "name": "Generic TPU @Creality Ender-5Max-all", "inherits": "fdm_filament_common", + "renamed_from": "Creality Generic TPU @Ender-5Max-all;Creality Generic TPU Ender-5Max-all", "from": "system", - "setting_id": "aaiFHjbveXabDAMr", - "filament_id": "OFhcrFw9", + "setting_id": "XqW2iYrRTVlXuCwD", + "filament_id": "OFgbpcy9", "instantiation": "true", "activate_air_filtration": "0", "activate_chamber_temp_control": "0", diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @Hi-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json similarity index 77% rename from resources/profiles/Creality/filament/Creality Generic TPU @Hi-all.json rename to resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json index c3b5905d96..1a46bfc0b5 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality Hi-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic TPU @Hi-all", - "inherits": "Creality Generic TPU", + "name": "Generic TPU @Creality Hi-all", + "inherits": "Generic TPU @Creality", + "renamed_from": "Creality Generic TPU @Hi-all;Creality Generic TPU Hi-all", "from": "system", - "setting_id": "aF2isnhJKc3hoq8r", + "setting_id": "P42mcGCETNdcZchS", "instantiation": "true", "hot_plate_temp": [ "30" diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json similarity index 69% rename from resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json rename to resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json index c8d4b63a69..d2cd19bb7c 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality K1-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic TPU @K1-all", - "inherits": "Creality Generic TPU", + "name": "Generic TPU @Creality K1-all", + "inherits": "Generic TPU @Creality", + "renamed_from": "Creality Generic TPU @K1-all;Creality Generic TPU K1-all", "from": "system", - "setting_id": "isJCGG1B672xyX4l", + "setting_id": "7zTgnS8bIEkkhqtB", "instantiation": "true", "hot_plate_temp": [ "30" @@ -33,9 +34,7 @@ "0" ], "compatible_printers": [ - "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", - "Creality K1C 0.8 nozzle", - "Creality K1 SE 0.4 nozzle" + "Creality K1C 0.8 nozzle" ] } diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @K2-all.json b/resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json similarity index 81% rename from resources/profiles/Creality/filament/Creality Generic TPU @K2-all.json rename to resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json index db2138db73..9a8896ea23 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @K2-all.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality K2-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic TPU @K2-all", - "inherits": "Creality Generic TPU", + "name": "Generic TPU @Creality K2-all", + "inherits": "Generic TPU @Creality", + "renamed_from": "Creality Generic TPU @K2-all;Creality Generic TPU K2-all", "from": "system", - "setting_id": "60PiyJbkRFDzr7b5", + "setting_id": "C9PAmCIDhCAthMuK", "instantiation": "true", "hot_plate_temp": [ "40" @@ -37,15 +38,12 @@ ], "compatible_printers": [ "Creality K2 0.2 nozzle", - "Creality K2 0.4 nozzle", "Creality K2 0.6 nozzle", "Creality K2 0.8 nozzle", "Creality K2 Plus 0.2 nozzle", - "Creality K2 Plus 0.4 nozzle", "Creality K2 Plus 0.6 nozzle", "Creality K2 Plus 0.8 nozzle", "Creality K2 Pro 0.2 nozzle", - "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/Creality Generic TPU.json b/resources/profiles/Creality/filament/Generic TPU @Creality.json similarity index 83% rename from resources/profiles/Creality/filament/Creality Generic TPU.json rename to resources/profiles/Creality/filament/Generic TPU @Creality.json index 13fc25d3a7..0277d14563 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU.json +++ b/resources/profiles/Creality/filament/Generic TPU @Creality.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Creality Generic TPU", + "name": "Generic TPU @Creality", "inherits": "fdm_filament_tpu", + "renamed_from": "Creality Generic TPU", "from": "system", - "setting_id": "mKCynAMC7cjY03c0", - "filament_id": "OFhcrFw9", + "setting_id": "eCzlxPg3piTZEui4", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json index 73687d8be7..e9cadc9124 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-10 Max", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality CR10Max", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality CR-10 Max.json b/resources/profiles/Creality/machine/Creality CR-10 Max.json index 5922576073..82a5d1d760 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 Max.json +++ b/resources/profiles/Creality/machine/Creality CR-10 Max.json @@ -8,5 +8,5 @@ "bed_model": "creality_cr10max_buildplate_model.stl", "bed_texture": "creality_cr10max_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json index 34ae5f05e3..9dc1ae8962 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json @@ -116,7 +116,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", "machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;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", diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.4 nozzle.json index 99ddf4e2e2..12805d5e86 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.4 nozzle.json @@ -116,7 +116,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", "machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;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", diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json index 32bec9dd85..60ae6d2db8 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json @@ -116,7 +116,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", "machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;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", diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json index 25d0d2a2df..1ae4e24163 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json @@ -116,7 +116,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", "machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;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", diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE.json b/resources/profiles/Creality/machine/Creality CR-10 SE.json index 6e57e38c0c..bd39ea5ff1 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE.json @@ -8,5 +8,5 @@ "bed_model": "creality_cr10se_buildplate_model.stl", "bed_texture": "creality_cr10se_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PETG;Creality Generic TPU;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PETG @Creality;Generic TPU @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json index af449cd705..7b70121bef 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json @@ -106,7 +106,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG28 ; home all\nG1 Z2 F240\nG1 X2 Y10 F3000\nG1 Z0.28 F240\nG92 E0\nG1 Y190 E15 F1500 ; intro line\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E15 F1200 ; intro line\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print head up\nG1 X5 Y170 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{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", diff --git a/resources/profiles/Creality/machine/Creality CR-10 V2.json b/resources/profiles/Creality/machine/Creality CR-10 V2.json index a709fe2309..6098003c41 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V2.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V2.json @@ -8,5 +8,5 @@ "bed_model": "creality_cr10v2_buildplate_model.stl", "bed_texture": "creality_cr10v2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality CR-10 V3 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 V3 0.4 nozzle.json index 10837d9271..6eee0b7357 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V3 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V3 0.4 nozzle.json @@ -109,7 +109,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S{first_layer_temperature[0]} ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG1 Z0.28 F240\nG92 E0\nG1 X2 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print head up\nG1 X5 Y170 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{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", diff --git a/resources/profiles/Creality/machine/Creality CR-10 V3 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 V3 0.6 nozzle.json index 6b518c35a5..8ec571442d 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V3 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V3 0.6 nozzle.json @@ -110,7 +110,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S{first_layer_temperature[0]} ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG1 Z0.28 F240\nG92 E0\nG1 X2 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print head up\nG1 X5 Y170 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{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", diff --git a/resources/profiles/Creality/machine/Creality CR-10 V3.json b/resources/profiles/Creality/machine/Creality CR-10 V3.json index 37cfe67f05..39958036b8 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 V3.json +++ b/resources/profiles/Creality/machine/Creality CR-10 V3.json @@ -8,5 +8,5 @@ "bed_model": "creality_cr10v3_buildplate_model.stl", "bed_texture": "creality_cr10v3_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json index 1a91139859..db3d5f8ac1 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 Max", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.2", "default_print_profile": "0.16mm Optimal @Creality CR-6 0.2", diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json index 0c8ce148a6..5f0d68af0c 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 Max", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality CR-6 0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json index aeea306f78..eb2b0bfb2a 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 Max", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.6", "default_print_profile": "0.20mm Standard @Creality CR-6 0.6", diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json index 417eba9589..fc9adbc8b6 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 Max", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.8", "default_print_profile": "0.32mm Standard @Creality CR-6 0.8", diff --git a/resources/profiles/Creality/machine/Creality CR-6 Max.json b/resources/profiles/Creality/machine/Creality CR-6 Max.json index aa1925da6e..af7f785051 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 Max.json +++ b/resources/profiles/Creality/machine/Creality CR-6 Max.json @@ -8,5 +8,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_CR_6_Max", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json index 757ee910bf..d738e8569c 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 SE", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.2", "default_print_profile": "0.16mm Optimal @Creality CR-6 0.2", diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json index 8c862ad0c1..8ad215b2f5 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 SE", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality CR-6 0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json index d5f40f373f..f5f19131b8 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 SE", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.6", "default_print_profile": "0.20mm Standard @Creality CR-6 0.6", diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json index a38fa30329..8afdf0d906 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality CR-6 SE", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.8", "default_print_profile": "0.32mm Standard @Creality CR-6 0.8", diff --git a/resources/profiles/Creality/machine/Creality CR-6 SE.json b/resources/profiles/Creality/machine/Creality CR-6 SE.json index 2d7026c31d..63fc2fc19b 100644 --- a/resources/profiles/Creality/machine/Creality CR-6 SE.json +++ b/resources/profiles/Creality/machine/Creality CR-6 SE.json @@ -8,5 +8,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_CR_6_SE", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality CR-M4 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality CR-M4 0.4 nozzle.json index 165a332297..9d1de682c3 100644 --- a/resources/profiles/Creality/machine/Creality CR-M4 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-M4 0.4 nozzle.json @@ -9,7 +9,7 @@ "gcode_flavor": "marlin", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality CR-M4", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality CR-M4.json b/resources/profiles/Creality/machine/Creality CR-M4.json index 0cb519eec9..d4df994d2c 100644 --- a/resources/profiles/Creality/machine/Creality CR-M4.json +++ b/resources/profiles/Creality/machine/Creality CR-M4.json @@ -8,5 +8,5 @@ "bed_model": "creality_crm4_buildplate_model.stl", "bed_texture": "creality_crm4_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json index 29762960b6..ce445321ed 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.4 nozzle.json index 59497d500b..7e6a63ab18 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.4 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json index a33329652b..5becaffc5d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json index d77ba1063f..03beab016f 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json index d6715bb636..d7305a3b9e 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.4 nozzle.json index ac1a04a609..a2bf0df0ad 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.4 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json index f0377efa29..66c1f038ba 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json index b8371d1770..f42b8f288d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json @@ -112,7 +112,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro.json index 982a2256bf..407f2d9833 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v2_buildplate_model.stl", "bed_texture": "creality_ender3v2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json index c8ee1f7a0f..72e1aeb855 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json @@ -106,7 +106,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json index 66d9161841..6f61fc3c0b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json @@ -110,7 +110,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling \nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.4 nozzle.json index a871bc6d03..08579e0a00 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.4 nozzle.json @@ -110,7 +110,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json index 53d5923358..9b688aae93 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json @@ -110,7 +110,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json index 29735d253d..73f2340b40 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json @@ -111,7 +111,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json index 134df7200d..68badab1c3 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3s1plus_buildplate_model.stl", "bed_texture": "creality_ender3s1plus_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json index fa9f815d66..d7cbb9292d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json @@ -109,7 +109,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json index 2ce3d35e19..e47e3ab7ba 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Pro.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3s1pro_buildplate_model.stl", "bed_texture": "creality_ender3s1pro_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1.json b/resources/profiles/Creality/machine/Creality Ender-3 S1.json index aec61a4289..fb405f39f4 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3s1_buildplate_model.stl", "bed_texture": "creality_ender3s1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json index 2e7787e04e..47e5f72147 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2 0.4 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-3 V2", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality Ender3V2", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo 0.4 nozzle.json index e07ac17f02..7cddabe415 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo 0.4 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Creality Ender-3 V2 Neo", "printer_structure": "i3", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality Ender3V2 Neo", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json b/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json index 827ae40bc3..b22add48ea 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2 Neo.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v2neo_buildplate_model.stl", "bed_texture": "creality_ender3v2neo_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PLA;Creality Generic PETG" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PLA @Creality;Generic PETG @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V2.json b/resources/profiles/Creality/machine/Creality Ender-3 V2.json index 88665f5892..a5ef1d123d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V2.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V2.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v2_buildplate_model.stl", "bed_texture": "creality_ender3v2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json index 4bc5a8a963..de3c4286dc 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json @@ -126,7 +126,7 @@ "change_filament_gcode": "PAUSE", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "M140 S0\nM104 S0\nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json index 317b7b3499..75ceca6c79 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json @@ -126,7 +126,7 @@ "change_filament_gcode": "PAUSE", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "M140 S0\nM104 S0\nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.2 nozzle.json index 9b1fa97ba2..e27b0b3c54 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.2 nozzle.json @@ -117,7 +117,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "SET_GCODE_VARIABLE MACRO=PRINTER_PARAM VARIABLE=fan0_min VALUE=30 ;compensate for fan speed\nSET_VELOCITY_LIMIT ACCEL_TO_DECEL=2500 ;revert accel_to_decel back to 2500\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nM140 S[bed_temperature_initial_layer_single] ;Set bed temp\nG28 X Y ;Home XY axes\nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nG28 Z ;Home Z axis & load bed mesh\nBED_MESH_CALIBRATE PROBE_COUNT=5,5 ;Auto bed level\n\nM104 S[nozzle_temperature_initial_layer] ;Set nozzle temp\nG92 E0 ;Reset Extruder\nG1 X-2.0 Y20 Z0.3 F5000.0 ;Move to start position\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 Z0.2 ;Lower nozzle to printing height\nG1 Y145.0 F1500.0 E15 ;Draw the first line\nG1 X-1.7 F5000.0 ;Move to side a little\nG1 Y30 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder", "machine_end_gcode": "G92 E0 ;Reset Extruder\nG1 E-1.2 Z{max_layer_z + 0.5} F1800 ;Retract and raise Z\n{if max_layer_z < 50}\nG1 Z{max_layer_z + 25} F900 ;Raise Z more\n{endif}\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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json index a0a2f1fe1b..1607a8bd4e 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json @@ -117,7 +117,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "SET_GCODE_VARIABLE MACRO=PRINTER_PARAM VARIABLE=fan0_min VALUE=30 ;compensate for fan speed\nSET_VELOCITY_LIMIT ACCEL_TO_DECEL=2500 ;revert accel_to_decel back to 2500\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nM140 S[bed_temperature_initial_layer_single] ;Set bed temp\nG28 X Y ;Home XY axes\nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nG28 Z ;Home Z axis & load bed mesh\nBED_MESH_CALIBRATE PROBE_COUNT=5,5 ;Auto bed level\n\nM104 S[nozzle_temperature_initial_layer] ;Set nozzle temp\nG92 E0 ;Reset Extruder\nG1 X-2.0 Y20 Z0.3 F5000.0 ;Move to start position\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 Z0.2 ;Lower nozzle to printing height\nG1 Y145.0 F1500.0 E15 ;Draw the first line\nG1 X-1.7 F5000.0 ;Move to side a little\nG1 Y30 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder", "machine_end_gcode": "G92 E0 ;Reset Extruder\nG1 E-1.2 Z{max_layer_z + 0.5} F1800 ;Retract and raise Z\n{if max_layer_z < 50}\nG1 Z{max_layer_z + 25} F900 ;Raise Z more\n{endif}\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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.6 nozzle.json index 7141b3088f..cbc3d0cc58 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.6 nozzle.json @@ -117,7 +117,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "SET_GCODE_VARIABLE MACRO=PRINTER_PARAM VARIABLE=fan0_min VALUE=30 ;compensate for fan speed\nSET_VELOCITY_LIMIT ACCEL_TO_DECEL=2500 ;revert accel_to_decel back to 2500\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nM140 S[bed_temperature_initial_layer_single] ;Set bed temp\nG28 X Y ;Home XY axes\nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nG28 Z ;Home Z axis & load bed mesh\nBED_MESH_CALIBRATE PROBE_COUNT=5,5 ;Auto bed level\n\nM104 S[nozzle_temperature_initial_layer] ;Set nozzle temp\nG92 E0 ;Reset Extruder\nG1 X-2.0 Y20 Z0.3 F5000.0 ;Move to start position\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 Z0.2 ;Lower nozzle to printing height\nG1 Y145.0 F1500.0 E15 ;Draw the first line\nG1 X-1.7 F5000.0 ;Move to side a little\nG1 Y30 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder", "machine_end_gcode": "G92 E0 ;Reset Extruder\nG1 E-1.2 Z{max_layer_z + 0.5} F1800 ;Retract and raise Z\n{if max_layer_z < 50}\nG1 Z{max_layer_z + 25} F900 ;Raise Z more\n{endif}\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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.8 nozzle.json index da6689b46d..d4eadbf772 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.8 nozzle.json @@ -117,7 +117,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "SET_GCODE_VARIABLE MACRO=PRINTER_PARAM VARIABLE=fan0_min VALUE=30 ;compensate for fan speed\nSET_VELOCITY_LIMIT ACCEL_TO_DECEL=2500 ;revert accel_to_decel back to 2500\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nM140 S[bed_temperature_initial_layer_single] ;Set bed temp\nG28 X Y ;Home XY axes\nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nG28 Z ;Home Z axis & load bed mesh\nBED_MESH_CALIBRATE PROBE_COUNT=5,5 ;Auto bed level\n\nM104 S[nozzle_temperature_initial_layer] ;Set nozzle temp\nG92 E0 ;Reset Extruder\nG1 X-2.0 Y20 Z0.3 F5000.0 ;Move to start position\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 Z0.2 ;Lower nozzle to printing height\nG1 Y145.0 F1500.0 E15 ;Draw the first line\nG1 X-1.7 F5000.0 ;Move to side a little\nG1 Y30 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder", "machine_end_gcode": "G92 E0 ;Reset Extruder\nG1 E-1.2 Z{max_layer_z + 0.5} F1800 ;Retract and raise Z\n{if max_layer_z < 50}\nG1 Z{max_layer_z + 25} F900 ;Raise Z more\n{endif}\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", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json index 63ac65eec6..1911d1f0d0 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v3ke_buildplate_model.stl", "bed_texture": "creality_ender3v3ke_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" + "default_materials": "Generic ABS @Creality Ender-3V3-all;Generic ASA @Creality Ender-3V3-all;Generic PETG @Creality Ender-3V3-all;Generic PLA @Creality Ender-3V3-all;Generic PLA High Speed @Creality Ender-3V3-all;Generic PLA Matte @Creality Ender-3V3-all;Generic PLA Silk @Creality Ender-3V3-all;Generic TPU @Creality Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json index ac9f51f5cb..f9b91395ba 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.4 nozzle.json @@ -123,7 +123,7 @@ "change_filament_gcode": "PAUSE", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "M140 S0\nM104 S0\nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json index 52db2b831d..d0c4bee18a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus 0.6 nozzle.json @@ -123,7 +123,7 @@ "change_filament_gcode": "PAUSE", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "machine_start_gcode": "M140 S0\nM104 S0\nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json index b471a9ab08..919076763b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 Plus.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v3plus_buildplate_model.stl", "bed_texture": "creality_ender3v3plus_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" + "default_materials": "Generic ABS @Creality Ender-3V3-all;Generic ASA @Creality Ender-3V3-all;Generic PETG @Creality Ender-3V3-all;Generic PLA @Creality Ender-3V3-all;Generic PLA High Speed @Creality Ender-3V3-all;Generic PLA Matte @Creality Ender-3V3-all;Generic PLA Silk @Creality Ender-3V3-all;Generic TPU @Creality Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json index e75a79ce23..dc04436c04 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json @@ -118,7 +118,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "file_start_gcode": ";FLAVOR:Marlin\\n;TIME:{print_time_sec}\\n;Filament used:{used_filament_length}m\\n;Layer height:{layer_height}", "machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nM190 S[bed_temperature_initial_layer_single] ;Set and wait for bed temp to stabilize \nG28 ;Home \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize \nG1 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json index 59c207b62a..22df39dd1d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json @@ -118,7 +118,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "file_start_gcode": ";FLAVOR:Marlin\\n;TIME:{print_time_sec}\\n;Filament used:{used_filament_length}m\\n;Layer height:{layer_height}", "machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nM190 S[bed_temperature_initial_layer_single] ;Set and wait for bed temp to stabilize \nG28 ;Home \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize \nG1 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json index 713e8e7332..881a46fc3a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json @@ -118,7 +118,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "file_start_gcode": ";FLAVOR:Marlin\\n;TIME:{print_time_sec}\\n;Filament used:{used_filament_length}m\\n;Layer height:{layer_height}", "machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nM190 S[bed_temperature_initial_layer_single] ;Set and wait for bed temp to stabilize \nG28 ;Home \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize \nG1 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json index b904c4b7f3..44e9b97afb 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json @@ -118,7 +118,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA @Ender-3V3-all" + "Generic PLA @Creality Ender-3V3-all" ], "file_start_gcode": ";FLAVOR:Marlin\\n;TIME:{print_time_sec}\\n;Filament used:{used_filament_length}m\\n;Layer height:{layer_height}", "machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nM190 S[bed_temperature_initial_layer_single] ;Set and wait for bed temp to stabilize \nG28 ;Home \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize \nG1 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json index 2ceb56c108..71786a500d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v3se_buildplate_model.stl", "bed_texture": "creality_ender3v3se_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" + "default_materials": "Generic ABS @Creality Ender-3V3-all;Generic ASA @Creality Ender-3V3-all;Generic PETG @Creality Ender-3V3-all;Generic PLA @Creality Ender-3V3-all;Generic PLA High Speed @Creality Ender-3V3-all;Generic PLA Matte @Creality Ender-3V3-all;Generic PLA Silk @Creality Ender-3V3-all;Generic TPU @Creality Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3.json b/resources/profiles/Creality/machine/Creality Ender-3 V3.json index 74f5c275fc..5650e068aa 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v3_buildplate_model.stl", "bed_texture": "creality_ender3v3_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" + "default_materials": "Generic ABS @Creality Ender-3V3-all;Generic ASA @Creality Ender-3V3-all;Generic PETG @Creality Ender-3V3-all;Generic PLA @Creality Ender-3V3-all;Generic PLA High Speed @Creality Ender-3V3-all;Generic PLA Matte @Creality Ender-3V3-all;Generic PLA Silk @Creality Ender-3V3-all;Generic TPU @Creality Ender-3V3-all" } diff --git a/resources/profiles/Creality/machine/Creality Ender-3.json b/resources/profiles/Creality/machine/Creality Ender-3.json index 66a234e378..70bdb03d55 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3.json +++ b/resources/profiles/Creality/machine/Creality Ender-3.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender3v2_buildplate_model.stl", "bed_texture": "creality_ender3v2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json index c04de58097..44434bbf93 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json @@ -105,7 +105,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Max.json b/resources/profiles/Creality/machine/Creality Ender-5 Max.json index 8c5354fea2..9c10f97f05 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Max.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Max.json @@ -9,5 +9,5 @@ "bed_texture": "creality_ender5max_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Creality Hyper PLA-CF @Ender-5Max-all;Creality Hyper PLA @Ender-5Max-all;Creality Hyper ABS @Ender-5Max-all;Creality Generic TPU @Ender-5Max-all;Creality Generic ASA @Ender-5Max-all;Creality Silk PLA @Ender-5Max-all;Creality Generic PLA @Ender-5Max-all;Creality Generic PETG @Ender-5Max-all;Creality Generic ABS @Ender-5Max-all;Creality Generic PA @Ender-5Max-all" + "default_materials": "Creality Hyper PLA-CF @Ender-5Max-all;Creality Hyper PLA @Ender-5Max-all;Creality Hyper ABS @Ender-5Max-all;Generic TPU @Creality Ender-5Max-all;Generic ASA @Creality Ender-5Max-all;Creality Silk PLA @Ender-5Max-all;Generic PLA @Creality Ender-5Max-all;Generic PETG @Creality Ender-5Max-all;Generic ABS @Creality Ender-5Max-all;Generic PA @Creality Ender-5Max-all" } 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 bcca726c1b..66fea8f254 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 @@ -108,7 +108,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print bed down\nG1 X50 Y50 F{travel_speed*60} ; move print head out of the way\n{if max_layer_z < printable_height-10}G1 Z{z_offset+ printable_height-10} F600{endif} ; Move print bed close to the bottom\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Plus.json b/resources/profiles/Creality/machine/Creality Ender-5 Plus.json index 2950cdacf5..f672b4db0a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Plus.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Plus.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender5plus_buildplate_model.stl", "bed_texture": "creality_ender5plus_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.2 nozzle.json index 285297c0df..435b89d3c9 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.2 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.2", "default_print_profile": "0.16mm Optimal @Creality Ender5Pro (2019) 0.2", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.25 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.25 nozzle.json index 375ad54f20..a2bffd1951 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.25 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.25 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.25", "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) 0.25", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.3 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.3 nozzle.json index fc273af47e..62c133018f 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.3 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.3 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.3", "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) 0.3", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json index 860e1dcc05..87e58181e4 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019)", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.5 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.5 nozzle.json index 47ad87824a..e46303cd0b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.5 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.5 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.5", "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) 0.5", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.6 nozzle.json index 11a71495b2..ca4875c1eb 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.6 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.6", "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) 0.6", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.8 nozzle.json index 45332a9788..d3597d37af 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.8 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "0.8", "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) 0.8", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 1.0 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 1.0 nozzle.json index 5d5230f5af..841bab4eab 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 1.0 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 1.0 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Ender-5 Pro (2019)", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "printer_variant": "1.0", "default_print_profile": "0.28mm SuperDraft @Creality Ender5Pro (2019) 1.0", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json index 1863dd03c6..e8185a0458 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json @@ -8,5 +8,5 @@ "bed_model": "creality_ender5pro_buildplate_model.stl", "bed_texture": "creality_ender5pro_buildplate_texture.svg", "hotend_model": "hotend.stl", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json index 6ef5e99e94..58a98c2064 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json @@ -105,7 +105,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 S1.json b/resources/profiles/Creality/machine/Creality Ender-5 S1.json index 23ec29b299..8ef8baed2f 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 S1.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 S1.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender5s1_buildplate_model.stl", "bed_texture": "creality_ender5s1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5.json b/resources/profiles/Creality/machine/Creality Ender-5.json index f43c00b81b..72f2f30680 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5.json +++ b/resources/profiles/Creality/machine/Creality Ender-5.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender5_buildplate_model.stl", "bed_texture": "creality_ender5_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json index 5b9fbe6a66..c6068c5e24 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json @@ -101,7 +101,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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", diff --git a/resources/profiles/Creality/machine/Creality Ender-5S.json b/resources/profiles/Creality/machine/Creality Ender-5S.json index ff1f2633fa..a3dfb27ff6 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5S.json +++ b/resources/profiles/Creality/machine/Creality Ender-5S.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender5s_buildplate_model.stl", "bed_texture": "creality_ender5s_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json index 3e8b6f1216..d61f549c7f 100644 --- a/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json @@ -105,7 +105,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print bed down\nG1 X50 Y50 F{travel_speed*60} ; move print head out of the way\n{if max_layer_z < printable_height-10}G1 Z{z_offset+ printable_height-10} F600{endif} ; Move print bed close to the bottom\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", diff --git a/resources/profiles/Creality/machine/Creality Ender-6.json b/resources/profiles/Creality/machine/Creality Ender-6.json index f327bd97b0..9f3b5e2cc8 100644 --- a/resources/profiles/Creality/machine/Creality Ender-6.json +++ b/resources/profiles/Creality/machine/Creality Ender-6.json @@ -8,5 +8,5 @@ "bed_model": "creality_ender6_buildplate_model.stl", "bed_texture": "creality_ender6_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality Hi.json b/resources/profiles/Creality/machine/Creality Hi.json index c1b5173f32..107d587cc5 100644 --- a/resources/profiles/Creality/machine/Creality Hi.json +++ b/resources/profiles/Creality/machine/Creality Hi.json @@ -9,5 +9,5 @@ "bed_texture": "creality_hi_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "", - "default_materials": "Creality Generic ABS @Hi-all;Creality Generic ASA @Hi-all;Creality Generic ASA-CF @Hi-all;Creality Generic PETG @Hi-all;Creality Generic PETG-CF @Hi-all;Creality Generic PLA @Hi-all;Creality Generic PLA High Speed @Hi-all;Creality Generic PLA Matte @Hi-all;Creality Generic PLA Silk @Hi-all;Creality Generic PLA-CF @Hi-all;Creality Generic PLA Wood @Hi-all;Creality Generic TPU @Hi-all" + "default_materials": "Generic ABS @Creality Hi-all;Generic ASA @Creality Hi-all;Generic ASA-CF @Creality Hi-all;Generic PETG @Creality Hi-all;Generic PETG-CF @Creality Hi-all;Generic PLA @Creality Hi-all;Generic PLA High Speed @Creality Hi-all;Generic PLA Matte @Creality Hi-all;Generic PLA Silk @Creality Hi-all;Generic PLA-CF @Creality Hi-all;Generic PLA Wood @Creality Hi-all;Generic TPU @Creality Hi-all" } diff --git a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json index 4b1fad646b..4cde2d1f5e 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json @@ -121,7 +121,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X42 Y180 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality HF Generic PLA" + "Generic PLA HF @Creality" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json index 1a849f15d9..afaa516e7e 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json @@ -121,7 +121,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X42 Y180 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality HF Generic PLA" + "Generic PLA HF @Creality" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json index efc77b1623..417c088cb7 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json @@ -121,7 +121,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X42 Y180 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality HF Generic PLA" + "Generic PLA HF @Creality" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json index d41f4b8ec9..c3978a05eb 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json @@ -122,7 +122,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X0 Y245 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality HF Generic PLA" + "Generic PLA HF @Creality" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json index 8c0f630a43..2ebe0a97c2 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json @@ -122,7 +122,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X0 Y245 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality HF Generic PLA" + "Generic PLA HF @Creality" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json index 2593be039b..b59c1f54a4 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json @@ -122,7 +122,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X0 Y245 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality HF Generic PLA" + "Generic PLA HF @Creality" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1 Max.json b/resources/profiles/Creality/machine/Creality K1 Max.json index af8379ad83..3acfd1ec99 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max.json +++ b/resources/profiles/Creality/machine/Creality K1 Max.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1max_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality" } 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 0ffbbb8fc2..992ae60a0f 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 @@ -83,7 +83,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality HF Generic PLA" + "Generic PLA HF @Creality" ], "deretraction_speed": "40", "extruder_colour": "#FCE94F", diff --git a/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json b/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json index 426f93e8be..3016f2de6c 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json +++ b/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json @@ -9,5 +9,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_K1_Max_CFS_C", - "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality" } diff --git a/resources/profiles/Creality/machine/Creality K1 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1 SE 0.4 nozzle.json index fc50432dd0..95db217016 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1 SE 0.4 nozzle.json @@ -121,7 +121,7 @@ "manual_filament_change": "0", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", 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 93a4641702..b78cf80658 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 @@ -83,7 +83,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "deretraction_speed": "30", "extruder_colour": "#FCE94F", 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 aa98cb2b00..175ff1da66 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 @@ -83,7 +83,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "deretraction_speed": "30", "extruder_colour": "#FCE94F", diff --git a/resources/profiles/Creality/machine/Creality K1 SE.json b/resources/profiles/Creality/machine/Creality K1 SE.json index 82a8d97b63..9f6806ee46 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE.json +++ b/resources/profiles/Creality/machine/Creality K1 SE.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1se_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all" + "default_materials": "Generic ABS @Creality K1-all;Generic ASA @Creality K1-all;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality K1-all;Generic PLA @Creality K1-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality K1-all" } 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 14077b6693..510e17ecf5 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 @@ -82,7 +82,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "deretraction_speed": "30", "extruder_colour": "#FCE94F", diff --git a/resources/profiles/Creality/machine/Creality K1 SE_CFS-C.json b/resources/profiles/Creality/machine/Creality K1 SE_CFS-C.json index 7c41c72dff..835c133338 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE_CFS-C.json +++ b/resources/profiles/Creality/machine/Creality K1 SE_CFS-C.json @@ -9,5 +9,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_K1_SE_CFS_C", - "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all" + "default_materials": "Generic ABS @Creality K1-all;Generic ASA @Creality K1-all;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality K1-all;Generic PLA @Creality K1-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality K1-all" } diff --git a/resources/profiles/Creality/machine/Creality K1.json b/resources/profiles/Creality/machine/Creality K1.json index 4892cfbaca..60cd9142f1 100644 --- a/resources/profiles/Creality/machine/Creality K1.json +++ b/resources/profiles/Creality/machine/Creality K1.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PC @K1-all;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PETG;Creality Generic TPU" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PC @Creality K1-all;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PETG @Creality;Generic TPU @Creality" } diff --git a/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json index 87ccb311bf..5d8154c1f1 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json @@ -122,7 +122,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X42 Y180 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json index b00db3d173..73328c69f4 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json @@ -122,7 +122,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X42 Y180 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json index 069b665e5f..2c59727abf 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json @@ -122,7 +122,7 @@ "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X42 Y180 F30000\nG1 Z{z_after_toolchange} F600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "END_PRINT", diff --git a/resources/profiles/Creality/machine/Creality K1C.json b/resources/profiles/Creality/machine/Creality K1C.json index 7db363a7d7..4283aabfd4 100644 --- a/resources/profiles/Creality/machine/Creality K1C.json +++ b/resources/profiles/Creality/machine/Creality K1C.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1c_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all" + "default_materials": "Generic ABS @Creality K1-all;Generic ASA @Creality K1-all;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality K1-all;Generic PLA @Creality K1-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality K1-all" } 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 225b760c9c..b3221b0dd5 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 @@ -83,7 +83,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "deretraction_speed": "40", "extruder_colour": "#FCE94F", diff --git a/resources/profiles/Creality/machine/Creality K1C_CFS-C.json b/resources/profiles/Creality/machine/Creality K1C_CFS-C.json index 9cf7839332..6e80f1fbd4 100644 --- a/resources/profiles/Creality/machine/Creality K1C_CFS-C.json +++ b/resources/profiles/Creality/machine/Creality K1C_CFS-C.json @@ -9,5 +9,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_K1C_CFS_C", - "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all" + "default_materials": "Generic ABS @Creality K1-all;Generic ASA @Creality K1-all;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality K1-all;Generic PLA @Creality K1-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality K1-all" } 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 d4a7d9e913..04cb946b94 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 @@ -83,7 +83,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K1-all" + "Generic PLA @Creality K1-all" ], "deretraction_speed": "40", "extruder_colour": "#FCE94F", diff --git a/resources/profiles/Creality/machine/Creality K1_CFS-C.json b/resources/profiles/Creality/machine/Creality K1_CFS-C.json index 268a48e994..d0d7124dd2 100644 --- a/resources/profiles/Creality/machine/Creality K1_CFS-C.json +++ b/resources/profiles/Creality/machine/Creality K1_CFS-C.json @@ -9,5 +9,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_K1_CFS_C", - "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PC @K1-all;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PETG;Creality Generic TPU" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PC @Creality K1-all;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PETG @Creality;Generic TPU @Creality" } diff --git a/resources/profiles/Creality/machine/Creality K2 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality K2 0.2 nozzle.json index a0a342d406..c75b9d04f1 100644 --- a/resources/profiles/Creality/machine/Creality K2 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 0.2 nozzle.json @@ -122,7 +122,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "deretraction_speed": [ "40" diff --git a/resources/profiles/Creality/machine/Creality K2 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K2 0.4 nozzle.json index c3d6488839..1c28315013 100644 --- a/resources/profiles/Creality/machine/Creality K2 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 0.4 nozzle.json @@ -118,7 +118,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "deretraction_speed": [ "40" diff --git a/resources/profiles/Creality/machine/Creality K2 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K2 0.6 nozzle.json index b17c6f479a..8eb0c83877 100644 --- a/resources/profiles/Creality/machine/Creality K2 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 0.6 nozzle.json @@ -120,7 +120,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "deretraction_speed": [ "30" diff --git a/resources/profiles/Creality/machine/Creality K2 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K2 0.8 nozzle.json index 9d13607569..1281d5934d 100644 --- a/resources/profiles/Creality/machine/Creality K2 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 0.8 nozzle.json @@ -120,7 +120,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "deretraction_speed": [ "30" diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json index 52e7d360e9..356e6f571a 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.2 nozzle.json @@ -136,7 +136,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json index 93472b4dea..e74b47a143 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.4 nozzle.json @@ -136,7 +136,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json index 3b9009eb0c..9faca356d9 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.6 nozzle.json @@ -136,7 +136,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json index 285613858f..df47686765 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json @@ -136,7 +136,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Plus.json b/resources/profiles/Creality/machine/Creality K2 Plus.json index 68cde06cfe..d70e5e517a 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k2plus_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Creality Generic ABS @K2-all;Creality Generic ASA @K2-all;Creality Generic PETG @K2-all;Creality Generic PLA @K2-all;Creality Generic PLA High Speed @K2-all;Creality Generic PLA Matte @K2-all;Creality Generic PLA Silk @K2-all" + "default_materials": "Generic ABS @Creality K2-all;Generic ASA @Creality K2-all;Generic PETG @Creality K2-all;Generic PLA @Creality K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" } diff --git a/resources/profiles/Creality/machine/Creality K2 Pro 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Pro 0.2 nozzle.json index 08249a6136..c8c34d0b39 100644 --- a/resources/profiles/Creality/machine/Creality K2 Pro 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Pro 0.2 nozzle.json @@ -136,7 +136,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Pro 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Pro 0.4 nozzle.json index c9d74994d7..e55e947fac 100644 --- a/resources/profiles/Creality/machine/Creality K2 Pro 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Pro 0.4 nozzle.json @@ -134,7 +134,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Pro 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Pro 0.6 nozzle.json index b364acf29f..9ca340c779 100644 --- a/resources/profiles/Creality/machine/Creality K2 Pro 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Pro 0.6 nozzle.json @@ -134,7 +134,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Pro 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Pro 0.8 nozzle.json index 207c059d24..4cadba6946 100644 --- a/resources/profiles/Creality/machine/Creality K2 Pro 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Pro 0.8 nozzle.json @@ -134,7 +134,7 @@ "single_extruder_multi_material": "1", "manual_filament_change": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "_comment": "the generated by Creality_Print start gcode removes a warning/error message when printing with Orca because it thinks its sliced with CrealityPrint ", "machine_start_gcode": "; HEADER_BLOCK_START\n; generated by Creality_Print V7.0.1.4212 on [year]-[month]-[day] at [hour]:[minute]:[second]\n; total layer number: [total_layer_count]\n; HEADER_BLOCK_END\n; SET PRINT AREA MIN AND MAX COORDINATES TO ENABLE ADAPTIVE PROBING\n; MINX = {first_layer_print_min[0]}\n; MINY = {first_layer_print_min[1]}\n; MAXX = {first_layer_print_max[0]}\n; MAXY = {first_layer_print_max[1]}\nM140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 X0 Y0 E15 F6000\nG1 X150 Y0 E15 F6000\nG92 E0\nG1 Z1 F600", diff --git a/resources/profiles/Creality/machine/Creality K2 Pro.json b/resources/profiles/Creality/machine/Creality K2 Pro.json index d50ec5384a..3df797399b 100644 --- a/resources/profiles/Creality/machine/Creality K2 Pro.json +++ b/resources/profiles/Creality/machine/Creality K2 Pro.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k2pro_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "", - "default_materials": "Creality Generic ABS @K2-all;Creality Generic ASA @K2-all;Creality Generic PETG @K2-all;Creality Generic PLA @K2-all;Creality Generic PLA High Speed @K2-all;Creality Generic PLA Matte @K2-all;Creality Generic PLA Silk @K2-all" + "default_materials": "Generic ABS @Creality K2-all;Generic ASA @Creality K2-all;Generic PETG @Creality K2-all;Generic PLA @Creality K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" } 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 ebe24f655f..4b0e4754fc 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 @@ -83,7 +83,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @K2-all" + "Generic PLA @Creality K2-all" ], "deretraction_speed": "30", "extruder_colour": "#FCE94F", diff --git a/resources/profiles/Creality/machine/Creality K2 SE.json b/resources/profiles/Creality/machine/Creality K2 SE.json index 701d32c06e..5b7ec27ea0 100644 --- a/resources/profiles/Creality/machine/Creality K2 SE.json +++ b/resources/profiles/Creality/machine/Creality K2 SE.json @@ -9,5 +9,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_K2_SE", - "default_materials": "Creality Generic ABS @K2-all;Creality Generic ASA @K2-all;Creality Generic PETG @K2-all;Creality Generic PLA @K2-all;Creality Generic PLA High Speed @K2-all;Creality Generic PLA Matte @K2-all;Creality Generic PLA Silk @K2-all" + "default_materials": "Generic ABS @Creality K2-all;Generic ASA @Creality K2-all;Generic PETG @Creality K2-all;Generic PLA @Creality K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" } diff --git a/resources/profiles/Creality/machine/Creality K2.json b/resources/profiles/Creality/machine/Creality K2.json index 3baf9e4126..3ea29942b7 100644 --- a/resources/profiles/Creality/machine/Creality K2.json +++ b/resources/profiles/Creality/machine/Creality K2.json @@ -9,5 +9,5 @@ "default_bed_type": "Textured PEI Plate", "bed_texture": "creality_k2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Creality Generic ABS @K2-all;Creality Generic ASA @K2-all;Creality Generic PETG @K2-all;Creality Generic PLA @K2-all;Creality Generic PLA High Speed @K2-all;Creality Generic PLA Matte @K2-all;Creality Generic PLA Silk @K2-all" + "default_materials": "Generic ABS @Creality K2-all;Generic ASA @Creality K2-all;Generic PETG @Creality K2-all;Generic PLA @Creality K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" } diff --git a/resources/profiles/Creality/machine/Creality Sermoon V1 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Sermoon V1 0.4 nozzle.json index a3a6bfbfb1..2d7f0a63d8 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon V1 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Sermoon V1 0.4 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "printer_model": "Creality Sermoon V1", "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality Sermoon V1", "nozzle_diameter": [ diff --git a/resources/profiles/Creality/machine/Creality Sermoon V1.json b/resources/profiles/Creality/machine/Creality Sermoon V1.json index 1f7f26c390..7b14e8256e 100644 --- a/resources/profiles/Creality/machine/Creality Sermoon V1.json +++ b/resources/profiles/Creality/machine/Creality Sermoon V1.json @@ -11,5 +11,5 @@ "Spiral Lift" ], "hotend_model": "", - "default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS;Creality Generic TPU" + "default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality;Generic TPU @Creality" } diff --git a/resources/profiles/Creality/machine/fdm_creality_common.json b/resources/profiles/Creality/machine/fdm_creality_common.json index f3021ae1ed..1818e8b54b 100644 --- a/resources/profiles/Creality/machine/fdm_creality_common.json +++ b/resources/profiles/Creality/machine/fdm_creality_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Creality Generic PLA" + "Generic PLA @Creality" ], "default_print_profile": "0.20mm Standard @Creality", "bed_exclude_area": [ diff --git a/resources/profiles/DeltaMaker.json b/resources/profiles/DeltaMaker.json index c583fa9a16..c7209bdf2b 100755 --- a/resources/profiles/DeltaMaker.json +++ b/resources/profiles/DeltaMaker.json @@ -1,7 +1,7 @@ { "name": "DeltaMaker", "url": "", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "DeltaMaker configurations", "machine_model_list": [ @@ -58,20 +58,20 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "DeltaMaker Generic PETG", - "sub_path": "filament/DeltaMaker Generic PETG.json" + "name": "Generic PETG @DeltaMaker", + "sub_path": "filament/Generic PETG @DeltaMaker.json" }, { "name": "DeltaMaker Brand PLA", "sub_path": "filament/DeltaMaker Brand PLA.json" }, { - "name": "DeltaMaker Generic PLA", - "sub_path": "filament/DeltaMaker Generic PLA.json" + "name": "Generic PLA @DeltaMaker", + "sub_path": "filament/Generic PLA @DeltaMaker.json" }, { - "name": "DeltaMaker Generic TPU", - "sub_path": "filament/DeltaMaker Generic TPU.json" + "name": "Generic TPU @DeltaMaker", + "sub_path": "filament/Generic TPU @DeltaMaker.json" } ], "machine_list": [ diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PETG.json b/resources/profiles/DeltaMaker/filament/Generic PETG @DeltaMaker.json similarity index 82% rename from resources/profiles/DeltaMaker/filament/DeltaMaker Generic PETG.json rename to resources/profiles/DeltaMaker/filament/Generic PETG @DeltaMaker.json index 94a2707c85..a31ad9aec5 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PETG.json +++ b/resources/profiles/DeltaMaker/filament/Generic PETG @DeltaMaker.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "DeltaMaker Generic PETG", + "name": "Generic PETG @DeltaMaker", "inherits": "fdm_filament_pet", + "renamed_from": "DeltaMaker Generic PETG", "from": "system", - "setting_id": "qlQo6a93esZv2l9a", - "filament_id": "OF4oCRKe", + "setting_id": "XmKr3I3RjeI3hm6F", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PLA.json b/resources/profiles/DeltaMaker/filament/Generic PLA @DeltaMaker.json similarity index 70% rename from resources/profiles/DeltaMaker/filament/DeltaMaker Generic PLA.json rename to resources/profiles/DeltaMaker/filament/Generic PLA @DeltaMaker.json index 5a130f9040..2e2b626feb 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic PLA.json +++ b/resources/profiles/DeltaMaker/filament/Generic PLA @DeltaMaker.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "DeltaMaker Generic PLA", + "name": "Generic PLA @DeltaMaker", "inherits": "fdm_filament_pla", + "renamed_from": "DeltaMaker Generic PLA", "from": "system", - "setting_id": "gfxr3MiE4uI2Xxy7", - "filament_id": "OFifxPW1", + "setting_id": "ITJo0Cig9myqk1uB", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.987" diff --git a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic TPU.json b/resources/profiles/DeltaMaker/filament/Generic TPU @DeltaMaker.json similarity index 68% rename from resources/profiles/DeltaMaker/filament/DeltaMaker Generic TPU.json rename to resources/profiles/DeltaMaker/filament/Generic TPU @DeltaMaker.json index 3d02e90708..edfc8a1cd2 100755 --- a/resources/profiles/DeltaMaker/filament/DeltaMaker Generic TPU.json +++ b/resources/profiles/DeltaMaker/filament/Generic TPU @DeltaMaker.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "DeltaMaker Generic TPU", + "name": "Generic TPU @DeltaMaker", "inherits": "fdm_filament_tpu", + "renamed_from": "DeltaMaker Generic TPU", "from": "system", - "setting_id": "2L1U33wC0LofrMWs", - "filament_id": "OFbt04e0", + "setting_id": "uWHBbbhFzvWq0qUP", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/DeltaMaker/machine/DeltaMaker 2 0.35 nozzle.json b/resources/profiles/DeltaMaker/machine/DeltaMaker 2 0.35 nozzle.json index f28c54eedc..8e7f98c81d 100755 --- a/resources/profiles/DeltaMaker/machine/DeltaMaker 2 0.35 nozzle.json +++ b/resources/profiles/DeltaMaker/machine/DeltaMaker 2 0.35 nozzle.json @@ -22,6 +22,6 @@ ], "default_filament_profile": [ "DeltaMaker Brand PLA", - "DeltaMaker Generic PLA" + "Generic PLA @DeltaMaker" ] } diff --git a/resources/profiles/DeltaMaker/machine/DeltaMaker 2.json b/resources/profiles/DeltaMaker/machine/DeltaMaker 2.json index e7693bc7ce..7b57c1956b 100755 --- a/resources/profiles/DeltaMaker/machine/DeltaMaker 2.json +++ b/resources/profiles/DeltaMaker/machine/DeltaMaker 2.json @@ -7,5 +7,5 @@ "family": "DeltaMaker", "bed_model": "deltamaker_2_buildplate_model.stl", "bed_texture": "deltamaker_2_buildplate_texture.svg", - "default_materials": "DeltaMaker Brand PLA;DeltaMaker Generic PLA" + "default_materials": "DeltaMaker Brand PLA;Generic PLA @DeltaMaker" } diff --git a/resources/profiles/DeltaMaker/machine/DeltaMaker 2T 0.5 nozzle.json b/resources/profiles/DeltaMaker/machine/DeltaMaker 2T 0.5 nozzle.json index 4f83ddb32e..2b622e3c68 100755 --- a/resources/profiles/DeltaMaker/machine/DeltaMaker 2T 0.5 nozzle.json +++ b/resources/profiles/DeltaMaker/machine/DeltaMaker 2T 0.5 nozzle.json @@ -22,6 +22,6 @@ ], "default_filament_profile": [ "DeltaMaker Brand PLA", - "DeltaMaker Generic PLA" + "Generic PLA @DeltaMaker" ] } diff --git a/resources/profiles/DeltaMaker/machine/DeltaMaker 2T.json b/resources/profiles/DeltaMaker/machine/DeltaMaker 2T.json index 37b989997b..88846595bf 100755 --- a/resources/profiles/DeltaMaker/machine/DeltaMaker 2T.json +++ b/resources/profiles/DeltaMaker/machine/DeltaMaker 2T.json @@ -7,5 +7,5 @@ "family": "DeltaMaker", "bed_model": "deltamaker_2_buildplate_model.stl", "bed_texture": "deltamaker_2_buildplate_texture.svg", - "default_materials": "DeltaMaker Brand PLA;DeltaMaker Generic PLA" + "default_materials": "DeltaMaker Brand PLA;Generic PLA @DeltaMaker" } diff --git a/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT 0.5 nozzle.json b/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT 0.5 nozzle.json index 5ce9d45438..1767cda770 100755 --- a/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT 0.5 nozzle.json +++ b/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT 0.5 nozzle.json @@ -22,6 +22,6 @@ ], "default_filament_profile": [ "DeltaMaker Brand PLA", - "DeltaMaker Generic PLA" + "Generic PLA @DeltaMaker" ] } diff --git a/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT.json b/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT.json index 9d10697dd8..0b3870e4ac 100755 --- a/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT.json +++ b/resources/profiles/DeltaMaker/machine/DeltaMaker 2XT.json @@ -7,5 +7,5 @@ "family": "DeltaMaker", "bed_model": "deltamaker_2_buildplate_model.stl", "bed_texture": "deltamaker_2_buildplate_texture.svg", - "default_materials": "DeltaMaker Brand PLA;DeltaMaker Generic PLA" + "default_materials": "DeltaMaker Brand PLA;Generic PLA @DeltaMaker" } diff --git a/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json b/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json index 1033551ca9..ecfe431ef6 100755 --- a/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json +++ b/resources/profiles/DeltaMaker/machine/fdm_klipper_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "DeltaMaker Generic PLA" + "Generic PLA @DeltaMaker" ], "default_print_profile": "0.20mm Standard @DeltaMaker 2 0.35 nozzle", "bed_exclude_area": [ diff --git a/resources/profiles/Dremel.json b/resources/profiles/Dremel.json index c8462f0414..951763b563 100644 --- a/resources/profiles/Dremel.json +++ b/resources/profiles/Dremel.json @@ -1,6 +1,6 @@ { "name": "Dremel", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "Dremel configurations", "machine_model_list": [ @@ -89,20 +89,20 @@ "sub_path": "filament/fdm_filament_pla.json" }, { - "name": "Dremel Generic PLA", - "sub_path": "filament/Dremel Generic PLA.json" + "name": "Generic PLA @Dremel", + "sub_path": "filament/Generic PLA @Dremel.json" }, { - "name": "Dremel Generic PLA @3D20 all", - "sub_path": "filament/Dremel Generic PLA @3D20 all.json" + "name": "Generic PLA @Dremel 3D20 all", + "sub_path": "filament/Generic PLA @Dremel 3D20 all.json" }, { - "name": "Dremel Generic PLA @3D40 all", - "sub_path": "filament/Dremel Generic PLA @3D40 all.json" + "name": "Generic PLA @Dremel 3D40 all", + "sub_path": "filament/Generic PLA @Dremel 3D40 all.json" }, { - "name": "Dremel Generic PLA @3D45 all", - "sub_path": "filament/Dremel Generic PLA @3D45 all.json" + "name": "Generic PLA @Dremel 3D45 all", + "sub_path": "filament/Generic PLA @Dremel 3D45 all.json" } ], "machine_list": [ diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json similarity index 66% rename from resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json rename to resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json index 90d7a3e8af..e38769a288 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D20 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Dremel Generic PLA @3D20 all", - "inherits": "Dremel Generic PLA", + "name": "Generic PLA @Dremel 3D20 all", + "inherits": "Generic PLA @Dremel", + "renamed_from": "Dremel Generic PLA @3D20 all;Dremel Generic PLA 3D20 all", "from": "system", - "setting_id": "weKWPiNIe3TmOXRn", - "filament_id": "OFD2JNS1", + "setting_id": "UggXEvCig0b6S8Vx", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json similarity index 70% rename from resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json rename to resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json index 3fbcaefaa1..4c7afbe819 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D40 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Dremel Generic PLA @3D40 all", - "inherits": "Dremel Generic PLA", + "name": "Generic PLA @Dremel 3D40 all", + "inherits": "Generic PLA @Dremel", + "renamed_from": "Dremel Generic PLA @3D40 all;Dremel Generic PLA 3D40 all", "from": "system", - "setting_id": "kZAEjhLS29WQeyf1", - "filament_id": "OFD2JNS1", + "setting_id": "VUOtsWfy46cvAyBT", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json similarity index 74% rename from resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json rename to resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json index 0b0f6b155f..a40cebf06d 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA @3D45 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Dremel Generic PLA @3D45 all", - "inherits": "Dremel Generic PLA", + "name": "Generic PLA @Dremel 3D45 all", + "inherits": "Generic PLA @Dremel", + "renamed_from": "Dremel Generic PLA @3D45 all;Dremel Generic PLA 3D45 all", "from": "system", - "setting_id": "pIlkZjNrXnHJDszp", - "filament_id": "OFD2JNS1", + "setting_id": "qEeBb3Pix2iDT3SD", + "filament_id": "OFDSrzZ8", "instantiation": "true", "slow_down_min_speed": "10", "close_fan_the_first_x_layers": "3", diff --git a/resources/profiles/Dremel/filament/Dremel Generic PLA.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel.json similarity index 71% rename from resources/profiles/Dremel/filament/Dremel Generic PLA.json rename to resources/profiles/Dremel/filament/Generic PLA @Dremel.json index d46a8cebfa..9cf4e162f0 100644 --- a/resources/profiles/Dremel/filament/Dremel Generic PLA.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Dremel Generic PLA", + "name": "Generic PLA @Dremel", "inherits": "fdm_filament_pla", + "renamed_from": "Dremel Generic PLA", "from": "system", - "setting_id": "blJERdJqaaRmRdD4", - "filament_id": "OFaU2JxD", + "setting_id": "jYydSWbyE3JzoKnQ", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Dremel/machine/Dremel 3D20 0.4 nozzle.json b/resources/profiles/Dremel/machine/Dremel 3D20 0.4 nozzle.json index ea9490971a..02d513000c 100644 --- a/resources/profiles/Dremel/machine/Dremel 3D20 0.4 nozzle.json +++ b/resources/profiles/Dremel/machine/Dremel 3D20 0.4 nozzle.json @@ -10,7 +10,7 @@ "printer_structure": "hbot", "gcode_flavor": "marlin", "default_filament_profile": [ - "Dremel Generic PLA @3D20 all" + "Generic PLA @Dremel 3D20 all" ], "default_print_profile": ".20mm Standard @Dremel 3D20 0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Dremel/machine/Dremel 3D20.json b/resources/profiles/Dremel/machine/Dremel 3D20.json index ec37c0d8df..8aa43be862 100644 --- a/resources/profiles/Dremel/machine/Dremel 3D20.json +++ b/resources/profiles/Dremel/machine/Dremel 3D20.json @@ -8,5 +8,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Dremel_3D20", - "default_materials": "Dremel Generic PLA @3D20 all" + "default_materials": "Generic PLA @Dremel 3D20 all" } diff --git a/resources/profiles/Dremel/machine/Dremel 3D40 0.4 nozzle.json b/resources/profiles/Dremel/machine/Dremel 3D40 0.4 nozzle.json index d37a785099..db8a20003a 100644 --- a/resources/profiles/Dremel/machine/Dremel 3D40 0.4 nozzle.json +++ b/resources/profiles/Dremel/machine/Dremel 3D40 0.4 nozzle.json @@ -10,7 +10,7 @@ "printer_structure": "hbot", "gcode_flavor": "marlin", "default_filament_profile": [ - "Dremel Generic PLA @3D40 all" + "Generic PLA @Dremel 3D40 all" ], "default_print_profile": ".20mm Standard @Dremel 3D40 0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Dremel/machine/Dremel 3D40.json b/resources/profiles/Dremel/machine/Dremel 3D40.json index 3e3a003f2a..0223ced4d8 100644 --- a/resources/profiles/Dremel/machine/Dremel 3D40.json +++ b/resources/profiles/Dremel/machine/Dremel 3D40.json @@ -8,5 +8,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Dremel_3D40", - "default_materials": "Dremel Generic PLA @3D40 all" + "default_materials": "Generic PLA @Dremel 3D40 all" } diff --git a/resources/profiles/Dremel/machine/Dremel 3D45 0.4 nozzle.json b/resources/profiles/Dremel/machine/Dremel 3D45 0.4 nozzle.json index 8d6b26f34b..c8cf0666d0 100644 --- a/resources/profiles/Dremel/machine/Dremel 3D45 0.4 nozzle.json +++ b/resources/profiles/Dremel/machine/Dremel 3D45 0.4 nozzle.json @@ -10,7 +10,7 @@ "printer_settings_id": "Dremel", "gcode_flavor": "marlin", "default_filament_profile": [ - "Dremel Generic PLA @3D45 all" + "Generic PLA @Dremel 3D45 all" ], "default_print_profile": ".20mm Standard @Dremel 3D45 0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Dremel/machine/Dremel 3D45.json b/resources/profiles/Dremel/machine/Dremel 3D45.json index d32aac4977..f701b83188 100644 --- a/resources/profiles/Dremel/machine/Dremel 3D45.json +++ b/resources/profiles/Dremel/machine/Dremel 3D45.json @@ -8,5 +8,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Dremel_3D45", - "default_materials": "Dremel Generic PLA @3D45 all" + "default_materials": "Generic PLA @Dremel 3D45 all" } diff --git a/resources/profiles/Dremel/machine/fdm_dremel_common.json b/resources/profiles/Dremel/machine/fdm_dremel_common.json index 194559cdcf..6f7504f9fa 100644 --- a/resources/profiles/Dremel/machine/fdm_dremel_common.json +++ b/resources/profiles/Dremel/machine/fdm_dremel_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Dremel Generic PLA" + "Generic PLA @Dremel" ], "bed_exclude_area": [ "0x0" diff --git a/resources/profiles/FLSun.json b/resources/profiles/FLSun.json index 8e234dffca..364b3cf521 100644 --- a/resources/profiles/FLSun.json +++ b/resources/profiles/FLSun.json @@ -1,6 +1,6 @@ { "name": "FLSun", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "FLSun configurations", "machine_model_list": [ @@ -177,44 +177,44 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "FLSun Generic ABS", - "sub_path": "filament/FLSun Generic ABS.json" + "name": "Generic ABS @FLSun", + "sub_path": "filament/Generic ABS @FLSun.json" }, { - "name": "FLSun Generic ASA", - "sub_path": "filament/FLSun Generic ASA.json" + "name": "Generic ASA @FLSun", + "sub_path": "filament/Generic ASA @FLSun.json" }, { - "name": "FLSun Generic PA", - "sub_path": "filament/FLSun Generic PA.json" + "name": "Generic PA @FLSun", + "sub_path": "filament/Generic PA @FLSun.json" }, { - "name": "FLSun Generic PA-CF", - "sub_path": "filament/FLSun Generic PA-CF.json" + "name": "Generic PA-CF @FLSun", + "sub_path": "filament/Generic PA-CF @FLSun.json" }, { - "name": "FLSun Generic PC", - "sub_path": "filament/FLSun Generic PC.json" + "name": "Generic PC @FLSun", + "sub_path": "filament/Generic PC @FLSun.json" }, { - "name": "FLSun Generic PETG", - "sub_path": "filament/FLSun Generic PETG.json" + "name": "Generic PETG @FLSun", + "sub_path": "filament/Generic PETG @FLSun.json" }, { - "name": "FLSun Generic PLA", - "sub_path": "filament/FLSun Generic PLA.json" + "name": "Generic PLA @FLSun", + "sub_path": "filament/Generic PLA @FLSun.json" }, { - "name": "FLSun Generic PLA-CF", - "sub_path": "filament/FLSun Generic PLA-CF.json" + "name": "Generic PLA-CF @FLSun", + "sub_path": "filament/Generic PLA-CF @FLSun.json" }, { - "name": "FLSun Generic PVA", - "sub_path": "filament/FLSun Generic PVA.json" + "name": "Generic PVA @FLSun", + "sub_path": "filament/Generic PVA @FLSun.json" }, { - "name": "FLSun Generic TPU", - "sub_path": "filament/FLSun Generic TPU.json" + "name": "Generic TPU @FLSun", + "sub_path": "filament/Generic TPU @FLSun.json" }, { "name": "FLSun S1 ABS", @@ -241,8 +241,8 @@ "sub_path": "filament/FLSun T1 PETG.json" }, { - "name": "FLSun S1 PLA Generic", - "sub_path": "filament/FLSun S1 PLA Generic.json" + "name": "Generic PLA @FLSun S1", + "sub_path": "filament/Generic PLA @FLSun S1.json" }, { "name": "FLSun S1 PLA High Speed", @@ -253,8 +253,8 @@ "sub_path": "filament/FLSun S1 PLA Silk.json" }, { - "name": "FLSun T1 PLA Generic", - "sub_path": "filament/FLSun T1 PLA Generic.json" + "name": "Generic PLA @FLSun T1", + "sub_path": "filament/Generic PLA @FLSun T1.json" }, { "name": "FLSun T1 PLA High Speed", diff --git a/resources/profiles/FLSun/filament/FLSun S1 ABS.json b/resources/profiles/FLSun/filament/FLSun S1 ABS.json index f796202c3e..d097e75200 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ABS.json +++ b/resources/profiles/FLSun/filament/FLSun S1 ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun S1 ABS", - "inherits": "FLSun Generic ABS", + "inherits": "Generic ABS @FLSun", "from": "system", "setting_id": "tvpZ28Oe4Al7hlgj", "filament_id": "OFzzmK2Q", diff --git a/resources/profiles/FLSun/filament/FLSun S1 ASA.json b/resources/profiles/FLSun/filament/FLSun S1 ASA.json index fed430ca63..79d37b5e30 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ASA.json +++ b/resources/profiles/FLSun/filament/FLSun S1 ASA.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun S1 ASA", - "inherits": "FLSun Generic ASA", + "inherits": "Generic ASA @FLSun", "from": "system", "setting_id": "C5oyaWw3YVEz0CgE", "filament_id": "OFIK0xFa", diff --git a/resources/profiles/FLSun/filament/FLSun S1 PETG.json b/resources/profiles/FLSun/filament/FLSun S1 PETG.json index cf6a506da0..33e14b08a1 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PETG.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun S1 PETG", - "inherits": "FLSun Generic PETG", + "inherits": "Generic PETG @FLSun", "from": "system", "setting_id": "Ac6q0FtMFMLesFdU", "filament_id": "OF9z5LZ9", diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json b/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json index 8d9d662dda..f1cd779e91 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun S1 PLA High Speed", - "inherits": "FLSun Generic PLA", + "inherits": "Generic PLA @FLSun", "from": "system", "setting_id": "v2clpNXXo8m6dV33", "filament_id": "OFoqrHTw", diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json index 70946da40c..2d4a65f157 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun S1 PLA Silk", - "inherits": "FLSun Generic PLA", + "inherits": "Generic PLA @FLSun", "from": "system", "setting_id": "164Bn4YchxJAaLsa", "filament_id": "OFSStjay", diff --git a/resources/profiles/FLSun/filament/FLSun S1 TPU.json b/resources/profiles/FLSun/filament/FLSun S1 TPU.json index 0b3e6a00ee..1a495c4a0b 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 TPU.json +++ b/resources/profiles/FLSun/filament/FLSun S1 TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun S1 TPU", - "inherits": "FLSun Generic TPU", + "inherits": "Generic TPU @FLSun", "from": "system", "setting_id": "yzPvNqIo7mfWAwNS", "filament_id": "OF6ooviO", diff --git a/resources/profiles/FLSun/filament/FLSun T1 ABS.json b/resources/profiles/FLSun/filament/FLSun T1 ABS.json index fe7c8c15c8..8514ed0ecd 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ABS.json +++ b/resources/profiles/FLSun/filament/FLSun T1 ABS.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun T1 ABS", - "inherits": "FLSun Generic ABS", + "inherits": "Generic ABS @FLSun", "from": "system", "setting_id": "GP8VqRfidKOdj0ZJ", "filament_id": "OFV0KrAG", diff --git a/resources/profiles/FLSun/filament/FLSun T1 ASA.json b/resources/profiles/FLSun/filament/FLSun T1 ASA.json index 4633c41271..862fde6c6e 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ASA.json +++ b/resources/profiles/FLSun/filament/FLSun T1 ASA.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun T1 ASA", - "inherits": "FLSun Generic ASA", + "inherits": "Generic ASA @FLSun", "from": "system", "setting_id": "YmJbWfCQpNk9nxB7", "filament_id": "OFbjtPQy", diff --git a/resources/profiles/FLSun/filament/FLSun T1 PETG.json b/resources/profiles/FLSun/filament/FLSun T1 PETG.json index 869df6e538..5b2e6e471c 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PETG.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun T1 PETG", - "inherits": "FLSun Generic PETG", + "inherits": "Generic PETG @FLSun", "from": "system", "setting_id": "A2aA7xcmqgz8ERyY", "filament_id": "OFJ80y1e", diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json b/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json index 2d612ce865..814aa5b47c 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun T1 PLA High Speed", - "inherits": "FLSun Generic PLA", + "inherits": "Generic PLA @FLSun", "from": "system", "setting_id": "E4lpSLLlAxUW04ik", "filament_id": "OFQ9qnkd", diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json index e2a7bbeca2..f7b4b22751 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun T1 PLA Silk", - "inherits": "FLSun Generic PLA", + "inherits": "Generic PLA @FLSun", "from": "system", "setting_id": "gElUb4GnCoEfVlEd", "filament_id": "OFuUJyRx", diff --git a/resources/profiles/FLSun/filament/FLSun T1 TPU.json b/resources/profiles/FLSun/filament/FLSun T1 TPU.json index 63813ae149..3b25d65229 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 TPU.json +++ b/resources/profiles/FLSun/filament/FLSun T1 TPU.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "FLSun T1 TPU", - "inherits": "FLSun Generic TPU", + "inherits": "Generic TPU @FLSun", "from": "system", "setting_id": "34Ux18VB4d6R6G40", "filament_id": "OFENzGSm", diff --git a/resources/profiles/FLSun/filament/FLSun Generic ABS.json b/resources/profiles/FLSun/filament/Generic ABS @FLSun.json similarity index 71% rename from resources/profiles/FLSun/filament/FLSun Generic ABS.json rename to resources/profiles/FLSun/filament/Generic ABS @FLSun.json index 848034b3e1..2daf007fe9 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic ABS.json +++ b/resources/profiles/FLSun/filament/Generic ABS @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic ABS", + "name": "Generic ABS @FLSun", "inherits": "fdm_filament_abs", + "renamed_from": "FLSun Generic ABS", "from": "system", - "setting_id": "2f9nYaR0PUMkGvDD", - "filament_id": "OFWof1Ap", + "setting_id": "1lPapSrZbKMLBx6k", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/FLSun/filament/FLSun Generic ASA.json b/resources/profiles/FLSun/filament/Generic ASA @FLSun.json similarity index 71% rename from resources/profiles/FLSun/filament/FLSun Generic ASA.json rename to resources/profiles/FLSun/filament/Generic ASA @FLSun.json index bbea739d1d..e86f82f441 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic ASA.json +++ b/resources/profiles/FLSun/filament/Generic ASA @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic ASA", + "name": "Generic ASA @FLSun", "inherits": "fdm_filament_asa", + "renamed_from": "FLSun Generic ASA", "from": "system", - "setting_id": "9GPCRihSQTBRxkm3", - "filament_id": "OFCcsYtf", + "setting_id": "22OH64Yfg5sdyEmz", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PA.json b/resources/profiles/FLSun/filament/Generic PA @FLSun.json similarity index 74% rename from resources/profiles/FLSun/filament/FLSun Generic PA.json rename to resources/profiles/FLSun/filament/Generic PA @FLSun.json index 8f9908acbc..49fe8c01fc 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PA.json +++ b/resources/profiles/FLSun/filament/Generic PA @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic PA", + "name": "Generic PA @FLSun", "inherits": "fdm_filament_pa", + "renamed_from": "FLSun Generic PA", "from": "system", - "setting_id": "ek14AgskfJXeZ84u", - "filament_id": "OFeJjoKF", + "setting_id": "hlHGTLqHjaRfMkqC", + "filament_id": "OFg8ndtj", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PA-CF.json b/resources/profiles/FLSun/filament/Generic PA-CF @FLSun.json similarity index 75% rename from resources/profiles/FLSun/filament/FLSun Generic PA-CF.json rename to resources/profiles/FLSun/filament/Generic PA-CF @FLSun.json index 65f3c06b99..b6dc311dcf 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PA-CF.json +++ b/resources/profiles/FLSun/filament/Generic PA-CF @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic PA-CF", + "name": "Generic PA-CF @FLSun", "inherits": "fdm_filament_pa", + "renamed_from": "FLSun Generic PA-CF", "from": "system", - "setting_id": "2JOA0YeYZHj0lFmA", - "filament_id": "OFHQUAoZ", + "setting_id": "xiLUY07SM81i1pPs", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PC.json b/resources/profiles/FLSun/filament/Generic PC @FLSun.json similarity index 71% rename from resources/profiles/FLSun/filament/FLSun Generic PC.json rename to resources/profiles/FLSun/filament/Generic PC @FLSun.json index 4a111e609f..e4d81857d3 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PC.json +++ b/resources/profiles/FLSun/filament/Generic PC @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic PC", + "name": "Generic PC @FLSun", "inherits": "fdm_filament_pc", + "renamed_from": "FLSun Generic PC", "from": "system", - "setting_id": "wluYSRtaCqajFCYT", - "filament_id": "OFVqZ2H0", + "setting_id": "Ok08F2LxNjxor6ph", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PETG.json b/resources/profiles/FLSun/filament/Generic PETG @FLSun.json similarity index 84% rename from resources/profiles/FLSun/filament/FLSun Generic PETG.json rename to resources/profiles/FLSun/filament/Generic PETG @FLSun.json index f0cf97956e..84eaee1c7c 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PETG.json +++ b/resources/profiles/FLSun/filament/Generic PETG @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic PETG", + "name": "Generic PETG @FLSun", "inherits": "fdm_filament_pet", + "renamed_from": "FLSun Generic PETG", "from": "system", - "setting_id": "FCjlzoLFYn3IVxxD", - "filament_id": "OFJJpaLS", + "setting_id": "pWuJLjWhYMutD92n", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json b/resources/profiles/FLSun/filament/Generic PLA @FLSun S1.json similarity index 83% rename from resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json rename to resources/profiles/FLSun/filament/Generic PLA @FLSun S1.json index 8115a9cec6..5674ba8c27 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Generic.json +++ b/resources/profiles/FLSun/filament/Generic PLA @FLSun S1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun S1 PLA Generic", - "inherits": "FLSun Generic PLA", + "name": "Generic PLA @FLSun S1", + "inherits": "Generic PLA @FLSun", + "renamed_from": "FLSun S1 PLA Generic", "from": "system", - "setting_id": "z0Y9rQVZairHqwbi", - "filament_id": "OFoDgVnY", + "setting_id": "4f9vGTYsHDbZoVjs", + "filament_id": "OFDSrzZ8", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json b/resources/profiles/FLSun/filament/Generic PLA @FLSun T1.json similarity index 83% rename from resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json rename to resources/profiles/FLSun/filament/Generic PLA @FLSun T1.json index 16e048d536..93b9ac08d4 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Generic.json +++ b/resources/profiles/FLSun/filament/Generic PLA @FLSun T1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun T1 PLA Generic", - "inherits": "FLSun Generic PLA", + "name": "Generic PLA @FLSun T1", + "inherits": "Generic PLA @FLSun", + "renamed_from": "FLSun T1 PLA Generic", "from": "system", - "setting_id": "aUMHmlsPMYDicnPp", - "filament_id": "OFU0n0zW", + "setting_id": "5aJUZ6r6jtnvck19", + "filament_id": "OFDSrzZ8", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PLA.json b/resources/profiles/FLSun/filament/Generic PLA @FLSun.json similarity index 73% rename from resources/profiles/FLSun/filament/FLSun Generic PLA.json rename to resources/profiles/FLSun/filament/Generic PLA @FLSun.json index abc2303137..a4f8655ff9 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PLA.json +++ b/resources/profiles/FLSun/filament/Generic PLA @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic PLA", + "name": "Generic PLA @FLSun", "inherits": "fdm_filament_pla", + "renamed_from": "FLSun Generic PLA", "from": "system", - "setting_id": "ltWBfkc84nszWS19", - "filament_id": "OFJSksUs", + "setting_id": "JcpwaJCVC9MoJrPB", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json b/resources/profiles/FLSun/filament/Generic PLA-CF @FLSun.json similarity index 74% rename from resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json rename to resources/profiles/FLSun/filament/Generic PLA-CF @FLSun.json index 3aefb8ea4a..87b301513e 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PLA-CF.json +++ b/resources/profiles/FLSun/filament/Generic PLA-CF @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic PLA-CF", + "name": "Generic PLA-CF @FLSun", "inherits": "fdm_filament_pla", + "renamed_from": "FLSun Generic PLA-CF", "from": "system", - "setting_id": "FEdplifUKOSUA4XX", - "filament_id": "OFsF96Gt", + "setting_id": "teBJEScAMecyn3JU", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/FLSun/filament/FLSun Generic PVA.json b/resources/profiles/FLSun/filament/Generic PVA @FLSun.json similarity index 75% rename from resources/profiles/FLSun/filament/FLSun Generic PVA.json rename to resources/profiles/FLSun/filament/Generic PVA @FLSun.json index 30defb2258..9279ece682 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic PVA.json +++ b/resources/profiles/FLSun/filament/Generic PVA @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic PVA", + "name": "Generic PVA @FLSun", "inherits": "fdm_filament_pva", + "renamed_from": "FLSun Generic PVA", "from": "system", - "setting_id": "IohayLPyRIsZJ0GY", - "filament_id": "OFtP1rqJ", + "setting_id": "hyVWJBubfQl497iO", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/FLSun/filament/FLSun Generic TPU.json b/resources/profiles/FLSun/filament/Generic TPU @FLSun.json similarity index 69% rename from resources/profiles/FLSun/filament/FLSun Generic TPU.json rename to resources/profiles/FLSun/filament/Generic TPU @FLSun.json index 63e0826eef..70d1b8c42a 100644 --- a/resources/profiles/FLSun/filament/FLSun Generic TPU.json +++ b/resources/profiles/FLSun/filament/Generic TPU @FLSun.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FLSun Generic TPU", + "name": "Generic TPU @FLSun", "inherits": "fdm_filament_tpu", + "renamed_from": "FLSun Generic TPU", "from": "system", - "setting_id": "hewisceC8FmSwzF4", - "filament_id": "OFMoLF46", + "setting_id": "gJ3UZr4n4K8DPdBz", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/FLSun/machine/FLSun Q5 0.4 nozzle.json b/resources/profiles/FLSun/machine/FLSun Q5 0.4 nozzle.json index 66fb95ccc6..3642cce4fb 100644 --- a/resources/profiles/FLSun/machine/FLSun Q5 0.4 nozzle.json +++ b/resources/profiles/FLSun/machine/FLSun Q5 0.4 nozzle.json @@ -180,7 +180,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M400 U1\n", "default_filament_profile": [ - "FLSun Generic PLA" + "Generic PLA @FLSun" ], "machine_start_gcode": ";STARTGCODE\nM117 Initializing\n; G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM107\nG28 ;Home\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\n\nG92 E0\nG1 X-98 Y0 Z0.2 F4000 ; move to arc start\nG3 X0 Y-98 I98 Z0.2 E40 F400 ; lay arc stripe 90deg\nG0 Z1 \nG92 E0.0\n", "machine_end_gcode": "M107\nM104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\n;M84\nM18 S180 ;disable motors after 180s\n", diff --git a/resources/profiles/FLSun/machine/FLSun Q5.json b/resources/profiles/FLSun/machine/FLSun Q5.json index f7825cb4fa..001c4cb149 100644 --- a/resources/profiles/FLSun/machine/FLSun Q5.json +++ b/resources/profiles/FLSun/machine/FLSun Q5.json @@ -8,5 +8,5 @@ "bed_model": "flsun_q5_buildplate_model.stl", "bed_texture": "flsun_q5_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF" + "default_materials": "Generic ABS @FLSun;Generic PLA @FLSun;Generic PLA-CF @FLSun;Generic PETG @FLSun;Generic TPU @FLSun;Generic ASA @FLSun;Generic PC @FLSun;Generic PVA @FLSun;Generic PA @FLSun;Generic PA-CF @FLSun" } diff --git a/resources/profiles/FLSun/machine/FLSun QQ-S Pro 0.4 nozzle.json b/resources/profiles/FLSun/machine/FLSun QQ-S Pro 0.4 nozzle.json index ef1dd22c15..e2444d404c 100644 --- a/resources/profiles/FLSun/machine/FLSun QQ-S Pro 0.4 nozzle.json +++ b/resources/profiles/FLSun/machine/FLSun QQ-S Pro 0.4 nozzle.json @@ -180,7 +180,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M400 U1\n", "default_filament_profile": [ - "FLSun Generic PLA" + "Generic PLA @FLSun" ], "machine_start_gcode": ";STARTGCODE\nM117 Initializing\n; Set coordinate modes\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; Reset speed and extrusion rates\nM200 D0 ; disable volumetric E\nM220 S100 ; reset speed\n; Set initial warmup temps\nM117 Nozzle preheat\nM104 S100 ; preheat extruder to no ooze temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed final temp\nM300 S40 P10 ; Bip\n; Home\nM117 Homing\nG28 ; home all with default mesh bed level\n; For ABL users put G29 for a leveling request\n; Final warmup routine\nM117 Final warmup\nM104 S[nozzle_temperature_initial_layer] ; set extruder final temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder final temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed final temp\nM300 S440 P200; 1st beep for printer ready and allow some time to clean nozzle\nM300 S0 P250; wait between dual beep\nM300 S440 P200; 2nd beep for printer ready\nG4 S10; wait to clean the nozzle\nM300 S440 P200; 3rd beep for ready to start printing\n; Prime line routine\nM117 Printing prime line\n;M900 K0; Disable Linear Advance (Marlin) for prime line\nG92 E0.0; reset extrusion distance\nG1 X-54.672 Y-95.203 Z0.3 F4000; go outside print area\nG92 E0.0; reset extrusion distance\nG1 E2 F1000 ; de-retract and push ooze\nG3 X38.904 Y-102.668 I54.672 J95.105 E20.999\nG3 X54.671 Y-95.203 I-38.815 J102.373 E5.45800\nG92 E0.0\nG1 E-5 F3000 ; retract 5mm\nG1 X52.931 Y-96.185 F1000 ; wipe\nG1 X50.985 Y-97.231 F1000 ; wipe\nG1 X49.018 Y-98.238 F1000 ; wipe\nG1 X0 Y-109.798 F1000\nG1 E4.8 F1500; de-retract\nG92 E0.0 ; reset extrusion distance\n; Final print adjustments\nM117 Preparing to print\n;M82 ; extruder absolute mode\nM221 S{if layer_height<0.075}100{else}95{endif}\nM300 S40 P10 ; chirp\nM117 Print [input_filename_base]; Display: Printing started...", "machine_end_gcode": "; printing object ENDGCODE\nG92 E0.0 ; prepare to retract\nG1 E-6 F3000; retract to avoid stringing\n; Anti-stringing end wiggle\n{if layer_z < max_print_height}G1 Z{min(layer_z+100, max_print_height)}{endif} F4000 ; Move print head up\nG1 X0 Y120 F3000 ; present print\n; Reset print setting overrides\nG92 E0\nM200 D0 ; disable volumetric e\nM220 S100 ; reset speed factor to 100%\nM221 S100 ; reset extruder factor to 100%\n;M900 K0 ; reset linear acceleration(Marlin)\n; Shut down printer\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM18 S180 ;disable motors after 180s\nM300 S40 P10 ; Bip\nM117 Print finish.", diff --git a/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json b/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json index 3b3cf86676..f360405471 100644 --- a/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json +++ b/resources/profiles/FLSun/machine/FLSun QQ-S Pro.json @@ -8,5 +8,5 @@ "bed_model": "flsun_qqspro_buildplate_model.stl", "bed_texture": "flsun_qqspro_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF" + "default_materials": "Generic ABS @FLSun;Generic PLA @FLSun;Generic PLA-CF @FLSun;Generic PETG @FLSun;Generic TPU @FLSun;Generic ASA @FLSun;Generic PC @FLSun;Generic PVA @FLSun;Generic PA @FLSun;Generic PA-CF @FLSun" } diff --git a/resources/profiles/FLSun/machine/FLSun S1.json b/resources/profiles/FLSun/machine/FLSun S1.json index 5b730f3c3b..597480c25f 100644 --- a/resources/profiles/FLSun/machine/FLSun S1.json +++ b/resources/profiles/FLSun/machine/FLSun S1.json @@ -8,5 +8,5 @@ "bed_model": "flsun_s1_buildplate_model.stl", "bed_texture": "FLSun_S1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun S1 PLA High Speed;FLSun S1 PLA Silk;FLSun S1 PLA Generic;FLSun S1 PETG;FLSun S1 ASA;FLSun S1 TPU;FLSun S1 ABS" + "default_materials": "FLSun S1 PLA High Speed;FLSun S1 PLA Silk;Generic PLA @FLSun S1;FLSun S1 PETG;FLSun S1 ASA;FLSun S1 TPU;FLSun S1 ABS" } diff --git a/resources/profiles/FLSun/machine/FLSun SR 0.4 nozzle.json b/resources/profiles/FLSun/machine/FLSun SR 0.4 nozzle.json index b6fac6caa7..78731a1481 100644 --- a/resources/profiles/FLSun/machine/FLSun SR 0.4 nozzle.json +++ b/resources/profiles/FLSun/machine/FLSun SR 0.4 nozzle.json @@ -13,7 +13,7 @@ ], "nozzle_type": "brass", "default_filament_profile": [ - "FLSun Generic PLA" + "Generic PLA @FLSun" ], "bed_exclude_area": [ "0x0" diff --git a/resources/profiles/FLSun/machine/FLSun SR.json b/resources/profiles/FLSun/machine/FLSun SR.json index 54e40302e2..6a26773ece 100644 --- a/resources/profiles/FLSun/machine/FLSun SR.json +++ b/resources/profiles/FLSun/machine/FLSun SR.json @@ -8,5 +8,5 @@ "bed_model": "flsun_SR_buildplate_model.stl", "bed_texture": "flsun_SR_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF" + "default_materials": "Generic ABS @FLSun;Generic PLA @FLSun;Generic PLA-CF @FLSun;Generic PETG @FLSun;Generic TPU @FLSun;Generic ASA @FLSun;Generic PC @FLSun;Generic PVA @FLSun;Generic PA @FLSun;Generic PA-CF @FLSun" } diff --git a/resources/profiles/FLSun/machine/FLSun T1.json b/resources/profiles/FLSun/machine/FLSun T1.json index 8fda638772..45a7a290b1 100644 --- a/resources/profiles/FLSun/machine/FLSun T1.json +++ b/resources/profiles/FLSun/machine/FLSun T1.json @@ -8,5 +8,5 @@ "bed_model": "flsun_T1_buildplate_model.stl", "bed_texture": "FLSun_T1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun T1 PLA High Speed;FLSun T1 PLA Silk;FLSun T1 PLA Generic;FLSun T1 PETG;FLSun T1 ASA;FLSun T1 TPU;FLSun T1 ABS" + "default_materials": "FLSun T1 PLA High Speed;FLSun T1 PLA Silk;Generic PLA @FLSun T1;FLSun T1 PETG;FLSun T1 ASA;FLSun T1 TPU;FLSun T1 ABS" } diff --git a/resources/profiles/FLSun/machine/FLSun V400.json b/resources/profiles/FLSun/machine/FLSun V400.json index 605e51e229..33fc9981ed 100644 --- a/resources/profiles/FLSun/machine/FLSun V400.json +++ b/resources/profiles/FLSun/machine/FLSun V400.json @@ -8,5 +8,5 @@ "bed_model": "flsun_v400_buildplate_model.stl", "bed_texture": "flsun_v400_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun Generic ABS;FLSun Generic PLA;FLSun Generic PLA-CF;FLSun Generic PETG;FLSun Generic TPU;FLSun Generic ASA;FLSun Generic PC;FLSun Generic PVA;FLSun Generic PA;FLSun Generic PA-CF" + "default_materials": "Generic ABS @FLSun;Generic PLA @FLSun;Generic PLA-CF @FLSun;Generic PETG @FLSun;Generic TPU @FLSun;Generic ASA @FLSun;Generic PC @FLSun;Generic PVA @FLSun;Generic PA @FLSun;Generic PA-CF @FLSun" } diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index 661d171771..63c09f65af 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -1,7 +1,7 @@ { "name": "Flashforge", "url": "", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "Flashforge configurations", "machine_model_list": [ @@ -550,20 +550,20 @@ "sub_path": "filament/Flashforge/Flashforge ABS @FF AD3.json" }, { - "name": "Flashforge Generic ABS", - "sub_path": "filament/Flashforge Generic ABS.json" + "name": "Generic ABS @Flashforge", + "sub_path": "filament/Generic ABS @Flashforge.json" }, { - "name": "Flashforge Generic ASA", - "sub_path": "filament/Flashforge Generic ASA.json" + "name": "Generic ASA @Flashforge", + "sub_path": "filament/Generic ASA @Flashforge.json" }, { - "name": "Flashforge Generic PETG", - "sub_path": "filament/Flashforge Generic PETG.json" + "name": "Generic PETG @Flashforge", + "sub_path": "filament/Generic PETG @Flashforge.json" }, { - "name": "Flashforge Generic PETG-CF10", - "sub_path": "filament/Flashforge Generic PETG-CF10.json" + "name": "Generic PETG-CF10 @Flashforge", + "sub_path": "filament/Generic PETG-CF10 @Flashforge.json" }, { "name": "Flashforge PETG", @@ -578,20 +578,20 @@ "sub_path": "filament/SUNLU/SUNLU PETG @base.json" }, { - "name": "Flashforge Generic HS PLA", - "sub_path": "filament/Flashforge Generic HS PLA.json" + "name": "Generic HS PLA @Flashforge", + "sub_path": "filament/Generic HS PLA @Flashforge.json" }, { - "name": "Flashforge Generic PLA", - "sub_path": "filament/Flashforge Generic PLA.json" + "name": "Generic PLA @Flashforge", + "sub_path": "filament/Generic PLA @Flashforge.json" }, { - "name": "Flashforge Generic PLA-CF10", - "sub_path": "filament/Flashforge Generic PLA-CF10.json" + "name": "Generic PLA-CF10 @Flashforge", + "sub_path": "filament/Generic PLA-CF10 @Flashforge.json" }, { - "name": "Flashforge Generic PLA-Silk", - "sub_path": "filament/Flashforge Generic PLA-Silk.json" + "name": "Generic PLA-Silk @Flashforge", + "sub_path": "filament/Generic PLA-Silk @Flashforge.json" }, { "name": "Flashforge PLA", @@ -622,8 +622,8 @@ "sub_path": "filament/SUNLU/SUNLU Wood PLA @base.json" }, { - "name": "Flashforge Generic TPU", - "sub_path": "filament/Flashforge Generic TPU.json" + "name": "Generic TPU @Flashforge", + "sub_path": "filament/Generic TPU @Flashforge.json" }, { "name": "Flashforge ABS @FF AD5M 0.25 Nozzle", @@ -690,28 +690,28 @@ "sub_path": "filament/Flashforge ASA-CF @FF G4P.json" }, { - "name": "Flashforge Generic ABS @FF AD5M 0.25 Nozzle", - "sub_path": "filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json" + "name": "Generic ABS @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Generic ABS @FF AD5M 0.25 Nozzle.json" }, { - "name": "Flashforge Generic ABS @G3U", - "sub_path": "filament/Flashforge Generic ABS @G3U.json" + "name": "Generic ABS @Flashforge G3U", + "sub_path": "filament/Generic ABS @Flashforge G3U.json" }, { - "name": "Flashforge Generic ABS @G3U 0.6 Nozzle", - "sub_path": "filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json" + "name": "Generic ABS @Flashforge G3U 0.6 Nozzle", + "sub_path": "filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json" }, { - "name": "Flashforge Generic ASA @G3U", - "sub_path": "filament/Flashforge Generic ASA @G3U.json" + "name": "Generic ASA @Flashforge G3U", + "sub_path": "filament/Generic ASA @Flashforge G3U.json" }, { - "name": "Flashforge Generic HIPS", - "sub_path": "filament/Flashforge Generic HIPS.json" + "name": "Generic HIPS @Flashforge", + "sub_path": "filament/Generic HIPS @Flashforge.json" }, { - "name": "Flashforge Generic HIPS @G3U 0.6 Nozzle", - "sub_path": "filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json" + "name": "Generic HIPS @Flashforge G3U 0.6 Nozzle", + "sub_path": "filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json" }, { "name": "Generic ABS @Flashforge AD4", @@ -726,44 +726,44 @@ "sub_path": "filament/Flashforge ASA Basic.json" }, { - "name": "Flashforge Generic ASA @FF AD5M 0.25 Nozzle", - "sub_path": "filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json" + "name": "Generic ASA @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Generic ASA @FF AD5M 0.25 Nozzle.json" }, { - "name": "Flashforge Generic ASA @G3U 0.6 Nozzle", - "sub_path": "filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json" + "name": "Generic ASA @Flashforge G3U 0.6 Nozzle", + "sub_path": "filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json" }, { "name": "Generic ASA @Flashforge AD4", "sub_path": "filament/Generic ASA @Flashforge AD4.json" }, { - "name": "Flashforge Generic PETG @FF AD5M 0.25 Nozzle", - "sub_path": "filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json" + "name": "Generic PETG @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Generic PETG @FF AD5M 0.25 Nozzle.json" }, { - "name": "Flashforge Generic PETG @G3U", - "sub_path": "filament/Flashforge Generic PETG @G3U.json" + "name": "Generic PETG @Flashforge G3U", + "sub_path": "filament/Generic PETG @Flashforge G3U.json" }, { - "name": "Flashforge Generic PETG @G3U 0.6 Nozzle", - "sub_path": "filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json" + "name": "Generic PETG @Flashforge G3U 0.6 Nozzle", + "sub_path": "filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json" }, { - "name": "Flashforge Generic PETG @G3U 0.8 Nozzle", - "sub_path": "filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json" + "name": "Generic PETG @Flashforge G3U 0.8 Nozzle", + "sub_path": "filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json" }, { - "name": "Flashforge Generic PETG-CF @G3U", - "sub_path": "filament/Flashforge Generic PETG-CF @G3U.json" + "name": "Generic PETG-CF @Flashforge G3U", + "sub_path": "filament/Generic PETG-CF @Flashforge G3U.json" }, { - "name": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", - "sub_path": "filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json" + "name": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle", + "sub_path": "filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json" }, { - "name": "Flashforge Generic PETG-CF @G3U 0.8 Nozzle", - "sub_path": "filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json" + "name": "Generic PETG-CF @Flashforge G3U 0.8 Nozzle", + "sub_path": "filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json" }, { "name": "Flashforge HS PETG", @@ -854,40 +854,40 @@ "sub_path": "filament/Flashforge PETG-CF @FF G4P.json" }, { - "name": "FusRock Generic NexPA-CF25", - "sub_path": "filament/FusRock/FusRock Generic NexPA-CF25.json" + "name": "FusRock NexPA-CF25", + "sub_path": "filament/FusRock/FusRock NexPA-CF25.json" }, { - "name": "FusRock Generic PAHT-CF", - "sub_path": "filament/FusRock/FusRock Generic PAHT-CF.json" + "name": "FusRock PAHT-CF", + "sub_path": "filament/FusRock/FusRock PAHT-CF.json" }, { - "name": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", - "sub_path": "filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json" + "name": "FusRock PAHT-CF @G3U 0.6 Nozzle", + "sub_path": "filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json" }, { - "name": "FusRock Generic PET-CF", - "sub_path": "filament/FusRock/FusRock Generic PET-CF.json" + "name": "FusRock PET-CF", + "sub_path": "filament/FusRock/FusRock PET-CF.json" }, { - "name": "FusRock Generic PET-CF @G3U 0.6 Nozzle", - "sub_path": "filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json" + "name": "FusRock PET-CF @G3U 0.6 Nozzle", + "sub_path": "filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json" }, { - "name": "FusRock Generic S-Multi", - "sub_path": "filament/FusRock/FusRock Generic S-Multi.json" + "name": "FusRock S-Multi", + "sub_path": "filament/FusRock/FusRock S-Multi.json" }, { - "name": "FusRock Generic S-Multi @G3U 0.6 Nozzle", - "sub_path": "filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json" + "name": "FusRock S-Multi @G3U 0.6 Nozzle", + "sub_path": "filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json" }, { - "name": "FusRock Generic S-PAHT", - "sub_path": "filament/FusRock/FusRock Generic S-PAHT.json" + "name": "FusRock S-PAHT", + "sub_path": "filament/FusRock/FusRock S-PAHT.json" }, { - "name": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", - "sub_path": "filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json" + "name": "FusRock S-PAHT @G3U 0.6 Nozzle", + "sub_path": "filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json" }, { "name": "Generic PETG @Flashforge AD4", @@ -930,8 +930,8 @@ "sub_path": "filament/SUNLU/SUNLU PETG @FF AD5M 0.8 nozzle.json" }, { - "name": "Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle", - "sub_path": "filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json" + "name": "Generic HS PLA @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Generic HS PLA @FF AD5M 0.25 Nozzle.json" }, { "name": "Flashforge HIPS @FF G4", @@ -1038,36 +1038,36 @@ "sub_path": "filament/Generic PLA High Speed @Flashforge AD4.json" }, { - "name": "Flashforge Generic PLA @FF AD5M 0.25 Nozzle", - "sub_path": "filament/Flashforge Generic PLA @FF AD5M 0.25 Nozzle.json" + "name": "Generic PLA @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Generic PLA @FF AD5M 0.25 Nozzle.json" }, { - "name": "Flashforge Generic PLA @G3U", - "sub_path": "filament/Flashforge Generic PLA @G3U.json" + "name": "Generic PLA @Flashforge G3U", + "sub_path": "filament/Generic PLA @Flashforge G3U.json" }, { - "name": "Flashforge Generic PLA @G3U 0.6 Nozzle", - "sub_path": "filament/Flashforge Generic PLA @G3U 0.6 Nozzle.json" + "name": "Generic PLA @Flashforge G3U 0.6 Nozzle", + "sub_path": "filament/Generic PLA @Flashforge G3U 0.6 Nozzle.json" }, { - "name": "Flashforge Generic PLA @G3U 0.8 Nozzle", - "sub_path": "filament/Flashforge Generic PLA @G3U 0.8 Nozzle.json" + "name": "Generic PLA @Flashforge G3U 0.8 Nozzle", + "sub_path": "filament/Generic PLA @Flashforge G3U 0.8 Nozzle.json" }, { - "name": "Flashforge Generic PLA-CF @G3U", - "sub_path": "filament/Flashforge Generic PLA-CF @G3U.json" + "name": "Generic PLA-CF @Flashforge G3U", + "sub_path": "filament/Generic PLA-CF @Flashforge G3U.json" }, { - "name": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", - "sub_path": "filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json" + "name": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle", + "sub_path": "filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json" }, { - "name": "Flashforge Generic PLA-CF @G3U 0.8 Nozzle", - "sub_path": "filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json" + "name": "Generic PLA-CF @Flashforge G3U 0.8 Nozzle", + "sub_path": "filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json" }, { - "name": "Flashforge Generic PVA", - "sub_path": "filament/Flashforge Generic PVA.json" + "name": "Generic PVA @Flashforge", + "sub_path": "filament/Generic PVA @Flashforge.json" }, { "name": "Flashforge HS PLA", @@ -1222,12 +1222,12 @@ "sub_path": "filament/Generic PLA @Flashforge AD4.json" }, { - "name": "Polymaker Generic CoPA", - "sub_path": "filament/Polymaker/Polymaker Generic CoPA.json" + "name": "Polymaker CoPA", + "sub_path": "filament/Polymaker/Polymaker CoPA.json" }, { - "name": "Polymaker Generic S1", - "sub_path": "filament/Polymaker/Polymaker Generic S1.json" + "name": "Polymaker S1", + "sub_path": "filament/Polymaker/Polymaker S1.json" }, { "name": "Flashforge PA-CF @FF G4", @@ -1290,8 +1290,8 @@ "sub_path": "filament/Generic PLA-CF10 @Flashforge AD4.json" }, { - "name": "Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", - "sub_path": "filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json" + "name": "Generic PLA-SILK @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Generic PLA-SILK @FF AD5M 0.25 Nozzle.json" }, { "name": "Flashforge PLA Silk", @@ -1866,8 +1866,8 @@ "sub_path": "filament/Flashforge PPS-CF.json" }, { - "name": "FusRock Generic PAHT-GF", - "sub_path": "filament/FusRock/FusRock Generic PAHT-GF.json" + "name": "FusRock PAHT-GF", + "sub_path": "filament/FusRock/FusRock PAHT-GF.json" }, { "name": "FusRock PAHT-CF @FF G4 0.6 nozzle", @@ -1894,8 +1894,8 @@ "sub_path": "filament/Flashforge PET-CF.json" }, { - "name": "FusRock Generic PET-GF", - "sub_path": "filament/FusRock/FusRock Generic PET-GF.json" + "name": "FusRock PET-GF", + "sub_path": "filament/FusRock/FusRock PET-GF.json" }, { "name": "FlashForge PPS @FF G4 0.6 HF nozzle", 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 76629e1a35..bd7ef806a7 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PC @FF G4 0.6 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "M9HM8tihJzV4crs8", "filament_id": "OFe6sfXS", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], 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 e9a09ff347..1bbc7d1e11 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PC @FF G4 0.6 nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "08VjBSha6gjhJYgk", "filament_id": "OFe6sfXS", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], 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 1572171a0b..9e7ebbdc89 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PC @FF G4 0.8 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "JqgkmxnjlnQ3uw1u", "filament_id": "OFe6sfXS", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], 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 5613453b3a..5e6b9ca06c 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PC @FF G4P 0.6 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "vvLLPvSeb5PYbT1R", "filament_id": "OFe6sfXS", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], 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 13e5f089fd..74fb0b79e2 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PC @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "mPJMPfFCyfWdKzMO", "filament_id": "OFe6sfXS", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], 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 35dc675173..81ee3e9c95 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PC @FF G4P 0.8 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "HTgqTUTznOlfCRAd", "filament_id": "OFe6sfXS", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], 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 2dfa04cea8..e8de847c00 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS @FF G4 0.6 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "3w8fnDjkoFaJ6Nhw", "filament_id": "OFUCpLaL", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_chamber_temp_control": [ "1" ], 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 2fbb2e4ceb..993a4dbf92 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS @FF G4 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "owHbDqY55rFtSegz", "filament_id": "OFUCpLaL", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_chamber_temp_control": [ "1" ], 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 50e2e88ee4..ff65c08991 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS @FF G4 0.8 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "eFK1zzT1JY9ZnEl9", "filament_id": "OFUCpLaL", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "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 667e3e9b01..0f6fa82220 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS @FF G4P 0.6 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "E8CcstoHzax78ZJY", "filament_id": "OFUCpLaL", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_chamber_temp_control": [ "1" ], 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 673304a79c..581d855fe0 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "xa22FD8bRVGsLiPJ", "filament_id": "OFUCpLaL", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_chamber_temp_control": [ "1" ], 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 dd2d7b107b..dee62ada5b 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS @FF G4P 0.8 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "bZ9dbA8dIu9mjWyN", "filament_id": "OFUCpLaL", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "activate_chamber_temp_control": [ "1" ], 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 34d7bfb528..218d8add21 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS-CF @FF G4 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "4w0oK3F50O1DUqsu", "filament_id": "OFogbnCb", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "2" ], 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 14a76bbdae..1213313096 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,11 +1,14 @@ { "type": "filament", "name": "FlashForge PPS-CF @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "94vPnztRcpnbfAKx", "filament_id": "OFogbnCb", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json index cd32fec949..faa456baad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "filament_id": "OF5SJ3jz", "instantiation": "false", 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 dcf7ef2ea3..8ce05c7f1e 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "fgEYZ1Mgyp1AvtwU", "filament_id": "OFShw1X8", 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 c77a70a68c..b3f51e2b63 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "cIxbQMVdG5K85rJr", "filament_id": "OFShw1X8", 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 421b590ffd..7457627179 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF AD5X", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "9GXBeuCUrScJfmJB", "filament_id": "OFShw1X8", 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 9cb888633d..136856bf4a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "NttDJCrfB01uwMDl", "filament_id": "OFShw1X8", 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 37946c87cd..79ecbbdf9e 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "hJd6dG6OdEffEFC7", "filament_id": "OFShw1X8", 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 853695c79f..dcc92a46c8 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8yFCuCnEuI3dUvQy", "filament_id": "OFShw1X8", 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 40d28d88ed..a824989281 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "np4fP5kghRlczOTT", "filament_id": "OFShw1X8", 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 bfc919b8a4..050606e773 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "8o2maTFOXq0XR6Dm", "filament_id": "OFShw1X8", 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 108219a5e8..6055001320 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "vCsjC0UnKenzIR0O", "filament_id": "OFShw1X8", 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 b477796207..c4295d0a31 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "xhxVdlmh5r7meoHo", "filament_id": "OFShw1X8", 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 85bd777649..30a2cdf399 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "6dlQN4Xhd6kGZ0Qn", "filament_id": "OFShw1X8", 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 ae87f2228c..ea68716e21 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "r8WVFPozL8f5oLVJ", "filament_id": "OFShw1X8", 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 4486a2e487..95bc121e93 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic @FF G4P", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "xw0pZNmhw1K4tPQ1", "filament_id": "OFShw1X8", diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json index d14e7a563f..b4b539a756 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS Basic", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "m6QLC2UaS3fW298i", "filament_id": "OFShw1X8", 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 e5c075681b..95fab6bbc4 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS-CF @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Nx3Px0Zu356IKShT", "filament_id": "OFi7Bf0F", 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 9fd47a1c35..92ed5ff1cc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS-CF @FF G4", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "d4EGsmMeEDCOUBF2", "filament_id": "OFi7Bf0F", 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 802dfebe5e..4e5016999f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS-CF @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "9ziPFKsjESbw1pXL", "filament_id": "OFi7Bf0F", 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 37f8d3d731..dceedb6fc5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ABS-CF @FF G4P", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "NzJJs6yrSik5xuyX", "filament_id": "OFi7Bf0F", 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 dd3efcaef3..1fe1013580 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic ASA", + "inherits": "Generic ASA @Flashforge", "from": "system", "filament_id": "OFtTYl9Q", "instantiation": "false", 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 19b021358e..4cd916c615 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "vaOyXUcrJ97KE7ZW", "filament_id": "OFaBwRvT", 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 1f0bc87211..c98dc7b59f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "iLWq5pJ3ox9EAM1Z", "filament_id": "OFaBwRvT", 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 37be38511c..8b80a1d1c3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF AD5X", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "i7PUPYxy0Z9weyyA", "filament_id": "OFaBwRvT", 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 34a50c950e..012911ba4a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "w8O6oenp0NymzCqf", "filament_id": "OFaBwRvT", 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 1abb8bb623..dc42f97981 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "thhmWRzNYLYJOeR2", "filament_id": "OFaBwRvT", 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 c75ee648aa..9cccf05b75 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "g5jiz6Q6or23BIo7", "filament_id": "OFaBwRvT", 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 fd012e0f33..2b405b1fb6 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "7xmWlHHNMvXBKdYS", "filament_id": "OFaBwRvT", 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 d6f71b0a72..ae0e3d9222 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "r0B8KfZ1mNWMvGqE", "filament_id": "OFaBwRvT", 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 82cbd340b7..01a5604125 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "CBLZqLhkwf5XKO12", "filament_id": "OFaBwRvT", 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 ec26d6d236..48e7d01b94 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Df3anJxiRXLVO9hw", "filament_id": "OFaBwRvT", 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 016a57fd14..6c8441ee9f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Nu4WvBWuEhazZfh5", "filament_id": "OFaBwRvT", 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 d24743172c..e30b784bfb 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "hF0h4ye3hMDtEba1", "filament_id": "OFaBwRvT", 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 a523291c0e..ce18c5a69f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic @FF G4P", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "3isZCWr4CBjFtGDX", "filament_id": "OFaBwRvT", diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json index 5fb5d976eb..613efc2502 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA Basic", - "inherits": "Flashforge Generic ASA", + "inherits": "Generic ASA @Flashforge", "from": "system", "setting_id": "SU6r879TbQMUFCij", "filament_id": "OFaBwRvT", diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json index 3645546f16..fed88f120e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA-CF @FF G4", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "ap7X4nWKfFR53NT0", "filament_id": "OFq0TY7C", diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json index f001e6d54c..ddd4c96ba2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA-CF @FF G4P", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "kZXg6odPm5iW79Qn", "filament_id": "OFq0TY7C", diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json index af262a6497..9a37c4c7d1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge ASA-CF", - "inherits": "FusRock Generic PAHT-CF", + "inherits": "FusRock PAHT-CF", "from": "system", "setting_id": "CI5dvVrCNk2XTU82", "filament_id": "OFq0TY7C", 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 0370e2b2ce..ae01f84a4b 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "jUNUZhE0BJyB64fC", "filament_id": "OFaz8VoR", 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 44753a6a08..6658adabab 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "0qMEqo9YMDLSVafs", "filament_id": "OFaz8VoR", 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 2a0a4d7898..4e2fd50066 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "ek749gIdUAPq6WxT", "filament_id": "OFaz8VoR", 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 30704efe75..ed9d2cb9e4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "tEohTtyHofD6l6o3", "filament_id": "OFaz8VoR", diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json index cd95f618c3..10127abb22 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "oLeLrIjFJzoZha3E", "filament_id": "OFaz8VoR", 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 a495959b82..f050371f1f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "HXGUlYY4X5IHhL3R", "filament_id": "OFaz8VoR", 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 6e87c12697..02d5c02b8c 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "g22Cv3zy3h5BhJYK", "filament_id": "OFaz8VoR", 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 8c4e3c633a..a99c168faf 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic ABS @G3U 0.6 Nozzle", + "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "aDzBXuvN7IuSP5sa", "filament_id": "OFaz8VoR", 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 3349b2ec63..436a4cba60 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "CIj24REX7BA8zPHQ", "filament_id": "OFaz8VoR", diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json index 8afa83e8f4..3b2a22ccbf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HIPS @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "yAGyGjF6uDrjfjLn", "filament_id": "OFaz8VoR", 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 52d7d0ee40..081ede7bc4 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "vOqAGzaYLz0XdRvC", "filament_id": "OF5w29Kq", 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 84d7492956..8ea4960a88 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "KSuxZ3fpQz0khDSz", "filament_id": "OF5w29Kq", 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 fc78000e54..577b175cbe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF AD5X", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "o4B1kAToVny7jw0M", "filament_id": "OF5w29Kq", 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 2bd44a8bb0..30ccd1a277 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "q9UbakUmZPzG3xU0", "filament_id": "OF5w29Kq", 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 9bb1244b29..6e2c0ca19c 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "IL18Lu0qHx1RVqKD", "filament_id": "OF5w29Kq", 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 a1ca0f6985..33696f6366 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "2FQib7fZjcwfCnm2", "filament_id": "OF5w29Kq", 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 f21520aa0b..2b3722dd0c 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "CtwOm90WWD4S7U6j", "filament_id": "OF5w29Kq", 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 a76d35fb6d..83ebdfa2b1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "kvULpm0WhKiSPj8V", "filament_id": "OF5w29Kq", 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 4bb3402cb1..cf4731f584 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "CUU7knzm4cbe1giE", "filament_id": "OF5w29Kq", 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 a847ff25f3..78a554fec2 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "gcYvL572cumWZdnl", "filament_id": "OF5w29Kq", 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 84c3e94acc..b00acd32da 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "cx99AH0C575XxAj9", "filament_id": "OF5w29Kq", 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 23a73b4ad5..613a806f5a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "RrrKoR7MVD8IFQlq", "filament_id": "OF5w29Kq", 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 c331466dab..aa7bf4a40f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG @FF G4P", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "7VEPGuR16wNukAX2", "filament_id": "OF5w29Kq", diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json index 5558ea98f9..8908833f96 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PETG", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "H9uwlPw6m6Nf7qH5", "filament_id": "OF5w29Kq", 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 dba18c4bed..d8dfd92fc6 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF AD5M 0.25 nozzle", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "OmDped3weZ4uHAtY", "filament_id": "OFnMv3W5", 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 d10ef1e3e9..1f37c091d2 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "oD592bif4ra0ADco", "filament_id": "OFnMv3W5", 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 f83591bf3c..a8cf1c5bdc 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "ldhMY6F7v6nK8wwf", "filament_id": "OFnMv3W5", 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 619b9e8767..ada09e1c19 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "5vzOmbjHbkJXrgYM", "filament_id": "OFnMv3W5", 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 e8200e41e2..42f009212d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "hzxRPyH1fqarsMuN", "filament_id": "OFnMv3W5", 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 0b46b5fa31..fcb55d2400 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "oJsLlIIpxwGSoJTv", "filament_id": "OFnMv3W5", 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 5940d7d272..80c9e422d0 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "hJbNZ381ERkZ0KUB", "filament_id": "OFnMv3W5", 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 dddf486229..5072e86227 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "BqavrNpwhXDXcZ3r", "filament_id": "OFnMv3W5", 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 598d3c6cab..25a9130d9d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "cgf4Qk4iHZh7zHN5", "filament_id": "OFnMv3W5", 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 2282b67e93..a1e58886d3 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "p31K69Srld6o4sQ2", "filament_id": "OFnMv3W5", 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 137f78fcd6..7217ec8854 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "MwbYvnRIzlNmH81h", "filament_id": "OFnMv3W5", 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 4506cf1d91..fcf7f8a8c7 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "rKhHmkqXYD2xN4K9", "filament_id": "OFnMv3W5", 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 45e42ed61c..c6d61c696b 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "Dshsi3O7NvYYjXJt", "filament_id": "OFnMv3W5", 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 1ee62a8bd4..a7fb05e8d6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "mfnL6QEevCmTmOL0", "filament_id": "OFnMv3W5", 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 1731aafb85..117fe724a9 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "AGLHrHKWye0YTtNK", "filament_id": "OFmQkb3c", 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 986f32690e..806f9e4ed7 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "px8qzmB2yFLoNl83", "filament_id": "OFmQkb3c", 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 fc20600185..fecd582701 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "mwuIEsBz5bXEV68w", "filament_id": "OFmQkb3c", 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 17b706989a..4ae6a84762 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "TielygFT88owWg4J", "filament_id": "OFmQkb3c", 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 d4832e08ae..f391f26c3a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "It2NI6OFhNEUvulz", "filament_id": "OFmQkb3c", 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 bc73b031b3..a554fc2a59 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,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Qt3huWxoYpMEqEN6", "filament_id": "OFmQkb3c", 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 5737b18c7d..f32d4697c0 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Y3XuavnnOMoHLGHA", "filament_id": "OFmQkb3c", 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 5316d2b8b4..7eddf0b7b5 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,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "2HUxAWeolJIlxPs1", "filament_id": "OFmQkb3c", diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json index fcba520ff6..120d8b317e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge HS PLA", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "vdaZBnDsmUC1fhDp", "filament_id": "OFnMv3W5", 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 b108289976..af9159b1b6 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "u7rolQaTQz9U6veH", "filament_id": "OFgf4gZa", 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 44783f007a..14e5f098ab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "qTGTwiliWj3dSo9y", "filament_id": "OFgf4gZa", diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json index dba15949a2..2f7836790f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA @FF G4", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "wAkuJRTLWxGyBU0b", "filament_id": "OFgf4gZa", 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 d2d2a93575..dd3a5801f6 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "dbs29hQSQl9zuWis", "filament_id": "OFgf4gZa", 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 ac63380352..dbbb88d9ee 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "XGNPvS2ps7Xn2fpx", "filament_id": "OFgf4gZa", diff --git a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json index e88fbf5126..6d34858446 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA @FF G4P", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "h33iEGZ7wPeBYKYQ", "filament_id": "OFgf4gZa", 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 b4a40e769a..d0589f6b1a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA-CF @FF G4", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "C4DfYuQgDXIgK7mk", "filament_id": "OFuGRMNV", 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 e2ab91aa24..6225424dc7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA-CF @FF G4P", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "Yu7hL4izNsgDVqMT", "filament_id": "OFuGRMNV", diff --git a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json index 8f1f04ffdc..3fe0018654 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA12-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA12-CF", - "inherits": "FusRock Generic PET-CF", + "inherits": "FusRock PET-CF", "from": "system", "setting_id": "1CevPV960sQWT3NF", "filament_id": "OFgeM7nD", diff --git a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json index 129ad8d648..8364fc4f3b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA6-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA6-CF", - "inherits": "FusRock Generic PET-CF", + "inherits": "FusRock PET-CF", "from": "system", "setting_id": "NGbZ8pQVTRKw28kp", "filament_id": "OFZtOQtl", diff --git a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json index 6654b78212..f3c1a27c16 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA66-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PA66-CF", - "inherits": "FusRock Generic PET-CF", + "inherits": "FusRock PET-CF", "from": "system", "setting_id": "5pVoGBvbiUlrJSwR", "filament_id": "OFuV79ru", diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json index addb373157..19abc27d75 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PAHT-CF @FF G4", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "ZlpBAM9uaS01sWAJ", "filament_id": "OFuFqYyG", diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json index 764d274e76..dff2e68ddd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PAHT-CF @FF G4P", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "9DaSYBA2OI7Jj5zS", "filament_id": "OFuFqYyG", diff --git a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json index f6899ad2e2..bc5485875b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PET-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PET-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PET-CF", - "inherits": "FusRock Generic PET-CF", + "inherits": "FusRock PET-CF", "from": "system", "setting_id": "vflpXTS9GwnODQDH", "filament_id": "OFrjacXf", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json index 6c5928993d..978245b58c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "filament_id": "OFMpxamb", "instantiation": "false", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json index f3fed78ca0..0d325d1c1a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Basic", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "YLLJ4xZI704GReej", "filament_id": "OFEMfQsX", 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 7009c5a076..d685b38547 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "dFZ1MmHjj1AAIaMm", "filament_id": "OFPQfNAf", 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 d092644658..1a279d0591 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "Ro3rt7IAJrA5aZD6", "filament_id": "OFPQfNAf", 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 17626d81ba..4f839ae1b5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF AD5X", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "cTxrnqzr2wVt4Nj7", "filament_id": "OFPQfNAf", 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 9919a54140..5c41866971 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8x6yU2U8d5f67N73", "filament_id": "OFPQfNAf", 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 30bbb96fab..df04115fd9 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4W0nfaSSZdg2HQkh", "filament_id": "OFPQfNAf", 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 f66c490c96..00878236df 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "AJcugKx4qHPJ3JAT", "filament_id": "OFPQfNAf", 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 cbebb6da3e..b73e951307 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "R0nZuLXEo5qA6Mt8", "filament_id": "OFPQfNAf", 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 1a3ee02fed..ccb1dd2f50 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "Ql2BBBymzqEG7GKk", "filament_id": "OFPQfNAf", 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 7d48ccda00..c4f944cfc2 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "KU5tDHAKja1sCoHm", "filament_id": "OFPQfNAf", 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 a83ba63b92..93664c46e2 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "sb6jD3UZmb0DNIsC", "filament_id": "OFPQfNAf", 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 ab7bd22340..da54d45f51 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4BB1wJLtsXus5eyY", "filament_id": "OFPQfNAf", 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 ac25f05323..b2f8087db9 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "m7oJx47UMlFctMkX", "filament_id": "OFPQfNAf", 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 adc38f6d91..be118c9e69 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro @FF G4P", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "ozD2wU5UiORTtJsa", "filament_id": "OFPQfNAf", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json index 5940c47fe1..00fffab83a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Pro", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "IQfUoy7gTmVmBDL5", "filament_id": "OFPQfNAf", 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 03bb077a25..fdc9c427d3 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "Ht7wzk8l0b1kv5tZ", "filament_id": "OFMyLYV8", 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 d799a1dc69..bbe03ece1f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "NJFHpa5HFHIyHSWu", "filament_id": "OFMyLYV8", 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 1a64752952..4e0de85100 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF AD5X", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "UaObrRNSTwitC6jr", "filament_id": "OFMyLYV8", 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 df04fca6df..5c9ccb693f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "K8WkJmFy2V1zhYQO", "filament_id": "OFMyLYV8", 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 31169455a5..7676d966b1 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "LLK1hwKZhDU8SaGJ", "filament_id": "OFMyLYV8", 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 776d9d1df4..63c046558f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "LaUF2HJtBnpZF7Cd", "filament_id": "OFMyLYV8", 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 1eda391a72..6adfb18f16 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "OUToXk8ddS1RPPUK", "filament_id": "OFMyLYV8", 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 df79bc8fdf..c8e5141713 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "ywff8rI39XKjcocY", "filament_id": "OFMyLYV8", 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 6dc5df0088..4ede8cb506 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "kuCvwo6Phr6Ywhm4", "filament_id": "OFMyLYV8", 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 2ed7597e91..74d4250de0 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Z2E69w9AevYg15tl", "filament_id": "OFMyLYV8", 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 22c2061b81..d345b35e9f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "RkQaxwTjhJK0A3zr", "filament_id": "OFMyLYV8", 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 22b4912e99..3d6abe6ff3 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "YBQTMes2S9iJjKDf", "filament_id": "OFMyLYV8", 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 315afb5acc..bf76cf5bfa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent @FF G4P", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "lCngVWG3q0FWsnrG", "filament_id": "OFMyLYV8", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json index ac03de5fb2..450c5f33d7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG Transparent", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "3Gv6MJ3RRja5pbOM", "filament_id": "OFMyLYV8", 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 758901ff5a..d746b5348d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PETG-CF10", + "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "bcqYod61blJRzhK2", "filament_id": "OFBK6zAi", 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 6eb1aba29f..1b5c706120 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PETG-CF10", + "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "CnFKOi7fFyS8QlKK", "filament_id": "OFBK6zAi", 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 4143582646..0fbd657de5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF @FF AD5X", - "inherits": "Flashforge Generic PETG-CF10", + "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "eKWJW36I5fVHwjWD", "filament_id": "OFBK6zAi", 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 3d85ed39ac..c0145120d7 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", + "inherits": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4EgMPzlVo1rTeQ1e", "filament_id": "OFBK6zAi", 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 f88e49c07a..fb095064f7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF @FF G4", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "K9ME1F4oJkPi8jRu", "filament_id": "OFBK6zAi", 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 cb8e888fb0..76d459de35 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", + "inherits": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "9jCp0gTjB3Mt95Mj", "filament_id": "OFBK6zAi", 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 3341e1dd03..14be746810 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF @FF G4P", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "d5OleuNNZBJK9vxH", "filament_id": "OFBK6zAi", diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json index f8c30e4f18..c92b4aa162 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PETG-CF", - "inherits": "Flashforge Generic PETG-CF10", + "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "MpG61mwVUtJ7t602", "filament_id": "OFBK6zAi", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json index 5fe939a7b7..2db42a7b5a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "instantiation": "false", "filament_vendor": [ 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 e280847ff0..6248751055 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "gMmhMDqjmJfAYcbV", "filament_id": "OFIxitiU", 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 a61f208b0f..d9041d25b7 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "0OsrtqfIxrEJMwac", "filament_id": "OFIxitiU", 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 949a7ab6a0..110048dba4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "fuzWVrfZqekMETLK", "filament_id": "OFIxitiU", 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 f7b96331ac..d0b03d8959 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "R54l7TcwsjdPHvNB", "filament_id": "OFIxitiU", 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 b748b785aa..a898615cfc 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "MELEwYupDkT2DPxL", "filament_id": "OFIxitiU", 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 0e01a20dcf..8a98aa4445 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "uGLvOoPAfksLO43M", "filament_id": "OFIxitiU", 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 58b72386e8..c9cb6c8711 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "gGpKvk3rnLuTjOwo", "filament_id": "OFIxitiU", 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 f4c16daaf0..94fee218f2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "Yopqnj4b5ZVwigGx", "filament_id": "OFIxitiU", 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 1af3c298cf..0714764c1c 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "QEfQrqMwApuSMqih", "filament_id": "OFIxitiU", 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 c42a17fc29..afa79d4382 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "BAPIn3eJAPGpscRJ", "filament_id": "OFIxitiU", 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 7a7344c225..1b7bd7a1dc 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "44BmRNRb6vlPq8qe", "filament_id": "OFIxitiU", 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 36a89b5dba..8f77560323 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "ltJbhoAeAec9gxrS", "filament_id": "OFIxitiU", 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 3d13adcc0c..6cf9a832ff 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "GxdZiXdqns72ibQl", "filament_id": "OFIxitiU", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json index 7640ec0834..8582b545c9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Basic", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "5XKGaHUjxHECbnHO", "filament_id": "OFIxitiU", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json index b58b98fdd8..2728623e2e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Buint Ti @FF G4 0.8 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "H8IStdO8zEfSLYVE", "filament_id": "OFQZeyZv", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json index 29dedf8f7a..538d1415f1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4wlkoKnU2bA7xhYO", "filament_id": "OFQZeyZv", 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 d0df8cd605..45e7ed6a32 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "TF6BeOl0patjpPaa", "filament_id": "OFkwIWwc", 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 105291c048..ed65db080c 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "nkYeEBo8NdkJulAP", "filament_id": "OFkwIWwc", 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 c8650a1a1c..70991dff2d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "yEDfsOsogfZbNBVX", "filament_id": "OFkwIWwc", 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 99a720a226..9c64cff73b 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "G2Et7kPHptMESzQ0", "filament_id": "OFkwIWwc", 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 0fb2690255..f57fbdc47d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "zsOdmFGBSF9UySMN", "filament_id": "OFkwIWwc", 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 bceeaba05a..963bd8152d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "oxRMuvBMu9qdQWUQ", "filament_id": "OFkwIWwc", 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 3887ded589..608ef77d24 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "5hwNJvvLtb75XBBg", "filament_id": "OFkwIWwc", 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 d0fba1bec2..78d56a62a5 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "mGj8VEyOnnogpkmF", "filament_id": "OFkwIWwc", 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 29ada76335..9070fa4762 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "JDcRA6apekWLXPvH", "filament_id": "OFkwIWwc", 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 dc01f07d81..01b3800053 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "b5GJpvKYktP4vZpj", "filament_id": "OFkwIWwc", 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 6dbe02b473..78aa762193 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "RjUpQV6iQxTircwj", "filament_id": "OFkwIWwc", 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 0e2690d93c..0241ed5dba 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "9DEZ6SmFdgfluhsR", "filament_id": "OFkwIWwc", 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 a3696383cf..7d3aa644c0 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "girTMkusNTfY04rz", "filament_id": "OFkwIWwc", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json index 030d4d1ff4..75e3bc1a3f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Color Change", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "pCQ2qmeXUyJzP7kS", "filament_id": "OFkwIWwc", 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 4928bc3891..d48f2944b6 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "y8TNaRebTrmFem10", "filament_id": "OF5NQFKI", 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 2a7e7616ba..17a2bd1120 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "qju0AMvvq0B5Glny", "filament_id": "OF5NQFKI", 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 97cd5bb9be..06e76b0a60 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "o8gGBOEcNvlbZxGW", "filament_id": "OF5NQFKI", 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 d3cc825ed6..aa3a164d86 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "koEC7DteUoXHUd2z", "filament_id": "OF5NQFKI", 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 f684c8b47b..0517355c72 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "D69fWcXioFcpoUjC", "filament_id": "OF5NQFKI", 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 5cb479f1a4..2982fcfe42 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "rfiQUncdSExEaK0U", "filament_id": "OF5NQFKI", 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 6018aad13d..ef995df080 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "WX8lK8efXIVcpjFf", "filament_id": "OF5NQFKI", 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 8588d194f0..a301208f82 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "Tzvo3oILQJc4SQko", "filament_id": "OF5NQFKI", 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 c4785481f0..9b00f47fc6 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Y5gm20O4yCCDIoC0", "filament_id": "OF5NQFKI", 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 b2a142d9bd..c92d0c95c3 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "80vSQxnHfd5ZUy5h", "filament_id": "OF5NQFKI", 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 0137ac7348..fc02069f65 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "UZi7T5VoasmXWyH5", "filament_id": "OF5NQFKI", 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 96aa6babdf..c86fa47d2f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "6UlSb4fqHIMdMxkO", "filament_id": "OF5NQFKI", 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 bb1e1d9513..22b40f77bb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "H2Cr4B5VUaxyYsN0", "filament_id": "OF5NQFKI", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json index 99727f9217..ffff2b3523 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Galaxy", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "NJrc0UZ54Fq8MaqF", "filament_id": "OF5NQFKI", 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 58ef1320d5..5898b4c1c2 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "GdvXL8SrKrYHxSgZ", "filament_id": "OFMIma8C", 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 a58b30c6fe..227d392df3 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "SLYD2YcQTQgbSjIF", "filament_id": "OFMIma8C", 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 9f8bbf2127..0b7704be7b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "kOobFSlqEG9Qe0d1", "filament_id": "OFMIma8C", 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 6be800cba6..1dd346734f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "xPPSRmadqfqCtRF2", "filament_id": "OFMIma8C", 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 7b49141fd8..19db33c12b 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "aWVXIk1xVa9URR1D", "filament_id": "OFMIma8C", 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 1063943964..85732db257 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "KhBF7hHHVPzqiAca", "filament_id": "OFMIma8C", 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 34929db7ab..4a47c2e41d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "sTplnj3gMAzwtLWE", "filament_id": "OFMIma8C", 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 2944c6ba8e..aab7e584c9 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "vXPXOKD8vNJlujM1", "filament_id": "OFMIma8C", 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 883241624e..01c99d30bd 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "purqxjmWiflDrnik", "filament_id": "OFMIma8C", 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 1daf6897b9..e11842c15a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "qraQ97uusigB63hv", "filament_id": "OFMIma8C", 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 d8735d275c..049325af4d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "Z1NCX8XMyIVlOlWn", "filament_id": "OFMIma8C", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json index f1ab00b390..e8f02f10a0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Luminous", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "s620OFLTgFT4Ds2A", "filament_id": "OFMIma8C", 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 1f7bd2b1da..9788577dc8 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "BVmVfNCuy8HDhcEI", "filament_id": "OF1bQyX2", 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 8b85ad1f7e..b044ecd47f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "WRMePGzDGdEGiqNv", "filament_id": "OF1bQyX2", 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 4f7b782d7f..1cdea005e4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "thnbuaLDDlGrkrdY", "filament_id": "OF1bQyX2", 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 0a5772910a..28809dc1c0 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8b9q1FfVljPmKoEt", "filament_id": "OF1bQyX2", 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 7ac6952363..2a2ac35fa8 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "o9dOrLgL6efF19O1", "filament_id": "OF1bQyX2", 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 3154dfabc1..d3d9ac763a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "QoRmDvhoeGi6Z2xv", "filament_id": "OF1bQyX2", 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 ec55501821..2cc4d75091 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "dHyuoORAUGLtlGkJ", "filament_id": "OF1bQyX2", 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 892a8d513c..bc2daed905 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "OgqVyIHfy3U8Dc6d", "filament_id": "OF1bQyX2", 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 c5338f91fa..fa2c6322ea 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "feXpVbDM5ON5mwg0", "filament_id": "OF1bQyX2", 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 589fc96f12..8ae39f5623 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "XMnZQ1AxXPJqpqRX", "filament_id": "OF1bQyX2", 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 8a2cc0815b..e8a01ae3e0 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Ke0bRKPNKSsVMO1Y", "filament_id": "OF1bQyX2", 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 14ee3d9ad6..55571d70e5 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "IRC2n4GaofxvvyTt", "filament_id": "OF1bQyX2", 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 c19e58a5df..75b6007012 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "RN4wdTL0qccM4huZ", "filament_id": "OF1bQyX2", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json index 989bed63b3..60488f6338 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Matte", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "ipMevDMORKqZYdvD", "filament_id": "OF1bQyX2", 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 45b9d0d7d4..231e4cf895 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "uusF7Vz94HOwoQF0", "filament_id": "OFvVxvzZ", 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 3f595ba93f..92a867b768 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "sHZWzrZO8PP0QYZR", "filament_id": "OFvVxvzZ", 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 4dc8a9d226..22abaf206a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "bxwjEFI8HmNY8JI6", "filament_id": "OFvVxvzZ", 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 1c40ec5691..682889ba46 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "5xqdqoj2l50FegPF", "filament_id": "OFvVxvzZ", 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 035d431419..da2e664b20 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "R79SbWA9i2OAu2ee", "filament_id": "OFvVxvzZ", 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 df92bc3004..56b51fbb39 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "zjIN4KzIOwI1VwOc", "filament_id": "OFvVxvzZ", 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 7828b38822..aa615d6c52 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "UxMNNil2KnWvAJ4q", "filament_id": "OFvVxvzZ", 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 d9e6e0ec27..18240ff4ab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "57i6iKrVYUS5UiBT", "filament_id": "OFvVxvzZ", 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 6b8014dff1..a8eea524f7 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "IYPw8a9tkpuf95uH", "filament_id": "OFvVxvzZ", 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 84429816a4..eebeaeb9d4 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "I0bULoVAbtVfQoCy", "filament_id": "OFvVxvzZ", 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 057c05a51f..48206bc4e6 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "DbPo3ay2e4a002AB", "filament_id": "OFvVxvzZ", 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 d9f64c3634..8d50a6ad0a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "uztv4hhm2O3T93zZ", "filament_id": "OFvVxvzZ", 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 9323d094ef..cd239560be 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "UFWWrhfgS7N36Y8W", "filament_id": "OFvVxvzZ", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json index 3a28540dbf..368782f0fd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Metal", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "UD5i0ijsirfieUvb", "filament_id": "OFvVxvzZ", 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 6a24a22501..b25c6b56ab 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "t9lPSFnwLDk0ARIp", "filament_id": "OFK74HJD", 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 14fcccf62b..d0a7d88e4f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "SBSlOEwZSvZHeX4r", "filament_id": "OFK74HJD", 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 d26813d36c..f276a6e671 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "DbWTm2H71izMWmpx", "filament_id": "OFK74HJD", 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 c7913ee0a9..e7b16bb162 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "YcXuvz3qYHtVoWxv", "filament_id": "OFK74HJD", 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 8747bf9e8f..400fb84d2e 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "prItyXNphhuPCAce", "filament_id": "OFK74HJD", 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 63b0c9a162..f044a481b4 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "83zDmjaAgxxIt7KU", "filament_id": "OFK74HJD", 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 1b1a3c059c..c40c210005 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "px3O28Olb9LExqfT", "filament_id": "OFK74HJD", 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 2d5f18b2c4..71ad06d85a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "QYgsCCHP3Khqrzh3", "filament_id": "OFK74HJD", 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 730a9ee7d9..aaab161802 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "1ro9wHPYhuMHNiYe", "filament_id": "OFK74HJD", 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 24afad6fd5..20ee4d7163 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4W4a7c9ugUVwvvmn", "filament_id": "OFK74HJD", 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 c8dc7de4cb..804c28cfe1 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "CloRo3qxvzxHZuIP", "filament_id": "OFK74HJD", 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 e677dfe51b..b0f9655605 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "QgUbP07tIXmFysEb", "filament_id": "OFK74HJD", 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 3edd253b70..50db881fc0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "6mvGOtkPZT6ROboo", "filament_id": "OFK74HJD", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json index 880e0e1ff1..2924f05d13 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Pro", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "vI875WYbMyQeMwlh", "filament_id": "OFK74HJD", 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 a5bdb3ae12..c39e501f5c 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA-Silk", + "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "YH9IHXOFMKwcTLyA", "filament_id": "OFLYDIb8", 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 6541cbefb5..58d57b30c2 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA-Silk", + "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "IfAieG0OAG807xlu", "filament_id": "OFLYDIb8", 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 a98c508f95..dc7fb68745 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF AD5X", - "inherits": "Flashforge Generic PLA-Silk", + "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "N6J7QqQ7TIgM3MyW", "filament_id": "OFLYDIb8", 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 4e99c711c1..0f6d8e0bbe 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "2GZp8yjrY1OioFDi", "filament_id": "OFLYDIb8", 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 1e92e0d029..284128710c 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "U0XtCVUhIMnidhbR", "filament_id": "OFLYDIb8", 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 cb7dc03904..72d48ebb9b 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8j9kaYy3ghkF81Cu", "filament_id": "OFLYDIb8", 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 6eff5673c5..00ddedabc1 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "E0LeJwSxaniDkB0b", "filament_id": "OFLYDIb8", 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 3f6a7428ea..536a4ac8ac 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "8rggqgJ9kg9yLE28", "filament_id": "OFLYDIb8", 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 2cc8db6387..96cc519bb4 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "uY4OWhIytHMz4rWq", "filament_id": "OFLYDIb8", 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 d77fc03f37..de21757695 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "YSkkXd9EhhEHvGpf", "filament_id": "OFLYDIb8", 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 9f890d3ae4..7a3f814c62 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "XlxXZj9Wi1D6IwCE", "filament_id": "OFLYDIb8", 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 030ea7370f..2723288b7d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "IPyXBSnMCAikjI9V", "filament_id": "OFLYDIb8", 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 16f980a35a..7837f5d704 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "f3gJsovSmDKoA7BP", "filament_id": "OFLYDIb8", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json index 7be8b80605..16a44d9bf2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Silk", - "inherits": "Flashforge Generic PLA-Silk", + "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "vZb7BvbyVWkZv3rR", "filament_id": "OFLYDIb8", 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 4c0cf846e9..96d39efa5d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "o8lsEnMIiHHorJhb", "filament_id": "OFec7Qiw", 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 173557e7cd..ee4824a8dd 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "oXlxQJY0K6Dnri7e", "filament_id": "OFec7Qiw", 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 0bed0a94ad..06c4d3fb57 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF AD5X", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "XKpFulrvvrfE56va", "filament_id": "OFec7Qiw", 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 94ef846a7e..296b827e39 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "yeh5cd0tAHtHzdoQ", "filament_id": "OFec7Qiw", 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 1ce68966df..9dbe7d7af0 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "q2Zi0YluaYpG3Ktf", "filament_id": "OFec7Qiw", 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 6d95754110..1eafaf0b40 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4 HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "1qXV6AJqPpAwX1YK", "filament_id": "OFec7Qiw", 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 70c9c99c7a..1d93c10b5a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "YsyGGOGqUVkEqkIr", "filament_id": "OFec7Qiw", 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 685625a28b..6459a6f8a8 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "UVvd018dTbygqTgy", "filament_id": "OFec7Qiw", 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 e9714994cc..410394cbce 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "F0k8kkgWM5FkLAzo", "filament_id": "OFec7Qiw", 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 964a187d38..7ecddf5859 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4P HF", - "inherits": "Flashforge Generic ABS @G3U", + "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "Oapl8InwbkwNSIDl", "filament_id": "OFec7Qiw", 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 34a5114484..0554f047e6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "NiB6Yb4b0auyn9KQ", "filament_id": "OFec7Qiw", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json index 659909085f..ca024d690b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA Sparkle", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "LYtdPgec1hBLhoQA", "filament_id": "OFec7Qiw", 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 8367f7e01b..8bb0d6980f 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "QRyISvTy06kCwxKo", "filament_id": "OF2bZtyg", 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 60f17b2196..f63829709e 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "rmnF24E3SuwzRscH", "filament_id": "OF2bZtyg", 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 f719c895cd..2939f9ee4e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF @FF AD5X", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "BXPI5Pkp7a6pLrCh", "filament_id": "OF2bZtyg", 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 3d493c1bf7..e441facb7d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", + "inherits": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "9PgjgxU7pLl2Dfpe", "filament_id": "OF2bZtyg", 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 011065f34f..f2b5662c13 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF @FF G4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "RuNKzuIsw7F1ogmG", "filament_id": "OF2bZtyg", 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 ee56dde5d4..62dd7a9ee9 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", + "inherits": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "YPuMCHNGDWh0FpIB", "filament_id": "OF2bZtyg", 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 3baeeccc60..7958393b2b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF @FF G4P", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "3uC056Y171ZjnQE6", "filament_id": "OF2bZtyg", diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json index 85527a625a..5466774689 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-CF", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "JxNlb64lTODaaQhU", "filament_id": "OF2bZtyg", 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 67c45b439d..07744f726a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic PLA-Silk", + "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "filament_id": "OFGc282l", "instantiation": "false", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json index f05cbff817..51578f824a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PPA-CF", - "inherits": "FusRock Generic PAHT-CF", + "inherits": "FusRock PAHT-CF", "from": "system", "setting_id": "MFItX51zZO0KYjdk", "filament_id": "OFLC1oRH", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json index 140f6c5dea..e6f3519e1e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPA-GF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PPA-GF", - "inherits": "FusRock Generic PAHT-CF", + "inherits": "FusRock PAHT-CF", "from": "system", "setting_id": "KITjZXcyM4N8cVyu", "filament_id": "OF5BN24W", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json index b543ea7215..c8a1c2d800 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PPS @FF G4", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "6NjEQ6RJKUAOrSLw", "filament_id": "OFxMGIPt", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json index 10ebf9f302..76257267fe 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PPS @FF G4P", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "vFMKqNjQjlNxwvDI", "filament_id": "OFxMGIPt", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json index 0b1139bf47..e4ee9e483e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PPS-CF @FF G4", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "oSGlx5mtGh07BnOz", "filament_id": "OFTSXxzE", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json index e7fac74763..dce01c64a7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PPS-CF @FF G4P", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "i5DllSvYjVPO04Su", "filament_id": "OFTSXxzE", diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json index 19630dac6a..ba10c3fadc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS-CF.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge PPS-CF", - "inherits": "FusRock Generic PAHT-CF", + "inherits": "FusRock PAHT-CF", "from": "system", "setting_id": "l3dYtVM52X0UMRix", "filament_id": "OFTSXxzE", 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 4e2a345147..f3625e4bea 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 65D @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "f75oElm4zB0hukIj", "filament_id": "OFKpQTJI", 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 a90c599c43..c08ad7948b 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 65D @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "o4KYTpJF6KksX2mg", "filament_id": "OFKpQTJI", 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 8c9d19de43..e0d6448c72 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 65D @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "HUSkDZL6rCpz0lRk", "filament_id": "OFKpQTJI", 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 43d235a9ba..a37ab23204 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 65D @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8xgu0AnMuKbPWyVd", "filament_id": "OFKpQTJI", 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 23e2cd0e23..a9ceca338a 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 65D @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Rgqt3MjxOye5EaFt", "filament_id": "OFKpQTJI", 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 6d8d7ce10d..df74375b18 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 65D @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "PBFsW5qhVbQteYh5", "filament_id": "OFKpQTJI", 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 952b10fa12..6eca69f2b4 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "TPbHmcFyPyjvoERv", "filament_id": "OFAf9pJF", 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 626c5891bc..c0e5b624e4 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "zLMgsyDmdoXHhqFv", "filament_id": "OFAf9pJF", 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 d084aa4b46..06a632a6c5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF AD5X", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "ThakVhjfpgnAlEVH", "filament_id": "OFAf9pJF", 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 262c9c9e47..676484711e 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "M0ozqaD3jSKoD6fm", "filament_id": "OFAf9pJF", 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 649ef446ef..01fd9f2752 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "ob8IkvzNt9CWCzbk", "filament_id": "OFAf9pJF", 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 8eb722c51f..9f72e9eaca 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "NzxX1lyRJ7wLUihV", "filament_id": "OFAf9pJF", 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 08a4033ee3..ecd3bbb764 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "4FIGiheSGvSJPw3s", "filament_id": "OFAf9pJF", 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 9dc4916ba9..bcfe2516a2 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4P 0.6 HF nozzle", - "inherits": "Flashforge Generic PETG @G3U 0.6 Nozzle", + "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "1GNqSBaQitzhYSx7", "filament_id": "OFAf9pJF", 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 8a0c8edacd..22373250ff 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4P 0.6 nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "eOhMygyxaccdov7o", "filament_id": "OFAf9pJF", 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 1e35a008af..7d393a9b9d 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 @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4P 0.8 HF nozzle", - "inherits": "Flashforge Generic PLA @G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "LxooKiOkRncktNLf", "filament_id": "OFAf9pJF", 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 bca2a33ba0..cdcee7c997 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A @FF G4P", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "HdoJfbQr0uwQ6Vwb", "filament_id": "OFAf9pJF", diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json index 6352a73829..c3042b14b1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Flashforge TPU 95A", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "J4EaFhnpkLDcl5wH", "filament_id": "OFAf9pJF", diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json index a9a3418254..8aadbbd478 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 HF nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT @FF G4 0.6 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "2JQjReK012FHpHIt", - "filament_id": "OF42ZDpN", + "filament_id": "OF7pjCsO", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json index 18df8ac124..08fd04115d 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT @FF G4 0.6 nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "3SCkpXXK8VcQBMQn", - "filament_id": "OF42ZDpN", + "filament_id": "OF7pjCsO", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json index 0f1754ae6c..093175981e 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4 0.8 HF nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT @FF G4 0.8 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "dgpcOrf7282LTh1d", - "filament_id": "OF42ZDpN", + "filament_id": "OF7pjCsO", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json index d6a0d3bd5d..0fd54aa769 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 HF nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT @FF G4P 0.6 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "e85SCr6SV9kQD2hm", - "filament_id": "OF42ZDpN", + "filament_id": "OF7pjCsO", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json index c6970afe6a..b3f46d40f3 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "eGXsHN5B9BZViVNe", - "filament_id": "OF42ZDpN", + "filament_id": "OF7pjCsO", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json index 70d29c3c5d..1b4848c0d8 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT @FF G4P 0.8 HF nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT @FF G4P 0.8 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "8JSb4JqZ7zLi8uPI", - "filament_id": "OF42ZDpN", + "filament_id": "OF7pjCsO", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 e7647aff3f..4b212a6283 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json @@ -4,8 +4,11 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "gZqAGVOlWR79n7hN", - "filament_id": "OFYtS9zg", + "filament_id": "OFKW5hEW", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", 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 a8dc9a771b..a9e1bce236 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json @@ -4,8 +4,11 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "nJF1lCOavNNh4yHs", - "filament_id": "OFYtS9zg", + "filament_id": "OFKW5hEW", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "activate_chamber_temp_control": [ "1" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json index 4bb5bfff69..5e18b7b64c 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF G4 0.6 nozzle", - "inherits": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PAHT-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "TZ0nKqxoIYk2mPh8", - "filament_id": "OFYtS9zg", + "filament_id": "OFKW5hEW", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 4ae7d696a8..f8595f254b 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF G4", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "nH6pwFYsPyBzL1EB", - "filament_id": "OFYtS9zg", + "filament_id": "OFKW5hEW", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json index d359420582..adc2063edd 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PAHT-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "yok12IOGZzGot5Ll", - "filament_id": "OFYtS9zg", + "filament_id": "OFKW5hEW", "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 8ef405d524..8634877859 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "FusRock PAHT-CF @FF G4P", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "wmWMf3MfmbfZx2o8", - "filament_id": "OFYtS9zg", + "filament_id": "OFKW5hEW", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json index 4befc54c32..c1d48bf1ff 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET @FF G4P 0.8 HF nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PET @FF G4P 0.8 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Xqb0GQluin2jUQyL", - "filament_id": "OFBC32Wb", + "filament_id": "OFKTGKJU", "instantiation": "true", "close_fan_the_first_x_layers": [ "3" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json index 0d57937da9..97aaccc69f 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PET-CF @FF G4 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "A8PDgw1jZE2m3bem", - "filament_id": "OFB8wSps", + "filament_id": "OFDu1qE7", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json index c9eb3cafd7..3e7c8023ad 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "FusRock PET-CF @FF G4", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "Iy5lHY4ihEKPgJ5x", - "filament_id": "OFB8wSps", + "filament_id": "OFDu1qE7", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "additional_cooling_fan_speed": [ "0" ], diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json index 7f07f612f6..c88a329872 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P 0.6 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", "name": "FusRock PET-CF @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Kdeg55RzLMYhqYMC", - "filament_id": "OFB8wSps", + "filament_id": "OFDu1qE7", "instantiation": "true", "complete_print_exhaust_fan_speed": [ "40" diff --git a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json index a3c7a4372e..d2e10d6c41 100644 --- a/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PET-CF @FF G4P.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "FusRock PET-CF @FF G4P", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "JXf7KCy4KY65xuzO", - "filament_id": "OFB8wSps", + "filament_id": "OFDu1qE7", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "additional_cooling_fan_speed": [ "0" ], 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 dfdd46fb57..c5d429456d 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5.json @@ -4,8 +4,11 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "O3tz36NNMoagELL0", - "filament_id": "OFUScM0D", + "filament_id": "OF0AquDh", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", @@ -57,7 +60,7 @@ "; filament start gcode" ], "filament_type": [ - "S-Multi" + "PA" ], "nozzle_temperature": [ "280" 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 d84fd5aeb0..bb1ccc7292 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-Multi @FF C5P.json @@ -4,8 +4,11 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "Gg9H6I32fOqoLSqE", - "filament_id": "OFUScM0D", + "filament_id": "OF0AquDh", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "activate_chamber_temp_control": [ "1" ], @@ -63,7 +66,7 @@ "; filament start gcode" ], "filament_type": [ - "S-Multi" + "PA" ], "nozzle_temperature": [ "280" 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 248fbb5ce1..b895fd4370 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5.json @@ -4,8 +4,11 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "pV5QERvRuROIZTOa", - "filament_id": "OF6WddJ1", + "filament_id": "OFCn83wF", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", "Flashforge Creator 5 0.6 nozzle", @@ -51,7 +54,7 @@ "; filament start gcode" ], "filament_type": [ - "S-PAHT" + "PAHT" ], "hot_plate_temp": [ "80" 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 538d1e5c0f..6845961090 100644 --- a/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock S-PAHT @FF C5P.json @@ -4,8 +4,11 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "0i7VkquM4n0uFaXH", - "filament_id": "OF6WddJ1", + "filament_id": "OFCn83wF", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "activate_chamber_temp_control": [ "1" ], @@ -57,7 +60,7 @@ "; filament start gcode" ], "filament_type": [ - "S-PAHT" + "PAHT" ], "hot_plate_temp": [ "80" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json b/resources/profiles/Flashforge/filament/FusRock/FusRock NexPA-CF25.json similarity index 94% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock NexPA-CF25.json index 088e4ac1b7..249060ab5c 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic NexPA-CF25.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock NexPA-CF25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FusRock Generic NexPA-CF25", - "inherits": "Flashforge Generic PETG", + "name": "FusRock NexPA-CF25", + "inherits": "Generic PETG @Flashforge", + "renamed_from": "FusRock Generic NexPA-CF25", "from": "system", - "setting_id": "TZDKsooodaGVkM4m", - "filament_id": "OFZ1hANN", + "setting_id": "sVoga8454H2oKuKI", + "filament_id": "OFjt8dDO", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "FusRock Generic NexPA-CF25" + "FusRock NexPA-CF25" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json similarity index 78% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json index ebd0a01ed4..b1112d508d 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF @G3U 0.6 Nozzle.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FusRock Generic PAHT-CF @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "NdNRNhmsHgHRnz1Z", - "filament_id": "OFPjOUtz", + "setting_id": "axB3SEA3AC7rmxiZ", + "filament_id": "OFKW5hEW", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" ], @@ -37,7 +41,7 @@ "5" ], "filament_settings_id": [ - "FusRock Generic PAHT-CF @G3U 0.6 Nozzle" + "FusRock PAHT-CF @G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF.json similarity index 94% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF.json index 5b959efeae..d47b7f865c 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-CF.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FusRock Generic PAHT-CF", - "inherits": "Flashforge Generic PETG", + "name": "FusRock PAHT-CF", + "inherits": "Generic PETG @Flashforge", + "renamed_from": "FusRock Generic PAHT-CF", "from": "system", - "setting_id": "fR7maJwWmteJ7bWY", - "filament_id": "OFPjOUtz", + "setting_id": "OGhhxVvR4O4VYuCK", + "filament_id": "OFKW5hEW", "instantiation": "true", "activate_air_filtration": [ "0" @@ -153,7 +154,7 @@ "nil" ], "filament_settings_id": [ - "FusRock Generic PAHT-CF" + "FusRock PAHT-CF" ], "filament_shrink": [ "100%" @@ -180,7 +181,7 @@ "40" ], "filament_vendor": [ - "Generic" + "FusRock" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-GF.json similarity index 72% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-GF.json index c35726f024..0e29324831 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PAHT-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PAHT-GF.json @@ -1,16 +1,17 @@ { "type": "filament", - "name": "FusRock Generic PAHT-GF", - "inherits": "FusRock Generic PAHT-CF", + "name": "FusRock PAHT-GF", + "inherits": "FusRock PAHT-CF", + "renamed_from": "FusRock Generic PAHT-GF", "from": "system", - "setting_id": "gLG1R5gtdliSlnZJ", - "filament_id": "OF2RjrWH", + "setting_id": "yJJEULB0ra4GAS8Q", + "filament_id": "OFcVLpNA", "instantiation": "true", "filament_max_volumetric_speed": [ "15" ], "filament_settings_id": [ - "FusRock Generic PAHT-GF" + "FusRock PAHT-GF" ], "filament_type": [ "PAHT-GF" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json similarity index 78% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json index acb65a33dc..b82f7ef4a9 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF @G3U 0.6 Nozzle.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FusRock Generic PET-CF @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "AaGdNgYaIIZyZBiW", - "filament_id": "OFRujL0v", + "setting_id": "Gyw0XH6UtYQqtgx9", + "filament_id": "OFDu1qE7", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" ], @@ -37,7 +41,7 @@ "5" ], "filament_settings_id": [ - "FusRock Generic PET-CF @G3U 0.6 Nozzle" + "FusRock PET-CF @G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF.json similarity index 94% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF.json index a526ad1e0c..4dee20a476 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-CF.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FusRock Generic PET-CF", - "inherits": "Flashforge Generic PETG", + "name": "FusRock PET-CF", + "inherits": "Generic PETG @Flashforge", + "renamed_from": "FusRock Generic PET-CF", "from": "system", - "setting_id": "jJVDAlGTt1QJlbn8", - "filament_id": "OFRujL0v", + "setting_id": "nGtsrswmS2Fj4Uev", + "filament_id": "OFDu1qE7", "instantiation": "true", "activate_air_filtration": [ "0" @@ -153,7 +154,7 @@ "nil" ], "filament_settings_id": [ - "FusRock Generic PET-CF" + "FusRock PET-CF" ], "filament_shrink": [ "100%" @@ -180,7 +181,7 @@ "40" ], "filament_vendor": [ - "Generic" + "FusRock" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-GF.json similarity index 69% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock PET-GF.json index e80c963649..6a224aded2 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic PET-GF.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock PET-GF.json @@ -1,16 +1,17 @@ { "type": "filament", - "name": "FusRock Generic PET-GF", - "inherits": "FusRock Generic PET-CF", + "name": "FusRock PET-GF", + "inherits": "FusRock PET-CF", + "renamed_from": "FusRock Generic PET-GF", "from": "system", - "setting_id": "IEpmsltdjoCu2txJ", - "filament_id": "OF4zzGwp", + "setting_id": "ZFIkUVZOklX8jUrT", + "filament_id": "OFzwA5Z9", "instantiation": "true", "filament_max_volumetric_speed": [ "15" ], "filament_settings_id": [ - "FusRock Generic PET-GF" + "FusRock PET-GF" ], "filament_type": [ "PET-GF" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json similarity index 77% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json index 963d3ab54d..80f5577529 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi @G3U 0.6 Nozzle.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FusRock Generic S-Multi @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "foH2sa61cDy12TzH", - "filament_id": "OF6rMr3U", + "setting_id": "HvimUHzfNcDRrUBq", + "filament_id": "OF0AquDh", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" ], @@ -31,7 +35,7 @@ "5" ], "filament_settings_id": [ - "FusRock Generic S-Multi @G3U 0.6 Nozzle" + "FusRock S-Multi @G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json b/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi.json similarity index 94% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi.json index 9ebf2fcdad..895d10aa12 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-Multi.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock S-Multi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FusRock Generic S-Multi", - "inherits": "Flashforge Generic PETG", + "name": "FusRock S-Multi", + "inherits": "Generic PETG @Flashforge", + "renamed_from": "FusRock Generic S-Multi", "from": "system", - "setting_id": "gQLoSJ7xGEdOd8kr", - "filament_id": "OF6rMr3U", + "setting_id": "zAqGdmTsz4Z0qbaa", + "filament_id": "OF0AquDh", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "FusRock Generic S-Multi" + "FusRock S-Multi" ], "filament_shrink": [ "100%" @@ -179,7 +180,7 @@ "40" ], "filament_vendor": [ - "Generic" + "FusRock" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json similarity index 77% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json index b3b537bfb3..858da9c1bb 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT @G3U 0.6 Nozzle.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "6Z5vce5YKlCGox8v", - "filament_id": "OFCaJHAA", + "setting_id": "JUiz70mbp7RRSPia", + "filament_id": "OFCn83wF", "instantiation": "true", + "filament_vendor": [ + "FusRock" + ], "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" ], @@ -31,7 +35,7 @@ "5" ], "filament_settings_id": [ - "FusRock Generic S-PAHT @G3U 0.6 Nozzle" + "FusRock S-PAHT @G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json b/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT.json similarity index 94% rename from resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json rename to resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT.json index 66c208d2d3..792b12c949 100644 --- a/resources/profiles/Flashforge/filament/FusRock/FusRock Generic S-PAHT.json +++ b/resources/profiles/Flashforge/filament/FusRock/FusRock S-PAHT.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "FusRock Generic S-PAHT", - "inherits": "Flashforge Generic PETG", + "name": "FusRock S-PAHT", + "inherits": "Generic PETG @Flashforge", + "renamed_from": "FusRock Generic S-PAHT", "from": "system", - "setting_id": "kMYDFSwivzTjFo2L", - "filament_id": "OFCaJHAA", + "setting_id": "mBQzgKKsV8Qo3gAr", + "filament_id": "OFCn83wF", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "FusRock Generic S-PAHT" + "FusRock S-PAHT" ], "filament_shrink": [ "100%" @@ -179,7 +180,7 @@ "40" ], "filament_vendor": [ - "Generic" + "FusRock" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Generic ABS @FF AD5M 0.25 Nozzle.json similarity index 60% rename from resources/profiles/Flashforge/filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic ABS @FF AD5M 0.25 Nozzle.json index b290e46444..cae13c67c1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @FF AD5M 0.25 Nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ABS @FF AD5M 0.25 Nozzle", - "renamed_from": "Flashforge ABS @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic ABS", + "name": "Generic ABS @FF AD5M 0.25 Nozzle", + "renamed_from": "Flashforge ABS @FF AD5M 0.25 Nozzle;Flashforge Generic ABS @FF AD5M 0.25 Nozzle", + "inherits": "Generic ABS @Flashforge", "from": "system", - "setting_id": "NWEY6ZxkUS8jqNU2", - "filament_id": "OFLDSqqi", + "setting_id": "1ourI1GmgyKWFsnl", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", @@ -13,7 +13,7 @@ "Flashforge AD5X 0.25 nozzle" ], "filament_settings_id": [ - "Flashforge Generic ABS @FF AD5M 0.25 Nozzle" + "Generic ABS @FF AD5M 0.25 Nozzle" ], "fan_max_speed": [ "50" diff --git a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json index d4947b14fb..3af6c25d2b 100644 --- a/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge AD4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic ABS @Flashforge AD4", - "inherits": "Flashforge Generic ABS", + "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "lS237JRDRMQgJFzd", "filament_id": "OFY9muEs", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json similarity index 73% rename from resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json index c49638eda5..0176ef471f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U 0.6 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ABS @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic ABS", + "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", "from": "system", - "setting_id": "OaXiy7DI5bOAiaYb", - "filament_id": "OFLDSqqi", + "setting_id": "tzuKCtXYbGw6WB2c", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" @@ -25,7 +26,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic ABS @G3U 0.6 Nozzle" + "Generic ABS @Flashforge G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode\n" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U.json similarity index 93% rename from resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json rename to resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U.json index 7e53c24675..8422875984 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge G3U.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ABS @G3U", - "inherits": "Flashforge Generic ABS", + "name": "Generic ABS @Flashforge G3U", + "inherits": "Generic ABS @Flashforge", + "renamed_from": "Flashforge Generic ABS @G3U;Flashforge Generic ABS G3U", "from": "system", - "setting_id": "Cfd7Q1nGwqxI5Ngh", - "filament_id": "OFLDSqqi", + "setting_id": "dxCNYDhcaJqAfDpR", + "filament_id": "OFY9muEs", "instantiation": "true", "activate_air_filtration": [ "0" @@ -153,7 +154,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic ABS @G3U" + "Generic ABS @Flashforge G3U" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge.json similarity index 88% rename from resources/profiles/Flashforge/filament/Flashforge Generic ABS.json rename to resources/profiles/Flashforge/filament/Generic ABS @Flashforge.json index e93a8a294d..a7cfc16967 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json +++ b/resources/profiles/Flashforge/filament/Generic ABS @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ABS", + "name": "Generic ABS @Flashforge", "inherits": "fdm_filament_abs", + "renamed_from": "Flashforge Generic ABS", "from": "system", - "setting_id": "uygAzLWRQiCIJ8jh", - "filament_id": "OFLDSqqi", + "setting_id": "CJXM3PoVEjf4kYnz", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Generic ASA @FF AD5M 0.25 Nozzle.json similarity index 64% rename from resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic ASA @FF AD5M 0.25 Nozzle.json index a661419618..863936bc35 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @FF AD5M 0.25 Nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ASA @FF AD5M 0.25 Nozzle", - "renamed_from": "Flashforge ASA @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic ASA", + "name": "Generic ASA @FF AD5M 0.25 Nozzle", + "renamed_from": "Flashforge ASA @FF AD5M 0.25 Nozzle;Flashforge Generic ASA @FF AD5M 0.25 Nozzle", + "inherits": "Generic ASA @Flashforge", "from": "system", - "setting_id": "spSRbidSN2yeZLhD", - "filament_id": "OFRPEs5o", + "setting_id": "aVpIQgRllsYZKRg0", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", @@ -13,7 +13,7 @@ "Flashforge AD5X 0.25 nozzle" ], "filament_settings_id": [ - "Flashforge Generic ASA @FF AD5M 0.25 Nozzle" + "Generic ASA @FF AD5M 0.25 Nozzle" ], "fan_max_speed": [ "50" diff --git a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json index f823512bcf..42f9b00a60 100644 --- a/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge AD4.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Generic ASA @Flashforge AD4", "renamed_from": "Generic ASA @AD4", - "inherits": "Flashforge Generic ASA", + "inherits": "Generic ASA @Flashforge", "from": "system", "setting_id": "tq7YmJohYaNiPplE", "filament_id": "OFLPAxz3", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json similarity index 76% rename from resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json index dab6446048..3ecb1b1c67 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U 0.6 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ASA @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic ASA", + "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", "from": "system", - "setting_id": "gVLGkoCoyrWL4DQr", - "filament_id": "OFRPEs5o", + "setting_id": "9wfcw1ifKVGOXx5G", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" @@ -31,7 +32,7 @@ "10" ], "filament_settings_id": [ - "Flashforge Generic ASA @G3U 0.6 Nozzle" + "Generic ASA @Flashforge G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode\n" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U.json similarity index 93% rename from resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json rename to resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U.json index e1f8b58fcf..20a3e61da2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge G3U.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ASA @G3U", - "inherits": "Flashforge Generic ABS", + "name": "Generic ASA @Flashforge G3U", + "inherits": "Generic ABS @Flashforge", + "renamed_from": "Flashforge Generic ASA @G3U;Flashforge Generic ASA G3U", "from": "system", - "setting_id": "c6IMgUyqOeS2HFWw", - "filament_id": "OFRPEs5o", + "setting_id": "N1vm5hhMHdSNvUwk", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_air_filtration": [ "0" @@ -153,7 +154,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic ASA @G3U" + "Generic ASA @Flashforge G3U" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge.json similarity index 95% rename from resources/profiles/Flashforge/filament/Flashforge Generic ASA.json rename to resources/profiles/Flashforge/filament/Generic ASA @Flashforge.json index 0466c5af9a..b80ad322c3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json +++ b/resources/profiles/Flashforge/filament/Generic ASA @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic ASA", + "name": "Generic ASA @Flashforge", "inherits": "fdm_filament_asa", + "renamed_from": "Flashforge Generic ASA", "from": "system", - "setting_id": "jMCunppmYOH5QIra", - "filament_id": "OFRPEs5o", + "setting_id": "tzs0HcyEZow99A2J", + "filament_id": "OFLPAxz3", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json similarity index 75% rename from resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json index c5097dca7c..84c43def44 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge G3U 0.6 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic HIPS @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic ABS", + "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", "from": "system", - "setting_id": "b3CFhGGnZLzpyAWa", - "filament_id": "OFYl0c8v", + "setting_id": "wsAmSziSQ4UEHucg", + "filament_id": "OFsFon5l", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" @@ -31,7 +32,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic HIPS @G3U 0.6 Nozzle" + "Generic HIPS @Flashforge G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode\n" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json b/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge.json similarity index 94% rename from resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json rename to resources/profiles/Flashforge/filament/Generic HIPS @Flashforge.json index 31dbe0e60f..3012161923 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json +++ b/resources/profiles/Flashforge/filament/Generic HIPS @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic HIPS", - "inherits": "Flashforge Generic ABS", + "name": "Generic HIPS @Flashforge", + "inherits": "Generic ABS @Flashforge", + "renamed_from": "Flashforge Generic HIPS", "from": "system", - "setting_id": "n68nw5tzKZ0rq43O", - "filament_id": "OFYl0c8v", + "setting_id": "zMQa7Squ3p3jKYwB", + "filament_id": "OFsFon5l", "instantiation": "true", "activate_air_filtration": [ "0" @@ -153,7 +154,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic HIPS" + "Generic HIPS @Flashforge" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Generic HS PLA @FF AD5M 0.25 Nozzle.json similarity index 71% rename from resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic HS PLA @FF AD5M 0.25 Nozzle.json index 4b4a6224bd..558a420640 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic HS PLA @FF AD5M 0.25 Nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle", - "renamed_from": "Flashforge HS PLA @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic HS PLA", + "name": "Generic HS PLA @FF AD5M 0.25 Nozzle", + "renamed_from": "Flashforge HS PLA @FF AD5M 0.25 Nozzle;Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle", + "inherits": "Generic HS PLA @Flashforge", "from": "system", - "setting_id": "1cvcaoBFNbg2GucE", - "filament_id": "OFLrdHse", + "setting_id": "DWsED5ish5gru5mt", + "filament_id": "OFvxghTE", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", @@ -13,7 +13,7 @@ "Flashforge AD5X 0.25 nozzle" ], "filament_settings_id": [ - "Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle" + "Generic HS PLA @FF AD5M 0.25 Nozzle" ], "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json b/resources/profiles/Flashforge/filament/Generic HS PLA @Flashforge.json similarity index 96% rename from resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json rename to resources/profiles/Flashforge/filament/Generic HS PLA @Flashforge.json index 48b701953d..b6b4f26221 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json +++ b/resources/profiles/Flashforge/filament/Generic HS PLA @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic HS PLA", + "name": "Generic HS PLA @Flashforge", "inherits": "fdm_filament_pla", + "renamed_from": "Flashforge Generic HS PLA", "from": "system", - "setting_id": "foG37d7HZKgt6l43", - "filament_id": "OFLrdHse", + "setting_id": "GTqLzBcGP2Rmmc9X", + "filament_id": "OFvxghTE", "instantiation": "true", "bed_temperature_difference": [ "10" diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json index 906b5af508..366dd8ec5a 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PET @FF G4 0.6 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "cvJIaPzb0uJLipX1", "filament_id": "OF6MOPWx", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json index 83744365bd..7e4f3adacc 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.6 nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PET @FF G4 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "wguPruY9M7GcMt6q", "filament_id": "OF6MOPWx", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json index 0e279cd8cb..33a832c216 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4 0.8 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PET @FF G4 0.8 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "EhobwmFIEg5Cs5Ki", "filament_id": "OF6MOPWx", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4.json index 77114b937f..82ddf2067c 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PET @FF G4", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "JvdxJyy7xCm3F0xH", "filament_id": "OF6MOPWx", diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json index 68d26b5ff5..6075390527 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PET @FF G4P 0.6 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "FtwGLcPMQqKw5uKW", "filament_id": "OF6MOPWx", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json index 9a6a079a2e..c26ba6d204 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.6 nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PET @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "lrnsjoh8DtnTcT7g", "filament_id": "OF6MOPWx", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json index 222c3f3085..731a8b0a27 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P 0.8 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Generic PET @FF G4P 0.8 HF nozzle", - "inherits": "FusRock Generic PET-CF @G3U 0.6 Nozzle", + "inherits": "FusRock PET-CF @G3U 0.6 Nozzle", "from": "system", "setting_id": "Th8rzyWoINHBwgcw", "filament_id": "OF6MOPWx", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "close_fan_the_first_x_layers": [ "3" ], diff --git a/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json b/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json index 346c467bd6..f1d33a0d09 100644 --- a/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Generic PET @FF G4P.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PET @FF G4P", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "1Lyq9gOfcZ5hPIdW", "filament_id": "OF6MOPWx", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG @FF AD5M 0.25 Nozzle.json similarity index 58% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PETG @FF AD5M 0.25 Nozzle.json index 9d4acd8d24..0a54e7aeff 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @FF AD5M 0.25 Nozzle.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG @FF AD5M 0.25 Nozzle", - "renamed_from": "Flashforge PETG @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic PETG", + "name": "Generic PETG @FF AD5M 0.25 Nozzle", + "renamed_from": "Flashforge PETG @FF AD5M 0.25 Nozzle;Flashforge Generic PETG @FF AD5M 0.25 Nozzle", + "inherits": "Generic PETG @Flashforge", "from": "system", - "setting_id": "KerUxwPsSEKDO6jL", - "filament_id": "OFZHgTVI", + "setting_id": "RyssSqtvE99XGdpZ", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", @@ -13,7 +13,7 @@ "Flashforge AD5X 0.25 nozzle" ], "filament_settings_id": [ - "Flashforge Generic PETG @FF AD5M 0.25 Nozzle" + "Generic PETG @FF AD5M 0.25 Nozzle" ], "fan_max_speed": [ "80" diff --git a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json index d18f7bc5c4..3308abfa38 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge AD4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PETG @Flashforge AD4", - "inherits": "Flashforge Generic PETG", + "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "6vtyYCWYY10OPMbz", "filament_id": "OFYPdQJh", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json similarity index 72% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json index 8b452d3759..77095049c2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.6 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "W7pWKQ2EWAB5viV1", - "filament_id": "OFZHgTVI", + "setting_id": "ptfqxSWRVMFXRqzD", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" @@ -25,7 +26,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PETG @G3U 0.6 Nozzle" + "Generic PETG @Flashforge G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json similarity index 73% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json index 288f028eac..f0ebbde186 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U 0.8 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG @G3U 0.8 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "eDQb2WfDsUTvj2Nf", - "filament_id": "OFZHgTVI", + "setting_id": "UhrHMgzzppLirT8M", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" @@ -28,7 +29,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PETG @G3U 0.8 Nozzle" + "Generic PETG @Flashforge G3U 0.8 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U.json similarity index 93% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json rename to resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U.json index 85e54ec1a6..119b9e3349 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge G3U.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG @G3U", - "inherits": "Flashforge Generic PETG", + "name": "Generic PETG @Flashforge G3U", + "inherits": "Generic PETG @Flashforge", + "renamed_from": "Flashforge Generic PETG @G3U;Flashforge Generic PETG G3U", "from": "system", - "setting_id": "yo4uc7TxQbqnlRUY", - "filament_id": "OFZHgTVI", + "setting_id": "umrO2bL7ihLROx0B", + "filament_id": "OFYPdQJh", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic PETG @G3U" + "Generic PETG @Flashforge G3U" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge.json similarity index 91% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG.json rename to resources/profiles/Flashforge/filament/Generic PETG @Flashforge.json index 916c392f08..b53946e06c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json +++ b/resources/profiles/Flashforge/filament/Generic PETG @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG", + "name": "Generic PETG @Flashforge", "inherits": "fdm_filament_pet", + "renamed_from": "Flashforge Generic PETG", "from": "system", - "setting_id": "YqiSgA018CdflfT9", - "filament_id": "OFZHgTVI", + "setting_id": "pd9YWgt8IGXdiiUV", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json similarity index 74% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json index 5e5c8ebf79..a44330253e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.6 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG-CF @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "u2OzNKIQIKUrOT9k", - "filament_id": "OFQC8Vna", + "setting_id": "xYtwo7Ddkfh5PLIz", + "filament_id": "OFoYSJKi", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" @@ -25,7 +26,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PETG-CF @G3U 0.6 Nozzle" + "Generic PETG-CF @Flashforge G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json similarity index 74% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json index 2a52b92e70..3f5f92e8bc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U 0.8 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG-CF @G3U 0.8 Nozzle", - "inherits": "Flashforge Generic PETG", + "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", "from": "system", - "setting_id": "7Qq8eY1kcFHTgzW3", - "filament_id": "OFQC8Vna", + "setting_id": "v3HCxK10mQARiRTZ", + "filament_id": "OFoYSJKi", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" @@ -28,7 +29,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PETG-CF @G3U 0.8 Nozzle" + "Generic PETG-CF @Flashforge G3U 0.8 Nozzle" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U.json similarity index 93% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json rename to resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U.json index 3a6f44f5ff..d298fa5b12 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF @Flashforge G3U.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG-CF @G3U", - "inherits": "Flashforge Generic PETG", + "name": "Generic PETG-CF @Flashforge G3U", + "inherits": "Generic PETG @Flashforge", + "renamed_from": "Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG-CF G3U", "from": "system", - "setting_id": "gLrecba33jDI9PeI", - "filament_id": "OFQC8Vna", + "setting_id": "XXoNSerT8aqG5dlL", + "filament_id": "OFoYSJKi", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic PETG-CF @G3U" + "Generic PETG-CF @Flashforge G3U" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json index a405594914..bcf3f0926c 100644 --- a/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge AD4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PETG-CF10 @Flashforge AD4", - "inherits": "Flashforge Generic PETG-CF10", + "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "fWM9WLGV9mUQOtHh", "filament_id": "OFO5djrM", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge.json similarity index 95% rename from resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json rename to resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge.json index c94cdfff56..ca45c4fe25 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json +++ b/resources/profiles/Flashforge/filament/Generic PETG-CF10 @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PETG-CF10", + "name": "Generic PETG-CF10 @Flashforge", "inherits": "fdm_filament_pet", + "renamed_from": "Flashforge Generic PETG-CF10", "from": "system", - "setting_id": "PlC4Ek7d09ytYZqJ", - "filament_id": "OFlNWVr5", + "setting_id": "0oCfWHsyqpBCbD62", + "filament_id": "OFO5djrM", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA @FF AD5M 0.25 Nozzle.json similarity index 73% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA @FF AD5M 0.25 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PLA @FF AD5M 0.25 Nozzle.json index 769d2f16d5..d0cf9d305f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @FF AD5M 0.25 Nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Flashforge Generic PLA @FF AD5M 0.25 Nozzle", - "renamed_from": "Flashforge PLA @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic PLA", + "name": "Generic PLA @FF AD5M 0.25 Nozzle", + "renamed_from": "Flashforge PLA @FF AD5M 0.25 Nozzle;Flashforge Generic PLA @FF AD5M 0.25 Nozzle", + "inherits": "Generic PLA @Flashforge", "from": "system", - "setting_id": "o1CHzasJ7x3CKjue", + "setting_id": "tPulq0o2HEsicj3g", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", @@ -12,7 +12,7 @@ "Flashforge AD5X 0.25 nozzle" ], "filament_settings_id": [ - "Flashforge Generic PLA @FF AD5M 0.25 Nozzle" + "Generic PLA @FF AD5M 0.25 Nozzle" ], "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json index e8d34603f3..5de4a77e3c 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge AD4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PLA @Flashforge AD4", - "inherits": "Flashforge Generic PLA", + "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "48NJ34G6Uo7VgzD4", "filament_id": "OFDSrzZ8", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U 0.6 Nozzle.json similarity index 84% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U 0.6 Nozzle.json index 72add60440..b0c0ce9597 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U 0.6 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", - "name": "Flashforge Generic PLA @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PLA", + "name": "Generic PLA @Flashforge G3U 0.6 Nozzle", + "inherits": "Generic PLA @Flashforge", "from": "system", "instantiation": "false", "compatible_printers": [ @@ -23,7 +23,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode\n\n\n" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U 0.8 Nozzle.json similarity index 86% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U 0.8 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U 0.8 Nozzle.json index ccc07ccec3..49aa73c7eb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U 0.8 Nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", - "name": "Flashforge Generic PLA @G3U 0.8 Nozzle", - "inherits": "Flashforge Generic PLA", + "name": "Generic PLA @Flashforge G3U 0.8 Nozzle", + "inherits": "Generic PLA @Flashforge", "from": "system", "instantiation": "false", "compatible_printers": [ @@ -23,7 +23,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PLA @G3U 0.8 Nozzle" + "Generic PLA @Flashforge G3U 0.8 Nozzle" ], "filament_start_gcode": [ "; filament start gcode\n\n\n" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U.json similarity index 93% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json rename to resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U.json index 9f2a18971a..48b66814ca 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge G3U.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PLA @G3U", - "inherits": "Flashforge Generic PLA", + "name": "Generic PLA @Flashforge G3U", + "inherits": "Generic PLA @Flashforge", + "renamed_from": "Flashforge Generic PLA @G3U;Flashforge Generic PLA G3U", "from": "system", - "setting_id": "gjIdhPTLOr17mz5B", - "filament_id": "OFtTHNTj", + "setting_id": "8ZlELnZzCa3UsztB", + "filament_id": "OFDSrzZ8", "instantiation": "true", "activate_air_filtration": [ "0" @@ -154,7 +155,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic PLA @G3U" + "Generic PLA @Flashforge G3U" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge.json similarity index 89% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA.json rename to resources/profiles/Flashforge/filament/Generic PLA @Flashforge.json index 8e2d4c90c3..2a7b642470 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json +++ b/resources/profiles/Flashforge/filament/Generic PLA @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PLA", + "name": "Generic PLA @Flashforge", "inherits": "fdm_filament_pla", + "renamed_from": "Flashforge Generic PLA", "from": "system", - "setting_id": "DwAgYHepesazDUjN", - "filament_id": "OFtTHNTj", + "setting_id": "keWbSonGBWos68ag", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json index 73ed3cbbaa..85741e007d 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA High Speed @Flashforge AD4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PLA High Speed @Flashforge AD4", - "inherits": "Flashforge Generic HS PLA", + "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "B4EWBUa9G36lZUd7", "filament_id": "OFmpMwxS", diff --git a/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json index d10e6d527c..39a2a4cfe8 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA Silk @Flashforge AD4.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Generic PLA Silk @Flashforge AD4", "renamed_from": "PLA Silk @Flashforge AD4", - "inherits": "Flashforge Generic PLA-Silk", + "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "9FrKIXABj3yedXri", "filament_id": "OFesA6rF", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json similarity index 73% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json index ad76d07bac..af864f7f8e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.6 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PLA-CF @G3U 0.6 Nozzle", - "inherits": "Flashforge Generic PLA", + "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", "from": "system", - "setting_id": "KR0LUSD7wd55oNI6", - "filament_id": "OFYlthXI", + "setting_id": "3vXm1hn43igE1xww", + "filament_id": "OFWbdGsC", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.6 Nozzle" @@ -28,7 +29,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PLA-CF @G3U 0.6 Nozzle" + "Generic PLA-CF @Flashforge G3U 0.6 Nozzle" ], "filament_start_gcode": [ "; filament start gcode\n" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json similarity index 73% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json index d0f628a2bb..798dff9458 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U 0.8 Nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PLA-CF @G3U 0.8 Nozzle", - "inherits": "Flashforge Generic PLA", + "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", "from": "system", - "setting_id": "rQSFNxuuqUVzsSV2", - "filament_id": "OFYlthXI", + "setting_id": "f1rqvqunGS94fw7q", + "filament_id": "OFWbdGsC", "instantiation": "true", "compatible_printers": [ "Flashforge Guider 3 Ultra 0.8 Nozzle" @@ -28,7 +29,7 @@ "5" ], "filament_settings_id": [ - "Flashforge Generic PLA-CF @G3U 0.8 Nozzle" + "Generic PLA-CF @Flashforge G3U 0.8 Nozzle" ], "filament_start_gcode": [ "; filament start gcode\n" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U.json similarity index 93% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json rename to resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U.json index 9ef92ee7ee..7f79c0753e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF @Flashforge G3U.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PLA-CF @G3U", - "inherits": "Flashforge Generic PLA", + "name": "Generic PLA-CF @Flashforge G3U", + "inherits": "Generic PLA @Flashforge", + "renamed_from": "Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA-CF G3U", "from": "system", - "setting_id": "S1UTm2oMRoQ4yM4R", - "filament_id": "OFYlthXI", + "setting_id": "J2zu45Q3zu7Tor3W", + "filament_id": "OFWbdGsC", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic PLA-CF @G3U" + "Generic PLA-CF @Flashforge G3U" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json index 1867ff0281..c03c616a0e 100644 --- a/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge AD4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PLA-CF10 @Flashforge AD4", - "inherits": "Flashforge Generic PLA-CF10", + "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "F8r0b3G228QEK53U", "filament_id": "OFX2zcrM", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge.json similarity index 96% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json rename to resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge.json index 9fe47dcd87..8b2e1efb14 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-CF10 @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PLA-CF10", + "name": "Generic PLA-CF10 @Flashforge", "inherits": "fdm_filament_pla", + "renamed_from": "Flashforge Generic PLA-CF10", "from": "system", - "setting_id": "qH3l3p0yvZHqHnwG", - "filament_id": "OFdEIwxy", + "setting_id": "cckB4CXjFwZKC0l0", + "filament_id": "OFX2zcrM", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA-SILK @FF AD5M 0.25 Nozzle.json similarity index 71% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json rename to resources/profiles/Flashforge/filament/Generic PLA-SILK @FF AD5M 0.25 Nozzle.json index a0317d1b97..c2e5210f3a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-SILK @FF AD5M 0.25 Nozzle.json @@ -1,18 +1,18 @@ { "type": "filament", - "name": "Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", - "renamed_from": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", - "inherits": "Flashforge Generic PLA-Silk", + "name": "Generic PLA-SILK @FF AD5M 0.25 Nozzle", + "renamed_from": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle;Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", + "inherits": "Generic PLA-Silk @Flashforge", "from": "system", - "setting_id": "WOl0JsKxAQFo2WnW", - "filament_id": "OFrrMLDw", + "setting_id": "gsOqWqaxtcrTm9JE", + "filament_id": "OFkf1HHw", "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", "Flashforge Adventurer 5M Pro 0.25 Nozzle" ], "filament_settings_id": [ - "Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle" + "Generic PLA-SILK @FF AD5M 0.25 Nozzle" ], "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json b/resources/profiles/Flashforge/filament/Generic PLA-Silk @Flashforge.json similarity index 89% rename from resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json rename to resources/profiles/Flashforge/filament/Generic PLA-Silk @Flashforge.json index e9ac388665..d8eabacaa0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json +++ b/resources/profiles/Flashforge/filament/Generic PLA-Silk @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PLA-Silk", + "name": "Generic PLA-Silk @Flashforge", "inherits": "fdm_filament_pla", + "renamed_from": "Flashforge Generic PLA-Silk", "from": "system", - "setting_id": "NryK9oIg8wMDKVHW", - "filament_id": "OFYvSO1W", + "setting_id": "TPRkxgDXxVhPC1ws", + "filament_id": "OFi6PfUM", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json b/resources/profiles/Flashforge/filament/Generic PVA @Flashforge.json similarity index 94% rename from resources/profiles/Flashforge/filament/Flashforge Generic PVA.json rename to resources/profiles/Flashforge/filament/Generic PVA @Flashforge.json index 52bc8adcb9..6c76493158 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json +++ b/resources/profiles/Flashforge/filament/Generic PVA @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic PVA", - "inherits": "Flashforge Generic PLA", + "name": "Generic PVA @Flashforge", + "inherits": "Generic PLA @Flashforge", + "renamed_from": "Flashforge Generic PVA", "from": "system", - "setting_id": "NA0PhaTNDvEH38lF", - "filament_id": "OF1OZujR", + "setting_id": "yiCXuEb87vNMhytL", + "filament_id": "OFDvXujf", "instantiation": "true", "activate_air_filtration": [ "0" @@ -154,7 +155,7 @@ "nil" ], "filament_settings_id": [ - "Flashforge Generic PVA" + "Generic PVA @Flashforge" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json index b46926fe5e..320aa2ad8d 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.6 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic TPU 85A @FF AD5X 0.6 nozzle", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "WQyJHZpkl9Dz6Yo3", "filament_id": "OFulOdT2", diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json index 01b1fbe328..0731ca82a6 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic TPU 85A @FF AD5X 0.8 nozzle", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "qRqhbOYn5TMfccem", "filament_id": "OFulOdT2", diff --git a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json index f1d682cfca..a93bdb8c2e 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Generic TPU 85A @FF AD5X.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic TPU 85A @FF AD5X", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "LTZCFxkzkGCnUMAR", "filament_id": "OFulOdT2", diff --git a/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json index 685e0dce0f..610777d347 100644 --- a/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json +++ b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge AD4.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic TPU @Flashforge AD4", - "inherits": "Flashforge Generic TPU", + "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "DW9Ck6xMK00Ry2iE", "filament_id": "OFgbpcy9", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge.json similarity index 95% rename from resources/profiles/Flashforge/filament/Flashforge Generic TPU.json rename to resources/profiles/Flashforge/filament/Generic TPU @Flashforge.json index 4ffd4a3aee..45a6b2e6f9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json +++ b/resources/profiles/Flashforge/filament/Generic TPU @Flashforge.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Flashforge Generic TPU", + "name": "Generic TPU @Flashforge", "inherits": "fdm_filament_tpu", + "renamed_from": "Flashforge Generic TPU", "from": "system", - "setting_id": "zQEeIIKWSgsDqlpI", - "filament_id": "OFC20UMj", + "setting_id": "luh9xN4STlD0sTyt", + "filament_id": "OFgbpcy9", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json index 5b9131d949..73d0c5de35 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Polymaker CoPA @FF G4 0.6 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "lALS0WwvUo5AYOq3", - "filament_id": "OFIieIka", + "filament_id": "OFQyyO0l", "instantiation": "true", + "filament_vendor": [ + "Polymaker" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json index e6267540fb..3f1f866e13 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.6 nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Polymaker CoPA @FF G4 0.6 nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "tgRrYwnp5nr1yr9w", - "filament_id": "OFIieIka", + "filament_id": "OFQyyO0l", "instantiation": "true", + "filament_vendor": [ + "Polymaker" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json index 9f844651fa..58a29d1466 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4 0.8 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Polymaker CoPA @FF G4 0.8 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "yom6iIUUwU1MsZwF", - "filament_id": "OFIieIka", + "filament_id": "OFQyyO0l", "instantiation": "true", + "filament_vendor": [ + "Polymaker" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json index 5117416c0a..9d896b6896 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Polymaker CoPA @FF G4P 0.6 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "ysj5nD1op08U8rUT", - "filament_id": "OFIieIka", + "filament_id": "OFQyyO0l", "instantiation": "true", + "filament_vendor": [ + "Polymaker" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json index 1d6ac1b4c2..153456f8da 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.6 nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Polymaker CoPA @FF G4P 0.6 nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "HBtkC3BfEpBGEWc5", - "filament_id": "OFIieIka", + "filament_id": "OFQyyO0l", "instantiation": "true", + "filament_vendor": [ + "Polymaker" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json index f284af6a29..cd5d838b69 100644 --- a/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json @@ -1,11 +1,14 @@ { "type": "filament", "name": "Polymaker CoPA @FF G4P 0.8 HF nozzle", - "inherits": "FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "inherits": "FusRock S-PAHT @G3U 0.6 Nozzle", "from": "system", "setting_id": "zsW4MCpeL5qfzNfg", - "filament_id": "OFIieIka", + "filament_id": "OFQyyO0l", "instantiation": "true", + "filament_vendor": [ + "Polymaker" + ], "close_fan_the_first_x_layers": [ "2" ], diff --git a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json b/resources/profiles/Flashforge/filament/Polymaker/Polymaker CoPA.json similarity index 95% rename from resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json rename to resources/profiles/Flashforge/filament/Polymaker/Polymaker CoPA.json index 352f419c5e..533af6688b 100644 --- a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic CoPA.json +++ b/resources/profiles/Flashforge/filament/Polymaker/Polymaker CoPA.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Polymaker Generic CoPA", - "inherits": "Flashforge Generic PLA", + "name": "Polymaker CoPA", + "inherits": "Generic PLA @Flashforge", + "renamed_from": "Polymaker Generic CoPA", "from": "system", - "setting_id": "t6CWYU3ZSddIjwhS", - "filament_id": "OFwxpmHM", + "setting_id": "5Dt1APJ8qd5pzmzK", + "filament_id": "OFQyyO0l", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "Polymaker Generic CoPA" + "Polymaker CoPA" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json b/resources/profiles/Flashforge/filament/Polymaker/Polymaker S1.json similarity index 95% rename from resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json rename to resources/profiles/Flashforge/filament/Polymaker/Polymaker S1.json index d55ea01f1d..c7eb2fb58c 100644 --- a/resources/profiles/Flashforge/filament/Polymaker/Polymaker Generic S1.json +++ b/resources/profiles/Flashforge/filament/Polymaker/Polymaker S1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Polymaker Generic S1", - "inherits": "Flashforge Generic PLA", + "name": "Polymaker S1", + "inherits": "Generic PLA @Flashforge", + "renamed_from": "Polymaker Generic S1", "from": "system", - "setting_id": "NXQtHvtO4tyQ1ueu", - "filament_id": "OFfegVpA", + "setting_id": "auChFegT1xViXxGe", + "filament_id": "OFaDsTE0", "instantiation": "true", "activate_air_filtration": [ "0" @@ -152,7 +153,7 @@ "nil" ], "filament_settings_id": [ - "Polymaker Generic S1" + "Polymaker S1" ], "filament_shrink": [ "100%" diff --git a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json index 994468c54d..c74353803b 100644 --- a/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json +++ b/resources/profiles/Flashforge/filament/SUNLU/SUNLU PLA Marble @base.json @@ -1,7 +1,6 @@ { "type": "filament", "name": "SUNLU PLA Marble @base", - "renamed_from": "SUNLU Marble PLA @base", "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFxUwUeW", diff --git a/resources/profiles/Flashforge/machine/FlashForge AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/machine/FlashForge AD5X 0.25 nozzle.json index ba5fc5f554..50a7d88ff5 100644 --- a/resources/profiles/Flashforge/machine/FlashForge AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/machine/FlashForge AD5X 0.25 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge AD5X 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge AD5X 0.4 nozzle.json index 8db76b0cd5..9dcd0f86dd 100644 --- a/resources/profiles/Flashforge/machine/Flashforge AD5X 0.4 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge AD5X 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge AD5X 0.6 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge AD5X 0.6 nozzle.json index 4955930d7c..a88cbb9e80 100644 --- a/resources/profiles/Flashforge/machine/Flashforge AD5X 0.6 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge AD5X 0.6 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge AD5X 0.8 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge AD5X 0.8 nozzle.json index ef7b50bbdb..47ac21c2ec 100644 --- a/resources/profiles/Flashforge/machine/Flashforge AD5X 0.8 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge AD5X 0.8 nozzle.json @@ -24,7 +24,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge AD5X.json b/resources/profiles/Flashforge/machine/Flashforge AD5X.json index 3ed31ba385..42cfac7967 100644 --- a/resources/profiles/Flashforge/machine/Flashforge AD5X.json +++ b/resources/profiles/Flashforge/machine/Flashforge AD5X.json @@ -9,5 +9,5 @@ "bed_texture": "flashforge_ad5x_buildplate_texture.svg", "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", "url": "", - "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" + "default_materials": "Generic ABS @Flashforge;Generic PETG @Flashforge;Generic PLA @Flashforge" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json index fbc164e0e0..476d036a95 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json @@ -9,5 +9,5 @@ "bed_texture": "flashforge_adventurer5m_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", - "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" + "default_materials": "Generic ABS @Flashforge;Generic PETG @Flashforge;Generic PLA @Flashforge" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json index c0822d3d73..b69dc12126 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json @@ -9,5 +9,5 @@ "bed_texture": "flashforge_adventurer5m_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", - "default_materials": "Flashforge Generic ABS;Flashforge Generic PETG;Flashforge Generic PLA" + "default_materials": "Generic ABS @Flashforge;Generic PETG @Flashforge;Generic PLA @Flashforge" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Artemis.json b/resources/profiles/Flashforge/machine/Flashforge Artemis.json index 7bab45b82a..22e9963a24 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Artemis.json +++ b/resources/profiles/Flashforge/machine/Flashforge Artemis.json @@ -9,5 +9,5 @@ "bed_model": "flashforge_artemis_buildplate_model.stl", "bed_texture": "flashforge_artemis_buildplate_texture.svg", "hotend_model": "", - "default_filament_profile": "Flashforge Generic PETG; Flashforge Generic PLA" + "default_filament_profile": "Generic PETG @Flashforge; Generic PLA @Flashforge" } 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 59c227c431..5ffbd6a7fc 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 @@ -24,7 +24,7 @@ "cooling_tube_retraction": "0", "default_bed_type": "", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ 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 9af2bb705b..ce7727209f 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 @@ -24,7 +24,7 @@ "cooling_tube_retraction": "0", "default_bed_type": "", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ 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 e25ed9f229..e747961d1e 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 @@ -24,7 +24,7 @@ "cooling_tube_retraction": "0", "default_bed_type": "", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ 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 fb960b8d27..620fb3dec3 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 @@ -24,7 +24,7 @@ "cooling_tube_retraction": "0", "default_bed_type": "", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ 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 b9343cf430..43c07989c6 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 @@ -24,7 +24,7 @@ "cooling_tube_retraction": "0", "default_bed_type": "", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ 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 7111452aa9..71d101c355 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 @@ -24,7 +24,7 @@ "cooling_tube_retraction": "0", "default_bed_type": "", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json index 4456789cce..54e03d72fe 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 2s 0.4 nozzle.json @@ -117,7 +117,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M25", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "machine_start_gcode": "M118 X10 Y10 Z10\nM140 S[bed_temperature_initial_layer_single]; set initial bed temp\nM104 S[nozzle_temperature_initial_layer] T0; set initial extruder temp\nM107; disable cooling fan\nG90; set to absolute positioning\nG28; home axes\nM132 X Y A B; recall home offsets from EPROM\nG1 Z50.0 F420; adjust Z\nG161 X Y F3300\nM7; wait for bed to stabilize\nM6 T0; wait for extruder to stabilize\nM651 S255; start case fan\nG1 Z0.3 F3600; move down to purge\nG92 E0; zero extruders\nG1 X120 Y-125 E20 F2000; extrude a line of filament across the front edge of the bed\nG1 X130 Y-125 F180; wait for ooze\nG1 X140 Y-125 F5000; fast wipe\nG1 Z1 F100; lift\nG92 E0; zero extruders again\nG1 E-1.0000 F1800", "machine_end_gcode": "M104 S0 T0; cool down extruder\nM140 S0 T0; cool down bed\nG162 Z F1800\nG28 X Y; home axes\nM132 X Y A B; recall home offsets from EPROM\nM652; turn off rear fan\nG91; set to relative positioning\nM18; disable stepper motors", diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json b/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json index 38c0f3c667..4c99585c03 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 2s.json @@ -8,5 +8,5 @@ "bed_model": "flashforge_g2s_buildplate_model.stl", "bed_texture": "flashforge_g2s_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" + "default_materials": "Generic PVA @Flashforge;Generic HIPS @Flashforge;Generic PETG-CF @Flashforge G3U;Generic PETG @Flashforge G3U;Generic PLA-CF @Flashforge G3U;Generic PLA @Flashforge G3U;Generic ASA @Flashforge G3U;Generic ABS @Flashforge G3U;FusRock PET-CF;FusRock PAHT-CF;FusRock NexPA-CF25;FusRock S-Multi;FusRock S-PAHT;Polymaker CoPA;Polymaker S1" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json index b8388ba7c4..dcde8504e9 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.4 Nozzle.json @@ -18,7 +18,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U" + "Generic PLA @Flashforge G3U" ], "default_print_profile": "0.20mm Standard @Flashforge G3U 0.4 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.6 Nozzle.json index f2b89e3585..2736b59737 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.6 Nozzle.json @@ -12,7 +12,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "default_print_profile": "0.30mm Standard @Flashforge G3U 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.8 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.8 Nozzle.json index 1076239de4..684474af9d 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra 0.8 Nozzle.json @@ -12,7 +12,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.8 Nozzle" + "Generic PLA @Flashforge G3U 0.8 Nozzle" ], "default_print_profile": "0.40mm Standard @Flashforge G3U 0.8 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json index a3bc7d0b68..c95215a762 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json @@ -8,5 +8,5 @@ "bed_model": "flashforge_g3u_buildplate_model.stl", "bed_texture": "flashforge_g3u_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" + "default_materials": "Generic PVA @Flashforge;Generic HIPS @Flashforge;Generic PETG-CF @Flashforge G3U;Generic PETG @Flashforge G3U;Generic PLA-CF @Flashforge G3U;Generic PLA @Flashforge G3U;Generic ASA @Flashforge G3U;Generic ABS @Flashforge G3U;FusRock PET-CF;FusRock PAHT-CF;FusRock NexPA-CF25;FusRock S-Multi;FusRock S-PAHT;Polymaker CoPA;Polymaker S1" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.25 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.25 nozzle.json index 2ee3538c7a..b7a7d5f6ba 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.25 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 HF nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 HF nozzle.json index b20d6ce763..f13d0aa125 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 HF nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 HF nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U" + "Generic PLA @Flashforge G3U" ], "default_print_profile": "0.20mm Standard @Flashforge G3U 0.4 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 nozzle.json index 452673eb55..22148f62db 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 HF nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 HF nozzle.json index 92bee1b7dc..4eb27093aa 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 HF nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "default_print_profile": "0.30mm Standard @Flashforge G3U 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 nozzle.json index 3570045562..56a63623fd 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.6 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "default_print_profile": "0.30mm Standard @Flashforge G3U 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.8 HF nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.8 HF nozzle.json index f61d3d7e77..64853e95fa 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 0.8 HF nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "default_print_profile": "0.30mm Standard @Flashforge G3U 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.25 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.25 nozzle.json index 3eee06cb24..4fbf0d684e 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.25 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.25 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 HF nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 HF nozzle.json index 35e7f5b067..9c0b57c05c 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 HF nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 HF nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U" + "Generic PLA @Flashforge G3U" ], "default_print_profile": "0.20mm Standard @Flashforge G3U 0.4 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 nozzle.json index e355db941c..58daabb444 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 HF nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 HF nozzle.json index 5ea36cfca8..49756682ba 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 HF nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 HF nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "default_print_profile": "0.30mm Standard @Flashforge G3U 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 nozzle.json index 21ae8e77fa..8c1a60781b 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.6 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "default_print_profile": "0.30mm Standard @Flashforge G3U 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.8 HF nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.8 HF nozzle.json index 660d3c342b..1140b773e3 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.8 HF nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro 0.8 HF nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Flashforge Generic PLA @G3U 0.6 Nozzle" + "Generic PLA @Flashforge G3U 0.6 Nozzle" ], "default_print_profile": "0.30mm Standard @Flashforge G3U 0.6 Nozzle", "deretraction_speed": [ diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json index 14ce7cead3..4bcdc78d4a 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4 Pro.json @@ -8,5 +8,5 @@ "bed_model": "flashforge_g4pro_buildplate_model.stl", "bed_texture": "flashforge_g4pro_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" + "default_materials": "Generic PVA @Flashforge;Generic HIPS @Flashforge;Generic PETG-CF @Flashforge G3U;Generic PETG @Flashforge G3U;Generic PLA-CF @Flashforge G3U;Generic PLA @Flashforge G3U;Generic ASA @Flashforge G3U;Generic ABS @Flashforge G3U;FusRock PET-CF;FusRock PAHT-CF;FusRock NexPA-CF25;FusRock S-Multi;FusRock S-PAHT;Polymaker CoPA;Polymaker S1" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider4.json b/resources/profiles/Flashforge/machine/Flashforge Guider4.json index 7b5248e14b..0cd89727d1 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider4.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider4.json @@ -8,5 +8,5 @@ "bed_model": "flashforge_g4pro_buildplate_model.stl", "bed_texture": "flashforge_g4pro_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Flashforge Generic PVA;Flashforge Generic HIPS;Flashforge Generic PETG-CF @G3U;Flashforge Generic PETG @G3U;Flashforge Generic PLA-CF @G3U;Flashforge Generic PLA @G3U;Flashforge Generic ASA @G3U;Flashforge Generic ABS @G3U;FusRock Generic PET-CF;FusRock Generic PAHT-CF;FusRock Generic NexPA-CF25;FusRock Generic S-Multi;FusRock Generic S-PAHT;Polymaker Generic CoPA;Polymaker Generic S1" + "default_materials": "Generic PVA @Flashforge;Generic HIPS @Flashforge;Generic PETG-CF @Flashforge G3U;Generic PETG @Flashforge G3U;Generic PLA-CF @Flashforge G3U;Generic PLA @Flashforge G3U;Generic ASA @Flashforge G3U;Generic ABS @Flashforge G3U;FusRock PET-CF;FusRock PAHT-CF;FusRock NexPA-CF25;FusRock S-Multi;FusRock S-PAHT;Polymaker CoPA;Polymaker S1" } diff --git a/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json b/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json index 6002dfb72e..2808e866e3 100644 --- a/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json +++ b/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json @@ -94,7 +94,7 @@ "machine_pause_gcode": "M25", "support_multi_bed_types": "1", "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-0.2 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", diff --git a/resources/profiles/Flashforge/machine/fdm_flashforge_common.json b/resources/profiles/Flashforge/machine/fdm_flashforge_common.json index ea865c4387..7e2e700885 100644 --- a/resources/profiles/Flashforge/machine/fdm_flashforge_common.json +++ b/resources/profiles/Flashforge/machine/fdm_flashforge_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Flashforge Generic PLA" + "Generic PLA @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M", "bed_exclude_area": [ diff --git a/resources/profiles/Flashforge/machine/fdm_klipper_common.json b/resources/profiles/Flashforge/machine/fdm_klipper_common.json index 237f4b54c7..3126f70c76 100644 --- a/resources/profiles/Flashforge/machine/fdm_klipper_common.json +++ b/resources/profiles/Flashforge/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Flashforge Generic ABS" + "Generic ABS @Flashforge" ], "default_print_profile": "0.20mm Standard @Flashforge AD5M", "bed_exclude_area": [ diff --git a/resources/profiles/FlyingBear.json b/resources/profiles/FlyingBear.json index d93bc00e57..5be5a8d4a3 100644 --- a/resources/profiles/FlyingBear.json +++ b/resources/profiles/FlyingBear.json @@ -1,6 +1,6 @@ { "name": "FlyingBear", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "1", "description": "FlyingBear configurations", "machine_model_list": [ @@ -245,32 +245,32 @@ "sub_path": "filament/S1/fdm_filament_tpu_other @S1.json" }, { - "name": "FlyingBear Generic ABS", - "sub_path": "filament/FlyingBear Generic ABS.json" + "name": "Generic ABS @FlyingBear", + "sub_path": "filament/Generic ABS @FlyingBear.json" }, { - "name": "FlyingBear Generic PA-CF", - "sub_path": "filament/FlyingBear Generic PA-CF.json" + "name": "Generic PA-CF @FlyingBear", + "sub_path": "filament/Generic PA-CF @FlyingBear.json" }, { - "name": "FlyingBear Generic PC", - "sub_path": "filament/FlyingBear Generic PC.json" + "name": "Generic PC @FlyingBear", + "sub_path": "filament/Generic PC @FlyingBear.json" }, { - "name": "FlyingBear Generic PETG", - "sub_path": "filament/FlyingBear Generic PETG.json" + "name": "Generic PETG @FlyingBear", + "sub_path": "filament/Generic PETG @FlyingBear.json" }, { - "name": "FlyingBear Generic PLA", - "sub_path": "filament/FlyingBear Generic PLA.json" + "name": "Generic PLA @FlyingBear", + "sub_path": "filament/Generic PLA @FlyingBear.json" }, { "name": "FlyingBear PLA Hyper", "sub_path": "filament/FlyingBear PLA Hyper.json" }, { - "name": "FlyingBear Generic TPU", - "sub_path": "filament/FlyingBear Generic TPU.json" + "name": "Generic TPU @FlyingBear", + "sub_path": "filament/Generic TPU @FlyingBear.json" }, { "name": "FlyingBear ABS @Ghost7", diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic ABS.json b/resources/profiles/FlyingBear/filament/Generic ABS @FlyingBear.json similarity index 69% rename from resources/profiles/FlyingBear/filament/FlyingBear Generic ABS.json rename to resources/profiles/FlyingBear/filament/Generic ABS @FlyingBear.json index 1bccf6a208..b0de37a64b 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic ABS.json +++ b/resources/profiles/FlyingBear/filament/Generic ABS @FlyingBear.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FlyingBear Generic ABS", + "name": "Generic ABS @FlyingBear", "inherits": "fdm_filament_abs", + "renamed_from": "FlyingBear Generic ABS", "from": "system", - "setting_id": "TDBNmmGSexhJjBVm", - "filament_id": "OFBtlI8M", + "setting_id": "2aW5bka7pvQhHGqF", + "filament_id": "OFY9muEs", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_flow_ratio": [ "0.94" ], diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PA-CF.json b/resources/profiles/FlyingBear/filament/Generic PA-CF @FlyingBear.json similarity index 72% rename from resources/profiles/FlyingBear/filament/FlyingBear Generic PA-CF.json rename to resources/profiles/FlyingBear/filament/Generic PA-CF @FlyingBear.json index 4ed339e5cc..37448910ed 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PA-CF.json +++ b/resources/profiles/FlyingBear/filament/Generic PA-CF @FlyingBear.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FlyingBear Generic PA-CF", + "name": "Generic PA-CF @FlyingBear", "inherits": "fdm_filament_pa", + "renamed_from": "FlyingBear Generic PA-CF", "from": "system", - "setting_id": "lpa58hsu9IB697v8", - "filament_id": "OFjoIVZ6", + "setting_id": "5hw49IVGTMbie2Zr", + "filament_id": "OFQLcbps", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_type": [ "PA-CF" ], diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PC.json b/resources/profiles/FlyingBear/filament/Generic PC @FlyingBear.json similarity index 67% rename from resources/profiles/FlyingBear/filament/FlyingBear Generic PC.json rename to resources/profiles/FlyingBear/filament/Generic PC @FlyingBear.json index 6dd3af11ba..926494718b 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PC.json +++ b/resources/profiles/FlyingBear/filament/Generic PC @FlyingBear.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FlyingBear Generic PC", + "name": "Generic PC @FlyingBear", "inherits": "fdm_filament_pc", + "renamed_from": "FlyingBear Generic PC", "from": "system", - "setting_id": "MkIN95sonzI0vNXT", - "filament_id": "OFxTMg1d", + "setting_id": "HU6kkNtEXGubYV0U", + "filament_id": "OFLakOUI", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_max_volumetric_speed": [ "12" ], diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PETG.json b/resources/profiles/FlyingBear/filament/Generic PETG @FlyingBear.json similarity index 80% rename from resources/profiles/FlyingBear/filament/FlyingBear Generic PETG.json rename to resources/profiles/FlyingBear/filament/Generic PETG @FlyingBear.json index b8a96a8154..77079afc33 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PETG.json +++ b/resources/profiles/FlyingBear/filament/Generic PETG @FlyingBear.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FlyingBear Generic PETG", + "name": "Generic PETG @FlyingBear", "inherits": "fdm_filament_pet", + "renamed_from": "FlyingBear Generic PETG", "from": "system", - "setting_id": "id0y4kfJciWjOwh6", - "filament_id": "OFzXURfo", + "setting_id": "D5Zk6ykY8TX3gs0Z", + "filament_id": "OFYPdQJh", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "reduce_fan_stop_start_freq": [ "1" ], diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic PLA.json b/resources/profiles/FlyingBear/filament/Generic PLA @FlyingBear.json similarity index 69% rename from resources/profiles/FlyingBear/filament/FlyingBear Generic PLA.json rename to resources/profiles/FlyingBear/filament/Generic PLA @FlyingBear.json index 87c72dc870..159f3da22b 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic PLA.json +++ b/resources/profiles/FlyingBear/filament/Generic PLA @FlyingBear.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FlyingBear Generic PLA", + "name": "Generic PLA @FlyingBear", "inherits": "fdm_filament_pla", + "renamed_from": "FlyingBear Generic PLA", "from": "system", - "setting_id": "yCGisctQQwASw8kc", - "filament_id": "OFFZ0BBL", + "setting_id": "g7zPgD6P3bbwm5gv", + "filament_id": "OFDSrzZ8", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_flow_ratio": [ "0.94" ], diff --git a/resources/profiles/FlyingBear/filament/FlyingBear Generic TPU.json b/resources/profiles/FlyingBear/filament/Generic TPU @FlyingBear.json similarity index 66% rename from resources/profiles/FlyingBear/filament/FlyingBear Generic TPU.json rename to resources/profiles/FlyingBear/filament/Generic TPU @FlyingBear.json index 5c97c06efb..c33b3757be 100644 --- a/resources/profiles/FlyingBear/filament/FlyingBear Generic TPU.json +++ b/resources/profiles/FlyingBear/filament/Generic TPU @FlyingBear.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "FlyingBear Generic TPU", + "name": "Generic TPU @FlyingBear", "inherits": "fdm_filament_tpu", + "renamed_from": "FlyingBear Generic TPU", "from": "system", - "setting_id": "84YwyW2C94NdN1zl", - "filament_id": "OFRzsaDK", + "setting_id": "Xdx2FIIQiqSz7DpN", + "filament_id": "OFgbpcy9", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_max_volumetric_speed": [ "3" ], diff --git a/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6 0.4 nozzle.json b/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6 0.4 nozzle.json index 633e17dd93..c5ac0140a5 100644 --- a/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6 0.4 nozzle.json +++ b/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6 0.4 nozzle.json @@ -122,7 +122,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M25", "default_filament_profile": [ - "FlyingBear Generic PLA" + "Generic PLA @FlyingBear" ], "machine_start_gcode": "M220 S100 ;reset feedrate\nM221 S100 ;reset flowrate\nG21 ;set units to millimeters\nG90 ;use absolute coordinates\nM82 ;absolute extrusion mode\nM107 ;turn off colling fan\n\nM140 S[bed_temperature_initial_layer] ;set bed temperature continue without waiting\nM104 S[nozzle_temperature_initial_layer] ;set hotend temperature continue without waiting\n\nG28 ;home\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder\n\nM190 S[bed_temperature_initial_layer] ;wait for bed temperature\nM109 S[nozzle_temperature_initial_layer] ;wait for hotend temperature\n\nG1 X20 Y20 F5000 ;start position \nG1 Z0.28 F1500 ;lower z\nG1 E4 F500 ;prime the filament\n\nG1 X20 Y20.0 Z0.28 F3000.0 ;start position \nG1 X20 Y170.0 Z0.28 F1500.0 E12 ;1st line\nG1 X20.3 F1500\nG1 X20.3 Y20.0 Z0.28 F1500.0 E18 ;2nd line\n\nG92 E0 ;reset extruder\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder\n", "machine_end_gcode": "G91 ;use relative coordinates\nG1 E-4 F1500 ;retract the filament\nG1 X5 Y5 Z0.2 F5000 ;wipe\nG1 Z5 F1500 ;raise z\nG90 ;use absolute coordinates\nG1 X10 Y210 F5000 ;park print head\n\nM107 ;turn off fan\nM104 S0 ;turn off hotend\nM140 S0 ;turn off heatbed\nM84 ;disable motors", diff --git a/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6.json b/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6.json index 3b1968c724..18a5c27f14 100644 --- a/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6.json +++ b/resources/profiles/FlyingBear/machine/FlyingBear Ghost 6.json @@ -8,5 +8,5 @@ "bed_model": "FlyingBear Ghost 6-bed.stl", "bed_texture": "FlyingBear Ghost 6-texture.png", "hotend_model": "", - "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;FlyingBear Generic TPU" + "default_materials": "Generic ABS @FlyingBear;Generic PA-CF @FlyingBear;Generic PC @FlyingBear;Generic PETG @FlyingBear;Generic PLA @FlyingBear;Generic TPU @FlyingBear" } diff --git a/resources/profiles/FlyingBear/machine/FlyingBear Reborn3.json b/resources/profiles/FlyingBear/machine/FlyingBear Reborn3.json index e75b8d0697..43dd2de3d4 100644 --- a/resources/profiles/FlyingBear/machine/FlyingBear Reborn3.json +++ b/resources/profiles/FlyingBear/machine/FlyingBear Reborn3.json @@ -8,5 +8,5 @@ "bed_model": "FlyingBear Reborn3-bed.stl", "bed_texture": "FlyingBear Reborn3-texture.png", "hotend_model": "", - "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;FlyingBear Generic TPU" + "default_materials": "Generic ABS @FlyingBear;Generic PA-CF @FlyingBear;Generic PC @FlyingBear;Generic PETG @FlyingBear;Generic PLA @FlyingBear;Generic TPU @FlyingBear" } diff --git a/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7.json b/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7.json index 959a8f1193..795743dc1f 100644 --- a/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7.json +++ b/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7.json @@ -8,5 +8,5 @@ "bed_model": "FlyingBear Ghost7-bed.stl", "bed_texture": "FlyingBear Ghost7-texture.png", "hotend_model": "", - "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;FlyingBear Generic TPU" + "default_materials": "Generic ABS @FlyingBear;Generic PA-CF @FlyingBear;Generic PC @FlyingBear;Generic PETG @FlyingBear;Generic PLA @FlyingBear;Generic TPU @FlyingBear" } diff --git a/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json b/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json index 2063aab681..53ca3accb9 100644 --- a/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json +++ b/resources/profiles/FlyingBear/machine/S1/FlyingBear S1.json @@ -8,5 +8,5 @@ "bed_model": "FlyingBear S1-bed.stl", "bed_texture": "FlyingBear S1-texture.png", "hotend_model": "", - "default_materials": "FlyingBear Generic ABS;FlyingBear Generic PA-CF;FlyingBear Generic PC;FlyingBear Generic PETG;FlyingBear Generic PLA;FlyingBear Generic TPU" + "default_materials": "Generic ABS @FlyingBear;Generic PA-CF @FlyingBear;Generic PC @FlyingBear;Generic PETG @FlyingBear;Generic PLA @FlyingBear;Generic TPU @FlyingBear" } diff --git a/resources/profiles/FlyingBear/machine/fdm_klipper_common.json b/resources/profiles/FlyingBear/machine/fdm_klipper_common.json index 8053ff22d0..d9170b7fec 100644 --- a/resources/profiles/FlyingBear/machine/fdm_klipper_common.json +++ b/resources/profiles/FlyingBear/machine/fdm_klipper_common.json @@ -14,7 +14,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "FlyingBear Generic PLA" + "Generic PLA @FlyingBear" ], "default_print_profile": "0.20mm Standard @FlyingBear Reborn3", "deretraction_speed": [ diff --git a/resources/profiles/FlyingBear/machine/fdm_machine_common.json b/resources/profiles/FlyingBear/machine/fdm_machine_common.json index 28e9665346..9b3574e7de 100644 --- a/resources/profiles/FlyingBear/machine/fdm_machine_common.json +++ b/resources/profiles/FlyingBear/machine/fdm_machine_common.json @@ -14,7 +14,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "FlyingBear Generic PLA" + "Generic PLA @FlyingBear" ], "default_print_profile": "0.20mm Standard @FlyingBear Reborn3", "deretraction_speed": [ diff --git a/resources/profiles/Ginger Additive.json b/resources/profiles/Ginger Additive.json index ff4c3bec09..249c3e9906 100644 --- a/resources/profiles/Ginger Additive.json +++ b/resources/profiles/Ginger Additive.json @@ -1,6 +1,6 @@ { "name": "Ginger Additive", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "1", "description": "Ginger configuration", "machine_model_list": [ @@ -67,12 +67,12 @@ "sub_path": "filament/fdm_filament_common.json" }, { - "name": "Ginger Generic PETG", - "sub_path": "filament/Ginger Generic PETG.json" + "name": "Generic PETG @Ginger", + "sub_path": "filament/Generic PETG @Ginger.json" }, { - "name": "Ginger Generic PLA", - "sub_path": "filament/Ginger Generic PLA.json" + "name": "Generic PLA @Ginger", + "sub_path": "filament/Generic PLA @Ginger.json" } ] } diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json b/resources/profiles/Ginger Additive/filament/Generic PETG @Ginger.json similarity index 92% rename from resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json rename to resources/profiles/Ginger Additive/filament/Generic PETG @Ginger.json index 15266aab2b..b9e6ce122c 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PETG.json +++ b/resources/profiles/Ginger Additive/filament/Generic PETG @Ginger.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Ginger Generic PETG", - "renamed_from": "Ginger Generic rPETG", + "name": "Generic PETG @Ginger", + "renamed_from": "Ginger Generic rPETG;Ginger Generic PETG", "inherits": "fdm_filament_common", "from": "system", - "setting_id": "ue95N2e65rdp5K6c", - "filament_id": "OFsGqI4y", + "setting_id": "rogjLzHbtvooz2lw", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json b/resources/profiles/Ginger Additive/filament/Generic PLA @Ginger.json similarity index 92% rename from resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json rename to resources/profiles/Ginger Additive/filament/Generic PLA @Ginger.json index 55e699954a..61e91d1f1e 100644 --- a/resources/profiles/Ginger Additive/filament/Ginger Generic PLA.json +++ b/resources/profiles/Ginger Additive/filament/Generic PLA @Ginger.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Ginger Generic PLA", - "renamed_from": "Ginger Generic rPLA", + "name": "Generic PLA @Ginger", + "renamed_from": "Ginger Generic rPLA;Ginger Generic PLA", "inherits": "fdm_filament_common", "from": "system", - "setting_id": "Z1scjKDBFoDaTa2C", - "filament_id": "OFlLmUeV", + "setting_id": "tu6pOYYSBlZCvmbH", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_vendor": [ "Generic" diff --git a/resources/profiles/Ginger Additive/machine/Ginger G1.json b/resources/profiles/Ginger Additive/machine/Ginger G1.json index 54756fd549..e379f536e4 100644 --- a/resources/profiles/Ginger Additive/machine/Ginger G1.json +++ b/resources/profiles/Ginger Additive/machine/Ginger G1.json @@ -8,5 +8,5 @@ "family": "Ginger", "bed_model": "Ginger_G1.stl", "bed_texture": "Ginger_One_texture.svg", - "default_materials": "Ginger Generic PETG;Ginger Generic PLA" + "default_materials": "Generic PETG @Ginger;Generic PLA @Ginger" } diff --git a/resources/profiles/Ginger Additive/machine/Ginger_G1_common.json b/resources/profiles/Ginger Additive/machine/Ginger_G1_common.json index 8b218915d1..a6fcccb284 100644 --- a/resources/profiles/Ginger Additive/machine/Ginger_G1_common.json +++ b/resources/profiles/Ginger Additive/machine/Ginger_G1_common.json @@ -1,13 +1,12 @@ { "type": "machine", "name": "Ginger_G1_common", - "renamed_from": "ginger_one_common", "inherits": "fdm_machine_common", "from": "system", "instantiation": "false", "printer_settings_id": "Ginger_G1_common", "default_filament_profile": [ - "Ginger Generic PLA" + "Generic PLA @Ginger" ], "default_print_profile": "1.50mm Standard @Ginger G1", "deretraction_speed": [ diff --git a/resources/profiles/InfiMech.json b/resources/profiles/InfiMech.json index 7ae4c46fb4..06d0629ffc 100644 --- a/resources/profiles/InfiMech.json +++ b/resources/profiles/InfiMech.json @@ -1,6 +1,6 @@ { "name": "InfiMech", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "1", "description": "InfiMech configurations", "machine_model_list": [ @@ -305,40 +305,40 @@ "sub_path": "filament/HSN/fdm_filament_tpu_other @HSN.json" }, { - "name": "InfiMech Generic ABS", - "sub_path": "filament/InfiMech Generic ABS.json" + "name": "Generic ABS @InfiMech", + "sub_path": "filament/Generic ABS @InfiMech.json" }, { "name": "Other ABS", "sub_path": "filament/Other ABS.json" }, { - "name": "InfiMech Generic PA-CF", - "sub_path": "filament/InfiMech Generic PA-CF.json" + "name": "Generic PA-CF @InfiMech", + "sub_path": "filament/Generic PA-CF @InfiMech.json" }, { "name": "Other PA-CF", "sub_path": "filament/Other PA-CF.json" }, { - "name": "InfiMech Generic PC", - "sub_path": "filament/InfiMech Generic PC.json" + "name": "Generic PC @InfiMech", + "sub_path": "filament/Generic PC @InfiMech.json" }, { "name": "Other PC", "sub_path": "filament/Other PC.json" }, { - "name": "InfiMech Generic PETG", - "sub_path": "filament/InfiMech Generic PETG.json" + "name": "Generic PETG @InfiMech", + "sub_path": "filament/Generic PETG @InfiMech.json" }, { "name": "Other PETG", "sub_path": "filament/Other PETG.json" }, { - "name": "InfiMech Generic PLA", - "sub_path": "filament/InfiMech Generic PLA.json" + "name": "Generic PLA @InfiMech", + "sub_path": "filament/Generic PLA @InfiMech.json" }, { "name": "InfiMech PLA Hyper", @@ -353,8 +353,8 @@ "sub_path": "filament/Other PLA.json" }, { - "name": "InfiMech Generic TPU", - "sub_path": "filament/InfiMech Generic TPU.json" + "name": "Generic TPU @InfiMech", + "sub_path": "filament/Generic TPU @InfiMech.json" }, { "name": "Other TPU", diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic ABS.json b/resources/profiles/InfiMech/filament/Generic ABS @InfiMech.json similarity index 67% rename from resources/profiles/InfiMech/filament/InfiMech Generic ABS.json rename to resources/profiles/InfiMech/filament/Generic ABS @InfiMech.json index 2b2223aec5..80b479de75 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic ABS.json +++ b/resources/profiles/InfiMech/filament/Generic ABS @InfiMech.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "InfiMech Generic ABS", + "name": "Generic ABS @InfiMech", "inherits": "fdm_filament_abs", + "renamed_from": "InfiMech Generic ABS", "from": "system", - "setting_id": "gtJ2ZoV8fxqqOXuv", - "filament_id": "OFWbbuRY", + "setting_id": "HRLECASD9Ko4Xxof", + "filament_id": "OFY9muEs", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_flow_ratio": [ "0.94" ], diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PA-CF.json b/resources/profiles/InfiMech/filament/Generic PA-CF @InfiMech.json similarity index 70% rename from resources/profiles/InfiMech/filament/InfiMech Generic PA-CF.json rename to resources/profiles/InfiMech/filament/Generic PA-CF @InfiMech.json index cfd3b187ce..0c202c609c 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PA-CF.json +++ b/resources/profiles/InfiMech/filament/Generic PA-CF @InfiMech.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "InfiMech Generic PA-CF", + "name": "Generic PA-CF @InfiMech", "inherits": "fdm_filament_pa", + "renamed_from": "InfiMech Generic PA-CF", "from": "system", - "setting_id": "k2NSIB3vVUoXGW9F", - "filament_id": "OF6K467o", + "setting_id": "IRYJpvGGjpF4ofY1", + "filament_id": "OFQLcbps", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_type": [ "PA-CF" ], diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PC.json b/resources/profiles/InfiMech/filament/Generic PC @InfiMech.json similarity index 64% rename from resources/profiles/InfiMech/filament/InfiMech Generic PC.json rename to resources/profiles/InfiMech/filament/Generic PC @InfiMech.json index 11d0153e01..a37d5db2b7 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PC.json +++ b/resources/profiles/InfiMech/filament/Generic PC @InfiMech.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "InfiMech Generic PC", + "name": "Generic PC @InfiMech", "inherits": "fdm_filament_pc", + "renamed_from": "InfiMech Generic PC", "from": "system", - "setting_id": "emj9YLXtmKmeoYJa", - "filament_id": "OF6xLvYg", + "setting_id": "W0oujcCps06G6yNB", + "filament_id": "OFLakOUI", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_max_volumetric_speed": [ "12" ], diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PETG.json b/resources/profiles/InfiMech/filament/Generic PETG @InfiMech.json similarity index 80% rename from resources/profiles/InfiMech/filament/InfiMech Generic PETG.json rename to resources/profiles/InfiMech/filament/Generic PETG @InfiMech.json index 7b5f094764..55162d9852 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PETG.json +++ b/resources/profiles/InfiMech/filament/Generic PETG @InfiMech.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "InfiMech Generic PETG", + "name": "Generic PETG @InfiMech", "inherits": "fdm_filament_pet", + "renamed_from": "InfiMech Generic PETG", "from": "system", - "setting_id": "rhXq50q3u2YxNRcE", - "filament_id": "OFs2ReMr", + "setting_id": "sAi8oKez7NGKo1wy", + "filament_id": "OFYPdQJh", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "reduce_fan_stop_start_freq": [ "1" ], diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic PLA.json b/resources/profiles/InfiMech/filament/Generic PLA @InfiMech.json similarity index 67% rename from resources/profiles/InfiMech/filament/InfiMech Generic PLA.json rename to resources/profiles/InfiMech/filament/Generic PLA @InfiMech.json index cdb8dc6563..4d2d7dc402 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic PLA.json +++ b/resources/profiles/InfiMech/filament/Generic PLA @InfiMech.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "InfiMech Generic PLA", + "name": "Generic PLA @InfiMech", "inherits": "fdm_filament_pla", + "renamed_from": "InfiMech Generic PLA", "from": "system", - "setting_id": "BHNIPk7Nbl7hXZY1", - "filament_id": "OFrQqCwL", + "setting_id": "tdnlzJyNB6zpQS8w", + "filament_id": "OFDSrzZ8", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_flow_ratio": [ "0.94" ], diff --git a/resources/profiles/InfiMech/filament/InfiMech Generic TPU.json b/resources/profiles/InfiMech/filament/Generic TPU @InfiMech.json similarity index 64% rename from resources/profiles/InfiMech/filament/InfiMech Generic TPU.json rename to resources/profiles/InfiMech/filament/Generic TPU @InfiMech.json index be76c39b21..bc2b0c37a8 100644 --- a/resources/profiles/InfiMech/filament/InfiMech Generic TPU.json +++ b/resources/profiles/InfiMech/filament/Generic TPU @InfiMech.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "InfiMech Generic TPU", + "name": "Generic TPU @InfiMech", "inherits": "fdm_filament_tpu", + "renamed_from": "InfiMech Generic TPU", "from": "system", - "setting_id": "pHS9IcwvsPCnkpaO", - "filament_id": "OFc0xiCz", + "setting_id": "kK1S7YP8vgTJeFPO", + "filament_id": "OFgbpcy9", "instantiation": "true", + "filament_vendor": [ + "Generic" + ], "filament_max_volumetric_speed": [ "3" ], diff --git a/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json b/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json index fff3371aba..8b8fd4e586 100644 --- a/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json +++ b/resources/profiles/InfiMech/machine/HSN/InfiMech TX Hardened Steel Nozzle.json @@ -8,5 +8,5 @@ "bed_model": "InfiMech TX-bed.stl", "bed_texture": "InfiMech TX-texture.svg", "hotend_model": "", - "default_materials": "InfiMech Generic ABS;InfiMech Generic PA-CF;InfiMech Generic PC;InfiMech Generic PETG;InfiMech Generic PLA;InfiMech Generic TPU" + "default_materials": "Generic ABS @InfiMech;Generic PA-CF @InfiMech;Generic PC @InfiMech;Generic PETG @InfiMech;Generic PLA @InfiMech;Generic TPU @InfiMech" } diff --git a/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json b/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json index 68b3b30e45..a95fea09c0 100644 --- a/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json +++ b/resources/profiles/InfiMech/machine/HSN/fdm_klipper_common.json @@ -14,7 +14,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "InfiMech Generic PLA" + "Generic PLA @InfiMech" ], "default_print_profile": "0.20mm Standard @InfiMech TX", "deretraction_speed": [ diff --git a/resources/profiles/InfiMech/machine/HSN/fdm_machine_common.json b/resources/profiles/InfiMech/machine/HSN/fdm_machine_common.json index 570a6aaf2f..35501555bb 100644 --- a/resources/profiles/InfiMech/machine/HSN/fdm_machine_common.json +++ b/resources/profiles/InfiMech/machine/HSN/fdm_machine_common.json @@ -14,7 +14,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "InfiMech Generic PLA" + "Generic PLA @InfiMech" ], "default_print_profile": "0.20mm Standard @InfiMech TX", "deretraction_speed": [ diff --git a/resources/profiles/InfiMech/machine/InfiMech TX.json b/resources/profiles/InfiMech/machine/InfiMech TX.json index abb93dfe09..c040efcfbb 100644 --- a/resources/profiles/InfiMech/machine/InfiMech TX.json +++ b/resources/profiles/InfiMech/machine/InfiMech TX.json @@ -8,5 +8,5 @@ "bed_model": "InfiMech TX-bed.stl", "bed_texture": "InfiMech TX-texture.svg", "hotend_model": "", - "default_materials": "InfiMech Generic ABS;InfiMech Generic PA-CF;InfiMech Generic PC;InfiMech Generic PETG;InfiMech Generic PLA;InfiMech Generic TPU" + "default_materials": "Generic ABS @InfiMech;Generic PA-CF @InfiMech;Generic PC @InfiMech;Generic PETG @InfiMech;Generic PLA @InfiMech;Generic TPU @InfiMech" } diff --git a/resources/profiles/InfiMech/machine/fdm_klipper_common.json b/resources/profiles/InfiMech/machine/fdm_klipper_common.json index adcb60145f..bbcd27a966 100644 --- a/resources/profiles/InfiMech/machine/fdm_klipper_common.json +++ b/resources/profiles/InfiMech/machine/fdm_klipper_common.json @@ -14,7 +14,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "InfiMech Generic PLA" + "Generic PLA @InfiMech" ], "default_print_profile": "0.20mm Standard @InfiMech TX", "deretraction_speed": [ diff --git a/resources/profiles/InfiMech/machine/fdm_machine_common.json b/resources/profiles/InfiMech/machine/fdm_machine_common.json index 2462c8f803..c329e930cb 100644 --- a/resources/profiles/InfiMech/machine/fdm_machine_common.json +++ b/resources/profiles/InfiMech/machine/fdm_machine_common.json @@ -14,7 +14,7 @@ "cooling_tube_length": "5", "cooling_tube_retraction": "91.5", "default_filament_profile": [ - "InfiMech Generic PLA" + "Generic PLA @InfiMech" ], "default_print_profile": "0.20mm Standard @InfiMech TX", "deretraction_speed": [ diff --git a/resources/profiles/MagicMaker.json b/resources/profiles/MagicMaker.json index ede555b66c..cfb4c10ac2 100644 --- a/resources/profiles/MagicMaker.json +++ b/resources/profiles/MagicMaker.json @@ -1,6 +1,6 @@ { "name": "MagicMaker", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "MagicMaker configurations", "machine_model_list": [ @@ -141,8 +141,8 @@ "sub_path": "filament/fdm_filament_peek.json" }, { - "name": "MM Generic PEEK", - "sub_path": "filament/MM Generic PEEK.json" + "name": "Generic PEEK @MM", + "sub_path": "filament/Generic PEEK @MM.json" } ], "machine_list": [ diff --git a/resources/profiles/MagicMaker/filament/MM Generic PEEK.json b/resources/profiles/MagicMaker/filament/Generic PEEK @MM.json similarity index 84% rename from resources/profiles/MagicMaker/filament/MM Generic PEEK.json rename to resources/profiles/MagicMaker/filament/Generic PEEK @MM.json index cfa53426f6..6915058856 100644 --- a/resources/profiles/MagicMaker/filament/MM Generic PEEK.json +++ b/resources/profiles/MagicMaker/filament/Generic PEEK @MM.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "MM Generic PEEK", + "name": "Generic PEEK @MM", "inherits": "fdm_filament_peek", + "renamed_from": "MM Generic PEEK", "from": "system", - "setting_id": "iznBAOK0m6dO7SCh", - "filament_id": "OFgSPtDn", + "setting_id": "2xiVNAQTwBaiLjJn", + "filament_id": "OFz5oHgf", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/MagicMaker/machine/MM BoneKing.json b/resources/profiles/MagicMaker/machine/MM BoneKing.json index a7b80100be..ab257957a6 100644 --- a/resources/profiles/MagicMaker/machine/MM BoneKing.json +++ b/resources/profiles/MagicMaker/machine/MM BoneKing.json @@ -8,5 +8,5 @@ "bed_model": "310_buildplate_model.stl", "bed_texture": "MM_buildplate_texture.svg", "hotend_model": "MM_hotend.stl", - "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System;Generic PC @System;Generic PA @System;MM Generic PEEK" + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System;Generic TPU @System;Generic PC @System;Generic PA @System;Generic PEEK @MM" } diff --git a/resources/profiles/OrcaArena.json b/resources/profiles/OrcaArena.json index c649cf3e6b..866b720b78 100644 --- a/resources/profiles/OrcaArena.json +++ b/resources/profiles/OrcaArena.json @@ -1,7 +1,7 @@ { "name": "Orca Arena Printer", "url": "", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Orca Arena configuration files", "machine_model_list": [ @@ -242,12 +242,12 @@ "sub_path": "filament/Arena ABS @base.json" }, { - "name": "OrcaArena Generic ABS @base", - "sub_path": "filament/OrcaArena Generic ABS @base.json" + "name": "Generic ABS @OrcaArena base", + "sub_path": "filament/Generic ABS @OrcaArena base.json" }, { - "name": "OrcaArena Generic ASA @base", - "sub_path": "filament/OrcaArena Generic ASA @base.json" + "name": "Generic ASA @OrcaArena base", + "sub_path": "filament/Generic ASA @OrcaArena base.json" }, { "name": "Arena PA-CF @base", @@ -262,20 +262,20 @@ "sub_path": "filament/Arena Support G @base.json" }, { - "name": "OrcaArena Generic PA", - "sub_path": "filament/OrcaArena Generic PA.json" + "name": "Generic PA @OrcaArena", + "sub_path": "filament/Generic PA @OrcaArena.json" }, { - "name": "OrcaArena Generic PA-CF", - "sub_path": "filament/OrcaArena Generic PA-CF.json" + "name": "Generic PA-CF @OrcaArena", + "sub_path": "filament/Generic PA-CF @OrcaArena.json" }, { "name": "Arena PC @base", "sub_path": "filament/Arena PC @base.json" }, { - "name": "OrcaArena Generic PC @base", - "sub_path": "filament/OrcaArena Generic PC @base.json" + "name": "Generic PC @OrcaArena base", + "sub_path": "filament/Generic PC @OrcaArena base.json" }, { "name": "Arena PET-CF @base", @@ -290,12 +290,12 @@ "sub_path": "filament/Arena PETG-CF @base.json" }, { - "name": "OrcaArena Generic PETG @base", - "sub_path": "filament/OrcaArena Generic PETG @base.json" + "name": "Generic PETG @OrcaArena base", + "sub_path": "filament/Generic PETG @OrcaArena base.json" }, { - "name": "OrcaArena Generic PETG-CF @base", - "sub_path": "filament/OrcaArena Generic PETG-CF @base.json" + "name": "Generic PETG-CF @OrcaArena base", + "sub_path": "filament/Generic PETG-CF @OrcaArena base.json" }, { "name": "Arena PLA Basic @base", @@ -338,16 +338,16 @@ "sub_path": "filament/Arena Support W @base.json" }, { - "name": "OrcaArena Generic PLA @base", - "sub_path": "filament/OrcaArena Generic PLA @base.json" + "name": "Generic PLA @OrcaArena base", + "sub_path": "filament/Generic PLA @OrcaArena base.json" }, { - "name": "OrcaArena Generic PLA Silk @base", - "sub_path": "filament/OrcaArena Generic PLA Silk @base.json" + "name": "Generic PLA Silk @OrcaArena base", + "sub_path": "filament/Generic PLA Silk @OrcaArena base.json" }, { - "name": "OrcaArena Generic PLA-CF @base", - "sub_path": "filament/OrcaArena Generic PLA-CF @base.json" + "name": "Generic PLA-CF @OrcaArena base", + "sub_path": "filament/Generic PLA-CF @OrcaArena base.json" }, { "name": "PolyLite PLA @base", @@ -358,16 +358,16 @@ "sub_path": "filament/PolyTerra PLA @base.json" }, { - "name": "OrcaArena Generic PVA @base", - "sub_path": "filament/OrcaArena Generic PVA @base.json" + "name": "Generic PVA @OrcaArena base", + "sub_path": "filament/Generic PVA @OrcaArena base.json" }, { "name": "Arena TPU 95A @base", "sub_path": "filament/Arena TPU 95A @base.json" }, { - "name": "OrcaArena Generic TPU", - "sub_path": "filament/OrcaArena Generic TPU.json" + "name": "Generic TPU @OrcaArena", + "sub_path": "filament/Generic TPU @OrcaArena.json" }, { "name": "Arena ABS @Arena X1C", @@ -382,20 +382,20 @@ "sub_path": "filament/Arena ABS @Arena X1C 0.8 nozzle.json" }, { - "name": "OrcaArena Generic ABS", - "sub_path": "filament/OrcaArena Generic ABS.json" + "name": "Generic ABS @OrcaArena", + "sub_path": "filament/Generic ABS @OrcaArena.json" }, { - "name": "OrcaArena Generic ABS @0.2 nozzle", - "sub_path": "filament/OrcaArena Generic ABS @0.2 nozzle.json" + "name": "Generic ABS @OrcaArena 0.2 nozzle", + "sub_path": "filament/Generic ABS @OrcaArena 0.2 nozzle.json" }, { - "name": "OrcaArena Generic ASA", - "sub_path": "filament/OrcaArena Generic ASA.json" + "name": "Generic ASA @OrcaArena", + "sub_path": "filament/Generic ASA @OrcaArena.json" }, { - "name": "OrcaArena Generic ASA @0.2 nozzle", - "sub_path": "filament/OrcaArena Generic ASA @0.2 nozzle.json" + "name": "Generic ASA @OrcaArena 0.2 nozzle", + "sub_path": "filament/Generic ASA @OrcaArena 0.2 nozzle.json" }, { "name": "Arena PA-CF @Arena X1C", @@ -426,12 +426,12 @@ "sub_path": "filament/Arena PC @Arena X1C 0.8 nozzle.json" }, { - "name": "OrcaArena Generic PC", - "sub_path": "filament/OrcaArena Generic PC.json" + "name": "Generic PC @OrcaArena", + "sub_path": "filament/Generic PC @OrcaArena.json" }, { - "name": "OrcaArena Generic PC @0.2 nozzle", - "sub_path": "filament/OrcaArena Generic PC @0.2 nozzle.json" + "name": "Generic PC @OrcaArena 0.2 nozzle", + "sub_path": "filament/Generic PC @OrcaArena 0.2 nozzle.json" }, { "name": "Arena PET-CF @Arena X1C", @@ -454,16 +454,16 @@ "sub_path": "filament/Arena PETG-CF @Arena X1C.json" }, { - "name": "OrcaArena Generic PETG", - "sub_path": "filament/OrcaArena Generic PETG.json" + "name": "Generic PETG @OrcaArena", + "sub_path": "filament/Generic PETG @OrcaArena.json" }, { - "name": "OrcaArena Generic PETG @0.2 nozzle", - "sub_path": "filament/OrcaArena Generic PETG @0.2 nozzle.json" + "name": "Generic PETG @OrcaArena 0.2 nozzle", + "sub_path": "filament/Generic PETG @OrcaArena 0.2 nozzle.json" }, { - "name": "OrcaArena Generic PETG-CF @Arena X1C", - "sub_path": "filament/OrcaArena Generic PETG-CF @Arena X1C.json" + "name": "Generic PETG-CF @Arena X1C", + "sub_path": "filament/Generic PETG-CF @Arena X1C.json" }, { "name": "Arena PLA Basic @Arena X1C", @@ -542,20 +542,20 @@ "sub_path": "filament/Arena Support W @Arena X1C 0.2 nozzle.json" }, { - "name": "OrcaArena Generic PLA", - "sub_path": "filament/OrcaArena Generic PLA.json" + "name": "Generic PLA @OrcaArena", + "sub_path": "filament/Generic PLA @OrcaArena.json" }, { - "name": "OrcaArena Generic PLA @0.2 nozzle", - "sub_path": "filament/OrcaArena Generic PLA @0.2 nozzle.json" + "name": "Generic PLA @OrcaArena 0.2 nozzle", + "sub_path": "filament/Generic PLA @OrcaArena 0.2 nozzle.json" }, { - "name": "OrcaArena Generic PLA Silk", - "sub_path": "filament/OrcaArena Generic PLA Silk.json" + "name": "Generic PLA Silk @OrcaArena", + "sub_path": "filament/Generic PLA Silk @OrcaArena.json" }, { - "name": "OrcaArena Generic PLA-CF", - "sub_path": "filament/OrcaArena Generic PLA-CF.json" + "name": "Generic PLA-CF @OrcaArena", + "sub_path": "filament/Generic PLA-CF @OrcaArena.json" }, { "name": "PolyLite PLA @Arena X1C", @@ -566,12 +566,12 @@ "sub_path": "filament/PolyTerra PLA @Arena X1C.json" }, { - "name": "OrcaArena Generic PVA", - "sub_path": "filament/OrcaArena Generic PVA.json" + "name": "Generic PVA @OrcaArena", + "sub_path": "filament/Generic PVA @OrcaArena.json" }, { - "name": "OrcaArena Generic PVA @0.2 nozzle", - "sub_path": "filament/OrcaArena Generic PVA @0.2 nozzle.json" + "name": "Generic PVA @OrcaArena 0.2 nozzle", + "sub_path": "filament/Generic PVA @OrcaArena 0.2 nozzle.json" }, { "name": "Arena TPU 95A @Arena X1C", 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 new file mode 100644 index 0000000000..f98408fe0f --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena 0.2 nozzle.json @@ -0,0 +1,15 @@ +{ + "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", + "from": "system", + "setting_id": "mzx0hG9Xe9fIrkrW", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2" + ], + "compatible_printers": [ + "Orca Arena X1 Carbon 0.2 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena base.json similarity index 73% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json rename to resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena base.json index 8a635421ee..f2cd5abbf4 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json +++ b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic ABS @base", + "name": "Generic ABS @OrcaArena base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OFetENFF", + "filament_id": "OFY9muEs", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena.json similarity index 57% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json rename to resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena.json index d092b1f64d..2a505d7ca1 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json +++ b/resources/profiles/OrcaArena/filament/Generic ABS @OrcaArena.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "OrcaArena Generic ASA", - "inherits": "OrcaArena Generic ASA @base", + "name": "Generic ABS @OrcaArena", + "inherits": "Generic ABS @OrcaArena base", + "renamed_from": "OrcaArena Generic ABS", "from": "system", - "setting_id": "8KdojTD3bygYDxwh", + "setting_id": "ftTPQmVmsaD0n1GF", "instantiation": "true", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", 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 new file mode 100644 index 0000000000..77bd051b4e --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena 0.2 nozzle.json @@ -0,0 +1,15 @@ +{ + "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", + "from": "system", + "setting_id": "rtFj6gFceWHdzTmO", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "2" + ], + "compatible_printers": [ + "Orca Arena X1 Carbon 0.2 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena base.json similarity index 73% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json rename to resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena base.json index 26032a7d85..772c708dd8 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json +++ b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic ASA @base", + "name": "Generic ASA @OrcaArena base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OFmzftED", + "filament_id": "OFLPAxz3", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena.json similarity index 57% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json rename to resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena.json index 024e76e0bc..0ee8d6cc20 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json +++ b/resources/profiles/OrcaArena/filament/Generic ASA @OrcaArena.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "OrcaArena Generic PC", - "inherits": "OrcaArena Generic PC @base", + "name": "Generic ASA @OrcaArena", + "inherits": "Generic ASA @OrcaArena base", + "renamed_from": "OrcaArena Generic ASA", "from": "system", - "setting_id": "WCiW1Yi88MEZIO2h", + "setting_id": "V2Z1rxHqIqIuwP5O", "instantiation": "true", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json b/resources/profiles/OrcaArena/filament/Generic PA @OrcaArena.json similarity index 74% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json rename to resources/profiles/OrcaArena/filament/Generic PA @OrcaArena.json index a95e022740..87b0a67ed8 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json +++ b/resources/profiles/OrcaArena/filament/Generic PA @OrcaArena.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "OrcaArena Generic PA", + "name": "Generic PA @OrcaArena", "inherits": "fdm_filament_pa", + "renamed_from": "OrcaArena Generic PA", "from": "system", - "setting_id": "IintLqJOecQcKmA8", - "filament_id": "OFmnJNqY", + "setting_id": "KScdeqdB3UR6uvxs", + "filament_id": "OFg8ndtj", "instantiation": "true", "required_nozzle_HRC": [ "3" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json b/resources/profiles/OrcaArena/filament/Generic PA-CF @OrcaArena.json similarity index 81% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json rename to resources/profiles/OrcaArena/filament/Generic PA-CF @OrcaArena.json index 2621b3cf05..2d928201b7 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json +++ b/resources/profiles/OrcaArena/filament/Generic PA-CF @OrcaArena.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "OrcaArena Generic PA-CF", + "name": "Generic PA-CF @OrcaArena", "inherits": "fdm_filament_pa", + "renamed_from": "OrcaArena Generic PA-CF", "from": "system", - "setting_id": "XHOpI9EFQmYoJ3Sy", - "filament_id": "OF4xhTuK", + "setting_id": "xANIesGhsXwbTn3J", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" 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 new file mode 100644 index 0000000000..ad15f49a69 --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena 0.2 nozzle.json @@ -0,0 +1,15 @@ +{ + "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", + "from": "system", + "setting_id": "AEKvB4RVBo2zOkdg", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "1" + ], + "compatible_printers": [ + "Orca Arena X1 Carbon 0.2 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena base.json similarity index 73% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json rename to resources/profiles/OrcaArena/filament/Generic PC @OrcaArena base.json index 97bdbe2df1..3ea8fd8bd4 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json +++ b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic PC @base", + "name": "Generic PC @OrcaArena base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OFXhZ3uY", + "filament_id": "OFLakOUI", "instantiation": "false", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena.json similarity index 57% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json rename to resources/profiles/OrcaArena/filament/Generic PC @OrcaArena.json index 773f58289e..b4302c3c47 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json +++ b/resources/profiles/OrcaArena/filament/Generic PC @OrcaArena.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "OrcaArena Generic ABS", - "inherits": "OrcaArena Generic ABS @base", + "name": "Generic PC @OrcaArena", + "inherits": "Generic PC @OrcaArena base", + "renamed_from": "OrcaArena Generic PC", "from": "system", - "setting_id": "5aN0QkAneu6yEWZh", + "setting_id": "He4O4h8oEFsySDIJ", "instantiation": "true", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", 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 new file mode 100644 index 0000000000..1be2988356 --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena 0.2 nozzle.json @@ -0,0 +1,15 @@ +{ + "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", + "from": "system", + "setting_id": "ZstQ3h8DGCpRWQJN", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "1" + ], + "compatible_printers": [ + "Orca Arena X1 Carbon 0.2 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena base.json similarity index 94% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json rename to resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena base.json index a68c25c24a..4ec26aae2b 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json +++ b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic PETG @base", + "name": "Generic PETG @OrcaArena base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFgSEwOZ", + "filament_id": "OFYPdQJh", "instantiation": "false", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json new file mode 100644 index 0000000000..ad3260fe1c --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic PETG @OrcaArena.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Generic PETG @OrcaArena", + "inherits": "Generic PETG @OrcaArena base", + "renamed_from": "OrcaArena Generic PETG", + "from": "system", + "setting_id": "3puaC0EwFLvEnGH2", + "instantiation": "true", + "compatible_printers": [ + "Orca Arena X1 Carbon 0.4 nozzle", + "Orca Arena X1 Carbon 0.6 nozzle", + "Orca Arena X1 Carbon 0.8 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json new file mode 100644 index 0000000000..f8741a22a9 --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json @@ -0,0 +1,14 @@ +{ + "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", + "from": "system", + "setting_id": "MeIL8qLFZytjvYrF", + "instantiation": "true", + "compatible_printers": [ + "Orca Arena X1 Carbon 0.4 nozzle", + "Orca Arena X1 Carbon 0.6 nozzle", + "Orca Arena X1 Carbon 0.8 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json b/resources/profiles/OrcaArena/filament/Generic PETG-CF @OrcaArena base.json similarity index 92% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json rename to resources/profiles/OrcaArena/filament/Generic PETG-CF @OrcaArena base.json index ba3364a5c4..754407c32a 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json +++ b/resources/profiles/OrcaArena/filament/Generic PETG-CF @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic PETG-CF @base", + "name": "Generic PETG-CF @OrcaArena base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFwpkvqf", + "filament_id": "OFoYSJKi", "instantiation": "false", "filament_flow_ratio": [ "0.95" @@ -45,7 +45,7 @@ "40" ], "filament_vendor": [ - "Orca Arena" + "Generic" ], "filament_type": [ "PETG-CF" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena 0.2 nozzle.json similarity index 69% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json rename to resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena 0.2 nozzle.json index 261cd931f6..074732db01 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena 0.2 nozzle.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "OrcaArena Generic PLA @0.2 nozzle", - "inherits": "OrcaArena Generic PLA @base", + "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", "from": "system", - "setting_id": "V1TMYgbxBLgciFa2", + "setting_id": "HjJH9JT9x9sFtVES", "instantiation": "true", "filament_max_volumetric_speed": [ "2" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena base.json similarity index 88% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json rename to resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena base.json index ade5634118..cec0b9cd19 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic PLA @base", + "name": "Generic PLA @OrcaArena base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFD6kN7F", + "filament_id": "OFDSrzZ8", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena.json similarity index 57% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json rename to resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena.json index 0a6e9a9dbc..9018f24583 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA @OrcaArena.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "OrcaArena Generic PETG-CF @Arena X1C", - "inherits": "OrcaArena Generic PETG-CF @base", + "name": "Generic PLA @OrcaArena", + "inherits": "Generic PLA @OrcaArena base", + "renamed_from": "OrcaArena Generic PLA", "from": "system", - "setting_id": "2OI2L2q50nSxam2z", + "setting_id": "TfkkCc6rILxDiZhR", "instantiation": "true", "compatible_printers": [ "Orca Arena X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json b/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena base.json similarity index 88% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json rename to resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena base.json index 9a0dc73322..f73d037385 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic PLA Silk @base", + "name": "Generic PLA Silk @OrcaArena base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFbeeFkl", + "filament_id": "OFesA6rF", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json b/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena.json similarity index 63% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json rename to resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena.json index 3b6b96bb72..6afb0e48a2 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA Silk @OrcaArena.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "OrcaArena Generic PLA Silk", - "inherits": "OrcaArena Generic PLA Silk @base", + "name": "Generic PLA Silk @OrcaArena", + "inherits": "Generic PLA Silk @OrcaArena base", + "renamed_from": "OrcaArena Generic PLA Silk", "from": "system", - "setting_id": "WRy8oYxZ542SX6jO", + "setting_id": "rvJjX9QsHM1O1CGD", "instantiation": "true", "filament_max_volumetric_speed": [ "7.5" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json b/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena base.json similarity index 92% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json rename to resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena base.json index c73b9fc480..79a2b7ba88 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json +++ b/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic PLA-CF @base", + "name": "Generic PLA-CF @OrcaArena base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFx0ZzFV", + "filament_id": "OFWbdGsC", "instantiation": "false", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json new file mode 100644 index 0000000000..ced9245904 --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic PLA-CF @OrcaArena.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @OrcaArena", + "inherits": "Generic PLA-CF @OrcaArena base", + "renamed_from": "OrcaArena Generic PLA-CF", + "from": "system", + "setting_id": "vexlQFuvVzpsYT0Z", + "instantiation": "true", + "compatible_printers": [ + "Orca Arena X1 Carbon 0.4 nozzle", + "Orca Arena X1 Carbon 0.6 nozzle", + "Orca Arena X1 Carbon 0.8 nozzle" + ] +} 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 new file mode 100644 index 0000000000..417ef65683 --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena 0.2 nozzle.json @@ -0,0 +1,15 @@ +{ + "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", + "from": "system", + "setting_id": "jX00tEZaqsJvpoBT", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "0.5" + ], + "compatible_printers": [ + "Orca Arena X1 Carbon 0.2 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena base.json similarity index 79% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json rename to resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena base.json index 53da039f09..f44bc7f46c 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json +++ b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "OrcaArena Generic PVA @base", + "name": "Generic PVA @OrcaArena base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "OFdLdGgJ", + "filament_id": "OFDvXujf", "instantiation": "false", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json new file mode 100644 index 0000000000..bf9cbcda7a --- /dev/null +++ b/resources/profiles/OrcaArena/filament/Generic PVA @OrcaArena.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Generic PVA @OrcaArena", + "inherits": "Generic PVA @OrcaArena base", + "renamed_from": "OrcaArena Generic PVA", + "from": "system", + "setting_id": "S9TMm0n7t54fKHoM", + "instantiation": "true", + "compatible_printers": [ + "Orca Arena X1 Carbon 0.4 nozzle", + "Orca Arena X1 Carbon 0.6 nozzle", + "Orca Arena X1 Carbon 0.8 nozzle" + ] +} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json b/resources/profiles/OrcaArena/filament/Generic TPU @OrcaArena.json similarity index 80% rename from resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json rename to resources/profiles/OrcaArena/filament/Generic TPU @OrcaArena.json index 8593c5c779..75fcc13a79 100644 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json +++ b/resources/profiles/OrcaArena/filament/Generic TPU @OrcaArena.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "OrcaArena Generic TPU", + "name": "Generic TPU @OrcaArena", "inherits": "fdm_filament_tpu", + "renamed_from": "OrcaArena Generic TPU", "from": "system", - "setting_id": "uPHnZUr5Sb16uKZm", - "filament_id": "OFU5N9jI", + "setting_id": "GBRnBtqYf9H8pQKU", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json deleted file mode 100644 index 37062950e4..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic ABS @0.2 nozzle", - "inherits": "OrcaArena Generic ABS @base", - "from": "system", - "setting_id": "o9UpKuDWgaJT7sM5", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "2" - ], - "compatible_printers": [ - "Orca Arena X1 Carbon 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json deleted file mode 100644 index 2d3f9a5026..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic ASA @0.2 nozzle", - "inherits": "OrcaArena Generic ASA @base", - "from": "system", - "setting_id": "rV2Uymwz7aoouqiN", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "2" - ], - "compatible_printers": [ - "Orca Arena X1 Carbon 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json deleted file mode 100644 index 0a26869776..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic PC @0.2 nozzle", - "inherits": "OrcaArena Generic PC @base", - "from": "system", - "setting_id": "THS8jolD0RsYaFzY", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "1" - ], - "compatible_printers": [ - "Orca Arena X1 Carbon 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json deleted file mode 100644 index 375031f137..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic PETG @0.2 nozzle", - "inherits": "OrcaArena Generic PETG @base", - "from": "system", - "setting_id": "jcoeFJFmDil7U667", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "1" - ], - "compatible_printers": [ - "Orca Arena X1 Carbon 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json deleted file mode 100644 index 8771a7b609..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic PETG", - "inherits": "OrcaArena Generic PETG @base", - "from": "system", - "setting_id": "1hFOFT9YOdnKBw1d", - "instantiation": "true", - "compatible_printers": [ - "Orca Arena X1 Carbon 0.4 nozzle", - "Orca Arena X1 Carbon 0.6 nozzle", - "Orca Arena X1 Carbon 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json deleted file mode 100644 index 4a04e96360..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic PLA-CF", - "inherits": "OrcaArena Generic PLA-CF @base", - "from": "system", - "setting_id": "qHV6B5JvmdtAQeNs", - "instantiation": "true", - "compatible_printers": [ - "Orca Arena X1 Carbon 0.4 nozzle", - "Orca Arena X1 Carbon 0.6 nozzle", - "Orca Arena X1 Carbon 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json deleted file mode 100644 index 2a3aef423c..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic PLA", - "inherits": "OrcaArena Generic PLA @base", - "from": "system", - "setting_id": "jGG0BiyRGgPDP8rB", - "instantiation": "true", - "compatible_printers": [ - "Orca Arena X1 Carbon 0.4 nozzle", - "Orca Arena X1 Carbon 0.6 nozzle", - "Orca Arena X1 Carbon 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json deleted file mode 100644 index 8892aac57f..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic PVA @0.2 nozzle", - "inherits": "OrcaArena Generic PVA @base", - "from": "system", - "setting_id": "N6p6wvNCjR4Lv0WC", - "instantiation": "true", - "filament_max_volumetric_speed": [ - "0.5" - ], - "compatible_printers": [ - "Orca Arena X1 Carbon 0.2 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json deleted file mode 100644 index 42a68b5fee..0000000000 --- a/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "filament", - "name": "OrcaArena Generic PVA", - "inherits": "OrcaArena Generic PVA @base", - "from": "system", - "setting_id": "Qh5TOtrBfOFul0OC", - "instantiation": "true", - "compatible_printers": [ - "Orca Arena X1 Carbon 0.4 nozzle", - "Orca Arena X1 Carbon 0.6 nozzle", - "Orca Arena X1 Carbon 0.8 nozzle" - ] -} diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json index 362496ba28..e375904da2 100644 --- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json +++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "", "hotend_model": "", - "default_materials": "OrcaArena Generic PLA Silk;OrcaArena Generic PLA;Arena PLA Matte @Arena X1C;Arena PLA Basic @Arena X1C;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1C;Arena TPU 95A @Arena X1C;PolyTerra PLA @Arena X1C;PolyLite PLA @Arena X1C;" + "default_materials": "Generic PLA Silk @OrcaArena;Generic PLA @OrcaArena;Arena PLA Matte @Arena X1C;Arena PLA Basic @Arena X1C;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1C;Arena TPU 95A @Arena X1C;PolyTerra PLA @Arena X1C;PolyLite PLA @Arena X1C;" } diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index e7f658a844..2f9e6a7f02 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -1,6 +1,6 @@ { "name": "OrcaFilamentLibrary", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "Orca Filament Library", "filament_list": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json index 08a8158d91..958fbc75a6 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PP-GF @base.json @@ -3,6 +3,9 @@ "name": "Generic PP-GF @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "OFNiSLfL", - "instantiation": "false" + "filament_id": "OFsijjtH", + "instantiation": "false", + "filament_type": [ + "PP-GF" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json index 52d96d24d1..ad1c0ef27e 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Panchroma PLA Satin @base.json @@ -1,7 +1,6 @@ { "type": "filament", "name": "Panchroma PLA Satin @base", - "renamed_from": "Panchroma PLA Stain @base", "inherits": "fdm_filament_pla", "from": "system", "filament_id": "OFPkCJKE", diff --git a/resources/profiles/Peopoly.json b/resources/profiles/Peopoly.json index ca6b59fb2b..2a73d251f1 100644 --- a/resources/profiles/Peopoly.json +++ b/resources/profiles/Peopoly.json @@ -1,6 +1,6 @@ { "name": "Peopoly", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "Peopoly configurations", "machine_model_list": [ @@ -105,8 +105,8 @@ "sub_path": "filament/fdm_filament_pla.json" }, { - "name": "Peopoly Generic ABS", - "sub_path": "filament/Peopoly Generic ABS.json" + "name": "Generic ABS @Peopoly", + "sub_path": "filament/Generic ABS @Peopoly.json" }, { "name": "Peopoly Lancer ABS-GF", @@ -117,16 +117,16 @@ "sub_path": "filament/Peopoly Lancer PET-CF.json" }, { - "name": "Peopoly Generic PETG", - "sub_path": "filament/Peopoly Generic PETG.json" + "name": "Generic PETG @Peopoly", + "sub_path": "filament/Generic PETG @Peopoly.json" }, { "name": "Peopoly Lancer PETG-C", "sub_path": "filament/Peopoly Lancer PETG-C.json" }, { - "name": "Peopoly Generic PLA", - "sub_path": "filament/Peopoly Generic PLA.json" + "name": "Generic PLA @Peopoly", + "sub_path": "filament/Generic PLA @Peopoly.json" }, { "name": "Peopoly Lancer PLA-C", diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json b/resources/profiles/Peopoly/filament/Generic ABS @Peopoly.json similarity index 73% rename from resources/profiles/Peopoly/filament/Peopoly Generic ABS.json rename to resources/profiles/Peopoly/filament/Generic ABS @Peopoly.json index ce0711b7e9..d9e2ae777c 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic ABS.json +++ b/resources/profiles/Peopoly/filament/Generic ABS @Peopoly.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Peopoly Generic ABS", + "name": "Generic ABS @Peopoly", "inherits": "fdm_filament_abs", + "renamed_from": "Peopoly Generic ABS", "from": "system", - "setting_id": "ICnZH4LkPD7c6Lmm", - "filament_id": "OFqOk9Ww", + "setting_id": "HLq9urLhPLW0du6x", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json b/resources/profiles/Peopoly/filament/Generic PETG @Peopoly.json similarity index 80% rename from resources/profiles/Peopoly/filament/Peopoly Generic PETG.json rename to resources/profiles/Peopoly/filament/Generic PETG @Peopoly.json index 2d0b34240a..fc4501866a 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic PETG.json +++ b/resources/profiles/Peopoly/filament/Generic PETG @Peopoly.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Peopoly Generic PETG", + "name": "Generic PETG @Peopoly", "inherits": "fdm_filament_petg", + "renamed_from": "Peopoly Generic PETG", "from": "system", - "setting_id": "7LVGx2lNqhBDdYiJ", - "filament_id": "OFIeCuXj", + "setting_id": "dgMXFTyLovrMR56j", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Peopoly/filament/Peopoly Generic PLA.json b/resources/profiles/Peopoly/filament/Generic PLA @Peopoly.json similarity index 79% rename from resources/profiles/Peopoly/filament/Peopoly Generic PLA.json rename to resources/profiles/Peopoly/filament/Generic PLA @Peopoly.json index 3a24fb3bc7..42cc687493 100644 --- a/resources/profiles/Peopoly/filament/Peopoly Generic PLA.json +++ b/resources/profiles/Peopoly/filament/Generic PLA @Peopoly.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Peopoly Generic PLA", - "renamed_from": "Peopoly Generic PLA 0.8 nozzle", + "name": "Generic PLA @Peopoly", + "renamed_from": "Peopoly Generic PLA 0.8 nozzle;Peopoly Generic PLA", "inherits": "fdm_filament_pla", "from": "system", - "setting_id": "KNsVV4dvEWAAkzDE", - "filament_id": "OFRDLNM9", + "setting_id": "OVbRqCpU0SXiZmot", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Peopoly/machine/Peopoly Magneto X.json b/resources/profiles/Peopoly/machine/Peopoly Magneto X.json index 031c3b2484..02553f502d 100644 --- a/resources/profiles/Peopoly/machine/Peopoly Magneto X.json +++ b/resources/profiles/Peopoly/machine/Peopoly Magneto X.json @@ -8,5 +8,5 @@ "bed_model": "magnetox_model.stl", "bed_texture": "magnetox_model_texture.svg", "hotend_model": "", - "default_materials": "Peopoly Generic PLA" + "default_materials": "Generic PLA @Peopoly" } diff --git a/resources/profiles/Peopoly/machine/fdm_klipper_common.json b/resources/profiles/Peopoly/machine/fdm_klipper_common.json index f89d97d9a6..e9a5185767 100644 --- a/resources/profiles/Peopoly/machine/fdm_klipper_common.json +++ b/resources/profiles/Peopoly/machine/fdm_klipper_common.json @@ -127,7 +127,7 @@ "1" ], "default_filament_profile": [ - "Peopoly Generic PLA" + "Generic PLA @Peopoly" ], "default_print_profile": "fdm_process_peopoly_common_0_2", "bed_exclude_area": [ diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 91e26a9fe9..ecbbe179e7 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -1,6 +1,6 @@ { "name": "Prusa", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Prusa configurations", "machine_model_list": [ @@ -1449,168 +1449,168 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Prusa Generic ABS @base", - "sub_path": "filament/Prusa Generic ABS @base.json" + "name": "Generic ABS @Prusa base", + "sub_path": "filament/Generic ABS @Prusa base.json" }, { - "name": "Prusa Generic ABS", - "sub_path": "filament/Prusa Generic ABS.json" + "name": "Generic ABS @Prusa", + "sub_path": "filament/Generic ABS @Prusa.json" }, { - "name": "Prusa Generic ABS @CORE One", - "sub_path": "filament/Prusa Generic ABS @CORE One.json" + "name": "Generic ABS @Prusa CORE One", + "sub_path": "filament/Generic ABS @Prusa CORE One.json" }, { - "name": "Prusa Generic ABS @MINIIS", - "sub_path": "filament/Prusa Generic ABS @MINIIS.json" + "name": "Generic ABS @Prusa MINIIS", + "sub_path": "filament/Generic ABS @Prusa MINIIS.json" }, { - "name": "Prusa Generic ABS @MINIIS 0.25", - "sub_path": "filament/Prusa Generic ABS @MINIIS 0.25.json" + "name": "Generic ABS @Prusa MINIIS 0.25", + "sub_path": "filament/Generic ABS @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic ABS @MINIIS 0.6", - "sub_path": "filament/Prusa Generic ABS @MINIIS 0.6.json" + "name": "Generic ABS @Prusa MINIIS 0.6", + "sub_path": "filament/Generic ABS @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic ABS @MINIIS 0.8", - "sub_path": "filament/Prusa Generic ABS @MINIIS 0.8.json" + "name": "Generic ABS @Prusa MINIIS 0.8", + "sub_path": "filament/Generic ABS @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic ABS @MK3.5", - "sub_path": "filament/Prusa Generic ABS @MK3.5.json" + "name": "Generic ABS @Prusa MK3.5", + "sub_path": "filament/Generic ABS @Prusa MK3.5.json" }, { - "name": "Prusa Generic ABS @MK3.5 0.25", - "sub_path": "filament/Prusa Generic ABS @MK3.5 0.25.json" + "name": "Generic ABS @Prusa MK3.5 0.25", + "sub_path": "filament/Generic ABS @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic ABS @MK3.5 0.6", - "sub_path": "filament/Prusa Generic ABS @MK3.5 0.6.json" + "name": "Generic ABS @Prusa MK3.5 0.6", + "sub_path": "filament/Generic ABS @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic ABS @MK3.5 0.8", - "sub_path": "filament/Prusa Generic ABS @MK3.5 0.8.json" + "name": "Generic ABS @Prusa MK3.5 0.8", + "sub_path": "filament/Generic ABS @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic ABS @MK4", - "sub_path": "filament/Prusa Generic ABS @MK4.json" + "name": "Generic ABS @Prusa MK4", + "sub_path": "filament/Generic ABS @Prusa MK4.json" }, { - "name": "Prusa Generic ABS @MK4S", - "sub_path": "filament/Prusa Generic ABS @MK4S.json" + "name": "Generic ABS @Prusa MK4S", + "sub_path": "filament/Generic ABS @Prusa MK4S.json" }, { - "name": "Prusa Generic ABS @XL", - "sub_path": "filament/Prusa Generic ABS @XL.json" + "name": "Generic ABS @Prusa XL", + "sub_path": "filament/Generic ABS @Prusa XL.json" }, { - "name": "Prusa Generic ABS @XL 5T", - "sub_path": "filament/Prusa Generic ABS @XL 5T.json" + "name": "Generic ABS @Prusa XL 5T", + "sub_path": "filament/Generic ABS @Prusa XL 5T.json" }, { - "name": "Prusa Generic ABS HF @base", - "sub_path": "filament/Prusa Generic ABS HF @base.json" + "name": "Generic ABS HF @Prusa base", + "sub_path": "filament/Generic ABS HF @Prusa base.json" }, { - "name": "Prusa Generic ABS HF @MINIIS", - "sub_path": "filament/Prusa Generic ABS HF @MINIIS.json" + "name": "Generic ABS HF @Prusa MINIIS", + "sub_path": "filament/Generic ABS HF @Prusa MINIIS.json" }, { - "name": "Prusa Generic ABS HF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic ABS HF @MINIIS 0.6.json" + "name": "Generic ABS HF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic ABS HF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic ABS HF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic ABS HF @MINIIS 0.8.json" + "name": "Generic ABS HF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic ABS HF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic ABS HF @MK3.5", - "sub_path": "filament/Prusa Generic ABS HF @MK3.5.json" + "name": "Generic ABS HF @Prusa MK3.5", + "sub_path": "filament/Generic ABS HF @Prusa MK3.5.json" }, { - "name": "Prusa Generic ABS HF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic ABS HF @MK3.5 0.6.json" + "name": "Generic ABS HF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic ABS HF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic ABS HF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic ABS HF @MK3.5 0.8.json" + "name": "Generic ABS HF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic ABS HF @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic ASA", - "sub_path": "filament/Prusa Generic ASA.json" + "name": "Generic ASA @Prusa", + "sub_path": "filament/Generic ASA @Prusa.json" }, { - "name": "Prusa Generic ASA @CORE One", - "sub_path": "filament/Prusa Generic ASA @CORE One.json" + "name": "Generic ASA @Prusa CORE One", + "sub_path": "filament/Generic ASA @Prusa CORE One.json" }, { - "name": "Prusa Generic ASA @MINIIS", - "sub_path": "filament/Prusa Generic ASA @MINIIS.json" + "name": "Generic ASA @Prusa MINIIS", + "sub_path": "filament/Generic ASA @Prusa MINIIS.json" }, { - "name": "Prusa Generic ASA @MINIIS 0.25", - "sub_path": "filament/Prusa Generic ASA @MINIIS 0.25.json" + "name": "Generic ASA @Prusa MINIIS 0.25", + "sub_path": "filament/Generic ASA @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic ASA @MINIIS 0.6", - "sub_path": "filament/Prusa Generic ASA @MINIIS 0.6.json" + "name": "Generic ASA @Prusa MINIIS 0.6", + "sub_path": "filament/Generic ASA @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic ASA @MINIIS 0.8", - "sub_path": "filament/Prusa Generic ASA @MINIIS 0.8.json" + "name": "Generic ASA @Prusa MINIIS 0.8", + "sub_path": "filament/Generic ASA @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic ASA @MK3.5", - "sub_path": "filament/Prusa Generic ASA @MK3.5.json" + "name": "Generic ASA @Prusa MK3.5", + "sub_path": "filament/Generic ASA @Prusa MK3.5.json" }, { - "name": "Prusa Generic ASA @MK3.5 0.25", - "sub_path": "filament/Prusa Generic ASA @MK3.5 0.25.json" + "name": "Generic ASA @Prusa MK3.5 0.25", + "sub_path": "filament/Generic ASA @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic ASA @MK3.5 0.6", - "sub_path": "filament/Prusa Generic ASA @MK3.5 0.6.json" + "name": "Generic ASA @Prusa MK3.5 0.6", + "sub_path": "filament/Generic ASA @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic ASA @MK3.5 0.8", - "sub_path": "filament/Prusa Generic ASA @MK3.5 0.8.json" + "name": "Generic ASA @Prusa MK3.5 0.8", + "sub_path": "filament/Generic ASA @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic ASA @MK4", - "sub_path": "filament/Prusa Generic ASA @MK4.json" + "name": "Generic ASA @Prusa MK4", + "sub_path": "filament/Generic ASA @Prusa MK4.json" }, { - "name": "Prusa Generic ASA @MK4S", - "sub_path": "filament/Prusa Generic ASA @MK4S.json" + "name": "Generic ASA @Prusa MK4S", + "sub_path": "filament/Generic ASA @Prusa MK4S.json" }, { - "name": "Prusa Generic ASA HF @base", - "sub_path": "filament/Prusa Generic ASA HF @base.json" + "name": "Generic ASA HF @Prusa base", + "sub_path": "filament/Generic ASA HF @Prusa base.json" }, { - "name": "Prusa Generic ASA HF @MINIIS", - "sub_path": "filament/Prusa Generic ASA HF @MINIIS.json" + "name": "Generic ASA HF @Prusa MINIIS", + "sub_path": "filament/Generic ASA HF @Prusa MINIIS.json" }, { - "name": "Prusa Generic ASA HF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic ASA HF @MINIIS 0.6.json" + "name": "Generic ASA HF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic ASA HF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic ASA HF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic ASA HF @MINIIS 0.8.json" + "name": "Generic ASA HF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic ASA HF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic ASA HF @MK3.5", - "sub_path": "filament/Prusa Generic ASA HF @MK3.5.json" + "name": "Generic ASA HF @Prusa MK3.5", + "sub_path": "filament/Generic ASA HF @Prusa MK3.5.json" }, { - "name": "Prusa Generic ASA HF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic ASA HF @MK3.5 0.6.json" + "name": "Generic ASA HF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic ASA HF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic ASA HF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic ASA HF @MK3.5 0.8.json" + "name": "Generic ASA HF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic ASA HF @Prusa MK3.5 0.8.json" }, { "name": "Prusament ASA @CORE One", @@ -1625,96 +1625,96 @@ "sub_path": "filament/Prusament ASA @XL 5T.json" }, { - "name": "Prusa Generic FLEX @XL", - "sub_path": "filament/Prusa Generic FLEX @XL.json" + "name": "Generic FLEX @Prusa XL", + "sub_path": "filament/Generic FLEX @Prusa XL.json" }, { - "name": "Prusa Generic FLEX @XL 5T", - "sub_path": "filament/Prusa Generic FLEX @XL 5T.json" + "name": "Generic FLEX @Prusa XL 5T", + "sub_path": "filament/Generic FLEX @Prusa XL 5T.json" }, { - "name": "Prusa Generic TPU @CORE One", - "sub_path": "filament/Prusa Generic TPU @CORE One.json" + "name": "Generic TPU @Prusa CORE One", + "sub_path": "filament/Generic TPU @Prusa CORE One.json" }, { - "name": "Prusa Generic PA @base", - "sub_path": "filament/Prusa Generic PA @base.json" + "name": "Generic PA @Prusa base", + "sub_path": "filament/Generic PA @Prusa base.json" }, { - "name": "Prusa Generic PA", - "sub_path": "filament/Prusa Generic PA.json" + "name": "Generic PA @Prusa", + "sub_path": "filament/Generic PA @Prusa.json" }, { - "name": "Prusa Generic PA @MINIIS", - "sub_path": "filament/Prusa Generic PA @MINIIS.json" + "name": "Generic PA @Prusa MINIIS", + "sub_path": "filament/Generic PA @Prusa MINIIS.json" }, { - "name": "Prusa Generic PA @MINIIS 0.25", - "sub_path": "filament/Prusa Generic PA @MINIIS 0.25.json" + "name": "Generic PA @Prusa MINIIS 0.25", + "sub_path": "filament/Generic PA @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic PA @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PA @MINIIS 0.6.json" + "name": "Generic PA @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PA @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PA @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PA @MINIIS 0.8.json" + "name": "Generic PA @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PA @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PA @MK3.5", - "sub_path": "filament/Prusa Generic PA @MK3.5.json" + "name": "Generic PA @Prusa MK3.5", + "sub_path": "filament/Generic PA @Prusa MK3.5.json" }, { - "name": "Prusa Generic PA @MK3.5 0.25", - "sub_path": "filament/Prusa Generic PA @MK3.5 0.25.json" + "name": "Generic PA @Prusa MK3.5 0.25", + "sub_path": "filament/Generic PA @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic PA @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PA @MK3.5 0.6.json" + "name": "Generic PA @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PA @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PA @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PA @MK3.5 0.8.json" + "name": "Generic PA @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PA @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic PA-CF @base", - "sub_path": "filament/Prusa Generic PA-CF @base.json" + "name": "Generic PA-CF @Prusa base", + "sub_path": "filament/Generic PA-CF @Prusa base.json" }, { - "name": "Prusa Generic PA-CF", - "sub_path": "filament/Prusa Generic PA-CF.json" + "name": "Generic PA-CF @Prusa", + "sub_path": "filament/Generic PA-CF @Prusa.json" }, { - "name": "Prusa Generic PA-CF @MINIIS", - "sub_path": "filament/Prusa Generic PA-CF @MINIIS.json" + "name": "Generic PA-CF @Prusa MINIIS", + "sub_path": "filament/Generic PA-CF @Prusa MINIIS.json" }, { - "name": "Prusa Generic PA-CF @MINIIS 0.25", - "sub_path": "filament/Prusa Generic PA-CF @MINIIS 0.25.json" + "name": "Generic PA-CF @Prusa MINIIS 0.25", + "sub_path": "filament/Generic PA-CF @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic PA-CF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PA-CF @MINIIS 0.6.json" + "name": "Generic PA-CF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PA-CF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PA-CF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PA-CF @MINIIS 0.8.json" + "name": "Generic PA-CF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PA-CF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PA-CF @MK3.5", - "sub_path": "filament/Prusa Generic PA-CF @MK3.5.json" + "name": "Generic PA-CF @Prusa MK3.5", + "sub_path": "filament/Generic PA-CF @Prusa MK3.5.json" }, { - "name": "Prusa Generic PA-CF @MK3.5 0.25", - "sub_path": "filament/Prusa Generic PA-CF @MK3.5 0.25.json" + "name": "Generic PA-CF @Prusa MK3.5 0.25", + "sub_path": "filament/Generic PA-CF @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic PA-CF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PA-CF @MK3.5 0.6.json" + "name": "Generic PA-CF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PA-CF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PA-CF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PA-CF @MK3.5 0.8.json" + "name": "Generic PA-CF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PA-CF @Prusa MK3.5 0.8.json" }, { "name": "Prusament PA-CF @CORE One", @@ -1729,68 +1729,68 @@ "sub_path": "filament/Prusament PA-CF @XL 5T.json" }, { - "name": "Prusa Generic PC", - "sub_path": "filament/Prusa Generic PC.json" + "name": "Generic PC @Prusa", + "sub_path": "filament/Generic PC @Prusa.json" }, { - "name": "Prusa Generic PC @MINIIS", - "sub_path": "filament/Prusa Generic PC @MINIIS.json" + "name": "Generic PC @Prusa MINIIS", + "sub_path": "filament/Generic PC @Prusa MINIIS.json" }, { - "name": "Prusa Generic PC @MINIIS 0.25", - "sub_path": "filament/Prusa Generic PC @MINIIS 0.25.json" + "name": "Generic PC @Prusa MINIIS 0.25", + "sub_path": "filament/Generic PC @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic PC @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PC @MINIIS 0.6.json" + "name": "Generic PC @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PC @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PC @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PC @MINIIS 0.8.json" + "name": "Generic PC @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PC @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PC @MK3.5", - "sub_path": "filament/Prusa Generic PC @MK3.5.json" + "name": "Generic PC @Prusa MK3.5", + "sub_path": "filament/Generic PC @Prusa MK3.5.json" }, { - "name": "Prusa Generic PC @MK3.5 0.25", - "sub_path": "filament/Prusa Generic PC @MK3.5 0.25.json" + "name": "Generic PC @Prusa MK3.5 0.25", + "sub_path": "filament/Generic PC @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic PC @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PC @MK3.5 0.6.json" + "name": "Generic PC @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PC @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PC @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PC @MK3.5 0.8.json" + "name": "Generic PC @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PC @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic PC HF @base", - "sub_path": "filament/Prusa Generic PC HF @base.json" + "name": "Generic PC HF @Prusa base", + "sub_path": "filament/Generic PC HF @Prusa base.json" }, { - "name": "Prusa Generic PC HF @MINIIS", - "sub_path": "filament/Prusa Generic PC HF @MINIIS.json" + "name": "Generic PC HF @Prusa MINIIS", + "sub_path": "filament/Generic PC HF @Prusa MINIIS.json" }, { - "name": "Prusa Generic PC HF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PC HF @MINIIS 0.6.json" + "name": "Generic PC HF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PC HF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PC HF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PC HF @MINIIS 0.8.json" + "name": "Generic PC HF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PC HF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PC HF @MK3.5", - "sub_path": "filament/Prusa Generic PC HF @MK3.5.json" + "name": "Generic PC HF @Prusa MK3.5", + "sub_path": "filament/Generic PC HF @Prusa MK3.5.json" }, { - "name": "Prusa Generic PC HF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PC HF @MK3.5 0.6.json" + "name": "Generic PC HF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PC HF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PC HF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PC HF @MK3.5 0.8.json" + "name": "Generic PC HF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PC HF @Prusa MK3.5 0.8.json" }, { "name": "Prusament PC Blend @CORE One", @@ -1817,92 +1817,92 @@ "sub_path": "filament/Prusament PC-CF @XL 5T.json" }, { - "name": "Prusa Generic PETG @base", - "sub_path": "filament/Prusa Generic PETG @base.json" + "name": "Generic PETG @Prusa base", + "sub_path": "filament/Generic PETG @Prusa base.json" }, { - "name": "Prusa Generic PETG", - "sub_path": "filament/Prusa Generic PETG.json" + "name": "Generic PETG @Prusa", + "sub_path": "filament/Generic PETG @Prusa.json" }, { - "name": "Prusa Generic PETG @CORE One", - "sub_path": "filament/Prusa Generic PETG @CORE One.json" + "name": "Generic PETG @Prusa CORE One", + "sub_path": "filament/Generic PETG @Prusa CORE One.json" }, { - "name": "Prusa Generic PETG @MINIIS", - "sub_path": "filament/Prusa Generic PETG @MINIIS.json" + "name": "Generic PETG @Prusa MINIIS", + "sub_path": "filament/Generic PETG @Prusa MINIIS.json" }, { - "name": "Prusa Generic PETG @MINIIS 0.25", - "sub_path": "filament/Prusa Generic PETG @MINIIS 0.25.json" + "name": "Generic PETG @Prusa MINIIS 0.25", + "sub_path": "filament/Generic PETG @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic PETG @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PETG @MINIIS 0.6.json" + "name": "Generic PETG @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PETG @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PETG @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PETG @MINIIS 0.8.json" + "name": "Generic PETG @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PETG @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PETG @MK3.5", - "sub_path": "filament/Prusa Generic PETG @MK3.5.json" + "name": "Generic PETG @Prusa MK3.5", + "sub_path": "filament/Generic PETG @Prusa MK3.5.json" }, { - "name": "Prusa Generic PETG @MK3.5 0.25", - "sub_path": "filament/Prusa Generic PETG @MK3.5 0.25.json" + "name": "Generic PETG @Prusa MK3.5 0.25", + "sub_path": "filament/Generic PETG @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic PETG @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PETG @MK3.5 0.6.json" + "name": "Generic PETG @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PETG @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PETG @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PETG @MK3.5 0.8.json" + "name": "Generic PETG @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PETG @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic PETG @MK4", - "sub_path": "filament/Prusa Generic PETG @MK4.json" + "name": "Generic PETG @Prusa MK4", + "sub_path": "filament/Generic PETG @Prusa MK4.json" }, { - "name": "Prusa Generic PETG @MK4S", - "sub_path": "filament/Prusa Generic PETG @MK4S.json" + "name": "Generic PETG @Prusa MK4S", + "sub_path": "filament/Generic PETG @Prusa MK4S.json" }, { - "name": "Prusa Generic PETG @XL", - "sub_path": "filament/Prusa Generic PETG @XL.json" + "name": "Generic PETG @Prusa XL", + "sub_path": "filament/Generic PETG @Prusa XL.json" }, { - "name": "Prusa Generic PETG @XL 5T", - "sub_path": "filament/Prusa Generic PETG @XL 5T.json" + "name": "Generic PETG @Prusa XL 5T", + "sub_path": "filament/Generic PETG @Prusa XL 5T.json" }, { - "name": "Prusa Generic PETG HF @base", - "sub_path": "filament/Prusa Generic PETG HF @base.json" + "name": "Generic PETG HF @Prusa base", + "sub_path": "filament/Generic PETG HF @Prusa base.json" }, { - "name": "Prusa Generic PETG HF @MINIIS", - "sub_path": "filament/Prusa Generic PETG HF @MINIIS.json" + "name": "Generic PETG HF @Prusa MINIIS", + "sub_path": "filament/Generic PETG HF @Prusa MINIIS.json" }, { - "name": "Prusa Generic PETG HF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PETG HF @MINIIS 0.6.json" + "name": "Generic PETG HF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PETG HF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PETG HF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PETG HF @MINIIS 0.8.json" + "name": "Generic PETG HF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PETG HF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PETG HF @MK3.5", - "sub_path": "filament/Prusa Generic PETG HF @MK3.5.json" + "name": "Generic PETG HF @Prusa MK3.5", + "sub_path": "filament/Generic PETG HF @Prusa MK3.5.json" }, { - "name": "Prusa Generic PETG HF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PETG HF @MK3.5 0.6.json" + "name": "Generic PETG HF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PETG HF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PETG HF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PETG HF @MK3.5 0.8.json" + "name": "Generic PETG HF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PETG HF @Prusa MK3.5 0.8.json" }, { "name": "Prusament PETG @CORE One", @@ -1921,136 +1921,136 @@ "sub_path": "filament/Prusament PETG @XL 5T.json" }, { - "name": "Prusa Generic PLA @base", - "sub_path": "filament/Prusa Generic PLA @base.json" + "name": "Generic PLA @Prusa base", + "sub_path": "filament/Generic PLA @Prusa base.json" }, { - "name": "Prusa Generic PLA", - "sub_path": "filament/Prusa Generic PLA.json" + "name": "Generic PLA @Prusa", + "sub_path": "filament/Generic PLA @Prusa.json" }, { - "name": "Prusa Generic PLA @CORE One", - "sub_path": "filament/Prusa Generic PLA @CORE One.json" + "name": "Generic PLA @Prusa CORE One", + "sub_path": "filament/Generic PLA @Prusa CORE One.json" }, { - "name": "Prusa Generic PLA @MINIIS", - "sub_path": "filament/Prusa Generic PLA @MINIIS.json" + "name": "Generic PLA @Prusa MINIIS", + "sub_path": "filament/Generic PLA @Prusa MINIIS.json" }, { - "name": "Prusa Generic PLA @MINIIS 0.25", - "sub_path": "filament/Prusa Generic PLA @MINIIS 0.25.json" + "name": "Generic PLA @Prusa MINIIS 0.25", + "sub_path": "filament/Generic PLA @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic PLA @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PLA @MINIIS 0.6.json" + "name": "Generic PLA @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PLA @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PLA @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PLA @MINIIS 0.8.json" + "name": "Generic PLA @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PLA @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PLA @MK3.5", - "sub_path": "filament/Prusa Generic PLA @MK3.5.json" + "name": "Generic PLA @Prusa MK3.5", + "sub_path": "filament/Generic PLA @Prusa MK3.5.json" }, { - "name": "Prusa Generic PLA @MK3.5 0.25", - "sub_path": "filament/Prusa Generic PLA @MK3.5 0.25.json" + "name": "Generic PLA @Prusa MK3.5 0.25", + "sub_path": "filament/Generic PLA @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic PLA @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PLA @MK3.5 0.6.json" + "name": "Generic PLA @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PLA @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PLA @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PLA @MK3.5 0.8.json" + "name": "Generic PLA @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PLA @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic PLA @MK4", - "sub_path": "filament/Prusa Generic PLA @MK4.json" + "name": "Generic PLA @Prusa MK4", + "sub_path": "filament/Generic PLA @Prusa MK4.json" }, { - "name": "Prusa Generic PLA @MK4S", - "sub_path": "filament/Prusa Generic PLA @MK4S.json" + "name": "Generic PLA @Prusa MK4S", + "sub_path": "filament/Generic PLA @Prusa MK4S.json" }, { - "name": "Prusa Generic PLA @XL", - "sub_path": "filament/Prusa Generic PLA @XL.json" + "name": "Generic PLA @Prusa XL", + "sub_path": "filament/Generic PLA @Prusa XL.json" }, { - "name": "Prusa Generic PLA @XL 5T", - "sub_path": "filament/Prusa Generic PLA @XL 5T.json" + "name": "Generic PLA @Prusa XL 5T", + "sub_path": "filament/Generic PLA @Prusa XL 5T.json" }, { - "name": "Prusa Generic PLA HF @base", - "sub_path": "filament/Prusa Generic PLA HF @base.json" + "name": "Generic PLA HF @Prusa base", + "sub_path": "filament/Generic PLA HF @Prusa base.json" }, { - "name": "Prusa Generic PLA HF @MINIIS", - "sub_path": "filament/Prusa Generic PLA HF @MINIIS.json" + "name": "Generic PLA HF @Prusa MINIIS", + "sub_path": "filament/Generic PLA HF @Prusa MINIIS.json" }, { - "name": "Prusa Generic PLA HF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PLA HF @MINIIS 0.6.json" + "name": "Generic PLA HF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PLA HF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PLA HF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PLA HF @MINIIS 0.8.json" + "name": "Generic PLA HF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PLA HF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PLA HF @MK3.5", - "sub_path": "filament/Prusa Generic PLA HF @MK3.5.json" + "name": "Generic PLA HF @Prusa MK3.5", + "sub_path": "filament/Generic PLA HF @Prusa MK3.5.json" }, { - "name": "Prusa Generic PLA HF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PLA HF @MK3.5 0.6.json" + "name": "Generic PLA HF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PLA HF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PLA HF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PLA HF @MK3.5 0.8.json" + "name": "Generic PLA HF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PLA HF @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic PLA Silk @CORE One", - "sub_path": "filament/Prusa Generic PLA Silk @CORE One.json" + "name": "Generic PLA Silk @Prusa CORE One", + "sub_path": "filament/Generic PLA Silk @Prusa CORE One.json" }, { - "name": "Prusa Generic PLA-CF @base", - "sub_path": "filament/Prusa Generic PLA-CF @base.json" + "name": "Generic PLA-CF @Prusa base", + "sub_path": "filament/Generic PLA-CF @Prusa base.json" }, { - "name": "Prusa Generic PLA-CF", - "sub_path": "filament/Prusa Generic PLA-CF.json" + "name": "Generic PLA-CF @Prusa", + "sub_path": "filament/Generic PLA-CF @Prusa.json" }, { - "name": "Prusa Generic PLA-CF @MINIIS", - "sub_path": "filament/Prusa Generic PLA-CF @MINIIS.json" + "name": "Generic PLA-CF @Prusa MINIIS", + "sub_path": "filament/Generic PLA-CF @Prusa MINIIS.json" }, { - "name": "Prusa Generic PLA-CF @MINIIS 0.25", - "sub_path": "filament/Prusa Generic PLA-CF @MINIIS 0.25.json" + "name": "Generic PLA-CF @Prusa MINIIS 0.25", + "sub_path": "filament/Generic PLA-CF @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic PLA-CF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PLA-CF @MINIIS 0.6.json" + "name": "Generic PLA-CF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PLA-CF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PLA-CF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PLA-CF @MINIIS 0.8.json" + "name": "Generic PLA-CF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PLA-CF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PLA-CF @MK3.5", - "sub_path": "filament/Prusa Generic PLA-CF @MK3.5.json" + "name": "Generic PLA-CF @Prusa MK3.5", + "sub_path": "filament/Generic PLA-CF @Prusa MK3.5.json" }, { - "name": "Prusa Generic PLA-CF @MK3.5 0.25", - "sub_path": "filament/Prusa Generic PLA-CF @MK3.5 0.25.json" + "name": "Generic PLA-CF @Prusa MK3.5 0.25", + "sub_path": "filament/Generic PLA-CF @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic PLA-CF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PLA-CF @MK3.5 0.6.json" + "name": "Generic PLA-CF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PLA-CF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PLA-CF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PLA-CF @MK3.5 0.8.json" + "name": "Generic PLA-CF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PLA-CF @Prusa MK3.5 0.8.json" }, { "name": "Prusament PLA @CORE One", @@ -2085,72 +2085,72 @@ "sub_path": "filament/Prusament rPLA @XL 5T.json" }, { - "name": "Prusa Generic PVA @base", - "sub_path": "filament/Prusa Generic PVA @base.json" + "name": "Generic PVA @Prusa base", + "sub_path": "filament/Generic PVA @Prusa base.json" }, { - "name": "Prusa Generic PVA", - "sub_path": "filament/Prusa Generic PVA.json" + "name": "Generic PVA @Prusa", + "sub_path": "filament/Generic PVA @Prusa.json" }, { - "name": "Prusa Generic PVA @MINIIS", - "sub_path": "filament/Prusa Generic PVA @MINIIS.json" + "name": "Generic PVA @Prusa MINIIS", + "sub_path": "filament/Generic PVA @Prusa MINIIS.json" }, { - "name": "Prusa Generic PVA @MINIIS 0.25", - "sub_path": "filament/Prusa Generic PVA @MINIIS 0.25.json" + "name": "Generic PVA @Prusa MINIIS 0.25", + "sub_path": "filament/Generic PVA @Prusa MINIIS 0.25.json" }, { - "name": "Prusa Generic PVA @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PVA @MINIIS 0.6.json" + "name": "Generic PVA @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PVA @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PVA @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PVA @MINIIS 0.8.json" + "name": "Generic PVA @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PVA @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PVA @MK3.5", - "sub_path": "filament/Prusa Generic PVA @MK3.5.json" + "name": "Generic PVA @Prusa MK3.5", + "sub_path": "filament/Generic PVA @Prusa MK3.5.json" }, { - "name": "Prusa Generic PVA @MK3.5 0.25", - "sub_path": "filament/Prusa Generic PVA @MK3.5 0.25.json" + "name": "Generic PVA @Prusa MK3.5 0.25", + "sub_path": "filament/Generic PVA @Prusa MK3.5 0.25.json" }, { - "name": "Prusa Generic PVA @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PVA @MK3.5 0.6.json" + "name": "Generic PVA @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PVA @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PVA @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PVA @MK3.5 0.8.json" + "name": "Generic PVA @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PVA @Prusa MK3.5 0.8.json" }, { - "name": "Prusa Generic PVA HF @base", - "sub_path": "filament/Prusa Generic PVA HF @base.json" + "name": "Generic PVA HF @Prusa base", + "sub_path": "filament/Generic PVA HF @Prusa base.json" }, { - "name": "Prusa Generic PVA HF @MINIIS", - "sub_path": "filament/Prusa Generic PVA HF @MINIIS.json" + "name": "Generic PVA HF @Prusa MINIIS", + "sub_path": "filament/Generic PVA HF @Prusa MINIIS.json" }, { - "name": "Prusa Generic PVA HF @MINIIS 0.6", - "sub_path": "filament/Prusa Generic PVA HF @MINIIS 0.6.json" + "name": "Generic PVA HF @Prusa MINIIS 0.6", + "sub_path": "filament/Generic PVA HF @Prusa MINIIS 0.6.json" }, { - "name": "Prusa Generic PVA HF @MINIIS 0.8", - "sub_path": "filament/Prusa Generic PVA HF @MINIIS 0.8.json" + "name": "Generic PVA HF @Prusa MINIIS 0.8", + "sub_path": "filament/Generic PVA HF @Prusa MINIIS 0.8.json" }, { - "name": "Prusa Generic PVA HF @MK3.5", - "sub_path": "filament/Prusa Generic PVA HF @MK3.5.json" + "name": "Generic PVA HF @Prusa MK3.5", + "sub_path": "filament/Generic PVA HF @Prusa MK3.5.json" }, { - "name": "Prusa Generic PVA HF @MK3.5 0.6", - "sub_path": "filament/Prusa Generic PVA HF @MK3.5 0.6.json" + "name": "Generic PVA HF @Prusa MK3.5 0.6", + "sub_path": "filament/Generic PVA HF @Prusa MK3.5 0.6.json" }, { - "name": "Prusa Generic PVA HF @MK3.5 0.8", - "sub_path": "filament/Prusa Generic PVA HF @MK3.5 0.8.json" + "name": "Generic PVA HF @Prusa MK3.5 0.8", + "sub_path": "filament/Generic PVA HF @Prusa MK3.5 0.8.json" }, { "name": "Prusament PVB @CORE One", @@ -2165,112 +2165,112 @@ "sub_path": "filament/Prusament PVB @XL 5T.json" }, { - "name": "Prusa Generic TPU @base", - "sub_path": "filament/Prusa Generic TPU @base.json" + "name": "Generic TPU @Prusa base", + "sub_path": "filament/Generic TPU @Prusa base.json" }, { - "name": "Prusa Generic TPU", - "sub_path": "filament/Prusa Generic TPU.json" + "name": "Generic TPU @Prusa", + "sub_path": "filament/Generic TPU @Prusa.json" }, { - "name": "Prusa Generic TPU @MINIIS", - "sub_path": "filament/Prusa Generic TPU @MINIIS.json" + "name": "Generic TPU @Prusa MINIIS", + "sub_path": "filament/Generic TPU @Prusa MINIIS.json" }, { - "name": "Prusa Generic TPU @MK3.5", - "sub_path": "filament/Prusa Generic TPU @MK3.5.json" + "name": "Generic TPU @Prusa MK3.5", + "sub_path": "filament/Generic TPU @Prusa MK3.5.json" }, { - "name": "Prusa Generic TPU @MK4", - "sub_path": "filament/Prusa Generic TPU @MK4.json" + "name": "Generic TPU @Prusa MK4", + "sub_path": "filament/Generic TPU @Prusa MK4.json" }, { - "name": "Prusa Generic TPU @MK4S", - "sub_path": "filament/Prusa Generic TPU @MK4S.json" + "name": "Generic TPU @Prusa MK4S", + "sub_path": "filament/Generic TPU @Prusa MK4S.json" }, { - "name": "Prusa Generic TPU HF @base", - "sub_path": "filament/Prusa Generic TPU HF @base.json" + "name": "Generic TPU HF @Prusa base", + "sub_path": "filament/Generic TPU HF @Prusa base.json" }, { - "name": "Prusa Generic TPU HF @MINIIS", - "sub_path": "filament/Prusa Generic TPU HF @MINIIS.json" + "name": "Generic TPU HF @Prusa MINIIS", + "sub_path": "filament/Generic TPU HF @Prusa MINIIS.json" }, { - "name": "Prusa Generic TPU HF @MK3.5", - "sub_path": "filament/Prusa Generic TPU HF @MK3.5.json" + "name": "Generic TPU HF @Prusa MK3.5", + "sub_path": "filament/Generic TPU HF @Prusa MK3.5.json" }, { - "name": "Prusa Generic ABS @CORE One 0.6", - "sub_path": "filament/Prusa Generic ABS @CORE One 0.6.json" + "name": "Generic ABS @Prusa CORE One 0.6", + "sub_path": "filament/Generic ABS @Prusa CORE One 0.6.json" }, { - "name": "Prusa Generic ABS @CORE One 0.8", - "sub_path": "filament/Prusa Generic ABS @CORE One 0.8.json" + "name": "Generic ABS @Prusa CORE One 0.8", + "sub_path": "filament/Generic ABS @Prusa CORE One 0.8.json" }, { - "name": "Prusa Generic ABS @CORE One HF 0.4", - "sub_path": "filament/Prusa Generic ABS @CORE One HF 0.4.json" + "name": "Generic ABS @Prusa CORE One HF 0.4", + "sub_path": "filament/Generic ABS @Prusa CORE One HF 0.4.json" }, { - "name": "Prusa Generic ABS @CORE One HF 0.5", - "sub_path": "filament/Prusa Generic ABS @CORE One HF 0.5.json" + "name": "Generic ABS @Prusa CORE One HF 0.5", + "sub_path": "filament/Generic ABS @Prusa CORE One HF 0.5.json" }, { - "name": "Prusa Generic ABS @CORE One HF 0.6", - "sub_path": "filament/Prusa Generic ABS @CORE One HF 0.6.json" + "name": "Generic ABS @Prusa CORE One HF 0.6", + "sub_path": "filament/Generic ABS @Prusa CORE One HF 0.6.json" }, { - "name": "Prusa Generic ABS @CORE One HF 0.8", - "sub_path": "filament/Prusa Generic ABS @CORE One HF 0.8.json" + "name": "Generic ABS @Prusa CORE One HF 0.8", + "sub_path": "filament/Generic ABS @Prusa CORE One HF 0.8.json" }, { - "name": "Prusa Generic ABS @MK4S 0.6", - "sub_path": "filament/Prusa Generic ABS @MK4S 0.6.json" + "name": "Generic ABS @Prusa MK4S 0.6", + "sub_path": "filament/Generic ABS @Prusa MK4S 0.6.json" }, { - "name": "Prusa Generic ABS @MK4S 0.8", - "sub_path": "filament/Prusa Generic ABS @MK4S 0.8.json" + "name": "Generic ABS @Prusa MK4S 0.8", + "sub_path": "filament/Generic ABS @Prusa MK4S 0.8.json" }, { - "name": "Prusa Generic ABS @MK4S HF0.4", - "sub_path": "filament/Prusa Generic ABS @MK4S HF0.4.json" + "name": "Generic ABS @Prusa MK4S HF0.4", + "sub_path": "filament/Generic ABS @Prusa MK4S HF0.4.json" }, { - "name": "Prusa Generic ASA @CORE One 0.6", - "sub_path": "filament/Prusa Generic ASA @CORE One 0.6.json" + "name": "Generic ASA @Prusa CORE One 0.6", + "sub_path": "filament/Generic ASA @Prusa CORE One 0.6.json" }, { - "name": "Prusa Generic ASA @CORE One 0.8", - "sub_path": "filament/Prusa Generic ASA @CORE One 0.8.json" + "name": "Generic ASA @Prusa CORE One 0.8", + "sub_path": "filament/Generic ASA @Prusa CORE One 0.8.json" }, { - "name": "Prusa Generic ASA @CORE One HF 0.4", - "sub_path": "filament/Prusa Generic ASA @CORE One HF 0.4.json" + "name": "Generic ASA @Prusa CORE One HF 0.4", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.4.json" }, { - "name": "Prusa Generic ASA @CORE One HF 0.5", - "sub_path": "filament/Prusa Generic ASA @CORE One HF 0.5.json" + "name": "Generic ASA @Prusa CORE One HF 0.5", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.5.json" }, { - "name": "Prusa Generic ASA @CORE One HF 0.6", - "sub_path": "filament/Prusa Generic ASA @CORE One HF 0.6.json" + "name": "Generic ASA @Prusa CORE One HF 0.6", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.6.json" }, { - "name": "Prusa Generic ASA @CORE One HF 0.8", - "sub_path": "filament/Prusa Generic ASA @CORE One HF 0.8.json" + "name": "Generic ASA @Prusa CORE One HF 0.8", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.8.json" }, { - "name": "Prusa Generic ASA @MK4S 0.6", - "sub_path": "filament/Prusa Generic ASA @MK4S 0.6.json" + "name": "Generic ASA @Prusa MK4S 0.6", + "sub_path": "filament/Generic ASA @Prusa MK4S 0.6.json" }, { - "name": "Prusa Generic ASA @MK4S 0.8", - "sub_path": "filament/Prusa Generic ASA @MK4S 0.8.json" + "name": "Generic ASA @Prusa MK4S 0.8", + "sub_path": "filament/Generic ASA @Prusa MK4S 0.8.json" }, { - "name": "Prusa Generic ASA @MK4S HF0.4", - "sub_path": "filament/Prusa Generic ASA @MK4S HF0.4.json" + "name": "Generic ASA @Prusa MK4S HF0.4", + "sub_path": "filament/Generic ASA @Prusa MK4S HF0.4.json" }, { "name": "Prusament ASA @CORE One 0.6", @@ -2297,12 +2297,12 @@ "sub_path": "filament/Prusament ASA @CORE One HF 0.8.json" }, { - "name": "Prusa Generic TPU @CORE One 0.6", - "sub_path": "filament/Prusa Generic TPU @CORE One 0.6.json" + "name": "Generic TPU @Prusa CORE One 0.6", + "sub_path": "filament/Generic TPU @Prusa CORE One 0.6.json" }, { - "name": "Prusa Generic TPU @CORE One 0.8", - "sub_path": "filament/Prusa Generic TPU @CORE One 0.8.json" + "name": "Generic TPU @Prusa CORE One 0.8", + "sub_path": "filament/Generic TPU @Prusa CORE One 0.8.json" }, { "name": "Prusament PA-CF @CORE One 0.6", @@ -2345,40 +2345,40 @@ "sub_path": "filament/Prusament PC-CF @CORE One 0.8.json" }, { - "name": "Prusa Generic PETG @CORE One 0.6", - "sub_path": "filament/Prusa Generic PETG @CORE One 0.6.json" + "name": "Generic PETG @Prusa CORE One 0.6", + "sub_path": "filament/Generic PETG @Prusa CORE One 0.6.json" }, { - "name": "Prusa Generic PETG @CORE One 0.8", - "sub_path": "filament/Prusa Generic PETG @CORE One 0.8.json" + "name": "Generic PETG @Prusa CORE One 0.8", + "sub_path": "filament/Generic PETG @Prusa CORE One 0.8.json" }, { - "name": "Prusa Generic PETG @CORE One HF 0.4", - "sub_path": "filament/Prusa Generic PETG @CORE One HF 0.4.json" + "name": "Generic PETG @Prusa CORE One HF 0.4", + "sub_path": "filament/Generic PETG @Prusa CORE One HF 0.4.json" }, { - "name": "Prusa Generic PETG @CORE One HF 0.5", - "sub_path": "filament/Prusa Generic PETG @CORE One HF 0.5.json" + "name": "Generic PETG @Prusa CORE One HF 0.5", + "sub_path": "filament/Generic PETG @Prusa CORE One HF 0.5.json" }, { - "name": "Prusa Generic PETG @CORE One HF 0.6", - "sub_path": "filament/Prusa Generic PETG @CORE One HF 0.6.json" + "name": "Generic PETG @Prusa CORE One HF 0.6", + "sub_path": "filament/Generic PETG @Prusa CORE One HF 0.6.json" }, { - "name": "Prusa Generic PETG @CORE One HF 0.8", - "sub_path": "filament/Prusa Generic PETG @CORE One HF 0.8.json" + "name": "Generic PETG @Prusa CORE One HF 0.8", + "sub_path": "filament/Generic PETG @Prusa CORE One HF 0.8.json" }, { - "name": "Prusa Generic PETG @MK4S 0.6", - "sub_path": "filament/Prusa Generic PETG @MK4S 0.6.json" + "name": "Generic PETG @Prusa MK4S 0.6", + "sub_path": "filament/Generic PETG @Prusa MK4S 0.6.json" }, { - "name": "Prusa Generic PETG @MK4S 0.8", - "sub_path": "filament/Prusa Generic PETG @MK4S 0.8.json" + "name": "Generic PETG @Prusa MK4S 0.8", + "sub_path": "filament/Generic PETG @Prusa MK4S 0.8.json" }, { - "name": "Prusa Generic PETG @MK4S HF0.4", - "sub_path": "filament/Prusa Generic PETG @MK4S HF0.4.json" + "name": "Generic PETG @Prusa MK4S HF0.4", + "sub_path": "filament/Generic PETG @Prusa MK4S HF0.4.json" }, { "name": "Prusament PETG @CORE One 0.6", @@ -2405,52 +2405,52 @@ "sub_path": "filament/Prusament PETG @CORE One HF 0.8.json" }, { - "name": "Prusa Generic PLA @CORE One 0.6", - "sub_path": "filament/Prusa Generic PLA @CORE One 0.6.json" + "name": "Generic PLA @Prusa CORE One 0.6", + "sub_path": "filament/Generic PLA @Prusa CORE One 0.6.json" }, { - "name": "Prusa Generic PLA @CORE One 0.8", - "sub_path": "filament/Prusa Generic PLA @CORE One 0.8.json" + "name": "Generic PLA @Prusa CORE One 0.8", + "sub_path": "filament/Generic PLA @Prusa CORE One 0.8.json" }, { - "name": "Prusa Generic PLA @CORE One HF 0.4", - "sub_path": "filament/Prusa Generic PLA @CORE One HF 0.4.json" + "name": "Generic PLA @Prusa CORE One HF 0.4", + "sub_path": "filament/Generic PLA @Prusa CORE One HF 0.4.json" }, { - "name": "Prusa Generic PLA @CORE One HF 0.5", - "sub_path": "filament/Prusa Generic PLA @CORE One HF 0.5.json" + "name": "Generic PLA @Prusa CORE One HF 0.5", + "sub_path": "filament/Generic PLA @Prusa CORE One HF 0.5.json" }, { - "name": "Prusa Generic PLA @CORE One HF 0.6", - "sub_path": "filament/Prusa Generic PLA @CORE One HF 0.6.json" + "name": "Generic PLA @Prusa CORE One HF 0.6", + "sub_path": "filament/Generic PLA @Prusa CORE One HF 0.6.json" }, { - "name": "Prusa Generic PLA @CORE One HF 0.8", - "sub_path": "filament/Prusa Generic PLA @CORE One HF 0.8.json" + "name": "Generic PLA @Prusa CORE One HF 0.8", + "sub_path": "filament/Generic PLA @Prusa CORE One HF 0.8.json" }, { - "name": "Prusa Generic PLA @MK4S 0.6", - "sub_path": "filament/Prusa Generic PLA @MK4S 0.6.json" + "name": "Generic PLA @Prusa MK4S 0.6", + "sub_path": "filament/Generic PLA @Prusa MK4S 0.6.json" }, { - "name": "Prusa Generic PLA @MK4S 0.8", - "sub_path": "filament/Prusa Generic PLA @MK4S 0.8.json" + "name": "Generic PLA @Prusa MK4S 0.8", + "sub_path": "filament/Generic PLA @Prusa MK4S 0.8.json" }, { - "name": "Prusa Generic PLA @MK4S HF0.4", - "sub_path": "filament/Prusa Generic PLA @MK4S HF0.4.json" + "name": "Generic PLA @Prusa MK4S HF0.4", + "sub_path": "filament/Generic PLA @Prusa MK4S HF0.4.json" }, { - "name": "Prusa Generic PLA Silk @MK4S", - "sub_path": "filament/Prusa Generic PLA Silk @MK4S.json" + "name": "Generic PLA Silk @Prusa MK4S", + "sub_path": "filament/Generic PLA Silk @Prusa MK4S.json" }, { - "name": "Prusa Generic PLA Silk @CORE One 0.6", - "sub_path": "filament/Prusa Generic PLA Silk @CORE One 0.6.json" + "name": "Generic PLA Silk @Prusa CORE One 0.6", + "sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.6.json" }, { - "name": "Prusa Generic PLA Silk @CORE One 0.8", - "sub_path": "filament/Prusa Generic PLA Silk @CORE One 0.8.json" + "name": "Generic PLA Silk @Prusa CORE One 0.8", + "sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.8.json" }, { "name": "Prusament PLA @CORE One 0.6", @@ -2493,68 +2493,68 @@ "sub_path": "filament/Prusament PVB @CORE One 0.8.json" }, { - "name": "Prusa Generic TPU @MK4S 0.6", - "sub_path": "filament/Prusa Generic TPU @MK4S 0.6.json" + "name": "Generic TPU @Prusa MK4S 0.6", + "sub_path": "filament/Generic TPU @Prusa MK4S 0.6.json" }, { - "name": "Prusa Generic TPU @MK4S 0.8", - "sub_path": "filament/Prusa Generic TPU @MK4S 0.8.json" + "name": "Generic TPU @Prusa MK4S 0.8", + "sub_path": "filament/Generic TPU @Prusa MK4S 0.8.json" }, { - "name": "Prusa Generic ABS @MK4S HF0.5", - "sub_path": "filament/Prusa Generic ABS @MK4S HF0.5.json" + "name": "Generic ABS @Prusa MK4S HF0.5", + "sub_path": "filament/Generic ABS @Prusa MK4S HF0.5.json" }, { - "name": "Prusa Generic ABS @MK4S HF0.6", - "sub_path": "filament/Prusa Generic ABS @MK4S HF0.6.json" + "name": "Generic ABS @Prusa MK4S HF0.6", + "sub_path": "filament/Generic ABS @Prusa MK4S HF0.6.json" }, { - "name": "Prusa Generic ABS @MK4S HF0.8", - "sub_path": "filament/Prusa Generic ABS @MK4S HF0.8.json" + "name": "Generic ABS @Prusa MK4S HF0.8", + "sub_path": "filament/Generic ABS @Prusa MK4S HF0.8.json" }, { - "name": "Prusa Generic ASA @MK4S HF0.5", - "sub_path": "filament/Prusa Generic ASA @MK4S HF0.5.json" + "name": "Generic ASA @Prusa MK4S HF0.5", + "sub_path": "filament/Generic ASA @Prusa MK4S HF0.5.json" }, { - "name": "Prusa Generic ASA @MK4S HF0.6", - "sub_path": "filament/Prusa Generic ASA @MK4S HF0.6.json" + "name": "Generic ASA @Prusa MK4S HF0.6", + "sub_path": "filament/Generic ASA @Prusa MK4S HF0.6.json" }, { - "name": "Prusa Generic ASA @MK4S HF0.8", - "sub_path": "filament/Prusa Generic ASA @MK4S HF0.8.json" + "name": "Generic ASA @Prusa MK4S HF0.8", + "sub_path": "filament/Generic ASA @Prusa MK4S HF0.8.json" }, { - "name": "Prusa Generic PETG @MK4S HF0.5", - "sub_path": "filament/Prusa Generic PETG @MK4S HF0.5.json" + "name": "Generic PETG @Prusa MK4S HF0.5", + "sub_path": "filament/Generic PETG @Prusa MK4S HF0.5.json" }, { - "name": "Prusa Generic PETG @MK4S HF0.6", - "sub_path": "filament/Prusa Generic PETG @MK4S HF0.6.json" + "name": "Generic PETG @Prusa MK4S HF0.6", + "sub_path": "filament/Generic PETG @Prusa MK4S HF0.6.json" }, { - "name": "Prusa Generic PETG @MK4S HF0.8", - "sub_path": "filament/Prusa Generic PETG @MK4S HF0.8.json" + "name": "Generic PETG @Prusa MK4S HF0.8", + "sub_path": "filament/Generic PETG @Prusa MK4S HF0.8.json" }, { - "name": "Prusa Generic PLA @MK4S HF0.5", - "sub_path": "filament/Prusa Generic PLA @MK4S HF0.5.json" + "name": "Generic PLA @Prusa MK4S HF0.5", + "sub_path": "filament/Generic PLA @Prusa MK4S HF0.5.json" }, { - "name": "Prusa Generic PLA @MK4S HF0.6", - "sub_path": "filament/Prusa Generic PLA @MK4S HF0.6.json" + "name": "Generic PLA @Prusa MK4S HF0.6", + "sub_path": "filament/Generic PLA @Prusa MK4S HF0.6.json" }, { - "name": "Prusa Generic PLA @MK4S HF0.8", - "sub_path": "filament/Prusa Generic PLA @MK4S HF0.8.json" + "name": "Generic PLA @Prusa MK4S HF0.8", + "sub_path": "filament/Generic PLA @Prusa MK4S HF0.8.json" }, { - "name": "Prusa Generic PLA Silk @MK4S 0.6", - "sub_path": "filament/Prusa Generic PLA Silk @MK4S 0.6.json" + "name": "Generic PLA Silk @Prusa MK4S 0.6", + "sub_path": "filament/Generic PLA Silk @Prusa MK4S 0.6.json" }, { - "name": "Prusa Generic PLA Silk @MK4S 0.8", - "sub_path": "filament/Prusa Generic PLA Silk @MK4S 0.8.json" + "name": "Generic PLA Silk @Prusa MK4S 0.8", + "sub_path": "filament/Generic PLA Silk @Prusa MK4S 0.8.json" } ], "machine_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 new file mode 100644 index 0000000000..8ba18e9dde --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.6.json @@ -0,0 +1,13 @@ +{ + "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", + "from": "system", + "setting_id": "PYQhstNvKFJ7qsxe", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..2981c2ef63 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One 0.8.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "ExG49agessyLCVpW", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One 0.8 nozzle" + ], + "fan_cooling_layer_time": [ + "40" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json similarity index 71% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.4.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json index 84d2ed8ea6..f2e61055ab 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @CORE One HF 0.4", - "inherits": "Prusa Generic ABS @CORE One", + "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", "from": "system", - "setting_id": "Sp0sbcvt0EqZ59NT", - "filament_id": "OFvGc67v", + "setting_id": "ASYz8yASE82tQDII", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json similarity index 71% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.5.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json index 568f8468e5..14782a747a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @CORE One HF 0.5", - "inherits": "Prusa Generic ABS @CORE One", + "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", "from": "system", - "setting_id": "U1ih5tnkViqI3vya", - "filament_id": "OFvGc67v", + "setting_id": "mzZCm8XDmAR23YR6", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json similarity index 71% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.6.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json index debed7aed6..be46455a73 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @CORE One HF 0.6", - "inherits": "Prusa Generic ABS @CORE One", + "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", "from": "system", - "setting_id": "MuqHvIoTlM1Pbs8j", - "filament_id": "OFvGc67v", + "setting_id": "gJhX2KBpk4wfXIj0", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.8.json similarity index 74% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.8.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.8.json index 66655ce8e8..f4d2954ad7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @CORE One HF 0.8", - "inherits": "Prusa Generic ABS @CORE One", + "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", "from": "system", - "setting_id": "Wbpc2Ddzc3zPnQVr", - "filament_id": "OFvGc67v", + "setting_id": "JbGYSVdZTeFJXaVk", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json similarity index 92% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json index 784eb0ef4d..7339d20a7c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @CORE One", + "name": "Generic ABS @Prusa CORE One", "inherits": "fdm_filament_abs", + "renamed_from": "Prusa Generic ABS @CORE One;Prusa Generic ABS CORE One", "from": "system", - "setting_id": "NajoyXhNAiyJyaRq", - "filament_id": "OFvGc67v", + "setting_id": "0k31oXq1pLQsHvrj", + "filament_id": "OFY9muEs", "instantiation": "true", "chamber_temperature": [ "40" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.25.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.25.json index ca834afe43..0fe673d854 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.25.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS @MINIIS 0.25", - "inherits": "Prusa Generic ABS @base", + "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", "from": "system", - "setting_id": "NdGEi7BdP59bqz53", + "setting_id": "T7U23i3I3ALV2oEd", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.6.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.6.json index b4c5c636bf..3b9fa495e3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS @MINIIS 0.6", - "inherits": "Prusa Generic ABS @base", + "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", "from": "system", - "setting_id": "f8RXAaEZ13jSgN9u", + "setting_id": "iZdNxczgKBs0zIiI", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.8.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.8.json index 7b847c26b0..e9d5d7554b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS @MINIIS 0.8", - "inherits": "Prusa Generic ABS @base", + "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", "from": "system", - "setting_id": "0QdQCdtcKqM9HhpD", + "setting_id": "f6fZt6LNgXSHjInj", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS.json index 35bf33de08..9f6569d6e9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS @MINIIS", - "inherits": "Prusa Generic ABS @base", + "name": "Generic ABS @Prusa MINIIS", + "inherits": "Generic ABS @Prusa base", + "renamed_from": "Prusa Generic ABS @MINIIS;Prusa Generic ABS MINIIS", "from": "system", - "setting_id": "LmdcShjNmbZ8E5fo", + "setting_id": "ZqiVOVIYGAbB1SPk", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.25.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.25.json index aacddbfd2d..0a36c04f02 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @MK3.5 0.25", + "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", "from": "system", - "setting_id": "bQgom9OdLzHf862f", - "filament_id": "OFvGc67v", + "setting_id": "IjZS8VJrGg6fRiI2", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.6.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.6.json index 1b45ec65e7..04626e6ad8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @MK3.5 0.6", + "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", "from": "system", - "setting_id": "juio4SnE9x7bcYdO", - "filament_id": "OFvGc67v", + "setting_id": "iJ2u6LgWCZd2zaPJ", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.8.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.8.json index dfc5fbc984..4e65b7e329 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @MK3.5 0.8", + "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", "from": "system", - "setting_id": "dRt2nKkJ0saWba5s", - "filament_id": "OFvGc67v", + "setting_id": "m8neIe1dfWt5Klbq", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5.json index d0cc74cc63..075e055e72 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @MK3.5", + "name": "Generic ABS @Prusa MK3.5", "inherits": "fdm_filament_abs", + "renamed_from": "Prusa Generic ABS @MK3.5;Prusa Generic ABS MK3.5", "from": "system", - "setting_id": "etTLu2Uk95XriBxT", - "filament_id": "OFvGc67v", + "setting_id": "EEc6F9uzIkv6nFib", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4.json similarity index 86% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MK4.json index 6b4f8d9fdf..9ab147b678 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS @MK4", - "inherits": "Prusa Generic ABS @base", + "name": "Generic ABS @Prusa MK4", + "inherits": "Generic ABS @Prusa base", + "renamed_from": "Prusa Generic ABS @MK4;Prusa Generic ABS MK4", "from": "system", - "setting_id": "Yeqfgyq1l0b1tCaT", + "setting_id": "MVcRPldYJo5fnXh8", "instantiation": "true", "filament_flow_ratio": [ "0.926" 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 new file mode 100644 index 0000000000..7371c1f2f9 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.6.json @@ -0,0 +1,13 @@ +{ + "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", + "from": "system", + "setting_id": "aNRfxkoYTEG3NPV1", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..bf0e8419cf --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S 0.8.json @@ -0,0 +1,13 @@ +{ + "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", + "from": "system", + "setting_id": "sL7NL7GOf52fzxnj", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.8 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.4.json similarity index 75% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.4.json index ecd8ec0872..84aca85d1a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @MK4S HF0.4", - "inherits": "Prusa Generic ABS @MK4S", + "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", "from": "system", - "setting_id": "8iqhyZkLiVCvZYLa", - "filament_id": "OFvGc67v", + "setting_id": "usm5Dycg7z1b1o1v", + "filament_id": "OFY9muEs", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" 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 new file mode 100644 index 0000000000..cb9f3ccebc --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.5.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "EdrmoUsReFVn5EWW", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "filament_max_volumetric_speed": [ + "27" + ] +} 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 new file mode 100644 index 0000000000..2327e2d1cc --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.6.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "lcxvk4AN6z8NGdKv", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "filament_max_volumetric_speed": [ + "34" + ] +} 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 new file mode 100644 index 0000000000..81bf85e41c --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S HF0.8.json @@ -0,0 +1,18 @@ +{ + "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", + "from": "system", + "setting_id": "VTSZGauVB9yGzOJD", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_min_speed": "15", + "filament_max_volumetric_speed": [ + "36" + ], + "slow_down_layer_time": "25" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S.json index 37762490e5..c454e1d79b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa MK4S.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS @MK4S", + "name": "Generic ABS @Prusa MK4S", "inherits": "fdm_filament_abs", + "renamed_from": "Prusa Generic ABS @MK4S;Prusa Generic ABS MK4S", "from": "system", - "setting_id": "mDDX6Hdt6Ee00Iqb", - "filament_id": "OFvGc67v", + "setting_id": "6xkFvOyWtTQNXYAm", + "filament_id": "OFY9muEs", "instantiation": "true", "close_fan_the_first_x_layers": "4", "compatible_printers": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa XL 5T.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa XL 5T.json index 38559e4b26..7d53f66645 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL 5T.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa XL 5T.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS @XL 5T", - "inherits": "Prusa Generic ABS @base", + "name": "Generic ABS @Prusa XL 5T", + "inherits": "Generic ABS @Prusa base", + "renamed_from": "Prusa Generic ABS @XL 5T;Prusa Generic ABS XL 5T", "from": "system", - "setting_id": "BVYagI9PtDtO1Jhu", + "setting_id": "XfavDzEzzrXDQVUC", "instantiation": "true", "nozzle_temperature_intial_layer": "255", "nozzle_temperature": "255", diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa XL.json similarity index 90% rename from resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa XL.json index e40a10cbeb..abf7986c12 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa XL.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS @XL", - "inherits": "Prusa Generic ABS @base", + "name": "Generic ABS @Prusa XL", + "inherits": "Generic ABS @Prusa base", + "renamed_from": "Prusa Generic ABS @XL;Prusa Generic ABS XL", "from": "system", - "setting_id": "fN9NUlg8l5DWy4LN", + "setting_id": "HYHkGEjr6Kid2Xg2", "instantiation": "true", "nozzle_temperature_intial_layer": "255", "nozzle_temperature": "255", diff --git a/resources/profiles/Anker/filament/Anker Generic ABS @base.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa base.json similarity index 61% rename from resources/profiles/Anker/filament/Anker Generic ABS @base.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa base.json index c4982fcfb4..265216328f 100644 --- a/resources/profiles/Anker/filament/Anker Generic ABS @base.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Anker Generic ABS @base", + "name": "Generic ABS @Prusa base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OF3P0BQA", + "filament_id": "OFY9muEs", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa.json similarity index 87% rename from resources/profiles/Prusa/filament/Prusa Generic ABS.json rename to resources/profiles/Prusa/filament/Generic ABS @Prusa.json index 9fef1f871c..0c10f8f297 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS", - "inherits": "Prusa Generic ABS @base", + "name": "Generic ABS @Prusa", + "inherits": "Generic ABS @Prusa base", + "renamed_from": "Prusa Generic ABS", "from": "system", - "setting_id": "pqQMpMgbSN3XvTdK", + "setting_id": "RBSSZVt1NCAz4x3V", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.6.json similarity index 77% rename from resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.6.json index f8959a77b2..071e689280 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS HF @MINIIS 0.6", - "inherits": "Prusa Generic ABS HF @base", + "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", "from": "system", - "setting_id": "86pFdkE3ly08xst7", + "setting_id": "L6copDR26trR0D8B", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.8.json similarity index 77% rename from resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.8.json index 63c1207fd9..ca0b250240 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS HF @MINIIS 0.8", - "inherits": "Prusa Generic ABS HF @base", + "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", "from": "system", - "setting_id": "yn9imamHaXlFDsPr", + "setting_id": "oxiwspATW960u3eZ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS.json index 358aa57b6d..6acc1844e7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ABS HF @MINIIS", - "inherits": "Prusa Generic ABS HF @base", + "name": "Generic ABS HF @Prusa MINIIS", + "inherits": "Generic ABS HF @Prusa base", + "renamed_from": "Prusa Generic ABS HF @MINIIS;Prusa Generic ABS HF MINIIS", "from": "system", - "setting_id": "KFoCfgUW9k9Yglwj", + "setting_id": "KcRRWqB7hrovzBng", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.6.json similarity index 77% rename from resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.6.json index 10b456d822..5e446b1507 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS HF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "IF0vGesJrPxKZhhP", - "filament_id": "OFyeSq8A", + "setting_id": "ELwxwCcaOKeCUqoB", + "filament_id": "OF55jHAJ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.8.json similarity index 77% rename from resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.8.json index abd3a2fc9e..e5f48f3390 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS HF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "Bl3iXBs56hdXM9SE", - "filament_id": "OFyeSq8A", + "setting_id": "xWMzscdlR6llxFKQ", + "filament_id": "OF55jHAJ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5.json index 02c86e018b..9c1f224149 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ABS HF @MK3.5", + "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", "from": "system", - "setting_id": "0luFxwjErjX80SXh", - "filament_id": "OFyeSq8A", + "setting_id": "n9Xu8L69l5rs6VZF", + "filament_id": "OF55jHAJ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa base.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json rename to resources/profiles/Prusa/filament/Generic ABS HF @Prusa base.json index a1745176f2..adeb00182e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS HF @base.json +++ b/resources/profiles/Prusa/filament/Generic ABS HF @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic ABS HF @base", + "name": "Generic ABS HF @Prusa base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "OFyeSq8A", + "filament_id": "OF55jHAJ", "instantiation": "false" } 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 new file mode 100644 index 0000000000..0fa54a9d21 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.6.json @@ -0,0 +1,19 @@ +{ + "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", + "from": "system", + "setting_id": "WJzGT568OrlSqxjt", + "filament_id": "OFLPAxz3", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One 0.6 nozzle" + ], + "nozzle_temperature": [ + "255" + ], + "slow_down_layer_time": [ + "15" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.8.json similarity index 50% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.8.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.8.json index c112241e63..db78ff7eeb 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @CORE One 0.8", - "inherits": "Prusa Generic ASA @CORE One", + "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", "from": "system", - "setting_id": "jwPZBZ4B116kCVu9", - "filament_id": "OFoJcr46", + "setting_id": "VtxVQIuWVkP6W3aN", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json similarity index 74% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.4.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json index 04bf35f2e7..18a1b68fb3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @CORE One HF 0.4", - "inherits": "Prusa Generic ASA @CORE One", + "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", "from": "system", - "setting_id": "3SHxmODIq9SCK4Kd", - "filament_id": "OFoJcr46", + "setting_id": "eKDfiVRE59itoppm", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json similarity index 74% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.5.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json index dfe8fec3fe..dd7c08b25f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @CORE One HF 0.5", - "inherits": "Prusa Generic ASA @CORE One", + "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", "from": "system", - "setting_id": "RBSMuMnrcTyregVJ", - "filament_id": "OFoJcr46", + "setting_id": "ZjHf5Vvtf4ESNnWb", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json similarity index 75% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.6.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json index f74efb4310..7ca03b1c37 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @CORE One HF 0.6", - "inherits": "Prusa Generic ASA @CORE One", + "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", "from": "system", - "setting_id": "5ezNirZa3m7Oi1Ts", - "filament_id": "OFoJcr46", + "setting_id": "aRDgUgQJWdNDJx5c", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.8.json similarity index 76% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.8.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.8.json index 8d6bb1a685..7fe2a7d8bf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @CORE One HF 0.8", - "inherits": "Prusa Generic ASA @CORE One", + "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", "from": "system", - "setting_id": "EtHBkeDF0LvudfBi", - "filament_id": "OFoJcr46", + "setting_id": "UQYl8pGvqg2D9zJX", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json similarity index 92% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json index e00a4d7ca8..84fe0fa3d9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @CORE One", + "name": "Generic ASA @Prusa CORE One", "inherits": "fdm_filament_asa", + "renamed_from": "Prusa Generic ASA @CORE One;Prusa Generic ASA CORE One", "from": "system", - "setting_id": "Pg9KDqFB63PFJo3Q", - "filament_id": "OFoJcr46", + "setting_id": "Q7fgojkHRZI0floy", + "filament_id": "OFLPAxz3", "instantiation": "true", "chamber_temperature": [ "40" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.25.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.25.json index 088221b03a..8aeaefd5c8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MINIIS 0.25", + "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", "from": "system", - "setting_id": "oLhpDGV7BIMFqZZq", - "filament_id": "OFoJcr46", + "setting_id": "3k53bfrhLAnuxHQo", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.6.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.6.json index d11f2f2dd6..46cf4ee835 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MINIIS 0.6", + "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", "from": "system", - "setting_id": "CN91PnsqqI5CTRhd", - "filament_id": "OFoJcr46", + "setting_id": "NMILNvvq88zkz2Lf", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.8.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.8.json index 2eae500425..2e96b0d886 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MINIIS 0.8", + "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", "from": "system", - "setting_id": "Mg0Sh8QULakXYt0m", - "filament_id": "OFoJcr46", + "setting_id": "lnjqcRttOW0XRGe2", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS.json similarity index 80% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS.json index 2d969f15be..add2390249 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MINIIS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MINIIS", + "name": "Generic ASA @Prusa MINIIS", "inherits": "fdm_filament_asa", + "renamed_from": "Prusa Generic ASA @MINIIS;Prusa Generic ASA MINIIS", "from": "system", - "setting_id": "StIz1ZclM5WV6MCC", - "filament_id": "OFoJcr46", + "setting_id": "53FptNgFYqTPZfkV", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.25.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.25.json index 5888bf67d4..ddf9c2d380 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK3.5 0.25", + "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", "from": "system", - "setting_id": "EVFkOOWqYWkUZRQG", - "filament_id": "OFoJcr46", + "setting_id": "zyUCfzPlsqRZiUvj", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.6.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.6.json index b467748041..0bcbf559e4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK3.5 0.6", + "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", "from": "system", - "setting_id": "LW2yi7y86rJ59LMi", - "filament_id": "OFoJcr46", + "setting_id": "AjpsLZCJaPLfpGdv", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.8.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.8.json index 7330692d37..2ca5decddd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK3.5 0.8", + "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", "from": "system", - "setting_id": "5iwLdW6pq5Y4Aziw", - "filament_id": "OFoJcr46", + "setting_id": "UwiRVbIWfsSjXcwV", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5.json index 4f1717860a..61eed484a1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK3.5", + "name": "Generic ASA @Prusa MK3.5", "inherits": "fdm_filament_asa", + "renamed_from": "Prusa Generic ASA @MK3.5;Prusa Generic ASA MK3.5", "from": "system", - "setting_id": "UaLDui75hljyKAkI", - "filament_id": "OFoJcr46", + "setting_id": "BA46zZsxlvH5bdbC", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4.json similarity index 86% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK4.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK4.json index f3d8a91378..bf6998903d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK4", + "name": "Generic ASA @Prusa MK4", "inherits": "fdm_filament_asa", + "renamed_from": "Prusa Generic ASA @MK4;Prusa Generic ASA MK4", "from": "system", - "setting_id": "ubNQKQ8Ex6khEWaI", - "filament_id": "OFoJcr46", + "setting_id": "3HdBZTnRTu6aKN1e", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.93" 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 new file mode 100644 index 0000000000..15d5cb17a8 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.6.json @@ -0,0 +1,15 @@ +{ + "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", + "from": "system", + "setting_id": "gtPmGmeYUKi7hwVI", + "filament_id": "OFLPAxz3", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "nozzle_temperature": "255", + "slow_down_layer_time": "15" +} 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 new file mode 100644 index 0000000000..5af8faecb8 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S 0.8.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "a0IXdYic1FVnKaJg", + "filament_id": "OFLPAxz3", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.8 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15", + "slow_down_layer_time": "18" +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.4.json similarity index 72% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.4.json index a9a784f496..033ca2b942 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK4S HF0.4", - "inherits": "Prusa Generic ASA @MK4S", + "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", "from": "system", - "setting_id": "na3FnleO5uhDF7Yr", - "filament_id": "OFoJcr46", + "setting_id": "INXVBsLNAkRQUlPU", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" 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 new file mode 100644 index 0000000000..fe96876ce6 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.5.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "g7VYJJrBS9mmbJOi", + "filament_id": "OFLPAxz3", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "filament_max_volumetric_speed": [ + "27" + ] +} 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 new file mode 100644 index 0000000000..56c2ff76e0 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.6.json @@ -0,0 +1,18 @@ +{ + "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", + "from": "system", + "setting_id": "yDj1rzyRIOYJM4Pp", + "filament_id": "OFLPAxz3", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15", + "filament_max_volumetric_speed": [ + "34" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.8.json similarity index 58% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.8.json index f0b377c8d1..be3eeb1fe4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S HF0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK4S HF0.8", - "inherits": "Prusa Generic ASA @MK4S HF0.4", + "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", "from": "system", - "setting_id": "VDDgOXq5iphlyQ5U", - "filament_id": "OFoJcr46", + "setting_id": "HF59RnyQo2wt5act", + "filament_id": "OFLPAxz3", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S.json index 75c3dcc399..80ba2d523b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa MK4S.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA @MK4S", + "name": "Generic ASA @Prusa MK4S", "inherits": "fdm_filament_asa", + "renamed_from": "Prusa Generic ASA @MK4S;Prusa Generic ASA MK4S", "from": "system", - "setting_id": "5BZ0OsiwFPYGCcBg", - "filament_id": "OFoJcr46", + "setting_id": "THc7WYsGi7nwc5wv", + "filament_id": "OFLPAxz3", "instantiation": "true", "close_fan_the_first_x_layers": "4", "compatible_printers": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa.json similarity index 88% rename from resources/profiles/Prusa/filament/Prusa Generic ASA.json rename to resources/profiles/Prusa/filament/Generic ASA @Prusa.json index 3bc0c0fd69..19d7553977 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA", + "name": "Generic ASA @Prusa", "inherits": "fdm_filament_asa", + "renamed_from": "Prusa Generic ASA", "from": "system", - "setting_id": "i5Zm7qbFAtsgG4mF", - "filament_id": "OFoJcr46", + "setting_id": "Uff8hd9OkoS2Yly7", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.6.json similarity index 76% rename from resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.6.json index 1dda0e52e2..a8806ff0c6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ASA HF @MINIIS 0.6", - "inherits": "Prusa Generic ASA HF @base", + "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", "from": "system", - "setting_id": "uf2mhiPodkiOu8Ui", + "setting_id": "Xswtt3GpBabtxN4h", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.8.json similarity index 76% rename from resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.8.json index b3d9bad889..cceae0087a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ASA HF @MINIIS 0.8", - "inherits": "Prusa Generic ASA HF @base", + "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", "from": "system", - "setting_id": "GMfOVAhKgKoiGZH5", + "setting_id": "z13Q2CqpzsnazYwI", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS.json similarity index 77% rename from resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS.json index 68ade52513..4a9bb2b877 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic ASA HF @MINIIS", - "inherits": "Prusa Generic ASA HF @base", + "name": "Generic ASA HF @Prusa MINIIS", + "inherits": "Generic ASA HF @Prusa base", + "renamed_from": "Prusa Generic ASA HF @MINIIS;Prusa Generic ASA HF MINIIS", "from": "system", - "setting_id": "o8mGAPApXYWIvPhm", + "setting_id": "zzMFtHrjmImnj77f", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.6.json similarity index 77% rename from resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.6.json index 3a6e047baa..e62013867c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA HF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "TwgQePxtpUic69Yw", - "filament_id": "OFK4LdYI", + "setting_id": "lhsnnKDQp3U8enP3", + "filament_id": "OFzRtFM9", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.8.json similarity index 77% rename from resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.8.json index 9d2bce435d..74d0b8a4dc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA HF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "TC1QAhU8v7mruXHK", - "filament_id": "OFK4LdYI", + "setting_id": "Qb9bphdgmmLKHgnC", + "filament_id": "OFzRtFM9", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5.json index f0d0395d78..b5675c32a0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic ASA HF @MK3.5", + "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", "from": "system", - "setting_id": "1s3xgWuvTP6UvMG7", - "filament_id": "OFK4LdYI", + "setting_id": "C9YvhnKeHonpemK8", + "filament_id": "OFzRtFM9", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa base.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json rename to resources/profiles/Prusa/filament/Generic ASA HF @Prusa base.json index 6dc6096675..8b6262282d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA HF @base.json +++ b/resources/profiles/Prusa/filament/Generic ASA HF @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic ASA HF @base", + "name": "Generic ASA HF @Prusa base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "OFK4LdYI", + "filament_id": "OFzRtFM9", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json b/resources/profiles/Prusa/filament/Generic FLEX @Prusa XL 5T.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json rename to resources/profiles/Prusa/filament/Generic FLEX @Prusa XL 5T.json index dcf3793661..c0501006d2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json +++ b/resources/profiles/Prusa/filament/Generic FLEX @Prusa XL 5T.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic FLEX @XL 5T", + "name": "Generic FLEX @Prusa XL 5T", "inherits": "fdm_filament_flex", + "renamed_from": "Prusa Generic FLEX @XL 5T;Prusa Generic FLEX XL 5T", "from": "system", - "setting_id": "PaXKTb31IFVovWiK", - "filament_id": "OFl2SXmv", + "setting_id": "ef8fSryRYselyr4G", + "filament_id": "OFbPuPKY", "instantiation": "true", "filament_loading_speed_start": "3", "filament_loading_speed": "28", diff --git a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json b/resources/profiles/Prusa/filament/Generic FLEX @Prusa XL.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json rename to resources/profiles/Prusa/filament/Generic FLEX @Prusa XL.json index 7231531ee2..ea56f3a8b5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json +++ b/resources/profiles/Prusa/filament/Generic FLEX @Prusa XL.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic FLEX @XL", + "name": "Generic FLEX @Prusa XL", "inherits": "fdm_filament_flex", + "renamed_from": "Prusa Generic FLEX @XL;Prusa Generic FLEX XL", "from": "system", - "setting_id": "b5AA45MlL14moY71", - "filament_id": "OFl2SXmv", + "setting_id": "qrFWrwgQSXgU7oCb", + "filament_id": "OFbPuPKY", "instantiation": "true", "filament_loading_speed_start": "3", "filament_loading_speed": "28", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.25.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.25.json index a74492d2aa..f887a7caca 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.25.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA @MINIIS 0.25", - "inherits": "Prusa Generic PA @base", + "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", "from": "system", - "setting_id": "tGSqS5YX8FXkVAKa", + "setting_id": "zONIDmAy6bC6rkBd", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.6.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.6.json index a28f3eedf0..fce5c4f837 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA @MINIIS 0.6", - "inherits": "Prusa Generic PA @base", + "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", "from": "system", - "setting_id": "u3ZeKEiAwme06ioU", + "setting_id": "Ib0bThHzZ0GXWgXv", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.8.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.8.json index cbf0faa16a..35c7df7919 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA @MINIIS 0.8", - "inherits": "Prusa Generic PA @base", + "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", "from": "system", - "setting_id": "nE90oPuU8lRFVBCl", + "setting_id": "WSCkyvdqYKalsLHg", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS.json index c8ff9bf5cb..67e59c92d9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA @MINIIS", - "inherits": "Prusa Generic PA @base", + "name": "Generic PA @Prusa MINIIS", + "inherits": "Generic PA @Prusa base", + "renamed_from": "Prusa Generic PA @MINIIS;Prusa Generic PA MINIIS", "from": "system", - "setting_id": "hda5VGcBTJOFu6B0", + "setting_id": "06VxUw37OfEzaSka", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.25.json similarity index 69% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.25.json index 1a2065a58d..eebbafe187 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA @MK3.5 0.25", + "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", "from": "system", - "setting_id": "4LeqziiUcsZFvsqn", - "filament_id": "OFIy3kLw", + "setting_id": "htgSl4rIQ1smRBy4", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.6.json similarity index 69% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.6.json index 8e67d973c4..6405d18e56 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA @MK3.5 0.6", + "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", "from": "system", - "setting_id": "FoUTZTxQNZRSUZqi", - "filament_id": "OFIy3kLw", + "setting_id": "LPzPJN0XdHVQDEsd", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.8.json similarity index 69% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.8.json index 8a026c1c90..d85d70d810 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA @MK3.5 0.8", + "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", "from": "system", - "setting_id": "7Qe2dHRqSOhsuoPn", - "filament_id": "OFIy3kLw", + "setting_id": "WiO6dm6LbzJxOC9j", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5.json b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5.json similarity index 70% rename from resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5.json index cdea8133e3..f3309fd275 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA @MK3.5", + "name": "Generic PA @Prusa MK3.5", "inherits": "fdm_filament_pa", + "renamed_from": "Prusa Generic PA @MK3.5;Prusa Generic PA MK3.5", "from": "system", - "setting_id": "HIOtwj2ImWrlXkld", - "filament_id": "OFIy3kLw", + "setting_id": "YfGmmjqpxHcDcRsk", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Anker/filament/Anker Generic PA @base.json b/resources/profiles/Prusa/filament/Generic PA @Prusa base.json similarity index 61% rename from resources/profiles/Anker/filament/Anker Generic PA @base.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa base.json index f95b038b25..c74dce0514 100644 --- a/resources/profiles/Anker/filament/Anker Generic PA @base.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Anker Generic PA @base", + "name": "Generic PA @Prusa base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFMgJQCZ", + "filament_id": "OFg8ndtj", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA.json b/resources/profiles/Prusa/filament/Generic PA @Prusa.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic PA.json rename to resources/profiles/Prusa/filament/Generic PA @Prusa.json index b50c329fab..1ebaec2fe2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA.json +++ b/resources/profiles/Prusa/filament/Generic PA @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA", - "inherits": "Prusa Generic PA @base", + "name": "Generic PA @Prusa", + "inherits": "Generic PA @Prusa base", + "renamed_from": "Prusa Generic PA", "from": "system", - "setting_id": "lWO6oNoV0wjzRVja", + "setting_id": "zTnz1NYXoXxIHhRv", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.25.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.25.json index cc78a91ff9..85ae694018 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.25.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MINIIS 0.25", - "inherits": "Prusa Generic PA-CF @base", + "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", "from": "system", - "setting_id": "R9H0mIGTEh4rxRag", + "setting_id": "5OyMl43GFDPQHrx3", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.6.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.6.json index 9cca375d20..e986346eee 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MINIIS 0.6", - "inherits": "Prusa Generic PA-CF @base", + "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", "from": "system", - "setting_id": "qy8b2cQmrhmxfUfm", + "setting_id": "lvYPxwHzVnW29IKZ", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.8.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.8.json index 930599ddf8..1e3dd13b49 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MINIIS 0.8", - "inherits": "Prusa Generic PA-CF @base", + "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", "from": "system", - "setting_id": "PNdZVpjyekMxgAWx", + "setting_id": "LlGpiQAvrrd5bMCs", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS.json index 320eaaccd5..6c59be3227 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MINIIS", - "inherits": "Prusa Generic PA-CF @base", + "name": "Generic PA-CF @Prusa MINIIS", + "inherits": "Generic PA-CF @Prusa base", + "renamed_from": "Prusa Generic PA-CF @MINIIS;Prusa Generic PA-CF MINIIS", "from": "system", - "setting_id": "B2SFfVrYjPnN9rw3", + "setting_id": "AfQLoOulI6zwAZDg", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.25.json similarity index 69% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.25.json index 16fd70bc82..8f0622e2cc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MK3.5 0.25", + "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", "from": "system", - "setting_id": "BjLde5wICEYFSlu1", - "filament_id": "OFfznI0Q", + "setting_id": "15pNQLVuXkSI3zjU", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.6.json similarity index 70% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.6.json index 193dcfe35c..bb6fc654ad 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "XgIsgzltjlTU8ixC", - "filament_id": "OFfznI0Q", + "setting_id": "3ZKi2gcV6LgJwidS", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.8.json similarity index 70% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.8.json index 9cbde53ee4..2ad7d45932 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "b2fjpGuYwbeo7O9K", - "filament_id": "OFfznI0Q", + "setting_id": "Ilehw0Za73eW1Z9v", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5.json similarity index 71% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5.json index b13ab2ddb0..4150a3f625 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @MK3.5", + "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", "from": "system", - "setting_id": "ko8pHTrnZTzz6LyX", - "filament_id": "OFfznI0Q", + "setting_id": "yy2FgYPLARliAAmZ", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa base.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa base.json index 28733da65c..1e5c1936d4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF @base.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Prusa Generic PA-CF @base", + "name": "Generic PA-CF @Prusa base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OFfznI0Q", + "filament_id": "OFQLcbps", "instantiation": "false", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json similarity index 79% rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF.json rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json index ac15c94417..f60463913f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json +++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PA-CF", - "inherits": "Prusa Generic PA-CF @base", + "name": "Generic PA-CF @Prusa", + "inherits": "Generic PA-CF @Prusa base", + "renamed_from": "Prusa Generic PA-CF", "from": "system", - "setting_id": "bptwthfCtglFSoMw", + "setting_id": "R2WthJ8gqw8xdajn", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.25.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.25.json index 37520ad405..4c50bdca0c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MINIIS 0.25", + "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", "from": "system", - "setting_id": "P9dO2M6dPICX7rhQ", - "filament_id": "OF97ru74", + "setting_id": "v5LHPemQZ8fEQJrX", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.6.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.6.json index 2642930cc1..f6e67d5d5e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MINIIS 0.6", + "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", "from": "system", - "setting_id": "uAzPBVsMr6eS1XXS", - "filament_id": "OF97ru74", + "setting_id": "MOLOCn9YKfvHMmOu", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.8.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.8.json index 2a3fe6485b..ecfa0c6fea 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MINIIS 0.8", + "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", "from": "system", - "setting_id": "MZd6zhq1pvhDj6yz", - "filament_id": "OF97ru74", + "setting_id": "eJ9SwUbq1VyHBciM", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS.json index 4a3bb29282..088f2be363 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MINIIS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MINIIS", + "name": "Generic PC @Prusa MINIIS", "inherits": "fdm_filament_pc", + "renamed_from": "Prusa Generic PC @MINIIS;Prusa Generic PC MINIIS", "from": "system", - "setting_id": "H7HoG0RfPLMTnCEo", - "filament_id": "OF97ru74", + "setting_id": "2QWF3WdcbA7ArFgt", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "7" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.25.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.25.json index 8dfcd4ac73..dd823e700d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MK3.5 0.25", + "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", "from": "system", - "setting_id": "365PSnHIwQoBabi7", - "filament_id": "OF97ru74", + "setting_id": "MWiCzFnPAeMCWxHz", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.6.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.6.json index b9ac2b8114..b33d32e71d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MK3.5 0.6", + "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", "from": "system", - "setting_id": "zullllDHKByF2PMu", - "filament_id": "OF97ru74", + "setting_id": "KEgDSg0oQi1SQlst", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.8.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.8.json index 7edc6d5a05..a6fa27ed6d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MK3.5 0.8", + "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", "from": "system", - "setting_id": "TTIxalWBM5b6YTJ0", - "filament_id": "OF97ru74", + "setting_id": "LHNmoFsylIuepyww", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5.json b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5.json index d63eaee60b..1891e65703 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC @MK3.5", + "name": "Generic PC @Prusa MK3.5", "inherits": "fdm_filament_pc", + "renamed_from": "Prusa Generic PC @MK3.5;Prusa Generic PC MK3.5", "from": "system", - "setting_id": "2h9EbPiUgE3BIHVb", - "filament_id": "OF97ru74", + "setting_id": "awF5u8ojSKhvSYud", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC.json b/resources/profiles/Prusa/filament/Generic PC @Prusa.json similarity index 85% rename from resources/profiles/Prusa/filament/Prusa Generic PC.json rename to resources/profiles/Prusa/filament/Generic PC @Prusa.json index fed8a0bb7b..59b97e22e5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC.json +++ b/resources/profiles/Prusa/filament/Generic PC @Prusa.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC", + "name": "Generic PC @Prusa", "inherits": "fdm_filament_pc", + "renamed_from": "Prusa Generic PC", "from": "system", - "setting_id": "51vavWbGjxnBwH7e", - "filament_id": "OF97ru74", + "setting_id": "UJ5KpqIb5mpcNXzl", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.6.json similarity index 58% rename from resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.6.json index e3d400892f..dbd6cb209f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PC HF @MINIIS 0.6", - "inherits": "Prusa Generic PC HF @base", + "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", "from": "system", - "setting_id": "oj7iq8Bsz8lYyoG8", + "setting_id": "W3G94E0IQo6Kaq8G", "instantiation": "true", "filament_max_volumetric_speed": [ "35" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.8.json similarity index 58% rename from resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.8.json index 5965ff9d5d..53bc9b96bd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PC HF @MINIIS 0.8", - "inherits": "Prusa Generic PC HF @base", + "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", "from": "system", - "setting_id": "SK8h5tE5di3YWaJp", + "setting_id": "Fjwchj1gB62f7CUF", "instantiation": "true", "filament_max_volumetric_speed": [ "29" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS.json similarity index 59% rename from resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS.json index b198ed3af4..4d0785504f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PC HF @MINIIS", - "inherits": "Prusa Generic PC HF @base", + "name": "Generic PC HF @Prusa MINIIS", + "inherits": "Generic PC HF @Prusa base", + "renamed_from": "Prusa Generic PC HF @MINIIS;Prusa Generic PC HF MINIIS", "from": "system", - "setting_id": "onMXXnQNjbSimzbW", + "setting_id": "Wodqshgvx38zWaE2", "instantiation": "true", "filament_max_volumetric_speed": [ "24" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.6.json similarity index 62% rename from resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.6.json index 4b5d973cdd..cb2ad5f37c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC HF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "MAtF0WCx6uLte1Bq", - "filament_id": "OFq5QANf", + "setting_id": "Rm7U967jnpk74lPA", + "filament_id": "OFwwAQnA", "instantiation": "true", "filament_max_volumetric_speed": [ "30" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.8.json similarity index 62% rename from resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.8.json index b7729e451f..0f684bcca8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC HF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "Om8P3dn8wY6CbdQg", - "filament_id": "OFq5QANf", + "setting_id": "zFkWWW3PTBvuUWqs", + "filament_id": "OFwwAQnA", "instantiation": "true", "filament_max_volumetric_speed": [ "36" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5.json index 7fdec94c49..aa007446ce 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PC HF @MK3.5", + "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", "from": "system", - "setting_id": "uGi7QoODY99zHuCt", - "filament_id": "OFq5QANf", + "setting_id": "lvbcRP0xEru9jmms", + "filament_id": "OFwwAQnA", "instantiation": "true", "filament_max_volumetric_speed": [ "24" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json b/resources/profiles/Prusa/filament/Generic PC HF @Prusa base.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json rename to resources/profiles/Prusa/filament/Generic PC HF @Prusa base.json index ffce8990b7..131b45ea55 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC HF @base.json +++ b/resources/profiles/Prusa/filament/Generic PC HF @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PC HF @base", + "name": "Generic PC HF @Prusa base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "OFq5QANf", + "filament_id": "OFwwAQnA", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.6.json similarity index 51% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.6.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.6.json index e776e17543..a2f899e88f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @CORE One 0.6", - "inherits": "Prusa Generic PETG @CORE One", + "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", "from": "system", - "setting_id": "plb6gY1isTp10Unr", - "filament_id": "OF1Id239", + "setting_id": "oPWpCDB3p6hQeY2F", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.8.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.8.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.8.json index a0b3bc4299..669cf219fc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @CORE One 0.8", - "inherits": "Prusa Generic PETG @CORE One", + "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", "from": "system", - "setting_id": "WISyN9WbqoZW5bBy", - "filament_id": "OF1Id239", + "setting_id": "OmaayFCLuRLadur0", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json similarity index 74% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.4.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json index d3354152df..6c9ff68c89 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @CORE One HF 0.4", - "inherits": "Prusa Generic PETG @CORE One", + "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", "from": "system", - "setting_id": "hMxEpxx9ERuIq28Z", - "filament_id": "OF1Id239", + "setting_id": "7oUyjvRHLH4bJyX0", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json similarity index 75% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.5.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json index 69c4158297..8784e403ab 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @CORE One HF 0.5", - "inherits": "Prusa Generic PETG @CORE One", + "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", "from": "system", - "setting_id": "HtW04UsVx5VpeLc9", - "filament_id": "OF1Id239", + "setting_id": "6HiIOGURZWwman1l", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json similarity index 73% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.6.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json index c50d2b1cd0..c0eb6a594f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @CORE One HF 0.6", - "inherits": "Prusa Generic PETG @CORE One", + "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", "from": "system", - "setting_id": "29TFTfss7xVear5j", - "filament_id": "OF1Id239", + "setting_id": "KKiug7A9NOQPe1m7", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.8.json similarity index 78% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.8.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.8.json index 91d6a29a9a..99748978bf 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @CORE One HF 0.8", - "inherits": "Prusa Generic PETG @CORE One", + "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", "from": "system", - "setting_id": "N91ct2U3Y3jOat0g", - "filament_id": "OF1Id239", + "setting_id": "vtiAC44hrmtap0Ou", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json similarity index 92% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json index fa5a8d2cd8..a086fb9336 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @CORE One", + "name": "Generic PETG @Prusa CORE One", "inherits": "fdm_filament_pet", + "renamed_from": "Prusa Generic PETG @CORE One;Prusa Generic PETG CORE One", "from": "system", - "setting_id": "VbFWb2QCAMxcrTAW", - "filament_id": "OF1Id239", + "setting_id": "W71PW5bpf7CV16D4", + "filament_id": "OFYPdQJh", "instantiation": "true", "chamber_temperature": [ "35" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.25.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.25.json index 1254f1aede..282048f6a3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.25.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG @MINIIS 0.25", - "inherits": "Prusa Generic PETG @base", + "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", "from": "system", - "setting_id": "u4zA4rasW1vfwG1o", + "setting_id": "lKegAyiWytPNEXH0", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.6.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.6.json index 7e849e01af..40f6d0c685 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG @MINIIS 0.6", - "inherits": "Prusa Generic PETG @base", + "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", "from": "system", - "setting_id": "QJQIAwmRSZW3hNI4", + "setting_id": "7QT1EXl4qKoNBuqz", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.8.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.8.json index 2a943198aa..a578482dc0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG @MINIIS 0.8", - "inherits": "Prusa Generic PETG @base", + "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", "from": "system", - "setting_id": "nXFZVAKBc3hkxbRt", + "setting_id": "zl2HOUtcoIR2dFQH", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS.json similarity index 85% rename from resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS.json index dcb87593dc..5a135dfd2d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG HF @MINIIS", - "inherits": "Prusa Generic PETG HF @base", + "name": "Generic PETG @Prusa MINIIS", + "inherits": "Generic PETG @Prusa base", + "renamed_from": "Prusa Generic PETG @MINIIS;Prusa Generic PETG MINIIS", "from": "system", - "setting_id": "SHIhEzb8wJonmulf", + "setting_id": "COQ9qpnYRGAFRBoq", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" @@ -48,7 +49,7 @@ "85" ], "filament_max_volumetric_speed": [ - "24" + "9" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.25.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.25.json index 940f308232..e338514096 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK3.5 0.25", + "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", "from": "system", - "setting_id": "g5YTLp0ZhzbpCD2h", - "filament_id": "OF1Id239", + "setting_id": "M0vmzxmP3IVIUTuv", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.6.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.6.json index f049544d2f..d57e0fdb3f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK3.5 0.6", + "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", "from": "system", - "setting_id": "6FATkctkE3RaWnWQ", - "filament_id": "OF1Id239", + "setting_id": "OvkhxGhjjRMjwb4C", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.8.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.8.json index ba45f70c00..59e45d94f6 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK3.5 0.8", + "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", "from": "system", - "setting_id": "ITT0YpAms3lzeSBk", - "filament_id": "OF1Id239", + "setting_id": "kZSlkCTdghAi8LFG", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5.json index e456955aae..7d63599c7a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK3.5", + "name": "Generic PETG @Prusa MK3.5", "inherits": "fdm_filament_pet", + "renamed_from": "Prusa Generic PETG @MK3.5;Prusa Generic PETG MK3.5", "from": "system", - "setting_id": "71gokqKp7e6fhhf4", - "filament_id": "OF1Id239", + "setting_id": "6PUbXHNUBfWjVvse", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4.json similarity index 89% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK4.json index f4d8216caa..68f627daa4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK4", - "inherits": "Prusa Generic PETG @base", + "name": "Generic PETG @Prusa MK4", + "inherits": "Generic PETG @Prusa base", + "renamed_from": "Prusa Generic PETG @MK4;Prusa Generic PETG MK4", "from": "system", - "setting_id": "Xk2dCGMzSaT73Gq5", + "setting_id": "ieo6hcpwnV0j76eo", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.6.json similarity index 54% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.6.json index 9b59b93ccf..ddfbb665be 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK4S 0.6", - "inherits": "Prusa Generic PETG @MK4S", + "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", "from": "system", - "setting_id": "Pci5FyYkl7E87APR", - "filament_id": "OF1Id239", + "setting_id": "z5Ys1AU5ujQF9D5U", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.8.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.8.json index 8024185152..8e8fee1973 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK4S 0.8", - "inherits": "Prusa Generic PETG @MK4S", + "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", "from": "system", - "setting_id": "gBfDSTXrnY1HRyw7", - "filament_id": "OF1Id239", + "setting_id": "LKUzA7cbyYL6kxar", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.4.json similarity index 76% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.4.json index 4267889359..ebbdb73717 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK4S HF0.4", - "inherits": "Prusa Generic PETG @MK4S", + "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", "from": "system", - "setting_id": "4pbIJVV1D2h5O3WZ", - "filament_id": "OF1Id239", + "setting_id": "lLapCyweW6Svj7cV", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" 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 new file mode 100644 index 0000000000..e424f13c82 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.5.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "lu9twhsjDkBT1kyn", + "filament_id": "OFYPdQJh", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "filament_max_volumetric_speed": [ + "29" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.6.json similarity index 59% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.6.json index 83a96f3a40..c0d46b3ca1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK4S HF0.6", - "inherits": "Prusa Generic PETG @MK4S HF0.4", + "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", "from": "system", - "setting_id": "tv7OUJ7pSPHTkE89", - "filament_id": "OF1Id239", + "setting_id": "d7ocKzA4YSAit63Z", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.8.json similarity index 61% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.8.json index 85c388ab7d..237c3f116a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S HF0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK4S HF0.8", - "inherits": "Prusa Generic PETG @MK4S HF0.4", + "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", "from": "system", - "setting_id": "wHfH0a2TgTYr9rWF", - "filament_id": "OF1Id239", + "setting_id": "HSBSswxwznxDClK5", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S.json similarity index 92% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S.json index ff70f3d63e..b7bbc6094e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa MK4S.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG @MK4S", + "name": "Generic PETG @Prusa MK4S", "inherits": "fdm_filament_pet", + "renamed_from": "Prusa Generic PETG @MK4S;Prusa Generic PETG MK4S", "from": "system", - "setting_id": "IGfvc0jGdG6evRj8", - "filament_id": "OF1Id239", + "setting_id": "t3ZCKWVct5d69cb8", + "filament_id": "OFYPdQJh", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.25 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa XL 5T.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa XL 5T.json index 4babb91e3f..9f70295142 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL 5T.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa XL 5T.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG @XL 5T", - "inherits": "Prusa Generic PETG @base", + "name": "Generic PETG @Prusa XL 5T", + "inherits": "Generic PETG @Prusa base", + "renamed_from": "Prusa Generic PETG @XL 5T;Prusa Generic PETG XL 5T", "from": "system", - "setting_id": "FbtB9og6yXm2ZktD", + "setting_id": "DNJECSjW6zKYALxE", "instantiation": "true", "nozzle_temperature_intial_layer": "230", "nozzle_temperature": "240", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa XL.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa XL.json index 793b97e290..0cdcbfc1c4 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa XL.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG @XL", - "inherits": "Prusa Generic PETG @base", + "name": "Generic PETG @Prusa XL", + "inherits": "Generic PETG @Prusa base", + "renamed_from": "Prusa Generic PETG @XL;Prusa Generic PETG XL", "from": "system", - "setting_id": "SQKcHBt6A4D8PwFZ", + "setting_id": "8vcNv4b4H7aYA01G", "instantiation": "true", "nozzle_temperature_intial_layer": "230", "nozzle_temperature": "240", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa base.json similarity index 61% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @base.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa base.json index 5ed73792e2..c5b0abf34f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @base.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PETG @base", + "name": "Generic PETG @Prusa base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OF1Id239", + "filament_id": "OFYPdQJh", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic PETG.json rename to resources/profiles/Prusa/filament/Generic PETG @Prusa.json index db17c39162..6881507204 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG", - "inherits": "Prusa Generic PETG @base", + "name": "Generic PETG @Prusa", + "inherits": "Generic PETG @Prusa base", + "renamed_from": "Prusa Generic PETG", "from": "system", - "setting_id": "b55Rd5kKGP1A3BM2", + "setting_id": "Vwc0owmwoEYrLhuU", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.6.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.6.json index da8b0f68e5..e8de400490 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG HF @MINIIS 0.6", - "inherits": "Prusa Generic PETG HF @base", + "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", "from": "system", - "setting_id": "tt7C6k90F51Q17NL", + "setting_id": "nF8YzRMvaT4D8LBD", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.8.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.8.json index c8eb08ef87..adc5401268 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG HF @MINIIS 0.8", - "inherits": "Prusa Generic PETG HF @base", + "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", "from": "system", - "setting_id": "hivI3u5bpGKEJuPR", + "setting_id": "7itUjrAu9Oj9hxiU", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS.json index 49d8e83444..9148f5e849 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PETG @MINIIS", - "inherits": "Prusa Generic PETG @base", + "name": "Generic PETG HF @Prusa MINIIS", + "inherits": "Generic PETG HF @Prusa base", + "renamed_from": "Prusa Generic PETG HF @MINIIS;Prusa Generic PETG HF MINIIS", "from": "system", - "setting_id": "nXB864FJ4Dbz5oXc", + "setting_id": "dPNOryBcrviemefo", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" @@ -48,7 +49,7 @@ "85" ], "filament_max_volumetric_speed": [ - "9" + "24" ], "enable_pressure_advance": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.6.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.6.json index 63f9742402..71481537b1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG HF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "Hw54qxSSdBrcOr4r", - "filament_id": "OFOKYhi6", + "setting_id": "YqVidH7m1HXR3hHZ", + "filament_id": "OF7lOgYF", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.8.json similarity index 81% rename from resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.8.json index e3401a666b..5dffe82d0b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG HF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "txhzOPQmzVqkcdnP", - "filament_id": "OFOKYhi6", + "setting_id": "vfR067tK5WsrE4pw", + "filament_id": "OF7lOgYF", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5.json index 1f63b82d0b..e343519efd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PETG HF @MK3.5", + "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", "from": "system", - "setting_id": "OjIQqC3uJdpcLqlG", - "filament_id": "OFOKYhi6", + "setting_id": "grvZIUU79fxDOa3O", + "filament_id": "OF7lOgYF", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa base.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json rename to resources/profiles/Prusa/filament/Generic PETG HF @Prusa base.json index 002c80fe6d..c15595a97c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG HF @base.json +++ b/resources/profiles/Prusa/filament/Generic PETG HF @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PETG HF @base", + "name": "Generic PETG HF @Prusa base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFOKYhi6", + "filament_id": "OF7lOgYF", "instantiation": "false" } 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 new file mode 100644 index 0000000000..2e2f9275d4 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json @@ -0,0 +1,19 @@ +{ + "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", + "from": "system", + "setting_id": "IkmLxDwrdRkacHWw", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One 0.6 nozzle" + ], + "nozzle_temperature": [ + "210" + ], + "slow_down_layer_time": [ + "15" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.8.json similarity index 51% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.8.json index c710474420..cfe88119de 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @CORE One 0.8", - "inherits": "Prusa Generic PLA @CORE One", + "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", "from": "system", - "setting_id": "qlG6J2sXs80HpkCl", - "filament_id": "OFiCHnso", + "setting_id": "aBengWdqRXg9i2sx", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json similarity index 73% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.4.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json index 5a38ba93f3..c0969904c7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @CORE One HF 0.4", - "inherits": "Prusa Generic PLA @CORE One", + "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", "from": "system", - "setting_id": "KzpBU6cAAqm7z0Sg", - "filament_id": "OFiCHnso", + "setting_id": "vniEPaoyABoAfLFa", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json similarity index 74% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.5.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json index 1935f27062..5d6e9fcba2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @CORE One HF 0.5", - "inherits": "Prusa Generic PLA @CORE One", + "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", "from": "system", - "setting_id": "2G99enCGyOVjrOlt", - "filament_id": "OFiCHnso", + "setting_id": "NPEs4gtBlKWupYZX", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json similarity index 75% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json index b47613e7d1..6575aebf8d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @CORE One HF 0.6", - "inherits": "Prusa Generic PLA @CORE One", + "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", "from": "system", - "setting_id": "iNQhrPrIj4GphWxI", - "filament_id": "OFiCHnso", + "setting_id": "SnfULjrWGCiA7ljq", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.8.json similarity index 75% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.8.json index a3b5df42d8..64471ba72b 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @CORE One HF 0.8", - "inherits": "Prusa Generic PLA @CORE One", + "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", "from": "system", - "setting_id": "YIm5w8btcXZqnNFB", - "filament_id": "OFiCHnso", + "setting_id": "ZsIuxJUaBzoeWPDv", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa CORE One HF 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json similarity index 92% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json index 1f65998039..9bc9e086b0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @CORE One", + "name": "Generic PLA @Prusa CORE One", "inherits": "fdm_filament_pla", + "renamed_from": "Prusa Generic PLA @CORE One;Prusa Generic PLA CORE One", "from": "system", - "setting_id": "NDBqFGNNvKxlmo3V", - "filament_id": "OFiCHnso", + "setting_id": "r2i4c7DsYXYIMVCX", + "filament_id": "OFDSrzZ8", "instantiation": "true", "chamber_temperature": [ "20" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.25.json similarity index 62% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.25.json index 73ce7b1606..3682a6fcb0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.25.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA @MINIIS 0.25", - "inherits": "Prusa Generic PLA @base", + "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", "from": "system", - "setting_id": "GOomDjqbF1CGAy8O", + "setting_id": "t7jm6WSfRqsdSZfz", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.6.json similarity index 62% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.6.json index 437eeeb6b8..ae982f46bc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA @MINIIS 0.6", - "inherits": "Prusa Generic PLA @base", + "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", "from": "system", - "setting_id": "rKRRhdLk0Heg3slz", + "setting_id": "hWk01xYl6gu41B4w", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.8.json similarity index 62% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.8.json index cd95805fb3..8a5897d741 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA @MINIIS 0.8", - "inherits": "Prusa Generic PLA @base", + "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", "from": "system", - "setting_id": "XC2NBSQXjiKIXnTi", + "setting_id": "6A9NivZl5nMpNfsz", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS.json index 5f3c8f9bb4..cf2adda390 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA @MINIIS", - "inherits": "Prusa Generic PLA @base", + "name": "Generic PLA @Prusa MINIIS", + "inherits": "Generic PLA @Prusa base", + "renamed_from": "Prusa Generic PLA @MINIIS;Prusa Generic PLA MINIIS", "from": "system", - "setting_id": "GUG6Ug0cZt0gs2Z2", + "setting_id": "3bPlO5U5udlu8eVv", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.25.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.25.json index ab3b9413ae..b3f84dc4e1 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK3.5 0.25", + "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", "from": "system", - "setting_id": "mQtIWbOJ2a4TMYxU", - "filament_id": "OFiCHnso", + "setting_id": "IJsZsvdG7N8uwobX", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.6.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.6.json index 9d239a47fd..49d75d5e31 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK3.5 0.6", + "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", "from": "system", - "setting_id": "lSbYoT83cp2tQjk3", - "filament_id": "OFiCHnso", + "setting_id": "YLx95teMRy5UQWKN", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.8.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.8.json index e77aa1edf0..6590e43c17 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK3.5 0.8", + "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", "from": "system", - "setting_id": "kZuzkEvYEluqlAfM", - "filament_id": "OFiCHnso", + "setting_id": "bZ42VSqIaJlri1VH", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5.json index d211b1fed2..058e05e99e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK3.5", + "name": "Generic PLA @Prusa MK3.5", "inherits": "fdm_filament_pla", + "renamed_from": "Prusa Generic PLA @MK3.5;Prusa Generic PLA MK3.5", "from": "system", - "setting_id": "ojwcK3bKU2Jyosws", - "filament_id": "OFiCHnso", + "setting_id": "5tDjTVPzE0lIEReK", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4.json similarity index 87% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4.json index 22f8bb274c..e7cc5df0d8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4", - "inherits": "Prusa Generic PLA @base", + "name": "Generic PLA @Prusa MK4", + "inherits": "Generic PLA @Prusa base", + "renamed_from": "Prusa Generic PLA @MK4;Prusa Generic PLA MK4", "from": "system", - "setting_id": "1aLBPgVpr7XZmmX6", + "setting_id": "cBqjSJcxcXvS8sY0", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.6.json similarity index 50% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.6.json index d6915f476d..bcc0847385 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4S 0.6", - "inherits": "Prusa Generic PLA @MK4S", + "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", "from": "system", - "setting_id": "6pZohvVY1eUGi2k8", - "filament_id": "OFiCHnso", + "setting_id": "vLeTzdoXExkeNSdX", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.8.json similarity index 57% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.8.json index 07b15552df..e574ce49a5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4S 0.8", - "inherits": "Prusa Generic PLA @MK4S", + "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", "from": "system", - "setting_id": "8z66T4ABcY8PLJMB", - "filament_id": "OFiCHnso", + "setting_id": "6fyFsevbPLYfgZRb", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.4.json similarity index 75% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.4.json index 39f7d1b020..10e37500a8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.4.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.4.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4S HF0.4", - "inherits": "Prusa Generic PLA @MK4S", + "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", "from": "system", - "setting_id": "LV8qQ1t2CmhHaRSA", - "filament_id": "OFiCHnso", + "setting_id": "BFvt90DhCobphEF9", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.5.json similarity index 50% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.5.json index 97235be213..ec1efb5aad 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4S HF0.5", - "inherits": "Prusa Generic PLA @MK4S HF0.4", + "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", "from": "system", - "setting_id": "WH3bJGQGSliMx6ta", - "filament_id": "OFiCHnso", + "setting_id": "IDv2UUR8EH7AVUIA", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.5 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.6.json similarity index 53% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.6.json index a90a033338..8ce85314dd 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4S HF0.6", - "inherits": "Prusa Generic PLA @MK4S HF0.4", + "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", "from": "system", - "setting_id": "du6Gy8TCxk5z7hPx", - "filament_id": "OFiCHnso", + "setting_id": "t7cAPFNPWmeHBeuD", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.6 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.8.json similarity index 55% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.8.json index 4d381eab0a..968bf56356 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S HF0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S HF0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4S HF0.8", - "inherits": "Prusa Generic PLA @MK4S HF0.4", + "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", "from": "system", - "setting_id": "aLcAkl8Zt2D5lOTp", - "filament_id": "OFiCHnso", + "setting_id": "t1a58q4l6Xo6kKCC", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa MK4S HF0.8 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S.json index 9d35c362fa..a847cf8334 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @MK4S.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa MK4S.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA @MK4S", + "name": "Generic PLA @Prusa MK4S", "inherits": "fdm_filament_pla", + "renamed_from": "Prusa Generic PLA @MK4S;Prusa Generic PLA MK4S", "from": "system", - "setting_id": "CqlMmArE8Llbji7t", - "filament_id": "OFiCHnso", + "setting_id": "lsjHMlvwZzImWgek", + "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.25 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa XL 5T.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa XL 5T.json index 2d149b8b7b..6dbefec6be 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL 5T.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa XL 5T.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA @XL 5T", - "inherits": "Prusa Generic PLA @base", + "name": "Generic PLA @Prusa XL 5T", + "inherits": "Generic PLA @Prusa base", + "renamed_from": "Prusa Generic PLA @XL 5T;Prusa Generic PLA XL 5T", "from": "system", - "setting_id": "orBUSq1sDBeMGMON", + "setting_id": "wDxtZLt5J2JODMBq", "instantiation": "true", "nozzle_temperature_intial_layer": "215", "nozzle_temperature": "210", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa XL.json similarity index 90% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa XL.json index 3206f6f3c5..ff8f343b41 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa XL.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA @XL", - "inherits": "Prusa Generic PLA @base", + "name": "Generic PLA @Prusa XL", + "inherits": "Generic PLA @Prusa base", + "renamed_from": "Prusa Generic PLA @XL;Prusa Generic PLA XL", "from": "system", - "setting_id": "tGG7egsphB0I1i6Z", + "setting_id": "27u5AiklUhmExsys", "instantiation": "true", "nozzle_temperature_intial_layer": "215", "nozzle_temperature": "210", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa base.json similarity index 61% rename from resources/profiles/Prusa/filament/Prusa Generic PLA @base.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa base.json index 4aaa66dd9e..7246d710ab 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @base.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PLA @base", + "name": "Generic PLA @Prusa base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFiCHnso", + "filament_id": "OFDSrzZ8", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa.json similarity index 87% rename from resources/profiles/Prusa/filament/Prusa Generic PLA.json rename to resources/profiles/Prusa/filament/Generic PLA @Prusa.json index a2f1521fec..83951fb4ab 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA", - "inherits": "Prusa Generic PLA @base", + "name": "Generic PLA @Prusa", + "inherits": "Generic PLA @Prusa base", + "renamed_from": "Prusa Generic PLA", "from": "system", - "setting_id": "pKHhR3Hx6AUoyIO3", + "setting_id": "SBviEhhXcdsIwj0y", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.6.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.6.json index 6b9f364da7..56c2e823b0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA HF @MINIIS 0.6", - "inherits": "Prusa Generic PLA HF @base", + "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", "from": "system", - "setting_id": "A6tgkt5mCN7hFzoU", + "setting_id": "eqBN6ykUB4csEMCR", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.8.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.8.json index b4a25d21a1..be0722c134 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA HF @MINIIS 0.8", - "inherits": "Prusa Generic PLA HF @base", + "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", "from": "system", - "setting_id": "3MSF1ZEw3D7bVhEI", + "setting_id": "FuCHQFBuP9yLUzT0", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS.json similarity index 62% rename from resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS.json index 243b69a393..656c756e6d 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA HF @MINIIS", - "inherits": "Prusa Generic PLA HF @base", + "name": "Generic PLA HF @Prusa MINIIS", + "inherits": "Generic PLA HF @Prusa base", + "renamed_from": "Prusa Generic PLA HF @MINIIS;Prusa Generic PLA HF MINIIS", "from": "system", - "setting_id": "eVuV41lUXe9SEmeh", + "setting_id": "cQJUt7LR5hkKT0Za", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.6.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.6.json index a75d98c47f..41dce0b5ed 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA HF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "IHOsyOhMvOcpHGtG", - "filament_id": "OFl4ItvQ", + "setting_id": "5vgrugarZSgMZ6FT", + "filament_id": "OFZr862X", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.8.json similarity index 65% rename from resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.8.json index c7f2c480be..b6af02d8fb 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA HF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "GYne0LPI8ooQJe08", - "filament_id": "OFl4ItvQ", + "setting_id": "CM3EYkpRcWwsw7KB", + "filament_id": "OFZr862X", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5.json index c1366194ec..46ed4d0752 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA HF @MK3.5", + "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", "from": "system", - "setting_id": "Bq51JVrGGEktAqIh", - "filament_id": "OFl4ItvQ", + "setting_id": "4N82rUxi9Bbm2Cdd", + "filament_id": "OFZr862X", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa base.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json rename to resources/profiles/Prusa/filament/Generic PLA HF @Prusa base.json index fffecfd0e1..aaf85ff4a7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA HF @base.json +++ b/resources/profiles/Prusa/filament/Generic PLA HF @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PLA HF @base", + "name": "Generic PLA HF @Prusa base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFl4ItvQ", + "filament_id": "OFZr862X", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json similarity index 52% rename from resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json index b974aa2fec..aeeba4d5ee 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA Silk @CORE One 0.6", - "inherits": "Prusa Generic PLA Silk @CORE One", + "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", "from": "system", - "setting_id": "QUaunbCOoBxA8fyJ", - "filament_id": "OFHFZ1Te", + "setting_id": "nBWqKjSKw2UEAmkv", + "filament_id": "OFesA6rF", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", 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 new file mode 100644 index 0000000000..82e3840d37 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.8.json @@ -0,0 +1,20 @@ +{ + "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", + "from": "system", + "setting_id": "a2KWbhOMQrFTkAZh", + "filament_id": "OFesA6rF", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One 0.8 nozzle", + "Prusa CORE One HF 0.8 nozzle" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "17" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json similarity index 91% rename from resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One.json rename to resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json index 1d39e71aaa..c11965fc72 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA Silk @CORE One", + "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", "from": "system", - "setting_id": "CYztrVFVOPD3RHJx", - "filament_id": "OFHFZ1Te", + "setting_id": "F9lNHyhZwZi7aD74", + "filament_id": "OFesA6rF", "instantiation": "true", "chamber_temperature": [ "20" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.6.json similarity index 55% rename from resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.6.json index 506f82f3ea..82413605dc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA Silk @MK4S 0.6", - "inherits": "Prusa Generic PLA Silk @MK4S", + "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", "from": "system", - "setting_id": "e1pUu3Y5pDr7LzNu", - "filament_id": "OFHFZ1Te", + "setting_id": "lWYrhnu1MUizrdOB", + "filament_id": "OFesA6rF", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.8.json similarity index 54% rename from resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.8.json index 6c57e0486e..e94cbdf57a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA Silk @MK4S 0.8", - "inherits": "Prusa Generic PLA Silk @MK4S", + "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", "from": "system", - "setting_id": "Yw5uZEeqmR9elIn6", - "filament_id": "OFHFZ1Te", + "setting_id": "cyBdMwJ5sAZcQ7wP", + "filament_id": "OFesA6rF", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json rename to resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S.json index 3585355a12..9a3830fd4a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa MK4S.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA Silk @MK4S", - "inherits": "Prusa Generic PLA @MK4S", + "name": "Generic PLA Silk @Prusa MK4S", + "inherits": "Generic PLA @Prusa MK4S", + "renamed_from": "Prusa Generic PLA Silk @MK4S;Prusa Generic PLA Silk MK4S", "from": "system", - "setting_id": "ngtF8hwv8cSubcR1", - "filament_id": "OFHFZ1Te", + "setting_id": "9VQ1YVv9EZexIUoF", + "filament_id": "OFesA6rF", "instantiation": "true", "compatible_printers": [ "Prusa MK4S 0.25 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.25.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.25.json index 1e95879fdf..9432c36087 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.25.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MINIIS 0.25", - "inherits": "Prusa Generic PLA-CF @base", + "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", "from": "system", - "setting_id": "Sv0IcpOJBk95F94d", + "setting_id": "uQJghHEl91slhmEP", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.6.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.6.json index 3736da09d7..7900e25ab2 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MINIIS 0.6", - "inherits": "Prusa Generic PLA-CF @base", + "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", "from": "system", - "setting_id": "tKAu2YX7WADQuJqv", + "setting_id": "nZEIrx6XaOFsNyHS", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.8.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.8.json index 83c781352d..97db4345c8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MINIIS 0.8", - "inherits": "Prusa Generic PLA-CF @base", + "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", "from": "system", - "setting_id": "dHVVnfZSJ6xEgzdQ", + "setting_id": "A3VUqeRysd3c5Txq", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS.json index 4cb69a99ec..4c08a4b23c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MINIIS", - "inherits": "Prusa Generic PLA-CF @base", + "name": "Generic PLA-CF @Prusa MINIIS", + "inherits": "Generic PLA-CF @Prusa base", + "renamed_from": "Prusa Generic PLA-CF @MINIIS;Prusa Generic PLA-CF MINIIS", "from": "system", - "setting_id": "VESr5xWPvPIlhyKh", + "setting_id": "cNZereL1ltFYG5FZ", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.25.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.25.json index 5a660705a7..436bf22209 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MK3.5 0.25", + "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", "from": "system", - "setting_id": "Pi3x8Wj5sdB7TDDK", - "filament_id": "OFQ7I5vC", + "setting_id": "eID2rl5MlHlkerrQ", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.6.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.6.json index 1b9b06f8f9..db1973c5c8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "vtxoJOj2lc1qxV3H", - "filament_id": "OFQ7I5vC", + "setting_id": "FGXPEP83zLoINOZy", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.8.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.8.json index 5f0619c66c..bfcbcf2dbc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "9gYj4jTP6y4UmR9s", - "filament_id": "OFQ7I5vC", + "setting_id": "TM5JPaNUTlZTiuCe", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5.json similarity index 68% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5.json index 9f8546a1ae..677bbc0d27 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @MK3.5", + "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", "from": "system", - "setting_id": "yQASt4Ej55vgeZAN", - "filament_id": "OFQ7I5vC", + "setting_id": "3qImFrQCon7iUj4c", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa base.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa base.json index 98cb90bcac..552a9139c5 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF @base.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF @base", + "name": "Generic PLA-CF @Prusa base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFQ7I5vC", + "filament_id": "OFWbdGsC", "instantiation": "false", "filament_type": [ "PLA-CF" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json similarity index 82% rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json index d156be1004..c572b9f67c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json +++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PLA-CF", - "inherits": "Prusa Generic PLA-CF @base", + "name": "Generic PLA-CF @Prusa", + "inherits": "Generic PLA-CF @Prusa base", + "renamed_from": "Prusa Generic PLA-CF", "from": "system", - "setting_id": "NqmFeHNZtfNefmvd", + "setting_id": "LIL5n1PzMoaNoJ84", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.25.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.25.json index 4357a8eb1f..f74228304a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.25.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA @MINIIS 0.25", - "inherits": "Prusa Generic PVA @base", + "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", "from": "system", - "setting_id": "B0Dmo1DvtrwBwM7U", + "setting_id": "2TecWVXOXcxW37EN", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.6.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.6.json index bd810e4933..f25c70a70c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA HF @MINIIS 0.6", - "inherits": "Prusa Generic PVA HF @base", + "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", "from": "system", - "setting_id": "4C7OAcG8LVPSTJsh", + "setting_id": "3UTClbjiwrQUCXsV", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.8.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.8.json index a2557cd576..90c4fc2256 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA HF @MINIIS 0.8", - "inherits": "Prusa Generic PVA HF @base", + "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", "from": "system", - "setting_id": "xj6xYUYJ0tAnfgao", + "setting_id": "RKxewqskgDD2DQTk", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS.json similarity index 66% rename from resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS.json index 467f0822bd..99014f18a3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA HF @MINIIS", - "inherits": "Prusa Generic PVA HF @base", + "name": "Generic PVA @Prusa MINIIS", + "inherits": "Generic PVA @Prusa base", + "renamed_from": "Prusa Generic PVA @MINIIS;Prusa Generic PVA MINIIS", "from": "system", - "setting_id": "9MNzR7N4A1k64jne", + "setting_id": "XfJmxNhCJiWTWB9i", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.25.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.25.json similarity index 68% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.25.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.25.json index b0febd6c30..a13990f6c7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.25.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.25.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PVA @MK3.5 0.25", + "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", "from": "system", - "setting_id": "ciRHVEjYNqjT5EsD", - "filament_id": "OFcCzEkS", + "setting_id": "P9y77rdSQsCFcFwr", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.6.json similarity index 68% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.6.json index e6956d6b8f..8854a19282 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PVA @MK3.5 0.6", + "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", "from": "system", - "setting_id": "G8TFM51vPvMbGSbX", - "filament_id": "OFcCzEkS", + "setting_id": "rvSzvHZL6FIiOQV1", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.8.json similarity index 68% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.8.json index af962c0fec..718845dc9a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PVA @MK3.5 0.8", + "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", "from": "system", - "setting_id": "hueUgJutZ71scT6F", - "filament_id": "OFcCzEkS", + "setting_id": "E2sA3y3Cyp0UsQD4", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5.json similarity index 69% rename from resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5.json index 36d34b4946..6e1e1c9381 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PVA HF @MK3.5", + "name": "Generic PVA @Prusa MK3.5", "inherits": "fdm_filament_pva", + "renamed_from": "Prusa Generic PVA @MK3.5;Prusa Generic PVA MK3.5", "from": "system", - "setting_id": "X2k0n055aaG1zc0u", - "filament_id": "OFoT8F7Y", + "setting_id": "UTyXSJox9HVdwfXR", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa base.json similarity index 61% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @base.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa base.json index 3da3125629..8f442bc5b0 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @base.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PVA @base", + "name": "Generic PVA @Prusa base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "OFcCzEkS", + "filament_id": "OFDvXujf", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa.json similarity index 80% rename from resources/profiles/Prusa/filament/Prusa Generic PVA.json rename to resources/profiles/Prusa/filament/Generic PVA @Prusa.json index 260dfb5d01..3ad6ba8337 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA.json +++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA", - "inherits": "Prusa Generic PVA @base", + "name": "Generic PVA @Prusa", + "inherits": "Generic PVA @Prusa base", + "renamed_from": "Prusa Generic PVA", "from": "system", - "setting_id": "yLrgUDS7cr4AkOed", + "setting_id": "uVzUlzHkXz6rH1ml", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.6.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json rename to resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.6.json index 1a4d7c6aa5..f4e03d791f 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.6.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA @MINIIS 0.6", - "inherits": "Prusa Generic PVA @base", + "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", "from": "system", - "setting_id": "yGTFSZeo1sUdCpeO", + "setting_id": "qeWFOMhrKa1yezHw", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.8.json similarity index 63% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json rename to resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.8.json index 7c3a77c52d..e8935f9172 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS 0.8.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA @MINIIS 0.8", - "inherits": "Prusa Generic PVA @base", + "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", "from": "system", - "setting_id": "ISdXFzAcVUj3ZIfQ", + "setting_id": "h0RQ3XME0UFEeZVA", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS.json similarity index 64% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json rename to resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS.json index f6eecea619..a4a131da97 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic PVA @MINIIS", - "inherits": "Prusa Generic PVA @base", + "name": "Generic PVA HF @Prusa MINIIS", + "inherits": "Generic PVA HF @Prusa base", + "renamed_from": "Prusa Generic PVA HF @MINIIS;Prusa Generic PVA HF MINIIS", "from": "system", - "setting_id": "rhZNRY8BNI1TskG2", + "setting_id": "VZcvmjCAtivpMepD", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.6.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.6.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.6.json rename to resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.6.json index 6c1843c3ba..1b78b6b0bc 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PVA HF @MK3.5 0.6", + "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", "from": "system", - "setting_id": "NfhvtCbeYlQ3el2O", - "filament_id": "OFoT8F7Y", + "setting_id": "8R3yU9OjRFBIp1nU", + "filament_id": "OFDwBwO5", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.8.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.8.json similarity index 67% rename from resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.8.json rename to resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.8.json index 9271b3051d..94f635382e 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @MK3.5 0.8.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PVA HF @MK3.5 0.8", + "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", "from": "system", - "setting_id": "J5PBEm3LvfpztfXU", - "filament_id": "OFoT8F7Y", + "setting_id": "OOUVHHPIB95wqeTB", + "filament_id": "OFDwBwO5", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5.json similarity index 68% rename from resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5.json rename to resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5.json index aee4bf78bc..c3749316e9 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic PVA @MK3.5", + "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", "from": "system", - "setting_id": "yaPlNuxryIpkxiOe", - "filament_id": "OFcCzEkS", + "setting_id": "gTh9PfBYkibWdknz", + "filament_id": "OFDwBwO5", "instantiation": "true", "filament_flow_ratio": [ "1" diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa base.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json rename to resources/profiles/Prusa/filament/Generic PVA HF @Prusa base.json index 8a768f844a..bd599d74b3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PVA HF @base.json +++ b/resources/profiles/Prusa/filament/Generic PVA HF @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic PVA HF @base", + "name": "Generic PVA HF @Prusa base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "OFoT8F7Y", + "filament_id": "OFDwBwO5", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.6.json similarity index 51% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.6.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.6.json index 896518c23c..dc68ea318c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.6.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic TPU @CORE One 0.6", - "inherits": "Prusa Generic TPU @CORE One", + "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", "from": "system", - "setting_id": "OulnL3bWrEpRJbgJ", - "filament_id": "OFbenYUK", + "setting_id": "VvvSk3OsXXxyerAX", + "filament_id": "OFgbpcy9", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.8.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.8.json similarity index 51% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.8.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.8.json index 8b270846d0..93b68e0afa 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One 0.8.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One 0.8.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic TPU @CORE One 0.8", - "inherits": "Prusa Generic TPU @CORE One", + "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", "from": "system", - "setting_id": "9fAhdX2hOAnUDn1I", - "filament_id": "OFbenYUK", + "setting_id": "LUUEXi6UUk0Zs5Pf", + "filament_id": "OFgbpcy9", "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.8 nozzle", diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One.json similarity index 90% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One.json index 9b212dd17a..3717f8586a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @CORE One.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic TPU @CORE One", + "name": "Generic TPU @Prusa CORE One", "inherits": "fdm_filament_flex", + "renamed_from": "Prusa Generic TPU @CORE One;Prusa Generic TPU CORE One", "from": "system", - "setting_id": "VR2WfERGWPIWTRha", - "filament_id": "OFbenYUK", + "setting_id": "jsXqf9CeaXCvsrWM", + "filament_id": "OFgbpcy9", "instantiation": "true", "chamber_temperature": [ "30" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MINIIS.json similarity index 87% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa MINIIS.json index e6d596aa4e..85c60e64a8 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic TPU @MINIIS", - "inherits": "Prusa Generic TPU @base", + "name": "Generic TPU @Prusa MINIIS", + "inherits": "Generic TPU @Prusa base", + "renamed_from": "Prusa Generic TPU @MINIIS;Prusa Generic TPU MINIIS", "from": "system", - "setting_id": "TUqkAb8i9HpFdiCy", + "setting_id": "bOai5Ib1dggl5Qlc", "instantiation": "true", "filament_max_volumetric_speed": [ "1.35" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK3.5.json similarity index 87% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa MK3.5.json index b3b017de67..3e72481ea7 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic TPU @MK3.5", + "name": "Generic TPU @Prusa MK3.5", "inherits": "fdm_filament_tpu", + "renamed_from": "Prusa Generic TPU @MK3.5;Prusa Generic TPU MK3.5", "from": "system", - "setting_id": "wfxLtrIAOgG7TKib", - "filament_id": "OFbenYUK", + "setting_id": "j6bDPJnwtsB16yBu", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "1.8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4.json similarity index 62% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa MK4.json index 11753a6232..52c7ebf182 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic TPU @MK4", - "inherits": "Prusa Generic TPU @base", + "name": "Generic TPU @Prusa MK4", + "inherits": "Generic TPU @Prusa base", + "renamed_from": "Prusa Generic TPU @MK4;Prusa Generic TPU MK4", "from": "system", - "setting_id": "9KjaEcwnQA8CsnVy", + "setting_id": "9wL3LAJZ7PyqBVEb", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" 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 new file mode 100644 index 0000000000..4b5399bd89 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.6.json @@ -0,0 +1,17 @@ +{ + "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", + "from": "system", + "setting_id": "XM427EDbbCgt2wNZ", + "filament_id": "OFgbpcy9", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle", + "Prusa MK4S HF0.6 nozzle" + ], + "filament_max_volumetric_speed": [ + "6" + ] +} 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 new file mode 100644 index 0000000000..3a663958f1 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S 0.8.json @@ -0,0 +1,17 @@ +{ + "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", + "from": "system", + "setting_id": "2UPIZFNertdlZ4o2", + "filament_id": "OFgbpcy9", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.8 nozzle", + "Prusa MK4S HF0.8 nozzle" + ], + "filament_max_volumetric_speed": [ + "9" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S.json similarity index 87% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S.json index 7f0ac852ee..75f1895c87 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa MK4S.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic TPU @MK4S", + "name": "Generic TPU @Prusa MK4S", "inherits": "fdm_filament_tpu", + "renamed_from": "Prusa Generic TPU @MK4S;Prusa Generic TPU MK4S", "from": "system", - "setting_id": "JxNaZsG7Y2rQKATV", - "filament_id": "OFbenYUK", + "setting_id": "wdopbtHBnMKC2rhj", + "filament_id": "OFgbpcy9", "instantiation": "true", "close_fan_the_first_x_layers": "3", "compatible_printers": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa base.json similarity index 61% rename from resources/profiles/Prusa/filament/Prusa Generic TPU @base.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa base.json index c0c1bccbb3..7b5668bfff 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @base.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic TPU @base", + "name": "Generic TPU @Prusa base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OFbenYUK", + "filament_id": "OFgbpcy9", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa.json similarity index 71% rename from resources/profiles/Prusa/filament/Prusa Generic TPU.json rename to resources/profiles/Prusa/filament/Generic TPU @Prusa.json index 5f1b953a7c..95048f947c 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU.json +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic TPU", - "inherits": "Prusa Generic TPU @base", + "name": "Generic TPU @Prusa", + "inherits": "Generic TPU @Prusa base", + "renamed_from": "Prusa Generic TPU", "from": "system", - "setting_id": "l9s40Rloq4urv3Y0", + "setting_id": "bmtq13tfalfSTRrO", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MINIIS.json similarity index 86% rename from resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json rename to resources/profiles/Prusa/filament/Generic TPU HF @Prusa MINIIS.json index 2295816502..4c4ab81b42 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MINIIS.json +++ b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MINIIS.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Prusa Generic TPU HF @MINIIS", - "inherits": "Prusa Generic TPU HF @base", + "name": "Generic TPU HF @Prusa MINIIS", + "inherits": "Generic TPU HF @Prusa base", + "renamed_from": "Prusa Generic TPU HF @MINIIS;Prusa Generic TPU HF MINIIS", "from": "system", - "setting_id": "a9fmPCI24EJoJ5OH", + "setting_id": "Jw1UjgrXtYG5rMDt", "instantiation": "true", "filament_max_volumetric_speed": [ "10" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MK3.5.json similarity index 87% rename from resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json rename to resources/profiles/Prusa/filament/Generic TPU HF @Prusa MK3.5.json index b2ac07402c..f958cac588 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @MK3.5.json +++ b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa MK3.5.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Prusa Generic TPU HF @MK3.5", + "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", "from": "system", - "setting_id": "Gfuy9ZSCpJw3Usa6", - "filament_id": "OFU3zwPc", + "setting_id": "W8pYAV5JMW70PKlw", + "filament_id": "OFnT7Qpb", "instantiation": "true", "filament_max_volumetric_speed": [ "8" diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa base.json similarity index 60% rename from resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json rename to resources/profiles/Prusa/filament/Generic TPU HF @Prusa base.json index e08a83c0e6..47b1b82c77 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU HF @base.json +++ b/resources/profiles/Prusa/filament/Generic TPU HF @Prusa base.json @@ -1,8 +1,8 @@ { "type": "filament", - "name": "Prusa Generic TPU HF @base", + "name": "Generic TPU HF @Prusa base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OFU3zwPc", + "filament_id": "OFnT7Qpb", "instantiation": "false" } diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json deleted file mode 100644 index ade8efad81..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.6.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ABS @CORE One 0.6", - "inherits": "Prusa Generic ABS @CORE One", - "from": "system", - "setting_id": "AADElwBWs9fzeAKC", - "filament_id": "OFvGc67v", - "instantiation": "true", - "compatible_printers": [ - "Prusa CORE One 0.6 nozzle" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json deleted file mode 100644 index c6c30a2c6b..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @CORE One 0.8.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ABS @CORE One 0.8", - "inherits": "Prusa Generic ABS @CORE One", - "from": "system", - "setting_id": "QLaQiU2tF5ZFTVjP", - "filament_id": "OFvGc67v", - "instantiation": "true", - "compatible_printers": [ - "Prusa CORE One 0.8 nozzle" - ], - "fan_cooling_layer_time": [ - "40" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json deleted file mode 100644 index dd33eedfa7..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.6.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ABS @MK4S 0.6", - "inherits": "Prusa Generic ABS @MK4S", - "from": "system", - "setting_id": "VVzzIN41B5ADTIeQ", - "filament_id": "OFvGc67v", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S 0.6 nozzle" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json deleted file mode 100644 index 66b27bd6c3..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S 0.8.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ABS @MK4S 0.8", - "inherits": "Prusa Generic ABS @MK4S", - "from": "system", - "setting_id": "4705fRqWWP2GZOK8", - "filament_id": "OFvGc67v", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S 0.8 nozzle" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json deleted file mode 100644 index 74f774bd11..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.5.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ABS @MK4S HF0.5", - "inherits": "Prusa Generic ABS @MK4S HF0.4", - "from": "system", - "setting_id": "bf8ANklVcC0xW1rT", - "filament_id": "OFvGc67v", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S HF0.5 nozzle" - ], - "filament_max_volumetric_speed": [ - "27" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json deleted file mode 100644 index 3c461880c7..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.6.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ABS @MK4S HF0.6", - "inherits": "Prusa Generic ABS @MK4S HF0.4", - "from": "system", - "setting_id": "ZB9vO7AnRqMDCrOy", - "filament_id": "OFvGc67v", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S HF0.6 nozzle" - ], - "filament_max_volumetric_speed": [ - "34" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json deleted file mode 100644 index 4d2d4631d5..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @MK4S HF0.8.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ABS @MK4S HF0.8", - "inherits": "Prusa Generic ABS @MK4S HF0.4", - "from": "system", - "setting_id": "7cx9gZh2vUCR0ELG", - "filament_id": "OFvGc67v", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S HF0.8 nozzle" - ], - "fan_min_speed": "15", - "filament_max_volumetric_speed": [ - "36" - ], - "slow_down_layer_time": "25" -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json deleted file mode 100644 index ce22974fd1..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @CORE One 0.6.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ASA @CORE One 0.6", - "inherits": "Prusa Generic ASA @CORE One", - "from": "system", - "setting_id": "GB4mI21wSfo3jfnQ", - "filament_id": "OFoJcr46", - "instantiation": "true", - "compatible_printers": [ - "Prusa CORE One 0.6 nozzle" - ], - "nozzle_temperature": [ - "255" - ], - "slow_down_layer_time": [ - "15" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json deleted file mode 100644 index cb1eb8f267..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.6.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ASA @MK4S 0.6", - "inherits": "Prusa Generic ASA @MK4S", - "from": "system", - "setting_id": "j5YvdepMw4z29kzr", - "filament_id": "OFoJcr46", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S 0.6 nozzle" - ], - "nozzle_temperature": "255", - "slow_down_layer_time": "15" -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json deleted file mode 100644 index cbacb6e747..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S 0.8.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ASA @MK4S 0.8", - "inherits": "Prusa Generic ASA @MK4S", - "from": "system", - "setting_id": "FtVjP8q0MzM0vr2J", - "filament_id": "OFoJcr46", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S 0.8 nozzle" - ], - "fan_max_speed": "15", - "fan_min_speed": "15", - "slow_down_layer_time": "18" -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json deleted file mode 100644 index 47055f18aa..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.5.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ASA @MK4S HF0.5", - "inherits": "Prusa Generic ASA @MK4S HF0.4", - "from": "system", - "setting_id": "meEXtenGq7N4dWf3", - "filament_id": "OFoJcr46", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S HF0.5 nozzle" - ], - "filament_max_volumetric_speed": [ - "27" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json deleted file mode 100644 index 414315ad65..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic ASA @MK4S HF0.6.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic ASA @MK4S HF0.6", - "inherits": "Prusa Generic ASA @MK4S HF0.4", - "from": "system", - "setting_id": "o0UhIK80Y28KX3AK", - "filament_id": "OFoJcr46", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S HF0.6 nozzle" - ], - "fan_max_speed": "15", - "fan_min_speed": "15", - "filament_max_volumetric_speed": [ - "34" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json deleted file mode 100644 index 6129d321b2..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @MK4S HF0.5.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic PETG @MK4S HF0.5", - "inherits": "Prusa Generic PETG @MK4S HF0.4", - "from": "system", - "setting_id": "vO26JgugJEsX5z6a", - "filament_id": "OF1Id239", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S HF0.5 nozzle" - ], - "filament_max_volumetric_speed": [ - "29" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json deleted file mode 100644 index a205ac7e71..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @CORE One 0.6.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic PLA @CORE One 0.6", - "inherits": "Prusa Generic PLA @CORE One", - "from": "system", - "setting_id": "8kSIJx0dpaelcAos", - "filament_id": "OFiCHnso", - "instantiation": "true", - "compatible_printers": [ - "Prusa CORE One 0.6 nozzle" - ], - "nozzle_temperature": [ - "210" - ], - "slow_down_layer_time": [ - "15" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json deleted file mode 100644 index e877f0f0b4..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @CORE One 0.8.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic PLA Silk @CORE One 0.8", - "inherits": "Prusa Generic PLA Silk @CORE One", - "from": "system", - "setting_id": "y2IZMYPduRS1mEFL", - "filament_id": "OFHFZ1Te", - "instantiation": "true", - "compatible_printers": [ - "Prusa CORE One 0.8 nozzle", - "Prusa CORE One HF 0.8 nozzle" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "slow_down_layer_time": [ - "17" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json deleted file mode 100644 index 2c0e48d6a5..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.6.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic TPU @MK4S 0.6", - "inherits": "Prusa Generic TPU @MK4S", - "from": "system", - "setting_id": "3zJSkjnxFgeAbkhY", - "filament_id": "OFbenYUK", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S 0.6 nozzle", - "Prusa MK4S HF0.6 nozzle" - ], - "filament_max_volumetric_speed": [ - "6" - ] -} diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json deleted file mode 100644 index e78a2768d0..0000000000 --- a/resources/profiles/Prusa/filament/Prusa Generic TPU @MK4S 0.8.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "filament", - "name": "Prusa Generic TPU @MK4S 0.8", - "inherits": "Prusa Generic TPU @MK4S", - "from": "system", - "setting_id": "tRRHfIUwFo1C8Q3B", - "filament_id": "OFbenYUK", - "instantiation": "true", - "compatible_printers": [ - "Prusa MK4S 0.8 nozzle", - "Prusa MK4S HF0.8 nozzle" - ], - "filament_max_volumetric_speed": [ - "9" - ] -} diff --git a/resources/profiles/Prusa/machine/Prusa CORE One HF.json b/resources/profiles/Prusa/machine/Prusa CORE One HF.json index cabd5b0cb4..027ef3e2d0 100644 --- a/resources/profiles/Prusa/machine/Prusa CORE One HF.json +++ b/resources/profiles/Prusa/machine/Prusa CORE One HF.json @@ -3,7 +3,7 @@ "name": "Prusa CORE One HF", "bed_model": "coreone_bed.stl", "bed_texture": "coreone.svg", - "default_materials": "Prusa Generic ABS @CORE One;Prusa Generic ASA @CORE One;Prusa Generic PETG @CORE One;Prusa Generic PLA @CORE One;Prusa Generic PLA Silk @CORE One;Prusa Generic TPU @CORE One", + "default_materials": "Generic ABS @Prusa CORE One;Generic ASA @Prusa CORE One;Generic PETG @Prusa CORE One;Generic PLA @Prusa CORE One;Generic PLA Silk @Prusa CORE One;Generic TPU @Prusa CORE One", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Prusa/machine/Prusa CORE One L HF.json b/resources/profiles/Prusa/machine/Prusa CORE One L HF.json index c176e5961b..57287f0380 100644 --- a/resources/profiles/Prusa/machine/Prusa CORE One L HF.json +++ b/resources/profiles/Prusa/machine/Prusa CORE One L HF.json @@ -3,7 +3,7 @@ "name": "Prusa CORE One L HF", "bed_model": "coreonel_bed.stl", "bed_texture": "coreonel.svg", - "default_materials": "Prusa Generic PLA @CORE One", + "default_materials": "Generic PLA @Prusa CORE One", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Prusa/machine/Prusa CORE One L.json b/resources/profiles/Prusa/machine/Prusa CORE One L.json index 4ba199b10f..87bc587830 100644 --- a/resources/profiles/Prusa/machine/Prusa CORE One L.json +++ b/resources/profiles/Prusa/machine/Prusa CORE One L.json @@ -3,7 +3,7 @@ "name": "Prusa CORE One L", "bed_model": "coreonel_bed.stl", "bed_texture": "coreonel.svg", - "default_materials": "Prusa Generic ABS @CORE One;Prusa Generic ASA @CORE One;Prusa Generic PETG @CORE One;Prusa Generic PLA @CORE One;Prusa Generic PLA Silk @CORE One;Prusa Generic TPU @CORE One", + "default_materials": "Generic ABS @Prusa CORE One;Generic ASA @Prusa CORE One;Generic PETG @Prusa CORE One;Generic PLA @Prusa CORE One;Generic PLA Silk @Prusa CORE One;Generic TPU @Prusa CORE One", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Prusa/machine/Prusa CORE One.json b/resources/profiles/Prusa/machine/Prusa CORE One.json index 7fbe05d11d..b9907aca2e 100644 --- a/resources/profiles/Prusa/machine/Prusa CORE One.json +++ b/resources/profiles/Prusa/machine/Prusa CORE One.json @@ -3,7 +3,7 @@ "name": "Prusa CORE One", "bed_model": "coreone_bed.stl", "bed_texture": "coreone.svg", - "default_materials": "Prusa Generic ABS @CORE One;Prusa Generic ASA @CORE One;Prusa Generic PETG @CORE One;Prusa Generic PLA @CORE One;Prusa Generic PLA Silk @CORE One;Prusa Generic TPU @CORE One", + "default_materials": "Generic ABS @Prusa CORE One;Generic ASA @Prusa CORE One;Generic PETG @Prusa CORE One;Generic PLA @Prusa CORE One;Generic PLA Silk @Prusa CORE One;Generic TPU @Prusa CORE One", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json index b5f9d8392b..dbfa34e816 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI", "printer_variant": "0.25", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.20mm Standard @MINI 0.25", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json index 488734582c..4bc7af6bab 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI", "printer_variant": "0.4", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.20mm Standard @MINI", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json index ea851b9dcf..6eed0480a6 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI", "printer_variant": "0.6", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.20mm Standard @MINI 0.6", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json index 30394e8eef..8168f195fa 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINI 0.8 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI", "printer_variant": "0.8", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.20mm Standard @MINI 0.8", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINI.json b/resources/profiles/Prusa/machine/Prusa MINI.json index 367b75a727..a7ce538229 100644 --- a/resources/profiles/Prusa/machine/Prusa MINI.json +++ b/resources/profiles/Prusa/machine/Prusa MINI.json @@ -8,5 +8,5 @@ "bed_model": "mini_bed.stl", "bed_texture": "mini.svg", "hotend_model": "", - "default_materials": "Prusa Generic ABS;Prusa Generic PLA;Prusa Generic PLA-CF;Prusa Generic PETG;Prusa Generic TPU;Prusa Generic ASA;Prusa Generic PC;Prusa Generic PVA;Prusa Generic PA;Prusa Generic PA-CF" + "default_materials": "Generic ABS @Prusa;Generic PLA @Prusa;Generic PLA-CF @Prusa;Generic PETG @Prusa;Generic TPU @Prusa;Generic ASA @Prusa;Generic PC @Prusa;Generic PVA @Prusa;Generic PA @Prusa;Generic PA-CF @Prusa" } diff --git a/resources/profiles/Prusa/machine/Prusa MINIIS 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINIIS 0.25 nozzle.json index c800a8a409..06b10cc244 100644 --- a/resources/profiles/Prusa/machine/Prusa MINIIS 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINIIS 0.25 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI IS", "printer_variant": "0.25", "default_filament_profile": [ - "Prusa Generic PLA @MINIIS 0.25" + "Generic PLA @Prusa MINIIS 0.25" ], "default_print_profile": "0.12mm Standard @MINIIS", "nozzle_diameter": [ 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 d2d6c18f39..18fe72ef3f 100644 --- a/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI IS", "printer_variant": "0.4", "default_filament_profile": [ - "Prusa Generic PLA @MINIIS" + "Generic PLA @Prusa MINIIS" ], "default_print_profile": "0.20mm Standard @MINIIS", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINIIS 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINIIS 0.6 nozzle.json index c7ebd42263..7dc21fb981 100644 --- a/resources/profiles/Prusa/machine/Prusa MINIIS 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINIIS 0.6 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI IS", "printer_variant": "0.6", "default_filament_profile": [ - "Prusa Generic PLA @MINIIS 0.6" + "Generic PLA @Prusa MINIIS 0.6" ], "default_print_profile": "0.25mm Standard @MINIIS", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINIIS 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINIIS 0.8 nozzle.json index 0ae5a7bbbd..4ab6daa76d 100644 --- a/resources/profiles/Prusa/machine/Prusa MINIIS 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINIIS 0.8 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MINI IS", "printer_variant": "0.8", "default_filament_profile": [ - "Prusa Generic PLA @MINIIS 0.8" + "Generic PLA @Prusa MINIIS 0.8" ], "default_print_profile": "0.40mm Standard @MINIIS", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MINIIS.json b/resources/profiles/Prusa/machine/Prusa MINIIS.json index 123f0a3665..ae5282a129 100644 --- a/resources/profiles/Prusa/machine/Prusa MINIIS.json +++ b/resources/profiles/Prusa/machine/Prusa MINIIS.json @@ -8,5 +8,5 @@ "bed_model": "miniis_bed.stl", "bed_texture": "miniis.svg", "hotend_model": "", - "default_materials": "Prusa Generic PLA-CF @MINIIS;Prusa Generic PC @MINIIS;Prusa Generic PVA @MINIIS;Prusa Generic PA @MINIIS;Prusa Generic PA-CF @MINIIS;Prusa Generic ABS @MINIIS;Prusa Generic PLA @MINIIS;Prusa Generic PLA @MINIIS 0.6;Prusa Generic PLA @MINIIS 0.8;Prusa Generic PETG @MINIIS;Prusa Generic PETG @MINIIS 0.6;Prusa Generic PETG @MINIIS 0.8;Prusa Generic TPU @MINIIS;Prusa Generic ASA @MINIIS;" + "default_materials": "Generic PLA-CF @Prusa MINIIS;Generic PC @Prusa MINIIS;Generic PVA @Prusa MINIIS;Generic PA @Prusa MINIIS;Generic PA-CF @Prusa MINIIS;Generic ABS @Prusa MINIIS;Generic PLA @Prusa MINIIS;Generic PLA @Prusa MINIIS 0.6;Generic PLA @Prusa MINIIS 0.8;Generic PETG @Prusa MINIIS;Generic PETG @Prusa MINIIS 0.6;Generic PETG @Prusa MINIIS 0.8;Generic TPU @Prusa MINIIS;Generic ASA @Prusa MINIIS;" } diff --git a/resources/profiles/Prusa/machine/Prusa MK3.5 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3.5 0.25 nozzle.json index d2fefedc6f..77ca6aa9e3 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3.5 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3.5 0.25 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MK3.5", "printer_variant": "0.25", "default_filament_profile": [ - "Prusa Generic PLA @MK3.5 0.25" + "Generic PLA @Prusa MK3.5 0.25" ], "default_print_profile": "0.12mm Standard @MK3.5", "nozzle_diameter": [ 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 6d473ce765..ae7df2e583 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 @@ -9,7 +9,7 @@ "printer_model": "Prusa MK3.5", "printer_variant": "0.4", "default_filament_profile": [ - "Prusa Generic PLA @MK3.5" + "Generic PLA @Prusa MK3.5" ], "default_print_profile": "0.20mm Standard @MK3.5", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3.5 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3.5 0.6 nozzle.json index 3631749c53..742b172254 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3.5 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3.5 0.6 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MK3.5", "printer_variant": "0.6", "default_filament_profile": [ - "Prusa Generic PLA @MK3.5 0.6" + "Generic PLA @Prusa MK3.5 0.6" ], "default_print_profile": "0.25mm Standard @MK3.5", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3.5 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3.5 0.8 nozzle.json index 1dd7d455d4..c67665fefa 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3.5 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3.5 0.8 nozzle.json @@ -9,7 +9,7 @@ "printer_model": "Prusa MK3.5", "printer_variant": "0.8", "default_filament_profile": [ - "Prusa Generic PLA @MK3.5 0.8" + "Generic PLA @Prusa MK3.5 0.8" ], "default_print_profile": "0.40mm Standard @MK3.5", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3.5.json b/resources/profiles/Prusa/machine/Prusa MK3.5.json index 4438d3d478..2893862789 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3.5.json +++ b/resources/profiles/Prusa/machine/Prusa MK3.5.json @@ -8,5 +8,5 @@ "bed_model": "mk3.5_bed.stl", "bed_texture": "mk3.5.svg", "hotend_model": "", - "default_materials": "Prusa Generic PLA-CF @MK3.5;Prusa Generic PC @MK3.5;Prusa Generic PVA @MK3.5;Prusa Generic PA @MK3.5;Prusa Generic PA-CF @MK3.5;Prusa Generic ABS @MK3.5;Prusa Generic PLA @MK3.5;Prusa Generic PLA @MK3.5 0.6;Prusa Generic PLA @MK3.5 0.8;Prusa Generic PETG @MK3.5;Prusa Generic PETG @MK3.5 0.6;Prusa Generic PETG @MK3.5 0.8;Prusa Generic TPU @MK3.5;Prusa Generic ASA @MK3.5;" + "default_materials": "Generic PLA-CF @Prusa MK3.5;Generic PC @Prusa MK3.5;Generic PVA @Prusa MK3.5;Generic PA @Prusa MK3.5;Generic PA-CF @Prusa MK3.5;Generic ABS @Prusa MK3.5;Generic PLA @Prusa MK3.5;Generic PLA @Prusa MK3.5 0.6;Generic PLA @Prusa MK3.5 0.8;Generic PETG @Prusa MK3.5;Generic PETG @Prusa MK3.5 0.6;Generic PETG @Prusa MK3.5 0.8;Generic TPU @Prusa MK3.5;Generic ASA @Prusa MK3.5;" } diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json index 28333578ff..31fd34848a 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Prusa MK3S", "printer_variant": "0.25", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.20mm Speed @MK3S 0.25", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json index 5b86474541..036b901121 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Prusa MK3S", "printer_variant": "0.4", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.20mm Speed @MK3S 0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json index d94d5a0306..c3be2666b8 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Prusa MK3S", "printer_variant": "0.6", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.30mm Quality @MK3S 0.6", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json index 92450e95fe..ac85e1db4c 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json @@ -8,7 +8,7 @@ "printer_model": "Prusa MK3S", "printer_variant": "0.8", "default_filament_profile": [ - "Prusa Generic PLA" + "Generic PLA @Prusa" ], "default_print_profile": "0.15mm Detail @MK3S 0.8", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK3S.json b/resources/profiles/Prusa/machine/Prusa MK3S.json index d5323b5f1f..ad27bb59f6 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S.json @@ -8,5 +8,5 @@ "bed_model": "mk3_bed.stl", "bed_texture": "mk3.svg", "hotend_model": "", - "default_materials": "Prusa Generic ABS;Prusa Generic PLA;Prusa Generic PLA-CF;Prusa Generic PETG;Prusa Generic TPU;Prusa Generic ASA;Prusa Generic PC;Prusa Generic PVA;Prusa Generic PA;Prusa Generic PA-CF" + "default_materials": "Generic ABS @Prusa;Generic PLA @Prusa;Generic PLA-CF @Prusa;Generic PETG @Prusa;Generic TPU @Prusa;Generic ASA @Prusa;Generic PC @Prusa;Generic PVA @Prusa;Generic PA @Prusa;Generic PA-CF @Prusa" } diff --git a/resources/profiles/Prusa/machine/Prusa MK4 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4 0.25 nozzle.json index 81b75a5098..ad8bdc7676 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4 0.25 nozzle.json @@ -8,7 +8,7 @@ "gcode_flavor": "marlin2", "printer_model": "Prusa MK4", "default_filament_profile": [ - "Prusa Generic PLA @MK4" + "Generic PLA @Prusa MK4" ], "default_print_profile": "0.08mm Standard @MK4", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK4 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4 0.4 nozzle.json index 89aa893547..417a953aaa 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4 0.4 nozzle.json @@ -8,7 +8,7 @@ "gcode_flavor": "marlin2", "printer_model": "Prusa MK4", "default_filament_profile": [ - "Prusa Generic PLA @MK4" + "Generic PLA @Prusa MK4" ], "default_print_profile": "0.20mm Standard @MK4", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK4 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4 0.6 nozzle.json index f5991e42a9..af4b985d28 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4 0.6 nozzle.json @@ -8,7 +8,7 @@ "gcode_flavor": "marlin2", "printer_model": "Prusa MK4", "default_filament_profile": [ - "Prusa Generic PLA @MK4" + "Generic PLA @Prusa MK4" ], "default_print_profile": "0.32mm Standard @MK4", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK4 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4 0.8 nozzle.json index 91e64bdbb1..f6a151581c 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4 0.8 nozzle.json @@ -8,7 +8,7 @@ "gcode_flavor": "marlin2", "printer_model": "Prusa MK4", "default_filament_profile": [ - "Prusa Generic PLA @MK4" + "Generic PLA @Prusa MK4" ], "default_print_profile": "0.40mm Standard @MK4", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa MK4.json b/resources/profiles/Prusa/machine/Prusa MK4.json index dc14d1477c..a5a01b2f2e 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4.json +++ b/resources/profiles/Prusa/machine/Prusa MK4.json @@ -8,5 +8,5 @@ "bed_model": "mk4_bed.stl", "bed_texture": "mk4is.svg", "hotend_model": "", - "default_materials": "Prusa Generic PLA-CF;Prusa Generic PC;Prusa Generic PVA;Prusa Generic PA;Prusa Generic PA-CF;Prusa Generic ABS @MK4;Prusa Generic PLA @MK4;Prusa Generic PETG @MK4;Prusa Generic TPU @MK4;Prusa Generic ASA @MK4;" + "default_materials": "Generic PLA-CF @Prusa;Generic PC @Prusa;Generic PVA @Prusa;Generic PA @Prusa;Generic PA-CF @Prusa;Generic ABS @Prusa MK4;Generic PLA @Prusa MK4;Generic PETG @Prusa MK4;Generic TPU @Prusa MK4;Generic ASA @Prusa MK4;" } diff --git a/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json index e9824d1ed6..4f0a79173a 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S 0.4 nozzle.json @@ -5,7 +5,7 @@ "from": "system", "setting_id": "8tL4SMT6bHqG2Ql1", "instantiation": "true", - "default_filament_profile": "Prusa Generic PLA @MK4S", + "default_filament_profile": "Generic PLA @Prusa MK4S", "default_print_profile": "0.20mm SPEED @MK4S 0.4", "nozzle_diameter": [ "0.4" diff --git a/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json index 0f454ca38f..22acff8dbe 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S 0.6 nozzle.json @@ -5,7 +5,7 @@ "from": "system", "setting_id": "m0ALiNI26ncFxsY2", "instantiation": "true", - "default_filament_profile": "Prusa Generic PLA @MK4S 0.6", + "default_filament_profile": "Generic PLA @Prusa MK4S 0.6", "default_print_profile": "0.25mm SPEED @MK4S 0.6", "max_layer_height": "0.40", "min_layer_height": "0.15", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json index d460517983..8799a148b4 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S 0.8 nozzle.json @@ -5,7 +5,7 @@ "from": "system", "setting_id": "rMzjWvSpqLsRK0gP", "instantiation": "true", - "default_filament_profile": "Prusa Generic PLA @MK4S 0.8", + "default_filament_profile": "Generic PLA @Prusa MK4S 0.8", "default_print_profile": "0.40mm QUALITY @MK4S 0.8", "deretraction_speed": "15", "max_layer_height": "0.6", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S HF.json b/resources/profiles/Prusa/machine/Prusa MK4S HF.json index b49fde2dde..088715b835 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S HF.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S HF.json @@ -3,7 +3,7 @@ "name": "Prusa MK4S HF", "bed_model": "mk4_bed.stl", "bed_texture": "mk4s.svg", - "default_materials": "Prusa Generic ABS @MK4S;Prusa Generic ASA @MK4S;Prusa Generic PETG @MK4S;Prusa Generic PLA @MK4S;Prusa Generic PLA Silk @MK4S;Prusa Generic TPU @MK4S", + "default_materials": "Generic ABS @Prusa MK4S;Generic ASA @Prusa MK4S;Generic PETG @Prusa MK4S;Generic PLA @Prusa MK4S;Generic PLA Silk @Prusa MK4S;Generic TPU @Prusa MK4S", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json index abc0f71d50..f417814bbd 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S HF0.4 nozzle.json @@ -5,7 +5,7 @@ "from": "system", "setting_id": "zMYcZUEYGqFVXcPo", "instantiation": "true", - "default_filament_profile": "Prusa Generic PLA @MK4S HF0.4", + "default_filament_profile": "Generic PLA @Prusa MK4S HF0.4", "default_print_profile": "0.20mm SPEED @MK4S HF0.4", "machine_start_gcode": [ "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle check\nM862.3 P \"MK4S\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.1.3+7898\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n\nM84 E ; turn off E motor\n\nG28 ; home all without mesh bed level\n\nG1 X42 Y-4 Z5 F4800\n\nM302 S160 ; lower cold extrusion limit to 160C\n\n{if filament_type[initial_tool]==\"FLEX\"}\nG1 E-4 F2400 ; retraction\n{else}\nG1 E-2 F2400 ; retraction\n{endif}\n\nM84 E ; turn off E motor\n\nG29 P9 X10 Y-4 W32 H4\n\n{if first_layer_bed_temperature[initial_tool]<=60}M106 S100{endif}\n\nG0 Z40 F10000\n\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nM107\n\n;\n; MBL\n;\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X0 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\nG92 E0\nM569 S0 E ; set spreadcycle mode for extruder\n\n;\n; Extrude purge line\n;\nG92 E0 ; reset extruder position\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X48 Z0.05 F8000 ; wipe, move close to the bed\nG0 X51 Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; set flow to 100%" diff --git a/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json index dd6cf098d4..37ea0e1f7c 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S HF0.8 nozzle.json @@ -5,7 +5,7 @@ "from": "system", "setting_id": "UygX2hdbWqKzY6Nn", "instantiation": "true", - "default_filament_profile": "Prusa Generic PLA @MK4S HF0.8", + "default_filament_profile": "Generic PLA @Prusa MK4S HF0.8", "default_print_profile": "0.40mm STRUCTURAL @MK4S HF0.8", "deretraction_speed": "15", "max_layer_height": "0.6", diff --git a/resources/profiles/Prusa/machine/Prusa MK4S.json b/resources/profiles/Prusa/machine/Prusa MK4S.json index 18f669594a..2f6bd3e45f 100644 --- a/resources/profiles/Prusa/machine/Prusa MK4S.json +++ b/resources/profiles/Prusa/machine/Prusa MK4S.json @@ -3,7 +3,7 @@ "name": "Prusa MK4S", "bed_model": "mk4_bed.stl", "bed_texture": "mk4s.svg", - "default_materials": "Prusa Generic ABS @MK4S;Prusa Generic ASA @MK4S;Prusa Generic PETG @MK4S;Prusa Generic PLA @MK4S;Prusa Generic PLA Silk @MK4S;Prusa Generic TPU @MK4S", + "default_materials": "Generic ABS @Prusa MK4S;Generic ASA @Prusa MK4S;Generic PETG @Prusa MK4S;Generic PLA @Prusa MK4S;Generic PLA Silk @Prusa MK4S;Generic TPU @Prusa MK4S", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Prusa/machine/Prusa XL 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.25 nozzle.json index 8a2ef4ecbb..e259346b94 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.25 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL", - "default_filament_profile": "Prusa Generic PLA @XL", + "default_filament_profile": "Generic PLA @Prusa XL", "default_print_profile": "0.15mm Speed @Prusa XL 0.25", "printer_variant": "0.25", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json index 7b6192e64c..afbd0b421c 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL", - "default_filament_profile": "Prusa Generic PLA @XL", + "default_filament_profile": "Generic PLA @Prusa XL", "default_print_profile": "0.20mm Speed @Prusa XL 0.3", "printer_variant": "0.3", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa XL 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.4 nozzle.json index ae5add4f6a..20e8694545 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.4 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL", - "default_filament_profile": "Prusa Generic PLA @XL", + "default_filament_profile": "Generic PLA @Prusa XL", "default_print_profile": "0.20mm Speed @Prusa XL 0.4", "printer_variant": "0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa XL 0.5 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.5 nozzle.json index 5d470138ca..d4dafc32a1 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 0.5 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.5 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL", - "default_filament_profile": "Prusa Generic PLA @XL", + "default_filament_profile": "Generic PLA @Prusa XL", "default_print_profile": "0.25mm Speed @Prusa XL 0.5", "printer_variant": "0.5", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa XL 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.6 nozzle.json index 050b6b5106..4e43982b7d 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.6 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL", - "default_filament_profile": "Prusa Generic PLA @XL", + "default_filament_profile": "Generic PLA @Prusa XL", "default_print_profile": "0.32mm Speed @Prusa XL 0.6", "printer_variant": "0.6", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa XL 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.8 nozzle.json index 3d64a2420d..2594b57060 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.8 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL", - "default_filament_profile": "Prusa Generic PLA @XL", + "default_filament_profile": "Generic PLA @Prusa XL", "default_print_profile": "0.40mm Quality @Prusa XL 0.8", "printer_variant": "0.8", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json index 42916b3a27..8a29e7dadf 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL 5T", - "default_filament_profile": "Prusa Generic PLA @XL 5T", + "default_filament_profile": "Generic PLA @Prusa XL 5T", "default_print_profile": "0.15mm Speed @Prusa XL 5T 0.25", "printer_variant": "0.25", "max_layer_height": "0.15", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json index 7a07b277e2..d380fe5434 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL 5T", - "default_filament_profile": "Prusa Generic PLA @XL 5T", + "default_filament_profile": "Generic PLA @Prusa XL 5T", "default_print_profile": "0.20mm Speed @Prusa XL 5T 0.3", "printer_variant": "0.3", "max_layer_height": "0.22", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.4 nozzle.json index 8642ac9ac7..3b29778f29 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.4 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL 5T", - "default_filament_profile": "Prusa Generic PLA @XL 5T", + "default_filament_profile": "Generic PLA @Prusa XL 5T", "default_print_profile": "0.20mm Speed @Prusa XL 5T 0.4", "printer_variant": "0.4", "nozzle_diameter": [ diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json index fe51f7f4f8..e795d8f8b0 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL 5T", - "default_filament_profile": "Prusa Generic PLA @XL 5T", + "default_filament_profile": "Generic PLA @Prusa XL 5T", "default_print_profile": "0.25mm Speed @Prusa XL 5T 0.5", "printer_variant": "0.5", "max_layer_height": "0.32", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json index 1492cf6a6d..76569ca735 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL 5T", - "default_filament_profile": "Prusa Generic PLA @XL 5T", + "default_filament_profile": "Generic PLA @Prusa XL 5T", "default_print_profile": "0.32mm Speed @Prusa XL 5T 0.6", "printer_variant": "0.6", "max_layer_height": "0.4", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json index 14277e59fe..d72bfeccad 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json @@ -7,7 +7,7 @@ "instantiation": "true", "gcode_flavor": "marlin2", "printer_model": "Prusa XL 5T", - "default_filament_profile": "Prusa Generic PLA @XL 5T", + "default_filament_profile": "Generic PLA @Prusa XL 5T", "default_print_profile": "0.40mm Quality @Prusa XL 5T 0.8", "printer_variant": "0.8", "max_layer_height": "0.6", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T.json b/resources/profiles/Prusa/machine/Prusa XL 5T.json index 20dfce5046..02e93a78b5 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T.json @@ -8,5 +8,5 @@ "bed_model": "Prusa XL_bed.stl", "bed_texture": "Prusa XL.svg", "hotend_model": "", - "default_materials": "Prusa Generic PLA @XL 5T;Prusament PLA @XL 5T;Prusament rPLA @XL 5T;Prusa Generic PETG @XL 5T;Prusament PETG @XL 5T;Prusa Generic ABS @XL 5T;Prusament ASA @XL 5T;Prusament PC Blend @XL 5T;Prusament PC-CF @XL 5T;Prusament PVB @XL 5T;Prusament PA-CF @XL 5T;Prusa Generic FLEX @XL 5T" + "default_materials": "Generic PLA @Prusa XL 5T;Prusament PLA @XL 5T;Prusament rPLA @XL 5T;Generic PETG @Prusa XL 5T;Prusament PETG @XL 5T;Generic ABS @Prusa XL 5T;Prusament ASA @XL 5T;Prusament PC Blend @XL 5T;Prusament PC-CF @XL 5T;Prusament PVB @XL 5T;Prusament PA-CF @XL 5T;Generic FLEX @Prusa XL 5T" } diff --git a/resources/profiles/Prusa/machine/Prusa XL.json b/resources/profiles/Prusa/machine/Prusa XL.json index 9a7ba66066..17cc16e486 100644 --- a/resources/profiles/Prusa/machine/Prusa XL.json +++ b/resources/profiles/Prusa/machine/Prusa XL.json @@ -8,5 +8,5 @@ "bed_model": "Prusa XL_bed.stl", "bed_texture": "Prusa XL.svg", "hotend_model": "", - "default_materials": "Prusa Generic PLA @XL;Prusament PLA @XL;Prusament rPLA @XL;Prusa Generic PETG @XL;Prusament PETG @XL;Prusa Generic ABS @XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL;Prusa Generic FLEX @XL" + "default_materials": "Generic PLA @Prusa XL;Prusament PLA @XL;Prusament rPLA @XL;Generic PETG @Prusa XL;Prusament PETG @XL;Generic ABS @Prusa XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL;Generic FLEX @Prusa XL" } diff --git a/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json b/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json index daec78bc4e..0cbde13d89 100644 --- a/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json +++ b/resources/profiles/Prusa/machine/fdm_machine_common_mk4s.json @@ -10,7 +10,7 @@ "change_filament_gcode": [ "" ], - "default_filament_profile": "Prusa Generic PLA @MK4S", + "default_filament_profile": "Generic PLA @Prusa MK4S", "default_print_profile": "0.20mm SPEED @MK4IS 0.4", "deretraction_speed": "25", "extruder_clearance_height_to_lid": "220", diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index 98f157c9a3..c3babbc4a5 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "02.04.00.12", + "version": "02.04.00.13", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ @@ -1753,8 +1753,8 @@ "sub_path": "filament/QIDI ABS-GF25.json" }, { - "name": "Qidi Generic ABS", - "sub_path": "filament/Qidi Generic ABS.json" + "name": "Generic ABS @Qidi", + "sub_path": "filament/Generic ABS @Qidi.json" }, { "name": "Qidi PC-ABS-FR", @@ -1769,8 +1769,8 @@ "sub_path": "filament/Qidi ASA-Aero.json" }, { - "name": "Qidi Generic ASA", - "sub_path": "filament/Qidi Generic ASA.json" + "name": "Generic ASA @Qidi", + "sub_path": "filament/Generic ASA @Qidi.json" }, { "name": "QIDI PA-Ultra", @@ -1817,16 +1817,16 @@ "sub_path": "filament/QIDI UltraPA-CF25.json" }, { - "name": "Qidi Generic PA", - "sub_path": "filament/Qidi Generic PA.json" + "name": "Generic PA @Qidi", + "sub_path": "filament/Generic PA @Qidi.json" }, { - "name": "Qidi Generic PA-CF", - "sub_path": "filament/Qidi Generic PA-CF.json" + "name": "Generic PA-CF @Qidi", + "sub_path": "filament/Generic PA-CF @Qidi.json" }, { - "name": "Qidi Generic PC", - "sub_path": "filament/Qidi Generic PC.json" + "name": "Generic PC @Qidi", + "sub_path": "filament/Generic PC @Qidi.json" }, { "name": "Bambu PETG", @@ -1861,12 +1861,12 @@ "sub_path": "filament/QIDI PETG-GF.json" }, { - "name": "Qidi Generic PETG", - "sub_path": "filament/Qidi Generic PETG.json" + "name": "Generic PETG @Qidi", + "sub_path": "filament/Generic PETG @Qidi.json" }, { - "name": "Qidi Generic PETG-CF", - "sub_path": "filament/Qidi Generic PETG-CF.json" + "name": "Generic PETG-CF @Qidi", + "sub_path": "filament/Generic PETG-CF @Qidi.json" }, { "name": "Tinmorry PETG-ECO", @@ -1917,28 +1917,28 @@ "sub_path": "filament/QIDI WOOD Rapido.json" }, { - "name": "Qidi Generic PLA", - "sub_path": "filament/Qidi Generic PLA.json" + "name": "Generic PLA @Qidi", + "sub_path": "filament/Generic PLA @Qidi.json" }, { - "name": "Qidi Generic PLA Silk", - "sub_path": "filament/Qidi Generic PLA Silk.json" + "name": "Generic PLA Silk @Qidi", + "sub_path": "filament/Generic PLA Silk @Qidi.json" }, { - "name": "Qidi Generic PLA+", - "sub_path": "filament/Qidi Generic PLA+.json" + "name": "Generic PLA+ @Qidi", + "sub_path": "filament/Generic PLA+ @Qidi.json" }, { - "name": "Qidi Generic PLA-CF", - "sub_path": "filament/Qidi Generic PLA-CF.json" + "name": "Generic PLA-CF @Qidi", + "sub_path": "filament/Generic PLA-CF @Qidi.json" }, { "name": "Qidi PLA-CF", "sub_path": "filament/Qidi PLA-CF.json" }, { - "name": "Qidi Generic PVA", - "sub_path": "filament/Qidi Generic PVA.json" + "name": "Generic PVA @Qidi", + "sub_path": "filament/Generic PVA @Qidi.json" }, { "name": "QIDI PEBA 95A", @@ -1953,12 +1953,12 @@ "sub_path": "filament/QIDI TPU-GF.json" }, { - "name": "Qidi Generic TPU", - "sub_path": "filament/Qidi Generic TPU.json" + "name": "Generic TPU @Qidi", + "sub_path": "filament/Generic TPU @Qidi.json" }, { - "name": "Qidi Generic TPU 95A", - "sub_path": "filament/Qidi Generic TPU 95A.json" + "name": "Generic TPU 95A @Qidi", + "sub_path": "filament/Generic TPU 95A @Qidi.json" }, { "name": "Qidi TPU 95A-HF", @@ -4553,48 +4553,48 @@ "sub_path": "filament/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Generic ABS @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic ABS @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Generic ABS @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Generic ABS @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json" + "name": "Generic ABS @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/Generic ABS @Qidi X-Max 3 0.2 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json" + "name": "Generic ABS @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/Generic ABS @Qidi X-Plus 3 0.2 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle.json" + "name": "Generic ABS @Qidi X-Plus 4 0.2 nozzle", + "sub_path": "filament/Generic ABS @Qidi X-Plus 4 0.2 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic ABS @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic ABS @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle.json" + "name": "Generic ABS @Qidi X-Plus 4 0.6 nozzle", + "sub_path": "filament/Generic ABS @Qidi X-Plus 4 0.6 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic ABS @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic ABS @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json" + "name": "Generic ABS @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/Generic ABS @Qidi X-Smart 3 0.2 nozzle.json" }, { "name": "Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle", @@ -4673,48 +4673,48 @@ "sub_path": "filament/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Generic ASA @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic ASA @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Generic ASA @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Generic ASA @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json" + "name": "Generic ASA @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/Generic ASA @Qidi X-Max 3 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json" + "name": "Generic ASA @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/Generic ASA @Qidi X-Plus 3 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json" + "name": "Generic ASA @Qidi X-Plus 4 0.2 nozzle", + "sub_path": "filament/Generic ASA @Qidi X-Plus 4 0.2 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic ASA @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic ASA @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json" + "name": "Generic ASA @Qidi X-Plus 4 0.6 nozzle", + "sub_path": "filament/Generic ASA @Qidi X-Plus 4 0.6 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic ASA @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic ASA @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json" + "name": "Generic ASA @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/Generic ASA @Qidi X-Smart 3 0.2 nozzle.json" }, { "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", @@ -4981,44 +4981,44 @@ "sub_path": "filament/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic PC @0.2 nozzle", - "sub_path": "filament/Qidi Generic PC @0.2 nozzle.json" + "name": "Generic PC @Qidi 0.2 nozzle", + "sub_path": "filament/Generic PC @Qidi 0.2 nozzle.json" }, { - "name": "Qidi Generic PC @0.8 nozzle", - "sub_path": "filament/Qidi Generic PC @0.8 nozzle.json" + "name": "Generic PC @Qidi 0.8 nozzle", + "sub_path": "filament/Generic PC @Qidi 0.8 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Generic PC @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic PC @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Generic PC @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Generic PC @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle.json" + "name": "Generic PC @Qidi X-Plus 4 0.2 nozzle", + "sub_path": "filament/Generic PC @Qidi X-Plus 4 0.2 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic PC @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic PC @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle.json" + "name": "Generic PC @Qidi X-Plus 4 0.6 nozzle", + "sub_path": "filament/Generic PC @Qidi X-Plus 4 0.6 nozzle.json" }, { - "name": "Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic PC @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic PC @Qidi X-Plus 4 0.8 nozzle.json" }, { "name": "Bambu PETG @0.2 nozzle", @@ -5333,48 +5333,48 @@ "sub_path": "filament/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Generic PETG @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic PETG @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Generic PETG @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Generic PETG @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json" + "name": "Generic PETG @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/Generic PETG @Qidi X-Max 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json" + "name": "Generic PETG @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/Generic PETG @Qidi X-Plus 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle.json" + "name": "Generic PETG @Qidi X-Plus 4 0.2 nozzle", + "sub_path": "filament/Generic PETG @Qidi X-Plus 4 0.2 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic PETG @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic PETG @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle.json" + "name": "Generic PETG @Qidi X-Plus 4 0.6 nozzle", + "sub_path": "filament/Generic PETG @Qidi X-Plus 4 0.6 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic PETG @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic PETG @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json" + "name": "Generic PETG @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/Generic PETG @Qidi X-Smart 3 0.2 nozzle.json" }, { "name": "Bambu PLA @0.2 nozzle", @@ -5825,148 +5825,148 @@ "sub_path": "filament/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Generic PLA @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic PLA @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Generic PLA @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Generic PLA @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json" + "name": "Generic PLA @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Max 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json" + "name": "Generic PLA @Qidi X-Max 3 0.6 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Max 3 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json" + "name": "Generic PLA @Qidi X-Max 3 0.8 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Max 3 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json" + "name": "Generic PLA @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Plus 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json" + "name": "Generic PLA @Qidi X-Plus 3 0.6 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Plus 3 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json" + "name": "Generic PLA @Qidi X-Plus 3 0.8 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Plus 3 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle.json" + "name": "Generic PLA @Qidi X-Plus 4 0.2 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Plus 4 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic PLA @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle.json" + "name": "Generic PLA @Qidi X-Plus 4 0.6 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Plus 4 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic PLA @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json" + "name": "Generic PLA @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Smart 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json" + "name": "Generic PLA @Qidi X-Smart 3 0.6 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Smart 3 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json" + "name": "Generic PLA @Qidi X-Smart 3 0.8 nozzle", + "sub_path": "filament/Generic PLA @Qidi X-Smart 3 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json" + "name": "Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json" + "name": "Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json" + "name": "Generic PLA+ @Qidi X-Max 3 0.2 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json" + "name": "Generic PLA+ @Qidi X-Max 3 0.6 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json" + "name": "Generic PLA+ @Qidi X-Max 3 0.8 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json" + "name": "Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json" + "name": "Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json" + "name": "Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json" + "name": "Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json" + "name": "Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json" + "name": "Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json" + "name": "Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json" + "name": "Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", + "sub_path": "filament/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json" }, { "name": "QIDI PLA-CF @0.6 nozzle", @@ -6057,20 +6057,20 @@ "sub_path": "filament/QIDI TPU-GF @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", - "sub_path": "filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json" + "name": "Generic TPU @Qidi Q1 Pro 0.4 nozzle", + "sub_path": "filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic TPU @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic TPU @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", - "sub_path": "filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json" + "name": "Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", + "sub_path": "filament/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json" }, { "name": "Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", @@ -6089,20 +6089,20 @@ "sub_path": "filament/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle.json" }, { - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", - "sub_path": "filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json" + "name": "Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", + "sub_path": "filament/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json" }, { - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", - "sub_path": "filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json" + "name": "Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", + "sub_path": "filament/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json" }, { - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", - "sub_path": "filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json" + "name": "Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", + "sub_path": "filament/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json" }, { - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "sub_path": "filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json" + "name": "Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", + "sub_path": "filament/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json" }, { "name": "fdm_filament_x5_common", diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json similarity index 62% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json index b14283c761..2ca51212e7 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "BNOS859dmAw7GIZp", - "filament_id": "OFv4VZCd", + "setting_id": "IQDYfIQsv6WlnA3z", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json similarity index 63% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json index 7dd600cc44..7c22168a8e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "XfuwzYZzTauK0ADk", - "filament_id": "OFv4VZCd", + "setting_id": "YS0ov4dEWAJhRRvk", + "filament_id": "OFY9muEs", "instantiation": "true", "fan_max_speed": [ "80" @@ -13,7 +14,7 @@ "10" ], "filament_settings_id": [ - "Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle" + "Generic ABS @Qidi Q1 Pro 0.4 nozzle" ], "nozzle_temperature": [ "250" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json similarity index 62% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json index 0411a7a366..b16d7783b2 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "ziWmRGMYOpjc7Hpo", - "filament_id": "OFv4VZCd", + "setting_id": "LQTfTgV2MBEm6DDD", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json similarity index 62% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json index 39cca2e3bb..61f33e870a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "lLXYczQE4YfPiyDO", - "filament_id": "OFv4VZCd", + "setting_id": "ZWOlrWQQwvsDV8xa", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi X-Max 3 0.2 nozzle.json index e24fd6df8f..fcb9b9f547 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "o62pcRmFnj2mIXhf", - "filament_id": "OFv4VZCd", + "setting_id": "v7w2dLJ1MtUjvy1l", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 3 0.2 nozzle.json index 6b67afc3a6..c52716ea4b 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "UBWjZCCGQrpgmlpa", - "filament_id": "OFv4VZCd", + "setting_id": "vH2jlch11zfDBUPP", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 62% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.2 nozzle.json index f04c392d36..521521c0fe 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "qB4eDc7UuoKv5m2U", - "filament_id": "OFv4VZCd", + "setting_id": "0bwmAx9OQYm5MwVE", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 62% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.4 nozzle.json index 0ba51d1d97..b5bbbdbf47 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "N3Ca9PN8nDnvhmak", - "filament_id": "OFv4VZCd", + "setting_id": "Y3yAythmKXxr76Pg", + "filament_id": "OFY9muEs", "instantiation": "true", "fan_max_speed": [ "80" @@ -13,7 +14,7 @@ "10" ], "filament_settings_id": [ - "Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle" + "Generic ABS @Qidi X-Plus 4 0.4 nozzle" ], "pressure_advance": [ "0.03" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 62% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.6 nozzle.json index c614b1b214..27ef9809e8 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "UkNcVB3bJZqLN3fu", - "filament_id": "OFv4VZCd", + "setting_id": "Bt8ySpZn6WFWC00A", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 62% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi X-Plus 4 0.8 nozzle.json index 1a25e73239..3dcc3d5889 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "uK0zY0a6MpcFTZWr", - "filament_id": "OFv4VZCd", + "setting_id": "7j3bweJutseUaoZQ", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi X-Smart 3 0.2 nozzle.json index fdfdb04794..7503ba737d 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Qidi Generic ABS", + "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", "from": "system", - "setting_id": "veNBpzcNYa6TAMry", - "filament_id": "OFv4VZCd", + "setting_id": "StJpaMQKORYm7i94", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json similarity index 89% rename from resources/profiles/Qidi/filament/Qidi Generic ABS.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi.json index fd469656b7..76a01a3fa6 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ABS.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ABS", + "name": "Generic ABS @Qidi", "inherits": "fdm_filament_abs", + "renamed_from": "Qidi Generic ABS", "from": "system", - "setting_id": "wcv9ZpNwvZ0ZcWKw", - "filament_id": "OFv4VZCd", + "setting_id": "iO5utPsBKAo7cHop", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_type": [ "ABS" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json similarity index 60% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json index b1dc3929af..749dddc689 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "OLkg128vxsk27w03", - "filament_id": "OFsxlLdo", + "setting_id": "3LUibDTlv799Gy6r", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json similarity index 68% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json index c76c3b7bf4..f8ef61a4aa 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "pGOT3C5eREsHRylS", - "filament_id": "OFsxlLdo", + "setting_id": "EtjXhHzpmShNgIqj", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_chamber_temp_control": [ "0" @@ -19,7 +20,7 @@ "16" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle" + "Generic ASA @Qidi Q1 Pro 0.4 nozzle" ], "nozzle_temperature": [ "270" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json similarity index 68% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json index b2e93f6042..cef5172ed5 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "QRlzPtO4mqLKcdws", - "filament_id": "OFsxlLdo", + "setting_id": "5hlUjx0YAFTR9TYr", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_chamber_temp_control": [ "0" @@ -19,7 +20,7 @@ "13" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle" + "Generic ASA @Qidi Q1 Pro 0.6 nozzle" ], "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json similarity index 68% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json index e31053553a..93b389d444 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "vLLCDxhI2GR76M1p", - "filament_id": "OFsxlLdo", + "setting_id": "oArSgOFOlXLGkueW", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_chamber_temp_control": [ "0" @@ -19,7 +20,7 @@ "13" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle" + "Generic ASA @Qidi Q1 Pro 0.8 nozzle" ], "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi X-Max 3 0.2 nozzle.json index 67919c260e..38b0088adb 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "6pY4I5kAFdSYPOte", - "filament_id": "OFsxlLdo", + "setting_id": "LfT1OaNir4KZevUP", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 3 0.2 nozzle.json index 8205a3e728..c0e92e8f7c 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "A85OmyjS63OgZa0V", - "filament_id": "OFsxlLdo", + "setting_id": "S2aFIcoyiIsZ5TR8", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.2 nozzle.json index f7d7fadfa0..1f7ec6918c 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "1CBWjstSdMJLJWuv", - "filament_id": "OFsxlLdo", + "setting_id": "aYowi3jA3nUcr5e8", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 67% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.4 nozzle.json index 0a0da5a68f..1a42a6d075 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "UIsup1TGWKg0Fq72", - "filament_id": "OFsxlLdo", + "setting_id": "Qaogxqa5Zw7i7n0a", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_chamber_temp_control": [ "0" @@ -19,7 +20,7 @@ "16" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle" + "Generic ASA @Qidi X-Plus 4 0.4 nozzle" ], "nozzle_temperature": [ "270" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 67% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.6 nozzle.json index bf2fbce6c2..6700a02c94 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "HQupWXd5yKceVrm4", - "filament_id": "OFsxlLdo", + "setting_id": "aP2WrJLkjpGFtt8I", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_chamber_temp_control": [ "0" @@ -19,7 +20,7 @@ "13" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle" + "Generic ASA @Qidi X-Plus 4 0.6 nozzle" ], "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 67% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi X-Plus 4 0.8 nozzle.json index 70f2dca93b..3a1c923505 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "R6FcpVRhnSp0i8bK", - "filament_id": "OFsxlLdo", + "setting_id": "mx6C1Q73i0B7gpag", + "filament_id": "OFLPAxz3", "instantiation": "true", "activate_chamber_temp_control": [ "0" @@ -19,7 +20,7 @@ "13" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle" + "Generic ASA @Qidi X-Plus 4 0.8 nozzle" ], "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi X-Smart 3 0.2 nozzle.json index 8fa1b77e26..437ed6c7d8 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Qidi Generic ASA", + "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", "from": "system", - "setting_id": "sE2DGjOmcjRuuh0z", - "filament_id": "OFsxlLdo", + "setting_id": "6jbwOYmS2ypqTshH", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json similarity index 87% rename from resources/profiles/Qidi/filament/Qidi Generic ASA.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi.json index 5c955f6322..6057fbea4a 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic ASA.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic ASA", + "name": "Generic ASA @Qidi", "inherits": "fdm_filament_asa", + "renamed_from": "Qidi Generic ASA", "from": "system", - "setting_id": "WTOEo36YTIFcXDaI", - "filament_id": "OFsxlLdo", + "setting_id": "IO7E03K3t2sySCAM", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_type": [ "ASA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA.json b/resources/profiles/Qidi/filament/Generic PA @Qidi.json similarity index 89% rename from resources/profiles/Qidi/filament/Qidi Generic PA.json rename to resources/profiles/Qidi/filament/Generic PA @Qidi.json index 640faa445f..c27771e405 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA.json +++ b/resources/profiles/Qidi/filament/Generic PA @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PA", + "name": "Generic PA @Qidi", "inherits": "fdm_filament_pa", + "renamed_from": "Qidi Generic PA", "from": "system", - "setting_id": "S6S5nM9zZbNCyhya", - "filament_id": "OFQbqeN7", + "setting_id": "la9e4F5ns9eWv7Lg", + "filament_id": "OFg8ndtj", "instantiation": "true", "filament_type": [ "PA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json similarity index 90% rename from resources/profiles/Qidi/filament/Qidi Generic PA-CF.json rename to resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json index ee5c5b3206..bdf39e1630 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json +++ b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PA-CF", + "name": "Generic PA-CF @Qidi", "inherits": "fdm_filament_pa", + "renamed_from": "Qidi Generic PA-CF", "from": "system", - "setting_id": "aOVEazsct9L3eD2u", - "filament_id": "OFPy0Ogq", + "setting_id": "qLuGt33iENH6QTjv", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.2 nozzle.json similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PC @0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi 0.2 nozzle.json index 80e7acafbe..8573598189 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.2 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @0.2 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "i4Nt0riiDwptxOIe", - "filament_id": "OFK01afJ", + "setting_id": "Ei2Izb38mh4A4wgw", + "filament_id": "OFLakOUI", "instantiation": "true", "pressure_advance": [ "0.04" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.8 nozzle.json similarity index 51% rename from resources/profiles/Qidi/filament/Qidi Generic PC @0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi 0.8 nozzle.json index 774e1deed8..491f5917d3 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi 0.8 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @0.8 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "8mJysYABmQTBlWLw", - "filament_id": "OFK01afJ", + "setting_id": "marM5nqtpl08NP9b", + "filament_id": "OFLakOUI", "instantiation": "true", "pressure_advance": [ "0.008" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json index b869e3db14..fb85345598 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.2 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "be2KpgVjm4APQtrt", - "filament_id": "OFK01afJ", + "setting_id": "5sAcMTaVI41PCs3n", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json index edcb7070ad..b7057b6c2f 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "9aGpKzNCjXDcfmqr", - "filament_id": "OFK01afJ", + "setting_id": "QmaeYzkbcmKJCJSv", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json index 4e018cf7e0..56a5a8e132 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "1BjBpSDoLs6nTHeo", - "filament_id": "OFK01afJ", + "setting_id": "heIlhCMIZ9MXeDHE", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json index 33ef6fa1b2..13f13ea759 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi Q1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "8ptIGtXeMSwVqkVB", - "filament_id": "OFK01afJ", + "setting_id": "JlztE3hk1LB23o4h", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.2 nozzle.json index bb41002e5a..29c7c1658b 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "IQCYG5yZFPsvTuHY", - "filament_id": "OFK01afJ", + "setting_id": "2eI2cXfCN6vlk6UV", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.4 nozzle.json index 1eb5bf3ae6..ba52effd22 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "TPbG7zlsPowdKEVw", - "filament_id": "OFK01afJ", + "setting_id": "kGhUT0TAXku3by9D", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.6 nozzle.json index ef7aadea0b..e3f9c180ba 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "mzsetSq0CzwqbGnP", - "filament_id": "OFK01afJ", + "setting_id": "HzAwEYvedOi3GRMY", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 50% rename from resources/profiles/Qidi/filament/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi X-Plus 4 0.8 nozzle.json index 4cc95f36fe..e6c8d1586d 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic PC", + "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", "from": "system", - "setting_id": "wlnm88gEKcNzvx7W", - "filament_id": "OFK01afJ", + "setting_id": "iq1u1nPMi9GT31p9", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC.json b/resources/profiles/Qidi/filament/Generic PC @Qidi.json similarity index 88% rename from resources/profiles/Qidi/filament/Qidi Generic PC.json rename to resources/profiles/Qidi/filament/Generic PC @Qidi.json index 8d17246464..c69f050f5c 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PC.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PC", + "name": "Generic PC @Qidi", "inherits": "fdm_filament_pc", + "renamed_from": "Qidi Generic PC", "from": "system", - "setting_id": "wd4PrqXE2um46ueW", - "filament_id": "OFK01afJ", + "setting_id": "m1fBauBqqvKdIAAr", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_type": [ "PC" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json index 4dc4f79a35..02004cab28 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "GfDMSO3DjLxfMnUc", - "filament_id": "OFKNAhls", + "setting_id": "D2QwO7VczuscejBF", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json similarity index 68% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json index 8cc579f330..10a2b2f080 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "SzQLWO8poDxEU0ez", - "filament_id": "OFKNAhls", + "setting_id": "GeV4szn47hD1UedT", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" @@ -22,7 +23,7 @@ "10" ], "filament_settings_id": [ - "Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle" + "Generic PETG @Qidi Q1 Pro 0.4 nozzle" ], "overhang_fan_speed": [ "90" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json index f3006cef44..995b79eb68 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "yyfoSMlQsvkmUGR5", - "filament_id": "OFKNAhls", + "setting_id": "hwVzOmBJL0wnhzVj", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json index 6ba08141b2..f1d1298d8d 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "ogHITGUcn1r2bHXc", - "filament_id": "OFKNAhls", + "setting_id": "QKyHd7rHutldls1y", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi X-Max 3 0.2 nozzle.json index 6ca659d410..9eb15c7a9c 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "CVyv3PHeZaSGmD6E", - "filament_id": "OFKNAhls", + "setting_id": "afJiGzHpK1vEgb0S", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 3 0.2 nozzle.json index f3a451fa22..7994ab710f 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "tNl6q6MadSoFZ3EH", - "filament_id": "OFKNAhls", + "setting_id": "grlFOKGDoAo075zz", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.2 nozzle.json index c30b0b9c48..f8de246245 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "1xGw8fYiSf6YzBnk", - "filament_id": "OFKNAhls", + "setting_id": "hb1v0ytZ8KFm0KeO", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 68% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.4 nozzle.json index 19eee209c1..0419f9669d 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "MMSCic1l0b3e5qe3", - "filament_id": "OFKNAhls", + "setting_id": "V8YvTFXnlItPw97m", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" @@ -25,7 +26,7 @@ "10" ], "filament_settings_id": [ - "Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle" + "Generic PETG @Qidi X-Plus 4 0.4 nozzle" ], "overhang_fan_speed": [ "90" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.6 nozzle.json index 320522f3b2..f4a3448c63 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "KD0ABMKuQunww07p", - "filament_id": "OFKNAhls", + "setting_id": "X9FiUfQBLABTKIKO", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 71% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi X-Plus 4 0.8 nozzle.json index df1d833154..6bc15f85a2 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "ZFkH9oLkRWDVovLu", - "filament_id": "OFKNAhls", + "setting_id": "5XdW6h65aMPX61o9", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 70% rename from resources/profiles/Qidi/filament/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi X-Smart 3 0.2 nozzle.json index 7a659abfe5..ac5c820791 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Qidi Generic PETG", + "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", "from": "system", - "setting_id": "ixR5wIrehSmn8Inz", - "filament_id": "OFKNAhls", + "setting_id": "MynfKhfKlXwFaVOJ", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json similarity index 89% rename from resources/profiles/Qidi/filament/Qidi Generic PETG.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi.json index a46451b4b2..b4747dc9df 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG", + "name": "Generic PETG @Qidi", "inherits": "fdm_filament_pet", + "renamed_from": "Qidi Generic PETG", "from": "system", - "setting_id": "Yk3w834THlnAS3jr", - "filament_id": "OFKNAhls", + "setting_id": "zRfo4sbJ3auEJtiC", + "filament_id": "OFYPdQJh", "instantiation": "true", "filament_type": [ "PETG" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json similarity index 92% rename from resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json rename to resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json index 41a8a19505..fbe5386405 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json +++ b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PETG-CF", + "name": "Generic PETG-CF @Qidi", "inherits": "fdm_filament_pet", + "renamed_from": "Qidi Generic PETG-CF", "from": "system", - "setting_id": "kjmXKWCMonhYhy8U", - "filament_id": "OFfZ0lTS", + "setting_id": "1ehKRzcekplfoFdJ", + "filament_id": "OFoYSJKi", "instantiation": "true", "temperature_vitrification": [ "75" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json index c4ee570822..4c0c00e6ba 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "6e0DHBzRkQvU0419", - "filament_id": "OFu79SUH", + "setting_id": "2TNFziuyxg2X4zgY", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json similarity index 55% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json index b8dc934bf9..5b49e8560e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -1,16 +1,17 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "eCR3lbTRdkYcMZgl", - "filament_id": "OFu79SUH", + "setting_id": "PNCPMC8uMY9h5SZr", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_max_volumetric_speed": [ "14" ], "filament_settings_id": [ - "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle" + "Generic PLA @Qidi Q1 Pro 0.4 nozzle" ], "full_fan_speed_layer": [ "3" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json index 9cb96bf501..442f46e559 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "JSQupeTNYtzE8l6q", - "filament_id": "OFu79SUH", + "setting_id": "23t94qXoDPSdi7fS", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json index 88954db351..d915ed03a8 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "n4rp1Pooux07hwx1", - "filament_id": "OFu79SUH", + "setting_id": "aWIicFWyadhnYKfF", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.2 nozzle.json index 8784aa33ac..52ee24c470 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "P57Nm7E7KTnHMov0", - "filament_id": "OFu79SUH", + "setting_id": "VhP4JYzAah2X1Kr3", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" 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 new file mode 100644 index 0000000000..76521556dd --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.6 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "uhzFvazl2rWd0YN3", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "pressure_advance": [ + "0.016" + ], + "compatible_printers": [ + "Qidi X-Max 3 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..4246b7fc19 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Max 3 0.8 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "t7bkbAgWCK7ObiK4", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "pressure_advance": [ + "0.008" + ], + "compatible_printers": [ + "Qidi X-Max 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.2 nozzle.json index aed12c1545..7508b21dc3 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "WwUGv09h9thWkzMf", - "filament_id": "OFsXOMoX", + "setting_id": "1iUDRQmhNsb4Tlag", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" 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 new file mode 100644 index 0000000000..fcdcb48de7 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.6 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "qbT3T9cRjqK7aO4M", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "pressure_advance": [ + "0.016" + ], + "compatible_printers": [ + "Qidi X-Plus 3 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..d42c838771 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 3 0.8 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "dMVLTDJInWMo2fMP", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "pressure_advance": [ + "0.008" + ], + "compatible_printers": [ + "Qidi X-Plus 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.2 nozzle.json index d59bd63cc0..8124fb26b0 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "M0JCDyI7icGyqs43", - "filament_id": "OFu79SUH", + "setting_id": "4OyCs9habQtGhoot", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 54% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.4 nozzle.json index a940104863..90d822953f 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "tRztgu06hBi9IxSE", - "filament_id": "OFu79SUH", + "setting_id": "SU5XqpfPO5g87dfL", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_max_volumetric_speed": [ "14" @@ -13,7 +14,7 @@ "0.034" ], "filament_settings_id": [ - "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle" + "Generic PLA @Qidi X-Plus 4 0.4 nozzle" ], "full_fan_speed_layer": [ "3" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.6 nozzle.json index 1581dfb47e..2cc9b574c1 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "8XzQCGoYi01mIjNY", - "filament_id": "OFu79SUH", + "setting_id": "7ALKguzkoK6KLHVv", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi X-Plus 4 0.8 nozzle.json index d39b789104..2f0ab0b4c7 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "hkeictJYR1KDX7kB", - "filament_id": "OFu79SUH", + "setting_id": "jzfMNZP4WaNcNixD", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.2 nozzle.json index a2359aff5e..c9af562ff6 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "KTkq14RsduGBSdMZ", - "filament_id": "OFsXOMoX", + "setting_id": "gNbvzCkxedrQ7nQe", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" 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 new file mode 100644 index 0000000000..497283dd4c --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.6 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "t8uPl9peXZRJbdLj", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "pressure_advance": [ + "0.016" + ], + "compatible_printers": [ + "Qidi X-Smart 3 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..6b125ee3aa --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi X-Smart 3 0.8 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "VsoBEmU35N8eW3CO", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "pressure_advance": [ + "0.008" + ], + "compatible_printers": [ + "Qidi X-Smart 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json similarity index 81% rename from resources/profiles/Qidi/filament/Qidi Generic PLA.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi.json index dd060727ed..e3e1f6eb48 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA", + "name": "Generic PLA @Qidi", "inherits": "fdm_filament_pla", + "renamed_from": "Qidi Generic PLA", "from": "system", - "setting_id": "tmrmjsN8vDKGlNpX", - "filament_id": "OFu79SUH", + "setting_id": "illxClFj0LphvnHh", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_type": [ "PLA" 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 new file mode 100644 index 0000000000..75f9a19364 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json @@ -0,0 +1,25 @@ +{ + "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", + "from": "system", + "setting_id": "ktWvoEzkA0mJ0Q5T", + "filament_id": "OFmpMwxS", + "instantiation": "true", + "slow_down_layer_time": [ + "6" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "pressure_advance": [ + "0.034" + ], + "nozzle_temperature": [ + "220" + ], + "compatible_printers": [ + "Qidi X-Plus 4 0.2 nozzle" + ] +} 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 new file mode 100644 index 0000000000..7067954ef5 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json @@ -0,0 +1,25 @@ +{ + "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", + "from": "system", + "setting_id": "lBa0yfqPsQgr4U3m", + "filament_id": "OFmpMwxS", + "instantiation": "true", + "slow_down_layer_time": [ + "6" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "pressure_advance": [ + "0.034" + ], + "nozzle_temperature": [ + "220" + ], + "compatible_printers": [ + "Qidi X-Plus 4 0.4 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 51% rename from resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle.json index 73b241ea48..d4bd50b020 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle", + "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", "from": "system", - "setting_id": "VqVyXnU77CZCKsNy", - "filament_id": "OFS8JF3S", + "setting_id": "Ls5CQx5Yf8QuC4T3", + "filament_id": "OFmpMwxS", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 51% rename from resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle.json index 47fe217eb7..dd77278778 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle", + "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", "from": "system", - "setting_id": "0504CZkoYLx6NMI0", - "filament_id": "OFS8JF3S", + "setting_id": "VyCsuptxJnVw1KqD", + "filament_id": "OFmpMwxS", "instantiation": "true", "slow_down_layer_time": [ "6" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 60% rename from resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle.json index 9088564556..fbf48ad575 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic PLA Silk", + "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", "from": "system", - "setting_id": "lRRlOS4Xd1pGLIEq", - "filament_id": "OFy4ajVZ", + "setting_id": "VusYzaMdLpjravVc", + "filament_id": "OFesA6rF", "instantiation": "true", "enable_pressure_advance": "1", "pressure_advance": [ diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 60% rename from resources/profiles/Qidi/filament/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle.json index 19d91f0f9c..bbfd984880 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic PLA Silk", + "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", "from": "system", - "setting_id": "DaBZGfcdheWjNdgr", - "filament_id": "OFy4ajVZ", + "setting_id": "9GVORPqwLq0s3mlY", + "filament_id": "OFesA6rF", "instantiation": "true", "enable_pressure_advance": "1", "pressure_advance": [ diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json similarity index 89% rename from resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json rename to resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json index 8f195626d2..c9fed29f60 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json +++ b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA Silk", + "name": "Generic PLA Silk @Qidi", "inherits": "fdm_filament_pla", + "renamed_from": "Qidi Generic PLA Silk", "from": "system", - "setting_id": "OATeG6kIIRyViXbn", - "filament_id": "OFy4ajVZ", + "setting_id": "qmNmFB6yN23u389x", + "filament_id": "OFesA6rF", "instantiation": "true", "enable_pressure_advance": "1", "filament_type": [ diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json similarity index 55% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json index 5639be330a..e61e507c68 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "dmKDk6Yb4zQFCWIe", - "filament_id": "OFsXOMoX", + "setting_id": "S5IihmYwqdoEXiOT", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json similarity index 51% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json index d78cdb3490..842010a166 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle.json @@ -1,13 +1,14 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "vwFHzxD2MrRieUIw", - "filament_id": "OFsXOMoX", + "setting_id": "iZYrNv7L15yrfAPR", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_settings_id": [ - "Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle" + "Generic PLA+ @Qidi Q1 Pro 0.4 nozzle" ], "full_fan_speed_layer": [ "3" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json similarity index 55% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json index cef91d9faa..1b48ab6b10 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "wlXNWvECV8ylNVFF", - "filament_id": "OFsXOMoX", + "setting_id": "zDYfWdaJGDL64gzD", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json similarity index 55% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json index 9d0b6428cc..677620b7b7 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "gR4NZ8mgTNVxxjhh", - "filament_id": "OFsXOMoX", + "setting_id": "eAtbANg8BCzaurOY", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.2 nozzle.json index c21f2a31df..f3fa9ec4b4 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "wCdBhg6B4tQZw7dp", - "filament_id": "OFsXOMoX", + "setting_id": "ak1iDHwta1iV5CXw", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" 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 new file mode 100644 index 0000000000..2e151c9e14 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "JwpYPwMfRZtymarF", + "filament_id": "OFEWYR89", + "instantiation": "true", + "pressure_advance": [ + "0.016" + ], + "compatible_printers": [ + "Qidi X-Max 3 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..b829c40c1a --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "ZOuRUZf07g43ZV9u", + "filament_id": "OFEWYR89", + "instantiation": "true", + "pressure_advance": [ + "0.008" + ], + "compatible_printers": [ + "Qidi X-Max 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle.json index ca0eeb74ba..2a761a1946 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "JJmzlY5XOz9eGO8n", - "filament_id": "OFu79SUH", + "setting_id": "DujfIhzIsPDdHZlg", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" 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 new file mode 100644 index 0000000000..657b16a6a4 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "BA46FjbkAt4dhdfQ", + "filament_id": "OFEWYR89", + "instantiation": "true", + "pressure_advance": [ + "0.016" + ], + "compatible_printers": [ + "Qidi X-Plus 3 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..9455380809 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "TEqTy5MhYC1CLkrr", + "filament_id": "OFEWYR89", + "instantiation": "true", + "pressure_advance": [ + "0.008" + ], + "compatible_printers": [ + "Qidi X-Plus 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 59% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle.json index 4e5928cf60..ecfb501bb0 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "XUhGdonOGCUI34EH", - "filament_id": "OFsXOMoX", + "setting_id": "TO1cgOHqLFnimX9m", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 51% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle.json index 53d4d543ae..c0ff54ee65 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,16 +1,17 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "yvokLiCctDUmcDCR", - "filament_id": "OFsXOMoX", + "setting_id": "Dyf2Y7pDd4UWIIJ5", + "filament_id": "OFEWYR89", "instantiation": "true", "pressure_advance": [ "0.034" ], "filament_settings_id": [ - "Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle" + "Generic PLA+ @Qidi X-Plus 4 0.4 nozzle" ], "full_fan_speed_layer": [ "3" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle.json index 72afba15b9..5ddca086f7 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "gZxafcPwX1hqI7Dm", - "filament_id": "OFsXOMoX", + "setting_id": "ty1M4Mik83FlDWKj", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle.json index 4eced792ff..937e85aff4 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic PLA+", + "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", "from": "system", - "setting_id": "j6fJ7L02mVcZ01fO", - "filament_id": "OFsXOMoX", + "setting_id": "Wyo0NeD4dPzA365C", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 55% rename from resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle.json index eeb8a443ef..a32c884550 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle", - "inherits": "Qidi Generic PLA", + "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", "from": "system", - "setting_id": "4YnRWwYLWMODUHXq", - "filament_id": "OFu79SUH", + "setting_id": "lypNmywVe3qfhs2q", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_flow_ratio": [ "0.98" 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 new file mode 100644 index 0000000000..fe84ef4f8c --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "Hxpe6y8Xo37WmcQr", + "filament_id": "OFEWYR89", + "instantiation": "true", + "pressure_advance": [ + "0.016" + ], + "compatible_printers": [ + "Qidi X-Smart 3 0.6 nozzle" + ] +} 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 new file mode 100644 index 0000000000..59a6efb166 --- /dev/null +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json @@ -0,0 +1,16 @@ +{ + "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", + "from": "system", + "setting_id": "2jjI8l22cAXTuxMl", + "filament_id": "OFEWYR89", + "instantiation": "true", + "pressure_advance": [ + "0.008" + ], + "compatible_printers": [ + "Qidi X-Smart 3 0.8 nozzle" + ] +} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+.json b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi.json similarity index 83% rename from resources/profiles/Qidi/filament/Qidi Generic PLA+.json rename to resources/profiles/Qidi/filament/Generic PLA+ @Qidi.json index 9ed1642e89..2c1e136f6b 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+.json +++ b/resources/profiles/Qidi/filament/Generic PLA+ @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA+", + "name": "Generic PLA+ @Qidi", "inherits": "fdm_filament_pla", + "renamed_from": "Qidi Generic PLA+", "from": "system", - "setting_id": "LNjBixpjLg5i8P1d", - "filament_id": "OFsXOMoX", + "setting_id": "JhZ9hP9n1gBNGwBq", + "filament_id": "OFEWYR89", "instantiation": "true", "filament_type": [ "PLA" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json similarity index 89% rename from resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json rename to resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json index b3e70b1a47..1381442943 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json +++ b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PLA-CF", + "name": "Generic PLA-CF @Qidi", "inherits": "fdm_filament_pla", + "renamed_from": "Qidi Generic PLA-CF", "from": "system", - "setting_id": "bJKgxsU0tR1NDtoN", - "filament_id": "OFQTrLXB", + "setting_id": "XspRlBSqR3DsiFBM", + "filament_id": "OFWbdGsC", "instantiation": "true", "required_nozzle_HRC": [ "40" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PVA.json b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json similarity index 89% rename from resources/profiles/Qidi/filament/Qidi Generic PVA.json rename to resources/profiles/Qidi/filament/Generic PVA @Qidi.json index 23d6c89d40..ffd25855a1 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic PVA.json +++ b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic PVA", + "name": "Generic PVA @Qidi", "inherits": "fdm_filament_pva", + "renamed_from": "Qidi Generic PVA", "from": "system", - "setting_id": "8450opPMJm6GG5Cq", - "filament_id": "OFNZYgLA", + "setting_id": "dmGcoGkH9lvmgsJL", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_type": [ "PVA" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 57% rename from resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle.json index 19b01dbf26..3fab5170d7 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", - "inherits": "Qidi Generic TPU 95A", + "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", "from": "system", - "setting_id": "0gGSrFIulk4gPLSp", - "filament_id": "OFWukXja", + "setting_id": "lwRnIxnWLYp1Hww4", + "filament_id": "OFjiXpyf", "instantiation": "true", "fan_cooling_layer_time": [ "60" @@ -13,7 +14,7 @@ "4" ], "filament_settings_id": [ - "Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle" + "Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle" ], "nozzle_temperature": [ "220" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 56% rename from resources/profiles/Qidi/filament/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json rename to resources/profiles/Qidi/filament/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle.json index ee19db18a9..7e964fd0b8 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", - "inherits": "Qidi Generic TPU 95A", + "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", "from": "system", - "setting_id": "5fkE2aGkghsMdZ1W", - "filament_id": "OFWukXja", + "setting_id": "BPUUHxYPhHcPIWs9", + "filament_id": "OFjiXpyf", "instantiation": "true", "fan_cooling_layer_time": [ "60" @@ -13,7 +14,7 @@ "4" ], "filament_settings_id": [ - "Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle" + "Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle" ], "nozzle_temperature": [ "220" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi.json similarity index 87% rename from resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json rename to resources/profiles/Qidi/filament/Generic TPU 95A @Qidi.json index 04e75b3633..2c9602ee2e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU 95A.json +++ b/resources/profiles/Qidi/filament/Generic TPU 95A @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic TPU 95A", + "name": "Generic TPU 95A @Qidi", "inherits": "fdm_filament_tpu", + "renamed_from": "Qidi Generic TPU 95A", "from": "system", - "setting_id": "JWZrlYnOOlGpTEg6", - "filament_id": "OFWukXja", + "setting_id": "nXjylLuhXqtlLGEv", + "filament_id": "OFjiXpyf", "instantiation": "true", "filament_type": [ "TPU" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json index f54208a542..93793f8d8e 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", - "inherits": "Qidi Generic TPU", + "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", "from": "system", - "setting_id": "s0MMbJlTt9Cbh8FQ", - "filament_id": "OFZsChIG", + "setting_id": "ToMKfKFZDCHyEHw9", + "filament_id": "OFgbpcy9", "instantiation": "true", "fan_cooling_layer_time": [ "60" @@ -13,7 +14,7 @@ "4" ], "filament_settings_id": [ - "Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle" + "Generic TPU @Qidi Q1 Pro 0.4 nozzle" ], "nozzle_temperature": [ "230" diff --git a/resources/profiles/Qidi/filament/Qidi 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 similarity index 53% rename from resources/profiles/Qidi/filament/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle.json rename to resources/profiles/Qidi/filament/Generic TPU @Qidi X-Plus 4 0.4 nozzle.json index 67d47da272..f1c8117c47 100644 --- a/resources/profiles/Qidi/filament/Qidi 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,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic TPU", + "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", "from": "system", - "setting_id": "KqdGTkLW1x7oZpvj", - "filament_id": "OFZsChIG", + "setting_id": "AACIHxmLhuNAGo6d", + "filament_id": "OFgbpcy9", "instantiation": "true", "fan_cooling_layer_time": [ "60" @@ -13,7 +14,7 @@ "4" ], "filament_settings_id": [ - "Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle" + "Generic TPU @Qidi X-Plus 4 0.4 nozzle" ], "nozzle_temperature": [ "230" diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json similarity index 87% rename from resources/profiles/Qidi/filament/Qidi Generic TPU.json rename to resources/profiles/Qidi/filament/Generic TPU @Qidi.json index bf4d662d62..a525b49520 100644 --- a/resources/profiles/Qidi/filament/Qidi Generic TPU.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Qidi Generic TPU", + "name": "Generic TPU @Qidi", "inherits": "fdm_filament_tpu", + "renamed_from": "Qidi Generic TPU", "from": "system", - "setting_id": "qvJXA6V5mxiOguUj", - "filament_id": "OFZsChIG", + "setting_id": "0jwJs0mTFs0904VK", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_type": [ "TPU" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json index e199e58998..fc2d6d8ba6 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -19,7 +19,7 @@ "16" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle" + "Generic ASA @Qidi Q1 Pro 0.4 nozzle" ], "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json index 39b0b7be70..f9dfff9d99 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi X-Plus 4 0.4 nozzle.json @@ -19,7 +19,7 @@ "16" ], "filament_settings_id": [ - "Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle" + "Generic ASA @Qidi X-Plus 4 0.4 nozzle" ], "nozzle_temperature": [ "255" diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json deleted file mode 100644 index c66a485d3b..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle", - "inherits": "Qidi Generic PLA", - "from": "system", - "setting_id": "DWfVtYimjZxqyDzM", - "filament_id": "OFu79SUH", - "instantiation": "true", - "pressure_advance": [ - "0.016" - ], - "compatible_printers": [ - "Qidi X-Max 3 0.6 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json deleted file mode 100644 index 004bd0cda5..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle", - "inherits": "Qidi Generic PLA", - "from": "system", - "setting_id": "ausfQ4SuKLMuruFb", - "filament_id": "OFu79SUH", - "instantiation": "true", - "pressure_advance": [ - "0.008" - ], - "compatible_printers": [ - "Qidi X-Max 3 0.8 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json deleted file mode 100644 index ea5c6e5f2a..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle", - "inherits": "Qidi Generic PLA", - "from": "system", - "setting_id": "EpYu1ME5tSsFYirK", - "filament_id": "OFu79SUH", - "instantiation": "true", - "pressure_advance": [ - "0.016" - ], - "compatible_printers": [ - "Qidi X-Plus 3 0.6 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json deleted file mode 100644 index 9b99d1a90f..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle", - "inherits": "Qidi Generic PLA", - "from": "system", - "setting_id": "wZ8U1Ga1bQXbd2nN", - "filament_id": "OFu79SUH", - "instantiation": "true", - "pressure_advance": [ - "0.008" - ], - "compatible_printers": [ - "Qidi X-Plus 3 0.8 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json deleted file mode 100644 index 683f582678..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle", - "inherits": "Qidi Generic PLA", - "from": "system", - "setting_id": "bKi57zeQX7mAw7kl", - "filament_id": "OFu79SUH", - "instantiation": "true", - "pressure_advance": [ - "0.016" - ], - "compatible_printers": [ - "Qidi X-Smart 3 0.6 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json deleted file mode 100644 index d4836a5f3d..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle", - "inherits": "Qidi Generic PLA", - "from": "system", - "setting_id": "lscOLQTFf4Y3Ax1f", - "filament_id": "OFu79SUH", - "instantiation": "true", - "pressure_advance": [ - "0.008" - ], - "compatible_printers": [ - "Qidi X-Smart 3 0.8 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json deleted file mode 100644 index 2c20544437..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", - "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle", - "from": "system", - "setting_id": "HaE0HFgjT8wysrVT", - "filament_id": "OFS8JF3S", - "instantiation": "true", - "slow_down_layer_time": [ - "6" - ], - "filament_max_volumetric_speed": [ - "2" - ], - "pressure_advance": [ - "0.034" - ], - "nozzle_temperature": [ - "220" - ], - "compatible_printers": [ - "Qidi X-Plus 4 0.2 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json deleted file mode 100644 index e4c16f3697..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", - "inherits": "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", - "from": "system", - "setting_id": "vxXEJP3C4k5Zjvsx", - "filament_id": "OFS8JF3S", - "instantiation": "true", - "slow_down_layer_time": [ - "6" - ], - "filament_max_volumetric_speed": [ - "18" - ], - "pressure_advance": [ - "0.034" - ], - "nozzle_temperature": [ - "220" - ], - "compatible_printers": [ - "Qidi X-Plus 4 0.4 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json deleted file mode 100644 index 29c72ccfe5..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle", - "inherits": "Qidi Generic PLA+", - "from": "system", - "setting_id": "7Bxn8OUT1MJbNvxC", - "filament_id": "OFsXOMoX", - "instantiation": "true", - "pressure_advance": [ - "0.016" - ], - "compatible_printers": [ - "Qidi X-Max 3 0.6 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json deleted file mode 100644 index b034072cbb..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle", - "inherits": "Qidi Generic PLA+", - "from": "system", - "setting_id": "miQxMqjI3odS4V1O", - "filament_id": "OFsXOMoX", - "instantiation": "true", - "pressure_advance": [ - "0.008" - ], - "compatible_printers": [ - "Qidi X-Max 3 0.8 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json deleted file mode 100644 index 4e3df63a29..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", - "inherits": "Qidi Generic PLA+", - "from": "system", - "setting_id": "oAIJyTMV5EnXTJDF", - "filament_id": "OFsXOMoX", - "instantiation": "true", - "pressure_advance": [ - "0.016" - ], - "compatible_printers": [ - "Qidi X-Plus 3 0.6 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json deleted file mode 100644 index 4d1ec90cb1..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", - "inherits": "Qidi Generic PLA+", - "from": "system", - "setting_id": "Ya2viE6yXmdshs75", - "filament_id": "OFsXOMoX", - "instantiation": "true", - "pressure_advance": [ - "0.008" - ], - "compatible_printers": [ - "Qidi X-Plus 3 0.8 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json deleted file mode 100644 index e2d3c6b536..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", - "inherits": "Qidi Generic PLA+", - "from": "system", - "setting_id": "xiomvJqo2HAwsxT0", - "filament_id": "OFsXOMoX", - "instantiation": "true", - "pressure_advance": [ - "0.016" - ], - "compatible_printers": [ - "Qidi X-Smart 3 0.6 nozzle" - ] -} diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json deleted file mode 100644 index f438b1f7c0..0000000000 --- a/resources/profiles/Qidi/filament/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "filament", - "name": "Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", - "inherits": "Qidi Generic PLA+", - "from": "system", - "setting_id": "3SemJWSvKeN7OXVy", - "filament_id": "OFsXOMoX", - "instantiation": "true", - "pressure_advance": [ - "0.008" - ], - "compatible_printers": [ - "Qidi X-Smart 3 0.8 nozzle" - ] -} diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json index 8b4274e094..a097f39bab 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi Q1 Pro", "printer_variant": "0.2", "default_filament_profile": [ - "Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle" + "Generic PLA @Qidi Q1 Pro 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi Q1 Pro 0.2 nozzle", "max_layer_height": [ 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 a97a66730b..a085ce6cfe 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 @@ -82,6 +82,6 @@ "machine_start_gcode": "PRINT_START BED=[hot_plate_temp_initial_layer] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperature]\nM83\nM140 S[hot_plate_temp_initial_layer]\nM104 S[nozzle_temperature_initial_layer]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 5, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\n", "thumbnails_format": "PNG", "default_filament_profile": [ - "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle" + "Generic PLA @Qidi Q1 Pro 0.4 nozzle" ] } diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json index 3e2e07d54f..fb2d73df60 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi Q1 Pro", "printer_variant": "0.6", "default_filament_profile": [ - "Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle" + "Generic PLA @Qidi Q1 Pro 0.6 nozzle" ], "default_print_profile": "0.30mm Standard @Qidi Q1 Pro 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json index 5dea524660..4d99e1a77d 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi Q1 Pro", "printer_variant": "0.8", "default_filament_profile": [ - "Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle" + "Generic PLA @Qidi Q1 Pro 0.8 nozzle" ], "default_print_profile": "0.40mm Standard @Qidi Q1 Pro 0.8 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro.json index d6102cf61f..ef9803cbd9 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro.json @@ -8,5 +8,5 @@ "bed_model": "qidi_Q1Pro_buildplate_model.stl", "bed_texture": "qidi_Q1Pro_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", - "default_materials": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle;QIDI ASA @Qidi Q1 Pro 0.4 nozzle;QIDI ASA @Qidi Q1 Pro 0.2 nozzle;QIDI ASA @Qidi Q1 Pro 0.6 nozzle;QIDI ASA @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle;Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle;Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle" + "default_materials": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle;QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle;QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle;QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle;QIDI ASA @Qidi Q1 Pro 0.4 nozzle;QIDI ASA @Qidi Q1 Pro 0.2 nozzle;QIDI ASA @Qidi Q1 Pro 0.6 nozzle;QIDI ASA @Qidi Q1 Pro 0.8 nozzle;Generic PETG @Qidi Q1 Pro 0.4 nozzle;Generic PETG @Qidi Q1 Pro 0.2 nozzle;Generic PETG @Qidi Q1 Pro 0.6 nozzle;Generic PETG @Qidi Q1 Pro 0.8 nozzle;Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle;Generic PLA @Qidi Q1 Pro 0.4 nozzle;Generic PLA @Qidi Q1 Pro 0.2 nozzle;Generic PLA @Qidi Q1 Pro 0.6 nozzle;Generic PLA @Qidi Q1 Pro 0.8 nozzle" } diff --git a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json index c82db4969e..a41e2b6a11 100644 --- a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json @@ -98,7 +98,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "machine_start_gcode": "G28\nM140 S[hot_plate_temp_initial_layer]\nM190 S[hot_plate_temp_initial_layer]\nM109 S[nozzle_temperature_initial_layer]\nG92 E-19\nG0 Y5 Z0.3 F3600\nG1 X5 E0 F2400\n", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n", diff --git a/resources/profiles/Qidi/machine/Qidi X-CF Pro.json b/resources/profiles/Qidi/machine/Qidi X-CF Pro.json index b70c4bc480..7729b8612d 100644 --- a/resources/profiles/Qidi/machine/Qidi X-CF Pro.json +++ b/resources/profiles/Qidi/machine/Qidi X-CF Pro.json @@ -8,5 +8,5 @@ "bed_model": "qidi_xcfpro_buildplate_model.stl", "bed_texture": "qidi_xcfpro_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen2_hotend.stl", - "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU 95A" + "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Generic ASA @Qidi;Generic ABS @Qidi;Generic PA-CF @Qidi;Generic PA @Qidi;Generic PC @Qidi;Generic PETG-CF @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi;Generic PLA-CF @Qidi;Generic PVA @Qidi;Generic TPU 95A @Qidi" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json index 76577d5f38..b1196c0e70 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json @@ -98,7 +98,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "machine_start_gcode": "G28\nG92 E0\nG0 X300 Y5 Z50 F3600\nM190 S[bed_temperature_initial_layer_single]\nM109 S[first_layer_temperature]\nG92 E-19\n", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n", diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json index d6b10d422d..84ae0879fe 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Max 3", "printer_variant": "0.2", "default_filament_profile": [ - "Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle" + "Generic PLA @Qidi X-Max 3 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi XMax3 0.2 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json index 655b4e32c8..d9ba740281 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json @@ -46,6 +46,6 @@ "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ] } diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json index d0d5ac6e04..c10a1c0254 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Max 3", "printer_variant": "0.6", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "default_print_profile": "0.30mm Standard @Qidi XMax3 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json index c8042e7e3a..4d04574c15 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Max 3", "printer_variant": "0.8", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "default_print_profile": "0.40mm Standard @Qidi XMax3 0.8 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3.json b/resources/profiles/Qidi/machine/Qidi X-Max 3.json index 56fc955601..99888a8acf 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3.json @@ -8,5 +8,5 @@ "bed_model": "qidi_xmax3_buildplate_model.stl", "bed_texture": "qidi_xmax3_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", - "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA" + "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Generic ASA @Qidi;Generic ABS @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Max.json b/resources/profiles/Qidi/machine/Qidi X-Max.json index ac917aa5b7..26b0ad47d7 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max.json @@ -8,5 +8,5 @@ "bed_model": "qidi_xmax_buildplate_model.stl", "bed_texture": "qidi_xmax_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen2_hotend.stl", - "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU 95A" + "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PET-CF;QIDI PA12-CF;QIDI PAHT-CF;QIDI ABS-GF25;QIDI PA-Ultra;Generic ASA @Qidi;Generic ABS @Qidi;Generic PA-CF @Qidi;Generic PA @Qidi;Generic PC @Qidi;Generic PETG-CF @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi;Generic PLA-CF @Qidi;Generic PVA @Qidi;Generic TPU 95A @Qidi" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json index ed7f0c24a1..d4e1daee9e 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json @@ -98,7 +98,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "machine_start_gcode": "G28\nG92 E0\nG0 X270 Y5 Z50 F3600\nM190 S[bed_temperature_initial_layer_single]\nM109 S[first_layer_temperature]\nG92 E-16\n", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n", diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json index 382cd364fd..c6a98fc3de 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 3", "printer_variant": "0.2", "default_filament_profile": [ - "Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle" + "Generic PLA @Qidi X-Plus 3 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi XPlus3 0.2 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json index 03159944f0..5d39065f8c 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json @@ -42,6 +42,6 @@ "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ] } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json index 5af64f9934..959f8013e8 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 3", "printer_variant": "0.6", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "default_print_profile": "0.30mm Standard @Qidi XPlus3 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json index 43aa1a2a2b..93aa435c52 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 3", "printer_variant": "0.8", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "default_print_profile": "0.40mm Standard @Qidi XPlus3 0.8 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3.json index 535fc25aef..84df7f37be 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3.json @@ -8,5 +8,5 @@ "bed_model": "qidi_xplus3_buildplate_model.stl", "bed_texture": "qidi_xplus3_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", - "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA" + "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Generic ASA @Qidi;Generic ABS @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.2 nozzle.json index b16849ea80..fe66c4fc60 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 4", "printer_variant": "0.2", "default_filament_profile": [ - "Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle" + "Generic PLA @Qidi X-Plus 4 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi XPlus4 0.2 nozzle", "max_layer_height": [ 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 82e9da78cb..a7d2f09195 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 @@ -97,7 +97,7 @@ "machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperature] EXTRUDER=[initial_no_support_extruder]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperature]\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0] - 12, first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1", "thumbnails_format": "PNG", "default_filament_profile": [ - "Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle" + "Generic PLA @Qidi X-Plus 4 0.4 nozzle" ], "printer_agent": "qidi" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.6 nozzle.json index f33fbeb5dc..116c754002 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 4", "printer_variant": "0.6", "default_filament_profile": [ - "Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle" + "Generic PLA @Qidi X-Plus 4 0.6 nozzle" ], "default_print_profile": "0.30mm Standard @Qidi XPlus4 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.8 nozzle.json index e66c252d0f..d232221c5d 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 4 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Plus 4", "printer_variant": "0.8", "default_filament_profile": [ - "Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle" + "Generic PLA @Qidi X-Plus 4 0.8 nozzle" ], "default_print_profile": "0.40mm Standard @Qidi XPlus4 0.8 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 4.json b/resources/profiles/Qidi/machine/Qidi X-Plus 4.json index 82702cb7dc..ac34a73e34 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 4.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 4.json @@ -8,5 +8,5 @@ "bed_model": "qidi_xplus4_buildplate_model.stl", "bed_texture": "qidi_xplus4_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", - "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PLA Rapido Matte;QIDI ASA;Qidi Generic PETG" + "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PETG Tough;QIDI PLA Rapido Matte;QIDI ASA;Generic PETG @Qidi" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus.json b/resources/profiles/Qidi/machine/Qidi X-Plus.json index 5aa0917d5e..bf30d976ac 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus.json @@ -8,5 +8,5 @@ "bed_model": "qidi_xplus_buildplate_model.stl", "bed_texture": "qidi_xplus_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen2_hotend.stl", - "default_materials": "Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PLA-CF;Qidi Generic PVA;Qidi Generic TPU" + "default_materials": "Generic ASA @Qidi;Generic ABS @Qidi;Generic PA-CF @Qidi;Generic PA @Qidi;Generic PC @Qidi;Generic PETG-CF @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi;Generic PLA-CF @Qidi;Generic PVA @Qidi;Generic TPU @Qidi" } diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json index bd5d6b5bba..e3bc48c8ed 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Smart 3", "printer_variant": "0.2", "default_filament_profile": [ - "Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle" + "Generic PLA @Qidi X-Smart 3 0.2 nozzle" ], "default_print_profile": "0.10mm Standard @Qidi XSmart3 0.2 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json index d224dbf971..f76a264423 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json @@ -48,6 +48,6 @@ "change_filament_gcode": "", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ] } diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json index 255f4d67db..97e5afc5d2 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.6 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Smart 3", "printer_variant": "0.6", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "default_print_profile": "0.30mm Standard @Qidi XSmart3 0.6 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json index ef62543341..a3192db8a5 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.8 nozzle.json @@ -11,7 +11,7 @@ "printer_model": "Qidi X-Smart 3", "printer_variant": "0.8", "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "default_print_profile": "0.40mm Standard @Qidi XSmart3 0.8 nozzle", "max_layer_height": [ diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3.json index 78cd91d3e4..75b3d2e252 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3.json @@ -8,5 +8,5 @@ "bed_model": "qidi_xsmart3_buildplate_model.stl", "bed_texture": "qidi_xsmart3_buildplate_texture.svg", "hotend_model": "qidi_xseries_gen3_hotend.stl", - "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA" + "default_materials": "QIDI PLA Rapido;QIDI ABS Rapido;QIDI PLA Rapido Matte;QIDI PETG Tough;QIDI ASA;Generic ASA @Qidi;Generic ABS @Qidi;Generic PETG @Qidi;Generic PLA Silk @Qidi;Generic PLA @Qidi" } diff --git a/resources/profiles/Qidi/machine/fdm_qidi_common.json b/resources/profiles/Qidi/machine/fdm_qidi_common.json index 99149558f9..38b39c4591 100644 --- a/resources/profiles/Qidi/machine/fdm_qidi_common.json +++ b/resources/profiles/Qidi/machine/fdm_qidi_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Qidi Generic PLA" + "Generic PLA @Qidi" ], "default_print_profile": "0.20mm Standard @QIDI", "bed_exclude_area": [ diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json index 969794f578..128926c992 100644 --- a/resources/profiles/Ratrig.json +++ b/resources/profiles/Ratrig.json @@ -1,6 +1,6 @@ { "name": "RatRig", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "RatRig configurations", "machine_model_list": [ @@ -317,8 +317,8 @@ "sub_path": "filament/RatRig BigNozzle ABS.json" }, { - "name": "RatRig Generic ABS", - "sub_path": "filament/RatRig Generic ABS.json" + "name": "Generic ABS @RatRig", + "sub_path": "filament/Generic ABS @RatRig.json" }, { "name": "RatRig PunkFil ABS", @@ -329,20 +329,20 @@ "sub_path": "filament/RatRig BigNozzle ASA.json" }, { - "name": "RatRig Generic ASA", - "sub_path": "filament/RatRig Generic ASA.json" + "name": "Generic ASA @RatRig", + "sub_path": "filament/Generic ASA @RatRig.json" }, { - "name": "RatRig Generic PA", - "sub_path": "filament/RatRig Generic PA.json" + "name": "Generic PA @RatRig", + "sub_path": "filament/Generic PA @RatRig.json" }, { - "name": "RatRig Generic PA-CF", - "sub_path": "filament/RatRig Generic PA-CF.json" + "name": "Generic PA-CF @RatRig", + "sub_path": "filament/Generic PA-CF @RatRig.json" }, { - "name": "RatRig Generic PC", - "sub_path": "filament/RatRig Generic PC.json" + "name": "Generic PC @RatRig", + "sub_path": "filament/Generic PC @RatRig.json" }, { "name": "RatRig BigNozzle PCTG", @@ -353,12 +353,12 @@ "sub_path": "filament/RatRig BigNozzle PETG.json" }, { - "name": "RatRig Generic PCTG", - "sub_path": "filament/RatRig Generic PCTG.json" + "name": "Generic PCTG @RatRig", + "sub_path": "filament/Generic PCTG @RatRig.json" }, { - "name": "RatRig Generic PETG", - "sub_path": "filament/RatRig Generic PETG.json" + "name": "Generic PETG @RatRig", + "sub_path": "filament/Generic PETG @RatRig.json" }, { "name": "RatRig PunkFil PETG", @@ -373,24 +373,24 @@ "sub_path": "filament/RatRig BigNozzle PLA.json" }, { - "name": "RatRig Generic PLA", - "sub_path": "filament/RatRig Generic PLA.json" + "name": "Generic PLA @RatRig", + "sub_path": "filament/Generic PLA @RatRig.json" }, { - "name": "RatRig Generic PLA-CF", - "sub_path": "filament/RatRig Generic PLA-CF.json" + "name": "Generic PLA-CF @RatRig", + "sub_path": "filament/Generic PLA-CF @RatRig.json" }, { - "name": "RatRig Generic PVA", - "sub_path": "filament/RatRig Generic PVA.json" + "name": "Generic PVA @RatRig", + "sub_path": "filament/Generic PVA @RatRig.json" }, { "name": "RatRig BigNozzle TPU", "sub_path": "filament/RatRig BigNozzle TPU.json" }, { - "name": "RatRig Generic TPU", - "sub_path": "filament/RatRig Generic TPU.json" + "name": "Generic TPU @RatRig", + "sub_path": "filament/Generic TPU @RatRig.json" } ], "machine_list": [ diff --git a/resources/profiles/Ratrig/filament/RatRig Generic ABS.json b/resources/profiles/Ratrig/filament/Generic ABS @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig Generic ABS.json rename to resources/profiles/Ratrig/filament/Generic ABS @RatRig.json index ed76ab9524..d45720cf60 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic ABS.json +++ b/resources/profiles/Ratrig/filament/Generic ABS @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic ABS", + "name": "Generic ABS @RatRig", "inherits": "fdm_filament_abs", + "renamed_from": "RatRig Generic ABS", "from": "system", - "setting_id": "ovLAzbygn6JHqGk0", - "filament_id": "OFyFRojy", + "setting_id": "0BepsauXBs5bxPYO", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.980" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic ASA.json b/resources/profiles/Ratrig/filament/Generic ASA @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig Generic ASA.json rename to resources/profiles/Ratrig/filament/Generic ASA @RatRig.json index 6cc52605f5..9b70da5bab 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic ASA.json +++ b/resources/profiles/Ratrig/filament/Generic ASA @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic ASA", + "name": "Generic ASA @RatRig", "inherits": "fdm_filament_asa", + "renamed_from": "RatRig Generic ASA", "from": "system", - "setting_id": "pmxazFQdx5Oa7Pke", - "filament_id": "OF48L671", + "setting_id": "cogJbKPAXzyCQgvf", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PA.json b/resources/profiles/Ratrig/filament/Generic PA @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig Generic PA.json rename to resources/profiles/Ratrig/filament/Generic PA @RatRig.json index 17a29f6fe5..58d6757d78 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PA.json +++ b/resources/profiles/Ratrig/filament/Generic PA @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic PA", + "name": "Generic PA @RatRig", "inherits": "fdm_filament_pa", + "renamed_from": "RatRig Generic PA", "from": "system", - "setting_id": "fVGEV9t4w06LODgD", - "filament_id": "OFEZNNw1", + "setting_id": "5rpTzhFjS6Ar4Xy8", + "filament_id": "OFg8ndtj", "instantiation": "true", "nozzle_temperature_initial_layer": [ "270" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json b/resources/profiles/Ratrig/filament/Generic PA-CF @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json rename to resources/profiles/Ratrig/filament/Generic PA-CF @RatRig.json index 4fa73713e1..5b0ea38d75 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PA-CF.json +++ b/resources/profiles/Ratrig/filament/Generic PA-CF @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic PA-CF", + "name": "Generic PA-CF @RatRig", "inherits": "fdm_filament_pa", + "renamed_from": "RatRig Generic PA-CF", "from": "system", - "setting_id": "ZRrsXKPk8pY4yrwd", - "filament_id": "OFNOxcYl", + "setting_id": "ps7duiwT8adNshEO", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PC.json b/resources/profiles/Ratrig/filament/Generic PC @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig Generic PC.json rename to resources/profiles/Ratrig/filament/Generic PC @RatRig.json index 3eab266588..c6dc89cce5 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PC.json +++ b/resources/profiles/Ratrig/filament/Generic PC @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic PC", + "name": "Generic PC @RatRig", "inherits": "fdm_filament_pc", + "renamed_from": "RatRig Generic PC", "from": "system", - "setting_id": "XQ5VEJXu5X0L3Lbn", - "filament_id": "OFdOWhCa", + "setting_id": "7x5VtUIevdAmBqqA", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json b/resources/profiles/Ratrig/filament/Generic PCTG @RatRig.json similarity index 92% rename from resources/profiles/Ratrig/filament/RatRig Generic PCTG.json rename to resources/profiles/Ratrig/filament/Generic PCTG @RatRig.json index 1bc6658211..d3e06685b5 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PCTG.json +++ b/resources/profiles/Ratrig/filament/Generic PCTG @RatRig.json @@ -1,11 +1,15 @@ { "type": "filament", - "name": "RatRig Generic PCTG", + "name": "Generic PCTG @RatRig", "inherits": "fdm_filament_pet", + "renamed_from": "RatRig Generic PCTG", "from": "system", - "setting_id": "SG4Gt87iS1ql3s8S", - "filament_id": "OFUrStd6", + "setting_id": "JMTUqdhoQzCb6ZxJ", + "filament_id": "OFu1evlr", "instantiation": "true", + "filament_type": [ + "PCTG" + ], "reduce_fan_stop_start_freq": [ "1" ], diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PETG.json b/resources/profiles/Ratrig/filament/Generic PETG @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig Generic PETG.json rename to resources/profiles/Ratrig/filament/Generic PETG @RatRig.json index ab649e81b3..b0182712b1 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PETG.json +++ b/resources/profiles/Ratrig/filament/Generic PETG @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic PETG", + "name": "Generic PETG @RatRig", "inherits": "fdm_filament_pet", + "renamed_from": "RatRig Generic PETG", "from": "system", - "setting_id": "u6diBMbHW2nnKKTm", - "filament_id": "OFxg7n2G", + "setting_id": "6p3FfhhSIAOQGEzT", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PLA.json b/resources/profiles/Ratrig/filament/Generic PLA @RatRig.json similarity index 92% rename from resources/profiles/Ratrig/filament/RatRig Generic PLA.json rename to resources/profiles/Ratrig/filament/Generic PLA @RatRig.json index 1e99ec6398..b8a33f4da4 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PLA.json +++ b/resources/profiles/Ratrig/filament/Generic PLA @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic PLA", + "name": "Generic PLA @RatRig", "inherits": "fdm_filament_pla", + "renamed_from": "RatRig Generic PLA", "from": "system", - "setting_id": "IY6qXVoQqhsKuMzP", - "filament_id": "OFd10YeG", + "setting_id": "BsQA6ChWHTDUSlii", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json b/resources/profiles/Ratrig/filament/Generic PLA-CF @RatRig.json similarity index 92% rename from resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json rename to resources/profiles/Ratrig/filament/Generic PLA-CF @RatRig.json index e8278cb1ab..288c892f09 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PLA-CF.json +++ b/resources/profiles/Ratrig/filament/Generic PLA-CF @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic PLA-CF", + "name": "Generic PLA-CF @RatRig", "inherits": "fdm_filament_pla", + "renamed_from": "RatRig Generic PLA-CF", "from": "system", - "setting_id": "Vwn22LQBChxWysmU", - "filament_id": "OFlx52rn", + "setting_id": "ai3I13fL5giqq5LW", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic PVA.json b/resources/profiles/Ratrig/filament/Generic PVA @RatRig.json similarity index 92% rename from resources/profiles/Ratrig/filament/RatRig Generic PVA.json rename to resources/profiles/Ratrig/filament/Generic PVA @RatRig.json index 5035285a77..016b146181 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic PVA.json +++ b/resources/profiles/Ratrig/filament/Generic PVA @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic PVA", + "name": "Generic PVA @RatRig", "inherits": "fdm_filament_pva", + "renamed_from": "RatRig Generic PVA", "from": "system", - "setting_id": "9uJ3Rr6kn9jZZxPO", - "filament_id": "OFsxRSwr", + "setting_id": "y6DJYhqAmxMng8Kf", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Ratrig/filament/RatRig Generic TPU.json b/resources/profiles/Ratrig/filament/Generic TPU @RatRig.json similarity index 92% rename from resources/profiles/Ratrig/filament/RatRig Generic TPU.json rename to resources/profiles/Ratrig/filament/Generic TPU @RatRig.json index 8e69cce08f..e8ea6176b7 100644 --- a/resources/profiles/Ratrig/filament/RatRig Generic TPU.json +++ b/resources/profiles/Ratrig/filament/Generic TPU @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig Generic TPU", + "name": "Generic TPU @RatRig", "inherits": "fdm_filament_tpu", + "renamed_from": "RatRig Generic TPU", "from": "system", - "setting_id": "zWOn983v5s2ujssj", - "filament_id": "OFB09fpe", + "setting_id": "dAIGKmZctSRhP1Lu", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "5" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Cast.json b/resources/profiles/Ratrig/machine/RatRig V-Cast.json index d4d2d51ce4..259a8fff94 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Cast.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Cast.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcast-bed.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json index 07e3e95a9c..1d0b05e4f5 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 200.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-200.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json index 830b0bded9..a82c91482c 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 300.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-300.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json index 5fb1292b86..97713f4417 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 400.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-400.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json b/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json index 4bce2ed0fe..08b6b2e59a 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 3 500.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-500.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300.json index 09a867b6e9..3b43d60a23 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-300.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400.json index 7cc76b3323..71eb9724f9 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-400.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500.json index 1664aff7e3..47cd8fba2f 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-500.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300.json index 6d0e891a12..4731e90901 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-300.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400.json index 9aa253bdea..86963d7e73 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-400.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500.json index bafe6879cf..7b61ebe531 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-500.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE.json index 961e647009..f2831e5919 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 COPY MODE.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-300-clone-mode.stl", "bed_texture": "ratrig_logo_copy_mode.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE.json index 5efa6aea9f..a14770104f 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300 MIRROR MODE.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-300-clone-mode.stl", "bed_texture": "ratrig_logo_mirror_mode.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300.json index e2549c0416..1a477fb750 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 300.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-300.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE.json index a8710f8aaa..327c56d036 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 COPY MODE.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-400-clone-mode.stl", "bed_texture": "ratrig_logo_copy_mode.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE.json index cb5eb6f526..2e72109e25 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400 MIRROR MODE.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-400-clone-mode.stl", "bed_texture": "ratrig_logo_mirror_mode.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400.json index d3e08811f8..e6c7405f9a 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 400.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-400.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE.json index 3e56953833..bc27a53e94 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 COPY MODE.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-500-clone-mode.stl", "bed_texture": "ratrig_logo_copy_mode.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE.json index 336ed1ddd8..3518748830 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500 MIRROR MODE.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-500-clone-mode.stl", "bed_texture": "ratrig_logo_mirror_mode.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500.json index 5766fb3953..59ff011a82 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 IDEX 500.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vcore-bed-500.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PCTG;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PCTG @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/RatRig V-Minion.json b/resources/profiles/Ratrig/machine/RatRig V-Minion.json index 974a3aaa59..4134cadbf2 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Minion.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Minion.json @@ -8,5 +8,5 @@ "bed_model": "ratrig-vminion-bed.stl", "bed_texture": "ratrig_logo.svg", "hotend_model": "", - "default_materials": "RatRig Generic ABS;RatRig Generic PLA;RatRig Generic PLA-CF;RatRig Generic PETG;RatRig Generic TPU;RatRig Generic ASA;RatRig Generic PC;RatRig Generic PVA;RatRig Generic PA;RatRig Generic PA-CF" + "default_materials": "Generic ABS @RatRig;Generic PLA @RatRig;Generic PLA-CF @RatRig;Generic PETG @RatRig;Generic TPU @RatRig;Generic ASA @RatRig;Generic PC @RatRig;Generic PVA @RatRig;Generic PA @RatRig;Generic PA-CF @RatRig" } diff --git a/resources/profiles/Ratrig/machine/fdm_klipper_common.json b/resources/profiles/Ratrig/machine/fdm_klipper_common.json index 8915fc1d4a..28ad9ce02c 100644 --- a/resources/profiles/Ratrig/machine/fdm_klipper_common.json +++ b/resources/profiles/Ratrig/machine/fdm_klipper_common.json @@ -126,7 +126,7 @@ "1" ], "default_filament_profile": [ - "RatRig Generic ABS" + "Generic ABS @RatRig" ], "default_print_profile": "0.20mm Standard @RatRig", "bed_exclude_area": [ diff --git a/resources/profiles/SecKit.json b/resources/profiles/SecKit.json index 85d373fbc9..42ac381eb6 100644 --- a/resources/profiles/SecKit.json +++ b/resources/profiles/SecKit.json @@ -1,6 +1,6 @@ { "name": "SecKit", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "SecKit configurations", "machine_model_list": [ @@ -89,44 +89,44 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "SecKit Generic ABS", - "sub_path": "filament/SecKit Generic ABS.json" + "name": "Generic ABS @SecKit", + "sub_path": "filament/Generic ABS @SecKit.json" }, { - "name": "SecKit Generic ASA", - "sub_path": "filament/SecKit Generic ASA.json" + "name": "Generic ASA @SecKit", + "sub_path": "filament/Generic ASA @SecKit.json" }, { - "name": "SecKit Generic PA", - "sub_path": "filament/SecKit Generic PA.json" + "name": "Generic PA @SecKit", + "sub_path": "filament/Generic PA @SecKit.json" }, { - "name": "SecKit Generic PA-CF", - "sub_path": "filament/SecKit Generic PA-CF.json" + "name": "Generic PA-CF @SecKit", + "sub_path": "filament/Generic PA-CF @SecKit.json" }, { - "name": "SecKit Generic PC", - "sub_path": "filament/SecKit Generic PC.json" + "name": "Generic PC @SecKit", + "sub_path": "filament/Generic PC @SecKit.json" }, { - "name": "SecKit Generic PETG", - "sub_path": "filament/SecKit Generic PETG.json" + "name": "Generic PETG @SecKit", + "sub_path": "filament/Generic PETG @SecKit.json" }, { - "name": "SecKit Generic PLA", - "sub_path": "filament/SecKit Generic PLA.json" + "name": "Generic PLA @SecKit", + "sub_path": "filament/Generic PLA @SecKit.json" }, { - "name": "SecKit Generic PLA-CF", - "sub_path": "filament/SecKit Generic PLA-CF.json" + "name": "Generic PLA-CF @SecKit", + "sub_path": "filament/Generic PLA-CF @SecKit.json" }, { - "name": "SecKit Generic PVA", - "sub_path": "filament/SecKit Generic PVA.json" + "name": "Generic PVA @SecKit", + "sub_path": "filament/Generic PVA @SecKit.json" }, { - "name": "SecKit Generic TPU", - "sub_path": "filament/SecKit Generic TPU.json" + "name": "Generic TPU @SecKit", + "sub_path": "filament/Generic TPU @SecKit.json" } ], "machine_list": [ diff --git a/resources/profiles/SecKit/filament/SecKit Generic ABS.json b/resources/profiles/SecKit/filament/Generic ABS @SecKit.json similarity index 83% rename from resources/profiles/SecKit/filament/SecKit Generic ABS.json rename to resources/profiles/SecKit/filament/Generic ABS @SecKit.json index ed9be1c69a..cdd9ce2f62 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic ABS.json +++ b/resources/profiles/SecKit/filament/Generic ABS @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic ABS", + "name": "Generic ABS @SecKit", "inherits": "fdm_filament_abs", + "renamed_from": "SecKit Generic ABS", "from": "system", - "setting_id": "gUrHIkj9GExYWVjh", - "filament_id": "OFnh79eM", + "setting_id": "VSrXBQUNBQMwUc08", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.980" diff --git a/resources/profiles/SecKit/filament/SecKit Generic ASA.json b/resources/profiles/SecKit/filament/Generic ASA @SecKit.json similarity index 81% rename from resources/profiles/SecKit/filament/SecKit Generic ASA.json rename to resources/profiles/SecKit/filament/Generic ASA @SecKit.json index 6688efd51f..366b20172b 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic ASA.json +++ b/resources/profiles/SecKit/filament/Generic ASA @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic ASA", + "name": "Generic ASA @SecKit", "inherits": "fdm_filament_asa", + "renamed_from": "SecKit Generic ASA", "from": "system", - "setting_id": "UwVF6VlxRg0IW9hB", - "filament_id": "OFrh4bBH", + "setting_id": "usCYRq4VuLqXvb0T", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PA.json b/resources/profiles/SecKit/filament/Generic PA @SecKit.json similarity index 81% rename from resources/profiles/SecKit/filament/SecKit Generic PA.json rename to resources/profiles/SecKit/filament/Generic PA @SecKit.json index 38a275a6f2..7746d8628a 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PA.json +++ b/resources/profiles/SecKit/filament/Generic PA @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic PA", + "name": "Generic PA @SecKit", "inherits": "fdm_filament_pa", + "renamed_from": "SecKit Generic PA", "from": "system", - "setting_id": "GlgeZsK719DDjaPo", - "filament_id": "OF8CXrvm", + "setting_id": "uAuptETLwGxTsthC", + "filament_id": "OFg8ndtj", "instantiation": "true", "nozzle_temperature_initial_layer": [ "270" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PA-CF.json b/resources/profiles/SecKit/filament/Generic PA-CF @SecKit.json similarity index 81% rename from resources/profiles/SecKit/filament/SecKit Generic PA-CF.json rename to resources/profiles/SecKit/filament/Generic PA-CF @SecKit.json index 46ad248815..52c0bae450 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PA-CF.json +++ b/resources/profiles/SecKit/filament/Generic PA-CF @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic PA-CF", + "name": "Generic PA-CF @SecKit", "inherits": "fdm_filament_pa", + "renamed_from": "SecKit Generic PA-CF", "from": "system", - "setting_id": "0K4eQ2fbaasNdvsP", - "filament_id": "OFtsVp4v", + "setting_id": "P6G8DjjyfAFgGaj2", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PC.json b/resources/profiles/SecKit/filament/Generic PC @SecKit.json similarity index 80% rename from resources/profiles/SecKit/filament/SecKit Generic PC.json rename to resources/profiles/SecKit/filament/Generic PC @SecKit.json index 2244729859..689f3ea553 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PC.json +++ b/resources/profiles/SecKit/filament/Generic PC @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic PC", + "name": "Generic PC @SecKit", "inherits": "fdm_filament_pc", + "renamed_from": "SecKit Generic PC", "from": "system", - "setting_id": "8DHToBaqE7g5VNvN", - "filament_id": "OF5E5KNA", + "setting_id": "PxmBHXsdhZGR9bYv", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "12" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PETG.json b/resources/profiles/SecKit/filament/Generic PETG @SecKit.json similarity index 86% rename from resources/profiles/SecKit/filament/SecKit Generic PETG.json rename to resources/profiles/SecKit/filament/Generic PETG @SecKit.json index 07af417aae..05c5c753c6 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PETG.json +++ b/resources/profiles/SecKit/filament/Generic PETG @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic PETG", + "name": "Generic PETG @SecKit", "inherits": "fdm_filament_pet", + "renamed_from": "SecKit Generic PETG", "from": "system", - "setting_id": "mx45AbmzGkqYMSsW", - "filament_id": "OFqS8fzK", + "setting_id": "Qt4oXABB5Fukbz46", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PLA.json b/resources/profiles/SecKit/filament/Generic PLA @SecKit.json similarity index 79% rename from resources/profiles/SecKit/filament/SecKit Generic PLA.json rename to resources/profiles/SecKit/filament/Generic PLA @SecKit.json index 2c85460be0..b3cd1c2ffc 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PLA.json +++ b/resources/profiles/SecKit/filament/Generic PLA @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic PLA", + "name": "Generic PLA @SecKit", "inherits": "fdm_filament_pla", + "renamed_from": "SecKit Generic PLA", "from": "system", - "setting_id": "7cpNIx6GWUp95tLN", - "filament_id": "OFETFWx7", + "setting_id": "uWvI4RDQiYLFN7pp", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PLA-CF.json b/resources/profiles/SecKit/filament/Generic PLA-CF @SecKit.json similarity index 79% rename from resources/profiles/SecKit/filament/SecKit Generic PLA-CF.json rename to resources/profiles/SecKit/filament/Generic PLA-CF @SecKit.json index 5ac681d9d7..507716caee 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PLA-CF.json +++ b/resources/profiles/SecKit/filament/Generic PLA-CF @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic PLA-CF", + "name": "Generic PLA-CF @SecKit", "inherits": "fdm_filament_pla", + "renamed_from": "SecKit Generic PLA-CF", "from": "system", - "setting_id": "dPLE2CXMpmdtyiZK", - "filament_id": "OFF73Bvp", + "setting_id": "znagqvEsDcHYse9M", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/SecKit/filament/SecKit Generic PVA.json b/resources/profiles/SecKit/filament/Generic PVA @SecKit.json similarity index 77% rename from resources/profiles/SecKit/filament/SecKit Generic PVA.json rename to resources/profiles/SecKit/filament/Generic PVA @SecKit.json index 67312ed658..13f7d50673 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic PVA.json +++ b/resources/profiles/SecKit/filament/Generic PVA @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic PVA", + "name": "Generic PVA @SecKit", "inherits": "fdm_filament_pva", + "renamed_from": "SecKit Generic PVA", "from": "system", - "setting_id": "jiHEC4uCmPQLINlO", - "filament_id": "OFyySVby", + "setting_id": "DIUaGXpIF3fUfxqg", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/SecKit/filament/SecKit Generic TPU.json b/resources/profiles/SecKit/filament/Generic TPU @SecKit.json similarity index 76% rename from resources/profiles/SecKit/filament/SecKit Generic TPU.json rename to resources/profiles/SecKit/filament/Generic TPU @SecKit.json index dab7cf4bf5..96d9c38a60 100644 --- a/resources/profiles/SecKit/filament/SecKit Generic TPU.json +++ b/resources/profiles/SecKit/filament/Generic TPU @SecKit.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "SecKit Generic TPU", + "name": "Generic TPU @SecKit", "inherits": "fdm_filament_tpu", + "renamed_from": "SecKit Generic TPU", "from": "system", - "setting_id": "b5GGHwZlR5oOx4eH", - "filament_id": "OFoVZg32", + "setting_id": "agKm2K9w4ZOmZN8c", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "5" diff --git a/resources/profiles/SecKit/machine/SecKit SK-Tank.json b/resources/profiles/SecKit/machine/SecKit SK-Tank.json index 88cd516037..171d979074 100644 --- a/resources/profiles/SecKit/machine/SecKit SK-Tank.json +++ b/resources/profiles/SecKit/machine/SecKit SK-Tank.json @@ -9,5 +9,5 @@ "bed_model": "SK-Tank_Bed.stl", "bed_texture": "seckit_logo.svg", "hotend_model": "hotend.stl", - "default_materials": "SecKit Generic ABS;SecKit Generic PLA;SecKit Generic PLA-CF;SecKit Generic PETG;SecKit Generic TPU;SecKit Generic ASA;SecKit Generic PC;SecKit Generic PVA;SecKit Generic PA;SecKit Generic PA-CF" + "default_materials": "Generic ABS @SecKit;Generic PLA @SecKit;Generic PLA-CF @SecKit;Generic PETG @SecKit;Generic TPU @SecKit;Generic ASA @SecKit;Generic PC @SecKit;Generic PVA @SecKit;Generic PA @SecKit;Generic PA-CF @SecKit" } diff --git a/resources/profiles/SecKit/machine/Seckit Go3.json b/resources/profiles/SecKit/machine/Seckit Go3.json index 9b5169b017..9882f8783e 100644 --- a/resources/profiles/SecKit/machine/Seckit Go3.json +++ b/resources/profiles/SecKit/machine/Seckit Go3.json @@ -9,5 +9,5 @@ "bed_model": "SK-Go3_Bed.stl", "bed_texture": "seckit_logo.svg", "hotend_model": "seckit-hotend.stl", - "default_materials": "SecKit Generic ABS;SecKit Generic PLA;SecKit Generic PLA-CF;SecKit Generic PETG;SecKit Generic TPU;SecKit Generic ASA;SecKit Generic PC;SecKit Generic PVA;SecKit Generic PA;SecKit Generic PA-CF" + "default_materials": "Generic ABS @SecKit;Generic PLA @SecKit;Generic PLA-CF @SecKit;Generic PETG @SecKit;Generic TPU @SecKit;Generic ASA @SecKit;Generic PC @SecKit;Generic PVA @SecKit;Generic PA @SecKit;Generic PA-CF @SecKit" } diff --git a/resources/profiles/SecKit/machine/fdm_klipper_common.json b/resources/profiles/SecKit/machine/fdm_klipper_common.json index 8b9cbf6efe..4bb08f7367 100644 --- a/resources/profiles/SecKit/machine/fdm_klipper_common.json +++ b/resources/profiles/SecKit/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "SecKit Generic PETG" + "Generic PETG @SecKit" ], "default_print_profile": "0.20mm Standard @SecKit", "bed_exclude_area": [ diff --git a/resources/profiles/Tiertime.json b/resources/profiles/Tiertime.json index 0742e8bce6..8134d621df 100644 --- a/resources/profiles/Tiertime.json +++ b/resources/profiles/Tiertime.json @@ -1,6 +1,6 @@ { "name": "Tiertime", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "Tiertime configurations", "machine_model_list": [ @@ -369,12 +369,12 @@ "sub_path": "filament/Tiertime ABS@300HS.json" }, { - "name": "Tiertime Generic ABS", - "sub_path": "filament/Tiertime Generic ABS.json" + "name": "Generic ABS @Tiertime", + "sub_path": "filament/Generic ABS @Tiertime.json" }, { - "name": "Tiertime Generic ABS@300HS", - "sub_path": "filament/Tiertime Generic ABS@300HS.json" + "name": "Generic ABS @Tiertime 300HS", + "sub_path": "filament/Generic ABS @Tiertime 300HS.json" }, { "name": "Tiertime ASA", @@ -385,52 +385,52 @@ "sub_path": "filament/Tiertime ASA@300HS.json" }, { - "name": "Tiertime Generic ASA", - "sub_path": "filament/Tiertime Generic ASA.json" + "name": "Generic ASA @Tiertime", + "sub_path": "filament/Generic ASA @Tiertime.json" }, { - "name": "Tiertime Generic ASA@300HS", - "sub_path": "filament/Tiertime Generic ASA@300HS.json" + "name": "Generic ASA @Tiertime 300HS", + "sub_path": "filament/Generic ASA @Tiertime 300HS.json" }, { - "name": "Tiertime Generic BVOH", - "sub_path": "filament/Tiertime Generic BVOH.json" + "name": "Generic BVOH @Tiertime", + "sub_path": "filament/Generic BVOH @Tiertime.json" }, { - "name": "Tiertime Generic BVOH@300HS", - "sub_path": "filament/Tiertime Generic BVOH@300HS.json" + "name": "Generic BVOH @Tiertime 300HS", + "sub_path": "filament/Generic BVOH @Tiertime 300HS.json" }, { - "name": "Tiertime Generic EVA", - "sub_path": "filament/Tiertime Generic EVA.json" + "name": "Generic EVA @Tiertime", + "sub_path": "filament/Generic EVA @Tiertime.json" }, { - "name": "Tiertime Generic EVA@300HS", - "sub_path": "filament/Tiertime Generic EVA@300HS.json" + "name": "Generic EVA @Tiertime 300HS", + "sub_path": "filament/Generic EVA @Tiertime 300HS.json" }, { - "name": "Tiertime Generic HIPS", - "sub_path": "filament/Tiertime Generic HIPS.json" + "name": "Generic HIPS @Tiertime", + "sub_path": "filament/Generic HIPS @Tiertime.json" }, { - "name": "Tiertime Generic HIPS@300HS", - "sub_path": "filament/Tiertime Generic HIPS@300HS.json" + "name": "Generic HIPS @Tiertime 300HS", + "sub_path": "filament/Generic HIPS @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PA", - "sub_path": "filament/Tiertime Generic PA.json" + "name": "Generic PA @Tiertime", + "sub_path": "filament/Generic PA @Tiertime.json" }, { - "name": "Tiertime Generic PA-CF", - "sub_path": "filament/Tiertime Generic PA-CF.json" + "name": "Generic PA-CF @Tiertime", + "sub_path": "filament/Generic PA-CF @Tiertime.json" }, { - "name": "Tiertime Generic PA-CF@300HS", - "sub_path": "filament/Tiertime Generic PA-CF@300HS.json" + "name": "Generic PA-CF @Tiertime 300HS", + "sub_path": "filament/Generic PA-CF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PA@300HS", - "sub_path": "filament/Tiertime Generic PA@300HS.json" + "name": "Generic PA @Tiertime 300HS", + "sub_path": "filament/Generic PA @Tiertime 300HS.json" }, { "name": "Tiertime PA6-CF", @@ -441,12 +441,12 @@ "sub_path": "filament/Tiertime PA6-CF@300HS.json" }, { - "name": "Tiertime Generic PC", - "sub_path": "filament/Tiertime Generic PC.json" + "name": "Generic PC @Tiertime", + "sub_path": "filament/Generic PC @Tiertime.json" }, { - "name": "Tiertime Generic PC@300HS", - "sub_path": "filament/Tiertime Generic PC@300HS.json" + "name": "Generic PC @Tiertime 300HS", + "sub_path": "filament/Generic PC @Tiertime 300HS.json" }, { "name": "Tiertime PC", @@ -457,44 +457,44 @@ "sub_path": "filament/Tiertime PC@300HS.json" }, { - "name": "Tiertime Generic PCTG", - "sub_path": "filament/Tiertime Generic PCTG.json" + "name": "Generic PCTG @Tiertime", + "sub_path": "filament/Generic PCTG @Tiertime.json" }, { - "name": "Tiertime Generic PCTG@300HS", - "sub_path": "filament/Tiertime Generic PCTG@300HS.json" + "name": "Generic PCTG @Tiertime 300HS", + "sub_path": "filament/Generic PCTG @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PE", - "sub_path": "filament/Tiertime Generic PE.json" + "name": "Generic PE @Tiertime", + "sub_path": "filament/Generic PE @Tiertime.json" }, { - "name": "Tiertime Generic PE-CF", - "sub_path": "filament/Tiertime Generic PE-CF.json" + "name": "Generic PE-CF @Tiertime", + "sub_path": "filament/Generic PE-CF @Tiertime.json" }, { - "name": "Tiertime Generic PE-CF@300HS", - "sub_path": "filament/Tiertime Generic PE-CF@300HS.json" + "name": "Generic PE-CF @Tiertime 300HS", + "sub_path": "filament/Generic PE-CF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PE@300HS", - "sub_path": "filament/Tiertime Generic PE@300HS.json" + "name": "Generic PE @Tiertime 300HS", + "sub_path": "filament/Generic PE @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PETG", - "sub_path": "filament/Tiertime Generic PETG.json" + "name": "Generic PETG @Tiertime", + "sub_path": "filament/Generic PETG @Tiertime.json" }, { - "name": "Tiertime Generic PETG-CF", - "sub_path": "filament/Tiertime Generic PETG-CF.json" + "name": "Generic PETG-CF @Tiertime", + "sub_path": "filament/Generic PETG-CF @Tiertime.json" }, { - "name": "Tiertime Generic PETG-CF@300HS", - "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json" + "name": "Generic PETG-CF @Tiertime 300HS", + "sub_path": "filament/Generic PETG-CF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PETG@300HS", - "sub_path": "filament/Tiertime Generic PETG@300HS.json" + "name": "Generic PETG @Tiertime 300HS", + "sub_path": "filament/Generic PETG @Tiertime 300HS.json" }, { "name": "Tiertime PET-CF", @@ -513,44 +513,44 @@ "sub_path": "filament/Tiertime PETG@300HS.json" }, { - "name": "Tiertime Generic PHA", - "sub_path": "filament/Tiertime Generic PHA.json" + "name": "Generic PHA @Tiertime", + "sub_path": "filament/Generic PHA @Tiertime.json" }, { - "name": "Tiertime Generic PHA@300HS", - "sub_path": "filament/Tiertime Generic PHA@300HS.json" + "name": "Generic PHA @Tiertime 300HS", + "sub_path": "filament/Generic PHA @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PLA", - "sub_path": "filament/Tiertime Generic PLA.json" + "name": "Generic PLA @Tiertime", + "sub_path": "filament/Generic PLA @Tiertime.json" }, { - "name": "Tiertime Generic PLA High Speed", - "sub_path": "filament/Tiertime Generic PLA High Speed.json" + "name": "Generic PLA High Speed @Tiertime", + "sub_path": "filament/Generic PLA High Speed @Tiertime.json" }, { - "name": "Tiertime Generic PLA High Speed@300HS", - "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json" + "name": "Generic PLA High Speed @Tiertime 300HS", + "sub_path": "filament/Generic PLA High Speed @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PLA Silk", - "sub_path": "filament/Tiertime Generic PLA Silk.json" + "name": "Generic PLA Silk @Tiertime", + "sub_path": "filament/Generic PLA Silk @Tiertime.json" }, { - "name": "Tiertime Generic PLA Silk@300HS", - "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json" + "name": "Generic PLA Silk @Tiertime 300HS", + "sub_path": "filament/Generic PLA Silk @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PLA-CF", - "sub_path": "filament/Tiertime Generic PLA-CF.json" + "name": "Generic PLA-CF @Tiertime", + "sub_path": "filament/Generic PLA-CF @Tiertime.json" }, { - "name": "Tiertime Generic PLA-CF@300HS", - "sub_path": "filament/Tiertime Generic PLA-CF@300HS.json" + "name": "Generic PLA-CF @Tiertime 300HS", + "sub_path": "filament/Generic PLA-CF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PLA@300HS", - "sub_path": "filament/Tiertime Generic PLA@300HS.json" + "name": "Generic PLA @Tiertime 300HS", + "sub_path": "filament/Generic PLA @Tiertime 300HS.json" }, { "name": "Tiertime PLA", @@ -569,68 +569,68 @@ "sub_path": "filament/Tiertime PLA@300HS.json" }, { - "name": "Tiertime Generic PP", - "sub_path": "filament/Tiertime Generic PP.json" + "name": "Generic PP @Tiertime", + "sub_path": "filament/Generic PP @Tiertime.json" }, { - "name": "Tiertime Generic PP-CF", - "sub_path": "filament/Tiertime Generic PP-CF.json" + "name": "Generic PP-CF @Tiertime", + "sub_path": "filament/Generic PP-CF @Tiertime.json" }, { - "name": "Tiertime Generic PP-CF@300HS", - "sub_path": "filament/Tiertime Generic PP-CF@300HS.json" + "name": "Generic PP-CF @Tiertime 300HS", + "sub_path": "filament/Generic PP-CF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PP-GF", - "sub_path": "filament/Tiertime Generic PP-GF.json" + "name": "Generic PP-GF @Tiertime", + "sub_path": "filament/Generic PP-GF @Tiertime.json" }, { - "name": "Tiertime Generic PP-GF@300HS", - "sub_path": "filament/Tiertime Generic PP-GF@300HS.json" + "name": "Generic PP-GF @Tiertime 300HS", + "sub_path": "filament/Generic PP-GF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PP@300HS", - "sub_path": "filament/Tiertime Generic PP@300HS.json" + "name": "Generic PP @Tiertime 300HS", + "sub_path": "filament/Generic PP @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PPA-CF", - "sub_path": "filament/Tiertime Generic PPA-CF.json" + "name": "Generic PPA-CF @Tiertime", + "sub_path": "filament/Generic PPA-CF @Tiertime.json" }, { - "name": "Tiertime Generic PPA-CF@300HS", - "sub_path": "filament/Tiertime Generic PPA-CF@300HS.json" + "name": "Generic PPA-CF @Tiertime 300HS", + "sub_path": "filament/Generic PPA-CF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PPA-GF", - "sub_path": "filament/Tiertime Generic PPA-GF.json" + "name": "Generic PPA-GF @Tiertime", + "sub_path": "filament/Generic PPA-GF @Tiertime.json" }, { - "name": "Tiertime Generic PPA-GF@300HS", - "sub_path": "filament/Tiertime Generic PPA-GF@300HS.json" + "name": "Generic PPA-GF @Tiertime 300HS", + "sub_path": "filament/Generic PPA-GF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PPS", - "sub_path": "filament/Tiertime Generic PPS.json" + "name": "Generic PPS @Tiertime", + "sub_path": "filament/Generic PPS @Tiertime.json" }, { - "name": "Tiertime Generic PPS-CF", - "sub_path": "filament/Tiertime Generic PPS-CF.json" + "name": "Generic PPS-CF @Tiertime", + "sub_path": "filament/Generic PPS-CF @Tiertime.json" }, { - "name": "Tiertime Generic PPS-CF@300HS", - "sub_path": "filament/Tiertime Generic PPS-CF@300HS.json" + "name": "Generic PPS-CF @Tiertime 300HS", + "sub_path": "filament/Generic PPS-CF @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PPS@300HS", - "sub_path": "filament/Tiertime Generic PPS@300HS.json" + "name": "Generic PPS @Tiertime 300HS", + "sub_path": "filament/Generic PPS @Tiertime 300HS.json" }, { - "name": "Tiertime Generic PVA", - "sub_path": "filament/Tiertime Generic PVA.json" + "name": "Generic PVA @Tiertime", + "sub_path": "filament/Generic PVA @Tiertime.json" }, { - "name": "Tiertime Generic PVA@300HS", - "sub_path": "filament/Tiertime Generic PVA@300HS.json" + "name": "Generic PVA @Tiertime 300HS", + "sub_path": "filament/Generic PVA @Tiertime 300HS.json" }, { "name": "Tiertime PVA", @@ -641,20 +641,20 @@ "sub_path": "filament/Tiertime PVA@300HS.json" }, { - "name": "Tiertime Generic SBS", - "sub_path": "filament/Tiertime Generic SBS.json" + "name": "Generic SBS @Tiertime", + "sub_path": "filament/Generic SBS @Tiertime.json" }, { - "name": "Tiertime Generic SBS@300HS", - "sub_path": "filament/Tiertime Generic SBS@300HS.json" + "name": "Generic SBS @Tiertime 300HS", + "sub_path": "filament/Generic SBS @Tiertime 300HS.json" }, { - "name": "Tiertime Generic TPU", - "sub_path": "filament/Tiertime Generic TPU.json" + "name": "Generic TPU @Tiertime", + "sub_path": "filament/Generic TPU @Tiertime.json" }, { - "name": "Tiertime Generic TPU@300HS", - "sub_path": "filament/Tiertime Generic TPU@300HS.json" + "name": "Generic TPU @Tiertime 300HS", + "sub_path": "filament/Generic TPU @Tiertime 300HS.json" }, { "name": "Tiertime TPU 95A", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime 300HS.json similarity index 77% rename from resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json rename to resources/profiles/Tiertime/filament/Generic ABS @Tiertime 300HS.json index efd49d6b20..e9d7aca6fc 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic ABS@300HS", + "name": "Generic ABS @Tiertime 300HS", "inherits": "fdm_filament_abs", + "renamed_from": "Tiertime Generic ABS@300HS;Tiertime Generic ABS300HS", "from": "system", - "setting_id": "tCw1f7MxFjxPr7Ci", - "filament_id": "OFNLXV8X", + "setting_id": "CDku986CRCZQpwu4", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime.json similarity index 81% rename from resources/profiles/Tiertime/filament/Tiertime Generic ABS.json rename to resources/profiles/Tiertime/filament/Generic ABS @Tiertime.json index 32cd14a523..7e8f606a6e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ABS.json +++ b/resources/profiles/Tiertime/filament/Generic ABS @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic ABS", + "name": "Generic ABS @Tiertime", "inherits": "fdm_filament_abs", + "renamed_from": "Tiertime Generic ABS", "from": "system", - "setting_id": "ImJ3Urgk3VVtwceI", - "filament_id": "OFNLXV8X", + "setting_id": "mDRlI9biZBn9sNlS", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime 300HS.json similarity index 74% rename from resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json rename to resources/profiles/Tiertime/filament/Generic ASA @Tiertime 300HS.json index 4962cc3046..adffa21725 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic ASA@300HS", + "name": "Generic ASA @Tiertime 300HS", "inherits": "fdm_filament_asa", + "renamed_from": "Tiertime Generic ASA@300HS;Tiertime Generic ASA300HS", "from": "system", - "setting_id": "7C5PjCg1vmTQFXWO", - "filament_id": "OFUaVAdj", + "setting_id": "HLh2XxQuVOa86efy", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime.json similarity index 79% rename from resources/profiles/Tiertime/filament/Tiertime Generic ASA.json rename to resources/profiles/Tiertime/filament/Generic ASA @Tiertime.json index 614b3b3c19..1529e0f702 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic ASA.json +++ b/resources/profiles/Tiertime/filament/Generic ASA @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic ASA", + "name": "Generic ASA @Tiertime", "inherits": "fdm_filament_asa", + "renamed_from": "Tiertime Generic ASA", "from": "system", - "setting_id": "T1AzUXSewNk5Bj3x", - "filament_id": "OFUaVAdj", + "setting_id": "kGrTR0sC37w9Qi3b", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime 300HS.json similarity index 59% rename from resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json rename to resources/profiles/Tiertime/filament/Generic BVOH @Tiertime 300HS.json index 124749396e..9db52386cb 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic BVOH@300HS", + "name": "Generic BVOH @Tiertime 300HS", "inherits": "fdm_filament_bvoh", + "renamed_from": "Tiertime Generic BVOH@300HS;Tiertime Generic BVOH300HS", "from": "system", - "setting_id": "xfFXVyGfmXiu508N", - "filament_id": "OFGDaEHO", + "setting_id": "aCtg07TUbh6I9XPo", + "filament_id": "OFo2UF2C", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime.json similarity index 66% rename from resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json rename to resources/profiles/Tiertime/filament/Generic BVOH @Tiertime.json index 76918d2c91..fd6e2a529f 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json +++ b/resources/profiles/Tiertime/filament/Generic BVOH @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic BVOH", + "name": "Generic BVOH @Tiertime", "inherits": "fdm_filament_bvoh", + "renamed_from": "Tiertime Generic BVOH", "from": "system", - "setting_id": "dhrpnirMnet0hJZl", - "filament_id": "OFGDaEHO", + "setting_id": "b642QISGuDZ18fQ8", + "filament_id": "OFo2UF2C", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime 300HS.json similarity index 91% rename from resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json rename to resources/profiles/Tiertime/filament/Generic EVA @Tiertime 300HS.json index ff107a65fb..f066563e4c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic EVA@300HS", + "name": "Generic EVA @Tiertime 300HS", "inherits": "fdm_filament_eva", + "renamed_from": "Tiertime Generic EVA@300HS;Tiertime Generic EVA300HS", "from": "system", - "setting_id": "pXuh92Zf1zPiaDXg", - "filament_id": "OFrnJJEa", + "setting_id": "q5f3UKuj7KOtiNkH", + "filament_id": "OFCD8qiU", "instantiation": "true", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime.json similarity index 93% rename from resources/profiles/Tiertime/filament/Tiertime Generic EVA.json rename to resources/profiles/Tiertime/filament/Generic EVA @Tiertime.json index 6d9851fb73..ec49722cae 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic EVA.json +++ b/resources/profiles/Tiertime/filament/Generic EVA @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic EVA", + "name": "Generic EVA @Tiertime", "inherits": "fdm_filament_eva", + "renamed_from": "Tiertime Generic EVA", "from": "system", - "setting_id": "ev5w69eBuTCYXB2d", - "filament_id": "OFrnJJEa", + "setting_id": "NTY4MeZtxt16HNAV", + "filament_id": "OFCD8qiU", "instantiation": "true", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime 300HS.json similarity index 62% rename from resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json rename to resources/profiles/Tiertime/filament/Generic HIPS @Tiertime 300HS.json index 932b1e3239..8eaa300930 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic HIPS@300HS", + "name": "Generic HIPS @Tiertime 300HS", "inherits": "fdm_filament_hips", + "renamed_from": "Tiertime Generic HIPS@300HS;Tiertime Generic HIPS300HS", "from": "system", - "setting_id": "9epHDviPNHRB5bPD", - "filament_id": "OFW9uIkE", + "setting_id": "ee157A7VEkDzMh61", + "filament_id": "OFsFon5l", "instantiation": "true", "filament_is_support": [ "1" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime.json similarity index 68% rename from resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json rename to resources/profiles/Tiertime/filament/Generic HIPS @Tiertime.json index 54e9d60fbd..519e690ed6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json +++ b/resources/profiles/Tiertime/filament/Generic HIPS @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic HIPS", + "name": "Generic HIPS @Tiertime", "inherits": "fdm_filament_hips", + "renamed_from": "Tiertime Generic HIPS", "from": "system", - "setting_id": "sFY2AyXFzAFuj6sv", - "filament_id": "OFW9uIkE", + "setting_id": "3Vm99hmTMTFPKNGk", + "filament_id": "OFsFon5l", "instantiation": "true", "filament_is_support": [ "1" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json b/resources/profiles/Tiertime/filament/Generic PA @Tiertime 300HS.json similarity index 82% rename from resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json rename to resources/profiles/Tiertime/filament/Generic PA @Tiertime 300HS.json index 7ef4871120..3c97aa11a7 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PA @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PA@300HS", + "name": "Generic PA @Tiertime 300HS", "inherits": "fdm_filament_pa", + "renamed_from": "Tiertime Generic PA@300HS;Tiertime Generic PA300HS", "from": "system", - "filament_id": "OFQswlnF", - "setting_id": "ERn1WYMiSjs6a82N", + "filament_id": "OFg8ndtj", + "setting_id": "yGD1puWjH2QFacXJ", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json b/resources/profiles/Tiertime/filament/Generic PA @Tiertime.json similarity index 85% rename from resources/profiles/Tiertime/filament/Tiertime Generic PA.json rename to resources/profiles/Tiertime/filament/Generic PA @Tiertime.json index 4f9e45d05e..1ff338b317 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA.json +++ b/resources/profiles/Tiertime/filament/Generic PA @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PA", + "name": "Generic PA @Tiertime", "inherits": "fdm_filament_pa", + "renamed_from": "Tiertime Generic PA", "from": "system", - "filament_id": "OFQswlnF", - "setting_id": "DmP33sDwKcBDRmDK", + "filament_id": "OFg8ndtj", + "setting_id": "u37BwUzY2vt6zqjd", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime 300HS.json similarity index 75% rename from resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime 300HS.json index b49c63ab92..3feade702d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PA-CF@300HS", + "name": "Generic PA-CF @Tiertime 300HS", "inherits": "fdm_filament_pa", + "renamed_from": "Tiertime Generic PA-CF@300HS;Tiertime Generic PA-CF300HS", "from": "system", - "filament_id": "OFHa3RZT", - "setting_id": "nRxvUKo1YXE8daoX", + "filament_id": "OFQLcbps", + "setting_id": "nZprcLHiLIAKvqtu", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime.json similarity index 79% rename from resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json rename to resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime.json index 22b8edb633..fe57cb7806 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json +++ b/resources/profiles/Tiertime/filament/Generic PA-CF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PA-CF", + "name": "Generic PA-CF @Tiertime", "inherits": "fdm_filament_pa", + "renamed_from": "Tiertime Generic PA-CF", "from": "system", - "filament_id": "OFHa3RZT", - "setting_id": "DOWYicvaXaTMfzBU", + "filament_id": "OFQLcbps", + "setting_id": "1oq9XQtCUcV9wGYV", "instantiation": "true", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json b/resources/profiles/Tiertime/filament/Generic PC @Tiertime 300HS.json similarity index 67% rename from resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json rename to resources/profiles/Tiertime/filament/Generic PC @Tiertime 300HS.json index 86c506902c..591d1c9208 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PC @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PC@300HS", + "name": "Generic PC @Tiertime 300HS", "inherits": "fdm_filament_pc", + "renamed_from": "Tiertime Generic PC@300HS;Tiertime Generic PC300HS", "from": "system", - "setting_id": "i2ShskYbiq61UJ1B", - "filament_id": "OFN7aNHe", + "setting_id": "cqm5YuWHhzXdvE0M", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json b/resources/profiles/Tiertime/filament/Generic PC @Tiertime.json similarity index 72% rename from resources/profiles/Tiertime/filament/Tiertime Generic PC.json rename to resources/profiles/Tiertime/filament/Generic PC @Tiertime.json index 264fe0fc03..8c36c18828 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PC.json +++ b/resources/profiles/Tiertime/filament/Generic PC @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PC", + "name": "Generic PC @Tiertime", "inherits": "fdm_filament_pc", + "renamed_from": "Tiertime Generic PC", "from": "system", - "setting_id": "5wzlA0sFj2xElixU", - "filament_id": "OFN7aNHe", + "setting_id": "ILOqHUkf5W9fcRic", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "16" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime 300HS.json similarity index 89% rename from resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json rename to resources/profiles/Tiertime/filament/Generic PCTG @Tiertime 300HS.json index 86d034aa24..25eb1b1b76 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PCTG@300HS", + "name": "Generic PCTG @Tiertime 300HS", "inherits": "fdm_filament_pctg", + "renamed_from": "Tiertime Generic PCTG@300HS;Tiertime Generic PCTG300HS", "from": "system", - "setting_id": "2Qbbi90zWBoo9dBl", - "filament_id": "OFTKFAZ4", + "setting_id": "1VNFGuUO3KSO6Yfr", + "filament_id": "OFu1evlr", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime.json similarity index 91% rename from resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json rename to resources/profiles/Tiertime/filament/Generic PCTG @Tiertime.json index 49c71cc115..4d091cde32 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PCTG.json +++ b/resources/profiles/Tiertime/filament/Generic PCTG @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PCTG", + "name": "Generic PCTG @Tiertime", "inherits": "fdm_filament_pctg", + "renamed_from": "Tiertime Generic PCTG", "from": "system", - "setting_id": "UDqS8gFlHvPIysFk", - "filament_id": "OFTKFAZ4", + "setting_id": "tJIMGMxg0hRSfL95", + "filament_id": "OFu1evlr", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json b/resources/profiles/Tiertime/filament/Generic PE @Tiertime 300HS.json similarity index 87% rename from resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json rename to resources/profiles/Tiertime/filament/Generic PE @Tiertime 300HS.json index 4e6aab9e87..a1fa9c5859 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PE @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PE@300HS", + "name": "Generic PE @Tiertime 300HS", "inherits": "fdm_filament_pe", + "renamed_from": "Tiertime Generic PE@300HS;Tiertime Generic PE300HS", "from": "system", - "setting_id": "ZbU3Ov0P5wtbudQ0", - "filament_id": "OFKuTr12", + "setting_id": "CO9KWZrfkTYBnB4X", + "filament_id": "OFPklMI1", "instantiation": "true", "filament_cost": [ "40.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json b/resources/profiles/Tiertime/filament/Generic PE @Tiertime.json similarity index 89% rename from resources/profiles/Tiertime/filament/Tiertime Generic PE.json rename to resources/profiles/Tiertime/filament/Generic PE @Tiertime.json index 0c9504212c..0684af67d8 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE.json +++ b/resources/profiles/Tiertime/filament/Generic PE @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PE", + "name": "Generic PE @Tiertime", "inherits": "fdm_filament_pe", + "renamed_from": "Tiertime Generic PE", "from": "system", - "setting_id": "bYC8MPsm3VIgwaSt", - "filament_id": "OFKuTr12", + "setting_id": "2U06Qrlxin8nLr9s", + "filament_id": "OFPklMI1", "instantiation": "true", "filament_cost": [ "40.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime 300HS.json similarity index 86% rename from resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime 300HS.json index 94686b9139..11a6680550 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PE-CF@300HS", + "name": "Generic PE-CF @Tiertime 300HS", "inherits": "fdm_filament_pe", + "renamed_from": "Tiertime Generic PE-CF@300HS;Tiertime Generic PE-CF300HS", "from": "system", - "setting_id": "5ChSjqNjRn8QArJP", - "filament_id": "OFkUaDnU", + "setting_id": "512vfRIxs8uwOBpP", + "filament_id": "OFd0Fv0k", "instantiation": "true", "filament_cost": [ "65.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime.json similarity index 89% rename from resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json rename to resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime.json index dc20a657b0..ecc5a74d8c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PE-CF.json +++ b/resources/profiles/Tiertime/filament/Generic PE-CF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PE-CF", + "name": "Generic PE-CF @Tiertime", "inherits": "fdm_filament_pe", + "renamed_from": "Tiertime Generic PE-CF", "from": "system", - "setting_id": "jzT1pay155tbaY9M", - "filament_id": "OFkUaDnU", + "setting_id": "QWIMNxCCZ9URxMjo", + "filament_id": "OFd0Fv0k", "instantiation": "true", "filament_cost": [ "65.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime 300HS.json similarity index 88% rename from resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json rename to resources/profiles/Tiertime/filament/Generic PETG @Tiertime 300HS.json index 56157be9e7..e65d53bc71 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PETG@300HS", + "name": "Generic PETG @Tiertime 300HS", "inherits": "fdm_filament_pet", + "renamed_from": "Tiertime Generic PETG@300HS;Tiertime Generic PETG300HS", "from": "system", - "setting_id": "ZZmmVicb1p0wb5r1", - "filament_id": "OF1uR1t2", + "setting_id": "btlSAAZFdFgnfIqh", + "filament_id": "OFYPdQJh", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime.json similarity index 91% rename from resources/profiles/Tiertime/filament/Tiertime Generic PETG.json rename to resources/profiles/Tiertime/filament/Generic PETG @Tiertime.json index 6d15c90d59..cdf4a2ba88 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG.json +++ b/resources/profiles/Tiertime/filament/Generic PETG @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PETG", + "name": "Generic PETG @Tiertime", "inherits": "fdm_filament_pet", + "renamed_from": "Tiertime Generic PETG", "from": "system", - "setting_id": "UevLlG43knAdcET2", - "filament_id": "OF1uR1t2", + "setting_id": "JwdH78YQ3v5XxsIq", + "filament_id": "OFYPdQJh", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime 300HS.json similarity index 89% rename from resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime 300HS.json index ed4c4d9347..2193ee85fe 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PETG-CF@300HS", + "name": "Generic PETG-CF @Tiertime 300HS", "inherits": "fdm_filament_pet", + "renamed_from": "Tiertime Generic PETG-CF@300HS;Tiertime Generic PETG-CF300HS", "from": "system", - "setting_id": "jBUy8xUDg53e51kz", - "filament_id": "OFWadebJ", + "setting_id": "pnBek08LG30iqOmr", + "filament_id": "OFoYSJKi", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime.json similarity index 91% rename from resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json rename to resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime.json index 32ab191cc2..42b67f2c6d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PETG-CF.json +++ b/resources/profiles/Tiertime/filament/Generic PETG-CF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PETG-CF", + "name": "Generic PETG-CF @Tiertime", "inherits": "fdm_filament_pet", + "renamed_from": "Tiertime Generic PETG-CF", "from": "system", - "setting_id": "zA6nHgNkxBxGKw0w", - "filament_id": "OFWadebJ", + "setting_id": "97ZKNZS7uHaNzgLJ", + "filament_id": "OFoYSJKi", "instantiation": "true", "cool_plate_temp": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime 300HS.json similarity index 60% rename from resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json rename to resources/profiles/Tiertime/filament/Generic PHA @Tiertime 300HS.json index 7c2deb0b12..d7d10eedfc 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PHA@300HS", + "name": "Generic PHA @Tiertime 300HS", "inherits": "fdm_filament_pha", + "renamed_from": "Tiertime Generic PHA@300HS;Tiertime Generic PHA300HS", "from": "system", - "setting_id": "de5eveMr3bI3OCtF", - "filament_id": "OFxvKuYW", + "setting_id": "cdIDNHr9YR5p1gQx", + "filament_id": "OF74KeQR", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime.json similarity index 66% rename from resources/profiles/Tiertime/filament/Tiertime Generic PHA.json rename to resources/profiles/Tiertime/filament/Generic PHA @Tiertime.json index d924c5d28b..f0565e38a2 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PHA.json +++ b/resources/profiles/Tiertime/filament/Generic PHA @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PHA", + "name": "Generic PHA @Tiertime", "inherits": "fdm_filament_pha", + "renamed_from": "Tiertime Generic PHA", "from": "system", - "setting_id": "tFuE7IEbeGEhCNnz", - "filament_id": "OFxvKuYW", + "setting_id": "GvzA9Y6mP5a767Qb", + "filament_id": "OF74KeQR", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime 300HS.json similarity index 82% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json rename to resources/profiles/Tiertime/filament/Generic PLA @Tiertime 300HS.json index 3fe56ea2e0..58c56fee5d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA@300HS", + "name": "Generic PLA @Tiertime 300HS", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA@300HS;Tiertime Generic PLA300HS", "from": "system", - "setting_id": "jTSVVOuHuQqETOpe", - "filament_id": "OFuSwKgm", + "setting_id": "VdXotPCaBzW0DswJ", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime.json similarity index 85% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA.json rename to resources/profiles/Tiertime/filament/Generic PLA @Tiertime.json index ea77ef41e3..5f8aaf4229 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA.json +++ b/resources/profiles/Tiertime/filament/Generic PLA @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA", + "name": "Generic PLA @Tiertime", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA", "from": "system", - "setting_id": "q9W1goEbw6UUrNY3", - "filament_id": "OFuSwKgm", + "setting_id": "RuyaWPyP41WHbU7p", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime 300HS.json similarity index 65% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json rename to resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime 300HS.json index 5814210aee..779cc6ca4e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA High Speed@300HS", + "name": "Generic PLA High Speed @Tiertime 300HS", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA High Speed@300HS;Tiertime Generic PLA High Speed300HS", "from": "system", - "setting_id": "e0vVCCT6Tw4061is", - "filament_id": "OFodPDxO", + "setting_id": "cDQTrE11kyvmtj6l", + "filament_id": "OFmpMwxS", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime.json similarity index 71% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json rename to resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime.json index bda1527d04..c88496b0e6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA High Speed.json +++ b/resources/profiles/Tiertime/filament/Generic PLA High Speed @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA High Speed", + "name": "Generic PLA High Speed @Tiertime", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA High Speed", "from": "system", - "setting_id": "Ms3c6DePE0cjBeQ4", - "filament_id": "OFodPDxO", + "setting_id": "HFwoDRXx0L72uTKc", + "filament_id": "OFmpMwxS", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime 300HS.json similarity index 82% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json rename to resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime 300HS.json index b4fafb3019..ba4745b50c 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA Silk@300HS", + "name": "Generic PLA Silk @Tiertime 300HS", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA Silk@300HS;Tiertime Generic PLA Silk300HS", "from": "system", - "setting_id": "yV358AeiALOn6xVr", - "filament_id": "OF0GIkJm", + "setting_id": "pXFxVcPY3aVixOKU", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime.json similarity index 86% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json rename to resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime.json index 88b0e6a700..a2cbb3f4c4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA Silk.json +++ b/resources/profiles/Tiertime/filament/Generic PLA Silk @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA Silk", + "name": "Generic PLA Silk @Tiertime", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA Silk", "from": "system", - "setting_id": "RgKM4PxtAasidTe5", - "filament_id": "OF0GIkJm", + "setting_id": "5R7nTGblzuEWfdog", + "filament_id": "OFesA6rF", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime 300HS.json similarity index 88% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime 300HS.json index 4cb7802847..d4ceebf2db 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA-CF@300HS", + "name": "Generic PLA-CF @Tiertime 300HS", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA-CF@300HS;Tiertime Generic PLA-CF300HS", "from": "system", - "setting_id": "3QSGv6pAz9ihFVuD", - "filament_id": "OFgVJhVt", + "setting_id": "CVks3a5cABQw38Ia", + "filament_id": "OFWbdGsC", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime.json similarity index 90% rename from resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json rename to resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime.json index ff1c8b14ee..306ff427aa 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PLA-CF.json +++ b/resources/profiles/Tiertime/filament/Generic PLA-CF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PLA-CF", + "name": "Generic PLA-CF @Tiertime", "inherits": "fdm_filament_pla", + "renamed_from": "Tiertime Generic PLA-CF", "from": "system", - "setting_id": "maM4lXic0F10faAb", - "filament_id": "OFgVJhVt", + "setting_id": "SSHFL8Wbk46BaTYF", + "filament_id": "OFWbdGsC", "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json b/resources/profiles/Tiertime/filament/Generic PP @Tiertime 300HS.json similarity index 60% rename from resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json rename to resources/profiles/Tiertime/filament/Generic PP @Tiertime 300HS.json index b908fe1011..b79c34b466 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PP @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PP@300HS", + "name": "Generic PP @Tiertime 300HS", "inherits": "fdm_filament_pp", + "renamed_from": "Tiertime Generic PP@300HS;Tiertime Generic PP300HS", "from": "system", - "setting_id": "lx9zoOh3ALDlLasf", - "filament_id": "OF3s929u", + "setting_id": "BmIuSlyYKMw76mqs", + "filament_id": "OF1UNk9P", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json b/resources/profiles/Tiertime/filament/Generic PP @Tiertime.json similarity index 66% rename from resources/profiles/Tiertime/filament/Tiertime Generic PP.json rename to resources/profiles/Tiertime/filament/Generic PP @Tiertime.json index bef2a0ee16..0b7361dc78 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP.json +++ b/resources/profiles/Tiertime/filament/Generic PP @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PP", + "name": "Generic PP @Tiertime", "inherits": "fdm_filament_pp", + "renamed_from": "Tiertime Generic PP", "from": "system", - "setting_id": "3ZYx92CbNBiocyXx", - "filament_id": "OF3s929u", + "setting_id": "hbt3RXCxomod1cBQ", + "filament_id": "OF1UNk9P", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime 300HS.json similarity index 69% rename from resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime 300HS.json index 15c4591f98..e5a08307fa 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PP-CF@300HS", + "name": "Generic PP-CF @Tiertime 300HS", "inherits": "fdm_filament_pp", + "renamed_from": "Tiertime Generic PP-CF@300HS;Tiertime Generic PP-CF300HS", "from": "system", - "setting_id": "3TZu7e58qrjP4F4u", - "filament_id": "OFMTBcnz", + "setting_id": "u1Sqh9bCLFQvJxoS", + "filament_id": "OFXkm8q1", "instantiation": "true", "filament_cost": [ "77.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime.json similarity index 74% rename from resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json rename to resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime.json index 22cd19292d..4c8abaa8ce 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-CF.json +++ b/resources/profiles/Tiertime/filament/Generic PP-CF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PP-CF", + "name": "Generic PP-CF @Tiertime", "inherits": "fdm_filament_pp", + "renamed_from": "Tiertime Generic PP-CF", "from": "system", - "setting_id": "O5VvyfY5CV6IfMPQ", - "filament_id": "OFMTBcnz", + "setting_id": "2giqoHCbRKiAuTyB", + "filament_id": "OFXkm8q1", "instantiation": "true", "filament_cost": [ "77.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime 300HS.json similarity index 69% rename from resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime 300HS.json index bac285fef0..820f415b25 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PP-GF@300HS", + "name": "Generic PP-GF @Tiertime 300HS", "inherits": "fdm_filament_pp", + "renamed_from": "Tiertime Generic PP-GF@300HS;Tiertime Generic PP-GF300HS", "from": "system", - "setting_id": "WKwUmsEhhYFyGAP5", - "filament_id": "OFkYkQGO", + "setting_id": "Aiw0kkL0EFLNZ0zB", + "filament_id": "OFsijjtH", "instantiation": "true", "filament_cost": [ "59.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime.json similarity index 74% rename from resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json rename to resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime.json index 44557aed47..930f2d7870 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PP-GF.json +++ b/resources/profiles/Tiertime/filament/Generic PP-GF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PP-GF", + "name": "Generic PP-GF @Tiertime", "inherits": "fdm_filament_pp", + "renamed_from": "Tiertime Generic PP-GF", "from": "system", - "setting_id": "ZQnzXtnTMVMVMNaS", - "filament_id": "OFkYkQGO", + "setting_id": "HQaX19e4JViPTQn0", + "filament_id": "OFsijjtH", "instantiation": "true", "filament_cost": [ "59.99" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime 300HS.json similarity index 69% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime 300HS.json index 918b4cf1a8..6402b8a7c9 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPA-CF@300HS", + "name": "Generic PPA-CF @Tiertime 300HS", "inherits": "fdm_filament_ppa", + "renamed_from": "Tiertime Generic PPA-CF@300HS;Tiertime Generic PPA-CF300HS", "from": "system", - "setting_id": "wLH8aGr4ZNiHazwA", - "filament_id": "OFSPdsuW", + "setting_id": "yEjRoG6UAmEBAsTg", + "filament_id": "OF8tPByX", "instantiation": "true", "filament_type": [ "PPA-CF" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime.json similarity index 74% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json rename to resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime.json index 924f324eb4..845cd1f1f3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-CF.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-CF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPA-CF", + "name": "Generic PPA-CF @Tiertime", "inherits": "fdm_filament_ppa", + "renamed_from": "Tiertime Generic PPA-CF", "from": "system", - "setting_id": "2zYiuKYR7bESaCnd", - "filament_id": "OFSPdsuW", + "setting_id": "C3VjtPXIQ9CikaQH", + "filament_id": "OF8tPByX", "instantiation": "true", "filament_type": [ "PPA-CF" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime 300HS.json similarity index 65% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime 300HS.json index dbc3c9ebf3..75a81d0aff 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPA-GF@300HS", + "name": "Generic PPA-GF @Tiertime 300HS", "inherits": "fdm_filament_ppa", + "renamed_from": "Tiertime Generic PPA-GF@300HS;Tiertime Generic PPA-GF300HS", "from": "system", - "setting_id": "1zAhSxsuv3wxgBtQ", - "filament_id": "OFptvi3F", + "setting_id": "9088HrpGRDIqqxTs", + "filament_id": "OF8Tlg47", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime.json similarity index 70% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json rename to resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime.json index e84a1c4bb9..7ec50bd2f4 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPA-GF.json +++ b/resources/profiles/Tiertime/filament/Generic PPA-GF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPA-GF", + "name": "Generic PPA-GF @Tiertime", "inherits": "fdm_filament_ppa", + "renamed_from": "Tiertime Generic PPA-GF", "from": "system", - "setting_id": "hYkZEmk1B8X9EcF8", - "filament_id": "OFptvi3F", + "setting_id": "jGP0en9vTFNmj5AJ", + "filament_id": "OF8Tlg47", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime 300HS.json similarity index 60% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json rename to resources/profiles/Tiertime/filament/Generic PPS @Tiertime 300HS.json index 047117502e..bd804b9ffc 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPS@300HS", + "name": "Generic PPS @Tiertime 300HS", "inherits": "fdm_filament_pps", + "renamed_from": "Tiertime Generic PPS@300HS;Tiertime Generic PPS300HS", "from": "system", - "setting_id": "5TZhbLxtLq6kSJJY", - "filament_id": "OFvPomQf", + "setting_id": "KIspUdArMQzvDtcX", + "filament_id": "OFq9svOz", "instantiation": "true", "compatible_printers": [ "Tiertime UP300 HS 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime.json similarity index 66% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPS.json rename to resources/profiles/Tiertime/filament/Generic PPS @Tiertime.json index 77fe993cdb..dbb381012e 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS.json +++ b/resources/profiles/Tiertime/filament/Generic PPS @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPS", + "name": "Generic PPS @Tiertime", "inherits": "fdm_filament_pps", + "renamed_from": "Tiertime Generic PPS", "from": "system", - "setting_id": "2L1eOtxSeCJxW3RV", - "filament_id": "OFvPomQf", + "setting_id": "NCTW11dGCzTxasjU", + "filament_id": "OFq9svOz", "instantiation": "true", "compatible_printers": [ "Tiertime UP400 Pro 0.4 nozzle", diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime 300HS.json similarity index 74% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json rename to resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime 300HS.json index cd3e802975..f53a77c9c6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPS-CF@300HS", + "name": "Generic PPS-CF @Tiertime 300HS", "inherits": "fdm_filament_pps", + "renamed_from": "Tiertime Generic PPS-CF@300HS;Tiertime Generic PPS-CF300HS", "from": "system", - "setting_id": "6UHEejfZvhQGA4vB", - "filament_id": "OFGzUNbm", + "setting_id": "E7mVBEFECdf1mhXE", + "filament_id": "OF6rdQ6M", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime.json similarity index 79% rename from resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json rename to resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime.json index 8a8485843c..3e4e15da7d 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PPS-CF.json +++ b/resources/profiles/Tiertime/filament/Generic PPS-CF @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PPS-CF", + "name": "Generic PPS-CF @Tiertime", "inherits": "fdm_filament_pps", + "renamed_from": "Tiertime Generic PPS-CF", "from": "system", - "setting_id": "E0gbADj0OHkGSOxt", - "filament_id": "OFGzUNbm", + "setting_id": "QUPOb7dBkg6bPul2", + "filament_id": "OF6rdQ6M", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime 300HS.json similarity index 70% rename from resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json rename to resources/profiles/Tiertime/filament/Generic PVA @Tiertime 300HS.json index d1a5b62d7d..2efe590fb6 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PVA@300HS", + "name": "Generic PVA @Tiertime 300HS", "inherits": "fdm_filament_pva", + "renamed_from": "Tiertime Generic PVA@300HS;Tiertime Generic PVA300HS", "from": "system", - "setting_id": "BQ6G75c9eLQQ7ULg", - "filament_id": "OFMZAoqa", + "setting_id": "E8fgXFvjTnIpqdrg", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime.json similarity index 75% rename from resources/profiles/Tiertime/filament/Tiertime Generic PVA.json rename to resources/profiles/Tiertime/filament/Generic PVA @Tiertime.json index db73f4b947..588648b8b0 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic PVA.json +++ b/resources/profiles/Tiertime/filament/Generic PVA @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic PVA", + "name": "Generic PVA @Tiertime", "inherits": "fdm_filament_pva", + "renamed_from": "Tiertime Generic PVA", "from": "system", - "setting_id": "bTkxwDd1TU8TUqVC", - "filament_id": "OFMZAoqa", + "setting_id": "6R2BduAh4ASmGbDd", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime 300HS.json similarity index 82% rename from resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json rename to resources/profiles/Tiertime/filament/Generic SBS @Tiertime 300HS.json index df8a4d7cbe..f3860b4e64 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic SBS@300HS", + "name": "Generic SBS @Tiertime 300HS", "inherits": "fdm_filament_sbs", + "renamed_from": "Tiertime Generic SBS@300HS;Tiertime Generic SBS300HS", "from": "system", - "setting_id": "neqjohDEPRiOa6ut", - "filament_id": "OFM87w9T", + "setting_id": "nS6aGQgepNoAjumo", + "filament_id": "OFhQfUQY", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime.json similarity index 85% rename from resources/profiles/Tiertime/filament/Tiertime Generic SBS.json rename to resources/profiles/Tiertime/filament/Generic SBS @Tiertime.json index ab91c462d0..7c4751aa34 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic SBS.json +++ b/resources/profiles/Tiertime/filament/Generic SBS @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic SBS", + "name": "Generic SBS @Tiertime", "inherits": "fdm_filament_sbs", + "renamed_from": "Tiertime Generic SBS", "from": "system", - "setting_id": "tHfCQJdD7qiIF4uT", - "filament_id": "OFM87w9T", + "setting_id": "nyv523sDXK9fDbtb", + "filament_id": "OFhQfUQY", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime 300HS.json similarity index 81% rename from resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json rename to resources/profiles/Tiertime/filament/Generic TPU @Tiertime 300HS.json index d1c8e5ba35..2d52d479d3 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU@300HS.json +++ b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime 300HS.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic TPU@300HS", + "name": "Generic TPU @Tiertime 300HS", "inherits": "fdm_filament_tpu", + "renamed_from": "Tiertime Generic TPU@300HS;Tiertime Generic TPU300HS", "from": "system", - "filament_id": "OFCVUEaV", - "setting_id": "wgOtq6REuUQmNe5R", + "filament_id": "OFgbpcy9", + "setting_id": "99UYNDy3zV3bChRG", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime.json similarity index 84% rename from resources/profiles/Tiertime/filament/Tiertime Generic TPU.json rename to resources/profiles/Tiertime/filament/Generic TPU @Tiertime.json index 0ecd0d9636..a32f1173dc 100644 --- a/resources/profiles/Tiertime/filament/Tiertime Generic TPU.json +++ b/resources/profiles/Tiertime/filament/Generic TPU @Tiertime.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Tiertime Generic TPU", + "name": "Generic TPU @Tiertime", "inherits": "fdm_filament_tpu", + "renamed_from": "Tiertime Generic TPU", "from": "system", - "filament_id": "OFCVUEaV", - "setting_id": "Viy3kUE0cTV2rMiC", + "filament_id": "OFgbpcy9", + "setting_id": "UCowa7X5TZwXBJWe", "instantiation": "true", "filament_max_volumetric_speed": [ "3.2" diff --git a/resources/profiles/TwoTrees.json b/resources/profiles/TwoTrees.json index 7484f27416..5c8349181f 100644 --- a/resources/profiles/TwoTrees.json +++ b/resources/profiles/TwoTrees.json @@ -1,6 +1,6 @@ { "name": "TwoTrees", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "1", "description": "TwoTrees configurations", "machine_model_list": [ @@ -81,12 +81,12 @@ ], "filament_list": [ { - "name": "TwoTrees Generic 95A TPU @SK1", - "sub_path": "filament/TwoTrees Generic 95A TPU @SK1.json" + "name": "Generic 95A TPU @TwoTrees SK1", + "sub_path": "filament/Generic 95A TPU @TwoTrees SK1.json" }, { - "name": "TwoTrees Generic HS PLA @SK1", - "sub_path": "filament/TwoTrees Generic HS PLA @SK1.json" + "name": "Generic HS PLA @TwoTrees SK1", + "sub_path": "filament/Generic HS PLA @TwoTrees SK1.json" } ], "machine_list": [ diff --git a/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json b/resources/profiles/TwoTrees/filament/Generic 95A TPU @TwoTrees SK1.json similarity index 74% rename from resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json rename to resources/profiles/TwoTrees/filament/Generic 95A TPU @TwoTrees SK1.json index 72564df29b..46b9d1f100 100644 --- a/resources/profiles/TwoTrees/filament/TwoTrees Generic 95A TPU @SK1.json +++ b/resources/profiles/TwoTrees/filament/Generic 95A TPU @TwoTrees SK1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "TwoTrees Generic 95A TPU @SK1", + "name": "Generic 95A TPU @TwoTrees SK1", "inherits": "fdm_filament_tpu", + "renamed_from": "TwoTrees Generic 95A TPU @SK1;TwoTrees Generic 95A TPU SK1", "from": "system", - "setting_id": "YqQSUrG195dCz67L", - "filament_id": "OFdHsxB4", + "setting_id": "LR7ufBEnGhieNdB7", + "filament_id": "OF6MMR8P", "instantiation": "true", "compatible_printers": [ "TwoTrees SK1 0.4 nozzle" diff --git a/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json b/resources/profiles/TwoTrees/filament/Generic HS PLA @TwoTrees SK1.json similarity index 83% rename from resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json rename to resources/profiles/TwoTrees/filament/Generic HS PLA @TwoTrees SK1.json index 1a7cef302e..fd22e6417a 100644 --- a/resources/profiles/TwoTrees/filament/TwoTrees Generic HS PLA @SK1.json +++ b/resources/profiles/TwoTrees/filament/Generic HS PLA @TwoTrees SK1.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "TwoTrees Generic HS PLA @SK1", + "name": "Generic HS PLA @TwoTrees SK1", "inherits": "fdm_filament_pla", + "renamed_from": "TwoTrees Generic HS PLA @SK1;TwoTrees Generic HS PLA SK1", "from": "system", - "setting_id": "k7bLC5us9mGJzznW", - "filament_id": "OFBpcB0a", + "setting_id": "uRS2QA3xad1lBZJR", + "filament_id": "OFvxghTE", "instantiation": "true", "compatible_printers": [ "TwoTrees SK1 0.4 nozzle" diff --git a/resources/profiles/TwoTrees/machine/TwoTrees SK1.json b/resources/profiles/TwoTrees/machine/TwoTrees SK1.json index fd32c01dcf..964d47c813 100644 --- a/resources/profiles/TwoTrees/machine/TwoTrees SK1.json +++ b/resources/profiles/TwoTrees/machine/TwoTrees SK1.json @@ -8,5 +8,5 @@ "bed_model": "TwoTrees SK1_buildplate_model.stl", "bed_texture": "TwoTrees SK1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "TwoTrees Generic 95A TPU @SK1;TwoTrees Generic PETG @SK1;TwoTrees Generic HS PLA @SK1;TwoTrees Generic PLA @SK1;TwoTrees Generic PLA-CF @SK1;TwoTrees Generic PLA Matte @SK1;TwoTrees Generic PLA Silk @SK1" + "default_materials": "Generic 95A TPU @TwoTrees SK1;TwoTrees Generic PETG @SK1;Generic HS PLA @TwoTrees SK1;TwoTrees Generic PLA @SK1;TwoTrees Generic PLA-CF @SK1;TwoTrees Generic PLA Matte @SK1;TwoTrees Generic PLA Silk @SK1" } diff --git a/resources/profiles/Vzbot.json b/resources/profiles/Vzbot.json index 12ec13402b..bcefdaf26c 100644 --- a/resources/profiles/Vzbot.json +++ b/resources/profiles/Vzbot.json @@ -1,6 +1,6 @@ { "name": "Vzbot", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "Vzbot configurations", "machine_model_list": [ @@ -149,44 +149,44 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Vzbot Generic ABS", - "sub_path": "filament/Vzbot Generic ABS.json" + "name": "Generic ABS @Vzbot", + "sub_path": "filament/Generic ABS @Vzbot.json" }, { - "name": "Vzbot Generic ASA", - "sub_path": "filament/Vzbot Generic ASA.json" + "name": "Generic ASA @Vzbot", + "sub_path": "filament/Generic ASA @Vzbot.json" }, { - "name": "Vzbot Generic PA", - "sub_path": "filament/Vzbot Generic PA.json" + "name": "Generic PA @Vzbot", + "sub_path": "filament/Generic PA @Vzbot.json" }, { - "name": "Vzbot Generic PA-CF", - "sub_path": "filament/Vzbot Generic PA-CF.json" + "name": "Generic PA-CF @Vzbot", + "sub_path": "filament/Generic PA-CF @Vzbot.json" }, { - "name": "Vzbot Generic PC", - "sub_path": "filament/Vzbot Generic PC.json" + "name": "Generic PC @Vzbot", + "sub_path": "filament/Generic PC @Vzbot.json" }, { - "name": "Vzbot Generic PETG", - "sub_path": "filament/Vzbot Generic PETG.json" + "name": "Generic PETG @Vzbot", + "sub_path": "filament/Generic PETG @Vzbot.json" }, { - "name": "Vzbot Generic PLA", - "sub_path": "filament/Vzbot Generic PLA.json" + "name": "Generic PLA @Vzbot", + "sub_path": "filament/Generic PLA @Vzbot.json" }, { - "name": "Vzbot Generic PLA-CF", - "sub_path": "filament/Vzbot Generic PLA-CF.json" + "name": "Generic PLA-CF @Vzbot", + "sub_path": "filament/Generic PLA-CF @Vzbot.json" }, { - "name": "Vzbot Generic PVA", - "sub_path": "filament/Vzbot Generic PVA.json" + "name": "Generic PVA @Vzbot", + "sub_path": "filament/Generic PVA @Vzbot.json" }, { - "name": "Vzbot Generic TPU", - "sub_path": "filament/Vzbot Generic TPU.json" + "name": "Generic TPU @Vzbot", + "sub_path": "filament/Generic TPU @Vzbot.json" } ], "machine_list": [ diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic ABS.json b/resources/profiles/Vzbot/filament/Generic ABS @Vzbot.json similarity index 75% rename from resources/profiles/Vzbot/filament/Vzbot Generic ABS.json rename to resources/profiles/Vzbot/filament/Generic ABS @Vzbot.json index 0ab07b4387..bc59bdfea7 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic ABS.json +++ b/resources/profiles/Vzbot/filament/Generic ABS @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic ABS", + "name": "Generic ABS @Vzbot", "inherits": "fdm_filament_abs", + "renamed_from": "Vzbot Generic ABS", "from": "system", - "setting_id": "nRFPlbSKRMb0UpSI", - "filament_id": "OFLBUkwC", + "setting_id": "0gr3MwdhoGW44mbr", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.926" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic ASA.json b/resources/profiles/Vzbot/filament/Generic ASA @Vzbot.json similarity index 75% rename from resources/profiles/Vzbot/filament/Vzbot Generic ASA.json rename to resources/profiles/Vzbot/filament/Generic ASA @Vzbot.json index 69ba1b7b5b..9495f5cb1e 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic ASA.json +++ b/resources/profiles/Vzbot/filament/Generic ASA @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic ASA", + "name": "Generic ASA @Vzbot", "inherits": "fdm_filament_asa", + "renamed_from": "Vzbot Generic ASA", "from": "system", - "setting_id": "rP4Qul9OY7lUhPgO", - "filament_id": "OF4XAUnp", + "setting_id": "0MutZpaR9XVzUGGS", + "filament_id": "OFLPAxz3", "instantiation": "true", "filament_flow_ratio": [ "0.93" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PA.json b/resources/profiles/Vzbot/filament/Generic PA @Vzbot.json similarity index 77% rename from resources/profiles/Vzbot/filament/Vzbot Generic PA.json rename to resources/profiles/Vzbot/filament/Generic PA @Vzbot.json index 46184d8018..a5e39c829c 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PA.json +++ b/resources/profiles/Vzbot/filament/Generic PA @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic PA", + "name": "Generic PA @Vzbot", "inherits": "fdm_filament_pa", + "renamed_from": "Vzbot Generic PA", "from": "system", - "setting_id": "4CBO5MnUk8Smhs3q", - "filament_id": "OF0zx94L", + "setting_id": "fwiU6RaIAOV38A9B", + "filament_id": "OFg8ndtj", "instantiation": "true", "nozzle_temperature_initial_layer": [ "280" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PA-CF.json b/resources/profiles/Vzbot/filament/Generic PA-CF @Vzbot.json similarity index 77% rename from resources/profiles/Vzbot/filament/Vzbot Generic PA-CF.json rename to resources/profiles/Vzbot/filament/Generic PA-CF @Vzbot.json index 75ca6d6b52..30a13910e0 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PA-CF.json +++ b/resources/profiles/Vzbot/filament/Generic PA-CF @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic PA-CF", + "name": "Generic PA-CF @Vzbot", "inherits": "fdm_filament_pa", + "renamed_from": "Vzbot Generic PA-CF", "from": "system", - "setting_id": "AKO1twNgFO67N5GK", - "filament_id": "OFNn21yM", + "setting_id": "q8DtJmdJUN3KFV3E", + "filament_id": "OFQLcbps", "instantiation": "true", "filament_type": [ "PA-CF" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PC.json b/resources/profiles/Vzbot/filament/Generic PC @Vzbot.json similarity index 75% rename from resources/profiles/Vzbot/filament/Vzbot Generic PC.json rename to resources/profiles/Vzbot/filament/Generic PC @Vzbot.json index 9731fbbe07..e2fecd6301 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PC.json +++ b/resources/profiles/Vzbot/filament/Generic PC @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic PC", + "name": "Generic PC @Vzbot", "inherits": "fdm_filament_pc", + "renamed_from": "Vzbot Generic PC", "from": "system", - "setting_id": "wUe99Mr4HqzSNxgO", - "filament_id": "OF9fOPpd", + "setting_id": "crcoB7BvhVnnHNaF", + "filament_id": "OFLakOUI", "instantiation": "true", "filament_max_volumetric_speed": [ "50" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PETG.json b/resources/profiles/Vzbot/filament/Generic PETG @Vzbot.json similarity index 85% rename from resources/profiles/Vzbot/filament/Vzbot Generic PETG.json rename to resources/profiles/Vzbot/filament/Generic PETG @Vzbot.json index 0f585fbb8c..bfb1f5af81 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PETG.json +++ b/resources/profiles/Vzbot/filament/Generic PETG @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic PETG", + "name": "Generic PETG @Vzbot", "inherits": "fdm_filament_pet", + "renamed_from": "Vzbot Generic PETG", "from": "system", - "setting_id": "C8LMRvN350POVqC2", - "filament_id": "OFHUnLY2", + "setting_id": "NInr0jEJnziZ1poM", + "filament_id": "OFYPdQJh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PLA.json b/resources/profiles/Vzbot/filament/Generic PLA @Vzbot.json similarity index 76% rename from resources/profiles/Vzbot/filament/Vzbot Generic PLA.json rename to resources/profiles/Vzbot/filament/Generic PLA @Vzbot.json index b0e447e66c..ee77c2fd61 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PLA.json +++ b/resources/profiles/Vzbot/filament/Generic PLA @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic PLA", + "name": "Generic PLA @Vzbot", "inherits": "fdm_filament_pla", + "renamed_from": "Vzbot Generic PLA", "from": "system", - "setting_id": "4JMiuJbl1gNrBipT", - "filament_id": "OF2mgDsI", + "setting_id": "Skn1ODpcSXd2NFcH", + "filament_id": "OFDSrzZ8", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PLA-CF.json b/resources/profiles/Vzbot/filament/Generic PLA-CF @Vzbot.json similarity index 77% rename from resources/profiles/Vzbot/filament/Vzbot Generic PLA-CF.json rename to resources/profiles/Vzbot/filament/Generic PLA-CF @Vzbot.json index 2b73cddba8..2fd8b03ee5 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PLA-CF.json +++ b/resources/profiles/Vzbot/filament/Generic PLA-CF @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic PLA-CF", + "name": "Generic PLA-CF @Vzbot", "inherits": "fdm_filament_pla", + "renamed_from": "Vzbot Generic PLA-CF", "from": "system", - "setting_id": "nt1egZD1dQEVXp0v", - "filament_id": "OFYHzKyS", + "setting_id": "FETpZHhHj60hztGS", + "filament_id": "OFWbdGsC", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic PVA.json b/resources/profiles/Vzbot/filament/Generic PVA @Vzbot.json similarity index 78% rename from resources/profiles/Vzbot/filament/Vzbot Generic PVA.json rename to resources/profiles/Vzbot/filament/Generic PVA @Vzbot.json index 23a748046e..f8b6793e74 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic PVA.json +++ b/resources/profiles/Vzbot/filament/Generic PVA @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic PVA", + "name": "Generic PVA @Vzbot", "inherits": "fdm_filament_pva", + "renamed_from": "Vzbot Generic PVA", "from": "system", - "setting_id": "DX4eZb2tlNVqeUrn", - "filament_id": "OFIda816", + "setting_id": "3xgrPw1nCEUaKQwQ", + "filament_id": "OFDvXujf", "instantiation": "true", "filament_flow_ratio": [ "0.95" diff --git a/resources/profiles/Vzbot/filament/Vzbot Generic TPU.json b/resources/profiles/Vzbot/filament/Generic TPU @Vzbot.json similarity index 73% rename from resources/profiles/Vzbot/filament/Vzbot Generic TPU.json rename to resources/profiles/Vzbot/filament/Generic TPU @Vzbot.json index 60901cb86e..6ba3a3e9e4 100644 --- a/resources/profiles/Vzbot/filament/Vzbot Generic TPU.json +++ b/resources/profiles/Vzbot/filament/Generic TPU @Vzbot.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "Vzbot Generic TPU", + "name": "Generic TPU @Vzbot", "inherits": "fdm_filament_tpu", + "renamed_from": "Vzbot Generic TPU", "from": "system", - "setting_id": "YlhTF1F3OA2qj6o2", - "filament_id": "OFGGyAgJ", + "setting_id": "eC3Pgdpbwi2amDbk", + "filament_id": "OFgbpcy9", "instantiation": "true", "filament_max_volumetric_speed": [ "50" diff --git a/resources/profiles/Vzbot/machine/Vzbot 235 AWD.json b/resources/profiles/Vzbot/machine/Vzbot 235 AWD.json index a29123add7..760c478b42 100644 --- a/resources/profiles/Vzbot/machine/Vzbot 235 AWD.json +++ b/resources/profiles/Vzbot/machine/Vzbot 235 AWD.json @@ -8,5 +8,5 @@ "bed_model": "Vz235SlicerBedModel-cnc.stl", "bed_texture": "VzBot_PS_bed_235.svg", "hotend_model": "Goliath.stl", - "default_materials": "Vzbot Generic ABS;Vzbot Generic PLA;Vzbot Generic PLA-CF;Vzbot Generic PETG;Vzbot Generic TPU;Vzbot Generic ASA;Vzbot Generic PC;Vzbot Generic PVA;Vzbot Generic PA;Vzbot Generic PA-CF" + "default_materials": "Generic ABS @Vzbot;Generic PLA @Vzbot;Generic PLA-CF @Vzbot;Generic PETG @Vzbot;Generic TPU @Vzbot;Generic ASA @Vzbot;Generic PC @Vzbot;Generic PVA @Vzbot;Generic PA @Vzbot;Generic PA-CF @Vzbot" } diff --git a/resources/profiles/Vzbot/machine/Vzbot 330 AWD.json b/resources/profiles/Vzbot/machine/Vzbot 330 AWD.json index 71561ce630..b30f6639fd 100644 --- a/resources/profiles/Vzbot/machine/Vzbot 330 AWD.json +++ b/resources/profiles/Vzbot/machine/Vzbot 330 AWD.json @@ -8,5 +8,5 @@ "bed_model": "Vz330SlicerBedModel-cnc.stl", "bed_texture": "VzBot_PS_bed_330.svg", "hotend_model": "Goliath.stl", - "default_materials": "Vzbot Generic ABS;Vzbot Generic PLA;Vzbot Generic PLA-CF;Vzbot Generic PETG;Vzbot Generic TPU;Vzbot Generic ASA;Vzbot Generic PC;Vzbot Generic PVA;Vzbot Generic PA;Vzbot Generic PA-CF" + "default_materials": "Generic ABS @Vzbot;Generic PLA @Vzbot;Generic PLA-CF @Vzbot;Generic PETG @Vzbot;Generic TPU @Vzbot;Generic ASA @Vzbot;Generic PC @Vzbot;Generic PVA @Vzbot;Generic PA @Vzbot;Generic PA-CF @Vzbot" } diff --git a/resources/profiles/Vzbot/machine/fdm_klipper_common.json b/resources/profiles/Vzbot/machine/fdm_klipper_common.json index 617015864c..97e546f272 100644 --- a/resources/profiles/Vzbot/machine/fdm_klipper_common.json +++ b/resources/profiles/Vzbot/machine/fdm_klipper_common.json @@ -125,7 +125,7 @@ "1" ], "default_filament_profile": [ - "Vzbot Generic ABS" + "Generic ABS @Vzbot" ], "default_print_profile": "0.20mm Standard @Vzbot", "bed_exclude_area": [ diff --git a/resources/profiles/Wanhao France.json b/resources/profiles/Wanhao France.json index 92694fe476..ce18d5c5d0 100644 --- a/resources/profiles/Wanhao France.json +++ b/resources/profiles/Wanhao France.json @@ -1,6 +1,6 @@ { "name": "Wanhao France", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Wanhao France D12 configurations", "machine_model_list": [ @@ -177,12 +177,12 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Yumi Generic PETG", - "sub_path": "filament/Yumi Generic PETG.json" + "name": "Generic PETG @Yumi", + "sub_path": "filament/Generic PETG @Yumi.json" }, { - "name": "Yumi Generic PLA", - "sub_path": "filament/Yumi Generic PLA.json" + "name": "Generic PLA @Yumi", + "sub_path": "filament/Generic PLA @Yumi.json" }, { "name": "YUMI PETG", diff --git a/resources/profiles/Wanhao France/filament/Yumi Generic PETG.json b/resources/profiles/Wanhao France/filament/Generic PETG @Yumi.json similarity index 91% rename from resources/profiles/Wanhao France/filament/Yumi Generic PETG.json rename to resources/profiles/Wanhao France/filament/Generic PETG @Yumi.json index af50f6f8b0..945df6cb10 100644 --- a/resources/profiles/Wanhao France/filament/Yumi Generic PETG.json +++ b/resources/profiles/Wanhao France/filament/Generic PETG @Yumi.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Yumi Generic PETG", + "name": "Generic PETG @Yumi", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "OFCu3jES", + "filament_id": "OFYPdQJh", "instantiation": "false", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Wanhao France/filament/Yumi Generic PLA.json b/resources/profiles/Wanhao France/filament/Generic PLA @Yumi.json similarity index 81% rename from resources/profiles/Wanhao France/filament/Yumi Generic PLA.json rename to resources/profiles/Wanhao France/filament/Generic PLA @Yumi.json index 0ef9bfdad2..1bcd4923a8 100644 --- a/resources/profiles/Wanhao France/filament/Yumi Generic PLA.json +++ b/resources/profiles/Wanhao France/filament/Generic PLA @Yumi.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Yumi Generic PLA", + "name": "Generic PLA @Yumi", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFGLeiNL", + "filament_id": "OFDSrzZ8", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Wanhao France/filament/YUMI PETG.json b/resources/profiles/Wanhao France/filament/YUMI PETG.json index d315c359f5..9d1bf0288a 100644 --- a/resources/profiles/Wanhao France/filament/YUMI PETG.json +++ b/resources/profiles/Wanhao France/filament/YUMI PETG.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "YUMI PETG", - "inherits": "Yumi Generic PETG", + "inherits": "Generic PETG @Yumi", "from": "system", "setting_id": "PFFm20QNgwqyuglH", "filament_id": "OF5NqBfC", diff --git a/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json b/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json index 5655743ca6..6636fe680d 100644 --- a/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json +++ b/resources/profiles/Wanhao France/filament/YUMI PLA Bowden.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "YUMI PLA Bowden", - "inherits": "Yumi Generic PLA", + "inherits": "Generic PLA @Yumi", "from": "system", "setting_id": "zQSSA2QZi27ESyQK", "filament_id": "OFZ2LuAi", diff --git a/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json b/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json index 52360e2d5b..050e003e77 100644 --- a/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json +++ b/resources/profiles/Wanhao France/filament/YUMI PLA Direct Drive.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "YUMI PLA Direct Drive", - "inherits": "Yumi Generic PLA", + "inherits": "Generic PLA @Yumi", "from": "system", "setting_id": "v2p0ooSxHnvVkn57", "filament_id": "OFJxSqO4", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json index 609e9f6106..26374ba05c 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json @@ -2,7 +2,6 @@ "type": "filament", "name": "Generic ABS @Z-Bolt Base", "inherits": "fdm_filament_abs", - "renamed_from": "Z-Bolt ABS;Generic ABS @Z-Bolt", "from": "system", "filament_id": "OFY9muEs", "instantiation": "false", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json index 0448f04bed..7bacdfde2e 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json @@ -2,7 +2,6 @@ "type": "filament", "name": "Generic ABS HT @Z-Bolt Base", "inherits": "Generic ABS @Z-Bolt Base", - "renamed_from": "Z-Bolt ABS HT;Generic ABS HT @Z-Bolt", "from": "system", "filament_id": "OFsP8PKH", "instantiation": "false", diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json index f593385ea7..07416a8d81 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json @@ -2,7 +2,6 @@ "type": "filament", "name": "Generic PA @Z-Bolt Base", "inherits": "fdm_filament_pa", - "renamed_from": "Z-Bolt PA;Generic PA @Z-Bolt", "from": "system", "filament_id": "OFg8ndtj", "instantiation": "false", diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json index 4c8d8dc6a7..18f2530d8a 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json @@ -2,7 +2,6 @@ "type": "filament", "name": "Generic PETG @Z-Bolt Base", "inherits": "fdm_filament_pet", - "renamed_from": "Z-Bolt PETG;Generic PETG @Z-Bolt", "from": "system", "filament_id": "OFYPdQJh", "instantiation": "false", diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json index df2c3259e1..2b64f307ac 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json @@ -2,7 +2,6 @@ "type": "filament", "name": "Generic PLA @Z-Bolt Base", "inherits": "fdm_filament_pla", - "renamed_from": "Z-Bolt PLA;Generic PLA @Z-Bolt", "from": "system", "filament_id": "OFDSrzZ8", "instantiation": "false", diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index 795fa4f768..336f48ac15 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -2322,18 +2322,1588 @@ ], "successor": "OFmhJs5V" }, + "OF0GIkJm": { + "claims": [ + "Tiertime/Tiertime Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "OF0zx94L": { + "claims": [ + "Vzbot/Vzbot Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OF1Id239": { + "claims": [ + "Prusa/Prusa Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OF1OZujR": { + "claims": [ + "Flashforge/Flashforge Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OF1daEUW": { + "claims": [ + "Anker/Anker Generic PETG-CF" + ], + "successor": "OFoYSJKi" + }, + "OF1uR1t2": { + "claims": [ + "Tiertime/Tiertime Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OF2RjrWH": { + "claims": [ + "Flashforge/FusRock Generic PAHT-GF" + ], + "successor": "OFcVLpNA" + }, + "OF2mgDsI": { + "claims": [ + "Vzbot/Vzbot Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OF3P0BQA": { + "claims": [ + "Anker/Anker Generic ABS", + "Anker/Anker Generic ABS 0.2 nozzle", + "Anker/Anker Generic ABS 0.25 nozzle" + ], + "successor": "OFY9muEs" + }, + "OF3s929u": { + "claims": [ + "Tiertime/Tiertime Generic PP" + ], + "successor": "OF1UNk9P" + }, + "OF3wxlw9": { + "claims": [ + "CoLiDo/CoLiDo Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OF42ZDpN": { + "claims": [ + "Flashforge/FusRock PAHT" + ], + "successor": "OF7pjCsO" + }, + "OF48L671": { + "claims": [ + "Ratrig/RatRig Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OF4Mf5Gz": { + "claims": [ + "Creality/Creality Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OF4XAUnp": { + "claims": [ + "Vzbot/Vzbot Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OF4oCRKe": { + "claims": [ + "DeltaMaker/DeltaMaker Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OF4xhTuK": { + "claims": [ + "OrcaArena/OrcaArena Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OF4zzGwp": { + "claims": [ + "Flashforge/FusRock Generic PET-GF" + ], + "successor": "OFzwA5Z9" + }, + "OF51XQar": { + "claims": [ + "CONSTRUCT3D/C1 Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OF5E5KNA": { + "claims": [ + "SecKit/SecKit Generic PC" + ], + "successor": "OFLakOUI" + }, + "OF5Zk4e1": { + "claims": [ + "Anycubic/Anycubic Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OF5vzBhb": { + "claims": [ + "Chuanying/Chuanying Generic PLA", + "Chuanying/Chuanying PLA" + ], + "successor": "OFDSrzZ8" + }, + "OF6Fpw1E": { + "claims": [ + "Comgrow/Comgrow Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OF6K467o": { + "claims": [ + "InfiMech/InfiMech Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OF6KELDx": { + "claims": [ + "Co Print/CoPrint Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OF6WddJ1": { + "claims": [ + "Flashforge/FusRock S-PAHT" + ], + "successor": "OFCn83wF" + }, + "OF6rMr3U": { + "claims": [ + "Flashforge/FusRock Generic S-Multi" + ], + "successor": "OF0AquDh" + }, + "OF6tKa1Z": { + "claims": [ + "Anker/Anker Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OF6vKLaU": { + "claims": [ + "Artillery/Artillery Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OF6xLvYg": { + "claims": [ + "InfiMech/InfiMech Generic PC" + ], + "successor": "OFLakOUI" + }, + "OF7g2vYQ": { + "claims": [ + "Co Print/CoPrint Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OF7uE5KB": { + "claims": [ + "Anker/Anker Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OF8CXrvm": { + "claims": [ + "SecKit/SecKit Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OF8bLDu7": { + "claims": [ + "Blocks/Blocks Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OF97ru74": { + "claims": [ + "Prusa/Prusa Generic PC" + ], + "successor": "OFLakOUI" + }, + "OF9fOPpd": { + "claims": [ + "Vzbot/Vzbot Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFACSw9O": { + "claims": [ + "Creality/Creality Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFB09fpe": { + "claims": [ + "Ratrig/RatRig Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFB0a3hT": { + "claims": [ + "Anker/Anker Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFB1Tv1E": { + "claims": [ + "Anycubic/Anycubic Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFB8wSps": { + "claims": [ + "Flashforge/FusRock PET-CF" + ], + "successor": "OFDu1qE7" + }, + "OFB9dx27": { + "claims": [ + "Blocks/Blocks Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFBC32Wb": { + "claims": [ + "Flashforge/FusRock PET" + ], + "successor": "OFKTGKJU" + }, + "OFBIadjM": { + "claims": [ + "Chuanying/Chuanying ASA", + "Chuanying/Chuanying Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFBpcB0a": { + "claims": [ + "TwoTrees/TwoTrees Generic HS PLA" + ], + "successor": "OFvxghTE" + }, + "OFBtlI8M": { + "claims": [ + "FlyingBear/FlyingBear Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFC20UMj": { + "claims": [ + "Flashforge/Flashforge Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFCVUEaV": { + "claims": [ + "Tiertime/Tiertime Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFCaJHAA": { + "claims": [ + "Flashforge/FusRock Generic S-PAHT" + ], + "successor": "OFCn83wF" + }, + "OFCcsYtf": { + "claims": [ + "FLSun/FLSun Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFCu3jES": { + "claims": [], + "successor": null + }, + "OFD2JNS1": { + "claims": [ + "Dremel/Dremel Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFD6kN7F": { + "claims": [ + "OrcaArena/OrcaArena Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFDeTsJw": { + "claims": [ + "Chuanying/Chuanying Generic HIPS" + ], + "successor": "OFsFon5l" + }, + "OFEE1Dld": { + "claims": [ + "Artillery/Artillery Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFETFWx7": { + "claims": [ + "SecKit/SecKit Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFEZNNw1": { + "claims": [ + "Ratrig/RatRig Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFF73Bvp": { + "claims": [ + "SecKit/SecKit Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFFZ0BBL": { + "claims": [ + "FlyingBear/FlyingBear Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFFxZ7hZ": { + "claims": [ + "Chuanying/Chuanying Generic PLA-CF10" + ], + "successor": "OFX2zcrM" + }, + "OFGDaEHO": { + "claims": [ + "Tiertime/Tiertime Generic BVOH" + ], + "successor": "OFo2UF2C" + }, + "OFGGyAgJ": { + "claims": [ + "Vzbot/Vzbot Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFGKLoUm": { + "claims": [ + "Anycubic/Anycubic Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFGLeiNL": { + "claims": [], + "successor": null + }, + "OFGPJxnt": { + "claims": [ + "Anker/Anker Generic PC", + "Anker/Anker Generic PC 0.2 nozzle", + "Anker/Anker Generic PC 0.25 nozzle" + ], + "successor": "OFLakOUI" + }, + "OFGzUNbm": { + "claims": [ + "Tiertime/Tiertime Generic PPS-CF" + ], + "successor": "OF6rdQ6M" + }, + "OFHFZ1Te": { + "claims": [ + "Prusa/Prusa Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "OFHQUAoZ": { + "claims": [ + "FLSun/FLSun Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFHUnLY2": { + "claims": [ + "Vzbot/Vzbot Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFHa3RZT": { + "claims": [ + "Tiertime/Tiertime Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFI80Hct": { + "claims": [ + "Anycubic/Anycubic Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFIYTy8S": { + "claims": [ + "Anker/Anker Generic PLA+", + "Anker/Anker Generic PLA+ 0.2 nozzle", + "Anker/Anker Generic PLA+ 0.25 nozzle" + ], + "successor": "OFEWYR89" + }, + "OFIda816": { + "claims": [ + "Vzbot/Vzbot Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFIeCuXj": { + "claims": [ + "Peopoly/Peopoly Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFIieIka": { + "claims": [ + "Flashforge/Polymaker CoPA" + ], + "successor": "OFQyyO0l" + }, + "OFIy3kLw": { + "claims": [ + "Prusa/Prusa Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFJJpaLS": { + "claims": [ + "FLSun/FLSun Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFJSksUs": { + "claims": [ + "FLSun/FLSun Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFK01afJ": { + "claims": [ + "Qidi/Qidi Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFK4LdYI": { + "claims": [ + "Prusa/Prusa Generic ASA HF" + ], + "successor": "OFzRtFM9" + }, + "OFKNAhls": { + "claims": [ + "Qidi/Qidi Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFKuTr12": { + "claims": [ + "Tiertime/Tiertime Generic PE" + ], + "successor": "OFPklMI1" + }, + "OFKyCgaK": { + "claims": [ + "Anycubic/Anycubic Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFLBUkwC": { + "claims": [ + "Vzbot/Vzbot Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFLDSqqi": { + "claims": [ + "Flashforge/Flashforge Generic ABS" + ], + "successor": "OFY9muEs" + }, "OFLSBS99": { "claims": [ "OrcaFilamentLibrary/Generic SBS" ], "successor": "OFhQfUQY" }, + "OFLrdHse": { + "claims": [ + "Flashforge/Flashforge Generic HS PLA" + ], + "successor": "OFvxghTE" + }, + "OFLuczRG": { + "claims": [ + "Creality/Creality Generic ASA-CF" + ], + "successor": "OF53eLVD" + }, + "OFM87w9T": { + "claims": [ + "Tiertime/Tiertime Generic SBS" + ], + "successor": "OFhQfUQY" + }, + "OFMEbuBE": { + "claims": [ + "Blocks/Blocks Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFMIurFh": { + "claims": [ + "Creality/Creality HF Generic Speed PLA" + ], + "successor": "OFXmv5p0" + }, + "OFMTBcnz": { + "claims": [ + "Tiertime/Tiertime Generic PP-CF" + ], + "successor": "OFXkm8q1" + }, + "OFMZAoqa": { + "claims": [ + "Tiertime/Tiertime Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFMgJQCZ": { + "claims": [ + "Anker/Anker Generic PA", + "Anker/Anker Generic PA 0.2 nozzle", + "Anker/Anker Generic PA 0.25 nozzle" + ], + "successor": "OFg8ndtj" + }, + "OFMoLF46": { + "claims": [ + "FLSun/FLSun Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFMqYusc": { + "claims": [ + "Creality/Creality Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFN7aNHe": { + "claims": [ + "Tiertime/Tiertime Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFNLXV8X": { + "claims": [ + "Tiertime/Tiertime Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFNOxcYl": { + "claims": [ + "Ratrig/RatRig Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFNW4ZTC": { + "claims": [ + "Creality/Creality Generic PLA Wood" + ], + "successor": "OFIKZxPF" + }, + "OFNYewRS": { + "claims": [ + "Blocks/Blocks Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFNZYgLA": { + "claims": [ + "Qidi/Qidi Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFNcdCrm": { + "claims": [ + "Anycubic/Anycubic Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFNiSLfL": { + "claims": [ + "OrcaFilamentLibrary/Generic PP-GF" + ], + "successor": "OFsijjtH" + }, + "OFNn21yM": { + "claims": [ + "Vzbot/Vzbot Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFOKYhi6": { + "claims": [ + "Prusa/Prusa Generic PETG HF" + ], + "successor": "OF7lOgYF" + }, + "OFPdhDlK": { + "claims": [ + "Anycubic/Anycubic Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFPjOUtz": { + "claims": [ + "Flashforge/FusRock Generic PAHT-CF" + ], + "successor": "OFKW5hEW" + }, + "OFPy0Ogq": { + "claims": [ + "Qidi/Qidi Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFQ7I5vC": { + "claims": [ + "Prusa/Prusa Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFQC8Vna": { + "claims": [ + "Flashforge/Flashforge Generic PETG-CF" + ], + "successor": "OFoYSJKi" + }, + "OFQTrLXB": { + "claims": [ + "Qidi/Qidi Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFQbqeN7": { + "claims": [ + "Qidi/Qidi Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFQswlnF": { + "claims": [ + "Tiertime/Tiertime Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFRDLNM9": { + "claims": [ + "Peopoly/Peopoly Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFRPEs5o": { + "claims": [ + "Flashforge/Flashforge Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFRiyes1": { + "claims": [ + "Anker/Anker Generic ASA", + "Anker/Anker Generic ASA 0.2 nozzle", + "Anker/Anker Generic ASA 0.25 nozzle" + ], + "successor": "OFLPAxz3" + }, + "OFRujL0v": { + "claims": [ + "Flashforge/FusRock Generic PET-CF" + ], + "successor": "OFDu1qE7" + }, + "OFRusgEn": { + "claims": [ + "Chuanying/Chuanying Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFRzsaDK": { + "claims": [ + "FlyingBear/FlyingBear Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFS8JF3S": { + "claims": [ + "Qidi/Qidi Generic PLA High Speed" + ], + "successor": "OFmpMwxS" + }, + "OFSDFYs4": { + "claims": [ + "Creality/Creality Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFSGbf2I": { + "claims": [ + "Anycubic/Anycubic Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFSPdsuW": { + "claims": [ + "Tiertime/Tiertime Generic PPA-CF" + ], + "successor": "OF8tPByX" + }, "OFSTCno1": { "claims": [ "re3D/re3D Greengate rPETG" ], "successor": "OFmCOW2Y" }, + "OFTKFAZ4": { + "claims": [ + "Tiertime/Tiertime Generic PCTG" + ], + "successor": "OFu1evlr" + }, + "OFU0n0zW": { + "claims": [ + "FLSun/FLSun T1 PLA Generic" + ], + "successor": "OFDSrzZ8" + }, + "OFU3zwPc": { + "claims": [ + "Prusa/Prusa Generic TPU HF" + ], + "successor": "OFnT7Qpb" + }, + "OFU5N9jI": { + "claims": [ + "OrcaArena/OrcaArena Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFU6fjbi": { + "claims": [ + "Co Print/CoPrint Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFUScM0D": { + "claims": [ + "Flashforge/FusRock S-Multi" + ], + "successor": "OF0AquDh" + }, + "OFUWRqwb": { + "claims": [ + "Creality/Creality Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFUaVAdj": { + "claims": [ + "Tiertime/Tiertime Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFUrStd6": { + "claims": [ + "Ratrig/RatRig Generic PCTG" + ], + "successor": "OFu1evlr" + }, + "OFUtGagr": { + "claims": [ + "Artillery/Artillery Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFVKADz5": { + "claims": [ + "Comgrow/Comgrow Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFVqZ2H0": { + "claims": [ + "FLSun/FLSun Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFW9uIkE": { + "claims": [ + "Tiertime/Tiertime Generic HIPS" + ], + "successor": "OFsFon5l" + }, + "OFWIr7ZE": { + "claims": [ + "CoLiDo/CoLiDo Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFWY6vBh": { + "claims": [ + "Anycubic/Anycubic Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFWadebJ": { + "claims": [ + "Tiertime/Tiertime Generic PETG-CF" + ], + "successor": "OFoYSJKi" + }, + "OFWbbuRY": { + "claims": [ + "InfiMech/InfiMech Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFWof1Ap": { + "claims": [ + "FLSun/FLSun Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFWukXja": { + "claims": [ + "Qidi/Qidi Generic TPU 95A" + ], + "successor": "OFjiXpyf" + }, + "OFWzr7m0": { + "claims": [ + "Anycubic/Anycubic Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFXXUHSG": { + "claims": [ + "Chuanying/Chuanying Generic PETG-CF10" + ], + "successor": "OFO5djrM" + }, + "OFXhZ3uY": { + "claims": [ + "OrcaArena/OrcaArena Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFXuwtnq": { + "claims": [ + "Co Print/CoPrint Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFXyyfX6": { + "claims": [ + "Anker/Anker Generic PLA Silk", + "Anker/Anker Generic PLA Silk 0.2 nozzle", + "Anker/Anker Generic PLA Silk 0.25 nozzle" + ], + "successor": "OFesA6rF" + }, + "OFYHzKyS": { + "claims": [ + "Vzbot/Vzbot Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFYPdJ7t": { + "claims": [ + "Creality/Creality Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFYl0c8v": { + "claims": [ + "Flashforge/Flashforge Generic HIPS" + ], + "successor": "OFsFon5l" + }, + "OFYlZMmy": { + "claims": [ + "Chuanying/Chuanying Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFYlthXI": { + "claims": [ + "Flashforge/Flashforge Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFYtS9zg": { + "claims": [ + "Flashforge/FusRock PAHT-CF" + ], + "successor": "OFKW5hEW" + }, + "OFYvSO1W": { + "claims": [ + "Flashforge/Flashforge Generic PLA-Silk" + ], + "successor": "OFi6PfUM" + }, + "OFZ1hANN": { + "claims": [ + "Flashforge/FusRock Generic NexPA-CF25" + ], + "successor": "OFjt8dDO" + }, + "OFZ4fTO8": { + "claims": [ + "CONSTRUCT3D/C1 Generic High Flow PETG" + ], + "successor": "OFNjku08" + }, + "OFZHgTVI": { + "claims": [ + "Flashforge/Flashforge Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFZPlCck": { + "claims": [ + "Chuanying/Chuanying Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFZsChIG": { + "claims": [ + "Qidi/Qidi Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFa9X7yl": { + "claims": [ + "Flashforge/FusRock S-PAHT" + ], + "successor": "OFCn83wF" + }, + "OFaU2JxD": { + "claims": [ + "Dremel/Dremel Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFahE7HP": { + "claims": [ + "Blocks/Blocks Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFbeeFkl": { + "claims": [ + "OrcaArena/OrcaArena Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "OFbenYUK": { + "claims": [ + "Prusa/Prusa Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFbt04e0": { + "claims": [ + "DeltaMaker/DeltaMaker Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFc0xiCz": { + "claims": [ + "InfiMech/InfiMech Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFcCzEkS": { + "claims": [ + "Prusa/Prusa Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFctbSkL": { + "claims": [ + "Blocks/Blocks Generic ASA-CF" + ], + "successor": "OF53eLVD" + }, + "OFd10YeG": { + "claims": [ + "Ratrig/RatRig Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFdEIwxy": { + "claims": [ + "Flashforge/Flashforge Generic PLA-CF10" + ], + "successor": "OFX2zcrM" + }, + "OFdHsxB4": { + "claims": [ + "TwoTrees/TwoTrees Generic 95A TPU" + ], + "successor": "OF6MMR8P" + }, + "OFdLdGgJ": { + "claims": [ + "OrcaArena/OrcaArena Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFdOWhCa": { + "claims": [ + "Ratrig/RatRig Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFdXgp2K": { + "claims": [ + "Chuanying/Chuanying Generic HS PLA", + "Chuanying/Chuanying HS PLA" + ], + "successor": "OFvxghTE" + }, + "OFdlGycb": { + "claims": [ + "CoLiDo/CoLiDo Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFe8UJXH": { + "claims": [ + "Creality/Creality Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFeDfaCh": { + "claims": [ + "CoLiDo/CoLiDo Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFeJjoKF": { + "claims": [ + "FLSun/FLSun Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFeK2vkS": { + "claims": [ + "Chuanying/Chuanying Generic PLA-Silk", + "Chuanying/Chuanying PLA-SILK" + ], + "successor": "OFi6PfUM" + }, + "OFetENFF": { + "claims": [ + "OrcaArena/OrcaArena Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFfZ0lTS": { + "claims": [ + "Qidi/Qidi Generic PETG-CF" + ], + "successor": "OFoYSJKi" + }, + "OFfegVpA": { + "claims": [ + "Flashforge/Polymaker Generic S1" + ], + "successor": "OFaDsTE0" + }, + "OFfxFQf9": { + "claims": [ + "Chuanying/Chuanying Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFfznI0Q": { + "claims": [ + "Prusa/Prusa Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFgSEwOZ": { + "claims": [ + "OrcaArena/OrcaArena Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFgSPtDn": { + "claims": [ + "MagicMaker/MM Generic PEEK" + ], + "successor": "OFz5oHgf" + }, + "OFgVJhVt": { + "claims": [ + "Tiertime/Tiertime Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFgvOmM2": { + "claims": [ + "Anker/Anker Generic PETG", + "Anker/Anker Generic PETG 0.2 nozzle", + "Anker/Anker Generic PETG 0.25 nozzle" + ], + "successor": "OFYPdQJh" + }, + "OFhcrFw9": { + "claims": [ + "Creality/Creality Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFiCHnso": { + "claims": [ + "Prusa/Prusa Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFiUSDih": { + "claims": [ + "Blocks/Blocks Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFifxPW1": { + "claims": [ + "DeltaMaker/DeltaMaker Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFiorRtJ": { + "claims": [ + "Blocks/Blocks Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFixgF4N": { + "claims": [ + "Flashforge/FusRock S-Multi" + ], + "successor": "OF0AquDh" + }, + "OFjoIVZ6": { + "claims": [ + "FlyingBear/FlyingBear Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFkUaDnU": { + "claims": [ + "Tiertime/Tiertime Generic PE-CF" + ], + "successor": "OFd0Fv0k" + }, + "OFkYkQGO": { + "claims": [ + "Tiertime/Tiertime Generic PP-GF" + ], + "successor": "OFsijjtH" + }, + "OFl2SXmv": { + "claims": [ + "Prusa/Prusa Generic FLEX" + ], + "successor": "OFbPuPKY" + }, + "OFl4ItvQ": { + "claims": [ + "Prusa/Prusa Generic PLA HF" + ], + "successor": "OFZr862X" + }, + "OFlLmUeV": { + "claims": [ + "Ginger Additive/Ginger Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFlNWVr5": { + "claims": [ + "Flashforge/Flashforge Generic PETG-CF10" + ], + "successor": "OFO5djrM" + }, + "OFlx52rn": { + "claims": [ + "Ratrig/RatRig Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFma52eS": { + "claims": [ + "Blocks/Blocks Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFmhWhEf": { + "claims": [ + "Creality/Creality HF Generic PLA" + ], + "successor": "OFZr862X" + }, + "OFmnJNqY": { + "claims": [ + "OrcaArena/OrcaArena Generic PA" + ], + "successor": "OFg8ndtj" + }, + "OFmzftED": { + "claims": [ + "OrcaArena/OrcaArena Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFndmfJ1": { + "claims": [ + "Anker/Anker Generic PLA", + "Anker/Anker Generic PLA 0.2 nozzle", + "Anker/Anker Generic PLA 0.25 nozzle" + ], + "successor": "OFDSrzZ8" + }, + "OFnfBvn5": { + "claims": [ + "Artillery/Artillery Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFnh79eM": { + "claims": [ + "SecKit/SecKit Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFoDgVnY": { + "claims": [ + "FLSun/FLSun S1 PLA Generic" + ], + "successor": "OFDSrzZ8" + }, + "OFoJcr46": { + "claims": [ + "Prusa/Prusa Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFoT8F7Y": { + "claims": [ + "Prusa/Prusa Generic PVA HF" + ], + "successor": "OFDwBwO5" + }, + "OFoVZg32": { + "claims": [ + "SecKit/SecKit Generic TPU" + ], + "successor": "OFgbpcy9" + }, + "OFodPDxO": { + "claims": [ + "Tiertime/Tiertime Generic PLA High Speed" + ], + "successor": "OFmpMwxS" + }, + "OFp8gtPH": { + "claims": [ + "Creality/Creality Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "OFpAaY6w": { + "claims": [ + "Creality/Creality Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFpSYJLI": { + "claims": [ + "Creality/Creality Generic PLA Matte" + ], + "successor": "OFmY0l6t" + }, + "OFptvi3F": { + "claims": [ + "Tiertime/Tiertime Generic PPA-GF" + ], + "successor": "OF8Tlg47" + }, + "OFq5QANf": { + "claims": [ + "Prusa/Prusa Generic PC HF" + ], + "successor": "OFwwAQnA" + }, + "OFqKmLJe": { + "claims": [ + "Creality/Creality Generic PETG-CF" + ], + "successor": "OFoYSJKi" + }, + "OFqOk9Ww": { + "claims": [ + "Peopoly/Peopoly Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFqS8fzK": { + "claims": [ + "SecKit/SecKit Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFrO2zyn": { + "claims": [ + "Creality/Creality Generic PLA High Speed" + ], + "successor": "OFmpMwxS" + }, + "OFrQqCwL": { + "claims": [ + "InfiMech/InfiMech Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFrgGex8": { + "claims": [ + "Blocks/Blocks Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFrh4bBH": { + "claims": [ + "SecKit/SecKit Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFrnJJEa": { + "claims": [ + "Tiertime/Tiertime Generic EVA" + ], + "successor": "OFCD8qiU" + }, + "OFrrMLDw": { + "claims": [ + "Flashforge/Flashforge Generic PLA-SILK" + ], + "successor": "OFkf1HHw" + }, + "OFs2ReMr": { + "claims": [ + "InfiMech/InfiMech Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFsCbVbN": { + "claims": [ + "Anker/Anker Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFsF96Gt": { + "claims": [ + "FLSun/FLSun Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFsGqI4y": { + "claims": [ + "Ginger Additive/Ginger Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFsXOMoX": { + "claims": [ + "Qidi/Qidi Generic PLA+" + ], + "successor": "OFEWYR89" + }, + "OFsoQ12i": { + "claims": [ + "Comgrow/Comgrow Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFsxRSwr": { + "claims": [ + "Ratrig/RatRig Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFsxlLdo": { + "claims": [ + "Qidi/Qidi Generic ASA" + ], + "successor": "OFLPAxz3" + }, + "OFtP1rqJ": { + "claims": [ + "FLSun/FLSun Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFtTHNTj": { + "claims": [ + "Flashforge/Flashforge Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFtsVp4v": { + "claims": [ + "SecKit/SecKit Generic PA-CF" + ], + "successor": "OFQLcbps" + }, + "OFu79SUH": { + "claims": [ + "Qidi/Qidi Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFuSwKgm": { + "claims": [ + "Tiertime/Tiertime Generic PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFupq0tY": { + "claims": [ + "Blocks/Blocks Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFv4VZCd": { + "claims": [ + "Qidi/Qidi Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFvGc67v": { + "claims": [ + "Prusa/Prusa Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFvPomQf": { + "claims": [ + "Tiertime/Tiertime Generic PPS" + ], + "successor": "OFq9svOz" + }, + "OFwMFLAm": { + "claims": [ + "Artillery/Artillery Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFwpkvqf": { + "claims": [ + "OrcaArena/OrcaArena Generic PETG-CF" + ], + "successor": "OFoYSJKi" + }, + "OFwxpmHM": { + "claims": [ + "Flashforge/Polymaker Generic CoPA" + ], + "successor": "OFQyyO0l" + }, + "OFx0ZzFV": { + "claims": [ + "OrcaArena/OrcaArena Generic PLA-CF" + ], + "successor": "OFWbdGsC" + }, + "OFxTMg1d": { + "claims": [ + "FlyingBear/FlyingBear Generic PC" + ], + "successor": "OFLakOUI" + }, + "OFxg7n2G": { + "claims": [ + "Ratrig/RatRig Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFxvKuYW": { + "claims": [ + "Tiertime/Tiertime Generic PHA" + ], + "successor": "OF74KeQR" + }, + "OFy4ajVZ": { + "claims": [ + "Qidi/Qidi Generic PLA Silk" + ], + "successor": "OFesA6rF" + }, + "OFyFRojy": { + "claims": [ + "Ratrig/RatRig Generic ABS" + ], + "successor": "OFY9muEs" + }, + "OFyK5Lt9": { + "claims": [ + "Artillery/Artillery Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFyeSq8A": { + "claims": [ + "Prusa/Prusa Generic ABS HF" + ], + "successor": "OF55jHAJ" + }, + "OFyySVby": { + "claims": [ + "SecKit/SecKit Generic PVA" + ], + "successor": "OFDvXujf" + }, + "OFz3q5Xz": { + "claims": [ + "CONSTRUCT3D/C1 Generic PETG" + ], + "successor": "OFYPdQJh" + }, + "OFzXURfo": { + "claims": [ + "FlyingBear/FlyingBear Generic PETG" + ], + "successor": "OFYPdQJh" + }, "OGFA00": { "claims": [ "OrcaFilamentLibrary/Bambu PLA Basic" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 5183acc069..e86eeab452 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -128,8 +128,6 @@ "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Generic ABS @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Generic TPU @Anycubic Kobra 3 0.4 nozzle", "Artillery/Artillery ABS", "Artillery/Artillery ABS @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery ASA @Artillery M1 Pro 0.4 nozzle", @@ -191,28 +189,28 @@ "BBL/addnorth TPU Pro Matte 85A", "BBL/addnorth TPU Pro Matte 95A", "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", - "Chuanying/Chuanying Generic HIPS", - "Chuanying/Chuanying Generic PVA", "Chuanying/Chuanying PETG @Chuanying X1 0.25 Nozzle", - "Co Print/CoPrint Generic ABS", - "Co Print/CoPrint Generic PETG", - "Co Print/CoPrint Generic TPU", + "Chuanying/Generic HIPS @Chuanying", + "Chuanying/Generic PVA @Chuanying", + "Co Print/Generic ABS @CoPrint", + "Co Print/Generic PETG @CoPrint", + "Co Print/Generic TPU @CoPrint", "Comgrow/Comgrow T300 PLA", - "Creality/Creality Generic ASA-CF @Hi-all", - "Creality/Creality Generic PETG-CF @Hi-all", - "Creality/Creality Generic PLA High Speed @Ender-3V3-all", - "Creality/Creality Generic PLA High Speed @Hi-all", - "Creality/Creality Generic PLA High Speed @K1-all", - "Creality/Creality Generic PLA High Speed @K2-all", - "Creality/Creality Generic PLA Matte @Ender-3V3-all", - "Creality/Creality Generic PLA Matte @Hi-all", - "Creality/Creality Generic PLA Matte @K1-all", - "Creality/Creality Generic PLA Matte @K2-all", - "Creality/Creality Generic PLA Silk @Ender-3V3-all", - "Creality/Creality Generic PLA Silk @Hi-all", - "Creality/Creality Generic PLA Silk @K1-all", - "Creality/Creality Generic PLA Silk @K2-all", - "Creality/Creality Generic PLA Wood @Hi-all", + "Creality/Generic ASA-CF @Creality Hi-all", + "Creality/Generic PETG-CF @Creality Hi-all", + "Creality/Generic PLA High Speed @Creality Ender-3V3-all", + "Creality/Generic PLA High Speed @Creality Hi-all", + "Creality/Generic PLA High Speed @Creality K1-all", + "Creality/Generic PLA High Speed @Creality K2-all", + "Creality/Generic PLA Matte @Creality Ender-3V3-all", + "Creality/Generic PLA Matte @Creality Hi-all", + "Creality/Generic PLA Matte @Creality K1-all", + "Creality/Generic PLA Matte @Creality K2-all", + "Creality/Generic PLA Silk @Creality Ender-3V3-all", + "Creality/Generic PLA Silk @Creality Hi-all", + "Creality/Generic PLA Silk @Creality K1-all", + "Creality/Generic PLA Silk @Creality K2-all", + "Creality/Generic PLA Wood @Creality Hi-all", "Cubicon/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", "Cubicon/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", @@ -244,9 +242,6 @@ "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle", "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PLAi21 @base", - "Dremel/Dremel Generic PLA @3D20 all", - "Dremel/Dremel Generic PLA @3D40 all", - "Dremel/Dremel Generic PLA @3D45 all", "Elegoo/Elegoo ASA-CF @base", "Elegoo/Elegoo PC-FR @base", "Elegoo/Elegoo PET-CF @base", @@ -281,14 +276,12 @@ "FLSun/FLSun S1 ABS", "FLSun/FLSun S1 ASA", "FLSun/FLSun S1 PETG", - "FLSun/FLSun S1 PLA Generic", "FLSun/FLSun S1 PLA High Speed", "FLSun/FLSun S1 PLA Silk", "FLSun/FLSun S1 TPU", "FLSun/FLSun T1 ABS", "FLSun/FLSun T1 ASA", "FLSun/FLSun T1 PETG", - "FLSun/FLSun T1 PLA Generic", "FLSun/FLSun T1 PLA High Speed", "FLSun/FLSun T1 PLA Silk", "FLSun/FLSun T1 TPU", @@ -361,17 +354,6 @@ "Flashforge/Flashforge ASA-CF @FF G4P", "Flashforge/Flashforge ASA-GF @FF C5", "Flashforge/Flashforge ASA-GF @FF C5P", - "Flashforge/Flashforge Generic ASA @G3U", - "Flashforge/Flashforge Generic HIPS", - "Flashforge/Flashforge Generic HIPS @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic PETG-CF @G3U", - "Flashforge/Flashforge Generic PETG-CF @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic PETG-CF @G3U 0.8 Nozzle", - "Flashforge/Flashforge Generic PLA-CF @G3U", - "Flashforge/Flashforge Generic PLA-CF @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic PLA-CF @G3U 0.8 Nozzle", - "Flashforge/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge Generic PVA", "Flashforge/Flashforge HIPS @FF C5", "Flashforge/Flashforge HIPS @FF C5P", "Flashforge/Flashforge HIPS @FF G4", @@ -729,40 +711,37 @@ "Flashforge/Flashforge TPU-90A @FF C5P", "Flashforge/Flashforge TPU-95A @FF C5", "Flashforge/Flashforge TPU-95A @FF C5P", - "Flashforge/FusRock Generic NexPA-CF25", - "Flashforge/FusRock Generic PAHT-CF", - "Flashforge/FusRock Generic PAHT-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock Generic PAHT-GF", - "Flashforge/FusRock Generic PET-CF", - "Flashforge/FusRock Generic PET-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock Generic PET-GF", - "Flashforge/FusRock Generic S-Multi", - "Flashforge/FusRock Generic S-Multi @G3U 0.6 Nozzle", - "Flashforge/FusRock Generic S-PAHT", - "Flashforge/FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "Flashforge/FusRock NexPA-CF25", "Flashforge/FusRock PAHT @FF G4 0.6 HF nozzle", "Flashforge/FusRock PAHT @FF G4 0.6 nozzle", "Flashforge/FusRock PAHT @FF G4 0.8 HF nozzle", "Flashforge/FusRock PAHT @FF G4P 0.6 HF nozzle", "Flashforge/FusRock PAHT @FF G4P 0.6 nozzle", "Flashforge/FusRock PAHT @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PAHT-CF", "Flashforge/FusRock PAHT-CF @FF C5", "Flashforge/FusRock PAHT-CF @FF C5P", "Flashforge/FusRock PAHT-CF @FF G4", - "Flashforge/FusRock PAHT-CF @FF G4 0.6 nozzle", "Flashforge/FusRock PAHT-CF @FF G4P", - "Flashforge/FusRock PAHT-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock PAHT-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock PAHT-GF", "Flashforge/FusRock PET @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PET-CF", "Flashforge/FusRock PET-CF @FF G4", - "Flashforge/FusRock PET-CF @FF G4 0.6 nozzle", "Flashforge/FusRock PET-CF @FF G4P", - "Flashforge/FusRock PET-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock PET-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock PET-GF", + "Flashforge/FusRock S-Multi", "Flashforge/FusRock S-Multi @FF C5", "Flashforge/FusRock S-Multi @FF C5P", + "Flashforge/FusRock S-Multi @G3U 0.6 Nozzle", + "Flashforge/FusRock S-PAHT", "Flashforge/FusRock S-PAHT @FF C5", "Flashforge/FusRock S-PAHT @FF C5P", - "Flashforge/Generic ABS @Flashforge AD4", - "Flashforge/Generic ASA @Flashforge AD4", + "Flashforge/FusRock S-PAHT @G3U 0.6 Nozzle", + "Flashforge/Generic ASA @Flashforge G3U", + "Flashforge/Generic HIPS @Flashforge", + "Flashforge/Generic HIPS @Flashforge G3U 0.6 Nozzle", "Flashforge/Generic PET @FF G4", "Flashforge/Generic PET @FF G4 0.6 HF nozzle", "Flashforge/Generic PET @FF G4 0.6 nozzle", @@ -771,30 +750,33 @@ "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", "Flashforge/Generic PET @FF G4P 0.6 nozzle", "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", - "Flashforge/Generic PETG @Flashforge AD4", - "Flashforge/Generic PETG-CF10 @Flashforge AD4", - "Flashforge/Generic PLA @Flashforge AD4", + "Flashforge/Generic PETG-CF @Flashforge G3U", + "Flashforge/Generic PETG-CF @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic PETG-CF @Flashforge G3U 0.8 Nozzle", "Flashforge/Generic PLA High Speed @Flashforge AD4", "Flashforge/Generic PLA Silk @Flashforge AD4", - "Flashforge/Generic PLA-CF10 @Flashforge AD4", + "Flashforge/Generic PLA-CF @Flashforge G3U", + "Flashforge/Generic PLA-CF @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic PLA-CF @Flashforge G3U 0.8 Nozzle", + "Flashforge/Generic PLA-SILK @FF AD5M 0.25 Nozzle", + "Flashforge/Generic PVA @Flashforge", "Flashforge/Generic TPU 85A @FF AD5X", "Flashforge/Generic TPU 85A @FF AD5X 0.6 nozzle", "Flashforge/Generic TPU 85A @FF AD5X 0.8 nozzle", - "Flashforge/Generic TPU @Flashforge AD4", "Flashforge/Generic TPU-64D @FF C5", "Flashforge/Generic TPU-64D @FF C5P", "Flashforge/Generic TPU-90A @FF C5", "Flashforge/Generic TPU-90A @FF C5P", "Flashforge/Generic TPU-95A @FF C5", "Flashforge/Generic TPU-95A @FF C5P", + "Flashforge/Polymaker CoPA", "Flashforge/Polymaker CoPA @FF G4 0.6 HF nozzle", "Flashforge/Polymaker CoPA @FF G4 0.6 nozzle", "Flashforge/Polymaker CoPA @FF G4 0.8 HF nozzle", "Flashforge/Polymaker CoPA @FF G4P 0.6 HF nozzle", "Flashforge/Polymaker CoPA @FF G4P 0.6 nozzle", "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", - "Flashforge/Polymaker Generic CoPA", - "Flashforge/Polymaker Generic S1", + "Flashforge/Polymaker S1", "Lulzbot/Lulzbot 2.85mm ABS", "Lulzbot/Lulzbot 2.85mm PETG", "Lulzbot/Lulzbot 2.85mm PLA", @@ -885,7 +867,11 @@ "OrcaFilamentLibrary/FilAr PLA-mate Violeta", "OrcaFilamentLibrary/PolyLite Dual PLA @base", "OrcaFilamentLibrary/PolyTerra Dual PLA @System", - "Prusa/Prusa Generic PLA Silk @MK4S", + "Prusa/Generic PLA Silk @Prusa MK4S", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", "Qidi/QIDI ABS Rapido 0.2 nozzle", "Qidi/QIDI ABS Rapido 0.6 nozzle", "Qidi/QIDI ABS Rapido 0.8 nozzle", @@ -902,10 +888,6 @@ "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", "Snapmaker/PolyLite Dual PLA @0.2 nozzle", "Snapmaker/PolyLite J1 PLA", "Snapmaker/PolyLite J1 PLA @0.2 nozzle", @@ -1595,12 +1577,12 @@ "OF02UAVh": [ "Creality/Soleyin Ultra PLA" ], + "OF0AquDh": [ + "Flashforge/FusRock S-Multi" + ], "OF0FfcAG": [ "Anycubic/Anycubic TPU for ACE" ], - "OF0GIkJm": [ - "Tiertime/Tiertime Generic PLA Silk" - ], "OF0NgY1y": [ "BBL/COEX NYLEX PA6-CF", "OrcaFilamentLibrary/COEX NYLEX PA6-CF" @@ -1655,29 +1637,21 @@ "OF0yFLkY": [ "Anycubic/Anycubic ASA" ], - "OF0zx94L": [ - "Vzbot/Vzbot Generic PA" - ], "OF112FvY": [ "Anycubic/Generic PETG Basic" ], - "OF1Id239": [ - "Prusa/Prusa Generic PETG" - ], "OF1N1qMK": [ "OrcaFilamentLibrary/Panchroma PLA UV Shift", "Snapmaker/Panchroma PLA UV Shift" ], - "OF1OZujR": [ - "Flashforge/Flashforge Generic PVA" - ], "OF1Pke8t": [ "BBL/Overture Easy PLA", "OrcaFilamentLibrary/Overture Easy PLA" ], "OF1UNk9P": [ "Creality/Generic PP", - "OrcaFilamentLibrary/Generic PP" + "OrcaFilamentLibrary/Generic PP", + "Tiertime/Generic PP" ], "OF1W7c76": [ "Qidi/QIDI ASA-CF" @@ -1688,9 +1662,6 @@ "OF1d7c3A": [ "Snapmaker/Snapmaker ASA" ], - "OF1daEUW": [ - "Anker/Anker Generic PETG-CF" - ], "OF1dpPrW": [ "Qidi/Bambu PLA" ], @@ -1698,9 +1669,6 @@ "Elegoo/Elegoo PLA PRO", "OrcaFilamentLibrary/Elegoo PLA PRO" ], - "OF1uR1t2": [ - "Tiertime/Tiertime Generic PETG" - ], "OF223rZv": [ "Anycubic/Anycubic ABS" ], @@ -1715,9 +1683,6 @@ "OrcaFilamentLibrary/SUNLU PETG", "Sovol/SUNLU PETG" ], - "OF2RjrWH": [ - "Flashforge/FusRock Generic PAHT-GF" - ], "OF2TQpOO": [ "Qidi/QIDI PLA Silk" ], @@ -1733,9 +1698,6 @@ "OF2hfMcG": [ "OrcaArena/Arena PLA-CF" ], - "OF2mgDsI": [ - "Vzbot/Vzbot Generic PLA" - ], "OF2pj5l5": [ "BBL/Overture Super PLA+", "OrcaFilamentLibrary/Overture Super PLA+" @@ -1754,11 +1716,6 @@ "OF3OMgrI": [ "Creality/CR-Silk" ], - "OF3P0BQA": [ - "Anker/Anker Generic ABS", - "Anker/Anker Generic ABS 0.2 nozzle", - "Anker/Anker Generic ABS 0.25 nozzle" - ], "OF3WQaKK": [ "Creality/CR-PETG" ], @@ -1775,21 +1732,12 @@ "OF3msXEa": [ "Snapmaker/Snapmaker Dual PETG-CF" ], - "OF3s929u": [ - "Tiertime/Tiertime Generic PP" - ], - "OF3wxlw9": [ - "CoLiDo/CoLiDo Generic PETG" - ], "OF3ydJTT": [ "InfiMech/InfiMech PLA Hyper" ], "OF41jaTh": [ "Flashforge/Flashforge TPU-90A" ], - "OF42ZDpN": [ - "Flashforge/FusRock PAHT" - ], "OF43Raws": [ "Snapmaker/PolyTerra J1 PLA" ], @@ -1799,16 +1747,10 @@ "OF44VYzK": [ "OrcaFilamentLibrary/FilAr PETG Azul Francia" ], - "OF48L671": [ - "Ratrig/RatRig Generic ASA" - ], "OF4APyxe": [ "Creality/Hyper PAHT-CF" ], "OF4KsW72": [], - "OF4Mf5Gz": [ - "Creality/Creality Generic PETG" - ], "OF4Nhggz": [ "Artillery/Artillery PLA Basic+" ], @@ -1819,9 +1761,6 @@ "OF4WB37S": [ "Snapmaker/Snapmaker PETG" ], - "OF4XAUnp": [ - "Vzbot/Vzbot Generic ASA" - ], "OF4f8vVp": [ "WonderMaker/WonderMaker PET-CF" ], @@ -1831,22 +1770,11 @@ "OF4nQ62r": [ "Qidi/QIDI PLA Basic" ], - "OF4oCRKe": [ - "DeltaMaker/DeltaMaker Generic PETG" - ], "OF4ulo9Y": [ "WonderMaker/WonderMaker PVA" ], - "OF4xhTuK": [ - "OrcaArena/OrcaArena Generic PA-CF" - ], - "OF4zzGwp": [ - "Flashforge/FusRock Generic PET-GF" - ], - "OF51XQar": [ - "CONSTRUCT3D/C1 Generic PLA" - ], "OF53eLVD": [ + "Blocks/Generic ASA-CF", "Creality/Generic ASA-CF", "Elegoo/Generic ASA-CF" ], @@ -1856,6 +1784,9 @@ "OF54SvEe": [ "Prusa/Prusament PA-CF" ], + "OF55jHAJ": [ + "Prusa/Generic ABS HF" + ], "OF5BN24W": [ "Flashforge/Flashforge PPA-GF" ], @@ -1865,9 +1796,6 @@ "Qidi/PolyLite PLA", "Snapmaker/PolyLite PLA" ], - "OF5E5KNA": [ - "SecKit/SecKit Generic PC" - ], "OF5NQFKI": [ "Flashforge/Flashforge PLA Galaxy" ], @@ -1886,9 +1814,6 @@ "OF5YVJXH": [ "Artillery/Artillery ASA" ], - "OF5Zk4e1": [ - "Anycubic/Anycubic Generic ABS" - ], "OF5c6nq3": [ "Flashforge/Generic TPU-64D" ], @@ -1912,10 +1837,6 @@ "OF5vgi2G": [ "OrcaFilamentLibrary/FilAr PLA-mate Azul" ], - "OF5vzBhb": [ - "Chuanying/Chuanying Generic PLA", - "Chuanying/Chuanying PLA" - ], "OF5w29Kq": [ "Flashforge/Flashforge HS PETG" ], @@ -1931,23 +1852,17 @@ "OF6ATsCF": [ "Snapmaker/Snapmaker Dual PLA-CF" ], - "OF6Fpw1E": [ - "Comgrow/Comgrow Generic PETG" - ], "OF6H51Xx": [ "Snapmaker/Polymaker PETG", "Sovol/Polymaker PETG" ], - "OF6K467o": [ - "InfiMech/InfiMech Generic PA-CF" - ], - "OF6KELDx": [ - "Co Print/CoPrint Generic PLA" - ], "OF6Ll8lK": [ "Elegoo/Elegoo PETG Translucent", "OrcaFilamentLibrary/Elegoo PETG Translucent" ], + "OF6MMR8P": [ + "TwoTrees/Generic 95A TPU" + ], "OF6MOPWx": [ "Creality/Generic PET", "Elegoo/Generic PET", @@ -1963,33 +1878,19 @@ "OF6VgL2U": [ "Phrozen/Phrozen PLA" ], - "OF6WddJ1": [ - "Flashforge/FusRock S-PAHT" - ], "OF6kj4jI": [ "iQ/Fiberthree PACF Pro P2" ], "OF6ooviO": [ "FLSun/FLSun S1 TPU" ], - "OF6rMr3U": [ - "Flashforge/FusRock Generic S-Multi" - ], "OF6rdQ6M": [ - "Creality/Generic PPS-CF" - ], - "OF6tKa1Z": [ - "Anker/Anker Generic TPU" + "Creality/Generic PPS-CF", + "Tiertime/Generic PPS-CF" ], "OF6ueBwd": [ "Flashforge/Flashforge PLA Pro" ], - "OF6vKLaU": [ - "Artillery/Artillery Generic ASA" - ], - "OF6xLvYg": [ - "InfiMech/InfiMech Generic PC" - ], "OF6zAVFj": [ "Sovol/Sovol Zero TPU" ], @@ -2000,7 +1901,8 @@ "Snapmaker/Snapmaker ABS" ], "OF74KeQR": [ - "OrcaFilamentLibrary/Generic PHA" + "OrcaFilamentLibrary/Generic PHA", + "Tiertime/Generic PHA" ], "OF79Fbo6": [ "Cubicon/Cubicon PC" @@ -2020,11 +1922,9 @@ "OF7c9fln": [ "Anycubic/Anycubic PLA Translucent" ], - "OF7g2vYQ": [ - "Co Print/CoPrint Generic TPU" - ], "OF7lOgYF": [ - "OrcaFilamentLibrary/Generic PETG HF" + "OrcaFilamentLibrary/Generic PETG HF", + "Prusa/Generic PETG HF" ], "OF7lwj52": [ "CoLiDo/CoLiDo PETG" @@ -2032,15 +1932,12 @@ "OF7nBAd3": [ "Eryone/Eryone Silk PLA" ], + "OF7pjCsO": [ + "Flashforge/FusRock PAHT" + ], "OF7tt7DO": [ "Cubicon/Cubicon PLA+" ], - "OF7uE5KB": [ - "Anker/Anker Generic PA-CF" - ], - "OF8CXrvm": [ - "SecKit/SecKit Generic PA" - ], "OF8GnyFU": [ "Creality/Hyper ABS" ], @@ -2051,14 +1948,12 @@ "Snapmaker/Snapmaker J1 PET" ], "OF8Tlg47": [ - "OrcaFilamentLibrary/Generic PPA-GF" + "OrcaFilamentLibrary/Generic PPA-GF", + "Tiertime/Generic PPA-GF" ], "OF8aFWfQ": [ "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" ], - "OF8bLDu7": [ - "Blocks/Blocks Generic PA-CF" - ], "OF8dCquh": [ "Snapmaker/Snapmaker J1 ABS Benchy" ], @@ -2075,14 +1970,12 @@ "Eryone/Eryone PETG" ], "OF8tPByX": [ - "OrcaFilamentLibrary/Generic PPA-CF" + "OrcaFilamentLibrary/Generic PPA-CF", + "Tiertime/Generic PPA-CF" ], "OF8wE5l7": [ "Artillery/Artillery PETG Basic" ], - "OF97ru74": [ - "Prusa/Prusa Generic PC" - ], "OF995YXg": [ "Flashforge/Flashforge TPU-64D" ], @@ -2109,9 +2002,6 @@ "OF9emAI9": [ "Ratrig/RatRig PunkFil PETG" ], - "OF9fOPpd": [ - "Vzbot/Vzbot Generic PC" - ], "OF9z5LZ9": [ "FLSun/FLSun S1 PETG" ], @@ -2121,9 +2011,6 @@ "OFAC7Wyu": [ "Artillery/Artillery PLA Matte" ], - "OFACSw9O": [ - "Creality/Creality Generic PLA" - ], "OFAIBCLJ": [ "Elegoo/Generic ABS-CF" ], @@ -2148,34 +2035,12 @@ "OFAt6ec0": [ "OrcaFilamentLibrary/FilAr PLA Marron Oxido" ], - "OFB09fpe": [ - "Ratrig/RatRig Generic TPU" - ], - "OFB0a3hT": [ - "Anker/Anker Generic PLA-CF" - ], - "OFB1Tv1E": [ - "Anycubic/Anycubic Generic PA" - ], "OFB5SmWk": [ "OrcaFilamentLibrary/Valment PLA Galaxy" ], - "OFB8wSps": [ - "Flashforge/FusRock PET-CF" - ], - "OFB9dx27": [ - "Blocks/Blocks Generic ASA" - ], "OFBBgw7B": [ "WonderMaker/WonderMaker PLA Wood" ], - "OFBC32Wb": [ - "Flashforge/FusRock PET" - ], - "OFBIadjM": [ - "Chuanying/Chuanying ASA", - "Chuanying/Chuanying Generic ASA" - ], "OFBJAdLw": [ "LH/LHS PCTG" ], @@ -2198,21 +2063,12 @@ "OFBoSWxb": [ "Snapmaker/PolyLite PLA Luminous" ], - "OFBpcB0a": [ - "TwoTrees/TwoTrees Generic HS PLA" - ], - "OFBtlI8M": [ - "FlyingBear/FlyingBear Generic ABS" - ], "OFBw6eEG": [ "OrcaFilamentLibrary/Overture Matte PLA" ], "OFC1PzXz": [ "Creality/Hyper Luminous" ], - "OFC20UMj": [ - "Flashforge/Flashforge Generic TPU" - ], "OFC5f4Ay": [ "RH3D/Generic PCCF" ], @@ -2221,7 +2077,8 @@ "Snapmaker/Panchroma PLA Starlight" ], "OFCD8qiU": [ - "OrcaFilamentLibrary/Generic EVA" + "OrcaFilamentLibrary/Generic EVA", + "Tiertime/Generic EVA" ], "OFCEA7Nt": [ "Sovol/Sovol SV06 Plus ACE ABS" @@ -2233,28 +2090,22 @@ "OFCJpR7a": [ "Creality/HP Ultra PLA" ], - "OFCVUEaV": [ - "Tiertime/Tiertime Generic TPU" - ], "OFCZsqXg": [ "Creality/Hyper PLA" ], - "OFCaJHAA": [ - "Flashforge/FusRock Generic S-PAHT" - ], "OFCccVrQ": [ "OrcaFilamentLibrary/PolyTerra Dual PLA", "Snapmaker/PolyTerra Dual PLA" ], - "OFCcsYtf": [ - "FLSun/FLSun Generic ASA" - ], "OFCidU7j": [ "OrcaFilamentLibrary/DREMC ABS-GF" ], "OFCjG251": [ "OrcaFilamentLibrary/FilAr PLA-mate Verde" ], + "OFCn83wF": [ + "Flashforge/FusRock S-PAHT" + ], "OFCnywiC": [ "Tiertime/Tiertime PET-CF" ], @@ -2264,19 +2115,12 @@ "OFCp3Bgo": [ "Anycubic/Anycubic PLA SE" ], - "OFCu3jES": [], "OFCuaCer": [ "Volumic/Désactivé" ], "OFD21ije": [ "Cubicon/Cubicon PA-CF" ], - "OFD2JNS1": [ - "Dremel/Dremel Generic PLA" - ], - "OFD6kN7F": [ - "OrcaArena/OrcaArena Generic PLA" - ], "OFD8loeT": [ "re3D/re3D rPETG" ], @@ -2307,15 +2151,39 @@ "InfiMech/Other PETG" ], "OFDSrzZ8": [ + "Anker/Generic PLA", + "Anycubic/Generic PLA", + "Artillery/Generic PLA", + "Blocks/Generic PLA", + "CONSTRUCT3D/Generic PLA", + "Chuanying/Chuanying PLA", + "Chuanying/Generic PLA", + "Co Print/Generic PLA", + "CoLiDo/Generic PLA", + "Comgrow/Generic PLA", + "Creality/Creality Generic PLA", "Creality/Generic PLA", "Custom/Generic PLA", + "DeltaMaker/Generic PLA", + "Dremel/Generic PLA", "Elegoo/Generic PLA", + "FLSun/Generic PLA", "Flashforge/Generic PLA", + "FlyingBear/Generic PLA", + "Ginger Additive/Generic PLA", + "InfiMech/Generic PLA", "LONGER/Generic PLA", + "OrcaArena/Generic PLA", "OrcaFilamentLibrary/Generic PLA", + "Peopoly/Generic PLA", + "Prusa/Generic PLA", "Qidi/Generic PLA", "RH3D/Generic PLA", + "Ratrig/Generic PLA", + "SecKit/Generic PLA", "Sovol/Generic PLA", + "Tiertime/Generic PLA", + "Vzbot/Generic PLA", "Z-Bolt/Generic PLA" ], "OFDdEaoL": [ @@ -2324,9 +2192,6 @@ "OFDe8uyM": [ "OrcaFilamentLibrary/Valment PLA" ], - "OFDeTsJw": [ - "Chuanying/Chuanying Generic HIPS" - ], "OFDgQaca": [ "FlyingBear/FlyingBear PETG" ], @@ -2336,14 +2201,33 @@ "OFDtop41": [ "Creality/Generic Support for PA" ], + "OFDu1qE7": [ + "Flashforge/FusRock PET-CF" + ], "OFDvXujf": [ + "Anker/Generic PVA", + "Anycubic/Generic PVA", + "Blocks/Generic PVA", + "Chuanying/Generic PVA", "Creality/Generic PVA", "Custom/Generic PVA", - "OrcaFilamentLibrary/Generic PVA" + "FLSun/Generic PVA", + "Flashforge/Generic PVA", + "OrcaArena/Generic PVA", + "OrcaFilamentLibrary/Generic PVA", + "Prusa/Generic PVA", + "Qidi/Generic PVA", + "Ratrig/Generic PVA", + "SecKit/Generic PVA", + "Tiertime/Generic PVA", + "Vzbot/Generic PVA" ], "OFDvqJ6n": [ "OrcaFilamentLibrary/Overture ABS Basic" ], + "OFDwBwO5": [ + "Prusa/Generic PVA HF" + ], "OFDxfPgH": [ "OrcaFilamentLibrary/Bambu PLA Sparkle" ], @@ -2351,9 +2235,6 @@ "BBL/COEX TPU 60A", "OrcaFilamentLibrary/COEX TPU 60A" ], - "OFEE1Dld": [ - "Artillery/Artillery Generic TPU" - ], "OFEGNJD4": [ "OrcaFilamentLibrary/Bambu PLA Silk" ], @@ -2366,18 +2247,13 @@ "OFEOnBj6": [ "Snapmaker/Snapmaker PLA Lite" ], - "OFETFWx7": [ - "SecKit/SecKit Generic PLA" - ], "OFEWYR89": [ + "Anker/Generic PLA+", "Qidi/Generic PLA+" ], "OFEZ449N": [ "OrcaFilamentLibrary/FilAr PLA-mate Uva" ], - "OFEZNNw1": [ - "Ratrig/RatRig Generic PA" - ], "OFEZpel7": [ "Volumic/PPS Carbone (Performance)" ], @@ -2413,9 +2289,6 @@ "OFF3cuzT": [ "Creality/Generic TPU 64D" ], - "OFF73Bvp": [ - "SecKit/SecKit Generic PLA-CF" - ], "OFF9OKoY": [ "OrcaFilamentLibrary/PolyLite PLA Pro", "Snapmaker/PolyLite PLA Pro" @@ -2438,9 +2311,6 @@ "OFFX1DRD": [ "FlyingBear/FlyingBear PC" ], - "OFFZ0BBL": [ - "FlyingBear/FlyingBear Generic PLA" - ], "OFFZ458u": [ "Snapmaker/Fiberon PA612-ESD" ], @@ -2457,9 +2327,6 @@ "OFFwJWea": [ "Anycubic/Anycubic PLA Silk" ], - "OFFxZ7hZ": [ - "Chuanying/Chuanying Generic PLA-CF10" - ], "OFG0kOKX": [ "Volumic/Volumic PETG Ultra" ], @@ -2469,25 +2336,10 @@ "OFG4do34": [ "Qidi/Qidi ASA-Aero" ], - "OFGDaEHO": [ - "Tiertime/Tiertime Generic BVOH" - ], - "OFGGyAgJ": [ - "Vzbot/Vzbot Generic TPU" - ], "OFGJ1nxs": [ "FlyingBear/Other PLA", "InfiMech/Other PLA" ], - "OFGKLoUm": [ - "Anycubic/Anycubic Generic TPU" - ], - "OFGLeiNL": [], - "OFGPJxnt": [ - "Anker/Anker Generic PC", - "Anker/Anker Generic PC 0.2 nozzle", - "Anker/Anker Generic PC 0.25 nozzle" - ], "OFGVwfK0": [ "OrcaFilamentLibrary/FilAr PLA-mate Gris" ], @@ -2514,9 +2366,6 @@ "OFGxC8gB": [ "Creality/CR-Wood" ], - "OFGzUNbm": [ - "Tiertime/Tiertime Generic PPS-CF" - ], "OFH2nN08": [ "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" ], @@ -2535,24 +2384,12 @@ "OFHAccHz": [ "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" ], - "OFHFZ1Te": [ - "Prusa/Prusa Generic PLA Silk" - ], - "OFHQUAoZ": [ - "FLSun/FLSun Generic PA-CF" - ], "OFHTVfaU": [ "Sovol/Sovol Zero PETG" ], - "OFHUnLY2": [ - "Vzbot/Vzbot Generic PETG" - ], "OFHWSM21": [ "OrcaFilamentLibrary/Fiberon PET-CF" ], - "OFHa3RZT": [ - "Tiertime/Tiertime Generic PA-CF" - ], "OFHa48An": [ "OrcaFilamentLibrary/Bambu PET-CF" ], @@ -2576,9 +2413,6 @@ "OFI6WZpn": [ "OrcaArena/Arena Support W" ], - "OFI80Hct": [ - "Anycubic/Anycubic Generic ASA" - ], "OFIBXa0k": [ "OrcaFilamentLibrary/FilAr PLA-mate Rojo" ], @@ -2588,6 +2422,9 @@ "OFIK0xFa": [ "FLSun/FLSun S1 ASA" ], + "OFIKZxPF": [ + "Creality/Generic PLA Wood" + ], "OFIPjqHt": [ "OrcaArena/Arena Support G" ], @@ -2600,23 +2437,12 @@ "OFIWMSGX": [ "Qidi/HATCHBOX PETG" ], - "OFIYTy8S": [ - "Anker/Anker Generic PLA+", - "Anker/Anker Generic PLA+ 0.2 nozzle", - "Anker/Anker Generic PLA+ 0.25 nozzle" - ], "OFIZMQwM": [ "LH/LHS TPU" ], "OFIamQnD": [ "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" ], - "OFIda816": [ - "Vzbot/Vzbot Generic PVA" - ], - "OFIeCuXj": [ - "Peopoly/Peopoly Generic PETG" - ], "OFIegjmD": [ "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" ], @@ -2626,18 +2452,12 @@ "OFIgbDHq": [ "Anycubic/Anycubic PLA Luminous" ], - "OFIieIka": [ - "Flashforge/Polymaker CoPA" - ], "OFIxOuOu": [ "Snapmaker/PolyLite PLA Starlight" ], "OFIxitiU": [ "Flashforge/Flashforge PLA Basic" ], - "OFIy3kLw": [ - "Prusa/Prusa Generic PA" - ], "OFJ3HRsR": [ "OrcaArena/Arena ABS" ], @@ -2645,9 +2465,6 @@ "FLSun/FLSun T1 PETG" ], "OFJHBEGD": [], - "OFJJpaLS": [ - "FLSun/FLSun Generic PETG" - ], "OFJNeELv": [ "OrcaFilamentLibrary/FILL3D PA" ], @@ -2658,9 +2475,6 @@ "OFJQDUk3": [ "OrcaFilamentLibrary/FilAr PETG Cristal" ], - "OFJSksUs": [ - "FLSun/FLSun Generic PLA" - ], "OFJVFpJz": [ "Sovol/Sovol Zero PLA Silk" ], @@ -2691,12 +2505,6 @@ "OFJxSqO4": [ "Wanhao France/YUMI PLA Direct Drive" ], - "OFK01afJ": [ - "Qidi/Qidi Generic PC" - ], - "OFK4LdYI": [ - "Prusa/Prusa Generic ASA HF" - ], "OFK74HJD": [ "Flashforge/Flashforge PLA Pro" ], @@ -2709,8 +2517,8 @@ "OFKKajh6": [ "OrcaFilamentLibrary/FilAr PLA Gris Plata" ], - "OFKNAhls": [ - "Qidi/Qidi Generic PETG" + "OFKTGKJU": [ + "Flashforge/FusRock PET" ], "OFKTSiYF": [ "OrcaFilamentLibrary/FilAr PLA Blanco Calido" @@ -2718,6 +2526,9 @@ "OFKUEXPA": [ "Snapmaker/Snapmaker Dual ASA" ], + "OFKW5hEW": [ + "Flashforge/FusRock PAHT-CF" + ], "OFKWWgyp": [ "OrcaFilamentLibrary/FilAr PLA Carpincho" ], @@ -2746,27 +2557,15 @@ "OFKpQTJI": [ "Flashforge/Flashforge TPU 65D" ], - "OFKuTr12": [ - "Tiertime/Tiertime Generic PE" - ], - "OFKyCgaK": [ - "Anycubic/Anycubic Generic PLA" - ], "OFL9aRjN": [ "Snapmaker/Snapmaker PETG HF" ], "OFLAXKqP": [ "WonderMaker/WonderMaker TPU 95A" ], - "OFLBUkwC": [ - "Vzbot/Vzbot Generic ABS" - ], "OFLC1oRH": [ "Flashforge/Flashforge PPA-CF" ], - "OFLDSqqi": [ - "Flashforge/Flashforge Generic ABS" - ], "OFLJ8S6I": [ "Flashforge/SUNLU Wood PLA", "OrcaFilamentLibrary/SUNLU Wood PLA" @@ -2776,12 +2575,26 @@ "Tiertime/Tiertime TPU 95A" ], "OFLPAxz3": [ + "Anker/Generic ASA", + "Anycubic/Generic ASA", + "Artillery/Generic ASA", + "Blocks/Generic ASA", + "Chuanying/Chuanying ASA", + "Chuanying/Generic ASA", "Creality/Generic ASA", "Custom/Generic ASA", "Elegoo/Generic ASA", + "FLSun/Generic ASA", "Flashforge/Generic ASA", + "OrcaArena/Generic ASA", "OrcaFilamentLibrary/Generic ASA", - "RH3D/Generic ASA" + "Prusa/Generic ASA", + "Qidi/Generic ASA", + "RH3D/Generic ASA", + "Ratrig/Generic ASA", + "SecKit/Generic ASA", + "Tiertime/Generic ASA", + "Vzbot/Generic ASA" ], "OFLTYJW0": [ "Snapmaker/Snapmaker PLA Translucent" @@ -2797,12 +2610,24 @@ "Qidi/Bambu PETG" ], "OFLakOUI": [ + "Anker/Generic PC", + "Anycubic/Generic PC", + "Blocks/Generic PC", "Creality/Generic PC", "Custom/Generic PC", "Elegoo/Generic PC", + "FLSun/Generic PC", + "FlyingBear/Generic PC", + "InfiMech/Generic PC", + "OrcaArena/Generic PC", "OrcaFilamentLibrary/Generic PC", + "Prusa/Generic PC", "Qidi/Generic PC", - "Sovol/Generic PC" + "Ratrig/Generic PC", + "SecKit/Generic PC", + "Sovol/Generic PC", + "Tiertime/Generic PC", + "Vzbot/Generic PC" ], "OFLbXwoL": [ "Artillery/Artillery PLA Silk" @@ -2820,12 +2645,6 @@ "OFLgwqp2": [ "Creality/Hyper PETG-GF" ], - "OFLrdHse": [ - "Flashforge/Flashforge Generic HS PLA" - ], - "OFLuczRG": [ - "Creality/Creality Generic ASA-CF" - ], "OFLzx3J4": [ "Creality/Hyper Marble" ], @@ -2835,9 +2654,6 @@ "OFM4iJlv": [ "Creality/Generic PA12-CF" ], - "OFM87w9T": [ - "Tiertime/Tiertime Generic SBS" - ], "OFM91vZs": [ "BBL/Overture ASA", "OrcaFilamentLibrary/Overture ASA" @@ -2845,15 +2661,9 @@ "OFMDHOcT": [ "Qidi/QIDI TPU-Aero" ], - "OFMEbuBE": [ - "Blocks/Blocks Generic TPU" - ], "OFMIma8C": [ "Flashforge/Flashforge PLA Luminous" ], - "OFMIurFh": [ - "Creality/Creality HF Generic Speed PLA" - ], "OFMK5gVo": [ "WonderMaker/WonderMaker PLA Basic" ], @@ -2863,9 +2673,6 @@ "OFMSvS8z": [ "Artillery/Artillery PA" ], - "OFMTBcnz": [ - "Tiertime/Tiertime Generic PP-CF" - ], "OFMTK0UC": [ "OrcaFilamentLibrary/Bambu Support For PA/PET" ], @@ -2873,30 +2680,16 @@ "Flashforge/SUNLU PLA+", "OrcaFilamentLibrary/SUNLU PLA+" ], - "OFMZAoqa": [ - "Tiertime/Tiertime Generic PVA" - ], "OFMZvH0z": [ "BBL/Overture Rock PLA", "OrcaFilamentLibrary/Overture Rock PLA" ], - "OFMgJQCZ": [ - "Anker/Anker Generic PA", - "Anker/Anker Generic PA 0.2 nozzle", - "Anker/Anker Generic PA 0.25 nozzle" - ], "OFMjtqTC": [ "OrcaFilamentLibrary/Bambu PLA Wood" ], - "OFMoLF46": [ - "FLSun/FLSun Generic TPU" - ], "OFMpxamb": [ "Flashforge/Flashforge PETG" ], - "OFMqYusc": [ - "Creality/Creality Generic PA" - ], "OFMsDGbs": [ "Anycubic/Anycubic TPU" ], @@ -2906,9 +2699,6 @@ "OFMyLYV8": [ "Flashforge/Flashforge PETG Transparent" ], - "OFN7aNHe": [ - "Tiertime/Tiertime Generic PC" - ], "OFN9fefN": [ "Cubicon/Cubicon ABS-A100" ], @@ -2918,12 +2708,6 @@ "OFNGTH3w": [ "Tiertime/Tiertime PLA" ], - "OFNLXV8X": [ - "Tiertime/Tiertime Generic ABS" - ], - "OFNOxcYl": [ - "Ratrig/RatRig Generic PA-CF" - ], "OFNQKF0M": [ "Tiertime/Tiertime ABS" ], @@ -2933,9 +2717,6 @@ "OFNU9YIW": [ "OrcaFilamentLibrary/FilAr PETG Azul Boreal" ], - "OFNW4ZTC": [ - "Creality/Creality Generic PLA Wood" - ], "OFNWcJsM": [ "Comgrow/Comgrow T300 PLA" ], @@ -2945,30 +2726,18 @@ "OFNX8GI1": [ "Sovol/Sovol Zero ABS" ], - "OFNYewRS": [ - "Blocks/Blocks Generic PLA" - ], - "OFNZYgLA": [ - "Qidi/Qidi Generic PVA" - ], "OFNZjrLo": [ "Sovol/Sovol SV06 Plus ACE PLA" ], - "OFNcdCrm": [ - "Anycubic/Anycubic Generic PLA-CF" - ], "OFNemJM6": [ "OrcaFilamentLibrary/FilAr PLA Cobre" ], - "OFNiSLfL": [ - "OrcaFilamentLibrary/Generic PP-GF" + "OFNjku08": [ + "CONSTRUCT3D/Generic High Flow PETG" ], "OFNk8bxk": [ "OrcaFilamentLibrary/Bambu PA6-GF" ], - "OFNn21yM": [ - "Vzbot/Vzbot Generic PA-CF" - ], "OFNstOna": [ "Eryone/Eryone PETG-CF" ], @@ -2980,6 +2749,7 @@ "Snapmaker/Panchroma PLA Neon" ], "OFO5djrM": [ + "Chuanying/Generic PETG-CF10", "Flashforge/Generic PETG-CF10" ], "OFOABq7t": [ @@ -2995,9 +2765,6 @@ "OFOJPAAS": [ "iQ/VXL90 TiQ2 P2" ], - "OFOKYhi6": [ - "Prusa/Prusa Generic PETG HF" - ], "OFOPU1xv": [ "Snapmaker/Snapmaker PLA Full Spectrum" ], @@ -3051,19 +2818,14 @@ "OFPc4zVY": [ "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" ], - "OFPdhDlK": [ - "Anycubic/Anycubic Generic PA-CF" - ], - "OFPjOUtz": [ - "Flashforge/FusRock Generic PAHT-CF" - ], "OFPkCJKE": [ "Creality/Panchroma PLA Satin", "OrcaFilamentLibrary/Panchroma PLA Satin", "Snapmaker/Panchroma PLA Satin" ], "OFPklMI1": [ - "OrcaFilamentLibrary/Generic PE" + "OrcaFilamentLibrary/Generic PE", + "Tiertime/Generic PE" ], "OFPoyiFs": [ "OrcaFilamentLibrary/Polymaker HT-PLA", @@ -3075,9 +2837,6 @@ "OFPryWt5": [ "Lulzbot/Lulzbot 2.85mm PLA" ], - "OFPy0Ogq": [ - "Qidi/Qidi Generic PA-CF" - ], "OFQ1KzO8": [ "Snapmaker/Snapmaker J1 PLA Silk" ], @@ -3090,15 +2849,9 @@ "OFQ40XeN": [ "Qidi/QIDI PETG Tough" ], - "OFQ7I5vC": [ - "Prusa/Prusa Generic PLA-CF" - ], "OFQ9qnkd": [ "FLSun/FLSun T1 PLA High Speed" ], - "OFQC8Vna": [ - "Flashforge/Flashforge Generic PETG-CF" - ], "OFQEGL7z": [ "FlyingBear/FlyingBear PA-CF" ], @@ -3109,9 +2862,22 @@ "OrcaFilamentLibrary/Bambu Support G" ], "OFQLcbps": [ + "Anker/Generic PA-CF", + "Anycubic/Generic PA-CF", + "Blocks/Generic PA-CF", "Creality/Generic PA-CF", "Custom/Generic PA-CF", - "OrcaFilamentLibrary/Generic PA-CF" + "FLSun/Generic PA-CF", + "FlyingBear/Generic PA-CF", + "InfiMech/Generic PA-CF", + "OrcaArena/Generic PA-CF", + "OrcaFilamentLibrary/Generic PA-CF", + "Prusa/Generic PA-CF", + "Qidi/Generic PA-CF", + "Ratrig/Generic PA-CF", + "SecKit/Generic PA-CF", + "Tiertime/Generic PA-CF", + "Vzbot/Generic PA-CF" ], "OFQMTRc8": [ "Snapmaker/Snapmaker J1 PETG" @@ -3119,9 +2885,6 @@ "OFQMsFfF": [ "Qidi/QIDI ABS-GF10" ], - "OFQTrLXB": [ - "Qidi/Qidi Generic PLA-CF" - ], "OFQWIKbV": [ "OrcaFilamentLibrary/FilAr PLA Titanio" ], @@ -3134,9 +2897,6 @@ "OFQbjX3s": [ "OrcaFilamentLibrary/FILL3D PETG" ], - "OFQbqeN7": [ - "Qidi/Qidi Generic PA" - ], "OFQdaVZS": [ "Creality/Generic PET-CF", "Elegoo/Generic PET-CF" @@ -3147,8 +2907,8 @@ "OFQiq4fb": [ "Flashforge/Flashforge PVA" ], - "OFQswlnF": [ - "Tiertime/Tiertime Generic PA" + "OFQyyO0l": [ + "Flashforge/Polymaker CoPA" ], "OFR0gODA": [ "SeeMeCNC/SeeMeCNC ABS" @@ -3156,15 +2916,9 @@ "OFR1XLMN": [ "Qidi/QIDI TPU 95A-HF" ], - "OFRDLNM9": [ - "Peopoly/Peopoly Generic PLA" - ], "OFRJ325z": [ "LH/LHS PETG" ], - "OFRPEs5o": [ - "Flashforge/Flashforge Generic ASA" - ], "OFRhBryT": [ "Cubicon/Cubicon PLAi21" ], @@ -3181,11 +2935,6 @@ "OrcaFilamentLibrary/Panchroma PLA Celestial", "Snapmaker/Panchroma PLA Celestial" ], - "OFRiyes1": [ - "Anker/Anker Generic ASA", - "Anker/Anker Generic ASA 0.2 nozzle", - "Anker/Anker Generic ASA 0.25 nozzle" - ], "OFRkjhxK": [ "Volumic/Volumic PVA-BVOH (Performance)" ], @@ -3198,43 +2947,22 @@ "OFRpAZ1P": [ "DeltaMaker/DeltaMaker Brand PLA" ], - "OFRujL0v": [ - "Flashforge/FusRock Generic PET-CF" - ], - "OFRusgEn": [ - "Chuanying/Chuanying Generic PVA" - ], "OFRyOsZj": [ "re3D/re3D PLA" ], "OFRzR5mi": [ "OrcaFilamentLibrary/eSUN ePLA-LW" ], - "OFRzsaDK": [ - "FlyingBear/FlyingBear Generic TPU" - ], "OFS2tn6G": [ "OrcaFilamentLibrary/Fiberon PA612-CF" ], "OFS4jbj3": [ "Eryone/Eryone PA" ], - "OFS8JF3S": [ - "Qidi/Qidi Generic PLA High Speed" - ], "OFS8lTQt": [ "OrcaFilamentLibrary/Panchroma PLA Silk", "Snapmaker/Panchroma PLA Silk" ], - "OFSDFYs4": [ - "Creality/Creality Generic PLA-CF" - ], - "OFSGbf2I": [ - "Anycubic/Anycubic Generic PVA" - ], - "OFSPdsuW": [ - "Tiertime/Tiertime Generic PPA-CF" - ], "OFSStjay": [ "FLSun/FLSun S1 PLA Silk" ], @@ -3254,9 +2982,6 @@ "OFTGHyNC": [ "OrcaFilamentLibrary/Bambu PLA Impact" ], - "OFTKFAZ4": [ - "Tiertime/Tiertime Generic PCTG" - ], "OFTOPcx0": [ "OrcaFilamentLibrary/Eolas Prints TPU Transition" ], @@ -3293,9 +3018,6 @@ "OFTvvox9": [ "Sovol/Sovol SV06 ACE PLA" ], - "OFU0n0zW": [ - "FLSun/FLSun T1 PLA Generic" - ], "OFU1zPxE": [ "Elegoo/Elegoo PLA Galaxy", "OrcaFilamentLibrary/Elegoo PLA Galaxy" @@ -3303,15 +3025,6 @@ "OFU3QXL7": [ "re3D/re3D PC" ], - "OFU3zwPc": [ - "Prusa/Prusa Generic TPU HF" - ], - "OFU5N9jI": [ - "OrcaArena/OrcaArena Generic TPU" - ], - "OFU6fjbi": [ - "Co Print/CoPrint Generic ABS" - ], "OFU7CKZt": [ "Volumic/Volumic ASA Ultra (Performance)" ], @@ -3327,33 +3040,18 @@ "OFUIfGoh": [ "Snapmaker/Snapmaker Dual PET" ], - "OFUScM0D": [ - "Flashforge/FusRock S-Multi" - ], - "OFUWRqwb": [ - "Creality/Creality Generic PA-CF" - ], "OFUYCqtB": [ "InfiMech/InfiMech PLA" ], "OFUaHEO9": [ "Anycubic/Anycubic PEBA 95A" ], - "OFUaVAdj": [ - "Tiertime/Tiertime Generic ASA" - ], "OFUanySo": [ "OrcaFilamentLibrary/Bambu PLA Silk+" ], "OFUmS5z5": [ "Creality/eSUN ASA+" ], - "OFUrStd6": [ - "Ratrig/RatRig Generic PCTG" - ], - "OFUtGagr": [ - "Artillery/Artillery Generic PLA-CF" - ], "OFUyDDNv": [ "Elegoo/Elegoo PC", "OrcaFilamentLibrary/Elegoo PC" @@ -3378,16 +3076,10 @@ "OFVHMFJX": [ "Qidi/QIDI PETG Tough 0.2 nozzle" ], - "OFVKADz5": [ - "Comgrow/Comgrow Generic PLA" - ], "OFVptRxp": [ "BBL/COEX TPE 30D", "OrcaFilamentLibrary/COEX TPE 30D" ], - "OFVqZ2H0": [ - "FLSun/FLSun Generic PC" - ], "OFVtIasg": [ "Eryone/Eryone ASA" ], @@ -3402,15 +3094,9 @@ "OFW8lqnb": [ "Snapmaker/Snapmaker PETG Translucent" ], - "OFW9uIkE": [ - "Tiertime/Tiertime Generic HIPS" - ], "OFWDe7YH": [ "Qidi/QIDI UltraPA" ], - "OFWIr7ZE": [ - "CoLiDo/CoLiDo Generic ABS" - ], "OFWRITFw": [ "Prusa/Prusament rPLA" ], @@ -3420,9 +3106,6 @@ "OFWTRJ1K": [ "OrcaFilamentLibrary/FilAr PLA Bronce" ], - "OFWY6vBh": [ - "Anycubic/Anycubic Generic PC" - ], "OFWYtgCa": [ "Elegoo/Elegoo PLA Wood", "OrcaFilamentLibrary/Elegoo PLA Wood" @@ -3430,19 +3113,26 @@ "OFWa0NiB": [ "Volumic/Volumic NYLON Ultra" ], - "OFWadebJ": [ - "Tiertime/Tiertime Generic PETG-CF" - ], "OFWao3Ic": [ "Creality/Ender-PLA" ], - "OFWbbuRY": [ - "InfiMech/InfiMech Generic ABS" - ], "OFWbdGsC": [ + "Anker/Generic PLA-CF", + "Anycubic/Generic PLA-CF", + "Artillery/Generic PLA-CF", + "Blocks/Generic PLA-CF", "Creality/Generic PLA-CF", "Custom/Generic PLA-CF", - "OrcaFilamentLibrary/Generic PLA-CF" + "FLSun/Generic PLA-CF", + "Flashforge/Generic PLA-CF", + "OrcaArena/Generic PLA-CF", + "OrcaFilamentLibrary/Generic PLA-CF", + "Prusa/Generic PLA-CF", + "Qidi/Generic PLA-CF", + "Ratrig/Generic PLA-CF", + "SecKit/Generic PLA-CF", + "Tiertime/Generic PLA-CF", + "Vzbot/Generic PLA-CF" ], "OFWgFOjn": [ "Snapmaker/Snapmaker PLA Silk" @@ -3450,18 +3140,9 @@ "OFWnSvGu": [ "Flashforge/Flashforge ASA-GF" ], - "OFWof1Ap": [ - "FLSun/FLSun Generic ABS" - ], - "OFWukXja": [ - "Qidi/Qidi Generic TPU 95A" - ], "OFWwF7K7": [ "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" ], - "OFWzr7m0": [ - "Anycubic/Anycubic Generic PETG" - ], "OFX0etlv": [ "re3D/re3D PETG" ], @@ -3469,6 +3150,7 @@ "OrcaFilamentLibrary/Fiberon PA12-CF" ], "OFX2zcrM": [ + "Chuanying/Generic PLA-CF10", "Flashforge/Generic PLA-CF10" ], "OFXCBZTA": [ @@ -3486,12 +3168,6 @@ "OFXTPuqV": [ "OrcaFilamentLibrary/Elas PETG Basic" ], - "OFXXUHSG": [ - "Chuanying/Chuanying Generic PETG-CF10" - ], - "OFXhZ3uY": [ - "OrcaArena/OrcaArena Generic PC" - ], "OFXi59OX": [ "Afinia/Afinia Value ABS" ], @@ -3500,7 +3176,11 @@ ], "OFXkm8q1": [ "Creality/Generic PP-CF", - "OrcaFilamentLibrary/Generic PP-CF" + "OrcaFilamentLibrary/Generic PP-CF", + "Tiertime/Generic PP-CF" + ], + "OFXmv5p0": [ + "Creality/Generic Speed PLA" ], "OFXn3Vd9": [ "Qidi/QIDI Support For PAHT" @@ -3511,14 +3191,6 @@ "OFXuGxvQ": [ "Volumic/Volumic PLA Ultra" ], - "OFXuwtnq": [ - "Co Print/CoPrint Generic PETG" - ], - "OFXyyfX6": [ - "Anker/Anker Generic PLA Silk", - "Anker/Anker Generic PLA Silk 0.2 nozzle", - "Anker/Anker Generic PLA Silk 0.25 nozzle" - ], "OFXz7Mwx": [ "Elegoo/Elegoo PLA Silk", "OrcaFilamentLibrary/Elegoo PLA Silk" @@ -3536,15 +3208,32 @@ "Snapmaker/Snapmaker TPU 90A" ], "OFY9muEs": [ + "Anker/Generic ABS", "Anycubic/Generic ABS", + "Artillery/Generic ABS", + "Blocks/Generic ABS", + "Chuanying/Generic ABS", + "Co Print/Generic ABS", + "CoLiDo/Generic ABS", + "Comgrow/Generic ABS", "Creality/Generic ABS", "Custom/Generic ABS", "Elegoo/Generic ABS", + "FLSun/Generic ABS", "Flashforge/Generic ABS", + "FlyingBear/Generic ABS", + "InfiMech/Generic ABS", + "OrcaArena/Generic ABS", "OrcaFilamentLibrary/Generic ABS", + "Peopoly/Generic ABS", + "Prusa/Generic ABS", "Qidi/Generic ABS", "RH3D/Generic ABS", + "Ratrig/Generic ABS", + "SecKit/Generic ABS", "Sovol/Generic ABS", + "Tiertime/Generic ABS", + "Vzbot/Generic ABS", "Z-Bolt/Generic ABS" ], "OFYEtXuk": [ @@ -3554,54 +3243,50 @@ "OrcaFilamentLibrary/PolyLite Dual PLA", "Snapmaker/PolyLite Dual PLA" ], - "OFYHzKyS": [ - "Vzbot/Vzbot Generic PLA-CF" - ], - "OFYPdJ7t": [ - "Creality/Creality Generic ABS" - ], "OFYPdQJh": [ + "Anker/Generic PETG", "Anycubic/Generic PETG", + "Artillery/Generic PETG", + "Blocks/Generic PETG", + "CONSTRUCT3D/Generic PETG", + "Chuanying/Generic PETG", + "Co Print/Generic PETG", + "CoLiDo/Generic PETG", + "Comgrow/Generic PETG", "Creality/Generic PETG", "Custom/Generic PETG", + "DeltaMaker/Generic PETG", "Elegoo/Generic PETG", + "FLSun/Generic PETG", "Flashforge/Generic PETG", + "FlyingBear/Generic PETG", + "Ginger Additive/Generic PETG", + "InfiMech/Generic PETG", "LONGER/Generic PETG", + "OrcaArena/Generic PETG", "OrcaFilamentLibrary/Generic PETG", + "Peopoly/Generic PETG", + "Prusa/Generic PETG", "Qidi/Generic PETG", "RH3D/Generic PETG", + "Ratrig/Generic PETG", + "SecKit/Generic PETG", "Sovol/Generic PETG", + "Tiertime/Generic PETG", + "Vzbot/Generic PETG", "Z-Bolt/Generic PETG" ], "OFYd5uS3": [], "OFYezc6s": [ "FlyingBear/FlyingBear TPU" ], - "OFYl0c8v": [ - "Flashforge/Flashforge Generic HIPS" - ], - "OFYlZMmy": [ - "Chuanying/Chuanying Generic TPU" - ], - "OFYlthXI": [ - "Flashforge/Flashforge Generic PLA-CF" - ], - "OFYtS9zg": [ - "Flashforge/FusRock PAHT-CF" - ], "OFYuowge": [ "FlyingBear/Other ABS", "InfiMech/Other ABS" ], - "OFYvSO1W": [ - "Flashforge/Flashforge Generic PLA-Silk" - ], "OFZ0mR5b": [ "Anycubic/Anycubic PLA-CF" ], - "OFZ1hANN": [ - "Flashforge/FusRock Generic NexPA-CF25" - ], "OFZ2LuAi": [ "Wanhao France/YUMI PLA Bowden" ], @@ -3611,26 +3296,18 @@ "OFZ4QbfK": [ "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" ], - "OFZ4fTO8": [ - "CONSTRUCT3D/C1 Generic High Flow PETG" - ], - "OFZHgTVI": [ - "Flashforge/Flashforge Generic PETG" - ], "OFZLtWYs": [ "Qidi/QIDI ABS-GF25" ], "OFZOuWrO": [ "Qidi/QIDI PPS-CF" ], - "OFZPlCck": [ - "Chuanying/Chuanying Generic ABS" - ], "OFZivHGL": [ "Snapmaker/Snapmaker Dual PLA" ], - "OFZsChIG": [ - "Qidi/Qidi Generic TPU" + "OFZr862X": [ + "Creality/Generic PLA HF", + "Prusa/Generic PLA HF" ], "OFZtOQtl": [ "Flashforge/Flashforge PA6-CF" @@ -3644,6 +3321,9 @@ "OFaDOaNt": [ "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" ], + "OFaDsTE0": [ + "Flashforge/Polymaker S1" + ], "OFaEesXQ": [ "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" ], @@ -3665,9 +3345,6 @@ "OFaRjiIm": [ "SeeMeCNC/SeeMeCNC PETG-CF" ], - "OFaU2JxD": [ - "Dremel/Dremel Generic PLA" - ], "OFaYz8iE": [ "OrcaFilamentLibrary/Elas PLA Pro" ], @@ -3680,9 +3357,6 @@ "OFafocjw": [ "Cubicon/Cubicon ABS" ], - "OFahE7HP": [ - "Blocks/Blocks Generic PC" - ], "OFausr3F": [ "OrcaFilamentLibrary/FilAr PLA-mate Rosa" ], @@ -3695,30 +3369,21 @@ "OFbP8zEO": [ "OrcaFilamentLibrary/Eolas Prints PLA Silk" ], + "OFbPuPKY": [ + "Prusa/Generic FLEX" + ], "OFbSChKb": [ "SeeMeCNC/SeeMeCNC PLA" ], "OFbSZBOi": [ "InfiMech/InfiMech TPU Basic" ], - "OFbeeFkl": [ - "OrcaArena/OrcaArena Generic PLA Silk" - ], - "OFbenYUK": [ - "Prusa/Prusa Generic TPU" - ], "OFbh7HcA": [ "Eryone/Eryone PP-CF" ], "OFbjtPQy": [ "FLSun/FLSun T1 ASA" ], - "OFbt04e0": [ - "DeltaMaker/DeltaMaker Generic TPU" - ], - "OFc0xiCz": [ - "InfiMech/InfiMech Generic TPU" - ], "OFc3xdm9": [ "OrcaFilamentLibrary/Overture PLA", "Qidi/Overture PLA" @@ -3729,9 +3394,6 @@ "OFcBJQcC": [ "Snapmaker/Snapmaker Dual TPU High-Flow" ], - "OFcCzEkS": [ - "Prusa/Prusa Generic PVA" - ], "OFcJ7AKd": [ "Sovol/Sovol SV08 PLA" ], @@ -3741,6 +3403,9 @@ "OFcKtw8W": [ "Volumic/PA6 CF20 (Performance)" ], + "OFcVLpNA": [ + "Flashforge/FusRock PAHT-GF" + ], "OFcdqaWI": [ "Sovol/Sovol Zero PC" ], @@ -3751,9 +3416,6 @@ "OFcogyWl": [ "WonderMaker/WonderMaker PLA Metal" ], - "OFctbSkL": [ - "Blocks/Blocks Generic ASA-CF" - ], "OFctg8r1": [ "CoLiDo/CoLiDo PLA+" ], @@ -3766,10 +3428,8 @@ "Snapmaker/Fiberon PETG-ESD" ], "OFd0Fv0k": [ - "OrcaFilamentLibrary/Generic PE-CF" - ], - "OFd10YeG": [ - "Ratrig/RatRig Generic PLA" + "OrcaFilamentLibrary/Generic PE-CF", + "Tiertime/Generic PE-CF" ], "OFd2vX0G": [ "BBL/COEX PLA PRIME", @@ -3782,26 +3442,10 @@ "OFdD5Wbu": [ "Snapmaker/Snapmaker J1 PLA-CF" ], - "OFdEIwxy": [ - "Flashforge/Flashforge Generic PLA-CF10" - ], - "OFdHsxB4": [ - "TwoTrees/TwoTrees Generic 95A TPU" - ], "OFdI4zMo": [], - "OFdLdGgJ": [ - "OrcaArena/OrcaArena Generic PVA" - ], - "OFdOWhCa": [ - "Ratrig/RatRig Generic PC" - ], "OFdXVjGZ": [ "Tiertime/Tiertime PC" ], - "OFdXgp2K": [ - "Chuanying/Chuanying Generic HS PLA", - "Chuanying/Chuanying HS PLA" - ], "OFdb8YNz": [ "OrcaFilamentLibrary/FilAr PLA Verde Manzana" ], @@ -3811,9 +3455,6 @@ "OFdkWDiy": [ "Cubicon/Cubicon PLAi21" ], - "OFdlGycb": [ - "CoLiDo/CoLiDo Generic TPU" - ], "OFdrYBmI": [ "Tiertime/Tiertime ASA" ], @@ -3832,9 +3473,6 @@ "OFe7Sx5B": [ "Sovol/Sovol SV06 ACE PETG" ], - "OFe8UJXH": [ - "Creality/Creality Generic PC" - ], "OFe8tuNb": [ "Tiertime/Tiertime PA6-CF" ], @@ -3847,19 +3485,9 @@ "OFeCJqxx": [ "Qidi/QIDI ABS Rapido Metal" ], - "OFeDfaCh": [ - "CoLiDo/CoLiDo Generic PLA" - ], "OFeIyhUx": [ "Anycubic/Anycubic PC-CF" ], - "OFeJjoKF": [ - "FLSun/FLSun Generic PA" - ], - "OFeK2vkS": [ - "Chuanying/Chuanying Generic PLA-Silk", - "Chuanying/Chuanying PLA-SILK" - ], "OFeTATC7": [ "Snapmaker/Snapmaker J1 Breakaway" ], @@ -3879,13 +3507,15 @@ "WonderMaker/WonderMaker PLA Matte" ], "OFesA6rF": [ + "Anker/Generic PLA Silk", + "Creality/Generic PLA Silk", "Flashforge/Generic PLA Silk", + "OrcaArena/Generic PLA Silk", "OrcaFilamentLibrary/Generic PLA Silk", + "Prusa/Generic PLA Silk", "Qidi/Generic PLA Silk", - "Sovol/Generic PLA Silk" - ], - "OFetENFF": [ - "OrcaArena/OrcaArena Generic ABS" + "Sovol/Generic PLA Silk", + "Tiertime/Generic PLA Silk" ], "OFexaZU2": [ "OrcaFilamentLibrary/FilAr PLA Manteca" @@ -3926,18 +3556,12 @@ "OFfYHK5z": [ "Qidi/Polymaker PLA-HT" ], - "OFfZ0lTS": [ - "Qidi/Qidi Generic PETG-CF" - ], "OFfZcoKr": [ "OrcaFilamentLibrary/FilAr PLA-mate Piel" ], "OFfb10SK": [ "Artillery/Artillery PC" ], - "OFfegVpA": [ - "Flashforge/Polymaker Generic S1" - ], "OFfmHUkQ": [ "Snapmaker/Snapmaker Dual Breakaway" ], @@ -3965,12 +3589,6 @@ "OFfuih8e": [ "Creality/Creality Silk PLA" ], - "OFfxFQf9": [ - "Chuanying/Chuanying Generic PETG" - ], - "OFfznI0Q": [ - "Prusa/Prusa Generic PA-CF" - ], "OFg3cWVt": [ "Snapmaker/Snapmaker Dual PLA Metal" ], @@ -3981,10 +3599,21 @@ "OrcaFilamentLibrary/FILL3D PPCF" ], "OFg8ndtj": [ + "Anker/Generic PA", + "Anycubic/Generic PA", + "Blocks/Generic PA", "Creality/Generic PA", "Custom/Generic PA", "Elegoo/Generic PA", + "FLSun/Generic PA", + "OrcaArena/Generic PA", "OrcaFilamentLibrary/Generic PA", + "Prusa/Generic PA", + "Qidi/Generic PA", + "Ratrig/Generic PA", + "SecKit/Generic PA", + "Tiertime/Generic PA", + "Vzbot/Generic PA", "Z-Bolt/Generic PA" ], "OFgHh8ly": [ @@ -3993,18 +3622,9 @@ "OFgMWJ8T": [ "OrcaFilamentLibrary/FilAr PLA Negro Azabache" ], - "OFgSEwOZ": [ - "OrcaArena/OrcaArena Generic PETG" - ], - "OFgSPtDn": [ - "MagicMaker/MM Generic PEEK" - ], "OFgSbX7E": [ "Volumic/Volumic PC (Performance)" ], - "OFgVJhVt": [ - "Tiertime/Tiertime Generic PLA-CF" - ], "OFgVQkqW": [ "Cubicon/Cubicon ABSk" ], @@ -4012,13 +3632,30 @@ "Artillery/Artillery ABS" ], "OFgbpcy9": [ + "Anker/Generic TPU", "Anycubic/Generic TPU", + "Artillery/Generic TPU", + "Blocks/Generic TPU", + "Chuanying/Generic TPU", + "Co Print/Generic TPU", + "CoLiDo/Generic TPU", "Creality/Generic TPU", "Custom/Generic TPU", + "DeltaMaker/Generic TPU", + "FLSun/Generic TPU", "Flashforge/Generic TPU", + "FlyingBear/Generic TPU", + "InfiMech/Generic TPU", + "OrcaArena/Generic TPU", "OrcaFilamentLibrary/Generic TPU", + "Prusa/Generic TPU", + "Qidi/Generic TPU", "RH3D/Generic TPU", - "Sovol/Generic TPU" + "Ratrig/Generic TPU", + "SecKit/Generic TPU", + "Sovol/Generic TPU", + "Tiertime/Generic TPU", + "Vzbot/Generic TPU" ], "OFgcryz4": [ "Ratrig/RatRig BigNozzle ASA" @@ -4044,11 +3681,6 @@ "OFgptDSf": [ "OrcaArena/Arena PLA Matte" ], - "OFgvOmM2": [ - "Anker/Anker Generic PETG", - "Anker/Anker Generic PETG 0.2 nozzle", - "Anker/Anker Generic PETG 0.25 nozzle" - ], "OFgyPlwU": [ "Snapmaker/Snapmaker TPU High-Flow" ], @@ -4072,7 +3704,8 @@ "Snapmaker/Snapmaker PLA-CF" ], "OFhQfUQY": [ - "OrcaFilamentLibrary/Generic SBS" + "OrcaFilamentLibrary/Generic SBS", + "Tiertime/Generic SBS" ], "OFhTPf6L": [ "Creality/Generic PA6-CF", @@ -4097,9 +3730,6 @@ "Elegoo/Elegoo PLA Sparkle", "OrcaFilamentLibrary/Elegoo PLA Sparkle" ], - "OFhcrFw9": [ - "Creality/Creality Generic TPU" - ], "OFhfd722": [ "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A" ], @@ -4130,7 +3760,10 @@ "Creality/eSUN PLA-LW" ], "OFi6PfUM": [ - "Creality/Generic PLA-Silk" + "Chuanying/Chuanying PLA-SILK", + "Chuanying/Generic PLA-Silk", + "Creality/Generic PLA-Silk", + "Flashforge/Generic PLA-Silk" ], "OFi7Bf0F": [ "Flashforge/Flashforge ABS-CF" @@ -4138,24 +3771,15 @@ "OFi90KlM": [ "Volumic/Volumic NYLON Ultra (Performance)" ], - "OFiCHnso": [ - "Prusa/Prusa Generic PLA" - ], "OFiDpM1B": [ "OrcaFilamentLibrary/FilAr PLA-mate Bordo" ], "OFiEz2XI": [ "Cubicon/Cubicon PA-CF" ], - "OFiUSDih": [ - "Blocks/Blocks Generic PA" - ], "OFiWaoqD": [ "OrcaFilamentLibrary/DREMC PPA-CF" ], - "OFifxPW1": [ - "DeltaMaker/DeltaMaker Generic PLA" - ], "OFilAA3b": [ "Eryone/Eryone PLA-CF" ], @@ -4168,9 +3792,6 @@ "OFin64Qg": [ "Creality/Generic Support for PLA" ], - "OFiorRtJ": [ - "Blocks/Blocks Generic PVA" - ], "OFitS8al": [ "Snapmaker/PolyLite PLA Neon" ], @@ -4227,12 +3848,12 @@ "OFjoAe0R": [ "Qidi/Qidi PLA-CF" ], - "OFjoIVZ6": [ - "FlyingBear/FlyingBear Generic PA-CF" - ], "OFjorDcx": [ "OrcaFilamentLibrary/FDplast ABS" ], + "OFjt8dDO": [ + "Flashforge/FusRock NexPA-CF25" + ], "OFjt9en1": [ "OrcaFilamentLibrary/Generic CoPE" ], @@ -4258,14 +3879,11 @@ "OFkR8E2c": [ "Prusa/Prusament PETG" ], - "OFkUaDnU": [ - "Tiertime/Tiertime Generic PE-CF" - ], "OFkWaWRo": [ "Sovol/Sovol SV06 Plus ACE TPU" ], - "OFkYkQGO": [ - "Tiertime/Tiertime Generic PP-GF" + "OFkf1HHw": [ + "Flashforge/Generic PLA-SILK" ], "OFkhhUS0": [ "Elegoo/Elegoo Rapid PLA+", @@ -4296,12 +3914,6 @@ "OFkzr35f": [ "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" ], - "OFl2SXmv": [ - "Prusa/Prusa Generic FLEX" - ], - "OFl4ItvQ": [ - "Prusa/Prusa Generic PLA HF" - ], "OFl7nOAf": [ "Sovol/Sovol SV06 Plus ACE PETG" ], @@ -4311,15 +3923,9 @@ "OFlIsW6f": [ "Snapmaker/Snapmaker Dual PLA Matte" ], - "OFlLmUeV": [ - "Ginger Additive/Ginger Generic PLA" - ], "OFlN6DL1": [ "Qidi/QIDI PA-Ultra" ], - "OFlNWVr5": [ - "Flashforge/Flashforge Generic PETG-CF10" - ], "OFlP3KWq": [ "Elegoo/Elegoo PETG HF", "OrcaFilamentLibrary/Elegoo PETG HF" @@ -4348,9 +3954,6 @@ "OrcaFilamentLibrary/Polymaker HT-PLA-GF", "Snapmaker/Polymaker HT-PLA-GF" ], - "OFlx52rn": [ - "Ratrig/RatRig Generic PLA-CF" - ], "OFm06H6V": [ "Elegoo/Elegoo PLA Basic", "OrcaFilamentLibrary/Elegoo PLA Basic" @@ -4380,12 +3983,10 @@ "Flashforge/Flashforge HS PLA Burnt Ti" ], "OFmY0l6t": [ + "Creality/Generic PLA Matte", "Elegoo/Generic PLA Matte", "OrcaFilamentLibrary/Generic PLA Matte" ], - "OFma52eS": [ - "Blocks/Blocks Generic ABS" - ], "OFma5TXH": [ "Qidi/QIDI ABS Odorless" ], @@ -4402,29 +4003,23 @@ "Elegoo/Elegoo TPU 95A", "OrcaFilamentLibrary/Elegoo TPU 95A" ], - "OFmhWhEf": [ - "Creality/Creality HF Generic PLA" - ], "OFmjN2bc": [ "Anycubic/Anycubic PLA" ], "OFmn9NZL": [ "OrcaFilamentLibrary/FusRock ABS-GF" ], - "OFmnJNqY": [ - "OrcaArena/OrcaArena Generic PA" - ], "OFmpMwxS": [ + "Creality/Generic PLA High Speed", "Flashforge/Generic PLA High Speed", - "OrcaFilamentLibrary/Generic PLA High Speed" + "OrcaFilamentLibrary/Generic PLA High Speed", + "Qidi/Generic PLA High Speed", + "Tiertime/Generic PLA High Speed" ], "OFmveLWz": [ "Elegoo/Elegoo PETG-GF", "OrcaFilamentLibrary/Elegoo PETG-GF" ], - "OFmzftED": [ - "OrcaArena/OrcaArena Generic ASA" - ], "OFn1QaY3": [ "Elegoo/Elegoo PLA Translucent2", "OrcaFilamentLibrary/Elegoo PLA Translucent2" @@ -4447,6 +4042,9 @@ "OFnSeLHk": [ "CoLiDo/CoLiDo PLA Silk" ], + "OFnT7Qpb": [ + "Prusa/Generic TPU HF" + ], "OFnXrkhA": [ "InfiMech/InfiMech PA-CF" ], @@ -4459,26 +4057,15 @@ "OFncpm7O": [ "WonderMaker/WonderMaker PLA Silk" ], - "OFndmfJ1": [ - "Anker/Anker Generic PLA", - "Anker/Anker Generic PLA 0.2 nozzle", - "Anker/Anker Generic PLA 0.25 nozzle" - ], "OFneOFWe": [ "CoLiDo/CoLiDo ABS" ], "OFnejEt4": [ "OrcaFilamentLibrary/FilAr PETG Cian" ], - "OFnfBvn5": [ - "Artillery/Artillery Generic PLA" - ], "OFngcE81": [ "LH/LHS TPU Foamy 78A" ], - "OFnh79eM": [ - "SecKit/SecKit Generic ABS" - ], "OFniMuTN": [ "OrcaFilamentLibrary/Bambu PA6-CF" ], @@ -4491,7 +4078,8 @@ "OFo2UF2C": [ "Creality/Generic BVOH", "Flashforge/Generic BVOH", - "OrcaFilamentLibrary/Generic BVOH" + "OrcaFilamentLibrary/Generic BVOH", + "Tiertime/Generic BVOH" ], "OFo6n2pB": [ "Anycubic/Anycubic PETG" @@ -4499,25 +4087,18 @@ "OFoBTKmn": [ "Cubicon/Cubicon PETG" ], - "OFoDgVnY": [ - "FLSun/FLSun S1 PLA Generic" - ], - "OFoJcr46": [ - "Prusa/Prusa Generic ASA" - ], "OFoSknDB": [ "OrcaFilamentLibrary/FILL3D PLA Turbo" ], - "OFoT8F7Y": [ - "Prusa/Prusa Generic PVA HF" - ], - "OFoVZg32": [ - "SecKit/SecKit Generic TPU" - ], "OFoYSJKi": [ + "Anker/Generic PETG-CF", "Creality/Generic PETG-CF", "Elegoo/Generic PETG-CF", - "OrcaFilamentLibrary/Generic PETG-CF" + "Flashforge/Generic PETG-CF", + "OrcaArena/Generic PETG-CF", + "OrcaFilamentLibrary/Generic PETG-CF", + "Qidi/Generic PETG-CF", + "Tiertime/Generic PETG-CF" ], "OFobDOW5": [ "Elegoo/Elegoo ASA", @@ -4527,9 +4108,6 @@ "BBL/AliZ PETG", "OrcaFilamentLibrary/AliZ PETG" ], - "OFodPDxO": [ - "Tiertime/Tiertime Generic PLA High Speed" - ], "OFogbnCb": [ "Flashforge/FlashForge PPS-CF" ], @@ -4551,15 +4129,9 @@ "OFp57RRC": [ "Qidi/QIDI PPS-GF" ], - "OFp8gtPH": [ - "Creality/Creality Generic PLA Silk" - ], "OFp9wdmf": [ "Eryone/Eryone PA-CF" ], - "OFpAaY6w": [ - "Creality/Creality Generic ASA" - ], "OFpBV2Ma": [ "Qidi/Tinmorry PETG-ECO" ], @@ -4576,16 +4148,10 @@ "OFpPJSHE": [ "Peopoly/Peopoly Lancer PETG-C" ], - "OFpSYJLI": [ - "Creality/Creality Generic PLA Matte" - ], "OFpW4gdi": [ "Flashforge/SUNLU PLA Matte", "OrcaFilamentLibrary/SUNLU PLA Matte" ], - "OFptvi3F": [ - "Tiertime/Tiertime Generic PPA-GF" - ], "OFpu74Qe": [ "Snapmaker/Snapmaker PLA Eco" ], @@ -4595,14 +4161,12 @@ "OFq0TY7C": [ "Flashforge/Flashforge ASA-CF" ], - "OFq5QANf": [ - "Prusa/Prusa Generic PC HF" - ], "OFq8gfS4": [ "OrcaFilamentLibrary/FilAr PETG Negro Azabache" ], "OFq9svOz": [ - "Creality/Generic PPS" + "Creality/Generic PPS", + "Tiertime/Generic PPS" ], "OFqGRZyH": [ "OrcaFilamentLibrary/Numakers PLA+" @@ -4611,15 +4175,6 @@ "Creality/eSUN PLA+", "OrcaFilamentLibrary/eSUN PLA+" ], - "OFqKmLJe": [ - "Creality/Creality Generic PETG-CF" - ], - "OFqOk9Ww": [ - "Peopoly/Peopoly Generic ABS" - ], - "OFqS8fzK": [ - "SecKit/SecKit Generic PETG" - ], "OFqcL5UF": [ "Qidi/QIDI Support For PET/PA" ], @@ -4645,41 +4200,23 @@ "OFrM4hdm": [ "Creality/CR-PLA Carbon" ], - "OFrO2zyn": [ - "Creality/Creality Generic PLA High Speed" - ], "OFrOh600": [ "Creality/Panchroma PLA Matte", "OrcaFilamentLibrary/Panchroma PLA Matte", "Snapmaker/Panchroma PLA Matte" ], - "OFrQqCwL": [ - "InfiMech/InfiMech Generic PLA" - ], "OFrdZ0cK": [ "Creality/eSUN PETG+HS" ], - "OFrgGex8": [ - "Blocks/Blocks Generic PETG" - ], - "OFrh4bBH": [ - "SecKit/SecKit Generic ASA" - ], "OFrjacXf": [ "Flashforge/Flashforge PET-CF" ], - "OFrnJJEa": [ - "Tiertime/Tiertime Generic EVA" - ], "OFrnkURQ": [ "Flashforge/Flashforge PLA Metal" ], "OFrr67nG": [ "OrcaArena/Arena PC" ], - "OFrrMLDw": [ - "Flashforge/Flashforge Generic PLA-SILK" - ], "OFryjl35": [ "Elegoo/Elegoo ASA-CF", "OrcaFilamentLibrary/Elegoo ASA-CF" @@ -4687,34 +4224,25 @@ "OFs1sNLz": [ "Chuanying/Chuanying ABS" ], - "OFs2ReMr": [ - "InfiMech/InfiMech Generic PETG" - ], "OFsB2lxm": [ "Elegoo/Elegoo PLA Matte", "OrcaFilamentLibrary/Elegoo PLA Matte" ], - "OFsCbVbN": [ - "Anker/Anker Generic PVA" - ], "OFsD974q": [ "Volumic/Volumic PETG Ultra (Performance)" ], "OFsDXRpS": [ "OrcaFilamentLibrary/FilAr PLA Piel" ], - "OFsF96Gt": [ - "FLSun/FLSun Generic PLA-CF" - ], "OFsFo7ms": [ "Volumic/Volumic PP Ultra" ], "OFsFon5l": [ + "Chuanying/Generic HIPS", "Creality/Generic HIPS", - "OrcaFilamentLibrary/Generic HIPS" - ], - "OFsGqI4y": [ - "Ginger Additive/Ginger Generic PETG" + "Flashforge/Generic HIPS", + "OrcaFilamentLibrary/Generic HIPS", + "Tiertime/Generic HIPS" ], "OFsHSVZc": [ "OrcaFilamentLibrary/Bambu Support W" @@ -4730,24 +4258,16 @@ "OrcaFilamentLibrary/Panchroma PLA", "Snapmaker/Panchroma PLA" ], - "OFsXOMoX": [ - "Qidi/Qidi Generic PLA+" - ], "OFsXQXbs": [ "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" ], - "OFsoQ12i": [ - "Comgrow/Comgrow Generic ABS" + "OFsijjtH": [ + "OrcaFilamentLibrary/Generic PP-GF", + "Tiertime/Generic PP-GF" ], "OFsoykbm": [ "OrcaFilamentLibrary/DREMC PA6-CF" ], - "OFsxRSwr": [ - "Ratrig/RatRig Generic PVA" - ], - "OFsxlLdo": [ - "Qidi/Qidi Generic ASA" - ], "OFt0JbR7": [ "Snapmaker/Snapmaker J1 PLA Metal" ], @@ -4773,15 +4293,9 @@ "OrcaArena/Arena PAHT-CF" ], "OFtOoWIj": [], - "OFtP1rqJ": [ - "FLSun/FLSun Generic PVA" - ], "OFtRn8X8": [ "OrcaFilamentLibrary/FDplast SBS" ], - "OFtTHNTj": [ - "Flashforge/Flashforge Generic PLA" - ], "OFtTYl9Q": [], "OFtefokm": [ "OrcaFilamentLibrary/FilAr PLA-mate Blanco" @@ -4796,9 +4310,6 @@ "OFtr8eZw": [ "OrcaFilamentLibrary/FDplast PLA" ], - "OFtsVp4v": [ - "SecKit/SecKit Generic PA-CF" - ], "OFtudokz": [ "OrcaFilamentLibrary/Eolas Prints PLA Premium" ], @@ -4816,10 +4327,9 @@ ], "OFu1evlr": [ "Creality/Generic PCTG", - "OrcaFilamentLibrary/Generic PCTG" - ], - "OFu79SUH": [ - "Qidi/Qidi Generic PLA" + "OrcaFilamentLibrary/Generic PCTG", + "Ratrig/Generic PCTG", + "Tiertime/Generic PCTG" ], "OFuFqYyG": [ "Flashforge/Flashforge PAHT-CF" @@ -4833,9 +4343,6 @@ "OFuO0cAP": [ "OrcaArena/Arena PETG-CF" ], - "OFuSwKgm": [ - "Tiertime/Tiertime Generic PLA" - ], "OFuUJyRx": [ "FLSun/FLSun T1 PLA Silk" ], @@ -4865,9 +4372,6 @@ "OFulOdT2": [ "Flashforge/Generic TPU 85A" ], - "OFupq0tY": [ - "Blocks/Blocks Generic PLA-CF" - ], "OFurdQxc": [ "OrcaFilamentLibrary/FilAr PETG Magenta" ], @@ -4877,15 +4381,9 @@ "OFuxH0Uz": [ "Volumic/Volumic FLEX93 Ultra" ], - "OFv4VZCd": [ - "Qidi/Qidi Generic ABS" - ], "OFvDbkFq": [ "Prusa/Prusament PC Blend" ], - "OFvGc67v": [ - "Prusa/Prusa Generic ABS" - ], "OFvKUnLh": [ "OrcaFilamentLibrary/Bambu TPU 95A HF" ], @@ -4895,9 +4393,6 @@ "OFvPPMxL": [ "OrcaFilamentLibrary/FilAr PLA Verde FilAr" ], - "OFvPomQf": [ - "Tiertime/Tiertime Generic PPS" - ], "OFvTVZc3": [ "BBL/COEX PETG", "OrcaFilamentLibrary/COEX PETG" @@ -4921,6 +4416,12 @@ "OFvxIS9g": [ "Snapmaker/Fiberon PA12-CF10" ], + "OFvxghTE": [ + "Chuanying/Chuanying HS PLA", + "Chuanying/Generic HS PLA", + "Flashforge/Generic HS PLA", + "TwoTrees/Generic HS PLA" + ], "OFvyB0Bz": [ "Snapmaker/PolyLite PLA Galaxy" ], @@ -4931,9 +4432,6 @@ "OFwLBAGf": [ "Qidi/HATCHBOX ABS" ], - "OFwMFLAm": [ - "Artillery/Artillery Generic ABS" - ], "OFwPrlCM": [ "OrcaFilamentLibrary/Bambu PETG Translucent" ], @@ -4953,22 +4451,16 @@ "OFwhLMs4": [ "Snapmaker/Snapmaker PLA SnapSpeed" ], - "OFwpkvqf": [ - "OrcaArena/OrcaArena Generic PETG-CF" - ], "OFwu7IAG": [ "BBL/COEX PCTG PRIME", "OrcaFilamentLibrary/COEX PCTG PRIME" ], - "OFwxpmHM": [ - "Flashforge/Polymaker Generic CoPA" + "OFwwAQnA": [ + "Prusa/Generic PC HF" ], "OFwyt1xt": [ "Eryone/Eryone ASA-CF" ], - "OFx0ZzFV": [ - "OrcaArena/OrcaArena Generic PLA-CF" - ], "OFx8Lmsd": [ "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" ], @@ -4988,9 +4480,6 @@ "Elegoo/Elegoo ABS", "OrcaFilamentLibrary/Elegoo ABS" ], - "OFxTMg1d": [ - "FlyingBear/FlyingBear Generic PC" - ], "OFxUwUeW": [ "Flashforge/SUNLU PLA Marble", "OrcaFilamentLibrary/SUNLU PLA Marble" @@ -5001,12 +4490,6 @@ "OFxe4rXr": [ "Snapmaker/PolyTerra PLA Marble" ], - "OFxg7n2G": [ - "Ratrig/RatRig Generic PETG" - ], - "OFxvKuYW": [ - "Tiertime/Tiertime Generic PHA" - ], "OFy02QHU": [ "Snapmaker/PolyLite PLA Translucent" ], @@ -5019,27 +4502,18 @@ "OFy48TOp": [ "Flashforge/Generic TPU-95A" ], - "OFy4ajVZ": [ - "Qidi/Qidi Generic PLA Silk" - ], "OFy8tYJE": [ "Cubicon/Cubicon ABS-A100" ], "OFyCToOV": [ "Sovol/Sovol SV08 TPU" ], - "OFyFRojy": [ - "Ratrig/RatRig Generic ABS" - ], "OFyFyLIp": [ "SeeMeCNC/SeeMeCNC TPU" ], "OFyHgT60": [ "OrcaArena/Arena PLA Sparkle" ], - "OFyK5Lt9": [ - "Artillery/Artillery Generic PETG" - ], "OFyLWVF3": [ "Creality/Generic PETG-GF" ], @@ -5059,9 +4533,6 @@ "OFybzvQN": [ "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" ], - "OFyeSq8A": [ - "Prusa/Prusa Generic ABS HF" - ], "OFyhjiNs": [ "Snapmaker/Snapmaker PVA" ], @@ -5087,11 +4558,8 @@ "BBL/AliZ PLA", "OrcaFilamentLibrary/AliZ PLA" ], - "OFyySVby": [ - "SecKit/SecKit Generic PVA" - ], - "OFz3q5Xz": [ - "CONSTRUCT3D/C1 Generic PETG" + "OFz5oHgf": [ + "MagicMaker/Generic PEEK" ], "OFzAWsca": [ "Qidi/Qidi TPU 95A-HF" @@ -5099,12 +4567,12 @@ "OFzB4uOs": [ "Sovol/Sovol Zero PLA Basic HS Nozzle" ], + "OFzRtFM9": [ + "Prusa/Generic ASA HF" + ], "OFzS7zt4": [ "Anycubic/Anycubic PA" ], - "OFzXURfo": [ - "FlyingBear/FlyingBear Generic PETG" - ], "OFzY7N3Z": [ "Artillery/Artillery PLA" ], @@ -5112,6 +4580,9 @@ "OFztQ7rO": [ "LH/LHS ABS" ], + "OFzwA5Z9": [ + "Flashforge/FusRock PET-GF" + ], "OFzyIxba": [ "OrcaFilamentLibrary/Bambu PVA" ], @@ -5144,16 +4615,6 @@ "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic ASA @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic Generic ABS", - "Anycubic/Anycubic Generic ASA", - "Anycubic/Anycubic Generic PA", - "Anycubic/Anycubic Generic PA-CF", - "Anycubic/Anycubic Generic PC", - "Anycubic/Anycubic Generic PETG", - "Anycubic/Anycubic Generic PLA", - "Anycubic/Anycubic Generic PLA-CF", - "Anycubic/Anycubic Generic PVA", - "Anycubic/Anycubic Generic TPU", "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", @@ -5265,10 +4726,20 @@ "Anycubic/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle", "Anycubic/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle", "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", + "Anycubic/Generic ABS @Anycubic", "Anycubic/Generic ABS @Anycubic Kobra 3 0.4 nozzle", + "Anycubic/Generic ASA @Anycubic", + "Anycubic/Generic PA @Anycubic", + "Anycubic/Generic PA-CF @Anycubic", + "Anycubic/Generic PC @Anycubic", + "Anycubic/Generic PETG @Anycubic", "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", + "Anycubic/Generic PLA @Anycubic", + "Anycubic/Generic PLA-CF @Anycubic", + "Anycubic/Generic PVA @Anycubic", + "Anycubic/Generic TPU @Anycubic", "Anycubic/Generic TPU @Anycubic Kobra 3 0.4 nozzle", "Anycubic/Panchroma PLA @Anycubic Kobra S1", "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", @@ -5282,12 +4753,6 @@ "Artillery/Artillery ASA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery ASA @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery ASA @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery Generic ABS", - "Artillery/Artillery Generic ASA", - "Artillery/Artillery Generic PETG", - "Artillery/Artillery Generic PLA", - "Artillery/Artillery Generic PLA-CF", - "Artillery/Artillery Generic TPU", "Artillery/Artillery PA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery PC @Artillery M1 Pro 0.4 nozzle", @@ -5334,6 +4799,12 @@ "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery TPU @Artillery M1 Pro 0.6 nozzle", "Artillery/Artillery TPU @Artillery M1 Pro 0.8 nozzle", + "Artillery/Generic ABS @Artillery", + "Artillery/Generic ASA @Artillery", + "Artillery/Generic PETG @Artillery", + "Artillery/Generic PLA @Artillery", + "Artillery/Generic PLA-CF @Artillery", + "Artillery/Generic TPU @Artillery", "BBL/Generic SBS", "BBL/addnorth ABS rABS", "BBL/addnorth PA Adura", @@ -5362,54 +4833,54 @@ "BBL/addnorth TPU EasyFlex", "BBL/addnorth TPU Pro Matte 85A", "BBL/addnorth TPU Pro Matte 95A", - "Blocks/Blocks Generic ABS", - "Blocks/Blocks Generic ASA", - "Blocks/Blocks Generic ASA-CF", - "Blocks/Blocks Generic PA", - "Blocks/Blocks Generic PA-CF", - "Blocks/Blocks Generic PC", - "Blocks/Blocks Generic PETG", - "Blocks/Blocks Generic PLA", - "Blocks/Blocks Generic PLA-CF", - "Blocks/Blocks Generic PVA", - "Blocks/Blocks Generic TPU", - "CONSTRUCT3D/C1 Generic High Flow PETG", - "CONSTRUCT3D/C1 Generic PETG", - "CONSTRUCT3D/C1 Generic PLA", + "Blocks/Generic ABS @Blocks", + "Blocks/Generic ASA @Blocks", + "Blocks/Generic ASA-CF @Blocks", + "Blocks/Generic PA @Blocks", + "Blocks/Generic PA-CF @Blocks", + "Blocks/Generic PC @Blocks", + "Blocks/Generic PETG @Blocks", + "Blocks/Generic PLA @Blocks", + "Blocks/Generic PLA-CF @Blocks", + "Blocks/Generic PVA @Blocks", + "Blocks/Generic TPU @Blocks", + "CONSTRUCT3D/Generic High Flow PETG @C1", + "CONSTRUCT3D/Generic PETG @C1", + "CONSTRUCT3D/Generic PLA @C1", "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", - "Chuanying/Chuanying Generic ABS", - "Chuanying/Chuanying Generic ASA", - "Chuanying/Chuanying Generic HIPS", - "Chuanying/Chuanying Generic HS PLA", - "Chuanying/Chuanying Generic PETG", - "Chuanying/Chuanying Generic PETG-CF10", - "Chuanying/Chuanying Generic PLA", - "Chuanying/Chuanying Generic PLA-CF10", - "Chuanying/Chuanying Generic PLA-Silk", - "Chuanying/Chuanying Generic PVA", - "Chuanying/Chuanying Generic TPU", "Chuanying/Chuanying PETG @Chuanying X1 0.25 Nozzle", - "Co Print/CoPrint Generic ABS", - "Co Print/CoPrint Generic PETG", - "Co Print/CoPrint Generic PLA", - "Co Print/CoPrint Generic TPU", + "Chuanying/Generic ABS @Chuanying", + "Chuanying/Generic ASA @Chuanying", + "Chuanying/Generic HIPS @Chuanying", + "Chuanying/Generic HS PLA @Chuanying", + "Chuanying/Generic PETG @Chuanying", + "Chuanying/Generic PETG-CF10 @Chuanying", + "Chuanying/Generic PLA @Chuanying", + "Chuanying/Generic PLA-CF10 @Chuanying", + "Chuanying/Generic PLA-Silk @Chuanying", + "Chuanying/Generic PVA @Chuanying", + "Chuanying/Generic TPU @Chuanying", + "Co Print/Generic ABS @CoPrint", + "Co Print/Generic PETG @CoPrint", + "Co Print/Generic PLA @CoPrint", + "Co Print/Generic TPU @CoPrint", "CoLiDo/CoLiDo ABS @CoLiDo SR1", - "CoLiDo/CoLiDo Generic ABS @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic ABS @CoLiDo X16", - "CoLiDo/CoLiDo Generic PETG @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic PETG @CoLiDo X16", - "CoLiDo/CoLiDo Generic PLA @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic PLA @CoLiDo X16", - "CoLiDo/CoLiDo Generic TPU @CoLiDo DIY 4.0", - "CoLiDo/CoLiDo Generic TPU @CoLiDo X16", "CoLiDo/CoLiDo PETG @CoLiDo SR1", "CoLiDo/CoLiDo PLA @CoLiDo SR1", "CoLiDo/CoLiDo PLA Silk @CoLiDo SR1", "CoLiDo/CoLiDo PLA+ @CoLiDo DIY 4.0 V2", - "Comgrow/Comgrow Generic ABS", - "Comgrow/Comgrow Generic PETG", - "Comgrow/Comgrow Generic PLA", + "CoLiDo/Generic ABS @CoLiDo DIY 4.0", + "CoLiDo/Generic ABS @CoLiDo X16", + "CoLiDo/Generic PETG @CoLiDo DIY 4.0", + "CoLiDo/Generic PETG @CoLiDo X16", + "CoLiDo/Generic PLA @CoLiDo DIY 4.0", + "CoLiDo/Generic PLA @CoLiDo X16", + "CoLiDo/Generic TPU @CoLiDo DIY 4.0", + "CoLiDo/Generic TPU @CoLiDo X16", "Comgrow/Comgrow T300 PLA", + "Comgrow/Generic ABS @Comgrow", + "Comgrow/Generic PETG @Comgrow", + "Comgrow/Generic PLA @Comgrow", "Creality/CR-ABS @Ender-3 V4-all", "Creality/CR-ABS @Hi-all", "Creality/CR-ABS @K1 Max_CFS-C-all", @@ -5501,36 +4972,6 @@ "Creality/CR-Wood @K1C_CFS-C-all", "Creality/CR-Wood @K1_CFS-C-all", "Creality/CR-Wood @K2 Plus-all", - "Creality/Creality Generic ABS", - "Creality/Creality Generic ABS @Ender-5Max-all", - "Creality/Creality Generic ASA", - "Creality/Creality Generic ASA @Ender-5Max-all", - "Creality/Creality Generic ASA-CF @Hi-all", - "Creality/Creality Generic PA @Ender-5Max-all", - "Creality/Creality Generic PA-CF", - "Creality/Creality Generic PETG", - "Creality/Creality Generic PETG @Ender-5Max-all", - "Creality/Creality Generic PETG-CF @Hi-all", - "Creality/Creality Generic PLA", - "Creality/Creality Generic PLA @Ender-5Max-all", - "Creality/Creality Generic PLA High Speed @Ender-3V3-all", - "Creality/Creality Generic PLA High Speed @Hi-all", - "Creality/Creality Generic PLA High Speed @K1-all", - "Creality/Creality Generic PLA High Speed @K2-all", - "Creality/Creality Generic PLA Matte @Ender-3V3-all", - "Creality/Creality Generic PLA Matte @Hi-all", - "Creality/Creality Generic PLA Matte @K1-all", - "Creality/Creality Generic PLA Matte @K2-all", - "Creality/Creality Generic PLA Silk @Ender-3V3-all", - "Creality/Creality Generic PLA Silk @Hi-all", - "Creality/Creality Generic PLA Silk @K1-all", - "Creality/Creality Generic PLA Silk @K2-all", - "Creality/Creality Generic PLA Wood @Hi-all", - "Creality/Creality Generic PLA-CF", - "Creality/Creality Generic TPU", - "Creality/Creality Generic TPU @Ender-5Max-all", - "Creality/Creality HF Generic PLA", - "Creality/Creality HF Generic Speed PLA", "Creality/Creality Hyper ABS @Ender-5Max-all", "Creality/Creality Hyper PLA @Ender-5Max-all", "Creality/Creality Hyper PLA-CF @Ender-5Max-all", @@ -5558,6 +4999,8 @@ "Creality/Ender-PLA @K2 Pro-all", "Creality/Ender-PLA @K2-all", "Creality/Ender-PLA @SPARKX i7-all", + "Creality/Generic ABS @Creality", + "Creality/Generic ABS @Creality Ender-5Max-all", "Creality/Generic ABS @Ender-3 V4-all", "Creality/Generic ABS @Hi-all", "Creality/Generic ABS @K1 Max_CFS-C-all", @@ -5570,6 +5013,8 @@ "Creality/Generic ABS @K2 Pro-all", "Creality/Generic ABS @K2 SE-all", "Creality/Generic ABS @K2-all", + "Creality/Generic ASA @Creality", + "Creality/Generic ASA @Creality Ender-5Max-all", "Creality/Generic ASA @K1 Max_CFS-C-all", "Creality/Generic ASA @K1 SE-all", "Creality/Generic ASA @K1 SE_CFS-C-all", @@ -5580,6 +5025,7 @@ "Creality/Generic ASA @K2 Pro-all", "Creality/Generic ASA @K2 SE-all", "Creality/Generic ASA @K2-all", + "Creality/Generic ASA-CF @Creality Hi-all", "Creality/Generic ASA-CF @K2 Plus-all", "Creality/Generic BVOH @Hi-all", "Creality/Generic BVOH @K1 Max_CFS-C-all", @@ -5594,6 +5040,7 @@ "Creality/Generic HIPS @K1C_CFS-C-all", "Creality/Generic HIPS @K1_CFS-C-all", "Creality/Generic HIPS @K2 Plus-all", + "Creality/Generic PA @Creality Ender-5Max-all", "Creality/Generic PA @K1 Max_CFS-C-all", "Creality/Generic PA @K1C-all", "Creality/Generic PA @K1C_CFS-C-all", @@ -5601,6 +5048,7 @@ "Creality/Generic PA @K2 Plus-all", "Creality/Generic PA @K2 Pro-all", "Creality/Generic PA @K2-all", + "Creality/Generic PA-CF @Creality", "Creality/Generic PA-CF @K1 Max_CFS-C-all", "Creality/Generic PA-CF @K1C-all", "Creality/Generic PA-CF @K1C_CFS-C-all", @@ -5643,6 +5091,8 @@ "Creality/Generic PET-CF @K1_CFS-C-all", "Creality/Generic PET-CF @K2 Plus-all", "Creality/Generic PET-CF @K2 Pro-all", + "Creality/Generic PETG @Creality", + "Creality/Generic PETG @Creality Ender-5Max-all", "Creality/Generic PETG @Ender-3 V4-all", "Creality/Generic PETG @Hi-all", "Creality/Generic PETG @K1 Max_CFS-C-all", @@ -5656,6 +5106,7 @@ "Creality/Generic PETG @K2 SE-all", "Creality/Generic PETG @K2-all", "Creality/Generic PETG @SPARKX i7-all", + "Creality/Generic PETG-CF @Creality Hi-all", "Creality/Generic PETG-CF @K1 Max_CFS-C-all", "Creality/Generic PETG-CF @K1C-all", "Creality/Generic PETG-CF @K1C_CFS-C-all", @@ -5667,6 +5118,8 @@ "Creality/Generic PETG-GF @K2 Plus-all", "Creality/Generic PETG-GF @K2 Pro-all", "Creality/Generic PETG-GF @K2-all", + "Creality/Generic PLA @Creality", + "Creality/Generic PLA @Creality Ender-5Max-all", "Creality/Generic PLA @Ender-3 V4-all", "Creality/Generic PLA @Hi-all", "Creality/Generic PLA @K1 Max_CFS-C-all", @@ -5680,6 +5133,21 @@ "Creality/Generic PLA @K2 SE-all", "Creality/Generic PLA @K2-all", "Creality/Generic PLA @SPARKX i7-all", + "Creality/Generic PLA HF @Creality", + "Creality/Generic PLA High Speed @Creality Ender-3V3-all", + "Creality/Generic PLA High Speed @Creality Hi-all", + "Creality/Generic PLA High Speed @Creality K1-all", + "Creality/Generic PLA High Speed @Creality K2-all", + "Creality/Generic PLA Matte @Creality Ender-3V3-all", + "Creality/Generic PLA Matte @Creality Hi-all", + "Creality/Generic PLA Matte @Creality K1-all", + "Creality/Generic PLA Matte @Creality K2-all", + "Creality/Generic PLA Silk @Creality Ender-3V3-all", + "Creality/Generic PLA Silk @Creality Hi-all", + "Creality/Generic PLA Silk @Creality K1-all", + "Creality/Generic PLA Silk @Creality K2-all", + "Creality/Generic PLA Wood @Creality Hi-all", + "Creality/Generic PLA-CF @Creality", "Creality/Generic PLA-CF @Ender-3 V4-all", "Creality/Generic PLA-CF @K1 Max_CFS-C-all", "Creality/Generic PLA-CF @K1 SE-all", @@ -5731,10 +5199,13 @@ "Creality/Generic PVA @K2 Plus-all", "Creality/Generic PVA @K2 Pro-all", "Creality/Generic PVA @K2-all", + "Creality/Generic Speed PLA @Creality HF", "Creality/Generic Support for PA @K2 Plus-all", "Creality/Generic Support for PLA @K2 Plus-all", "Creality/Generic TPU 64D @K2 Plus-all", "Creality/Generic TPU 64D @SPARKX i7-all", + "Creality/Generic TPU @Creality", + "Creality/Generic TPU @Creality Ender-5Max-all", "Creality/Generic TPU @Ender-3 V4-all", "Creality/Generic TPU @K1 Max_CFS-C-all", "Creality/Generic TPU @K1 SE-all", @@ -5958,13 +5429,13 @@ "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", "Cubicon/Cubicon PLAi21 @base", "DeltaMaker/DeltaMaker Brand PLA", - "DeltaMaker/DeltaMaker Generic PETG", - "DeltaMaker/DeltaMaker Generic PLA", - "DeltaMaker/DeltaMaker Generic TPU", - "Dremel/Dremel Generic PLA", - "Dremel/Dremel Generic PLA @3D20 all", - "Dremel/Dremel Generic PLA @3D40 all", - "Dremel/Dremel Generic PLA @3D45 all", + "DeltaMaker/Generic PETG @DeltaMaker", + "DeltaMaker/Generic PLA @DeltaMaker", + "DeltaMaker/Generic TPU @DeltaMaker", + "Dremel/Generic PLA @Dremel", + "Dremel/Generic PLA @Dremel 3D20 all", + "Dremel/Generic PLA @Dremel 3D40 all", + "Dremel/Generic PLA @Dremel 3D45 all", "Elegoo/Generic ABS-CF @Elegoo Centauri", "Elegoo/Generic ASA-CF @Elegoo Centauri", "Elegoo/Generic PA6-CF @Elegoo", @@ -5988,30 +5459,30 @@ "Eryone/Eryone PP-CF", "Eryone/Eryone Silk PLA", "Eryone/Eryone TPU", - "FLSun/FLSun Generic ABS", - "FLSun/FLSun Generic ASA", - "FLSun/FLSun Generic PA", - "FLSun/FLSun Generic PA-CF", - "FLSun/FLSun Generic PC", - "FLSun/FLSun Generic PETG", - "FLSun/FLSun Generic PLA", - "FLSun/FLSun Generic PLA-CF", - "FLSun/FLSun Generic PVA", - "FLSun/FLSun Generic TPU", "FLSun/FLSun S1 ABS", "FLSun/FLSun S1 ASA", "FLSun/FLSun S1 PETG", - "FLSun/FLSun S1 PLA Generic", "FLSun/FLSun S1 PLA High Speed", "FLSun/FLSun S1 PLA Silk", "FLSun/FLSun S1 TPU", "FLSun/FLSun T1 ABS", "FLSun/FLSun T1 ASA", "FLSun/FLSun T1 PETG", - "FLSun/FLSun T1 PLA Generic", "FLSun/FLSun T1 PLA High Speed", "FLSun/FLSun T1 PLA Silk", "FLSun/FLSun T1 TPU", + "FLSun/Generic ABS @FLSun", + "FLSun/Generic ASA @FLSun", + "FLSun/Generic PA @FLSun", + "FLSun/Generic PA-CF @FLSun", + "FLSun/Generic PC @FLSun", + "FLSun/Generic PETG @FLSun", + "FLSun/Generic PLA @FLSun", + "FLSun/Generic PLA @FLSun S1", + "FLSun/Generic PLA @FLSun T1", + "FLSun/Generic PLA-CF @FLSun", + "FLSun/Generic PVA @FLSun", + "FLSun/Generic TPU @FLSun", "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", "Flashforge/FlashForge PC @FF G4 0.6 nozzle", "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", @@ -6080,37 +5551,6 @@ "Flashforge/Flashforge ASA-CF @FF G4P", "Flashforge/Flashforge ASA-GF @FF C5", "Flashforge/Flashforge ASA-GF @FF C5P", - "Flashforge/Flashforge Generic ABS", - "Flashforge/Flashforge Generic ABS @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge Generic ABS @G3U", - "Flashforge/Flashforge Generic ABS @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic ASA", - "Flashforge/Flashforge Generic ASA @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge Generic ASA @G3U", - "Flashforge/Flashforge Generic ASA @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic HIPS", - "Flashforge/Flashforge Generic HIPS @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic HS PLA", - "Flashforge/Flashforge Generic HS PLA @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge Generic PETG", - "Flashforge/Flashforge Generic PETG @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge Generic PETG @G3U", - "Flashforge/Flashforge Generic PETG @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic PETG @G3U 0.8 Nozzle", - "Flashforge/Flashforge Generic PETG-CF @G3U", - "Flashforge/Flashforge Generic PETG-CF @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic PETG-CF @G3U 0.8 Nozzle", - "Flashforge/Flashforge Generic PETG-CF10", - "Flashforge/Flashforge Generic PLA", - "Flashforge/Flashforge Generic PLA @G3U", - "Flashforge/Flashforge Generic PLA-CF @G3U", - "Flashforge/Flashforge Generic PLA-CF @G3U 0.6 Nozzle", - "Flashforge/Flashforge Generic PLA-CF @G3U 0.8 Nozzle", - "Flashforge/Flashforge Generic PLA-CF10", - "Flashforge/Flashforge Generic PLA-SILK @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge Generic PLA-Silk", - "Flashforge/Flashforge Generic PVA", - "Flashforge/Flashforge Generic TPU", "Flashforge/Flashforge HIPS @FF C5", "Flashforge/Flashforge HIPS @FF C5P", "Flashforge/Flashforge HIPS @FF G4", @@ -6468,40 +5908,52 @@ "Flashforge/Flashforge TPU-90A @FF C5P", "Flashforge/Flashforge TPU-95A @FF C5", "Flashforge/Flashforge TPU-95A @FF C5P", - "Flashforge/FusRock Generic NexPA-CF25", - "Flashforge/FusRock Generic PAHT-CF", - "Flashforge/FusRock Generic PAHT-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock Generic PAHT-GF", - "Flashforge/FusRock Generic PET-CF", - "Flashforge/FusRock Generic PET-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock Generic PET-GF", - "Flashforge/FusRock Generic S-Multi", - "Flashforge/FusRock Generic S-Multi @G3U 0.6 Nozzle", - "Flashforge/FusRock Generic S-PAHT", - "Flashforge/FusRock Generic S-PAHT @G3U 0.6 Nozzle", + "Flashforge/FusRock NexPA-CF25", "Flashforge/FusRock PAHT @FF G4 0.6 HF nozzle", "Flashforge/FusRock PAHT @FF G4 0.6 nozzle", "Flashforge/FusRock PAHT @FF G4 0.8 HF nozzle", "Flashforge/FusRock PAHT @FF G4P 0.6 HF nozzle", "Flashforge/FusRock PAHT @FF G4P 0.6 nozzle", "Flashforge/FusRock PAHT @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PAHT-CF", "Flashforge/FusRock PAHT-CF @FF C5", "Flashforge/FusRock PAHT-CF @FF C5P", "Flashforge/FusRock PAHT-CF @FF G4", "Flashforge/FusRock PAHT-CF @FF G4 0.6 nozzle", "Flashforge/FusRock PAHT-CF @FF G4P", "Flashforge/FusRock PAHT-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock PAHT-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock PAHT-GF", "Flashforge/FusRock PET @FF G4P 0.8 HF nozzle", + "Flashforge/FusRock PET-CF", "Flashforge/FusRock PET-CF @FF G4", "Flashforge/FusRock PET-CF @FF G4 0.6 nozzle", "Flashforge/FusRock PET-CF @FF G4P", "Flashforge/FusRock PET-CF @FF G4P 0.6 nozzle", + "Flashforge/FusRock PET-CF @G3U 0.6 Nozzle", + "Flashforge/FusRock PET-GF", + "Flashforge/FusRock S-Multi", "Flashforge/FusRock S-Multi @FF C5", "Flashforge/FusRock S-Multi @FF C5P", + "Flashforge/FusRock S-Multi @G3U 0.6 Nozzle", + "Flashforge/FusRock S-PAHT", "Flashforge/FusRock S-PAHT @FF C5", "Flashforge/FusRock S-PAHT @FF C5P", + "Flashforge/FusRock S-PAHT @G3U 0.6 Nozzle", + "Flashforge/Generic ABS @FF AD5M 0.25 Nozzle", + "Flashforge/Generic ABS @Flashforge", "Flashforge/Generic ABS @Flashforge AD4", + "Flashforge/Generic ABS @Flashforge G3U", + "Flashforge/Generic ABS @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic ASA @FF AD5M 0.25 Nozzle", + "Flashforge/Generic ASA @Flashforge", "Flashforge/Generic ASA @Flashforge AD4", + "Flashforge/Generic ASA @Flashforge G3U", + "Flashforge/Generic ASA @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic HIPS @Flashforge", + "Flashforge/Generic HIPS @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic HS PLA @FF AD5M 0.25 Nozzle", + "Flashforge/Generic HS PLA @Flashforge", "Flashforge/Generic PET @FF G4", "Flashforge/Generic PET @FF G4 0.6 HF nozzle", "Flashforge/Generic PET @FF G4 0.6 nozzle", @@ -6510,16 +5962,35 @@ "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", "Flashforge/Generic PET @FF G4P 0.6 nozzle", "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", + "Flashforge/Generic PETG @FF AD5M 0.25 Nozzle", + "Flashforge/Generic PETG @Flashforge", "Flashforge/Generic PETG @Flashforge AD4", "Flashforge/Generic PETG @Flashforge Artemis", + "Flashforge/Generic PETG @Flashforge G3U", + "Flashforge/Generic PETG @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic PETG @Flashforge G3U 0.8 Nozzle", + "Flashforge/Generic PETG-CF @Flashforge G3U", + "Flashforge/Generic PETG-CF @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic PETG-CF @Flashforge G3U 0.8 Nozzle", + "Flashforge/Generic PETG-CF10 @Flashforge", "Flashforge/Generic PETG-CF10 @Flashforge AD4", + "Flashforge/Generic PLA @Flashforge", "Flashforge/Generic PLA @Flashforge AD4", + "Flashforge/Generic PLA @Flashforge G3U", "Flashforge/Generic PLA High Speed @Flashforge AD4", "Flashforge/Generic PLA Silk @Flashforge AD4", + "Flashforge/Generic PLA-CF @Flashforge G3U", + "Flashforge/Generic PLA-CF @Flashforge G3U 0.6 Nozzle", + "Flashforge/Generic PLA-CF @Flashforge G3U 0.8 Nozzle", + "Flashforge/Generic PLA-CF10 @Flashforge", "Flashforge/Generic PLA-CF10 @Flashforge AD4", + "Flashforge/Generic PLA-SILK @FF AD5M 0.25 Nozzle", + "Flashforge/Generic PLA-Silk @Flashforge", + "Flashforge/Generic PVA @Flashforge", "Flashforge/Generic TPU 85A @FF AD5X", "Flashforge/Generic TPU 85A @FF AD5X 0.6 nozzle", "Flashforge/Generic TPU 85A @FF AD5X 0.8 nozzle", + "Flashforge/Generic TPU @Flashforge", "Flashforge/Generic TPU @Flashforge AD4", "Flashforge/Generic TPU-64D @FF C5", "Flashforge/Generic TPU-64D @FF C5P", @@ -6527,22 +5998,16 @@ "Flashforge/Generic TPU-90A @FF C5P", "Flashforge/Generic TPU-95A @FF C5", "Flashforge/Generic TPU-95A @FF C5P", + "Flashforge/Polymaker CoPA", "Flashforge/Polymaker CoPA @FF G4 0.6 HF nozzle", "Flashforge/Polymaker CoPA @FF G4 0.6 nozzle", "Flashforge/Polymaker CoPA @FF G4 0.8 HF nozzle", "Flashforge/Polymaker CoPA @FF G4P 0.6 HF nozzle", "Flashforge/Polymaker CoPA @FF G4P 0.6 nozzle", "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", - "Flashforge/Polymaker Generic CoPA", - "Flashforge/Polymaker Generic S1", + "Flashforge/Polymaker S1", "FlyingBear/FlyingBear ABS @Ghost7", "FlyingBear/FlyingBear ABS @S1", - "FlyingBear/FlyingBear Generic ABS", - "FlyingBear/FlyingBear Generic PA-CF", - "FlyingBear/FlyingBear Generic PC", - "FlyingBear/FlyingBear Generic PETG", - "FlyingBear/FlyingBear Generic PLA", - "FlyingBear/FlyingBear Generic TPU", "FlyingBear/FlyingBear PA-CF @Ghost7", "FlyingBear/FlyingBear PA-CF @S1", "FlyingBear/FlyingBear PC @Ghost7", @@ -6556,6 +6021,12 @@ "FlyingBear/FlyingBear PLA Hyper @S1", "FlyingBear/FlyingBear TPU @S1", "FlyingBear/FlyingBear TPU Basic @Ghost7", + "FlyingBear/Generic ABS @FlyingBear", + "FlyingBear/Generic PA-CF @FlyingBear", + "FlyingBear/Generic PC @FlyingBear", + "FlyingBear/Generic PETG @FlyingBear", + "FlyingBear/Generic PLA @FlyingBear", + "FlyingBear/Generic TPU @FlyingBear", "FlyingBear/Other ABS @S1", "FlyingBear/Other PA-CF @S1", "FlyingBear/Other PC @S1", @@ -6563,17 +6034,17 @@ "FlyingBear/Other PLA @S1", "FlyingBear/Other PLA Hyper @S1", "FlyingBear/Other TPU @S1", - "Ginger Additive/Ginger Generic PETG", - "Ginger Additive/Ginger Generic PLA", + "Ginger Additive/Generic PETG @Ginger", + "Ginger Additive/Generic PLA @Ginger", + "InfiMech/Generic ABS @InfiMech", + "InfiMech/Generic PA-CF @InfiMech", + "InfiMech/Generic PC @InfiMech", + "InfiMech/Generic PETG @InfiMech", + "InfiMech/Generic PLA @InfiMech", + "InfiMech/Generic TPU @InfiMech", "InfiMech/InfiMech ABS @EX", "InfiMech/InfiMech ABS @EX+APS", "InfiMech/InfiMech ABS @HSN", - "InfiMech/InfiMech Generic ABS", - "InfiMech/InfiMech Generic PA-CF", - "InfiMech/InfiMech Generic PC", - "InfiMech/InfiMech Generic PETG", - "InfiMech/InfiMech Generic PLA", - "InfiMech/InfiMech Generic TPU", "InfiMech/InfiMech PA-CF @EX", "InfiMech/InfiMech PA-CF @EX+APS", "InfiMech/InfiMech PA-CF @HSN", @@ -6622,10 +6093,10 @@ "Lulzbot/Lulzbot 2.85mm ABS", "Lulzbot/Lulzbot 2.85mm PETG", "Lulzbot/Lulzbot 2.85mm PLA", - "MagicMaker/MM Generic PEEK", - "OrcaArena/OrcaArena Generic PA", - "OrcaArena/OrcaArena Generic PA-CF", - "OrcaArena/OrcaArena Generic TPU", + "MagicMaker/Generic PEEK @MM", + "OrcaArena/Generic PA @OrcaArena", + "OrcaArena/Generic PA-CF @OrcaArena", + "OrcaArena/Generic TPU @OrcaArena", "OrcaFilamentLibrary/Eolas Prints ABS @System", "OrcaFilamentLibrary/Eolas Prints ASA @System", "OrcaFilamentLibrary/Eolas Prints PETG @System", @@ -6730,151 +6201,151 @@ "OrcaFilamentLibrary/PolyLite PLA @System", "OrcaFilamentLibrary/PolyTerra Dual PLA @System", "OrcaFilamentLibrary/eSUN ePLA-LW @System", - "Peopoly/Peopoly Generic ABS", - "Peopoly/Peopoly Generic PETG", - "Peopoly/Peopoly Generic PLA", + "Peopoly/Generic ABS @Peopoly", + "Peopoly/Generic PETG @Peopoly", + "Peopoly/Generic PLA @Peopoly", "Peopoly/Peopoly Lancer ABS-GF", "Peopoly/Peopoly Lancer PET-CF", "Peopoly/Peopoly Lancer PETG-C", "Peopoly/Peopoly Lancer PLA-C", "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", - "Prusa/Prusa Generic ABS @CORE One", - "Prusa/Prusa Generic ABS @CORE One 0.6", - "Prusa/Prusa Generic ABS @CORE One 0.8", - "Prusa/Prusa Generic ABS @CORE One HF 0.4", - "Prusa/Prusa Generic ABS @CORE One HF 0.5", - "Prusa/Prusa Generic ABS @CORE One HF 0.6", - "Prusa/Prusa Generic ABS @CORE One HF 0.8", - "Prusa/Prusa Generic ABS @MK3.5", - "Prusa/Prusa Generic ABS @MK3.5 0.25", - "Prusa/Prusa Generic ABS @MK3.5 0.6", - "Prusa/Prusa Generic ABS @MK3.5 0.8", - "Prusa/Prusa Generic ABS @MK4S", - "Prusa/Prusa Generic ABS @MK4S 0.6", - "Prusa/Prusa Generic ABS @MK4S 0.8", - "Prusa/Prusa Generic ABS @MK4S HF0.4", - "Prusa/Prusa Generic ABS @MK4S HF0.5", - "Prusa/Prusa Generic ABS @MK4S HF0.6", - "Prusa/Prusa Generic ABS @MK4S HF0.8", - "Prusa/Prusa Generic ABS HF @MK3.5", - "Prusa/Prusa Generic ABS HF @MK3.5 0.6", - "Prusa/Prusa Generic ABS HF @MK3.5 0.8", - "Prusa/Prusa Generic ASA", - "Prusa/Prusa Generic ASA @CORE One", - "Prusa/Prusa Generic ASA @CORE One 0.6", - "Prusa/Prusa Generic ASA @CORE One 0.8", - "Prusa/Prusa Generic ASA @CORE One HF 0.4", - "Prusa/Prusa Generic ASA @CORE One HF 0.5", - "Prusa/Prusa Generic ASA @CORE One HF 0.6", - "Prusa/Prusa Generic ASA @CORE One HF 0.8", - "Prusa/Prusa Generic ASA @MINIIS", - "Prusa/Prusa Generic ASA @MINIIS 0.25", - "Prusa/Prusa Generic ASA @MINIIS 0.6", - "Prusa/Prusa Generic ASA @MINIIS 0.8", - "Prusa/Prusa Generic ASA @MK3.5", - "Prusa/Prusa Generic ASA @MK3.5 0.25", - "Prusa/Prusa Generic ASA @MK3.5 0.6", - "Prusa/Prusa Generic ASA @MK3.5 0.8", - "Prusa/Prusa Generic ASA @MK4", - "Prusa/Prusa Generic ASA @MK4S", - "Prusa/Prusa Generic ASA @MK4S 0.6", - "Prusa/Prusa Generic ASA @MK4S 0.8", - "Prusa/Prusa Generic ASA @MK4S HF0.4", - "Prusa/Prusa Generic ASA @MK4S HF0.5", - "Prusa/Prusa Generic ASA @MK4S HF0.6", - "Prusa/Prusa Generic ASA @MK4S HF0.8", - "Prusa/Prusa Generic ASA HF @MK3.5", - "Prusa/Prusa Generic ASA HF @MK3.5 0.6", - "Prusa/Prusa Generic ASA HF @MK3.5 0.8", - "Prusa/Prusa Generic FLEX @XL", - "Prusa/Prusa Generic FLEX @XL 5T", - "Prusa/Prusa Generic PA @MK3.5", - "Prusa/Prusa Generic PA @MK3.5 0.25", - "Prusa/Prusa Generic PA @MK3.5 0.6", - "Prusa/Prusa Generic PA @MK3.5 0.8", - "Prusa/Prusa Generic PA-CF @MK3.5", - "Prusa/Prusa Generic PA-CF @MK3.5 0.25", - "Prusa/Prusa Generic PA-CF @MK3.5 0.6", - "Prusa/Prusa Generic PA-CF @MK3.5 0.8", - "Prusa/Prusa Generic PC", - "Prusa/Prusa Generic PC @MINIIS", - "Prusa/Prusa Generic PC @MINIIS 0.25", - "Prusa/Prusa Generic PC @MINIIS 0.6", - "Prusa/Prusa Generic PC @MINIIS 0.8", - "Prusa/Prusa Generic PC @MK3.5", - "Prusa/Prusa Generic PC @MK3.5 0.25", - "Prusa/Prusa Generic PC @MK3.5 0.6", - "Prusa/Prusa Generic PC @MK3.5 0.8", - "Prusa/Prusa Generic PC HF @MK3.5", - "Prusa/Prusa Generic PC HF @MK3.5 0.6", - "Prusa/Prusa Generic PC HF @MK3.5 0.8", - "Prusa/Prusa Generic PETG @CORE One", - "Prusa/Prusa Generic PETG @CORE One 0.6", - "Prusa/Prusa Generic PETG @CORE One 0.8", - "Prusa/Prusa Generic PETG @CORE One HF 0.4", - "Prusa/Prusa Generic PETG @CORE One HF 0.5", - "Prusa/Prusa Generic PETG @CORE One HF 0.6", - "Prusa/Prusa Generic PETG @CORE One HF 0.8", - "Prusa/Prusa Generic PETG @MK3.5", - "Prusa/Prusa Generic PETG @MK3.5 0.25", - "Prusa/Prusa Generic PETG @MK3.5 0.6", - "Prusa/Prusa Generic PETG @MK3.5 0.8", - "Prusa/Prusa Generic PETG @MK4S", - "Prusa/Prusa Generic PETG @MK4S 0.6", - "Prusa/Prusa Generic PETG @MK4S 0.8", - "Prusa/Prusa Generic PETG @MK4S HF0.4", - "Prusa/Prusa Generic PETG @MK4S HF0.5", - "Prusa/Prusa Generic PETG @MK4S HF0.6", - "Prusa/Prusa Generic PETG @MK4S HF0.8", - "Prusa/Prusa Generic PETG HF @MK3.5", - "Prusa/Prusa Generic PETG HF @MK3.5 0.6", - "Prusa/Prusa Generic PETG HF @MK3.5 0.8", - "Prusa/Prusa Generic PLA @CORE One", - "Prusa/Prusa Generic PLA @CORE One 0.6", - "Prusa/Prusa Generic PLA @CORE One 0.8", - "Prusa/Prusa Generic PLA @CORE One HF 0.4", - "Prusa/Prusa Generic PLA @CORE One HF 0.5", - "Prusa/Prusa Generic PLA @CORE One HF 0.6", - "Prusa/Prusa Generic PLA @CORE One HF 0.8", - "Prusa/Prusa Generic PLA @MK3.5", - "Prusa/Prusa Generic PLA @MK3.5 0.25", - "Prusa/Prusa Generic PLA @MK3.5 0.6", - "Prusa/Prusa Generic PLA @MK3.5 0.8", - "Prusa/Prusa Generic PLA @MK4S", - "Prusa/Prusa Generic PLA @MK4S 0.6", - "Prusa/Prusa Generic PLA @MK4S 0.8", - "Prusa/Prusa Generic PLA @MK4S HF0.4", - "Prusa/Prusa Generic PLA @MK4S HF0.5", - "Prusa/Prusa Generic PLA @MK4S HF0.6", - "Prusa/Prusa Generic PLA @MK4S HF0.8", - "Prusa/Prusa Generic PLA HF @MK3.5", - "Prusa/Prusa Generic PLA HF @MK3.5 0.6", - "Prusa/Prusa Generic PLA HF @MK3.5 0.8", - "Prusa/Prusa Generic PLA Silk @CORE One", - "Prusa/Prusa Generic PLA Silk @CORE One 0.6", - "Prusa/Prusa Generic PLA Silk @CORE One 0.8", - "Prusa/Prusa Generic PLA Silk @MK4S", - "Prusa/Prusa Generic PLA Silk @MK4S 0.6", - "Prusa/Prusa Generic PLA Silk @MK4S 0.8", - "Prusa/Prusa Generic PLA-CF @MK3.5", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.25", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.6", - "Prusa/Prusa Generic PLA-CF @MK3.5 0.8", - "Prusa/Prusa Generic PVA @MK3.5", - "Prusa/Prusa Generic PVA @MK3.5 0.25", - "Prusa/Prusa Generic PVA @MK3.5 0.6", - "Prusa/Prusa Generic PVA @MK3.5 0.8", - "Prusa/Prusa Generic PVA HF @MK3.5", - "Prusa/Prusa Generic PVA HF @MK3.5 0.6", - "Prusa/Prusa Generic PVA HF @MK3.5 0.8", - "Prusa/Prusa Generic TPU @CORE One", - "Prusa/Prusa Generic TPU @CORE One 0.6", - "Prusa/Prusa Generic TPU @CORE One 0.8", - "Prusa/Prusa Generic TPU @MK3.5", - "Prusa/Prusa Generic TPU @MK4S", - "Prusa/Prusa Generic TPU @MK4S 0.6", - "Prusa/Prusa Generic TPU @MK4S 0.8", - "Prusa/Prusa Generic TPU HF @MK3.5", + "Prusa/Generic ABS @Prusa CORE One", + "Prusa/Generic ABS @Prusa CORE One 0.6", + "Prusa/Generic ABS @Prusa CORE One 0.8", + "Prusa/Generic ABS @Prusa CORE One HF 0.4", + "Prusa/Generic ABS @Prusa CORE One HF 0.5", + "Prusa/Generic ABS @Prusa CORE One HF 0.6", + "Prusa/Generic ABS @Prusa CORE One HF 0.8", + "Prusa/Generic ABS @Prusa MK3.5", + "Prusa/Generic ABS @Prusa MK3.5 0.25", + "Prusa/Generic ABS @Prusa MK3.5 0.6", + "Prusa/Generic ABS @Prusa MK3.5 0.8", + "Prusa/Generic ABS @Prusa MK4S", + "Prusa/Generic ABS @Prusa MK4S 0.6", + "Prusa/Generic ABS @Prusa MK4S 0.8", + "Prusa/Generic ABS @Prusa MK4S HF0.4", + "Prusa/Generic ABS @Prusa MK4S HF0.5", + "Prusa/Generic ABS @Prusa MK4S HF0.6", + "Prusa/Generic ABS @Prusa MK4S HF0.8", + "Prusa/Generic ABS HF @Prusa MK3.5", + "Prusa/Generic ABS HF @Prusa MK3.5 0.6", + "Prusa/Generic ABS HF @Prusa MK3.5 0.8", + "Prusa/Generic ASA @Prusa", + "Prusa/Generic ASA @Prusa CORE One", + "Prusa/Generic ASA @Prusa CORE One 0.6", + "Prusa/Generic ASA @Prusa CORE One 0.8", + "Prusa/Generic ASA @Prusa CORE One HF 0.4", + "Prusa/Generic ASA @Prusa CORE One HF 0.5", + "Prusa/Generic ASA @Prusa CORE One HF 0.6", + "Prusa/Generic ASA @Prusa CORE One HF 0.8", + "Prusa/Generic ASA @Prusa MINIIS", + "Prusa/Generic ASA @Prusa MINIIS 0.25", + "Prusa/Generic ASA @Prusa MINIIS 0.6", + "Prusa/Generic ASA @Prusa MINIIS 0.8", + "Prusa/Generic ASA @Prusa MK3.5", + "Prusa/Generic ASA @Prusa MK3.5 0.25", + "Prusa/Generic ASA @Prusa MK3.5 0.6", + "Prusa/Generic ASA @Prusa MK3.5 0.8", + "Prusa/Generic ASA @Prusa MK4", + "Prusa/Generic ASA @Prusa MK4S", + "Prusa/Generic ASA @Prusa MK4S 0.6", + "Prusa/Generic ASA @Prusa MK4S 0.8", + "Prusa/Generic ASA @Prusa MK4S HF0.4", + "Prusa/Generic ASA @Prusa MK4S HF0.5", + "Prusa/Generic ASA @Prusa MK4S HF0.6", + "Prusa/Generic ASA @Prusa MK4S HF0.8", + "Prusa/Generic ASA HF @Prusa MK3.5", + "Prusa/Generic ASA HF @Prusa MK3.5 0.6", + "Prusa/Generic ASA HF @Prusa MK3.5 0.8", + "Prusa/Generic FLEX @Prusa XL", + "Prusa/Generic FLEX @Prusa XL 5T", + "Prusa/Generic PA @Prusa MK3.5", + "Prusa/Generic PA @Prusa MK3.5 0.25", + "Prusa/Generic PA @Prusa MK3.5 0.6", + "Prusa/Generic PA @Prusa MK3.5 0.8", + "Prusa/Generic PA-CF @Prusa MK3.5", + "Prusa/Generic PA-CF @Prusa MK3.5 0.25", + "Prusa/Generic PA-CF @Prusa MK3.5 0.6", + "Prusa/Generic PA-CF @Prusa MK3.5 0.8", + "Prusa/Generic PC @Prusa", + "Prusa/Generic PC @Prusa MINIIS", + "Prusa/Generic PC @Prusa MINIIS 0.25", + "Prusa/Generic PC @Prusa MINIIS 0.6", + "Prusa/Generic PC @Prusa MINIIS 0.8", + "Prusa/Generic PC @Prusa MK3.5", + "Prusa/Generic PC @Prusa MK3.5 0.25", + "Prusa/Generic PC @Prusa MK3.5 0.6", + "Prusa/Generic PC @Prusa MK3.5 0.8", + "Prusa/Generic PC HF @Prusa MK3.5", + "Prusa/Generic PC HF @Prusa MK3.5 0.6", + "Prusa/Generic PC HF @Prusa MK3.5 0.8", + "Prusa/Generic PETG @Prusa CORE One", + "Prusa/Generic PETG @Prusa CORE One 0.6", + "Prusa/Generic PETG @Prusa CORE One 0.8", + "Prusa/Generic PETG @Prusa CORE One HF 0.4", + "Prusa/Generic PETG @Prusa CORE One HF 0.5", + "Prusa/Generic PETG @Prusa CORE One HF 0.6", + "Prusa/Generic PETG @Prusa CORE One HF 0.8", + "Prusa/Generic PETG @Prusa MK3.5", + "Prusa/Generic PETG @Prusa MK3.5 0.25", + "Prusa/Generic PETG @Prusa MK3.5 0.6", + "Prusa/Generic PETG @Prusa MK3.5 0.8", + "Prusa/Generic PETG @Prusa MK4S", + "Prusa/Generic PETG @Prusa MK4S 0.6", + "Prusa/Generic PETG @Prusa MK4S 0.8", + "Prusa/Generic PETG @Prusa MK4S HF0.4", + "Prusa/Generic PETG @Prusa MK4S HF0.5", + "Prusa/Generic PETG @Prusa MK4S HF0.6", + "Prusa/Generic PETG @Prusa MK4S HF0.8", + "Prusa/Generic PETG HF @Prusa MK3.5", + "Prusa/Generic PETG HF @Prusa MK3.5 0.6", + "Prusa/Generic PETG HF @Prusa MK3.5 0.8", + "Prusa/Generic PLA @Prusa CORE One", + "Prusa/Generic PLA @Prusa CORE One 0.6", + "Prusa/Generic PLA @Prusa CORE One 0.8", + "Prusa/Generic PLA @Prusa CORE One HF 0.4", + "Prusa/Generic PLA @Prusa CORE One HF 0.5", + "Prusa/Generic PLA @Prusa CORE One HF 0.6", + "Prusa/Generic PLA @Prusa CORE One HF 0.8", + "Prusa/Generic PLA @Prusa MK3.5", + "Prusa/Generic PLA @Prusa MK3.5 0.25", + "Prusa/Generic PLA @Prusa MK3.5 0.6", + "Prusa/Generic PLA @Prusa MK3.5 0.8", + "Prusa/Generic PLA @Prusa MK4S", + "Prusa/Generic PLA @Prusa MK4S 0.6", + "Prusa/Generic PLA @Prusa MK4S 0.8", + "Prusa/Generic PLA @Prusa MK4S HF0.4", + "Prusa/Generic PLA @Prusa MK4S HF0.5", + "Prusa/Generic PLA @Prusa MK4S HF0.6", + "Prusa/Generic PLA @Prusa MK4S HF0.8", + "Prusa/Generic PLA HF @Prusa MK3.5", + "Prusa/Generic PLA HF @Prusa MK3.5 0.6", + "Prusa/Generic PLA HF @Prusa MK3.5 0.8", + "Prusa/Generic PLA Silk @Prusa CORE One", + "Prusa/Generic PLA Silk @Prusa CORE One 0.6", + "Prusa/Generic PLA Silk @Prusa CORE One 0.8", + "Prusa/Generic PLA Silk @Prusa MK4S", + "Prusa/Generic PLA Silk @Prusa MK4S 0.6", + "Prusa/Generic PLA Silk @Prusa MK4S 0.8", + "Prusa/Generic PLA-CF @Prusa MK3.5", + "Prusa/Generic PLA-CF @Prusa MK3.5 0.25", + "Prusa/Generic PLA-CF @Prusa MK3.5 0.6", + "Prusa/Generic PLA-CF @Prusa MK3.5 0.8", + "Prusa/Generic PVA @Prusa MK3.5", + "Prusa/Generic PVA @Prusa MK3.5 0.25", + "Prusa/Generic PVA @Prusa MK3.5 0.6", + "Prusa/Generic PVA @Prusa MK3.5 0.8", + "Prusa/Generic PVA HF @Prusa MK3.5", + "Prusa/Generic PVA HF @Prusa MK3.5 0.6", + "Prusa/Generic PVA HF @Prusa MK3.5 0.8", + "Prusa/Generic TPU @Prusa CORE One", + "Prusa/Generic TPU @Prusa CORE One 0.6", + "Prusa/Generic TPU @Prusa CORE One 0.8", + "Prusa/Generic TPU @Prusa MK3.5", + "Prusa/Generic TPU @Prusa MK4S", + "Prusa/Generic TPU @Prusa MK4S 0.6", + "Prusa/Generic TPU @Prusa MK4S 0.8", + "Prusa/Generic TPU HF @Prusa MK3.5", "Prusa/Prusament ASA @CORE One", "Prusa/Prusament ASA @CORE One 0.6", "Prusa/Prusament ASA @CORE One 0.8", @@ -6961,6 +6432,107 @@ "Qidi/Bambu PLA @Qidi X-Plus 4 0.4 nozzle", "Qidi/Bambu PLA @Qidi X-Plus 4 0.6 nozzle", "Qidi/Bambu PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic ABS @Qidi", + "Qidi/Generic ABS @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Generic ABS @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic ABS @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Generic ABS @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Generic ABS @Qidi X-Max 3 0.2 nozzle", + "Qidi/Generic ABS @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Generic ABS @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic ABS @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic ABS @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic ABS @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic ABS @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Generic ASA @Qidi", + "Qidi/Generic ASA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Generic ASA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic ASA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Generic ASA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Generic ASA @Qidi X-Max 3 0.2 nozzle", + "Qidi/Generic ASA @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Generic ASA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic ASA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic ASA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic ASA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic ASA @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Generic PA @Qidi", + "Qidi/Generic PA-CF @Qidi", + "Qidi/Generic PC @Qidi", + "Qidi/Generic PC @Qidi 0.2 nozzle", + "Qidi/Generic PC @Qidi 0.8 nozzle", + "Qidi/Generic PC @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Generic PC @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic PC @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Generic PC @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Generic PC @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic PC @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic PC @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic PC @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic PETG @Qidi", + "Qidi/Generic PETG @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Generic PETG @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic PETG @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Generic PETG @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Generic PETG @Qidi X-Max 3 0.2 nozzle", + "Qidi/Generic PETG @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Generic PETG @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic PETG @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic PETG @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic PETG @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic PETG @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Generic PETG-CF @Qidi", + "Qidi/Generic PLA @Qidi", + "Qidi/Generic PLA @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Generic PLA @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic PLA @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Generic PLA @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Generic PLA @Qidi X-Max 3 0.2 nozzle", + "Qidi/Generic PLA @Qidi X-Max 3 0.6 nozzle", + "Qidi/Generic PLA @Qidi X-Max 3 0.8 nozzle", + "Qidi/Generic PLA @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Generic PLA @Qidi X-Plus 3 0.6 nozzle", + "Qidi/Generic PLA @Qidi X-Plus 3 0.8 nozzle", + "Qidi/Generic PLA @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic PLA @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic PLA @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic PLA @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic PLA @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Generic PLA @Qidi X-Smart 3 0.6 nozzle", + "Qidi/Generic PLA @Qidi X-Smart 3 0.8 nozzle", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic PLA Silk @Qidi", + "Qidi/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic PLA+ @Qidi", + "Qidi/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", + "Qidi/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", + "Qidi/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Generic PLA+ @Qidi X-Max 3 0.2 nozzle", + "Qidi/Generic PLA+ @Qidi X-Max 3 0.6 nozzle", + "Qidi/Generic PLA+ @Qidi X-Max 3 0.8 nozzle", + "Qidi/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", + "Qidi/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", + "Qidi/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", + "Qidi/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", + "Qidi/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", + "Qidi/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", + "Qidi/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", + "Qidi/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", + "Qidi/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", + "Qidi/Generic PLA-CF @Qidi", + "Qidi/Generic PVA @Qidi", + "Qidi/Generic TPU 95A @Qidi", + "Qidi/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", + "Qidi/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", + "Qidi/Generic TPU @Qidi", + "Qidi/Generic TPU @Qidi Q1 Pro 0.4 nozzle", + "Qidi/Generic TPU @Qidi X-Plus 4 0.4 nozzle", "Qidi/HATCHBOX ABS @Qidi", "Qidi/HATCHBOX ABS @Qidi 0.2 nozzle", "Qidi/HATCHBOX ABS @Qidi 0.6 nozzle", @@ -7360,107 +6932,6 @@ "Qidi/Qidi ASA-Aero", "Qidi/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle", "Qidi/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic ABS", - "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Qidi Generic ABS @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic ABS @Qidi X-Max 3 0.2 nozzle", - "Qidi/Qidi Generic ABS @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic ABS @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic ABS @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Qidi Generic ASA", - "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Qidi Generic ASA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic ASA @Qidi X-Max 3 0.2 nozzle", - "Qidi/Qidi Generic ASA @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic ASA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic ASA @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Qidi Generic PA", - "Qidi/Qidi Generic PA-CF", - "Qidi/Qidi Generic PC", - "Qidi/Qidi Generic PC @0.2 nozzle", - "Qidi/Qidi Generic PC @0.8 nozzle", - "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Qidi Generic PC @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic PC @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PETG", - "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Qidi Generic PETG @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Max 3 0.2 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PETG @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Qidi Generic PETG-CF", - "Qidi/Qidi Generic PLA", - "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Qidi Generic PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Max 3 0.2 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Max 3 0.6 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Max 3 0.8 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 3 0.6 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 3 0.8 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Smart 3 0.6 nozzle", - "Qidi/Qidi Generic PLA @Qidi X-Smart 3 0.8 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PLA Silk", - "Qidi/Qidi Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic PLA+", - "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Max 3 0.2 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Max 3 0.6 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Max 3 0.8 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", - "Qidi/Qidi Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", - "Qidi/Qidi Generic PLA-CF", - "Qidi/Qidi Generic PVA", - "Qidi/Qidi Generic TPU", - "Qidi/Qidi Generic TPU 95A", - "Qidi/Qidi Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi Generic TPU @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi Generic TPU @Qidi X-Plus 4 0.4 nozzle", "Qidi/Qidi PC-ABS-FR", "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle", "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle", @@ -7481,36 +6952,36 @@ "RH3D/Generic PETG @E3NG v1.2S", "RH3D/Generic PLA @E3NG v1.2S", "RH3D/Generic TPU @E3NG v1.2S", + "Ratrig/Generic ABS @RatRig", + "Ratrig/Generic ASA @RatRig", + "Ratrig/Generic PA @RatRig", + "Ratrig/Generic PA-CF @RatRig", + "Ratrig/Generic PC @RatRig", + "Ratrig/Generic PCTG @RatRig", + "Ratrig/Generic PETG @RatRig", + "Ratrig/Generic PLA @RatRig", + "Ratrig/Generic PLA-CF @RatRig", + "Ratrig/Generic PVA @RatRig", + "Ratrig/Generic TPU @RatRig", "Ratrig/RatRig BigNozzle ABS", "Ratrig/RatRig BigNozzle ASA", "Ratrig/RatRig BigNozzle PCTG", "Ratrig/RatRig BigNozzle PETG", "Ratrig/RatRig BigNozzle PLA", "Ratrig/RatRig BigNozzle TPU", - "Ratrig/RatRig Generic ABS", - "Ratrig/RatRig Generic ASA", - "Ratrig/RatRig Generic PA", - "Ratrig/RatRig Generic PA-CF", - "Ratrig/RatRig Generic PC", - "Ratrig/RatRig Generic PCTG", - "Ratrig/RatRig Generic PETG", - "Ratrig/RatRig Generic PLA", - "Ratrig/RatRig Generic PLA-CF", - "Ratrig/RatRig Generic PVA", - "Ratrig/RatRig Generic TPU", "Ratrig/RatRig PunkFil ABS", "Ratrig/RatRig PunkFil PETG", "Ratrig/RatRig PunkFil PETG CF", - "SecKit/SecKit Generic ABS", - "SecKit/SecKit Generic ASA", - "SecKit/SecKit Generic PA", - "SecKit/SecKit Generic PA-CF", - "SecKit/SecKit Generic PC", - "SecKit/SecKit Generic PETG", - "SecKit/SecKit Generic PLA", - "SecKit/SecKit Generic PLA-CF", - "SecKit/SecKit Generic PVA", - "SecKit/SecKit Generic TPU", + "SecKit/Generic ABS @SecKit", + "SecKit/Generic ASA @SecKit", + "SecKit/Generic PA @SecKit", + "SecKit/Generic PA-CF @SecKit", + "SecKit/Generic PC @SecKit", + "SecKit/Generic PETG @SecKit", + "SecKit/Generic PLA @SecKit", + "SecKit/Generic PLA-CF @SecKit", + "SecKit/Generic PVA @SecKit", + "SecKit/Generic TPU @SecKit", "SeeMeCNC/SeeMeCNC ABS", "SeeMeCNC/SeeMeCNC PA-CF", "SeeMeCNC/SeeMeCNC PETG", @@ -7581,66 +7052,66 @@ "Sovol/Sovol Zero PLA Silk", "Sovol/Sovol Zero PLA Silk HS Nozzle", "Sovol/Sovol Zero TPU", + "Tiertime/Generic ABS @Tiertime", + "Tiertime/Generic ABS @Tiertime 300HS", + "Tiertime/Generic ASA @Tiertime", + "Tiertime/Generic ASA @Tiertime 300HS", + "Tiertime/Generic BVOH @Tiertime", + "Tiertime/Generic BVOH @Tiertime 300HS", + "Tiertime/Generic EVA @Tiertime", + "Tiertime/Generic EVA @Tiertime 300HS", + "Tiertime/Generic HIPS @Tiertime", + "Tiertime/Generic HIPS @Tiertime 300HS", + "Tiertime/Generic PA @Tiertime", + "Tiertime/Generic PA @Tiertime 300HS", + "Tiertime/Generic PA-CF @Tiertime", + "Tiertime/Generic PA-CF @Tiertime 300HS", + "Tiertime/Generic PC @Tiertime", + "Tiertime/Generic PC @Tiertime 300HS", + "Tiertime/Generic PCTG @Tiertime", + "Tiertime/Generic PCTG @Tiertime 300HS", + "Tiertime/Generic PE @Tiertime", + "Tiertime/Generic PE @Tiertime 300HS", + "Tiertime/Generic PE-CF @Tiertime", + "Tiertime/Generic PE-CF @Tiertime 300HS", + "Tiertime/Generic PETG @Tiertime", + "Tiertime/Generic PETG @Tiertime 300HS", + "Tiertime/Generic PETG-CF @Tiertime", + "Tiertime/Generic PETG-CF @Tiertime 300HS", + "Tiertime/Generic PHA @Tiertime", + "Tiertime/Generic PHA @Tiertime 300HS", + "Tiertime/Generic PLA @Tiertime", + "Tiertime/Generic PLA @Tiertime 300HS", + "Tiertime/Generic PLA High Speed @Tiertime", + "Tiertime/Generic PLA High Speed @Tiertime 300HS", + "Tiertime/Generic PLA Silk @Tiertime", + "Tiertime/Generic PLA Silk @Tiertime 300HS", + "Tiertime/Generic PLA-CF @Tiertime", + "Tiertime/Generic PLA-CF @Tiertime 300HS", + "Tiertime/Generic PP @Tiertime", + "Tiertime/Generic PP @Tiertime 300HS", + "Tiertime/Generic PP-CF @Tiertime", + "Tiertime/Generic PP-CF @Tiertime 300HS", + "Tiertime/Generic PP-GF @Tiertime", + "Tiertime/Generic PP-GF @Tiertime 300HS", + "Tiertime/Generic PPA-CF @Tiertime", + "Tiertime/Generic PPA-CF @Tiertime 300HS", + "Tiertime/Generic PPA-GF @Tiertime", + "Tiertime/Generic PPA-GF @Tiertime 300HS", + "Tiertime/Generic PPS @Tiertime", + "Tiertime/Generic PPS @Tiertime 300HS", + "Tiertime/Generic PPS-CF @Tiertime", + "Tiertime/Generic PPS-CF @Tiertime 300HS", + "Tiertime/Generic PVA @Tiertime", + "Tiertime/Generic PVA @Tiertime 300HS", + "Tiertime/Generic SBS @Tiertime", + "Tiertime/Generic SBS @Tiertime 300HS", + "Tiertime/Generic TPU @Tiertime", + "Tiertime/Generic TPU @Tiertime 300HS", "Tiertime/Tiertime ABS", "Tiertime/Tiertime ABS@300HS", "Tiertime/Tiertime ASA", "Tiertime/Tiertime ASA@300HS", - "Tiertime/Tiertime Generic ABS", - "Tiertime/Tiertime Generic ABS@300HS", - "Tiertime/Tiertime Generic ASA", - "Tiertime/Tiertime Generic ASA@300HS", - "Tiertime/Tiertime Generic BVOH", - "Tiertime/Tiertime Generic BVOH@300HS", - "Tiertime/Tiertime Generic EVA", - "Tiertime/Tiertime Generic EVA@300HS", - "Tiertime/Tiertime Generic HIPS", - "Tiertime/Tiertime Generic HIPS@300HS", - "Tiertime/Tiertime Generic PA", - "Tiertime/Tiertime Generic PA-CF", - "Tiertime/Tiertime Generic PA-CF@300HS", - "Tiertime/Tiertime Generic PA@300HS", - "Tiertime/Tiertime Generic PC", - "Tiertime/Tiertime Generic PC@300HS", - "Tiertime/Tiertime Generic PCTG", - "Tiertime/Tiertime Generic PCTG@300HS", - "Tiertime/Tiertime Generic PE", - "Tiertime/Tiertime Generic PE-CF", - "Tiertime/Tiertime Generic PE-CF@300HS", - "Tiertime/Tiertime Generic PE@300HS", - "Tiertime/Tiertime Generic PETG", - "Tiertime/Tiertime Generic PETG-CF", - "Tiertime/Tiertime Generic PETG-CF@300HS", - "Tiertime/Tiertime Generic PETG@300HS", - "Tiertime/Tiertime Generic PHA", - "Tiertime/Tiertime Generic PHA@300HS", - "Tiertime/Tiertime Generic PLA", - "Tiertime/Tiertime Generic PLA High Speed", - "Tiertime/Tiertime Generic PLA High Speed@300HS", - "Tiertime/Tiertime Generic PLA Silk", - "Tiertime/Tiertime Generic PLA Silk@300HS", - "Tiertime/Tiertime Generic PLA-CF", - "Tiertime/Tiertime Generic PLA-CF@300HS", - "Tiertime/Tiertime Generic PLA@300HS", - "Tiertime/Tiertime Generic PP", - "Tiertime/Tiertime Generic PP-CF", - "Tiertime/Tiertime Generic PP-CF@300HS", - "Tiertime/Tiertime Generic PP-GF", - "Tiertime/Tiertime Generic PP-GF@300HS", - "Tiertime/Tiertime Generic PP@300HS", - "Tiertime/Tiertime Generic PPA-CF", - "Tiertime/Tiertime Generic PPA-CF@300HS", - "Tiertime/Tiertime Generic PPA-GF", - "Tiertime/Tiertime Generic PPA-GF@300HS", - "Tiertime/Tiertime Generic PPS", - "Tiertime/Tiertime Generic PPS-CF", - "Tiertime/Tiertime Generic PPS-CF@300HS", - "Tiertime/Tiertime Generic PPS@300HS", - "Tiertime/Tiertime Generic PVA", - "Tiertime/Tiertime Generic PVA@300HS", - "Tiertime/Tiertime Generic SBS", - "Tiertime/Tiertime Generic SBS@300HS", - "Tiertime/Tiertime Generic TPU", - "Tiertime/Tiertime Generic TPU@300HS", "Tiertime/Tiertime PA6-CF", "Tiertime/Tiertime PA6-CF@300HS", "Tiertime/Tiertime PC", @@ -7657,8 +7128,8 @@ "Tiertime/Tiertime PVA@300HS", "Tiertime/Tiertime TPU 95A", "Tiertime/Tiertime TPU 95A@300HS", - "TwoTrees/TwoTrees Generic 95A TPU @SK1", - "TwoTrees/TwoTrees Generic HS PLA @SK1", + "TwoTrees/Generic 95A TPU @TwoTrees SK1", + "TwoTrees/Generic HS PLA @TwoTrees SK1", "Volumic/Désactivé", "Volumic/PA6 CF20 (Performance)", "Volumic/PETG ESD (Performance)", @@ -7686,16 +7157,16 @@ "Volumic/Volumic PVA-BVOH (Performance)", "Volumic/Volumic UNIVERSAL Ultra", "Volumic/Volumic UNIVERSAL Ultra (Performance)", - "Vzbot/Vzbot Generic ABS", - "Vzbot/Vzbot Generic ASA", - "Vzbot/Vzbot Generic PA", - "Vzbot/Vzbot Generic PA-CF", - "Vzbot/Vzbot Generic PC", - "Vzbot/Vzbot Generic PETG", - "Vzbot/Vzbot Generic PLA", - "Vzbot/Vzbot Generic PLA-CF", - "Vzbot/Vzbot Generic PVA", - "Vzbot/Vzbot Generic TPU", + "Vzbot/Generic ABS @Vzbot", + "Vzbot/Generic ASA @Vzbot", + "Vzbot/Generic PA @Vzbot", + "Vzbot/Generic PA-CF @Vzbot", + "Vzbot/Generic PC @Vzbot", + "Vzbot/Generic PETG @Vzbot", + "Vzbot/Generic PLA @Vzbot", + "Vzbot/Generic PLA-CF @Vzbot", + "Vzbot/Generic PVA @Vzbot", + "Vzbot/Generic TPU @Vzbot", "Wanhao France/YUMI PETG", "Wanhao France/YUMI PLA Bowden", "Wanhao France/YUMI PLA Direct Drive", @@ -7764,6 +7235,13 @@ "Soleyin Ultra PLA" ] ], + "OF0AquDh": [ + [ + "FusRock", + "PA", + "FusRock S-Multi" + ] + ], "OF0FfcAG": [ [ "Anycubic", @@ -7771,13 +7249,6 @@ "Anycubic TPU for ACE" ] ], - "OF0GIkJm": [ - [ - "Generic", - "PLA", - "Tiertime Generic PLA Silk" - ] - ], "OF0NgY1y": [ [ "COEX 3D", @@ -7890,13 +7361,6 @@ "Anycubic ASA" ] ], - "OF0zx94L": [ - [ - "Generic", - "PA", - "Vzbot Generic PA" - ] - ], "OF112FvY": [ [ "Generic", @@ -7904,13 +7368,6 @@ "Generic PETG Basic" ] ], - "OF1Id239": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG" - ] - ], "OF1N1qMK": [ [ "Polymaker", @@ -7918,13 +7375,6 @@ "Panchroma PLA UV Shift" ] ], - "OF1OZujR": [ - [ - "Generic", - "PVA", - "Flashforge Generic PVA" - ] - ], "OF1Pke8t": [ [ "Overture", @@ -7960,13 +7410,6 @@ "Snapmaker ASA" ] ], - "OF1daEUW": [ - [ - "Generic", - "PETG-CF", - "Anker Generic PETG-CF" - ] - ], "OF1dpPrW": [ [ "Bambu Lab", @@ -7981,13 +7424,6 @@ "Elegoo PLA PRO" ] ], - "OF1uR1t2": [ - [ - "Generic", - "PETG", - "Tiertime Generic PETG" - ] - ], "OF223rZv": [ [ "Anycubic", @@ -8016,13 +7452,6 @@ "SUNLU PETG" ] ], - "OF2RjrWH": [ - [ - "Generic", - "PAHT-GF", - "FusRock Generic PAHT-GF" - ] - ], "OF2TQpOO": [ [ "QIDI", @@ -8058,13 +7487,6 @@ "Arena PLA-CF" ] ], - "OF2mgDsI": [ - [ - "Generic", - "PLA", - "Vzbot Generic PLA" - ] - ], "OF2pj5l5": [ [ "Overture", @@ -8107,13 +7529,6 @@ "CR-Silk" ] ], - "OF3P0BQA": [ - [ - "Generic", - "ABS", - "Anker Generic ABS" - ] - ], "OF3WQaKK": [ [ "Creality", @@ -8149,20 +7564,6 @@ "Snapmaker Dual PETG-CF" ] ], - "OF3s929u": [ - [ - "Generic", - "PP", - "Tiertime Generic PP" - ] - ], - "OF3wxlw9": [ - [ - "CoLiDo", - "PETG", - "CoLiDo Generic PETG" - ] - ], "OF3ydJTT": [ [ "InfiMech", @@ -8177,13 +7578,6 @@ "Flashforge TPU-90A" ] ], - "OF42ZDpN": [ - [ - "Generic", - "PAHT", - "FusRock PAHT" - ] - ], "OF43Raws": [ [ "Polymaker", @@ -8205,13 +7599,6 @@ "FilAr PETG Azul Francia" ] ], - "OF48L671": [ - [ - "Generic", - "ASA", - "RatRig Generic ASA" - ] - ], "OF4APyxe": [ [ "Creality", @@ -8226,13 +7613,6 @@ "FilAr PLA" ] ], - "OF4Mf5Gz": [ - [ - "Generic", - "PETG", - "Creality Generic PETG" - ] - ], "OF4Nhggz": [ [ "Artillery", @@ -8261,13 +7641,6 @@ "Snapmaker PETG" ] ], - "OF4XAUnp": [ - [ - "Generic", - "ASA", - "Vzbot Generic ASA" - ] - ], "OF4f8vVp": [ [ "WonderMaker", @@ -8289,13 +7662,6 @@ "QIDI PLA Basic" ] ], - "OF4oCRKe": [ - [ - "Generic", - "PETG", - "DeltaMaker Generic PETG" - ] - ], "OF4ulo9Y": [ [ "WonderMaker", @@ -8303,27 +7669,6 @@ "WonderMaker PVA" ] ], - "OF4xhTuK": [ - [ - "Generic", - "PA-CF", - "OrcaArena Generic PA-CF" - ] - ], - "OF4zzGwp": [ - [ - "Generic", - "PET-GF", - "FusRock Generic PET-GF" - ] - ], - "OF51XQar": [ - [ - "Generic", - "PLA", - "C1 Generic PLA" - ] - ], "OF53eLVD": [ [ "Generic", @@ -8345,6 +7690,13 @@ "Prusament PA-CF" ] ], + "OF55jHAJ": [ + [ + "Generic", + "ABS", + "Generic ABS HF" + ] + ], "OF5BN24W": [ [ "Flashforge", @@ -8359,13 +7711,6 @@ "PolyLite PLA" ] ], - "OF5E5KNA": [ - [ - "Generic", - "PC", - "SecKit Generic PC" - ] - ], "OF5NQFKI": [ [ "Generic", @@ -8408,13 +7753,6 @@ "Artillery ASA" ] ], - "OF5Zk4e1": [ - [ - "Generic", - "ABS", - "Anycubic Generic ABS" - ] - ], "OF5c6nq3": [ [ "Generic", @@ -8471,13 +7809,6 @@ "FilAr PLA-mate Azul" ] ], - "OF5vzBhb": [ - [ - "Generic", - "PLA", - "Chuanying Generic PLA" - ] - ], "OF5w29Kq": [ [ "Generic", @@ -8513,13 +7844,6 @@ "Snapmaker Dual PLA-CF" ] ], - "OF6Fpw1E": [ - [ - "Generic", - "PETG", - "Comgrow Generic PETG" - ] - ], "OF6H51Xx": [ [ "Polymaker", @@ -8527,20 +7851,6 @@ "Polymaker PETG" ] ], - "OF6K467o": [ - [ - "InfiMech", - "PA-CF", - "InfiMech Generic PA-CF" - ] - ], - "OF6KELDx": [ - [ - "Co Print", - "PLA", - "CoPrint Generic PLA" - ] - ], "OF6Ll8lK": [ [ "Elegoo", @@ -8548,6 +7858,13 @@ "Elegoo PETG Translucent" ] ], + "OF6MMR8P": [ + [ + "Generic", + "TPU", + "Generic 95A TPU" + ] + ], "OF6MOPWx": [ [ "Generic", @@ -8576,13 +7893,6 @@ "Phrozen PLA" ] ], - "OF6WddJ1": [ - [ - "Generic", - "S-PAHT", - "FusRock S-PAHT" - ] - ], "OF6kj4jI": [ [ "iQ Materials", @@ -8597,13 +7907,6 @@ "FLSun S1 TPU" ] ], - "OF6rMr3U": [ - [ - "Generic", - "PA", - "FusRock Generic S-Multi" - ] - ], "OF6rdQ6M": [ [ "Generic", @@ -8611,13 +7914,6 @@ "Generic PPS-CF" ] ], - "OF6tKa1Z": [ - [ - "Generic", - "TPU", - "Anker Generic TPU" - ] - ], "OF6ueBwd": [ [ "Generic", @@ -8625,20 +7921,6 @@ "Flashforge PLA Pro" ] ], - "OF6vKLaU": [ - [ - "Generic", - "ASA", - "Artillery Generic ASA" - ] - ], - "OF6xLvYg": [ - [ - "InfiMech", - "PC", - "InfiMech Generic PC" - ] - ], "OF6zAVFj": [ [ "Generic", @@ -8709,13 +7991,6 @@ "Anycubic PLA Translucent" ] ], - "OF7g2vYQ": [ - [ - "Co Print", - "TPU", - "CoPrint Generic TPU" - ] - ], "OF7lOgYF": [ [ "Generic", @@ -8737,6 +8012,13 @@ "Eryone Silk PLA" ] ], + "OF7pjCsO": [ + [ + "FusRock", + "PAHT", + "FusRock PAHT" + ] + ], "OF7tt7DO": [ [ "Cubicon", @@ -8744,20 +8026,6 @@ "Cubicon PLA+" ] ], - "OF7uE5KB": [ - [ - "Generic", - "PA-CF", - "Anker Generic PA-CF" - ] - ], - "OF8CXrvm": [ - [ - "Generic", - "PA", - "SecKit Generic PA" - ] - ], "OF8GnyFU": [ [ "Creality", @@ -8793,13 +8061,6 @@ "FilAr PLA Amarillo Lirio" ] ], - "OF8bLDu7": [ - [ - "Generic", - "PA-CF", - "Blocks Generic PA-CF" - ] - ], "OF8dCquh": [ [ "Snapmaker", @@ -8849,13 +8110,6 @@ "Artillery PETG Basic" ] ], - "OF97ru74": [ - [ - "Generic", - "PC", - "Prusa Generic PC" - ] - ], "OF995YXg": [ [ "Generic", @@ -8919,13 +8173,6 @@ "RatRig PunkFil PETG" ] ], - "OF9fOPpd": [ - [ - "Generic", - "PC", - "Vzbot Generic PC" - ] - ], "OF9z5LZ9": [ [ "Generic", @@ -8947,13 +8194,6 @@ "Artillery PLA Matte" ] ], - "OFACSw9O": [ - [ - "Generic", - "PLA", - "Creality Generic PLA" - ] - ], "OFAIBCLJ": [ [ "Generic", @@ -9010,27 +8250,6 @@ "FilAr PLA Marron Oxido" ] ], - "OFB09fpe": [ - [ - "Generic", - "TPU", - "RatRig Generic TPU" - ] - ], - "OFB0a3hT": [ - [ - "Generic", - "PLA-CF", - "Anker Generic PLA-CF" - ] - ], - "OFB1Tv1E": [ - [ - "Generic", - "PA", - "Anycubic Generic PA" - ] - ], "OFB5SmWk": [ [ "Valment", @@ -9038,20 +8257,6 @@ "Valment PLA Galaxy" ] ], - "OFB8wSps": [ - [ - "Generic", - "PET-CF", - "FusRock PET-CF" - ] - ], - "OFB9dx27": [ - [ - "Generic", - "ASA", - "Blocks Generic ASA" - ] - ], "OFBBgw7B": [ [ "WonderMaker", @@ -9059,20 +8264,6 @@ "WonderMaker PLA Wood" ] ], - "OFBC32Wb": [ - [ - "Generic", - "PET", - "FusRock PET" - ] - ], - "OFBIadjM": [ - [ - "Generic", - "ASA", - "Chuanying Generic ASA" - ] - ], "OFBJAdLw": [ [ "LH Stinger", @@ -9122,20 +8313,6 @@ "PolyLite PLA Luminous" ] ], - "OFBpcB0a": [ - [ - "Generic", - "PLA", - "TwoTrees Generic HS PLA" - ] - ], - "OFBtlI8M": [ - [ - "FlyingBear", - "ABS", - "FlyingBear Generic ABS" - ] - ], "OFBw6eEG": [ [ "Overture", @@ -9150,13 +8327,6 @@ "Hyper Luminous" ] ], - "OFC20UMj": [ - [ - "Generic", - "TPU", - "Flashforge Generic TPU" - ] - ], "OFC5f4Ay": [ [ "Generic", @@ -9199,13 +8369,6 @@ "HP Ultra PLA" ] ], - "OFCVUEaV": [ - [ - "Generic", - "TPU", - "Tiertime Generic TPU" - ] - ], "OFCZsqXg": [ [ "Creality", @@ -9213,13 +8376,6 @@ "Hyper PLA" ] ], - "OFCaJHAA": [ - [ - "Generic", - "PAHT", - "FusRock Generic S-PAHT" - ] - ], "OFCccVrQ": [ [ "Polymaker", @@ -9227,13 +8383,6 @@ "PolyTerra Dual PLA" ] ], - "OFCcsYtf": [ - [ - "Generic", - "ASA", - "FLSun Generic ASA" - ] - ], "OFCidU7j": [ [ "DREMC", @@ -9248,6 +8397,13 @@ "FilAr PLA-mate Verde" ] ], + "OFCn83wF": [ + [ + "FusRock", + "PAHT", + "FusRock S-PAHT" + ] + ], "OFCnywiC": [ [ "Tiertime", @@ -9269,13 +8425,6 @@ "Anycubic PLA SE" ] ], - "OFCu3jES": [ - [ - "Generic", - "PETG", - "Yumi Generic PETG" - ] - ], "OFCuaCer": [ [ "Volumic", @@ -9290,20 +8439,6 @@ "Cubicon PA-CF" ] ], - "OFD2JNS1": [ - [ - "Generic", - "PLA", - "Dremel Generic PLA" - ] - ], - "OFD6kN7F": [ - [ - "Generic", - "PLA", - "OrcaArena Generic PLA" - ] - ], "OFD8loeT": [ [ "re3D", @@ -9388,13 +8523,6 @@ "Valment PLA" ] ], - "OFDeTsJw": [ - [ - "Generic", - "HIPS", - "Chuanying Generic HIPS" - ] - ], "OFDgQaca": [ [ "FlyingBear", @@ -9416,6 +8544,13 @@ "Generic Support for PA" ] ], + "OFDu1qE7": [ + [ + "FusRock", + "PET-CF", + "FusRock PET-CF" + ] + ], "OFDvXujf": [ [ "Generic", @@ -9430,6 +8565,13 @@ "Overture ABS Basic" ] ], + "OFDwBwO5": [ + [ + "Generic", + "PVA", + "Generic PVA HF" + ] + ], "OFDxfPgH": [ [ "Bambu Lab", @@ -9444,13 +8586,6 @@ "COEX TPU 60A" ] ], - "OFEE1Dld": [ - [ - "Generic", - "TPU", - "Artillery Generic TPU" - ] - ], "OFEGNJD4": [ [ "Bambu Lab", @@ -9479,13 +8614,6 @@ "Snapmaker PLA Lite" ] ], - "OFETFWx7": [ - [ - "Generic", - "PLA", - "SecKit Generic PLA" - ] - ], "OFEWYR89": [ [ "Generic", @@ -9500,13 +8628,6 @@ "FilAr PLA-mate Uva" ] ], - "OFEZNNw1": [ - [ - "Generic", - "PA", - "RatRig Generic PA" - ] - ], "OFEZpel7": [ [ "Volumic", @@ -9591,13 +8712,6 @@ "Generic TPU 64D" ] ], - "OFF73Bvp": [ - [ - "Generic", - "PLA-CF", - "SecKit Generic PLA-CF" - ] - ], "OFF9OKoY": [ [ "Polymaker", @@ -9647,13 +8761,6 @@ "FlyingBear PC" ] ], - "OFFZ0BBL": [ - [ - "FlyingBear", - "PLA", - "FlyingBear Generic PLA" - ] - ], "OFFZ458u": [ [ "Polymaker", @@ -9689,13 +8796,6 @@ "Anycubic PLA Silk" ] ], - "OFFxZ7hZ": [ - [ - "Generic", - "PLA-CF", - "Chuanying Generic PLA-CF10" - ] - ], "OFG0kOKX": [ [ "Volumic", @@ -9717,20 +8817,6 @@ "Qidi ASA-Aero" ] ], - "OFGDaEHO": [ - [ - "Generic", - "BVOH", - "Tiertime Generic BVOH" - ] - ], - "OFGGyAgJ": [ - [ - "Generic", - "TPU", - "Vzbot Generic TPU" - ] - ], "OFGJ1nxs": [ [ "Other", @@ -9738,27 +8824,6 @@ "Other PLA" ] ], - "OFGKLoUm": [ - [ - "Generic", - "TPU", - "Anycubic Generic TPU" - ] - ], - "OFGLeiNL": [ - [ - "Generic", - "PLA", - "Yumi Generic PLA" - ] - ], - "OFGPJxnt": [ - [ - "Generic", - "PC", - "Anker Generic PC" - ] - ], "OFGVwfK0": [ [ "FilAr", @@ -9822,13 +8887,6 @@ "CR-Wood" ] ], - "OFGzUNbm": [ - [ - "Generic", - "PPS-CF", - "Tiertime Generic PPS-CF" - ] - ], "OFH2nN08": [ [ "Eolas Prints", @@ -9871,20 +8929,6 @@ "FilAr PLA Blanco Antartida" ] ], - "OFHFZ1Te": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA Silk" - ] - ], - "OFHQUAoZ": [ - [ - "Generic", - "PA-CF", - "FLSun Generic PA-CF" - ] - ], "OFHTVfaU": [ [ "Generic", @@ -9892,13 +8936,6 @@ "Sovol Zero PETG" ] ], - "OFHUnLY2": [ - [ - "Generic", - "PETG", - "Vzbot Generic PETG" - ] - ], "OFHWSM21": [ [ "Polymaker", @@ -9906,13 +8943,6 @@ "Fiberon PET-CF" ] ], - "OFHa3RZT": [ - [ - "Generic", - "PA-CF", - "Tiertime Generic PA-CF" - ] - ], "OFHa48An": [ [ "Bambu Lab", @@ -9962,13 +8992,6 @@ "Arena Support W" ] ], - "OFI80Hct": [ - [ - "Generic", - "ASA", - "Anycubic Generic ASA" - ] - ], "OFIBXa0k": [ [ "FilAr", @@ -9990,6 +9013,13 @@ "FLSun S1 ASA" ] ], + "OFIKZxPF": [ + [ + "Generic", + "PLA", + "Generic PLA Wood" + ] + ], "OFIPjqHt": [ [ "Orca Arena", @@ -10018,13 +9048,6 @@ "HATCHBOX PETG" ] ], - "OFIYTy8S": [ - [ - "Generic", - "PLA", - "Anker Generic PLA+" - ] - ], "OFIZMQwM": [ [ "LH Stinger", @@ -10039,20 +9062,6 @@ "FilAr PLA Gris Ceniza" ] ], - "OFIda816": [ - [ - "Generic", - "PVA", - "Vzbot Generic PVA" - ] - ], - "OFIeCuXj": [ - [ - "Generic", - "PETG", - "Peopoly Generic PETG" - ] - ], "OFIegjmD": [ [ "Eolas Prints", @@ -10074,13 +9083,6 @@ "Anycubic PLA Luminous" ] ], - "OFIieIka": [ - [ - "Generic", - "PA", - "Polymaker CoPA" - ] - ], "OFIxOuOu": [ [ "Polymaker", @@ -10095,13 +9097,6 @@ "Flashforge PLA Basic" ] ], - "OFIy3kLw": [ - [ - "Generic", - "PA", - "Prusa Generic PA" - ] - ], "OFJ3HRsR": [ [ "Orca Arena", @@ -10123,13 +9118,6 @@ "DREMC PLA+ HS" ] ], - "OFJJpaLS": [ - [ - "Generic", - "PETG", - "FLSun Generic PETG" - ] - ], "OFJNeELv": [ [ "FILL3D", @@ -10151,13 +9139,6 @@ "FilAr PETG Cristal" ] ], - "OFJSksUs": [ - [ - "Generic", - "PLA", - "FLSun Generic PLA" - ] - ], "OFJVFpJz": [ [ "Generic", @@ -10228,20 +9209,6 @@ "YUMI PLA Direct Drive" ] ], - "OFK01afJ": [ - [ - "Generic", - "PC", - "Qidi Generic PC" - ] - ], - "OFK4LdYI": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA HF" - ] - ], "OFK74HJD": [ [ "Generic", @@ -10270,11 +9237,11 @@ "FilAr PLA Gris Plata" ] ], - "OFKNAhls": [ + "OFKTGKJU": [ [ - "Generic", - "PETG", - "Qidi Generic PETG" + "FusRock", + "PET", + "FusRock PET" ] ], "OFKTSiYF": [ @@ -10291,6 +9258,13 @@ "Snapmaker Dual ASA" ] ], + "OFKW5hEW": [ + [ + "FusRock", + "PAHT-CF", + "FusRock PAHT-CF" + ] + ], "OFKWWgyp": [ [ "FilAr", @@ -10354,20 +9328,6 @@ "Flashforge TPU 65D" ] ], - "OFKuTr12": [ - [ - "Generic", - "PE", - "Tiertime Generic PE" - ] - ], - "OFKyCgaK": [ - [ - "Generic", - "PLA", - "Anycubic Generic PLA" - ] - ], "OFL9aRjN": [ [ "Snapmaker", @@ -10382,13 +9342,6 @@ "WonderMaker TPU 95A" ] ], - "OFLBUkwC": [ - [ - "Generic", - "ABS", - "Vzbot Generic ABS" - ] - ], "OFLC1oRH": [ [ "Flashforge", @@ -10396,13 +9349,6 @@ "Flashforge PPA-CF" ] ], - "OFLDSqqi": [ - [ - "Generic", - "ABS", - "Flashforge Generic ABS" - ] - ], "OFLJ8S6I": [ [ "SUNLU", @@ -10501,20 +9447,6 @@ "Hyper PETG-GF" ] ], - "OFLrdHse": [ - [ - "Generic", - "PLA", - "Flashforge Generic HS PLA" - ] - ], - "OFLuczRG": [ - [ - "Generic", - "ASA", - "Creality Generic ASA-CF" - ] - ], "OFLzx3J4": [ [ "Creality", @@ -10536,13 +9468,6 @@ "Generic PA12-CF" ] ], - "OFM87w9T": [ - [ - "Generic", - "SBS", - "Tiertime Generic SBS" - ] - ], "OFM91vZs": [ [ "Overture", @@ -10557,13 +9482,6 @@ "QIDI TPU-Aero" ] ], - "OFMEbuBE": [ - [ - "Generic", - "TPU", - "Blocks Generic TPU" - ] - ], "OFMIma8C": [ [ "Generic", @@ -10571,13 +9489,6 @@ "Flashforge PLA Luminous" ] ], - "OFMIurFh": [ - [ - "Generic", - "PLA", - "Creality HF Generic Speed PLA" - ] - ], "OFMK5gVo": [ [ "WonderMaker", @@ -10599,13 +9510,6 @@ "Artillery PA" ] ], - "OFMTBcnz": [ - [ - "Generic", - "PP-CF", - "Tiertime Generic PP-CF" - ] - ], "OFMTK0UC": [ [ "Bambu Lab", @@ -10620,13 +9524,6 @@ "SUNLU PLA+" ] ], - "OFMZAoqa": [ - [ - "Generic", - "PVA", - "Tiertime Generic PVA" - ] - ], "OFMZvH0z": [ [ "Overture", @@ -10634,13 +9531,6 @@ "Overture Rock PLA" ] ], - "OFMgJQCZ": [ - [ - "Generic", - "PA", - "Anker Generic PA" - ] - ], "OFMjtqTC": [ [ "Bambu Lab", @@ -10648,13 +9538,6 @@ "Bambu PLA Wood" ] ], - "OFMoLF46": [ - [ - "Generic", - "TPU", - "FLSun Generic TPU" - ] - ], "OFMpxamb": [ [ "Flashforge", @@ -10662,13 +9545,6 @@ "Flashforge PETG" ] ], - "OFMqYusc": [ - [ - "Generic", - "PA", - "Creality Generic PA" - ] - ], "OFMsDGbs": [ [ "Anycubic", @@ -10690,13 +9566,6 @@ "Flashforge PETG Transparent" ] ], - "OFN7aNHe": [ - [ - "Generic", - "PC", - "Tiertime Generic PC" - ] - ], "OFN9fefN": [ [ "Cubicon", @@ -10718,20 +9587,6 @@ "Tiertime PLA" ] ], - "OFNLXV8X": [ - [ - "Generic", - "ABS", - "Tiertime Generic ABS" - ] - ], - "OFNOxcYl": [ - [ - "Generic", - "PA-CF", - "RatRig Generic PA-CF" - ] - ], "OFNQKF0M": [ [ "Tiertime", @@ -10753,13 +9608,6 @@ "FilAr PETG Azul Boreal" ] ], - "OFNW4ZTC": [ - [ - "Generic", - "PLA", - "Creality Generic PLA Wood" - ] - ], "OFNWcJsM": [ [ "Generic", @@ -10781,20 +9629,6 @@ "Sovol Zero ABS" ] ], - "OFNYewRS": [ - [ - "Generic", - "PLA", - "Blocks Generic PLA" - ] - ], - "OFNZYgLA": [ - [ - "Generic", - "PVA", - "Qidi Generic PVA" - ] - ], "OFNZjrLo": [ [ "Generic", @@ -10802,13 +9636,6 @@ "Sovol SV06 Plus ACE PLA" ] ], - "OFNcdCrm": [ - [ - "Generic", - "PLA-CF", - "Anycubic Generic PLA-CF" - ] - ], "OFNemJM6": [ [ "FilAr", @@ -10816,11 +9643,11 @@ "FilAr PLA Cobre" ] ], - "OFNiSLfL": [ + "OFNjku08": [ [ "Generic", - "PP", - "Generic PP-GF" + "PETG", + "Generic High Flow PETG" ] ], "OFNk8bxk": [ @@ -10830,13 +9657,6 @@ "Bambu PA6-GF" ] ], - "OFNn21yM": [ - [ - "Generic", - "PA-CF", - "Vzbot Generic PA-CF" - ] - ], "OFNstOna": [ [ "Eryone", @@ -10893,13 +9713,6 @@ "VXL90 TiQ2 P2" ] ], - "OFOKYhi6": [ - [ - "Generic", - "PETG", - "Prusa Generic PETG HF" - ] - ], "OFOPU1xv": [ [ "Snapmaker", @@ -11019,20 +9832,6 @@ "Eolas Prints PLA INGEO 870" ] ], - "OFPdhDlK": [ - [ - "Generic", - "PA-CF", - "Anycubic Generic PA-CF" - ] - ], - "OFPjOUtz": [ - [ - "Generic", - "PAHT-CF", - "FusRock Generic PAHT-CF" - ] - ], "OFPkCJKE": [ [ "Polymaker", @@ -11068,13 +9867,6 @@ "Lulzbot 2.85mm PLA" ] ], - "OFPy0Ogq": [ - [ - "Generic", - "PA-CF", - "Qidi Generic PA-CF" - ] - ], "OFQ1KzO8": [ [ "Snapmaker", @@ -11103,13 +9895,6 @@ "QIDI PETG Tough" ] ], - "OFQ7I5vC": [ - [ - "Generic", - "PLA-CF", - "Prusa Generic PLA-CF" - ] - ], "OFQ9qnkd": [ [ "Generic", @@ -11117,13 +9902,6 @@ "FLSun T1 PLA High Speed" ] ], - "OFQC8Vna": [ - [ - "Generic", - "PETG-CF", - "Flashforge Generic PETG-CF" - ] - ], "OFQEGL7z": [ [ "FlyingBear", @@ -11166,13 +9944,6 @@ "QIDI ABS-GF10" ] ], - "OFQTrLXB": [ - [ - "Generic", - "PLA-CF", - "Qidi Generic PLA-CF" - ] - ], "OFQWIKbV": [ [ "FilAr", @@ -11201,13 +9972,6 @@ "FILL3D PETG" ] ], - "OFQbqeN7": [ - [ - "Generic", - "PA", - "Qidi Generic PA" - ] - ], "OFQdaVZS": [ [ "Generic", @@ -11229,11 +9993,11 @@ "Flashforge PVA" ] ], - "OFQswlnF": [ + "OFQyyO0l": [ [ - "Generic", + "Polymaker", "PA", - "Tiertime Generic PA" + "Polymaker CoPA" ] ], "OFR0gODA": [ @@ -11250,13 +10014,6 @@ "QIDI TPU 95A-HF" ] ], - "OFRDLNM9": [ - [ - "Generic", - "PLA", - "Peopoly Generic PLA" - ] - ], "OFRJ325z": [ [ "LH Stinger", @@ -11264,13 +10021,6 @@ "LHS PETG" ] ], - "OFRPEs5o": [ - [ - "Generic", - "ASA", - "Flashforge Generic ASA" - ] - ], "OFRhBryT": [ [ "Cubicon", @@ -11306,13 +10056,6 @@ "Panchroma PLA Celestial" ] ], - "OFRiyes1": [ - [ - "Generic", - "ASA", - "Anker Generic ASA" - ] - ], "OFRkjhxK": [ [ "Volumic", @@ -11341,20 +10084,6 @@ "DeltaMaker Brand PLA" ] ], - "OFRujL0v": [ - [ - "Generic", - "PET-CF", - "FusRock Generic PET-CF" - ] - ], - "OFRusgEn": [ - [ - "Generic", - "PVA", - "Chuanying Generic PVA" - ] - ], "OFRyOsZj": [ [ "re3D", @@ -11369,13 +10098,6 @@ "eSUN ePLA-LW" ] ], - "OFRzsaDK": [ - [ - "FlyingBear", - "TPU", - "FlyingBear Generic TPU" - ] - ], "OFS2tn6G": [ [ "Polymaker", @@ -11390,13 +10112,6 @@ "Eryone PA" ] ], - "OFS8JF3S": [ - [ - "Generic", - "PLA", - "Qidi Generic PLA High Speed" - ] - ], "OFS8lTQt": [ [ "Polymaker", @@ -11404,27 +10119,6 @@ "Panchroma PLA Silk" ] ], - "OFSDFYs4": [ - [ - "Generic", - "PLA-CF", - "Creality Generic PLA-CF" - ] - ], - "OFSGbf2I": [ - [ - "Generic", - "PVA", - "Anycubic Generic PVA" - ] - ], - "OFSPdsuW": [ - [ - "Generic", - "PPA-CF", - "Tiertime Generic PPA-CF" - ] - ], "OFSStjay": [ [ "Generic", @@ -11474,13 +10168,6 @@ "Bambu PLA Impact" ] ], - "OFTKFAZ4": [ - [ - "Generic", - "PCTG", - "Tiertime Generic PCTG" - ] - ], "OFTOPcx0": [ [ "Eolas Prints", @@ -11565,13 +10252,6 @@ "Sovol SV06 ACE PLA" ] ], - "OFU0n0zW": [ - [ - "Generic", - "PLA", - "FLSun T1 PLA Generic" - ] - ], "OFU1zPxE": [ [ "Elegoo", @@ -11586,27 +10266,6 @@ "re3D PC" ] ], - "OFU3zwPc": [ - [ - "Generic", - "TPU", - "Prusa Generic TPU HF" - ] - ], - "OFU5N9jI": [ - [ - "Generic", - "TPU", - "OrcaArena Generic TPU" - ] - ], - "OFU6fjbi": [ - [ - "Co Print", - "ABS", - "CoPrint Generic ABS" - ] - ], "OFU7CKZt": [ [ "Volumic", @@ -11642,20 +10301,6 @@ "Snapmaker Dual PET" ] ], - "OFUScM0D": [ - [ - "Generic", - "S-Multi", - "FusRock S-Multi" - ] - ], - "OFUWRqwb": [ - [ - "Generic", - "PA-CF", - "Creality Generic PA-CF" - ] - ], "OFUYCqtB": [ [ "InfiMech", @@ -11670,13 +10315,6 @@ "Anycubic PEBA 95A" ] ], - "OFUaVAdj": [ - [ - "Generic", - "ASA", - "Tiertime Generic ASA" - ] - ], "OFUanySo": [ [ "Bambu Lab", @@ -11691,20 +10329,6 @@ "eSUN ASA+" ] ], - "OFUrStd6": [ - [ - "Generic", - "PETG", - "RatRig Generic PCTG" - ] - ], - "OFUtGagr": [ - [ - "Generic", - "PLA-CF", - "Artillery Generic PLA-CF" - ] - ], "OFUyDDNv": [ [ "Elegoo", @@ -11761,13 +10385,6 @@ "QIDI PETG Tough 0.2 nozzle" ] ], - "OFVKADz5": [ - [ - "Generic", - "PLA", - "Comgrow Generic PLA" - ] - ], "OFVptRxp": [ [ "COEX 3D", @@ -11775,13 +10392,6 @@ "COEX TPE 30D" ] ], - "OFVqZ2H0": [ - [ - "Generic", - "PC", - "FLSun Generic PC" - ] - ], "OFVtIasg": [ [ "Eryone", @@ -11810,13 +10420,6 @@ "Snapmaker PETG Translucent" ] ], - "OFW9uIkE": [ - [ - "Generic", - "HIPS", - "Tiertime Generic HIPS" - ] - ], "OFWDe7YH": [ [ "QIDI", @@ -11824,13 +10427,6 @@ "QIDI UltraPA" ] ], - "OFWIr7ZE": [ - [ - "CoLiDo", - "ABS", - "CoLiDo Generic ABS" - ] - ], "OFWRITFw": [ [ "Prusa Polymers", @@ -11852,13 +10448,6 @@ "FilAr PLA Bronce" ] ], - "OFWY6vBh": [ - [ - "Generic", - "PC", - "Anycubic Generic PC" - ] - ], "OFWYtgCa": [ [ "Elegoo", @@ -11873,13 +10462,6 @@ "Volumic NYLON Ultra" ] ], - "OFWadebJ": [ - [ - "Generic", - "PETG-CF", - "Tiertime Generic PETG-CF" - ] - ], "OFWao3Ic": [ [ "Creality", @@ -11887,13 +10469,6 @@ "Ender-PLA" ] ], - "OFWbbuRY": [ - [ - "InfiMech", - "ABS", - "InfiMech Generic ABS" - ] - ], "OFWbdGsC": [ [ "Generic", @@ -11915,20 +10490,6 @@ "Flashforge ASA-GF" ] ], - "OFWof1Ap": [ - [ - "Generic", - "ABS", - "FLSun Generic ABS" - ] - ], - "OFWukXja": [ - [ - "Generic", - "TPU", - "Qidi Generic TPU 95A" - ] - ], "OFWwF7K7": [ [ "FilAr", @@ -11936,13 +10497,6 @@ "FilAr PLA Cafe con Leche" ] ], - "OFWzr7m0": [ - [ - "Generic", - "PETG", - "Anycubic Generic PETG" - ] - ], "OFX0etlv": [ [ "re3D", @@ -11999,20 +10553,6 @@ "Elas PETG Basic" ] ], - "OFXXUHSG": [ - [ - "Generic", - "PETG-CF", - "Chuanying Generic PETG-CF10" - ] - ], - "OFXhZ3uY": [ - [ - "Generic", - "PC", - "OrcaArena Generic PC" - ] - ], "OFXi59OX": [ [ "Afinia", @@ -12034,6 +10574,13 @@ "Generic PP-CF" ] ], + "OFXmv5p0": [ + [ + "Generic", + "PLA", + "Generic Speed PLA" + ] + ], "OFXn3Vd9": [ [ "QIDI", @@ -12055,20 +10602,6 @@ "Volumic PLA Ultra" ] ], - "OFXuwtnq": [ - [ - "Co Print", - "PETG", - "CoPrint Generic PETG" - ] - ], - "OFXyyfX6": [ - [ - "Generic", - "PLA", - "Anker Generic PLA Silk" - ] - ], "OFXz7Mwx": [ [ "Elegoo", @@ -12125,20 +10658,6 @@ "PolyLite Dual PLA" ] ], - "OFYHzKyS": [ - [ - "Generic", - "PLA-CF", - "Vzbot Generic PLA-CF" - ] - ], - "OFYPdJ7t": [ - [ - "Generic", - "ABS", - "Creality Generic ABS" - ] - ], "OFYPdQJh": [ [ "Generic", @@ -12160,34 +10679,6 @@ "FlyingBear TPU" ] ], - "OFYl0c8v": [ - [ - "Generic", - "HIPS", - "Flashforge Generic HIPS" - ] - ], - "OFYlZMmy": [ - [ - "Generic", - "TPU", - "Chuanying Generic TPU" - ] - ], - "OFYlthXI": [ - [ - "Generic", - "PLA-CF", - "Flashforge Generic PLA-CF" - ] - ], - "OFYtS9zg": [ - [ - "Generic", - "PAHT-CF", - "FusRock PAHT-CF" - ] - ], "OFYuowge": [ [ "Other", @@ -12195,13 +10686,6 @@ "Other ABS" ] ], - "OFYvSO1W": [ - [ - "Generic", - "PLA", - "Flashforge Generic PLA-Silk" - ] - ], "OFZ0mR5b": [ [ "Anycubic", @@ -12209,13 +10693,6 @@ "Anycubic PLA-CF" ] ], - "OFZ1hANN": [ - [ - "FusRock", - "PA-CF", - "FusRock Generic NexPA-CF25" - ] - ], "OFZ2LuAi": [ [ "Yumi", @@ -12237,20 +10714,6 @@ "FilAr PLA Rosa Flamenco" ] ], - "OFZ4fTO8": [ - [ - "Generic", - "PETG", - "C1 Generic High Flow PETG" - ] - ], - "OFZHgTVI": [ - [ - "Generic", - "PETG", - "Flashforge Generic PETG" - ] - ], "OFZLtWYs": [ [ "QIDI", @@ -12265,13 +10728,6 @@ "QIDI PPS-CF" ] ], - "OFZPlCck": [ - [ - "Generic", - "ABS", - "Chuanying Generic ABS" - ] - ], "OFZivHGL": [ [ "Snapmaker", @@ -12279,11 +10735,11 @@ "Snapmaker Dual PLA" ] ], - "OFZsChIG": [ + "OFZr862X": [ [ "Generic", - "TPU", - "Qidi Generic TPU" + "PLA", + "Generic PLA HF" ] ], "OFZtOQtl": [ @@ -12314,6 +10770,13 @@ "FilAr PLA Celeste Cielo" ] ], + "OFaDsTE0": [ + [ + "Polymaker", + "PA", + "Polymaker S1" + ] + ], "OFaEesXQ": [ [ "FilAr", @@ -12363,13 +10826,6 @@ "SeeMeCNC PETG-CF" ] ], - "OFaU2JxD": [ - [ - "Generic", - "PLA", - "Dremel Generic PLA" - ] - ], "OFaYz8iE": [ [ "Elas", @@ -12398,13 +10854,6 @@ "Cubicon ABS" ] ], - "OFahE7HP": [ - [ - "Generic", - "PC", - "Blocks Generic PC" - ] - ], "OFausr3F": [ [ "FilAr", @@ -12433,6 +10882,13 @@ "Eolas Prints PLA Silk" ] ], + "OFbPuPKY": [ + [ + "Generic", + "FLEX", + "Generic FLEX" + ] + ], "OFbSChKb": [ [ "SeeMeCNC", @@ -12447,20 +10903,6 @@ "InfiMech TPU Basic" ] ], - "OFbeeFkl": [ - [ - "Generic", - "PLA", - "OrcaArena Generic PLA Silk" - ] - ], - "OFbenYUK": [ - [ - "Generic", - "TPU", - "Prusa Generic TPU" - ] - ], "OFbh7HcA": [ [ "Eryone", @@ -12475,20 +10917,6 @@ "FLSun T1 ASA" ] ], - "OFbt04e0": [ - [ - "Generic", - "TPU", - "DeltaMaker Generic TPU" - ] - ], - "OFc0xiCz": [ - [ - "InfiMech", - "TPU", - "InfiMech Generic TPU" - ] - ], "OFc3xdm9": [ [ "Overture", @@ -12510,13 +10938,6 @@ "Snapmaker Dual TPU High-Flow" ] ], - "OFcCzEkS": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA" - ] - ], "OFcJ7AKd": [ [ "Generic", @@ -12538,6 +10959,13 @@ "PA6 CF20 (Performance)" ] ], + "OFcVLpNA": [ + [ + "FusRock", + "PAHT-GF", + "FusRock PAHT-GF" + ] + ], "OFcdqaWI": [ [ "Generic", @@ -12559,13 +10987,6 @@ "WonderMaker PLA Metal" ] ], - "OFctbSkL": [ - [ - "Generic", - "ASA", - "Blocks Generic ASA-CF" - ] - ], "OFctg8r1": [ [ "CoLiDo", @@ -12594,13 +11015,6 @@ "Generic PE-CF" ] ], - "OFd10YeG": [ - [ - "Generic", - "PLA", - "RatRig Generic PLA" - ] - ], "OFd2vX0G": [ [ "COEX 3D", @@ -12622,20 +11036,6 @@ "Snapmaker J1 PLA-CF" ] ], - "OFdEIwxy": [ - [ - "Generic", - "PLA-CF", - "Flashforge Generic PLA-CF10" - ] - ], - "OFdHsxB4": [ - [ - "Generic", - "TPU", - "TwoTrees Generic 95A TPU" - ] - ], "OFdI4zMo": [ [ "DREMC", @@ -12643,20 +11043,6 @@ "DREMC ASA CF" ] ], - "OFdLdGgJ": [ - [ - "Generic", - "PVA", - "OrcaArena Generic PVA" - ] - ], - "OFdOWhCa": [ - [ - "Generic", - "PC", - "RatRig Generic PC" - ] - ], "OFdXVjGZ": [ [ "Tiertime", @@ -12664,13 +11050,6 @@ "Tiertime PC" ] ], - "OFdXgp2K": [ - [ - "Generic", - "PLA", - "Chuanying Generic HS PLA" - ] - ], "OFdb8YNz": [ [ "FilAr", @@ -12692,13 +11071,6 @@ "Cubicon PLAi21" ] ], - "OFdlGycb": [ - [ - "CoLiDo", - "TPU", - "CoLiDo Generic TPU" - ] - ], "OFdrYBmI": [ [ "Tiertime", @@ -12741,13 +11113,6 @@ "Sovol SV06 ACE PETG" ] ], - "OFe8UJXH": [ - [ - "Generic", - "PC", - "Creality Generic PC" - ] - ], "OFe8tuNb": [ [ "Tiertime", @@ -12776,13 +11141,6 @@ "QIDI ABS Rapido Metal" ] ], - "OFeDfaCh": [ - [ - "CoLiDo", - "PLA", - "CoLiDo Generic PLA" - ] - ], "OFeIyhUx": [ [ "Anycubic", @@ -12790,20 +11148,6 @@ "Anycubic PC-CF" ] ], - "OFeJjoKF": [ - [ - "Generic", - "PA", - "FLSun Generic PA" - ] - ], - "OFeK2vkS": [ - [ - "Generic", - "PLA", - "Chuanying Generic PLA-Silk" - ] - ], "OFeTATC7": [ [ "Snapmaker", @@ -12853,13 +11197,6 @@ "Generic PLA Silk" ] ], - "OFetENFF": [ - [ - "Generic", - "ABS", - "OrcaArena Generic ABS" - ] - ], "OFexaZU2": [ [ "FilAr", @@ -12951,13 +11288,6 @@ "Polymaker PLA-HT" ] ], - "OFfZ0lTS": [ - [ - "Generic", - "PETG-CF", - "Qidi Generic PETG-CF" - ] - ], "OFfZcoKr": [ [ "FilAr", @@ -12972,13 +11302,6 @@ "Artillery PC" ] ], - "OFfegVpA": [ - [ - "Polymaker", - "PA", - "Polymaker Generic S1" - ] - ], "OFfmHUkQ": [ [ "Snapmaker", @@ -13035,20 +11358,6 @@ "Creality Silk PLA" ] ], - "OFfxFQf9": [ - [ - "Generic", - "PETG", - "Chuanying Generic PETG" - ] - ], - "OFfznI0Q": [ - [ - "Generic", - "PA-CF", - "Prusa Generic PA-CF" - ] - ], "OFg3cWVt": [ [ "Snapmaker", @@ -13091,20 +11400,6 @@ "FilAr PLA Negro Azabache" ] ], - "OFgSEwOZ": [ - [ - "Generic", - "PETG", - "OrcaArena Generic PETG" - ] - ], - "OFgSPtDn": [ - [ - "Generic", - "PEEK", - "MM Generic PEEK" - ] - ], "OFgSbX7E": [ [ "Volumic", @@ -13112,13 +11407,6 @@ "Volumic PC (Performance)" ] ], - "OFgVJhVt": [ - [ - "Generic", - "PLA-CF", - "Tiertime Generic PLA-CF" - ] - ], "OFgVQkqW": [ [ "Cubicon", @@ -13196,13 +11484,6 @@ "Arena PLA Matte" ] ], - "OFgvOmM2": [ - [ - "Generic", - "PETG", - "Anker Generic PETG" - ] - ], "OFgyPlwU": [ [ "Snapmaker", @@ -13308,13 +11589,6 @@ "Elegoo PLA Sparkle" ] ], - "OFhcrFw9": [ - [ - "Generic", - "TPU", - "Creality Generic TPU" - ] - ], "OFhfd722": [ [ "Eolas Prints", @@ -13399,13 +11673,6 @@ "Volumic NYLON Ultra (Performance)" ] ], - "OFiCHnso": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA" - ] - ], "OFiDpM1B": [ [ "FilAr", @@ -13420,13 +11687,6 @@ "Cubicon PA-CF" ] ], - "OFiUSDih": [ - [ - "Generic", - "PA", - "Blocks Generic PA" - ] - ], "OFiWaoqD": [ [ "DREMC", @@ -13434,13 +11694,6 @@ "DREMC PPA-CF" ] ], - "OFifxPW1": [ - [ - "Generic", - "PLA", - "DeltaMaker Generic PLA" - ] - ], "OFilAA3b": [ [ "Eryone", @@ -13469,13 +11722,6 @@ "Generic Support for PLA" ] ], - "OFiorRtJ": [ - [ - "Generic", - "PVA", - "Blocks Generic PVA" - ] - ], "OFitS8al": [ [ "Polymaker", @@ -13602,13 +11848,6 @@ "Qidi PLA-CF" ] ], - "OFjoIVZ6": [ - [ - "FlyingBear", - "PA-CF", - "FlyingBear Generic PA-CF" - ] - ], "OFjorDcx": [ [ "FDplast", @@ -13616,6 +11855,13 @@ "FDplast ABS" ] ], + "OFjt8dDO": [ + [ + "FusRock", + "PA-CF", + "FusRock NexPA-CF25" + ] + ], "OFjt9en1": [ [ "Generic", @@ -13672,13 +11918,6 @@ "Prusament PETG" ] ], - "OFkUaDnU": [ - [ - "Generic", - "PE-CF", - "Tiertime Generic PE-CF" - ] - ], "OFkWaWRo": [ [ "Generic", @@ -13686,11 +11925,11 @@ "Sovol SV06 Plus ACE TPU" ] ], - "OFkYkQGO": [ + "OFkf1HHw": [ [ "Generic", - "PP-GF", - "Tiertime Generic PP-GF" + "PLA", + "Generic PLA-SILK" ] ], "OFkhhUS0": [ @@ -13756,20 +11995,6 @@ "Eolas Prints PLA Antibacterial" ] ], - "OFl2SXmv": [ - [ - "Generic", - "FLEX", - "Prusa Generic FLEX" - ] - ], - "OFl4ItvQ": [ - [ - "Generic", - "PLA", - "Prusa Generic PLA HF" - ] - ], "OFl7nOAf": [ [ "Generic", @@ -13791,13 +12016,6 @@ "Snapmaker Dual PLA Matte" ] ], - "OFlLmUeV": [ - [ - "Generic", - "PLA", - "Ginger Generic PLA" - ] - ], "OFlN6DL1": [ [ "QIDI", @@ -13805,13 +12023,6 @@ "QIDI PA-Ultra" ] ], - "OFlNWVr5": [ - [ - "Generic", - "PETG-CF", - "Flashforge Generic PETG-CF10" - ] - ], "OFlP3KWq": [ [ "Elegoo", @@ -13868,13 +12079,6 @@ "Polymaker HT-PLA-GF" ] ], - "OFlx52rn": [ - [ - "Generic", - "PLA-CF", - "RatRig Generic PLA-CF" - ] - ], "OFm06H6V": [ [ "Elegoo", @@ -13945,13 +12149,6 @@ "Generic PLA Matte" ] ], - "OFma52eS": [ - [ - "Generic", - "ABS", - "Blocks Generic ABS" - ] - ], "OFma5TXH": [ [ "QIDI", @@ -13987,13 +12184,6 @@ "Elegoo TPU" ] ], - "OFmhWhEf": [ - [ - "Generic", - "PLA", - "Creality HF Generic PLA" - ] - ], "OFmjN2bc": [ [ "Anycubic", @@ -14008,13 +12198,6 @@ "FusRock ABS-GF" ] ], - "OFmnJNqY": [ - [ - "Generic", - "PA", - "OrcaArena Generic PA" - ] - ], "OFmpMwxS": [ [ "Generic", @@ -14029,13 +12212,6 @@ "Elegoo PETG-GF" ] ], - "OFmzftED": [ - [ - "Generic", - "ASA", - "OrcaArena Generic ASA" - ] - ], "OFn1QaY3": [ [ "Elegoo", @@ -14085,6 +12261,13 @@ "CoLiDo PLA Silk" ] ], + "OFnT7Qpb": [ + [ + "Generic", + "TPU", + "Generic TPU HF" + ] + ], "OFnXrkhA": [ [ "InfiMech", @@ -14113,13 +12296,6 @@ "WonderMaker PLA Silk" ] ], - "OFndmfJ1": [ - [ - "Generic", - "PLA", - "Anker Generic PLA" - ] - ], "OFneOFWe": [ [ "CoLiDo", @@ -14134,13 +12310,6 @@ "FilAr PETG Cian" ] ], - "OFnfBvn5": [ - [ - "Generic", - "PLA", - "Artillery Generic PLA" - ] - ], "OFngcE81": [ [ "LH Stinger", @@ -14148,13 +12317,6 @@ "LHS TPU Foamy 78A" ] ], - "OFnh79eM": [ - [ - "Generic", - "ABS", - "SecKit Generic ABS" - ] - ], "OFniMuTN": [ [ "Bambu Lab", @@ -14197,20 +12359,6 @@ "Cubicon PETG" ] ], - "OFoDgVnY": [ - [ - "Generic", - "PLA", - "FLSun S1 PLA Generic" - ] - ], - "OFoJcr46": [ - [ - "Generic", - "ASA", - "Prusa Generic ASA" - ] - ], "OFoSknDB": [ [ "FILL3D", @@ -14218,20 +12366,6 @@ "FILL3D PLA Turbo" ] ], - "OFoT8F7Y": [ - [ - "Generic", - "PVA", - "Prusa Generic PVA HF" - ] - ], - "OFoVZg32": [ - [ - "Generic", - "TPU", - "SecKit Generic TPU" - ] - ], "OFoYSJKi": [ [ "Generic", @@ -14253,13 +12387,6 @@ "AliZ PETG" ] ], - "OFodPDxO": [ - [ - "Generic", - "PLA", - "Tiertime Generic PLA High Speed" - ] - ], "OFogbnCb": [ [ "Generic", @@ -14309,13 +12436,6 @@ "QIDI PPS-GF" ] ], - "OFp8gtPH": [ - [ - "Generic", - "PLA", - "Creality Generic PLA Silk" - ] - ], "OFp9wdmf": [ [ "Eryone", @@ -14323,13 +12443,6 @@ "Eryone PA-CF" ] ], - "OFpAaY6w": [ - [ - "Generic", - "ASA", - "Creality Generic ASA" - ] - ], "OFpBV2Ma": [ [ "Generic", @@ -14365,13 +12478,6 @@ "Peopoly Lancer PETG-C" ] ], - "OFpSYJLI": [ - [ - "Generic", - "PLA", - "Creality Generic PLA Matte" - ] - ], "OFpW4gdi": [ [ "SUNLU", @@ -14379,13 +12485,6 @@ "SUNLU PLA Matte" ] ], - "OFptvi3F": [ - [ - "Generic", - "PPA-GF", - "Tiertime Generic PPA-GF" - ] - ], "OFpu74Qe": [ [ "Snapmaker", @@ -14407,13 +12506,6 @@ "Flashforge ASA-CF" ] ], - "OFq5QANf": [ - [ - "Generic", - "PC", - "Prusa Generic PC HF" - ] - ], "OFq8gfS4": [ [ "FilAr", @@ -14442,27 +12534,6 @@ "eSUN PLA+" ] ], - "OFqKmLJe": [ - [ - "Generic", - "PETG", - "Creality Generic PETG-CF" - ] - ], - "OFqOk9Ww": [ - [ - "Generic", - "ABS", - "Peopoly Generic ABS" - ] - ], - "OFqS8fzK": [ - [ - "Generic", - "PETG", - "SecKit Generic PETG" - ] - ], "OFqcL5UF": [ [ "QIDI", @@ -14519,13 +12590,6 @@ "CR-PLA Carbon" ] ], - "OFrO2zyn": [ - [ - "Generic", - "PLA", - "Creality Generic PLA High Speed" - ] - ], "OFrOh600": [ [ "Polymaker", @@ -14533,13 +12597,6 @@ "Panchroma PLA Matte" ] ], - "OFrQqCwL": [ - [ - "InfiMech", - "PLA", - "InfiMech Generic PLA" - ] - ], "OFrdZ0cK": [ [ "eSUN", @@ -14547,20 +12604,6 @@ "eSUN PETG+HS" ] ], - "OFrgGex8": [ - [ - "Generic", - "PETG", - "Blocks Generic PETG" - ] - ], - "OFrh4bBH": [ - [ - "Generic", - "ASA", - "SecKit Generic ASA" - ] - ], "OFrjacXf": [ [ "Flashforge", @@ -14568,13 +12611,6 @@ "Flashforge PET-CF" ] ], - "OFrnJJEa": [ - [ - "Generic", - "EVA", - "Tiertime Generic EVA" - ] - ], "OFrnkURQ": [ [ "Generic", @@ -14589,13 +12625,6 @@ "Arena PC" ] ], - "OFrrMLDw": [ - [ - "Generic", - "PLA", - "Flashforge Generic PLA-SILK" - ] - ], "OFryjl35": [ [ "Elegoo", @@ -14610,13 +12639,6 @@ "Chuanying ABS" ] ], - "OFs2ReMr": [ - [ - "InfiMech", - "PETG", - "InfiMech Generic PETG" - ] - ], "OFsB2lxm": [ [ "Elegoo", @@ -14624,13 +12646,6 @@ "Elegoo PLA Matte" ] ], - "OFsCbVbN": [ - [ - "Generic", - "PVA", - "Anker Generic PVA" - ] - ], "OFsD974q": [ [ "Volumic", @@ -14645,13 +12660,6 @@ "FilAr PLA Piel" ] ], - "OFsF96Gt": [ - [ - "Generic", - "PLA-CF", - "FLSun Generic PLA-CF" - ] - ], "OFsFo7ms": [ [ "Volumic", @@ -14666,13 +12674,6 @@ "Generic HIPS" ] ], - "OFsGqI4y": [ - [ - "Generic", - "PETG", - "Ginger Generic PETG" - ] - ], "OFsHSVZc": [ [ "Bambu Lab", @@ -14701,13 +12702,6 @@ "Panchroma PLA" ] ], - "OFsXOMoX": [ - [ - "Generic", - "PLA", - "Qidi Generic PLA+" - ] - ], "OFsXQXbs": [ [ "FilAr", @@ -14715,11 +12709,11 @@ "FilAr PETG Blanco Antartida" ] ], - "OFsoQ12i": [ + "OFsijjtH": [ [ "Generic", - "ABS", - "Comgrow Generic ABS" + "PP-GF", + "Generic PP-GF" ] ], "OFsoykbm": [ @@ -14729,20 +12723,6 @@ "DREMC PA6-CF" ] ], - "OFsxRSwr": [ - [ - "Generic", - "PVA", - "RatRig Generic PVA" - ] - ], - "OFsxlLdo": [ - [ - "Generic", - "ASA", - "Qidi Generic ASA" - ] - ], "OFt0JbR7": [ [ "Snapmaker", @@ -14806,13 +12786,6 @@ "FilAr PLA-mate" ] ], - "OFtP1rqJ": [ - [ - "Generic", - "PVA", - "FLSun Generic PVA" - ] - ], "OFtRn8X8": [ [ "FDplast", @@ -14820,13 +12793,6 @@ "FDplast SBS" ] ], - "OFtTHNTj": [ - [ - "Generic", - "PLA", - "Flashforge Generic PLA" - ] - ], "OFtTYl9Q": [ [ "Generic", @@ -14862,13 +12828,6 @@ "FDplast PLA" ] ], - "OFtsVp4v": [ - [ - "Generic", - "PA-CF", - "SecKit Generic PA-CF" - ] - ], "OFtudokz": [ [ "Eolas Prints", @@ -14911,13 +12870,6 @@ "Generic PCTG" ] ], - "OFu79SUH": [ - [ - "Generic", - "PLA", - "Qidi Generic PLA" - ] - ], "OFuFqYyG": [ [ "Generic", @@ -14946,13 +12898,6 @@ "Arena PETG-CF" ] ], - "OFuSwKgm": [ - [ - "Generic", - "PLA", - "Tiertime Generic PLA" - ] - ], "OFuUJyRx": [ [ "Generic", @@ -15016,13 +12961,6 @@ "Generic TPU 85A" ] ], - "OFupq0tY": [ - [ - "Generic", - "PLA-CF", - "Blocks Generic PLA-CF" - ] - ], "OFurdQxc": [ [ "FilAr", @@ -15044,13 +12982,6 @@ "Volumic FLEX93 Ultra" ] ], - "OFv4VZCd": [ - [ - "Generic", - "ABS", - "Qidi Generic ABS" - ] - ], "OFvDbkFq": [ [ "Prusa Polymers", @@ -15058,13 +12989,6 @@ "Prusament PC Blend" ] ], - "OFvGc67v": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS" - ] - ], "OFvKUnLh": [ [ "Bambu Lab", @@ -15086,13 +13010,6 @@ "FilAr PLA Verde FilAr" ] ], - "OFvPomQf": [ - [ - "Generic", - "PPS", - "Tiertime Generic PPS" - ] - ], "OFvTVZc3": [ [ "COEX 3D", @@ -15142,6 +13059,13 @@ "Fiberon PA12-CF10" ] ], + "OFvxghTE": [ + [ + "Generic", + "PLA", + "Generic HS PLA" + ] + ], "OFvyB0Bz": [ [ "Polymaker", @@ -15170,13 +13094,6 @@ "HATCHBOX ABS" ] ], - "OFwMFLAm": [ - [ - "Generic", - "ABS", - "Artillery Generic ABS" - ] - ], "OFwPrlCM": [ [ "Bambu Lab", @@ -15219,13 +13136,6 @@ "Snapmaker PLA SnapSpeed" ] ], - "OFwpkvqf": [ - [ - "Orca Arena", - "PETG-CF", - "OrcaArena Generic PETG-CF" - ] - ], "OFwu7IAG": [ [ "COEX 3D", @@ -15233,11 +13143,11 @@ "COEX PCTG PRIME" ] ], - "OFwxpmHM": [ + "OFwwAQnA": [ [ - "Polymaker", - "PA", - "Polymaker Generic CoPA" + "Generic", + "PC", + "Generic PC HF" ] ], "OFwyt1xt": [ @@ -15247,13 +13157,6 @@ "Eryone ASA-CF" ] ], - "OFx0ZzFV": [ - [ - "Generic", - "PLA-CF", - "OrcaArena Generic PLA-CF" - ] - ], "OFx8Lmsd": [ [ "Eolas Prints", @@ -15296,13 +13199,6 @@ "Elegoo ABS" ] ], - "OFxTMg1d": [ - [ - "FlyingBear", - "PC", - "FlyingBear Generic PC" - ] - ], "OFxUwUeW": [ [ "SUNLU", @@ -15324,20 +13220,6 @@ "PolyTerra PLA Marble" ] ], - "OFxg7n2G": [ - [ - "Generic", - "PETG", - "RatRig Generic PETG" - ] - ], - "OFxvKuYW": [ - [ - "Generic", - "PHA", - "Tiertime Generic PHA" - ] - ], "OFy02QHU": [ [ "Polymaker", @@ -15366,13 +13248,6 @@ "Generic TPU-95A" ] ], - "OFy4ajVZ": [ - [ - "Generic", - "PLA", - "Qidi Generic PLA Silk" - ] - ], "OFy8tYJE": [ [ "Cubicon", @@ -15387,13 +13262,6 @@ "Sovol SV08 TPU" ] ], - "OFyFRojy": [ - [ - "Generic", - "ABS", - "RatRig Generic ABS" - ] - ], "OFyFyLIp": [ [ "SeeMeCNC", @@ -15408,13 +13276,6 @@ "Arena PLA Sparkle" ] ], - "OFyK5Lt9": [ - [ - "Generic", - "PETG", - "Artillery Generic PETG" - ] - ], "OFyLWVF3": [ [ "Generic", @@ -15457,13 +13318,6 @@ "FilAr PETG Gris Ceniza" ] ], - "OFyeSq8A": [ - [ - "Generic", - "ABS", - "Prusa Generic ABS HF" - ] - ], "OFyhjiNs": [ [ "Snapmaker", @@ -15520,18 +13374,11 @@ "AliZ PLA" ] ], - "OFyySVby": [ + "OFz5oHgf": [ [ "Generic", - "PVA", - "SecKit Generic PVA" - ] - ], - "OFz3q5Xz": [ - [ - "Generic", - "PETG", - "C1 Generic PETG" + "PEEK", + "Generic PEEK" ] ], "OFzAWsca": [ @@ -15548,6 +13395,13 @@ "Sovol Zero PLA Basic HS Nozzle" ] ], + "OFzRtFM9": [ + [ + "Generic", + "ASA", + "Generic ASA HF" + ] + ], "OFzS7zt4": [ [ "Anycubic", @@ -15555,13 +13409,6 @@ "Anycubic PA" ] ], - "OFzXURfo": [ - [ - "FlyingBear", - "PETG", - "FlyingBear Generic PETG" - ] - ], "OFzY7N3Z": [ [ "Artillery", @@ -15583,6 +13430,13 @@ "LHS ABS" ] ], + "OFzwA5Z9": [ + [ + "FusRock", + "PET-GF", + "FusRock PET-GF" + ] + ], "OFzyIxba": [ [ "Bambu Lab", From ab21af6b08d7a44918b75c169191fb3534394a62 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 1 Sep 2026 17:44:12 +0800 Subject: [PATCH 30/52] fix filament names --- resources/profiles/Chuanying.json | 26 +- ...eneric ABS @Chuanying X1 0.25 Nozzle.json} | 8 +- ...eneric ASA @Chuanying X1 0.25 Nozzle.json} | 7 +- ...ric HS PLA @Chuanying X1 0.25 Nozzle.json} | 7 +- ...neric PETG @Chuanying X1 0.25 Nozzle.json} | 8 +- ...eneric PLA @Chuanying X1 0.25 Nozzle.json} | 7 +- ...c PLA-Silk @Chuanying X1 0.25 Nozzle.json} | 7 +- resources/profiles/Comgrow.json | 6 +- ...LA.json => Generic PLA @Comgrow T300.json} | 6 +- .../Comgrow/machine/Comgrow T300.json | 2 +- resources/profiles/FLSun.json | 50 +- ...S1 ABS.json => Generic ABS @FLSun S1.json} | 6 +- ...T1 ABS.json => Generic ABS @FLSun T1.json} | 6 +- ...S1 ASA.json => Generic ASA @FLSun S1.json} | 6 +- ...T1 ASA.json => Generic ASA @FLSun T1.json} | 6 +- ... PETG.json => Generic PETG @FLSun S1.json} | 6 +- ... PETG.json => Generic PETG @FLSun T1.json} | 6 +- ... => Generic PLA High Speed @FLSun S1.json} | 11 +- ... => Generic PLA High Speed @FLSun T1.json} | 11 +- ...k.json => Generic PLA Silk @FLSun S1.json} | 11 +- ...k.json => Generic PLA Silk @FLSun T1.json} | 11 +- ...S1 TPU.json => Generic TPU @FLSun S1.json} | 6 +- ...T1 TPU.json => Generic TPU @FLSun T1.json} | 6 +- .../profiles/FLSun/machine/FLSun S1.json | 2 +- .../profiles/FLSun/machine/FLSun T1.json | 2 +- resources/profiles/Lulzbot.json | 14 +- ...5mm ABS.json => Generic ABS @Lulzbot.json} | 6 +- ...m PETG.json => Generic PETG @Lulzbot.json} | 6 +- ...5mm PLA.json => Generic PLA @Lulzbot.json} | 6 +- .../Lulzbot Taz 4 or 5 0.5 nozzle.json | 2 +- .../Lulzbot/machine/Lulzbot Taz 4 or 5.json | 2 +- .../machine/Lulzbot Taz 6 0.5 nozzle.json | 2 +- .../Lulzbot/machine/Lulzbot Taz 6.json | 2 +- .../Lulzbot Taz Pro Dual 0.5 nozzle.json | 2 +- .../Lulzbot/machine/Lulzbot Taz Pro Dual.json | 2 +- resources/profiles/Phrozen.json | 6 +- ...Generic PLA @Phrozen Arco 0.4 nozzle.json} | 10 +- .../machine/Phrozen Arco 0.4 nozzle.json | 2 +- .../Phrozen/machine/Phrozen Arco.json | 2 +- resources/profiles/Qidi.json | 2 +- .../Qidi/filament/Tinmorry PETG-ECO.json | 4 +- resources/profiles/Snapmaker.json | 2 +- .../filament/Snapmaker TPU 95A @U1 base.json | 4 +- .../filament/Snapmaker TPU 95A @U1.json | 2 +- resources/profiles/Sovol.json | 82 +-- ....json => Generic ABS @Sovol SV06 ACE.json} | 6 +- ... => Generic ABS @Sovol SV06 Plus ACE.json} | 6 +- ... ABS.json => Generic ABS @Sovol SV08.json} | 6 +- ... ABS.json => Generic ABS @Sovol Zero.json} | 6 +- ...ro PC.json => Generic PC @Sovol Zero.json} | 6 +- ...json => Generic PETG @Sovol SV06 ACE.json} | 6 +- ...=> Generic PETG @Sovol SV06 Plus ACE.json} | 6 +- ...ETG.json => Generic PETG @Sovol SV08.json} | 6 +- ...ETG.json => Generic PETG @Sovol Zero.json} | 6 +- ....json => Generic PLA @Sovol SV06 ACE.json} | 6 +- ... => Generic PLA @Sovol SV06 Plus ACE.json} | 6 +- ... PLA.json => Generic PLA @Sovol SV07.json} | 6 +- ...> Generic PLA @Sovol SV08 0.2 nozzle.json} | 6 +- ... PLA.json => Generic PLA @Sovol SV08.json} | 6 +- ...asic.json => Generic PLA @Sovol Zero.json} | 6 +- ...json => Generic PLA Silk @Sovol Zero.json} | 14 +- ....json => Generic TPU @Sovol SV06 ACE.json} | 6 +- ... => Generic TPU @Sovol SV06 Plus ACE.json} | 6 +- ... TPU.json => Generic TPU @Sovol SV08.json} | 6 +- ... TPU.json => Generic TPU @Sovol Zero.json} | 6 +- .../machine/Sovol SV06 ACE 0.2 nozzle.json | 2 +- .../machine/Sovol SV06 ACE 0.4 nozzle.json | 2 +- .../machine/Sovol SV06 ACE 0.6 nozzle.json | 2 +- .../machine/Sovol SV06 ACE 0.8 nozzle.json | 2 +- .../Sovol/machine/Sovol SV06 ACE.json | 2 +- .../Sovol SV06 Plus ACE 0.4 nozzle.json | 2 +- .../Sovol/machine/Sovol SV06 Plus ACE.json | 2 +- .../profiles/Sovol/machine/Sovol SV07.json | 2 +- .../Sovol/machine/Sovol SV08 0.2 nozzle.json | 2 +- .../Sovol/machine/Sovol SV08 0.4 nozzle.json | 2 +- .../Sovol/machine/Sovol SV08 0.6 nozzle.json | 2 +- .../Sovol/machine/Sovol SV08 0.8 nozzle.json | 2 +- .../profiles/Sovol/machine/Sovol SV08.json | 2 +- .../Sovol/machine/Sovol Zero 0.4 nozzle.json | 2 +- .../profiles/Sovol/machine/Sovol Zero.json | 2 +- resources/profiles/retired_filament_ids.json | 240 ++++++++ scripts/assign_filament_ids.py | 19 +- scripts/filament_id_snapshot.json | 532 +----------------- 83 files changed, 570 insertions(+), 769 deletions(-) rename resources/profiles/Chuanying/filament/{Chuanying ABS @Chuanying X1 0.25 Nozzle.json => Generic ABS @Chuanying X1 0.25 Nozzle.json} (62%) rename resources/profiles/Chuanying/filament/{Chuanying ASA @Chuanying X1 0.25 Nozzle.json => Generic ASA @Chuanying X1 0.25 Nozzle.json} (67%) rename resources/profiles/Chuanying/filament/{Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json => Generic HS PLA @Chuanying X1 0.25 Nozzle.json} (74%) rename resources/profiles/Chuanying/filament/{Chuanying PETG @Chuanying X1 0.25 Nozzle.json => Generic PETG @Chuanying X1 0.25 Nozzle.json} (60%) rename resources/profiles/Chuanying/filament/{Chuanying PLA @Chuanying X1 0.25 Nozzle.json => Generic PLA @Chuanying X1 0.25 Nozzle.json} (74%) rename resources/profiles/Chuanying/filament/{Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json => Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json} (75%) rename resources/profiles/Comgrow/filament/{Comgrow T300 PLA.json => Generic PLA @Comgrow T300.json} (86%) rename resources/profiles/FLSun/filament/{FLSun S1 ABS.json => Generic ABS @FLSun S1.json} (91%) rename resources/profiles/FLSun/filament/{FLSun T1 ABS.json => Generic ABS @FLSun T1.json} (91%) rename resources/profiles/FLSun/filament/{FLSun S1 ASA.json => Generic ASA @FLSun S1.json} (91%) rename resources/profiles/FLSun/filament/{FLSun T1 ASA.json => Generic ASA @FLSun T1.json} (91%) rename resources/profiles/FLSun/filament/{FLSun S1 PETG.json => Generic PETG @FLSun S1.json} (90%) rename resources/profiles/FLSun/filament/{FLSun T1 PETG.json => Generic PETG @FLSun T1.json} (90%) rename resources/profiles/FLSun/filament/{FLSun S1 PLA High Speed.json => Generic PLA High Speed @FLSun S1.json} (79%) rename resources/profiles/FLSun/filament/{FLSun T1 PLA High Speed.json => Generic PLA High Speed @FLSun T1.json} (79%) rename resources/profiles/FLSun/filament/{FLSun S1 PLA Silk.json => Generic PLA Silk @FLSun S1.json} (81%) rename resources/profiles/FLSun/filament/{FLSun T1 PLA Silk.json => Generic PLA Silk @FLSun T1.json} (81%) rename resources/profiles/FLSun/filament/{FLSun S1 TPU.json => Generic TPU @FLSun S1.json} (91%) rename resources/profiles/FLSun/filament/{FLSun T1 TPU.json => Generic TPU @FLSun T1.json} (91%) rename resources/profiles/Lulzbot/filament/{Lulzbot 2.85mm ABS.json => Generic ABS @Lulzbot.json} (74%) rename resources/profiles/Lulzbot/filament/{Lulzbot 2.85mm PETG.json => Generic PETG @Lulzbot.json} (74%) rename resources/profiles/Lulzbot/filament/{Lulzbot 2.85mm PLA.json => Generic PLA @Lulzbot.json} (74%) rename resources/profiles/Phrozen/filament/{Phrozen PLA @Phrozen Arco 0.4 nozzle.json => Generic PLA @Phrozen Arco 0.4 nozzle.json} (94%) rename resources/profiles/Sovol/filament/{Sovol SV06 ACE ABS.json => Generic ABS @Sovol SV06 ACE.json} (87%) rename resources/profiles/Sovol/filament/{Sovol SV06 Plus ACE ABS.json => Generic ABS @Sovol SV06 Plus ACE.json} (84%) rename resources/profiles/Sovol/filament/{Sovol SV08 ABS.json => Generic ABS @Sovol SV08.json} (91%) rename resources/profiles/Sovol/filament/{Sovol Zero ABS.json => Generic ABS @Sovol Zero.json} (90%) rename resources/profiles/Sovol/filament/{Sovol Zero PC.json => Generic PC @Sovol Zero.json} (90%) rename resources/profiles/Sovol/filament/{Sovol SV06 ACE PETG.json => Generic PETG @Sovol SV06 ACE.json} (87%) rename resources/profiles/Sovol/filament/{Sovol SV06 Plus ACE PETG.json => Generic PETG @Sovol SV06 Plus ACE.json} (84%) rename resources/profiles/Sovol/filament/{Sovol SV08 PETG.json => Generic PETG @Sovol SV08.json} (90%) rename resources/profiles/Sovol/filament/{Sovol Zero PETG.json => Generic PETG @Sovol Zero.json} (91%) rename resources/profiles/Sovol/filament/{Sovol SV06 ACE PLA.json => Generic PLA @Sovol SV06 ACE.json} (87%) rename resources/profiles/Sovol/filament/{Sovol SV06 Plus ACE PLA.json => Generic PLA @Sovol SV06 Plus ACE.json} (85%) rename resources/profiles/Sovol/filament/{Sovol SV07 PLA.json => Generic PLA @Sovol SV07.json} (87%) rename resources/profiles/Sovol/filament/{Sovol SV08 PLA @SV08 0.2 nozzle.json => Generic PLA @Sovol SV08 0.2 nozzle.json} (84%) rename resources/profiles/Sovol/filament/{Sovol SV08 PLA.json => Generic PLA @Sovol SV08.json} (89%) rename resources/profiles/Sovol/filament/{Sovol Zero PLA Basic.json => Generic PLA @Sovol Zero.json} (90%) rename resources/profiles/Sovol/filament/{Sovol Zero PLA Silk.json => Generic PLA Silk @Sovol Zero.json} (80%) rename resources/profiles/Sovol/filament/{Sovol SV06 ACE TPU.json => Generic TPU @Sovol SV06 ACE.json} (87%) rename resources/profiles/Sovol/filament/{Sovol SV06 Plus ACE TPU.json => Generic TPU @Sovol SV06 Plus ACE.json} (85%) rename resources/profiles/Sovol/filament/{Sovol SV08 TPU.json => Generic TPU @Sovol SV08.json} (90%) rename resources/profiles/Sovol/filament/{Sovol Zero TPU.json => Generic TPU @Sovol Zero.json} (90%) diff --git a/resources/profiles/Chuanying.json b/resources/profiles/Chuanying.json index 746a31e334..d994843f60 100644 --- a/resources/profiles/Chuanying.json +++ b/resources/profiles/Chuanying.json @@ -1,7 +1,7 @@ { "name": "Chuanying", "url": "", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "Chuanying configurations", "machine_model_list": [ @@ -70,36 +70,36 @@ "sub_path": "filament/Generic PLA-Silk @Chuanying.json" }, { - "name": "Chuanying ABS @Chuanying X1 0.25 Nozzle", - "sub_path": "filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json" + "name": "Generic ABS @Chuanying X1 0.25 Nozzle", + "sub_path": "filament/Generic ABS @Chuanying X1 0.25 Nozzle.json" }, { "name": "Generic HIPS @Chuanying", "sub_path": "filament/Generic HIPS @Chuanying.json" }, { - "name": "Chuanying ASA @Chuanying X1 0.25 Nozzle", - "sub_path": "filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json" + "name": "Generic ASA @Chuanying X1 0.25 Nozzle", + "sub_path": "filament/Generic ASA @Chuanying X1 0.25 Nozzle.json" }, { - "name": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle", - "sub_path": "filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json" + "name": "Generic HS PLA @Chuanying X1 0.25 Nozzle", + "sub_path": "filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json" }, { - "name": "Chuanying PETG @Chuanying X1 0.25 Nozzle", - "sub_path": "filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json" + "name": "Generic PETG @Chuanying X1 0.25 Nozzle", + "sub_path": "filament/Generic PETG @Chuanying X1 0.25 Nozzle.json" }, { "name": "Generic PVA @Chuanying", "sub_path": "filament/Generic PVA @Chuanying.json" }, { - "name": "Chuanying PLA @Chuanying X1 0.25 Nozzle", - "sub_path": "filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json" + "name": "Generic PLA @Chuanying X1 0.25 Nozzle", + "sub_path": "filament/Generic PLA @Chuanying X1 0.25 Nozzle.json" }, { - "name": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle", - "sub_path": "filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json" + "name": "Generic PLA-Silk @Chuanying X1 0.25 Nozzle", + "sub_path": "filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json" }, { "name": "Generic PETG-CF10 @Chuanying", diff --git a/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying X1 0.25 Nozzle.json similarity index 62% rename from resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json rename to resources/profiles/Chuanying/filament/Generic ABS @Chuanying X1 0.25 Nozzle.json index 8a2a02e2f6..f54d17ef0d 100644 --- a/resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic ABS @Chuanying X1 0.25 Nozzle.json @@ -1,16 +1,16 @@ { "type": "filament", - "name": "Chuanying ABS @Chuanying X1 0.25 Nozzle", + "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", "from": "system", - "setting_id": "VkCgo0e4KR24DX28", - "filament_id": "OFs1sNLz", + "setting_id": "uHqfv6eUDzoxEkEj", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" ], "filament_settings_id": [ - "Chuanying ABS @Chuanying X1 0.25 Nozzle" + "Generic ABS @Chuanying X1 0.25 Nozzle" ], "fan_max_speed": [ "50" diff --git a/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic ASA @Chuanying X1 0.25 Nozzle.json similarity index 67% rename from resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json rename to resources/profiles/Chuanying/filament/Generic ASA @Chuanying X1 0.25 Nozzle.json index 018b418f50..690f31669a 100644 --- a/resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic ASA @Chuanying X1 0.25 Nozzle.json @@ -1,15 +1,16 @@ { "type": "filament", - "name": "Chuanying ASA @Chuanying X1 0.25 Nozzle", + "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", "from": "system", - "setting_id": "px1EPCDgOG8eE81V", + "setting_id": "bVxY01TC9sAM9KQW", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" ], "filament_settings_id": [ - "Chuanying ASA @Chuanying X1 0.25 Nozzle" + "Generic ASA @Chuanying X1 0.25 Nozzle" ], "fan_max_speed": [ "50" diff --git a/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json similarity index 74% rename from resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json rename to resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json index 2cf18e831f..339fae8619 100644 --- a/resources/profiles/Chuanying/filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic HS PLA @Chuanying X1 0.25 Nozzle.json @@ -1,15 +1,16 @@ { "type": "filament", - "name": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle", + "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", "from": "system", - "setting_id": "CAdli5S8JIFafvRG", + "setting_id": "gdW1LIVf6BecAtpa", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" ], "filament_settings_id": [ - "Chuanying HS PLA @Chuanying X1 0.25 Nozzle" + "Generic HS PLA @Chuanying X1 0.25 Nozzle" ], "activate_air_filtration": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying X1 0.25 Nozzle.json similarity index 60% rename from resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json rename to resources/profiles/Chuanying/filament/Generic PETG @Chuanying X1 0.25 Nozzle.json index e41bc4221b..88eaf57c01 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic PETG @Chuanying X1 0.25 Nozzle.json @@ -1,16 +1,16 @@ { "type": "filament", - "name": "Chuanying PETG @Chuanying X1 0.25 Nozzle", + "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", "from": "system", - "setting_id": "9xxP8YWj4hnWQoVZ", - "filament_id": "OFlXJxX1", + "setting_id": "YQ0HAxEDmMQgqNGY", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" ], "filament_settings_id": [ - "Chuanying PETG @Chuanying X1 0.25 Nozzle" + "Generic PETG @Chuanying X1 0.25 Nozzle" ], "fan_max_speed": [ "80" diff --git a/resources/profiles/Chuanying/filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying X1 0.25 Nozzle.json similarity index 74% rename from resources/profiles/Chuanying/filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json rename to resources/profiles/Chuanying/filament/Generic PLA @Chuanying X1 0.25 Nozzle.json index 7bdab64af6..cea064f9da 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic PLA @Chuanying X1 0.25 Nozzle.json @@ -1,15 +1,16 @@ { "type": "filament", - "name": "Chuanying PLA @Chuanying X1 0.25 Nozzle", + "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", "from": "system", - "setting_id": "3WDFe1uKTOTiRtPE", + "setting_id": "XsPEVGHYiyAX4YXy", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" ], "filament_settings_id": [ - "Chuanying PLA @Chuanying X1 0.25 Nozzle" + "Generic PLA @Chuanying X1 0.25 Nozzle" ], "activate_air_filtration": [ "1" diff --git a/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json similarity index 75% rename from resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json rename to resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json index d04fcc6f38..66d057cbf1 100644 --- a/resources/profiles/Chuanying/filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json +++ b/resources/profiles/Chuanying/filament/Generic PLA-Silk @Chuanying X1 0.25 Nozzle.json @@ -1,15 +1,16 @@ { "type": "filament", - "name": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle", + "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", "from": "system", - "setting_id": "kph5feBjhPi0oo0G", + "setting_id": "XaGDKARkuGTTabMN", "instantiation": "true", "compatible_printers": [ "Chuanying X1 0.25 Nozzle" ], "filament_settings_id": [ - "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle" + "Generic PLA-Silk @Chuanying X1 0.25 Nozzle" ], "activate_air_filtration": [ "1" diff --git a/resources/profiles/Comgrow.json b/resources/profiles/Comgrow.json index 107ef2b3ba..e3eb237518 100644 --- a/resources/profiles/Comgrow.json +++ b/resources/profiles/Comgrow.json @@ -1,6 +1,6 @@ { "name": "Comgrow", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "Comgrow configurations", "machine_model_list": [ @@ -117,8 +117,8 @@ "sub_path": "filament/Generic PLA @Comgrow.json" }, { - "name": "Comgrow T300 PLA", - "sub_path": "filament/Comgrow T300 PLA.json" + "name": "Generic PLA @Comgrow T300", + "sub_path": "filament/Generic PLA @Comgrow T300.json" } ], "machine_list": [ diff --git a/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow T300.json similarity index 86% rename from resources/profiles/Comgrow/filament/Comgrow T300 PLA.json rename to resources/profiles/Comgrow/filament/Generic PLA @Comgrow T300.json index 965e2985ee..bde24b8ba0 100644 --- a/resources/profiles/Comgrow/filament/Comgrow T300 PLA.json +++ b/resources/profiles/Comgrow/filament/Generic PLA @Comgrow T300.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Comgrow T300 PLA", + "name": "Generic PLA @Comgrow T300", "inherits": "Generic PLA @Comgrow", + "renamed_from": "Comgrow T300 PLA", "from": "system", - "setting_id": "TnHaf2TSHVfuwbVg", - "filament_id": "OFNWcJsM", + "setting_id": "3N6gPGkzpE9CvkVz", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Comgrow/machine/Comgrow T300.json b/resources/profiles/Comgrow/machine/Comgrow T300.json index 41c94aa193..558c4338b6 100644 --- a/resources/profiles/Comgrow/machine/Comgrow T300.json +++ b/resources/profiles/Comgrow/machine/Comgrow T300.json @@ -8,5 +8,5 @@ "bed_model": "comgrow_t300_buildplate_model.stl", "bed_texture": "comgrow_t300_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Comgrow T300 PLA" + "default_materials": "Generic PLA @Comgrow T300" } diff --git a/resources/profiles/FLSun.json b/resources/profiles/FLSun.json index 364b3cf521..67ce8c2583 100644 --- a/resources/profiles/FLSun.json +++ b/resources/profiles/FLSun.json @@ -1,6 +1,6 @@ { "name": "FLSun", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "FLSun configurations", "machine_model_list": [ @@ -217,60 +217,60 @@ "sub_path": "filament/Generic TPU @FLSun.json" }, { - "name": "FLSun S1 ABS", - "sub_path": "filament/FLSun S1 ABS.json" + "name": "Generic ABS @FLSun S1", + "sub_path": "filament/Generic ABS @FLSun S1.json" }, { - "name": "FLSun T1 ABS", - "sub_path": "filament/FLSun T1 ABS.json" + "name": "Generic ABS @FLSun T1", + "sub_path": "filament/Generic ABS @FLSun T1.json" }, { - "name": "FLSun S1 ASA", - "sub_path": "filament/FLSun S1 ASA.json" + "name": "Generic ASA @FLSun S1", + "sub_path": "filament/Generic ASA @FLSun S1.json" }, { - "name": "FLSun T1 ASA", - "sub_path": "filament/FLSun T1 ASA.json" + "name": "Generic ASA @FLSun T1", + "sub_path": "filament/Generic ASA @FLSun T1.json" }, { - "name": "FLSun S1 PETG", - "sub_path": "filament/FLSun S1 PETG.json" + "name": "Generic PETG @FLSun S1", + "sub_path": "filament/Generic PETG @FLSun S1.json" }, { - "name": "FLSun T1 PETG", - "sub_path": "filament/FLSun T1 PETG.json" + "name": "Generic PETG @FLSun T1", + "sub_path": "filament/Generic PETG @FLSun T1.json" }, { "name": "Generic PLA @FLSun S1", "sub_path": "filament/Generic PLA @FLSun S1.json" }, { - "name": "FLSun S1 PLA High Speed", - "sub_path": "filament/FLSun S1 PLA High Speed.json" + "name": "Generic PLA High Speed @FLSun S1", + "sub_path": "filament/Generic PLA High Speed @FLSun S1.json" }, { - "name": "FLSun S1 PLA Silk", - "sub_path": "filament/FLSun S1 PLA Silk.json" + "name": "Generic PLA Silk @FLSun S1", + "sub_path": "filament/Generic PLA Silk @FLSun S1.json" }, { "name": "Generic PLA @FLSun T1", "sub_path": "filament/Generic PLA @FLSun T1.json" }, { - "name": "FLSun T1 PLA High Speed", - "sub_path": "filament/FLSun T1 PLA High Speed.json" + "name": "Generic PLA High Speed @FLSun T1", + "sub_path": "filament/Generic PLA High Speed @FLSun T1.json" }, { - "name": "FLSun T1 PLA Silk", - "sub_path": "filament/FLSun T1 PLA Silk.json" + "name": "Generic PLA Silk @FLSun T1", + "sub_path": "filament/Generic PLA Silk @FLSun T1.json" }, { - "name": "FLSun S1 TPU", - "sub_path": "filament/FLSun S1 TPU.json" + "name": "Generic TPU @FLSun S1", + "sub_path": "filament/Generic TPU @FLSun S1.json" }, { - "name": "FLSun T1 TPU", - "sub_path": "filament/FLSun T1 TPU.json" + "name": "Generic TPU @FLSun T1", + "sub_path": "filament/Generic TPU @FLSun T1.json" } ], "machine_list": [ diff --git a/resources/profiles/FLSun/filament/FLSun S1 ABS.json b/resources/profiles/FLSun/filament/Generic ABS @FLSun S1.json similarity index 91% rename from resources/profiles/FLSun/filament/FLSun S1 ABS.json rename to resources/profiles/FLSun/filament/Generic ABS @FLSun S1.json index d097e75200..3a57d47404 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ABS.json +++ b/resources/profiles/FLSun/filament/Generic ABS @FLSun S1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun S1 ABS", + "name": "Generic ABS @FLSun S1", "inherits": "Generic ABS @FLSun", + "renamed_from": "FLSun S1 ABS", "from": "system", - "setting_id": "tvpZ28Oe4Al7hlgj", - "filament_id": "OFzzmK2Q", + "setting_id": "a7U3u888FlJ6CSFb", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun T1 ABS.json b/resources/profiles/FLSun/filament/Generic ABS @FLSun T1.json similarity index 91% rename from resources/profiles/FLSun/filament/FLSun T1 ABS.json rename to resources/profiles/FLSun/filament/Generic ABS @FLSun T1.json index 8514ed0ecd..36c684cdc6 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ABS.json +++ b/resources/profiles/FLSun/filament/Generic ABS @FLSun T1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun T1 ABS", + "name": "Generic ABS @FLSun T1", "inherits": "Generic ABS @FLSun", + "renamed_from": "FLSun T1 ABS", "from": "system", - "setting_id": "GP8VqRfidKOdj0ZJ", - "filament_id": "OFV0KrAG", + "setting_id": "j185WWfVulPxWJvQ", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun S1 ASA.json b/resources/profiles/FLSun/filament/Generic ASA @FLSun S1.json similarity index 91% rename from resources/profiles/FLSun/filament/FLSun S1 ASA.json rename to resources/profiles/FLSun/filament/Generic ASA @FLSun S1.json index 79d37b5e30..d605ac5519 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 ASA.json +++ b/resources/profiles/FLSun/filament/Generic ASA @FLSun S1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun S1 ASA", + "name": "Generic ASA @FLSun S1", "inherits": "Generic ASA @FLSun", + "renamed_from": "FLSun S1 ASA", "from": "system", - "setting_id": "C5oyaWw3YVEz0CgE", - "filament_id": "OFIK0xFa", + "setting_id": "qJeJII6CgHuaC4Iz", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun T1 ASA.json b/resources/profiles/FLSun/filament/Generic ASA @FLSun T1.json similarity index 91% rename from resources/profiles/FLSun/filament/FLSun T1 ASA.json rename to resources/profiles/FLSun/filament/Generic ASA @FLSun T1.json index 862fde6c6e..c27f9e34dd 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 ASA.json +++ b/resources/profiles/FLSun/filament/Generic ASA @FLSun T1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun T1 ASA", + "name": "Generic ASA @FLSun T1", "inherits": "Generic ASA @FLSun", + "renamed_from": "FLSun T1 ASA", "from": "system", - "setting_id": "YmJbWfCQpNk9nxB7", - "filament_id": "OFbjtPQy", + "setting_id": "kj4PPnvuvvGDrDwA", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PETG.json b/resources/profiles/FLSun/filament/Generic PETG @FLSun S1.json similarity index 90% rename from resources/profiles/FLSun/filament/FLSun S1 PETG.json rename to resources/profiles/FLSun/filament/Generic PETG @FLSun S1.json index 33e14b08a1..02506525dd 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PETG.json +++ b/resources/profiles/FLSun/filament/Generic PETG @FLSun S1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun S1 PETG", + "name": "Generic PETG @FLSun S1", "inherits": "Generic PETG @FLSun", + "renamed_from": "FLSun S1 PETG", "from": "system", - "setting_id": "Ac6q0FtMFMLesFdU", - "filament_id": "OF9z5LZ9", + "setting_id": "LxDenrdsmz0QjMDE", "instantiation": "true", "fan_max_speed": [ "60" diff --git a/resources/profiles/FLSun/filament/FLSun T1 PETG.json b/resources/profiles/FLSun/filament/Generic PETG @FLSun T1.json similarity index 90% rename from resources/profiles/FLSun/filament/FLSun T1 PETG.json rename to resources/profiles/FLSun/filament/Generic PETG @FLSun T1.json index 5b2e6e471c..64651bea1d 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PETG.json +++ b/resources/profiles/FLSun/filament/Generic PETG @FLSun T1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun T1 PETG", + "name": "Generic PETG @FLSun T1", "inherits": "Generic PETG @FLSun", + "renamed_from": "FLSun T1 PETG", "from": "system", - "setting_id": "A2aA7xcmqgz8ERyY", - "filament_id": "OFJ80y1e", + "setting_id": "n9wpUe32lTtq2iSS", "instantiation": "true", "fan_max_speed": [ "60" diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun S1.json similarity index 79% rename from resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json rename to resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun S1.json index f1cd779e91..af00b2272d 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun S1.json @@ -1,11 +1,14 @@ { "type": "filament", - "name": "FLSun S1 PLA High Speed", - "inherits": "Generic PLA @FLSun", + "name": "Generic PLA High Speed @FLSun S1", + "inherits": "Generic PLA High Speed @System", + "renamed_from": "FLSun S1 PLA High Speed", "from": "system", - "setting_id": "v2clpNXXo8m6dV33", - "filament_id": "OFoqrHTw", + "setting_id": "ONz6C8a3AMGWxqdK", "instantiation": "true", + "filament_multitool_ramming_flow": [ + "10" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun T1.json similarity index 79% rename from resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json rename to resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun T1.json index 814aa5b47c..7468aadd31 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA High Speed.json +++ b/resources/profiles/FLSun/filament/Generic PLA High Speed @FLSun T1.json @@ -1,11 +1,14 @@ { "type": "filament", - "name": "FLSun T1 PLA High Speed", - "inherits": "Generic PLA @FLSun", + "name": "Generic PLA High Speed @FLSun T1", + "inherits": "Generic PLA High Speed @System", + "renamed_from": "FLSun T1 PLA High Speed", "from": "system", - "setting_id": "E4lpSLLlAxUW04ik", - "filament_id": "OFQ9qnkd", + "setting_id": "en1l0jgFX97t6qUi", "instantiation": "true", + "filament_multitool_ramming_flow": [ + "10" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun S1.json similarity index 81% rename from resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json rename to resources/profiles/FLSun/filament/Generic PLA Silk @FLSun S1.json index 2d4a65f157..0ec0d28da4 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun S1.json @@ -1,11 +1,14 @@ { "type": "filament", - "name": "FLSun S1 PLA Silk", - "inherits": "Generic PLA @FLSun", + "name": "Generic PLA Silk @FLSun S1", + "inherits": "Generic PLA Silk @System", + "renamed_from": "FLSun S1 PLA Silk", "from": "system", - "setting_id": "164Bn4YchxJAaLsa", - "filament_id": "OFSStjay", + "setting_id": "NTJw0fbcn3JoOr0R", "instantiation": "true", + "filament_retraction_length": [ + "nil" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun T1.json similarity index 81% rename from resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json rename to resources/profiles/FLSun/filament/Generic PLA Silk @FLSun T1.json index f7b4b22751..891697aa01 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 PLA Silk.json +++ b/resources/profiles/FLSun/filament/Generic PLA Silk @FLSun T1.json @@ -1,11 +1,14 @@ { "type": "filament", - "name": "FLSun T1 PLA Silk", - "inherits": "Generic PLA @FLSun", + "name": "Generic PLA Silk @FLSun T1", + "inherits": "Generic PLA Silk @System", + "renamed_from": "FLSun T1 PLA Silk", "from": "system", - "setting_id": "gElUb4GnCoEfVlEd", - "filament_id": "OFuUJyRx", + "setting_id": "y2p7TTGI8XWIeiQY", "instantiation": "true", + "filament_retraction_length": [ + "nil" + ], "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/FLSun/filament/FLSun S1 TPU.json b/resources/profiles/FLSun/filament/Generic TPU @FLSun S1.json similarity index 91% rename from resources/profiles/FLSun/filament/FLSun S1 TPU.json rename to resources/profiles/FLSun/filament/Generic TPU @FLSun S1.json index 1a495c4a0b..76e27d9be3 100644 --- a/resources/profiles/FLSun/filament/FLSun S1 TPU.json +++ b/resources/profiles/FLSun/filament/Generic TPU @FLSun S1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun S1 TPU", + "name": "Generic TPU @FLSun S1", "inherits": "Generic TPU @FLSun", + "renamed_from": "FLSun S1 TPU", "from": "system", - "setting_id": "yzPvNqIo7mfWAwNS", - "filament_id": "OF6ooviO", + "setting_id": "xDnQih17nXmGPoPc", "instantiation": "true", "fan_max_speed": [ "100" diff --git a/resources/profiles/FLSun/filament/FLSun T1 TPU.json b/resources/profiles/FLSun/filament/Generic TPU @FLSun T1.json similarity index 91% rename from resources/profiles/FLSun/filament/FLSun T1 TPU.json rename to resources/profiles/FLSun/filament/Generic TPU @FLSun T1.json index 3b25d65229..25f60f10e1 100644 --- a/resources/profiles/FLSun/filament/FLSun T1 TPU.json +++ b/resources/profiles/FLSun/filament/Generic TPU @FLSun T1.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "FLSun T1 TPU", + "name": "Generic TPU @FLSun T1", "inherits": "Generic TPU @FLSun", + "renamed_from": "FLSun T1 TPU", "from": "system", - "setting_id": "34Ux18VB4d6R6G40", - "filament_id": "OFENzGSm", + "setting_id": "TEakmydLXxrHti3G", "instantiation": "true", "fan_max_speed": [ "100" diff --git a/resources/profiles/FLSun/machine/FLSun S1.json b/resources/profiles/FLSun/machine/FLSun S1.json index 597480c25f..eac676cd09 100644 --- a/resources/profiles/FLSun/machine/FLSun S1.json +++ b/resources/profiles/FLSun/machine/FLSun S1.json @@ -8,5 +8,5 @@ "bed_model": "flsun_s1_buildplate_model.stl", "bed_texture": "FLSun_S1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun S1 PLA High Speed;FLSun S1 PLA Silk;Generic PLA @FLSun S1;FLSun S1 PETG;FLSun S1 ASA;FLSun S1 TPU;FLSun S1 ABS" + "default_materials": "Generic PLA High Speed @FLSun S1;Generic PLA Silk @FLSun S1;Generic PLA @FLSun S1;Generic PETG @FLSun S1;Generic ASA @FLSun S1;Generic TPU @FLSun S1;Generic ABS @FLSun S1" } diff --git a/resources/profiles/FLSun/machine/FLSun T1.json b/resources/profiles/FLSun/machine/FLSun T1.json index 45a7a290b1..25a788a60e 100644 --- a/resources/profiles/FLSun/machine/FLSun T1.json +++ b/resources/profiles/FLSun/machine/FLSun T1.json @@ -8,5 +8,5 @@ "bed_model": "flsun_T1_buildplate_model.stl", "bed_texture": "FLSun_T1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "FLSun T1 PLA High Speed;FLSun T1 PLA Silk;Generic PLA @FLSun T1;FLSun T1 PETG;FLSun T1 ASA;FLSun T1 TPU;FLSun T1 ABS" + "default_materials": "Generic PLA High Speed @FLSun T1;Generic PLA Silk @FLSun T1;Generic PLA @FLSun T1;Generic PETG @FLSun T1;Generic ASA @FLSun T1;Generic TPU @FLSun T1;Generic ABS @FLSun T1" } diff --git a/resources/profiles/Lulzbot.json b/resources/profiles/Lulzbot.json index 31836580f0..1d8e31dc93 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.01", + "version": "02.04.00.02", "force_update": "0", "description": "Lulzbot configurations", "machine_model_list": [ @@ -62,16 +62,16 @@ ], "filament_list": [ { - "name": "Lulzbot 2.85mm ABS", - "sub_path": "filament/Lulzbot 2.85mm ABS.json" + "name": "Generic ABS @Lulzbot", + "sub_path": "filament/Generic ABS @Lulzbot.json" }, { - "name": "Lulzbot 2.85mm PETG", - "sub_path": "filament/Lulzbot 2.85mm PETG.json" + "name": "Generic PETG @Lulzbot", + "sub_path": "filament/Generic PETG @Lulzbot.json" }, { - "name": "Lulzbot 2.85mm PLA", - "sub_path": "filament/Lulzbot 2.85mm PLA.json" + "name": "Generic PLA @Lulzbot", + "sub_path": "filament/Generic PLA @Lulzbot.json" } ], "machine_list": [ diff --git a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm ABS.json b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot.json similarity index 74% rename from resources/profiles/Lulzbot/filament/Lulzbot 2.85mm ABS.json rename to resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot.json index 002c664cc2..95d8a2274c 100644 --- a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm ABS.json +++ b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Lulzbot 2.85mm ABS", + "name": "Generic ABS @Lulzbot", "inherits": "Generic ABS @System", + "renamed_from": "Lulzbot 2.85mm ABS", "from": "system", - "setting_id": "XwsWBVH2xIwyRMm4", - "filament_id": "OF6O67Xk", + "setting_id": "Mtn4Fh3Lp6KlAxjo", "instantiation": "true", "filament_diameter": [ "2.85" diff --git a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PETG.json b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot.json similarity index 74% rename from resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PETG.json rename to resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot.json index 343900a1ce..825df8bdc8 100644 --- a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PETG.json +++ b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Lulzbot 2.85mm PETG", + "name": "Generic PETG @Lulzbot", "inherits": "Generic PETG @System", + "renamed_from": "Lulzbot 2.85mm PETG", "from": "system", - "setting_id": "7aS9fdn94lEOU1gJ", - "filament_id": "OF8eQjjt", + "setting_id": "dqj6O9NIPAaq8wWz", "instantiation": "true", "filament_diameter": [ "2.85" diff --git a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PLA.json b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot.json similarity index 74% rename from resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PLA.json rename to resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot.json index 89e0681b45..d08d72ee53 100644 --- a/resources/profiles/Lulzbot/filament/Lulzbot 2.85mm PLA.json +++ b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Lulzbot 2.85mm PLA", + "name": "Generic PLA @Lulzbot", "inherits": "Generic PLA @System", + "renamed_from": "Lulzbot 2.85mm PLA", "from": "system", - "setting_id": "1pyzsOWeVPCxWlqQ", - "filament_id": "OFPryWt5", + "setting_id": "3evRjso1wNxd9nV3", "instantiation": "true", "filament_diameter": [ "2.85" diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5 0.5 nozzle.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5 0.5 nozzle.json index cc1224b635..5fe1dc64e7 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5 0.5 nozzle.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5 0.5 nozzle.json @@ -104,7 +104,7 @@ ], "single_extruder_multi_material": "1", "default_filament_profile": [ - "Lulzbot 2.85mm PLA" + "Generic PLA @Lulzbot" ], "machine_start_gcode": ";This G-Code has been generated specifically for the Lulzbot Taz 4 and 5 - translated from CuraLE 4.13.10 by Wrathernaut\nM73 P0; clear GLCD progress bar\nM75; start GLCD timer\nM140 S{bed_temperature_initial_layer[0]}; start bed heating up\nG90; absolute positioning\nM107; disable fans\nM82; set extruder to absolute mode\nG28 X0 Y0; home X and Y\nG28 Z0; home Z\nG1 Z15.0 F175; move extruder up\nM117 Heating...; progress indicator message on LCD\nM109 R{nozzle_temperature_initial_layer[0]}; wait for extruder to reach printing temp\nM190 R{bed_temperature_initial_layer[0]}; wait for bed to reach printing temp\nG92 E0; set extruder position to 0\nG1 F200 E0; prime the nozzle with filament\nG92 E0; re-set extruder position to 0\nG1 F175; set travel speed\nM203 X192 Y208 Z3; set limits on travel speed\nM117 TAZ Printing...; progress indicator message on LCD\n;Start G-Code End", "machine_end_gcode": ";End G-Code Begin\nM400; wait for moves to finish\nM140 S0; disable hotend\nM104 S0; disable bed heater\nM107; disable fans\nG91; relative positioning\nG1 E-1 F300; filament retraction to release pressure\nG1 Z0.5 E-5 X-20 Y-20 F3000; lift up and retract even more filament\nM77;stopGLCD timer\nG90;absolute positioning\nG1 X0 Y250;move to cooling position\nM84;disable steppers\nM117 Print Complete.;print complete message", diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json index c00c1cc2e3..f7b77690b4 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz 4 or 5.json @@ -8,5 +8,5 @@ "bed_model": "taz_4_or_5_build_plate.stl", "bed_texture": "lulzbot_logo.svg", "hotend_model": "", - "default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" + "default_materials": "Generic ABS @Lulzbot;Generic PETG @Lulzbot;Generic PLA @Lulzbot" } diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz 6 0.5 nozzle.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz 6 0.5 nozzle.json index 4a7aa978fb..23a74064b6 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz 6 0.5 nozzle.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz 6 0.5 nozzle.json @@ -100,7 +100,7 @@ ], "single_extruder_multi_material": "1", "default_filament_profile": [ - "Lulzbot 2.85mm PLA" + "Generic PLA @Lulzbot" ], "machine_start_gcode": ";This G-Code has been translated from LulzBot's CuraLE (v4.13.10) startup GCODE for Taz 6 Single Extruder by Wrathernaut\nM73 P0; clear GLCD progress bar\nM75; start GLCD timer\nM107; disable fans\nM420 S; disable leveling matrix\nG90; absolute positioning\nM82; set extruder to absolute mode\nG92 E0; set extruder position to 0\nM140 S{bed_temperature_initial_layer[0]}; start bed heating up (w)\nG28 XY; home X and Y\nG1 X-19 Y258 F1000; move to safe homing position\nM109 {if filament_type[0] == \"PLA\"}R180\n{elsif filament_type[0] == \"ABS\"}R190\n{elsif filament_type[0] == \"ABS-GF\"}R190\n{elsif filament_type[0] == \"ASA\"}R190\n{elsif filament_type[0] == \"ASA-Aero\"}R190\n{elsif filament_type[0] == \"BVOH\"}R170\n{elsif filament_type[0] == \"EVA\"}R170\n{elsif filament_type[0] == \"PA\"}R220\n{elsif filament_type[0] == \"PA-CF\"}R220\n{elsif filament_type[0] == \"PA-GF\"}R220\n{elsif filament_type[0] == \"PA6-CF\"}R220\n{elsif filament_type[0] == \"PA11-CF\"}R220\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"PC\"}R220\n{elsif filament_type[0] == \"PC-CF\"}R220\n{elsif filament_type[0] == \"PCTG\"}R180\n{elsif filament_type[0] == \"PE\"}R190\n{elsif filament_type[0] == \"PE-CF\"}R190\n{elsif filament_type[0] == \"PET-CF\"}R190\n{elsif filament_type[0] == \"PETG\"}R190\n{elsif filament_type[0] == \"PETG-CF10\"}R190\n{elsif filament_type[0] == \"PHA\"}R180\n{elsif filament_type[0] == \"PLA-AERO\"}R180\n{elsif filament_type[0] == \"PLA-CF\"}R180\n{elsif filament_type[0] == \"PP\"}R180\n{elsif filament_type[0] == \"PP-CF\"}R180\n{elsif filament_type[0] == \"PP-GF\"}R180\n{elsif filament_type[0] == \"PPS\"}R180\n{elsif filament_type[0] == \"PPS-CF\"}R180\n{elsif filament_type[0] == \"PVA\"}R180\n{elsif filament_type[0] == \"PVB\"}R180\n{elsif filament_type[0] == \"SBS\"}R180\n{elsif filament_type[0] == \"TPU\"}R180\n{elsif filament_type[0] == \"FLEX\"}R180\n{elsif filament_type[0] == \"PET\"}R170\n{elsif filament_type[0] == \"HIPS\"}R170\n{elsif filament_type[0] == \"NYLON\"}R220\n{else}R190; unknown filament type soften temp before homing Z{endif}\nG28 Z; home Z\nG1 E-15 F100; retract filament\nM109 {if filament_type[0] == \"PLA\"}R180\n{elsif filament_type[0] == \"ABS\"}R190\n{elsif filament_type[0] == \"ABS-GF\"}R190\n{elsif filament_type[0] == \"ASA\"}R190\n{elsif filament_type[0] == \"ASA-Aero\"}R190\n{elsif filament_type[0] == \"BVOH\"}R170\n{elsif filament_type[0] == \"EVA\"}R170\n{elsif filament_type[0] == \"PA\"}R220\n{elsif filament_type[0] == \"PA-CF\"}R220\n{elsif filament_type[0] == \"PA-GF\"}R220\n{elsif filament_type[0] == \"PA6-CF\"}R220\n{elsif filament_type[0] == \"PA11-CF\"}R220\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"PC\"}R220\n{elsif filament_type[0] == \"PC-CF\"}R220\n{elsif filament_type[0] == \"PCTG\"}R190\n{elsif filament_type[0] == \"PE\"}R190\n{elsif filament_type[0] == \"PE-CF\"}R190\n{elsif filament_type[0] == \"PET-CF\"}R190\n{elsif filament_type[0] == \"PETG\"}R190\n{elsif filament_type[0] == \"PETG-CF10\"}R190\n{elsif filament_type[0] == \"PHA\"}R180\n{elsif filament_type[0] == \"PLA-AERO\"}R180\n{elsif filament_type[0] == \"PLA-CF\"}R180\n{elsif filament_type[0] == \"PP\"}R180\n{elsif filament_type[0] == \"PP-CF\"}R180\n{elsif filament_type[0] == \"PP-GF\"}R180\n{elsif filament_type[0] == \"PPS\"}R180\n{elsif filament_type[0] == \"PPS-CF\"}R180\n{elsif filament_type[0] == \"PVA\"}R180\n{elsif filament_type[0] == \"PVB\"}R180\n{elsif filament_type[0] == \"SBS\"}R180\n{elsif filament_type[0] == \"TPU\"}R180\n{elsif filament_type[0] == \"FLEX\"}R180\n{elsif filament_type[0] == \"PET\"}R170\n{elsif filament_type[0] == \"HIPS\"}R180\n{elsif filament_type[0] == \"NYLON\"}R220\n{else}R170; unknown filament type wipe temp{endif}\n;M206 X0 Y0 Z0; uncomment to adjust wipe position (+X ~ nozzle moves left)(+Y ~ nozzle moves forward)(+Z ~ nozzle moves down)\nG12; wiping sequence\nM206 X0 Y0 Z0; reseting stock nozzle position ### CAUTION: changing this line can affect print quality ###\nG1 Z10 F5000; raise nozzle after wipe\nM109 {if filament_type[0] == \"PLA\"}R160\n{elsif filament_type[0] == \"ABS\"}R170\n{elsif filament_type[0] == \"ABS-GF\"}R170\n{elsif filament_type[0] == \"ASA\"}R170\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"BVOH\"}R170\n{elsif filament_type[0] == \"EVA\"}R170\n{elsif filament_type[0] == \"PA\"}R200\n{elsif filament_type[0] == \"PA-CF\"}R200\n{elsif filament_type[0] == \"PA-GF\"}R170\n{elsif filament_type[0] == \"PA6-CF\"}R170\n{elsif filament_type[0] == \"PA11-CF\"}R200\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"PC\"}R200\n{elsif filament_type[0] == \"PC-CF\"}R200\n{elsif filament_type[0] == \"PCTG\"}R180\n{elsif filament_type[0] == \"PE\"}R180\n{elsif filament_type[0] == \"PE-CF\"}R180\n{elsif filament_type[0] == \"PET-CF\"}R170\n{elsif filament_type[0] == \"PETG\"}R170\n{elsif filament_type[0] == \"PETG-CF10\"}R170\n{elsif filament_type[0] == \"PHA\"}R180\n{elsif filament_type[0] == \"PLA-AERO\"}R180\n{elsif filament_type[0] == \"PLA-CF\"}R180\n{elsif filament_type[0] == \"PP\"}R180\n{elsif filament_type[0] == \"PP-CF\"}R180\n{elsif filament_type[0] == \"PP-GF\"}R180\n{elsif filament_type[0] == \"PPS\"}R180\n{elsif filament_type[0] == \"PPS-CF\"}R180\n{elsif filament_type[0] == \"PVA\"}R160\n{elsif filament_type[0] == \"PVB\"}R160\n{elsif filament_type[0] == \"SBS\"}R180\n{elsif filament_type[0] == \"TPU\"}R160\n{elsif filament_type[0] == \"FLEX\"}R160\n{elsif filament_type[0] == \"PET\"}R170\n{elsif filament_type[0] == \"HIPS\"}R160\n{elsif filament_type[0] == \"NYLON\"}R200\n{else}R170; unknown filament type probe temp{endif}\nG1 X-10 Y293 F4000; move above first probe point\nM204 S100; set probing acceleration\nG29; start auto-leveling sequence\nM420 S1; enable leveling matrix\nM204 S500; restore standard acceleration\nG1 X0 Y0 Z15 F5000; move up off last probe point\nG4 S1; pause\nM400; wait for moves to finish\nM117 Heating...; progress indicator message on LCD\nM109 R{nozzle_temperature_initial_layer[0]}; wait for extruder to reach printing temp (w)\nM190 R{bed_temperature_initial_layer[0]}; wait for bed to reach printing temp\nG1 Z2 E0 F75; prime tiny bit of filament into the nozzle\nM117 TAZ 6 Printing...; progress indicator message on LCD\n;Start G-Code End", "machine_end_gcode": ";End G-Code Begin\nM400; wait for moves to finish\nM140 S0; start bed cooling\nM104 S0; disable hotend\nM107; disable fans\nG91; relative positioning\nG1 E-1 F300; filament retraction to release pressure\nG1 Z20 E-5 X-20 Y-20 F3000; lift up and retract even more filament\nG1 E6; re-prime extruder\nG90; absolute positioning\nG1 Y280 F3000; present finished print\nM77; stop GLCD timer\nM84; disable steppers\nG90; absolute positioning\nM117 Print Complete.; print complete message\n;End G-Code End", diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json index fdf3c0b056..46772a73b0 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz 6.json @@ -8,5 +8,5 @@ "bed_model": "taz_6_build_plate.stl", "bed_texture": "lulzbot_logo.svg", "hotend_model": "", - "default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" + "default_materials": "Generic ABS @Lulzbot;Generic PETG @Lulzbot;Generic PLA @Lulzbot" } diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual 0.5 nozzle.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual 0.5 nozzle.json index dccf5c21a9..ad04dec32a 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual 0.5 nozzle.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual 0.5 nozzle.json @@ -15,7 +15,7 @@ ], "printer_settings_id": "LulzbotPro-Dual", "default_filament_profile": [ - "Lulzbot 2.85mm PLA" + "Generic PLA @Lulzbot" ], "machine_start_gcode": ";This G-Code has been translated from Cura startup from CuraLE 4.13.10 to OrcaSlicer by Wrathernaut\nT0\nM82; absolute extrusion mode\nM73 P0; clear GLCD progress bar\nM75; start GLCD timer\nM107; disable fans\nG90; absolute positioning\nM420 S0; disable previous leveling matrix\nM140 S{bed_temperature_initial_layer[initial_tool]}; begin bed temping up (w)\nM104 {if filament_type[initial_tool] == \"PLA\"}S180\n{elsif filament_type[initial_tool] == \"ABS\"}S190\n{elsif filament_type[initial_tool] == \"ABS-GF\"}S190\n{elsif filament_type[initial_tool] == \"ASA\"}S190\n{elsif filament_type[initial_tool] == \"ASA-Aero\"}S190\n{elsif filament_type[initial_tool] == \"BVOH\"}S170\n{elsif filament_type[initial_tool] == \"EVA\"}S170\n{elsif filament_type[initial_tool] == \"PA\"}R220\n{elsif filament_type[initial_tool] == \"PA-CF\"}R220\n{elsif filament_type[initial_tool] == \"PA-GF\"}R220\n{elsif filament_type[initial_tool] == \"PA6-CF\"}R220\n{elsif filament_type[initial_tool] == \"PA11-CF\"}R220\n{elsif filament_type[initial_tool] == \"ASA-Aero\"}S170\n{elsif filament_type[initial_tool] == \"PC\"}R220\n{elsif filament_type[initial_tool] == \"PC-CF\"}R220\n{elsif filament_type[initial_tool] == \"PCTG\"}S180\n{elsif filament_type[initial_tool] == \"PE\"}S190\n{elsif filament_type[initial_tool] == \"PE-CF\"}S190\n{elsif filament_type[initial_tool] == \"PET-CF\"}S190\n{elsif filament_type[initial_tool] == \"PETG\"}S190\n{elsif filament_type[initial_tool] == \"PETG-CF10\"}S190\n{elsif filament_type[initial_tool] == \"PHA\"}S180\n{elsif filament_type[initial_tool] == \"PLA-AERO\"}S180\n{elsif filament_type[initial_tool] == \"PLA-CF\"}S180\n{elsif filament_type[initial_tool] == \"PP\"}S180\n{elsif filament_type[initial_tool] == \"PP-CF\"}S180\n{elsif filament_type[initial_tool] == \"PP-GF\"}S180\n{elsif filament_type[initial_tool] == \"PPS\"}S180\n{elsif filament_type[initial_tool] == \"PPS-CF\"}S180\n{elsif filament_type[initial_tool] == \"PVA\"}S180\n{elsif filament_type[initial_tool] == \"PVB\"}S180\n{elsif filament_type[initial_tool] == \"SBS\"}S180\n{elsif filament_type[initial_tool] == \"TPU\"}S180\n{elsif filament_type[initial_tool] == \"FLEX\"}S180\n{elsif filament_type[initial_tool] == \"PET\"}S170\n{elsif filament_type[initial_tool] == \"HIPS\"}S170\n{elsif filament_type[initial_tool] == \"NYLON\"}R220\n{else}S190; unknown filament type soften temp before homing Z\n{endif}G28; home\nG0 X50 Y25 Z10 F2000\nM117 Heating...\nM109 {if filament_type[0] == \"PLA\"}R180\n{elsif filament_type[0] == \"ABS\"}R190\n{elsif filament_type[0] == \"ABS-GF\"}R190\n{elsif filament_type[0] == \"ASA\"}R190\n{elsif filament_type[0] == \"ASA-Aero\"}R190\n{elsif filament_type[0] == \"BVOH\"}R170\n{elsif filament_type[0] == \"EVA\"}R170\n{elsif filament_type[0] == \"PA\"}R220\n{elsif filament_type[0] == \"PA-CF\"}R220\n{elsif filament_type[0] == \"PA-GF\"}R220\n{elsif filament_type[0] == \"PA6-CF\"}R220\n{elsif filament_type[0] == \"PA11-CF\"}R220\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"PC\"}R220\n{elsif filament_type[0] == \"PC-CF\"}R220\n{elsif filament_type[0] == \"PCTG\"}R180\n{elsif filament_type[0] == \"PE\"}R190\n{elsif filament_type[0] == \"PE-CF\"}R190\n{elsif filament_type[0] == \"PET-CF\"}R190\n{elsif filament_type[0] == \"PETG\"}R190\n{elsif filament_type[0] == \"PETG-CF10\"}R190\n{elsif filament_type[0] == \"PHA\"}R180\n{elsif filament_type[0] == \"PLA-AERO\"}R180\n{elsif filament_type[0] == \"PLA-CF\"}R180\n{elsif filament_type[0] == \"PP\"}R180\n{elsif filament_type[0] == \"PP-CF\"}R180\n{elsif filament_type[0] == \"PP-GF\"}R180\n{elsif filament_type[0] == \"PPS\"}R180\n{elsif filament_type[0] == \"PPS-CF\"}R180\n{elsif filament_type[0] == \"PVA\"}R180\n{elsif filament_type[0] == \"PVB\"}R180\n{elsif filament_type[0] == \"SBS\"}R180\n{elsif filament_type[0] == \"TPU\"}R180\n{elsif filament_type[0] == \"FLEX\"}R180\n{elsif filament_type[0] == \"PET\"}R170\n{elsif filament_type[0] == \"HIPS\"}R170\n{elsif filament_type[0] == \"NYLON\"}R220\n{else}R190; unknown filament type soften temp before homing Z{endif}\nM82; set extruder to absolute mode\nG92 E0; set extruder to zero\nG1 E-7 F100; retract 7mm of filament on first extruder\nM106; turn on fans to speed cooling\nM117 Wiping...\nM109 {if filament_type[0] == \"PLA\"}R180\n{elsif filament_type[0] == \"ABS\"}R190\n{elsif filament_type[0] == \"ABS-GF\"}R190\n{elsif filament_type[0] == \"ASA\"}R190\n{elsif filament_type[0] == \"ASA-Aero\"}R190\n{elsif filament_type[0] == \"BVOH\"}R170\n{elsif filament_type[0] == \"EVA\"}R170\n{elsif filament_type[0] == \"PA\"}R220\n{elsif filament_type[0] == \"PA-CF\"}R220\n{elsif filament_type[0] == \"PA-GF\"}R220\n{elsif filament_type[0] == \"PA6-CF\"}R220\n{elsif filament_type[0] == \"PA11-CF\"}R220\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"PC\"}R220\n{elsif filament_type[0] == \"PC-CF\"}R220\n{elsif filament_type[0] == \"PCTG\"}R190\n{elsif filament_type[0] == \"PE\"}R190\n{elsif filament_type[0] == \"PE-CF\"}R190\n{elsif filament_type[0] == \"PET-CF\"}R190\n{elsif filament_type[0] == \"PETG\"}R190\n{elsif filament_type[0] == \"PETG-CF10\"}R190\n{elsif filament_type[0] == \"PHA\"}R180\n{elsif filament_type[0] == \"PLA-AERO\"}R180\n{elsif filament_type[0] == \"PLA-CF\"}R180\n{elsif filament_type[0] == \"PP\"}R180\n{elsif filament_type[0] == \"PP-CF\"}R180\n{elsif filament_type[0] == \"PP-GF\"}R180\n{elsif filament_type[0] == \"PPS\"}R180\n{elsif filament_type[0] == \"PPS-CF\"}R180\n{elsif filament_type[0] == \"PVA\"}R180\n{elsif filament_type[0] == \"PVB\"}R180\n{elsif filament_type[0] == \"SBS\"}R180\n{elsif filament_type[0] == \"TPU\"}R180\n{elsif filament_type[0] == \"FLEX\"}R180\n{elsif filament_type[0] == \"PET\"}R170\n{elsif filament_type[0] == \"HIPS\"}R180\n{elsif filament_type[0] == \"NYLON\"}R220\n{else}R170; unknown filament type wipe temp{endif}\nM109 {if filament_type[0] == \"PLA\"}R160\n{elsif filament_type[0] == \"ABS\"}R170\n{elsif filament_type[0] == \"ABS-GF\"}R170\n{elsif filament_type[0] == \"ASA\"}R170\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"BVOH\"}R170\n{elsif filament_type[0] == \"EVA\"}R170\n{elsif filament_type[0] == \"PA\"}R200\n{elsif filament_type[0] == \"PA-CF\"}R200\n{elsif filament_type[0] == \"PA-GF\"}R170\n{elsif filament_type[0] == \"PA6-CF\"}R170\n{elsif filament_type[0] == \"PA11-CF\"}R200\n{elsif filament_type[0] == \"ASA-Aero\"}R170\n{elsif filament_type[0] == \"PC\"}R200\n{elsif filament_type[0] == \"PC-CF\"}R200\n{elsif filament_type[0] == \"PCTG\"}R180\n{elsif filament_type[0] == \"PE\"}R180\n{elsif filament_type[0] == \"PE-CF\"}R180\n{elsif filament_type[0] == \"PET-CF\"}R170\n{elsif filament_type[0] == \"PETG\"}R170\n{elsif filament_type[0] == \"PETG-CF10\"}R170\n{elsif filament_type[0] == \"PHA\"}R180\n{elsif filament_type[0] == \"PLA-AERO\"}R180\n{elsif filament_type[0] == \"PLA-CF\"}R180\n{elsif filament_type[0] == \"PP\"}R180\n{elsif filament_type[0] == \"PP-CF\"}R180\n{elsif filament_type[0] == \"PP-GF\"}R180\n{elsif filament_type[0] == \"PPS\"}R180\n{elsif filament_type[0] == \"PPS-CF\"}R180\n{elsif filament_type[0] == \"PVA\"}R160\n{elsif filament_type[0] == \"PVB\"}R160\n{elsif filament_type[0] == \"SBS\"}R180\n{elsif filament_type[0] == \"TPU\"}R160\n{elsif filament_type[0] == \"FLEX\"}R160\n{elsif filament_type[0] == \"PET\"}R170\n{elsif filament_type[0] == \"HIPS\"}R160\n{elsif filament_type[0] == \"NYLON\"}R200\n{else}R170; unknown filament type probe temp{endif}; cool to probe temp\nG12; wipe sequence\nM107; turn off fan\nG29; probe sequence (for auto-leveling)\nM420 S1; enable leveling matrix\nT{initial_tool}; ensure we're using the first extruder\nM104 S{first_layer_temperature[initial_tool]}; set extruder temp\nG0 X5 Y15 Z10 F5000; move to start location\nM400; clear buffer\nM117 Heating...\nM109 R{first_layer_temperature[initial_tool]}; set extruder temp and waitnM190 R{bed_temperature_initial_layer[initial_tool]}; get bed temping up during first layer\nG1 Z2 E0 F75; raise head and 0 extruder\nM82; set to absolute mode\nM400; clear buffer\nM300 T; play sound at start of first layer\nM117 Printing ...\n;Start G-Code End", "machine_end_gcode": "M400; wait for moves to finish\nM140 S0; start cooling bed\nM107; fans off\nG91 ; relative positioning\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z25 E-1 X20 Y20 F2000; move Z up a bit and retract filament even more\nM104 S{nozzle_temperature[0]} T0 ; T0 to print temp\nM104 S{nozzle_temperature[1]} T1 ; T1 to print temp\nG90 ; absolute positioning\nG0 X285 Y-30 F3000; move to cooling position\nG91 ; relative positioning\nM117 Purging for next print;progress indicator message\nT0\nM109 S{nozzle_temperature[0]}; wait for temp\nG92 E0; set extruder position to purge amount\nG1 E15 F75; purge\nM400; wait for purge\nM104 S0 ; T0 hotend off\nT1\nM109 S{nozzle_temperature[1]}; wait for temp\nG92 E0; set extruder position to purge amount\nG1 E15 F75; purge\nM400; wait for purge\nM104 S0 ; T1 hotend off\nT0\nM117 Cooling, please wait;progress indicator message\nM190 S0; cool off bed\nG0 Y280 F3000 ; present finished print\nM77; stop GLCD timer\nM18 X Y E; turn off x y and e axis\nG90 ; absolute positioning\nM117 Print complete; progress indicator message" diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json index b5157e0925..ca7afe7d9f 100644 --- a/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json +++ b/resources/profiles/Lulzbot/machine/Lulzbot Taz Pro Dual.json @@ -8,5 +8,5 @@ "bed_model": "taz_pro_dual_build_plate.stl", "bed_texture": "Taz_Pro_Dual_printbed.svg", "hotend_model": "", - "default_materials": "Lulzbot 2.85mm ABS;Lulzbot 2.85mm PETG;Lulzbot 2.85mm PLA" + "default_materials": "Generic ABS @Lulzbot;Generic PETG @Lulzbot;Generic PLA @Lulzbot" } diff --git a/resources/profiles/Phrozen.json b/resources/profiles/Phrozen.json index bd4e6f1081..0c711816c1 100644 --- a/resources/profiles/Phrozen.json +++ b/resources/profiles/Phrozen.json @@ -1,6 +1,6 @@ { "name": "Phrozen", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Phrozen configurations", "machine_model_list": [ @@ -57,8 +57,8 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Phrozen PLA @Phrozen Arco 0.4 nozzle", - "sub_path": "filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json" + "name": "Generic PLA @Phrozen Arco 0.4 nozzle", + "sub_path": "filament/Generic PLA @Phrozen Arco 0.4 nozzle.json" } ], "machine_list": [ diff --git a/resources/profiles/Phrozen/filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json b/resources/profiles/Phrozen/filament/Generic PLA @Phrozen Arco 0.4 nozzle.json similarity index 94% rename from resources/profiles/Phrozen/filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json rename to resources/profiles/Phrozen/filament/Generic PLA @Phrozen Arco 0.4 nozzle.json index 8ca51614b6..d909765bad 100644 --- a/resources/profiles/Phrozen/filament/Phrozen PLA @Phrozen Arco 0.4 nozzle.json +++ b/resources/profiles/Phrozen/filament/Generic PLA @Phrozen Arco 0.4 nozzle.json @@ -1,13 +1,13 @@ { "type": "filament", - "name": "Phrozen PLA @Phrozen Arco 0.4 nozzle", - "inherits": "fdm_filament_pla", + "name": "Generic PLA @Phrozen Arco 0.4 nozzle", + "inherits": "Generic PLA @System", + "renamed_from": "Phrozen PLA @Phrozen Arco 0.4 nozzle;Phrozen PLA Phrozen Arco 0.4 nozzle", "from": "system", - "setting_id": "Cc3ULDFzvoHwh8bV", - "filament_id": "OF6VgL2U", + "setting_id": "xTeHmDOY48Bik10J", "instantiation": "true", "filament_settings_id": [ - "Phrozen PLA @Phrozen Arco 0.4 nozzle" + "Generic PLA @Phrozen Arco 0.4 nozzle" ], "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Phrozen/machine/Phrozen Arco 0.4 nozzle.json b/resources/profiles/Phrozen/machine/Phrozen Arco 0.4 nozzle.json index 051f62fa6c..c34d188507 100644 --- a/resources/profiles/Phrozen/machine/Phrozen Arco 0.4 nozzle.json +++ b/resources/profiles/Phrozen/machine/Phrozen Arco 0.4 nozzle.json @@ -14,7 +14,7 @@ ], "default_print_profile": "0.20mm Standard @Phrozen Arco 0.4 nozzle", "default_filament_profile": [ - "Phrozen PLA @Phrozen Arco 0.4 nozzle" + "Generic PLA @Phrozen Arco 0.4 nozzle" ], "disable_m73": "1", "gcode_flavor": "klipper", diff --git a/resources/profiles/Phrozen/machine/Phrozen Arco.json b/resources/profiles/Phrozen/machine/Phrozen Arco.json index 648b014ebd..be6c15bfe7 100644 --- a/resources/profiles/Phrozen/machine/Phrozen Arco.json +++ b/resources/profiles/Phrozen/machine/Phrozen Arco.json @@ -8,5 +8,5 @@ "bed_model": "Phrozen Arco_buildplate_model.stl", "bed_texture": "Phrozen Arco_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Phrozen PLA @Phrozen Arco 0.4 nozzle" + "default_materials": "Generic PLA @Phrozen Arco 0.4 nozzle" } diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index c3babbc4a5..a831bb268c 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "02.04.00.13", + "version": "02.04.00.14", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ diff --git a/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json b/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json index 83ec8a1025..ce29e0a165 100644 --- a/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json +++ b/resources/profiles/Qidi/filament/Tinmorry PETG-ECO.json @@ -4,7 +4,7 @@ "inherits": "fdm_filament_pet", "from": "system", "setting_id": "uVa250OrqClMz41k", - "filament_id": "OFpBV2Ma", + "filament_id": "OFYE7YZw", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" @@ -52,7 +52,7 @@ "235" ], "filament_vendor": [ - "Generic" + "Tinmorry" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index 65b1d12a3a..50aaad2715 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -1,6 +1,6 @@ { "name": "Snapmaker", - "version": "02.04.00.10", + "version": "02.04.00.11", "force_update": "0", "description": "Snapmaker configurations", "machine_model_list": [ diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json index 9dce5b1e84..d61e2adb1b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json @@ -2,7 +2,7 @@ "type": "filament", "name": "Snapmaker TPU 95A @U1 base", "from": "system", - "filament_id": "OFKo87c6", + "filament_id": "OFvmwTZE", "instantiation": "false", "overhang_fan_threshold": [ "95%" @@ -47,7 +47,7 @@ "0" ], "filament_vendor": [ - "Generic" + "Snapmaker" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json index 9cc40e8552..59b125ff72 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json @@ -195,7 +195,7 @@ "100" ], "filament_vendor": [ - "Generic" + "Snapmaker" ], "filament_wipe": [ "nil" diff --git a/resources/profiles/Sovol.json b/resources/profiles/Sovol.json index 770ca55c95..a38645abc2 100644 --- a/resources/profiles/Sovol.json +++ b/resources/profiles/Sovol.json @@ -1,7 +1,7 @@ { "name": "Sovol", "url": "", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "Sovol configurations", "machine_model_list": [ @@ -234,96 +234,96 @@ "sub_path": "filament/SUNLU PETG @Sovol SV08 MAX.json" }, { - "name": "Sovol SV06 ACE ABS", - "sub_path": "filament/Sovol SV06 ACE ABS.json" + "name": "Generic ABS @Sovol SV06 ACE", + "sub_path": "filament/Generic ABS @Sovol SV06 ACE.json" }, { - "name": "Sovol SV06 ACE PETG", - "sub_path": "filament/Sovol SV06 ACE PETG.json" + "name": "Generic PETG @Sovol SV06 ACE", + "sub_path": "filament/Generic PETG @Sovol SV06 ACE.json" }, { - "name": "Sovol SV06 ACE PLA", - "sub_path": "filament/Sovol SV06 ACE PLA.json" + "name": "Generic PLA @Sovol SV06 ACE", + "sub_path": "filament/Generic PLA @Sovol SV06 ACE.json" }, { - "name": "Sovol SV06 ACE TPU", - "sub_path": "filament/Sovol SV06 ACE TPU.json" + "name": "Generic TPU @Sovol SV06 ACE", + "sub_path": "filament/Generic TPU @Sovol SV06 ACE.json" }, { - "name": "Sovol SV06 Plus ACE ABS", - "sub_path": "filament/Sovol SV06 Plus ACE ABS.json" + "name": "Generic ABS @Sovol SV06 Plus ACE", + "sub_path": "filament/Generic ABS @Sovol SV06 Plus ACE.json" }, { - "name": "Sovol SV06 Plus ACE PETG", - "sub_path": "filament/Sovol SV06 Plus ACE PETG.json" + "name": "Generic PETG @Sovol SV06 Plus ACE", + "sub_path": "filament/Generic PETG @Sovol SV06 Plus ACE.json" }, { - "name": "Sovol SV06 Plus ACE PLA", - "sub_path": "filament/Sovol SV06 Plus ACE PLA.json" + "name": "Generic PLA @Sovol SV06 Plus ACE", + "sub_path": "filament/Generic PLA @Sovol SV06 Plus ACE.json" }, { - "name": "Sovol SV06 Plus ACE TPU", - "sub_path": "filament/Sovol SV06 Plus ACE TPU.json" + "name": "Generic TPU @Sovol SV06 Plus ACE", + "sub_path": "filament/Generic TPU @Sovol SV06 Plus ACE.json" }, { - "name": "Sovol SV07 PLA", - "sub_path": "filament/Sovol SV07 PLA.json" + "name": "Generic PLA @Sovol SV07", + "sub_path": "filament/Generic PLA @Sovol SV07.json" }, { - "name": "Sovol SV08 ABS", - "sub_path": "filament/Sovol SV08 ABS.json" + "name": "Generic ABS @Sovol SV08", + "sub_path": "filament/Generic ABS @Sovol SV08.json" }, { - "name": "Sovol SV08 PETG", - "sub_path": "filament/Sovol SV08 PETG.json" + "name": "Generic PETG @Sovol SV08", + "sub_path": "filament/Generic PETG @Sovol SV08.json" }, { - "name": "Sovol SV08 PLA", - "sub_path": "filament/Sovol SV08 PLA.json" + "name": "Generic PLA @Sovol SV08", + "sub_path": "filament/Generic PLA @Sovol SV08.json" }, { - "name": "Sovol SV08 PLA @SV08 0.2 nozzle", - "sub_path": "filament/Sovol SV08 PLA @SV08 0.2 nozzle.json" + "name": "Generic PLA @Sovol SV08 0.2 nozzle", + "sub_path": "filament/Generic PLA @Sovol SV08 0.2 nozzle.json" }, { - "name": "Sovol SV08 TPU", - "sub_path": "filament/Sovol SV08 TPU.json" + "name": "Generic TPU @Sovol SV08", + "sub_path": "filament/Generic TPU @Sovol SV08.json" }, { - "name": "Sovol Zero ABS", - "sub_path": "filament/Sovol Zero ABS.json" + "name": "Generic ABS @Sovol Zero", + "sub_path": "filament/Generic ABS @Sovol Zero.json" }, { - "name": "Sovol Zero PC", - "sub_path": "filament/Sovol Zero PC.json" + "name": "Generic PC @Sovol Zero", + "sub_path": "filament/Generic PC @Sovol Zero.json" }, { - "name": "Sovol Zero PETG", - "sub_path": "filament/Sovol Zero PETG.json" + "name": "Generic PETG @Sovol Zero", + "sub_path": "filament/Generic PETG @Sovol Zero.json" }, { "name": "Sovol Zero PETG HS Nozzle", "sub_path": "filament/Sovol Zero PETG HS Nozzle.json" }, { - "name": "Sovol Zero PLA Basic", - "sub_path": "filament/Sovol Zero PLA Basic.json" + "name": "Generic PLA @Sovol Zero", + "sub_path": "filament/Generic PLA @Sovol Zero.json" }, { "name": "Sovol Zero PLA Basic HS Nozzle", "sub_path": "filament/Sovol Zero PLA Basic HS Nozzle.json" }, { - "name": "Sovol Zero PLA Silk", - "sub_path": "filament/Sovol Zero PLA Silk.json" + "name": "Generic PLA Silk @Sovol Zero", + "sub_path": "filament/Generic PLA Silk @Sovol Zero.json" }, { "name": "Sovol Zero PLA Silk HS Nozzle", "sub_path": "filament/Sovol Zero PLA Silk HS Nozzle.json" }, { - "name": "Sovol Zero TPU", - "sub_path": "filament/Sovol Zero TPU.json" + "name": "Generic TPU @Sovol Zero", + "sub_path": "filament/Generic TPU @Sovol Zero.json" } ], "machine_list": [ diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 ACE.json similarity index 87% rename from resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json rename to resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 ACE.json index 025dee3fe5..49b26d498a 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE ABS.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 ACE ABS", + "name": "Generic ABS @Sovol SV06 ACE", "inherits": "Generic ABS @System", + "renamed_from": "Sovol SV06 ACE ABS", "from": "system", - "setting_id": "okqqqm0P8ehlQuDY", - "filament_id": "OF67EdL5", + "setting_id": "exjBdPPCgk53gipu", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 Plus ACE.json similarity index 84% rename from resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json rename to resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 Plus ACE.json index e38812d1a4..905ee2bda0 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE ABS.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV06 Plus ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 Plus ACE ABS", + "name": "Generic ABS @Sovol SV06 Plus ACE", "inherits": "Generic ABS @System", + "renamed_from": "Sovol SV06 Plus ACE ABS", "from": "system", - "setting_id": "Me1iSJmocW35ClmN", - "filament_id": "OFCEA7Nt", + "setting_id": "sg9HXvKEoKD4pw7v", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 ABS.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08.json similarity index 91% rename from resources/profiles/Sovol/filament/Sovol SV08 ABS.json rename to resources/profiles/Sovol/filament/Generic ABS @Sovol SV08.json index f29c3f274d..e690ee88e5 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 ABS.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol SV08.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV08 ABS", + "name": "Generic ABS @Sovol SV08", "inherits": "Generic ABS @System", + "renamed_from": "Sovol SV08 ABS", "from": "system", - "setting_id": "nq4vvrWqKjWKELEz", - "filament_id": "OF016CJw", + "setting_id": "aZx3ePr3Id1jPJG9", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero ABS.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol Zero.json similarity index 90% rename from resources/profiles/Sovol/filament/Sovol Zero ABS.json rename to resources/profiles/Sovol/filament/Generic ABS @Sovol Zero.json index 8ae60c192f..3b737e2a18 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero ABS.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol Zero.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol Zero ABS", + "name": "Generic ABS @Sovol Zero", "inherits": "Generic ABS @System", + "renamed_from": "Sovol Zero ABS", "from": "system", - "setting_id": "9pI7op6U4azpfNfb", - "filament_id": "OFNX8GI1", + "setting_id": "g6sSyyIFYJUzlXsp", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PC.json b/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json similarity index 90% rename from resources/profiles/Sovol/filament/Sovol Zero PC.json rename to resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json index 87d4b2c924..dd0eb60594 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PC.json +++ b/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol Zero PC", + "name": "Generic PC @Sovol Zero", "inherits": "Generic PC @System", + "renamed_from": "Sovol Zero PC", "from": "system", - "setting_id": "vuuZXnlrMgUKtSI0", - "filament_id": "OFcdqaWI", + "setting_id": "yRKCiPMN6fxibcyg", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 ACE.json similarity index 87% rename from resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json rename to resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 ACE.json index 41066fb061..acb2c90316 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE PETG.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 ACE PETG", + "name": "Generic PETG @Sovol SV06 ACE", "inherits": "Generic PETG @System", + "renamed_from": "Sovol SV06 ACE PETG", "from": "system", - "setting_id": "5mtng0PM8CMglpD7", - "filament_id": "OFe7Sx5B", + "setting_id": "p8fGWNVkT6n5Dv9P", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 Plus ACE.json similarity index 84% rename from resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json rename to resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 Plus ACE.json index 4b1ab35b1c..5c2dfeff98 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PETG.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV06 Plus ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 Plus ACE PETG", + "name": "Generic PETG @Sovol SV06 Plus ACE", "inherits": "Generic PETG @System", + "renamed_from": "Sovol SV06 Plus ACE PETG", "from": "system", - "setting_id": "ZrAm6Nm4FI7p4PgC", - "filament_id": "OFl7nOAf", + "setting_id": "I7IzLMYw7iDUUJwc", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PETG.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08.json similarity index 90% rename from resources/profiles/Sovol/filament/Sovol SV08 PETG.json rename to resources/profiles/Sovol/filament/Generic PETG @Sovol SV08.json index 54718800a9..c637897b10 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PETG.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol SV08.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV08 PETG", + "name": "Generic PETG @Sovol SV08", "inherits": "Generic PETG @System", + "renamed_from": "Sovol SV08 PETG", "from": "system", - "setting_id": "CWd7KULbXvJeTTEy", - "filament_id": "OFRi7v0b", + "setting_id": "7vDZKIKJW5fy1EGG", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PETG.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json similarity index 91% rename from resources/profiles/Sovol/filament/Sovol Zero PETG.json rename to resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json index 37f603579b..a223521d25 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PETG.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol Zero PETG", + "name": "Generic PETG @Sovol Zero", "inherits": "Generic PETG @System", + "renamed_from": "Sovol Zero PETG", "from": "system", - "setting_id": "75OJvkXlmbcaHQfW", - "filament_id": "OFHTVfaU", + "setting_id": "i4OW2eAtXOKdtVNj", "instantiation": "true", "filament_flow_ratio": [ "1.0348" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 ACE.json similarity index 87% rename from resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json rename to resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 ACE.json index b3780567d1..de9e7cde47 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE PLA.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 ACE PLA", + "name": "Generic PLA @Sovol SV06 ACE", "inherits": "Generic PLA @System", + "renamed_from": "Sovol SV06 ACE PLA", "from": "system", - "setting_id": "kgtcANsbfwSbdgOh", - "filament_id": "OFTvvox9", + "setting_id": "UEEwpetmmxpxM4vV", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 Plus ACE.json similarity index 85% rename from resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json rename to resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 Plus ACE.json index a0a3190eaf..8dcb4a6d2d 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE PLA.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV06 Plus ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 Plus ACE PLA", + "name": "Generic PLA @Sovol SV06 Plus ACE", "inherits": "Generic PLA @System", + "renamed_from": "Sovol SV06 Plus ACE PLA", "from": "system", - "setting_id": "YEEOGJYm4Z8W4vGV", - "filament_id": "OFNZjrLo", + "setting_id": "yzv5Kwe3OivHxNUI", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV07 PLA.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV07.json similarity index 87% rename from resources/profiles/Sovol/filament/Sovol SV07 PLA.json rename to resources/profiles/Sovol/filament/Generic PLA @Sovol SV07.json index b1b13b7e79..42210ef9c0 100644 --- a/resources/profiles/Sovol/filament/Sovol SV07 PLA.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV07.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV07 PLA", + "name": "Generic PLA @Sovol SV07", "inherits": "Generic PLA @System", + "renamed_from": "Sovol SV07 PLA", "from": "system", - "setting_id": "IHicmU5gzVf6G4F1", - "filament_id": "OFaFNP2U", + "setting_id": "sNGno8XCSsgmwjvH", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 0.2 nozzle.json similarity index 84% rename from resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json rename to resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 0.2 nozzle.json index dda11511e0..be23b183ab 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PLA @SV08 0.2 nozzle.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08 0.2 nozzle.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV08 PLA @SV08 0.2 nozzle", + "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", "from": "system", - "setting_id": "qmnuve3FgzrXgjPA", - "filament_id": "OFcJ7AKd", + "setting_id": "W7oQNGWqiPMUlzhw", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 PLA.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08.json similarity index 89% rename from resources/profiles/Sovol/filament/Sovol SV08 PLA.json rename to resources/profiles/Sovol/filament/Generic PLA @Sovol SV08.json index 9e76203099..c124edee31 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 PLA.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol SV08.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV08 PLA", + "name": "Generic PLA @Sovol SV08", "inherits": "Generic PLA @System", + "renamed_from": "Sovol SV08 PLA", "from": "system", - "setting_id": "nnU0222BS0F1c5ki", - "filament_id": "OFcJ7AKd", + "setting_id": "4fSYcvbFXNRHnlEw", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json similarity index 90% rename from resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json rename to resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json index 990a2b3edb..131867f6b8 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol Zero PLA Basic", + "name": "Generic PLA @Sovol Zero", "inherits": "Generic PLA @System", + "renamed_from": "Sovol Zero PLA Basic", "from": "system", - "setting_id": "ZVvOaMwZ7noevsYf", - "filament_id": "OF7VJMYM", + "setting_id": "NNDerIjh7qtuh1I3", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json similarity index 80% rename from resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json rename to resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json index 24fab028e8..5b46a92d64 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk.json +++ b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json @@ -1,11 +1,17 @@ { "type": "filament", - "name": "Sovol Zero PLA Silk", - "inherits": "Generic PLA @System", + "name": "Generic PLA Silk @Sovol Zero", + "inherits": "Generic PLA Silk @System", + "renamed_from": "Sovol Zero PLA Silk", "from": "system", - "setting_id": "QowhGzqSwGQoAp1a", - "filament_id": "OFJVFpJz", + "setting_id": "Se2yKerHRStYtWf5", "instantiation": "true", + "filament_multitool_ramming_flow": [ + "20" + ], + "filament_retraction_length": [ + "nil" + ], "filament_flow_ratio": [ "0.98" ], diff --git a/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 ACE.json similarity index 87% rename from resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json rename to resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 ACE.json index 861b80c567..ba653af37d 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 ACE TPU.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 ACE TPU", + "name": "Generic TPU @Sovol SV06 ACE", "inherits": "Generic TPU @System", + "renamed_from": "Sovol SV06 ACE TPU", "from": "system", - "setting_id": "ERN0ozxmPhIMze0i", - "filament_id": "OFJfv07m", + "setting_id": "jBAo7stLaaQxKFsp", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 Plus ACE.json similarity index 85% rename from resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json rename to resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 Plus ACE.json index fbacdaf2da..9c9490b863 100644 --- a/resources/profiles/Sovol/filament/Sovol SV06 Plus ACE TPU.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV06 Plus ACE.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV06 Plus ACE TPU", + "name": "Generic TPU @Sovol SV06 Plus ACE", "inherits": "Generic TPU @System", + "renamed_from": "Sovol SV06 Plus ACE TPU", "from": "system", - "setting_id": "oNucKLcIdxwBPpUN", - "filament_id": "OFkWaWRo", + "setting_id": "MUXz0JSHdT66Mti1", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol SV08 TPU.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08.json similarity index 90% rename from resources/profiles/Sovol/filament/Sovol SV08 TPU.json rename to resources/profiles/Sovol/filament/Generic TPU @Sovol SV08.json index 404675d8f4..bf412d77d8 100644 --- a/resources/profiles/Sovol/filament/Sovol SV08 TPU.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol SV08.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol SV08 TPU", + "name": "Generic TPU @Sovol SV08", "inherits": "Generic TPU @System", + "renamed_from": "Sovol SV08 TPU", "from": "system", - "setting_id": "tpBbCQhcSJsBesnG", - "filament_id": "OFyCToOV", + "setting_id": "vFPYMoNvgjn1aSKA", "instantiation": "true", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/Sovol/filament/Sovol Zero TPU.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json similarity index 90% rename from resources/profiles/Sovol/filament/Sovol Zero TPU.json rename to resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json index bd4596b303..8c7c18c523 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero TPU.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json @@ -1,10 +1,10 @@ { "type": "filament", - "name": "Sovol Zero TPU", + "name": "Generic TPU @Sovol Zero", "inherits": "Generic TPU @System", + "renamed_from": "Sovol Zero TPU", "from": "system", - "setting_id": "iZHXx0RyRO096L0z", - "filament_id": "OF6zAVFj", + "setting_id": "MlY6WQ41FE8zDPSV", "instantiation": "true", "filament_flow_ratio": [ "0.98" 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 45030c23ac..329a91b001 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 @@ -126,6 +126,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV06 ACE PLA" + "Generic PLA @Sovol SV06 ACE" ] } 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 9128747e51..c9f054af98 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 @@ -126,6 +126,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV06 ACE PLA" + "Generic PLA @Sovol SV06 ACE" ] } 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 a1433ec914..e7bc84ee1a 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 @@ -126,6 +126,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV06 ACE PLA" + "Generic PLA @Sovol SV06 ACE" ] } 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 5415c845e2..6c555ef1d5 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 @@ -126,6 +126,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV06 ACE PLA" + "Generic PLA @Sovol SV06 ACE" ] } diff --git a/resources/profiles/Sovol/machine/Sovol SV06 ACE.json b/resources/profiles/Sovol/machine/Sovol SV06 ACE.json index fe28ebc823..e3e0067e60 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 ACE.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 ACE.json @@ -8,5 +8,5 @@ "bed_model": "sovol_sv06_ace_buildplate_model.stl", "bed_texture": "sovol_sv06_ace_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Sovol SV06 ACE PLA" + "default_materials": "Generic PLA @Sovol SV06 ACE" } 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 440ff3c88f..5624a3c07f 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 @@ -124,6 +124,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV06 Plus ACE PLA" + "Generic PLA @Sovol SV06 Plus ACE" ] } diff --git a/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json b/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json index 8ec61bab90..5b034f4359 100644 --- a/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json +++ b/resources/profiles/Sovol/machine/Sovol SV06 Plus ACE.json @@ -8,5 +8,5 @@ "bed_model": "sovol_sv06plus_ace_buildplate_model.stl", "bed_texture": "sovol_sv06plus_ace_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Sovol SV06 Plus ACE PLA" + "default_materials": "Generic PLA @Sovol SV06 Plus ACE" } diff --git a/resources/profiles/Sovol/machine/Sovol SV07.json b/resources/profiles/Sovol/machine/Sovol SV07.json index 2ac60556da..bd63f8d407 100644 --- a/resources/profiles/Sovol/machine/Sovol SV07.json +++ b/resources/profiles/Sovol/machine/Sovol SV07.json @@ -8,5 +8,5 @@ "bed_model": "sovol_sv07_buildplate_model.stl", "bed_texture": "sovol_sv07_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Sovol SV07 PLA" + "default_materials": "Generic PLA @Sovol SV07" } 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 c81d26c959..441616c542 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.2 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.2 nozzle.json @@ -108,6 +108,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV08 PLA @SV08 0.2 nozzle" + "Generic PLA @Sovol SV08 0.2 nozzle" ] } 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 5aa5e4f14b..7defca131b 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.4 nozzle.json @@ -102,6 +102,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV08 PLA" + "Generic PLA @Sovol SV08" ] } 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 2825fb9a83..d49594b4af 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.6 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.6 nozzle.json @@ -108,6 +108,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV08 PLA" + "Generic PLA @Sovol SV08" ] } 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 6510857d6f..576ca16076 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08 0.8 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol SV08 0.8 nozzle.json @@ -108,6 +108,6 @@ "machine_end_gcode": "END_PRINT\n", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Sovol SV08 PLA" + "Generic PLA @Sovol SV08" ] } diff --git a/resources/profiles/Sovol/machine/Sovol SV08.json b/resources/profiles/Sovol/machine/Sovol SV08.json index 2d861f5ef4..c6cee44624 100644 --- a/resources/profiles/Sovol/machine/Sovol SV08.json +++ b/resources/profiles/Sovol/machine/Sovol SV08.json @@ -8,5 +8,5 @@ "bed_model": "sovol_sv08_buildplate_model.stl", "bed_texture": "sovol_sv08_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Sovol SV08 PLA;Sovol SV08 PLA @SV08 0.2 nozzle;Sovol SV08 ABS;Sovol SV08 PETG;Sovol SV08 TPU" + "default_materials": "Generic PLA @Sovol SV08;Generic PLA @Sovol SV08 0.2 nozzle;Generic ABS @Sovol SV08;Generic PETG @Sovol SV08;Generic TPU @Sovol SV08" } 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 f4ae49b7cb..a5699a9eed 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json @@ -107,6 +107,6 @@ "machine_start_gcode": "M140 S[bed_temperature_initial_layer_single] ;set bed temp\nM190 S[bed_temperature_initial_layer_single] ;wait for bed temp\nG28\nSTART_PRINT\nG28\nG90\nG1 X0 Y0 F12000\nG1 Z0.300 F600\nM104 S[nozzle_temperature_initial_layer] ;set extruder temp\nM109 S[nozzle_temperature_initial_layer];wait for extruder temp\n{if first_layer_print_min[1] - 6 > print_bed_min[1]}\nG90\nM83\nG1 E-0.5 F600\nG1 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4} Y{first_layer_print_min[1] - 5} F12000\nG0 Z0.3 F600 ;Move to start position\nG1 E0.200 F600\n{if first_layer_print_max[0] - first_layer_print_min[0] > 50}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*1} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*2} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*3} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*4} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*5} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*6} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*7} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*8} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*9} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*10} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\n{else}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 2} E{(first_layer_print_max[0] - first_layer_print_min[0]) / 2 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0])} E{(first_layer_print_max[0] - first_layer_print_min[0]) / 2 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\n{endif}\nG1 E-0.300 F600\nG0 Z1 F600\nG1 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4} Y{first_layer_print_min[1] - 4} F12000\nG0 Z0.3 F600 ;Move to start position\nG1 E0.200 F600\n{if first_layer_print_max[0] - first_layer_print_min[0] > 50}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*1} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*2} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*3} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*4} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*5} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*6} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*7} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*8} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*9} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 4 + 5*10} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\n{else}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0]) / 2} E{(first_layer_print_max[0] - first_layer_print_min[0]) / 2 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG0 X{first_layer_print_min[0] + (first_layer_print_max[0] - first_layer_print_min[0])} E{(first_layer_print_max[0] - first_layer_print_min[0]) / 2 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\n{endif}\nG1 E-0.300 F600\nG0 Z5 F600\nM400\n{else}\nG90\nM83\nG1 E-0.300 Z3 F600\nG1 X{print_bed_max[1] / 3} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 Z0.3 F600\nG1 E0.300 F600\nG1 X{print_bed_max[1] / 3 + 5*1} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*2} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*3} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*4} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*5} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*6} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*7} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*8} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*9} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*10} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3} Y1 F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*1} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*2} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*3} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*4} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*5} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*6} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*7} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*8} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 X{print_bed_max[1] / 3 + 5*9} E{5 * 0.2} F{outer_wall_volumetric_speed/(24/20) * 60}\nG1 X{print_bed_max[1] / 3 + 5*10} E{5 * 0.2} F{outer_wall_volumetric_speed/(0.3*0.5)/4 * 60}\nG1 E-0.300 Z3 F600\nM400\n{endif}\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\n\n", "machine_end_gcode": "END_PRINT\n", "default_filament_profile": [ - "Sovol Zero PLA Basic" + "Generic PLA @Sovol Zero" ] } diff --git a/resources/profiles/Sovol/machine/Sovol Zero.json b/resources/profiles/Sovol/machine/Sovol Zero.json index c1ccc64b84..6f99e8f8d0 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero.json +++ b/resources/profiles/Sovol/machine/Sovol Zero.json @@ -8,5 +8,5 @@ "bed_model": "sovol_zero_buildplate_model.stl", "bed_texture": "sovol_zero_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Sovol Zero PLA Basic;Sovol Zero PLA Basic HS Nozzle;Sovol Zero PLA Silk;Sovol Zero PLA Silk HS Nozzle;Sovol Zero ABS;Sovol Zero PETG;Sovol Zero PETG HS Nozzle;Sovol Zero TPU;Sovol Zero PC" + "default_materials": "Generic PLA @Sovol Zero;Sovol Zero PLA Basic HS Nozzle;Generic PLA Silk @Sovol Zero;Sovol Zero PLA Silk HS Nozzle;Generic ABS @Sovol Zero;Generic PETG @Sovol Zero;Sovol Zero PETG HS Nozzle;Generic TPU @Sovol Zero;Generic PC @Sovol Zero" } diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index 336f48ac15..b41888a840 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -2322,6 +2322,12 @@ ], "successor": "OFmhJs5V" }, + "OF016CJw": { + "claims": [ + "Sovol/Sovol SV08 ABS" + ], + "successor": "OFY9muEs" + }, "OF0GIkJm": { "claims": [ "Tiertime/Tiertime Generic PLA Silk" @@ -2457,6 +2463,12 @@ ], "successor": "OFDSrzZ8" }, + "OF67EdL5": { + "claims": [ + "Sovol/Sovol SV06 ACE ABS" + ], + "successor": "OFY9muEs" + }, "OF6Fpw1E": { "claims": [ "Comgrow/Comgrow Generic PETG" @@ -2475,12 +2487,30 @@ ], "successor": "OFDSrzZ8" }, + "OF6O67Xk": { + "claims": [ + "Lulzbot/Lulzbot 2.85mm ABS" + ], + "successor": "OFY9muEs" + }, + "OF6VgL2U": { + "claims": [ + "Phrozen/Phrozen PLA" + ], + "successor": "OFDSrzZ8" + }, "OF6WddJ1": { "claims": [ "Flashforge/FusRock S-PAHT" ], "successor": "OFCn83wF" }, + "OF6ooviO": { + "claims": [ + "FLSun/FLSun S1 TPU" + ], + "successor": "OFgbpcy9" + }, "OF6rMr3U": { "claims": [ "Flashforge/FusRock Generic S-Multi" @@ -2505,6 +2535,18 @@ ], "successor": "OFLakOUI" }, + "OF6zAVFj": { + "claims": [ + "Sovol/Sovol Zero TPU" + ], + "successor": "OFgbpcy9" + }, + "OF7VJMYM": { + "claims": [ + "Sovol/Sovol Zero PLA Basic" + ], + "successor": "OFDSrzZ8" + }, "OF7g2vYQ": { "claims": [ "Co Print/CoPrint Generic TPU" @@ -2529,6 +2571,12 @@ ], "successor": "OFQLcbps" }, + "OF8eQjjt": { + "claims": [ + "Lulzbot/Lulzbot 2.85mm PETG" + ], + "successor": "OFYPdQJh" + }, "OF97ru74": { "claims": [ "Prusa/Prusa Generic PC" @@ -2541,6 +2589,12 @@ ], "successor": "OFLakOUI" }, + "OF9z5LZ9": { + "claims": [ + "FLSun/FLSun S1 PETG" + ], + "successor": "OFYPdQJh" + }, "OFACSw9O": { "claims": [ "Creality/Creality Generic PLA" @@ -2608,6 +2662,12 @@ ], "successor": "OFgbpcy9" }, + "OFCEA7Nt": { + "claims": [ + "Sovol/Sovol SV06 Plus ACE ABS" + ], + "successor": "OFY9muEs" + }, "OFCVUEaV": { "claims": [ "Tiertime/Tiertime Generic TPU" @@ -2654,6 +2714,12 @@ ], "successor": "OFgbpcy9" }, + "OFENzGSm": { + "claims": [ + "FLSun/FLSun T1 TPU" + ], + "successor": "OFgbpcy9" + }, "OFETFWx7": { "claims": [ "SecKit/SecKit Generic PLA" @@ -2732,6 +2798,12 @@ ], "successor": "OFQLcbps" }, + "OFHTVfaU": { + "claims": [ + "Sovol/Sovol Zero PETG" + ], + "successor": "OFYPdQJh" + }, "OFHUnLY2": { "claims": [ "Vzbot/Vzbot Generic PETG" @@ -2750,6 +2822,12 @@ ], "successor": "OFLPAxz3" }, + "OFIK0xFa": { + "claims": [ + "FLSun/FLSun S1 ASA" + ], + "successor": "OFLPAxz3" + }, "OFIYTy8S": { "claims": [ "Anker/Anker Generic PLA+", @@ -2782,6 +2860,12 @@ ], "successor": "OFg8ndtj" }, + "OFJ80y1e": { + "claims": [ + "FLSun/FLSun T1 PETG" + ], + "successor": "OFYPdQJh" + }, "OFJJpaLS": { "claims": [ "FLSun/FLSun Generic PETG" @@ -2794,6 +2878,18 @@ ], "successor": "OFDSrzZ8" }, + "OFJVFpJz": { + "claims": [ + "Sovol/Sovol Zero PLA Silk" + ], + "successor": "OFesA6rF" + }, + "OFJfv07m": { + "claims": [ + "Sovol/Sovol SV06 ACE TPU" + ], + "successor": "OFgbpcy9" + }, "OFK01afJ": { "claims": [ "Qidi/Qidi Generic PC" @@ -2812,6 +2908,12 @@ ], "successor": "OFYPdQJh" }, + "OFKo87c6": { + "claims": [ + "Snapmaker/Snapmaker TPU 95A" + ], + "successor": "OFvmwTZE" + }, "OFKuTr12": { "claims": [ "Tiertime/Tiertime Generic PE" @@ -2928,6 +3030,18 @@ ], "successor": "OFIKZxPF" }, + "OFNWcJsM": { + "claims": [ + "Comgrow/Comgrow T300 PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFNX8GI1": { + "claims": [ + "Sovol/Sovol Zero ABS" + ], + "successor": "OFY9muEs" + }, "OFNYewRS": { "claims": [ "Blocks/Blocks Generic PLA" @@ -2940,6 +3054,12 @@ ], "successor": "OFDvXujf" }, + "OFNZjrLo": { + "claims": [ + "Sovol/Sovol SV06 Plus ACE PLA" + ], + "successor": "OFDSrzZ8" + }, "OFNcdCrm": { "claims": [ "Anycubic/Anycubic Generic PLA-CF" @@ -2976,6 +3096,12 @@ ], "successor": "OFKW5hEW" }, + "OFPryWt5": { + "claims": [ + "Lulzbot/Lulzbot 2.85mm PLA" + ], + "successor": "OFDSrzZ8" + }, "OFPy0Ogq": { "claims": [ "Qidi/Qidi Generic PA-CF" @@ -2988,6 +3114,12 @@ ], "successor": "OFWbdGsC" }, + "OFQ9qnkd": { + "claims": [ + "FLSun/FLSun T1 PLA High Speed" + ], + "successor": "OFmpMwxS" + }, "OFQC8Vna": { "claims": [ "Flashforge/Flashforge Generic PETG-CF" @@ -3024,6 +3156,12 @@ ], "successor": "OFLPAxz3" }, + "OFRi7v0b": { + "claims": [ + "Sovol/Sovol SV08 PETG" + ], + "successor": "OFYPdQJh" + }, "OFRiyes1": { "claims": [ "Anker/Anker Generic ASA", @@ -3074,6 +3212,12 @@ ], "successor": "OF8tPByX" }, + "OFSStjay": { + "claims": [ + "FLSun/FLSun S1 PLA Silk" + ], + "successor": "OFesA6rF" + }, "OFSTCno1": { "claims": [ "re3D/re3D Greengate rPETG" @@ -3086,6 +3230,12 @@ ], "successor": "OFu1evlr" }, + "OFTvvox9": { + "claims": [ + "Sovol/Sovol SV06 ACE PLA" + ], + "successor": "OFDSrzZ8" + }, "OFU0n0zW": { "claims": [ "FLSun/FLSun T1 PLA Generic" @@ -3140,6 +3290,12 @@ ], "successor": "OFWbdGsC" }, + "OFV0KrAG": { + "claims": [ + "FLSun/FLSun T1 ABS" + ], + "successor": "OFY9muEs" + }, "OFVKADz5": { "claims": [ "Comgrow/Comgrow Generic PLA" @@ -3304,6 +3460,12 @@ ], "successor": "OFCn83wF" }, + "OFaFNP2U": { + "claims": [ + "Sovol/Sovol SV07 PLA" + ], + "successor": "OFDSrzZ8" + }, "OFaU2JxD": { "claims": [ "Dremel/Dremel Generic PLA" @@ -3328,6 +3490,12 @@ ], "successor": "OFgbpcy9" }, + "OFbjtPQy": { + "claims": [ + "FLSun/FLSun T1 ASA" + ], + "successor": "OFLPAxz3" + }, "OFbt04e0": { "claims": [ "DeltaMaker/DeltaMaker Generic TPU" @@ -3346,6 +3514,18 @@ ], "successor": "OFDvXujf" }, + "OFcJ7AKd": { + "claims": [ + "Sovol/Sovol SV08 PLA" + ], + "successor": "OFDSrzZ8" + }, + "OFcdqaWI": { + "claims": [ + "Sovol/Sovol Zero PC" + ], + "successor": "OFLakOUI" + }, "OFctbSkL": { "claims": [ "Blocks/Blocks Generic ASA-CF" @@ -3395,6 +3575,12 @@ ], "successor": "OFgbpcy9" }, + "OFe7Sx5B": { + "claims": [ + "Sovol/Sovol SV06 ACE PETG" + ], + "successor": "OFYPdQJh" + }, "OFe8UJXH": { "claims": [ "Creality/Creality Generic PC" @@ -3524,6 +3710,12 @@ ], "successor": "OFd0Fv0k" }, + "OFkWaWRo": { + "claims": [ + "Sovol/Sovol SV06 Plus ACE TPU" + ], + "successor": "OFgbpcy9" + }, "OFkYkQGO": { "claims": [ "Tiertime/Tiertime Generic PP-GF" @@ -3542,6 +3734,12 @@ ], "successor": "OFZr862X" }, + "OFl7nOAf": { + "claims": [ + "Sovol/Sovol SV06 Plus ACE PETG" + ], + "successor": "OFYPdQJh" + }, "OFlLmUeV": { "claims": [ "Ginger Additive/Ginger Generic PLA" @@ -3554,6 +3752,12 @@ ], "successor": "OFO5djrM" }, + "OFlXJxX1": { + "claims": [ + "Chuanying/Chuanying PETG" + ], + "successor": "OFYPdQJh" + }, "OFlx52rn": { "claims": [ "Ratrig/RatRig Generic PLA-CF" @@ -3634,6 +3838,12 @@ ], "successor": "OFmpMwxS" }, + "OFoqrHTw": { + "claims": [ + "FLSun/FLSun S1 PLA High Speed" + ], + "successor": "OFmpMwxS" + }, "OFp8gtPH": { "claims": [ "Creality/Creality Generic PLA Silk" @@ -3646,6 +3856,12 @@ ], "successor": "OFLPAxz3" }, + "OFpBV2Ma": { + "claims": [ + "Qidi/Tinmorry PETG-ECO" + ], + "successor": "OFYE7YZw" + }, "OFpSYJLI": { "claims": [ "Creality/Creality Generic PLA Matte" @@ -3718,6 +3934,12 @@ ], "successor": "OFkf1HHw" }, + "OFs1sNLz": { + "claims": [ + "Chuanying/Chuanying ABS" + ], + "successor": "OFY9muEs" + }, "OFs2ReMr": { "claims": [ "InfiMech/InfiMech Generic PETG" @@ -3796,6 +4018,12 @@ ], "successor": "OFDSrzZ8" }, + "OFuUJyRx": { + "claims": [ + "FLSun/FLSun T1 PLA Silk" + ], + "successor": "OFesA6rF" + }, "OFupq0tY": { "claims": [ "Blocks/Blocks Generic PLA-CF" @@ -3868,6 +4096,12 @@ ], "successor": "OFesA6rF" }, + "OFyCToOV": { + "claims": [ + "Sovol/Sovol SV08 TPU" + ], + "successor": "OFgbpcy9" + }, "OFyFRojy": { "claims": [ "Ratrig/RatRig Generic ABS" @@ -3904,6 +4138,12 @@ ], "successor": "OFYPdQJh" }, + "OFzzmK2Q": { + "claims": [ + "FLSun/FLSun S1 ABS" + ], + "successor": "OFY9muEs" + }, "OGFA00": { "claims": [ "OrcaFilamentLibrary/Bambu PLA Basic" diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index c5e6aefe58..34ff667ed0 100755 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -234,6 +234,7 @@ def load_vendor_filaments(profiles_dir, vendor): "compatible_printers": data.get("compatible_printers") or [], "filament_vendor": data.get("filament_vendor"), "filament_type": data.get("filament_type"), + "renamed_from": data.get("renamed_from"), } return presets, errors @@ -378,6 +379,7 @@ def analyze_tree(profiles_dir): triples = {} # fid -> set of triples of its non-island declarers declarer_triples = [] # (vendor, rec, fid, triple) per non-island declarer family_triples = {} # (vendor, family) -> {triple: [declarer names]} + renamed_claims = {} # "Vendor/OldFamily" -> set of ids the rename now carries for vendor, filaments in vendors.items(): occurring = vendor_ids.setdefault(vendor, set()) @@ -411,6 +413,13 @@ def analyze_tree(profiles_dir): continue occurring.add(eff) ids.setdefault(eff, set()).add(f"{vendor}/{base_name(rec['name'])}") + # A renamed preset keeps voting under the names it used to have, so + # the id its old family carried retires to the id the rename minted. + renamed = rec.get("renamed_from") + for old in (renamed if isinstance(renamed, str) else "").split(";"): + if old.strip(): + renamed_claims.setdefault( + f"{vendor}/{base_name(old.strip())}", set()).add(eff) if rec.get("filament_id"): instantiated_with_id.append(f"{vendor}/{rec['name']}") if vendor != OFL and rec["ofl_entry"] and eff in ofl_declared: @@ -459,6 +468,7 @@ def analyze_tree(profiles_dir): "vendors": vendors, "read_errors": read_errors, "ids": {fid: sorted(claims) for fid, claims in ids.items()}, + "renamed_claims": {claim: sorted(fids) for claim, fids in renamed_claims.items()}, "vendor_ids": vendor_ids, "declared_ids": declared_ids, "instantiated_with_id": sorted(instantiated_with_id), @@ -529,11 +539,18 @@ def write_ledger(path, obj): def claim_effective_ids(analysis): - """Reverse of analysis["ids"]: claim "Vendor/Family" -> set of effective ids.""" + """Reverse of analysis["ids"]: claim "Vendor/Family" -> set of effective ids. + + A preset's "renamed_from" names count as claims of that preset too, so an id + whose family was renamed still finds a successor in the claim vote. + """ claim_ids = {} for fid, claims in analysis["ids"].items(): for claim in claims: claim_ids.setdefault(claim, set()).add(fid) + for claim, fids in analysis.get("renamed_claims", {}).items(): + if claim not in claim_ids: + claim_ids[claim] = set(fids) return claim_ids diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index e86eeab452..b3e38041f3 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -71,38 +71,15 @@ "Flashforge/Generic TPU-90A @FF C5P", "Flashforge/Generic TPU-95A @FF C5", "Flashforge/Generic TPU-95A @FF C5P", - "Lulzbot/Lulzbot 2.85mm ABS", - "Lulzbot/Lulzbot 2.85mm PETG", - "Lulzbot/Lulzbot 2.85mm PLA", "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", "Snapmaker/PolyTerra J1 PLA", "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", "Sovol/Generic PLA Silk @Sovol SV08 MAX", "Sovol/Polymaker PETG @Sovol SV08 MAX", "Sovol/SUNLU PETG @Sovol SV08 MAX", - "Sovol/Sovol SV06 ACE ABS", - "Sovol/Sovol SV06 ACE PETG", - "Sovol/Sovol SV06 ACE PLA", - "Sovol/Sovol SV06 ACE TPU", - "Sovol/Sovol SV06 Plus ACE ABS", - "Sovol/Sovol SV06 Plus ACE PETG", - "Sovol/Sovol SV06 Plus ACE PLA", - "Sovol/Sovol SV06 Plus ACE TPU", - "Sovol/Sovol SV07 PLA", - "Sovol/Sovol SV08 ABS", - "Sovol/Sovol SV08 PETG", - "Sovol/Sovol SV08 PLA", - "Sovol/Sovol SV08 PLA @SV08 0.2 nozzle", - "Sovol/Sovol SV08 TPU", - "Sovol/Sovol Zero ABS", - "Sovol/Sovol Zero PC", - "Sovol/Sovol Zero PETG", "Sovol/Sovol Zero PETG HS Nozzle", - "Sovol/Sovol Zero PLA Basic", "Sovol/Sovol Zero PLA Basic HS Nozzle", - "Sovol/Sovol Zero PLA Silk", - "Sovol/Sovol Zero PLA Silk HS Nozzle", - "Sovol/Sovol Zero TPU" + "Sovol/Sovol Zero PLA Silk HS Nozzle" ], "id_overrides": [ "Anycubic/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", @@ -188,14 +165,11 @@ "BBL/addnorth TPU EasyFlex", "BBL/addnorth TPU Pro Matte 85A", "BBL/addnorth TPU Pro Matte 95A", - "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", - "Chuanying/Chuanying PETG @Chuanying X1 0.25 Nozzle", "Chuanying/Generic HIPS @Chuanying", "Chuanying/Generic PVA @Chuanying", "Co Print/Generic ABS @CoPrint", "Co Print/Generic PETG @CoPrint", "Co Print/Generic TPU @CoPrint", - "Comgrow/Comgrow T300 PLA", "Creality/Generic ASA-CF @Creality Hi-all", "Creality/Generic PETG-CF @Creality Hi-all", "Creality/Generic PLA High Speed @Creality Ender-3V3-all", @@ -273,18 +247,6 @@ "Elegoo/Generic PETG PRO @Elegoo", "Elegoo/Generic PETG-CF @Elegoo Centauri", "Elegoo/Generic PLA Matte @Elegoo", - "FLSun/FLSun S1 ABS", - "FLSun/FLSun S1 ASA", - "FLSun/FLSun S1 PETG", - "FLSun/FLSun S1 PLA High Speed", - "FLSun/FLSun S1 PLA Silk", - "FLSun/FLSun S1 TPU", - "FLSun/FLSun T1 ABS", - "FLSun/FLSun T1 ASA", - "FLSun/FLSun T1 PETG", - "FLSun/FLSun T1 PLA High Speed", - "FLSun/FLSun T1 PLA Silk", - "FLSun/FLSun T1 TPU", "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", "Flashforge/FlashForge PC @FF G4 0.6 nozzle", "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", @@ -777,9 +739,6 @@ "Flashforge/Polymaker CoPA @FF G4P 0.6 nozzle", "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", "Flashforge/Polymaker S1", - "Lulzbot/Lulzbot 2.85mm ABS", - "Lulzbot/Lulzbot 2.85mm PETG", - "Lulzbot/Lulzbot 2.85mm PLA", "OrcaFilamentLibrary/AliZ PETG-CF @base", "OrcaFilamentLibrary/AliZ PETG-Metal @base", "OrcaFilamentLibrary/Elegoo ASA-CF @base", @@ -917,29 +876,9 @@ "Sovol/Generic PLA Silk @Sovol SV08 MAX", "Sovol/Polymaker PETG @Sovol SV08 MAX", "Sovol/SUNLU PETG @Sovol SV08 MAX", - "Sovol/Sovol SV06 ACE ABS", - "Sovol/Sovol SV06 ACE PETG", - "Sovol/Sovol SV06 ACE PLA", - "Sovol/Sovol SV06 ACE TPU", - "Sovol/Sovol SV06 Plus ACE ABS", - "Sovol/Sovol SV06 Plus ACE PETG", - "Sovol/Sovol SV06 Plus ACE PLA", - "Sovol/Sovol SV06 Plus ACE TPU", - "Sovol/Sovol SV07 PLA", - "Sovol/Sovol SV08 ABS", - "Sovol/Sovol SV08 PETG", - "Sovol/Sovol SV08 PLA", - "Sovol/Sovol SV08 PLA @SV08 0.2 nozzle", - "Sovol/Sovol SV08 TPU", - "Sovol/Sovol Zero ABS", - "Sovol/Sovol Zero PC", - "Sovol/Sovol Zero PETG", "Sovol/Sovol Zero PETG HS Nozzle", - "Sovol/Sovol Zero PLA Basic", "Sovol/Sovol Zero PLA Basic HS Nozzle", - "Sovol/Sovol Zero PLA Silk", "Sovol/Sovol Zero PLA Silk HS Nozzle", - "Sovol/Sovol Zero TPU", "Wanhao France/YUMI PETG", "Wanhao France/YUMI PLA Bowden", "Wanhao France/YUMI PLA Direct Drive", @@ -1571,9 +1510,6 @@ "GF_ANXPH": [ "BBL/addnorth PLA X-PLA High Speed" ], - "OF016CJw": [ - "Sovol/Sovol SV08 ABS" - ], "OF02UAVh": [ "Creality/Soleyin Ultra PLA" ], @@ -1846,9 +1782,6 @@ "OF66KUAN": [ "Creality/PolySonic PLA" ], - "OF67EdL5": [ - "Sovol/Sovol SV06 ACE ABS" - ], "OF6ATsCF": [ "Snapmaker/Snapmaker Dual PLA-CF" ], @@ -1868,22 +1801,13 @@ "Elegoo/Generic PET", "Flashforge/Generic PET" ], - "OF6O67Xk": [ - "Lulzbot/Lulzbot 2.85mm ABS" - ], "OF6TuVAg": [ "Snapmaker/Snapmaker Breakaway Support For PLA", "Snapmaker/Snapmaker J1 PVA" ], - "OF6VgL2U": [ - "Phrozen/Phrozen PLA" - ], "OF6kj4jI": [ "iQ/Fiberthree PACF Pro P2" ], - "OF6ooviO": [ - "FLSun/FLSun S1 TPU" - ], "OF6rdQ6M": [ "Creality/Generic PPS-CF", "Tiertime/Generic PPS-CF" @@ -1891,9 +1815,6 @@ "OF6ueBwd": [ "Flashforge/Flashforge PLA Pro" ], - "OF6zAVFj": [ - "Sovol/Sovol Zero TPU" - ], "OF70zbGS": [ "Creality/Hyper L-W PLA" ], @@ -1916,9 +1837,6 @@ "OF7SliVn": [ "Snapmaker/PolyLite J1 PLA" ], - "OF7VJMYM": [ - "Sovol/Sovol Zero PLA Basic" - ], "OF7c9fln": [ "Anycubic/Anycubic PLA Translucent" ], @@ -1957,9 +1875,6 @@ "OF8dCquh": [ "Snapmaker/Snapmaker J1 ABS Benchy" ], - "OF8eQjjt": [ - "Lulzbot/Lulzbot 2.85mm PETG" - ], "OF8eaY7j": [ "Creality/Generic PA612-CF" ], @@ -2002,9 +1917,6 @@ "OF9emAI9": [ "Ratrig/RatRig PunkFil PETG" ], - "OF9z5LZ9": [ - "FLSun/FLSun S1 PETG" - ], "OFA026vt": [ "OrcaArena/Arena PA-CF" ], @@ -2080,9 +1992,6 @@ "OrcaFilamentLibrary/Generic EVA", "Tiertime/Generic EVA" ], - "OFCEA7Nt": [ - "Sovol/Sovol SV06 Plus ACE ABS" - ], "OFCIUsWh": [ "OrcaFilamentLibrary/Panchroma PLA Translucent", "Snapmaker/Panchroma PLA Translucent" @@ -2156,7 +2065,6 @@ "Artillery/Generic PLA", "Blocks/Generic PLA", "CONSTRUCT3D/Generic PLA", - "Chuanying/Chuanying PLA", "Chuanying/Generic PLA", "Co Print/Generic PLA", "CoLiDo/Generic PLA", @@ -2173,9 +2081,11 @@ "Ginger Additive/Generic PLA", "InfiMech/Generic PLA", "LONGER/Generic PLA", + "Lulzbot/Generic PLA", "OrcaArena/Generic PLA", "OrcaFilamentLibrary/Generic PLA", "Peopoly/Generic PLA", + "Phrozen/Generic PLA", "Prusa/Generic PLA", "Qidi/Generic PLA", "RH3D/Generic PLA", @@ -2241,9 +2151,6 @@ "OFEMfQsX": [ "Flashforge/Flashforge PETG Basic" ], - "OFENzGSm": [ - "FLSun/FLSun T1 TPU" - ], "OFEOnBj6": [ "Snapmaker/Snapmaker PLA Lite" ], @@ -2384,9 +2291,6 @@ "OFHAccHz": [ "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" ], - "OFHTVfaU": [ - "Sovol/Sovol Zero PETG" - ], "OFHWSM21": [ "OrcaFilamentLibrary/Fiberon PET-CF" ], @@ -2419,9 +2323,6 @@ "OFIE3vOf": [ "Anycubic/Anycubic PLA Matte" ], - "OFIK0xFa": [ - "FLSun/FLSun S1 ASA" - ], "OFIKZxPF": [ "Creality/Generic PLA Wood" ], @@ -2461,9 +2362,6 @@ "OFJ3HRsR": [ "OrcaArena/Arena ABS" ], - "OFJ80y1e": [ - "FLSun/FLSun T1 PETG" - ], "OFJHBEGD": [], "OFJNeELv": [ "OrcaFilamentLibrary/FILL3D PA" @@ -2475,18 +2373,12 @@ "OFJQDUk3": [ "OrcaFilamentLibrary/FilAr PETG Cristal" ], - "OFJVFpJz": [ - "Sovol/Sovol Zero PLA Silk" - ], "OFJWKoYG": [ "iQ/Material4Print ABS Natur P1" ], "OFJYpVAQ": [ "Flashforge/Generic TPU-90A" ], - "OFJfv07m": [ - "Sovol/Sovol SV06 ACE TPU" - ], "OFJgijky": [ "Snapmaker/PolyLite CosPLA" ], @@ -2551,9 +2443,6 @@ "OrcaFilamentLibrary/Panchroma PLA Marble", "Snapmaker/Panchroma PLA Marble" ], - "OFKo87c6": [ - "Snapmaker/Snapmaker TPU 95A" - ], "OFKpQTJI": [ "Flashforge/Flashforge TPU 65D" ], @@ -2579,7 +2468,6 @@ "Anycubic/Generic ASA", "Artillery/Generic ASA", "Blocks/Generic ASA", - "Chuanying/Chuanying ASA", "Chuanying/Generic ASA", "Creality/Generic ASA", "Custom/Generic ASA", @@ -2717,18 +2605,9 @@ "OFNU9YIW": [ "OrcaFilamentLibrary/FilAr PETG Azul Boreal" ], - "OFNWcJsM": [ - "Comgrow/Comgrow T300 PLA" - ], "OFNWnx2c": [ "Flashforge/Flashforge TPU-95A" ], - "OFNX8GI1": [ - "Sovol/Sovol Zero ABS" - ], - "OFNZjrLo": [ - "Sovol/Sovol SV06 Plus ACE PLA" - ], "OFNemJM6": [ "OrcaFilamentLibrary/FilAr PLA Cobre" ], @@ -2834,9 +2713,6 @@ "OFPqX3x2": [ "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" ], - "OFPryWt5": [ - "Lulzbot/Lulzbot 2.85mm PLA" - ], "OFQ1KzO8": [ "Snapmaker/Snapmaker J1 PLA Silk" ], @@ -2849,9 +2725,6 @@ "OFQ40XeN": [ "Qidi/QIDI PETG Tough" ], - "OFQ9qnkd": [ - "FLSun/FLSun T1 PLA High Speed" - ], "OFQEGL7z": [ "FlyingBear/FlyingBear PA-CF" ], @@ -2925,9 +2798,6 @@ "OFRhCTUg": [ "Anycubic/Anycubic PET-CF" ], - "OFRi7v0b": [ - "Sovol/Sovol SV08 PETG" - ], "OFRiFnfQ": [ "OrcaFilamentLibrary/Eolas Prints PETG Transition" ], @@ -2963,9 +2833,6 @@ "OrcaFilamentLibrary/Panchroma PLA Silk", "Snapmaker/Panchroma PLA Silk" ], - "OFSStjay": [ - "FLSun/FLSun S1 PLA Silk" - ], "OFSa39yP": [ "Snapmaker/Snapmaker J1 PLA" ], @@ -3015,9 +2882,6 @@ "OFTsHNQi": [ "Qidi/QIDI ASA" ], - "OFTvvox9": [ - "Sovol/Sovol SV06 ACE PLA" - ], "OFU1zPxE": [ "Elegoo/Elegoo PLA Galaxy", "OrcaFilamentLibrary/Elegoo PLA Galaxy" @@ -3056,9 +2920,6 @@ "Elegoo/Elegoo PC", "OrcaFilamentLibrary/Elegoo PC" ], - "OFV0KrAG": [ - "FLSun/FLSun T1 ABS" - ], "OFV5Q7j2": [ "Snapmaker/Snapmaker J1 TPE" ], @@ -3223,6 +3084,7 @@ "Flashforge/Generic ABS", "FlyingBear/Generic ABS", "InfiMech/Generic ABS", + "Lulzbot/Generic ABS", "OrcaArena/Generic ABS", "OrcaFilamentLibrary/Generic ABS", "Peopoly/Generic ABS", @@ -3236,6 +3098,9 @@ "Vzbot/Generic ABS", "Z-Bolt/Generic ABS" ], + "OFYE7YZw": [ + "Qidi/Tinmorry PETG-ECO" + ], "OFYEtXuk": [ "Snapmaker/Snapmaker J1 PA-CF" ], @@ -3263,6 +3128,7 @@ "Ginger Additive/Generic PETG", "InfiMech/Generic PETG", "LONGER/Generic PETG", + "Lulzbot/Generic PETG", "OrcaArena/Generic PETG", "OrcaFilamentLibrary/Generic PETG", "Peopoly/Generic PETG", @@ -3330,9 +3196,6 @@ "OFaEuvNF": [ "Anycubic/Anycubic PAHT-CF" ], - "OFaFNP2U": [ - "Sovol/Sovol SV07 PLA" - ], "OFaHjk1V": [ "Volumic/Volumic PC" ], @@ -3381,9 +3244,6 @@ "OFbh7HcA": [ "Eryone/Eryone PP-CF" ], - "OFbjtPQy": [ - "FLSun/FLSun T1 ASA" - ], "OFc3xdm9": [ "OrcaFilamentLibrary/Overture PLA", "Qidi/Overture PLA" @@ -3394,9 +3254,6 @@ "OFcBJQcC": [ "Snapmaker/Snapmaker Dual TPU High-Flow" ], - "OFcJ7AKd": [ - "Sovol/Sovol SV08 PLA" - ], "OFcJDtTx": [ "Artillery/Artillery TPU" ], @@ -3406,9 +3263,6 @@ "OFcVLpNA": [ "Flashforge/FusRock PAHT-GF" ], - "OFcdqaWI": [ - "Sovol/Sovol Zero PC" - ], "OFcfQk4h": [ "BBL/Overture Air PLA", "OrcaFilamentLibrary/Overture Air PLA" @@ -3470,9 +3324,6 @@ "OFe6sfXS": [ "Flashforge/FlashForge PC" ], - "OFe7Sx5B": [ - "Sovol/Sovol SV06 ACE PETG" - ], "OFe8tuNb": [ "Tiertime/Tiertime PA6-CF" ], @@ -3509,6 +3360,7 @@ "OFesA6rF": [ "Anker/Generic PLA Silk", "Creality/Generic PLA Silk", + "FLSun/Generic PLA Silk", "Flashforge/Generic PLA Silk", "OrcaArena/Generic PLA Silk", "OrcaFilamentLibrary/Generic PLA Silk", @@ -3760,7 +3612,6 @@ "Creality/eSUN PLA-LW" ], "OFi6PfUM": [ - "Chuanying/Chuanying PLA-SILK", "Chuanying/Generic PLA-Silk", "Creality/Generic PLA-Silk", "Flashforge/Generic PLA-Silk" @@ -3879,9 +3730,6 @@ "OFkR8E2c": [ "Prusa/Prusament PETG" ], - "OFkWaWRo": [ - "Sovol/Sovol SV06 Plus ACE TPU" - ], "OFkf1HHw": [ "Flashforge/Generic PLA-SILK" ], @@ -3914,9 +3762,6 @@ "OFkzr35f": [ "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" ], - "OFl7nOAf": [ - "Sovol/Sovol SV06 Plus ACE PETG" - ], "OFlBoEfL": [ "Snapmaker/Snapmaker J1 TPU High-Flow" ], @@ -3933,9 +3778,6 @@ "OFlSNkhc": [ "OrcaFilamentLibrary/Eolas Prints ASA" ], - "OFlXJxX1": [ - "Chuanying/Chuanying PETG" - ], "OFllmFhT": [ "Elegoo/Generic PETG PRO" ], @@ -4011,6 +3853,7 @@ ], "OFmpMwxS": [ "Creality/Generic PLA High Speed", + "FLSun/Generic PLA High Speed", "Flashforge/Generic PLA High Speed", "OrcaFilamentLibrary/Generic PLA High Speed", "Qidi/Generic PLA High Speed", @@ -4114,9 +3957,6 @@ "OFoiVqVM": [ "OrcaFilamentLibrary/Bambu PLA Basic" ], - "OFoqrHTw": [ - "FLSun/FLSun S1 PLA High Speed" - ], "OForhBi4": [ "Cubicon/Cubicon ABSk" ], @@ -4132,9 +3972,6 @@ "OFp9wdmf": [ "Eryone/Eryone PA-CF" ], - "OFpBV2Ma": [ - "Qidi/Tinmorry PETG-ECO" - ], "OFpBlrvY": [ "OrcaFilamentLibrary/Valment PLA Silk" ], @@ -4221,9 +4058,6 @@ "Elegoo/Elegoo ASA-CF", "OrcaFilamentLibrary/Elegoo ASA-CF" ], - "OFs1sNLz": [ - "Chuanying/Chuanying ABS" - ], "OFsB2lxm": [ "Elegoo/Elegoo PLA Matte", "OrcaFilamentLibrary/Elegoo PLA Matte" @@ -4343,9 +4177,6 @@ "OFuO0cAP": [ "OrcaArena/Arena PETG-CF" ], - "OFuUJyRx": [ - "FLSun/FLSun T1 PLA Silk" - ], "OFuUuIhR": [ "Elegoo/Elegoo PETG-CF", "OrcaFilamentLibrary/Elegoo PETG-CF" @@ -4410,6 +4241,9 @@ "Elegoo/Elegoo PLA", "OrcaFilamentLibrary/Elegoo PLA" ], + "OFvmwTZE": [ + "Snapmaker/Snapmaker TPU 95A" + ], "OFvrXuV7": [ "OrcaFilamentLibrary/PolyLite ASA" ], @@ -4417,7 +4251,6 @@ "Snapmaker/Fiberon PA12-CF10" ], "OFvxghTE": [ - "Chuanying/Chuanying HS PLA", "Chuanying/Generic HS PLA", "Flashforge/Generic HS PLA", "TwoTrees/Generic HS PLA" @@ -4505,9 +4338,6 @@ "OFy8tYJE": [ "Cubicon/Cubicon ABS-A100" ], - "OFyCToOV": [ - "Sovol/Sovol SV08 TPU" - ], "OFyFyLIp": [ "SeeMeCNC/SeeMeCNC TPU" ], @@ -4585,9 +4415,6 @@ ], "OFzyIxba": [ "OrcaFilamentLibrary/Bambu PVA" - ], - "OFzzmK2Q": [ - "FLSun/FLSun S1 ABS" ] }, "instantiated_with_id": [ @@ -4847,8 +4674,6 @@ "CONSTRUCT3D/Generic High Flow PETG @C1", "CONSTRUCT3D/Generic PETG @C1", "CONSTRUCT3D/Generic PLA @C1", - "Chuanying/Chuanying ABS @Chuanying X1 0.25 Nozzle", - "Chuanying/Chuanying PETG @Chuanying X1 0.25 Nozzle", "Chuanying/Generic ABS @Chuanying", "Chuanying/Generic ASA @Chuanying", "Chuanying/Generic HIPS @Chuanying", @@ -4877,7 +4702,6 @@ "CoLiDo/Generic PLA @CoLiDo X16", "CoLiDo/Generic TPU @CoLiDo DIY 4.0", "CoLiDo/Generic TPU @CoLiDo X16", - "Comgrow/Comgrow T300 PLA", "Comgrow/Generic ABS @Comgrow", "Comgrow/Generic PETG @Comgrow", "Comgrow/Generic PLA @Comgrow", @@ -5459,18 +5283,6 @@ "Eryone/Eryone PP-CF", "Eryone/Eryone Silk PLA", "Eryone/Eryone TPU", - "FLSun/FLSun S1 ABS", - "FLSun/FLSun S1 ASA", - "FLSun/FLSun S1 PETG", - "FLSun/FLSun S1 PLA High Speed", - "FLSun/FLSun S1 PLA Silk", - "FLSun/FLSun S1 TPU", - "FLSun/FLSun T1 ABS", - "FLSun/FLSun T1 ASA", - "FLSun/FLSun T1 PETG", - "FLSun/FLSun T1 PLA High Speed", - "FLSun/FLSun T1 PLA Silk", - "FLSun/FLSun T1 TPU", "FLSun/Generic ABS @FLSun", "FLSun/Generic ASA @FLSun", "FLSun/Generic PA @FLSun", @@ -6090,9 +5902,6 @@ "LONGER/Generic PETG @LONGER LK10 Plus", "LONGER/Generic PLA @LONGER LK10", "LONGER/Generic PLA @LONGER LK10 Plus", - "Lulzbot/Lulzbot 2.85mm ABS", - "Lulzbot/Lulzbot 2.85mm PETG", - "Lulzbot/Lulzbot 2.85mm PLA", "MagicMaker/Generic PEEK @MM", "OrcaArena/Generic PA @OrcaArena", "OrcaArena/Generic PA-CF @OrcaArena", @@ -6208,7 +6017,6 @@ "Peopoly/Peopoly Lancer PET-CF", "Peopoly/Peopoly Lancer PETG-C", "Peopoly/Peopoly Lancer PLA-C", - "Phrozen/Phrozen PLA @Phrozen Arco 0.4 nozzle", "Prusa/Generic ABS @Prusa CORE One", "Prusa/Generic ABS @Prusa CORE One 0.6", "Prusa/Generic ABS @Prusa CORE One 0.8", @@ -7029,29 +6837,9 @@ "Sovol/Generic PLA Silk @Sovol SV08 MAX", "Sovol/Polymaker PETG @Sovol SV08 MAX", "Sovol/SUNLU PETG @Sovol SV08 MAX", - "Sovol/Sovol SV06 ACE ABS", - "Sovol/Sovol SV06 ACE PETG", - "Sovol/Sovol SV06 ACE PLA", - "Sovol/Sovol SV06 ACE TPU", - "Sovol/Sovol SV06 Plus ACE ABS", - "Sovol/Sovol SV06 Plus ACE PETG", - "Sovol/Sovol SV06 Plus ACE PLA", - "Sovol/Sovol SV06 Plus ACE TPU", - "Sovol/Sovol SV07 PLA", - "Sovol/Sovol SV08 ABS", - "Sovol/Sovol SV08 PETG", - "Sovol/Sovol SV08 PLA", - "Sovol/Sovol SV08 PLA @SV08 0.2 nozzle", - "Sovol/Sovol SV08 TPU", - "Sovol/Sovol Zero ABS", - "Sovol/Sovol Zero PC", - "Sovol/Sovol Zero PETG", "Sovol/Sovol Zero PETG HS Nozzle", - "Sovol/Sovol Zero PLA Basic", "Sovol/Sovol Zero PLA Basic HS Nozzle", - "Sovol/Sovol Zero PLA Silk", "Sovol/Sovol Zero PLA Silk HS Nozzle", - "Sovol/Sovol Zero TPU", "Tiertime/Generic ABS @Tiertime", "Tiertime/Generic ABS @Tiertime 300HS", "Tiertime/Generic ASA @Tiertime", @@ -7221,13 +7009,6 @@ ], "triple_exceptions": [], "triples": { - "OF016CJw": [ - [ - "Generic", - "ABS", - "Sovol SV08 ABS" - ] - ], "OF02UAVh": [ [ "Creality", @@ -7830,13 +7611,6 @@ "PolySonic PLA" ] ], - "OF67EdL5": [ - [ - "Generic", - "ABS", - "Sovol SV06 ACE ABS" - ] - ], "OF6ATsCF": [ [ "Snapmaker", @@ -7872,13 +7646,6 @@ "Generic PET" ] ], - "OF6O67Xk": [ - [ - "Generic", - "ABS", - "Lulzbot 2.85mm ABS" - ] - ], "OF6TuVAg": [ [ "Snapmaker", @@ -7886,13 +7653,6 @@ "Snapmaker J1 PVA" ] ], - "OF6VgL2U": [ - [ - "Generic", - "PLA", - "Phrozen PLA" - ] - ], "OF6kj4jI": [ [ "iQ Materials", @@ -7900,13 +7660,6 @@ "Fiberthree PACF Pro P2" ] ], - "OF6ooviO": [ - [ - "Generic", - "TPU", - "FLSun S1 TPU" - ] - ], "OF6rdQ6M": [ [ "Generic", @@ -7921,13 +7674,6 @@ "Flashforge PLA Pro" ] ], - "OF6zAVFj": [ - [ - "Generic", - "TPU", - "Sovol Zero TPU" - ] - ], "OF70zbGS": [ [ "Creality", @@ -7977,13 +7723,6 @@ "PolyLite J1 PLA" ] ], - "OF7VJMYM": [ - [ - "Generic", - "PLA", - "Sovol Zero PLA Basic" - ] - ], "OF7c9fln": [ [ "Anycubic", @@ -8068,13 +7807,6 @@ "Snapmaker J1 ABS Benchy" ] ], - "OF8eQjjt": [ - [ - "Generic", - "PETG", - "Lulzbot 2.85mm PETG" - ] - ], "OF8eaY7j": [ [ "Generic", @@ -8173,13 +7905,6 @@ "RatRig PunkFil PETG" ] ], - "OF9z5LZ9": [ - [ - "Generic", - "PETG", - "FLSun S1 PETG" - ] - ], "OFA026vt": [ [ "Orca Arena", @@ -8348,13 +8073,6 @@ "Generic EVA" ] ], - "OFCEA7Nt": [ - [ - "Generic", - "ABS", - "Sovol SV06 Plus ACE ABS" - ] - ], "OFCIUsWh": [ [ "Polymaker", @@ -8600,13 +8318,6 @@ "Flashforge PETG Basic" ] ], - "OFENzGSm": [ - [ - "Generic", - "TPU", - "FLSun T1 TPU" - ] - ], "OFEOnBj6": [ [ "Snapmaker", @@ -8929,13 +8640,6 @@ "FilAr PLA Blanco Antartida" ] ], - "OFHTVfaU": [ - [ - "Generic", - "PETG", - "Sovol Zero PETG" - ] - ], "OFHWSM21": [ [ "Polymaker", @@ -9006,13 +8710,6 @@ "Anycubic PLA Matte" ] ], - "OFIK0xFa": [ - [ - "Generic", - "ASA", - "FLSun S1 ASA" - ] - ], "OFIKZxPF": [ [ "Generic", @@ -9104,13 +8801,6 @@ "Arena ABS" ] ], - "OFJ80y1e": [ - [ - "Generic", - "PETG", - "FLSun T1 PETG" - ] - ], "OFJHBEGD": [ [ "DREMC", @@ -9139,13 +8829,6 @@ "FilAr PETG Cristal" ] ], - "OFJVFpJz": [ - [ - "Generic", - "PLA", - "Sovol Zero PLA Silk" - ] - ], "OFJWKoYG": [ [ "iQ Materials", @@ -9160,13 +8843,6 @@ "Generic TPU-90A" ] ], - "OFJfv07m": [ - [ - "Generic", - "TPU", - "Sovol SV06 ACE TPU" - ] - ], "OFJgijky": [ [ "Polymaker", @@ -9314,13 +8990,6 @@ "Panchroma PLA Marble" ] ], - "OFKo87c6": [ - [ - "Generic", - "TPU", - "Snapmaker TPU 95A" - ] - ], "OFKpQTJI": [ [ "Generic", @@ -9608,13 +9277,6 @@ "FilAr PETG Azul Boreal" ] ], - "OFNWcJsM": [ - [ - "Generic", - "PLA", - "Comgrow T300 PLA" - ] - ], "OFNWnx2c": [ [ "Generic", @@ -9622,20 +9284,6 @@ "Flashforge TPU-95A" ] ], - "OFNX8GI1": [ - [ - "Generic", - "ABS", - "Sovol Zero ABS" - ] - ], - "OFNZjrLo": [ - [ - "Generic", - "PLA", - "Sovol SV06 Plus ACE PLA" - ] - ], "OFNemJM6": [ [ "FilAr", @@ -9860,13 +9508,6 @@ "FilAr PLA Rosa Amaranto" ] ], - "OFPryWt5": [ - [ - "Generic", - "PLA", - "Lulzbot 2.85mm PLA" - ] - ], "OFQ1KzO8": [ [ "Snapmaker", @@ -9895,13 +9536,6 @@ "QIDI PETG Tough" ] ], - "OFQ9qnkd": [ - [ - "Generic", - "PLA", - "FLSun T1 PLA High Speed" - ] - ], "OFQEGL7z": [ [ "FlyingBear", @@ -10035,13 +9669,6 @@ "Anycubic PET-CF" ] ], - "OFRi7v0b": [ - [ - "Generic", - "PETG", - "Sovol SV08 PETG" - ] - ], "OFRiFnfQ": [ [ "Eolas Prints", @@ -10119,13 +9746,6 @@ "Panchroma PLA Silk" ] ], - "OFSStjay": [ - [ - "Generic", - "PLA", - "FLSun S1 PLA Silk" - ] - ], "OFSa39yP": [ [ "Snapmaker", @@ -10245,13 +9865,6 @@ "QIDI ASA" ] ], - "OFTvvox9": [ - [ - "Generic", - "PLA", - "Sovol SV06 ACE PLA" - ] - ], "OFU1zPxE": [ [ "Elegoo", @@ -10336,13 +9949,6 @@ "Elegoo PC" ] ], - "OFV0KrAG": [ - [ - "Generic", - "ABS", - "FLSun T1 ABS" - ] - ], "OFV5Q7j2": [ [ "Snapmaker", @@ -10644,6 +10250,13 @@ "Generic ABS" ] ], + "OFYE7YZw": [ + [ + "Tinmorry", + "PETG", + "Tinmorry PETG-ECO" + ] + ], "OFYEtXuk": [ [ "Snapmaker", @@ -10791,13 +10404,6 @@ "Anycubic PAHT-CF" ] ], - "OFaFNP2U": [ - [ - "Generic", - "PLA", - "Sovol SV07 PLA" - ] - ], "OFaHjk1V": [ [ "Volumic", @@ -10910,13 +10516,6 @@ "Eryone PP-CF" ] ], - "OFbjtPQy": [ - [ - "Generic", - "ASA", - "FLSun T1 ASA" - ] - ], "OFc3xdm9": [ [ "Overture", @@ -10938,13 +10537,6 @@ "Snapmaker Dual TPU High-Flow" ] ], - "OFcJ7AKd": [ - [ - "Generic", - "PLA", - "Sovol SV08 PLA" - ] - ], "OFcJDtTx": [ [ "Artillery", @@ -10966,13 +10558,6 @@ "FusRock PAHT-GF" ] ], - "OFcdqaWI": [ - [ - "Generic", - "PC", - "Sovol Zero PC" - ] - ], "OFcfQk4h": [ [ "Overture", @@ -11106,13 +10691,6 @@ "FlashForge PC" ] ], - "OFe7Sx5B": [ - [ - "Generic", - "PETG", - "Sovol SV06 ACE PETG" - ] - ], "OFe8tuNb": [ [ "Tiertime", @@ -11918,13 +11496,6 @@ "Prusament PETG" ] ], - "OFkWaWRo": [ - [ - "Generic", - "TPU", - "Sovol SV06 Plus ACE TPU" - ] - ], "OFkf1HHw": [ [ "Generic", @@ -11995,13 +11566,6 @@ "Eolas Prints PLA Antibacterial" ] ], - "OFl7nOAf": [ - [ - "Generic", - "PETG", - "Sovol SV06 Plus ACE PETG" - ] - ], "OFlBoEfL": [ [ "Snapmaker", @@ -12037,13 +11601,6 @@ "Eolas Prints ASA" ] ], - "OFlXJxX1": [ - [ - "Generic", - "PETG", - "Chuanying PETG" - ] - ], "OFllmFhT": [ [ "Generic", @@ -12401,13 +11958,6 @@ "Bambu PLA Basic" ] ], - "OFoqrHTw": [ - [ - "Generic", - "PLA", - "FLSun S1 PLA High Speed" - ] - ], "OForhBi4": [ [ "Cubicon", @@ -12443,13 +11993,6 @@ "Eryone PA-CF" ] ], - "OFpBV2Ma": [ - [ - "Generic", - "PETG", - "Tinmorry PETG-ECO" - ] - ], "OFpBlrvY": [ [ "Valment", @@ -12632,13 +12175,6 @@ "Elegoo ASA-CF" ] ], - "OFs1sNLz": [ - [ - "Generic", - "ABS", - "Chuanying ABS" - ] - ], "OFsB2lxm": [ [ "Elegoo", @@ -12898,13 +12434,6 @@ "Arena PETG-CF" ] ], - "OFuUJyRx": [ - [ - "Generic", - "PLA", - "FLSun T1 PLA Silk" - ] - ], "OFuUuIhR": [ [ "Elegoo", @@ -13045,6 +12574,13 @@ "Elegoo PLA" ] ], + "OFvmwTZE": [ + [ + "Snapmaker", + "TPU", + "Snapmaker TPU 95A" + ] + ], "OFvrXuV7": [ [ "Polymaker", @@ -13255,13 +12791,6 @@ "Cubicon ABS-A100" ] ], - "OFyCToOV": [ - [ - "Generic", - "TPU", - "Sovol SV08 TPU" - ] - ], "OFyFyLIp": [ [ "SeeMeCNC", @@ -13443,13 +12972,6 @@ "PVA", "Bambu PVA" ] - ], - "OFzzmK2Q": [ - [ - "Generic", - "ABS", - "FLSun S1 ABS" - ] ] } } From bee0df825ea6fcf3a96ead493354406acb07e371 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 1 Sep 2026 18:36:44 +0800 Subject: [PATCH 31/52] fix filament_vendor --- resources/profiles/Flashforge.json | 106 +- ...hforge ABS Basic @FF AD5M 0.25 nozzle.json | 4 +- ...hforge ABS Basic @FF AD5X 0.25 nozzle.json | 4 +- ...shforge ABS Basic @FF AD5X 0.6 nozzle.json | 5 +- ...shforge ABS Basic @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge ABS Basic @FF AD5X.json | 5 +- .../filament/Flashforge ABS Basic @FF C5.json | 5 +- .../Flashforge ABS Basic @FF C5P.json | 5 +- ...ashforge ABS Basic @FF G4 0.25 nozzle.json | 4 +- ...hforge ABS Basic @FF G4 0.6 HF nozzle.json | 5 +- ...lashforge ABS Basic @FF G4 0.6 nozzle.json | 5 +- ...hforge ABS Basic @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge ABS Basic @FF G4 HF.json | 5 +- .../filament/Flashforge ABS Basic @FF G4.json | 5 +- ...shforge ABS Basic @FF G4P 0.25 nozzle.json | 4 +- ...forge ABS Basic @FF G4P 0.6 HF nozzle.json | 5 +- ...ashforge ABS Basic @FF G4P 0.6 nozzle.json | 5 +- ...forge ABS Basic @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge ABS Basic @FF G4P HF.json | 5 +- .../Flashforge ABS Basic @FF G4P.json | 5 +- .../filament/Flashforge ABS Basic.json | 5 +- .../Flashforge ABS-CF @FF G4 0.6 nozzle.json | 5 +- .../filament/Flashforge ABS-CF @FF G4.json | 5 +- .../Flashforge ABS-CF @FF G4P 0.6 nozzle.json | 5 +- .../filament/Flashforge ABS-CF @FF G4P.json | 5 +- .../filament/Flashforge ABS-GF @FF C5.json | 5 +- .../filament/Flashforge ABS-GF @FF C5P.json | 5 +- .../Flashforge ASA @FF AD5M 0.25 Nozzle.json | 5 +- ...hforge ASA Basic @FF AD5M 0.25 nozzle.json | 5 +- ...hforge ASA Basic @FF AD5X 0.25 nozzle.json | 5 +- ...shforge ASA Basic @FF AD5X 0.6 nozzle.json | 5 +- ...shforge ASA Basic @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge ASA Basic @FF AD5X.json | 5 +- .../filament/Flashforge ASA Basic @FF C5.json | 5 +- .../Flashforge ASA Basic @FF C5P.json | 5 +- ...ashforge ASA Basic @FF G4 0.25 nozzle.json | 4 +- ...hforge ASA Basic @FF G4 0.6 HF nozzle.json | 5 +- ...lashforge ASA Basic @FF G4 0.6 nozzle.json | 5 +- ...hforge ASA Basic @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge ASA Basic @FF G4 HF.json | 5 +- .../filament/Flashforge ASA Basic @FF G4.json | 5 +- ...shforge ASA Basic @FF G4P 0.25 nozzle.json | 4 +- ...forge ASA Basic @FF G4P 0.6 HF nozzle.json | 5 +- ...ashforge ASA Basic @FF G4P 0.6 nozzle.json | 5 +- ...forge ASA Basic @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge ASA Basic @FF G4P HF.json | 5 +- .../Flashforge ASA Basic @FF G4P.json | 5 +- .../filament/Flashforge ASA Basic.json | 5 +- .../filament/Flashforge ASA-GF @FF C5.json | 5 +- .../filament/Flashforge ASA-GF @FF C5P.json | 5 +- .../filament/Flashforge HIPS @FF C5.json | 5 +- .../filament/Flashforge HIPS @FF C5P.json | 5 +- .../Flashforge HIPS @FF G4 0.6 HF nozzle.json | 5 +- .../Flashforge HIPS @FF G4 0.6 nozzle.json | 5 +- .../Flashforge HIPS @FF G4 0.8 HF nozzle.json | 5 +- .../filament/Flashforge HIPS @FF G4 HF.json | 5 +- .../filament/Flashforge HIPS @FF G4.json | 5 +- ...Flashforge HIPS @FF G4P 0.6 HF nozzle.json | 5 +- .../Flashforge HIPS @FF G4P 0.6 nozzle.json | 5 +- ...Flashforge HIPS @FF G4P 0.8 HF nozzle.json | 5 +- .../filament/Flashforge HIPS @FF G4P HF.json | 5 +- .../filament/Flashforge HIPS @FF G4P.json | 5 +- ...ashforge HS PETG @FF AD5M 0.25 nozzle.json | 4 +- ...ashforge HS PETG @FF AD5X 0.25 nozzle.json | 4 +- ...lashforge HS PETG @FF AD5X 0.6 nozzle.json | 5 +- ...lashforge HS PETG @FF AD5X 0.8 nozzle.json | 5 +- .../filament/Flashforge HS PETG @FF AD5X.json | 5 +- .../filament/Flashforge HS PETG @FF C5.json | 5 +- .../filament/Flashforge HS PETG @FF C5P.json | 5 +- ...Flashforge HS PETG @FF G4 0.25 nozzle.json | 4 +- ...ashforge HS PETG @FF G4 0.6 HF nozzle.json | 5 +- .../Flashforge HS PETG @FF G4 0.6 nozzle.json | 5 +- ...ashforge HS PETG @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge HS PETG @FF G4 HF.json | 5 +- .../filament/Flashforge HS PETG @FF G4.json | 5 +- ...lashforge HS PETG @FF G4P 0.25 nozzle.json | 4 +- ...shforge HS PETG @FF G4P 0.6 HF nozzle.json | 5 +- ...Flashforge HS PETG @FF G4P 0.6 nozzle.json | 5 +- ...shforge HS PETG @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge HS PETG @FF G4P HF.json | 5 +- .../filament/Flashforge HS PETG @FF G4P.json | 5 +- .../filament/Flashforge HS PETG.json | 5 +- ...lashforge HS PLA @FF AD5M 0.25 Nozzle.json | 5 +- ...lashforge HS PLA @FF AD5X 0.25 nozzle.json | 4 +- ...Flashforge HS PLA @FF AD5X 0.6 nozzle.json | 5 +- ...Flashforge HS PLA @FF AD5X 0.8 nozzle.json | 5 +- .../filament/Flashforge HS PLA @FF AD5X.json | 5 +- .../filament/Flashforge HS PLA @FF C5.json | 5 +- .../filament/Flashforge HS PLA @FF C5P.json | 5 +- .../Flashforge HS PLA @FF G4 0.25 nozzle.json | 4 +- ...lashforge HS PLA @FF G4 0.6 HF nozzle.json | 5 +- .../Flashforge HS PLA @FF G4 0.6 nozzle.json | 5 +- ...lashforge HS PLA @FF G4 0.8 HF nozzle.json | 5 +- .../filament/Flashforge HS PLA @FF G4 HF.json | 5 +- .../filament/Flashforge HS PLA @FF G4.json | 5 +- ...Flashforge HS PLA @FF G4P 0.25 nozzle.json | 4 +- ...ashforge HS PLA @FF G4P 0.6 HF nozzle.json | 5 +- .../Flashforge HS PLA @FF G4P 0.6 nozzle.json | 5 +- ...ashforge HS PLA @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge HS PLA @FF G4P HF.json | 5 +- .../filament/Flashforge HS PLA @FF G4P.json | 5 +- ... HS PLA Burnt Ti @FF G4 0.6 HF nozzle.json | 5 +- .../Flashforge HS PLA Burnt Ti @FF G4 HF.json | 5 +- ...HS PLA Burnt Ti @FF G4P 0.6 HF nozzle.json | 5 +- ...Flashforge HS PLA Burnt Ti @FF G4P HF.json | 5 +- ...orge HS PLA Burnt Ti@FF G4 0.6 nozzle.json | 5 +- ...e HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json | 6 +- ...rge HS PLA Burnt Ti@FF G4P 0.6 nozzle.json | 5 +- ... HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json | 6 +- .../filament/Flashforge HS PLA.json | 5 +- .../Flashforge PA @FF G4 0.6 HF nozzle.json | 5 +- .../filament/Flashforge PA @FF G4 HF.json | 5 +- .../filament/Flashforge PA @FF G4.json | 5 +- .../Flashforge PA @FF G4P 0.6 HF nozzle.json | 5 +- .../filament/Flashforge PA @FF G4P HF.json | 5 +- .../filament/Flashforge PA @FF G4P.json | 5 +- .../filament/Flashforge PA-CF @FF C5.json | 5 +- .../filament/Flashforge PA-CF @FF C5P.json | 5 +- .../filament/Flashforge PA-CF @FF G4.json | 5 +- .../filament/Flashforge PA-CF @FF G4P.json | 5 +- .../filament/Flashforge PAHT-CF @FF C5.json | 83 -- .../filament/Flashforge PAHT-CF @FF C5P.json | 89 -- .../filament/Flashforge PAHT-CF @FF G4.json | 108 -- .../filament/Flashforge PAHT-CF @FF G4P.json | 108 -- ...> Flashforge PC @FF G4 0.6 HF nozzle.json} | 11 +- ...n => Flashforge PC @FF G4 0.6 nozzle.json} | 11 +- ...> Flashforge PC @FF G4 0.8 HF nozzle.json} | 11 +- ... Flashforge PC @FF G4P 0.6 HF nozzle.json} | 11 +- ... => Flashforge PC @FF G4P 0.6 nozzle.json} | 11 +- ... Flashforge PC @FF G4P 0.8 HF nozzle.json} | 11 +- ...forge PETG Basic @FF AD5M 0.25 nozzle.json | 4 +- .../filament/Flashforge PETG Basic.json | 5 +- ...shforge PETG Pro @FF AD5M 0.25 nozzle.json | 4 +- ...shforge PETG Pro @FF AD5X 0.25 nozzle.json | 4 +- ...ashforge PETG Pro @FF AD5X 0.6 nozzle.json | 5 +- ...ashforge PETG Pro @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PETG Pro @FF AD5X.json | 5 +- .../filament/Flashforge PETG Pro @FF C5.json | 5 +- .../filament/Flashforge PETG Pro @FF C5P.json | 5 +- ...lashforge PETG Pro @FF G4 0.25 nozzle.json | 4 +- ...shforge PETG Pro @FF G4 0.6 HF nozzle.json | 5 +- ...Flashforge PETG Pro @FF G4 0.6 nozzle.json | 5 +- ...shforge PETG Pro @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PETG Pro @FF G4 HF.json | 5 +- .../filament/Flashforge PETG Pro @FF G4.json | 5 +- ...ashforge PETG Pro @FF G4P 0.25 nozzle.json | 4 +- ...hforge PETG Pro @FF G4P 0.6 HF nozzle.json | 5 +- ...lashforge PETG Pro @FF G4P 0.6 nozzle.json | 5 +- ...hforge PETG Pro @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PETG Pro @FF G4P HF.json | 5 +- .../filament/Flashforge PETG Pro @FF G4P.json | 5 +- .../filament/Flashforge PETG Pro.json | 5 +- ...PETG Transparent @FF AD5M 0.25 nozzle.json | 4 +- ...PETG Transparent @FF AD5X 0.25 nozzle.json | 4 +- ... PETG Transparent @FF AD5X 0.6 nozzle.json | 5 +- ... PETG Transparent @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PETG Transparent @FF AD5X.json | 5 +- .../Flashforge PETG Transparent @FF C5.json | 5 +- .../Flashforge PETG Transparent @FF C5P.json | 5 +- ...e PETG Transparent @FF G4 0.25 nozzle.json | 4 +- ...PETG Transparent @FF G4 0.6 HF nozzle.json | 5 +- ...ge PETG Transparent @FF G4 0.6 nozzle.json | 5 +- ...PETG Transparent @FF G4 0.8 HF nozzle.json | 5 +- ...Flashforge PETG Transparent @FF G4 HF.json | 5 +- .../Flashforge PETG Transparent @FF G4.json | 5 +- ... PETG Transparent @FF G4P 0.25 nozzle.json | 4 +- ...ETG Transparent @FF G4P 0.6 HF nozzle.json | 5 +- ...e PETG Transparent @FF G4P 0.6 nozzle.json | 5 +- ...ETG Transparent @FF G4P 0.8 HF nozzle.json | 5 +- ...lashforge PETG Transparent @FF G4P HF.json | 5 +- .../Flashforge PETG Transparent @FF G4P.json | 5 +- .../filament/Flashforge PETG Transparent.json | 5 +- ...lashforge PETG-CF @FF AD5X 0.6 nozzle.json | 5 +- ...lashforge PETG-CF @FF AD5X 0.8 nozzle.json | 5 +- .../filament/Flashforge PETG-CF @FF AD5X.json | 5 +- .../filament/Flashforge PETG-CF @FF C5.json | 5 +- .../filament/Flashforge PETG-CF @FF C5P.json | 5 +- .../Flashforge PETG-CF @FF G4 0.6 nozzle.json | 5 +- .../filament/Flashforge PETG-CF @FF G4.json | 5 +- ...Flashforge PETG-CF @FF G4P 0.6 nozzle.json | 5 +- .../filament/Flashforge PETG-CF @FF G4P.json | 5 +- .../filament/Flashforge PETG-CF.json | 5 +- ...hforge PLA Basic @FF AD5M 0.25 nozzle.json | 4 +- ...hforge PLA Basic @FF AD5X 0.25 nozzle.json | 4 +- ...shforge PLA Basic @FF AD5X 0.6 nozzle.json | 5 +- ...shforge PLA Basic @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Basic @FF AD5X.json | 5 +- .../filament/Flashforge PLA Basic @FF C5.json | 5 +- .../Flashforge PLA Basic @FF C5P.json | 5 +- ...ashforge PLA Basic @FF G4 0.25 nozzle.json | 4 +- ...hforge PLA Basic @FF G4 0.6 HF nozzle.json | 5 +- ...lashforge PLA Basic @FF G4 0.6 nozzle.json | 5 +- ...hforge PLA Basic @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Basic @FF G4 HF.json | 5 +- .../filament/Flashforge PLA Basic @FF G4.json | 5 +- ...shforge PLA Basic @FF G4P 0.25 nozzle.json | 4 +- ...forge PLA Basic @FF G4P 0.6 HF nozzle.json | 5 +- ...ashforge PLA Basic @FF G4P 0.6 nozzle.json | 5 +- ...forge PLA Basic @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Basic @FF G4P HF.json | 5 +- .../Flashforge PLA Basic @FF G4P.json | 5 +- .../filament/Flashforge PLA Basic.json | 5 +- ...hforge PLA Buint Ti @FF G4 0.8 nozzle.json | 93 -- ...forge PLA Buint Ti @FF G4P 0.8 nozzle.json | 93 -- ...PLA Color Change @FF AD5M 0.25 nozzle.json | 4 +- ...PLA Color Change @FF AD5X 0.25 nozzle.json | 4 +- ... PLA Color Change @FF AD5X 0.6 nozzle.json | 5 +- ... PLA Color Change @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Color Change @FF AD5X.json | 5 +- .../Flashforge PLA Color Change @FF C5.json | 5 +- .../Flashforge PLA Color Change @FF C5P.json | 5 +- ...e PLA Color Change @FF G4 0.25 nozzle.json | 4 +- ...PLA Color Change @FF G4 0.6 HF nozzle.json | 5 +- ...ge PLA Color Change @FF G4 0.6 nozzle.json | 5 +- ...PLA Color Change @FF G4 0.8 HF nozzle.json | 5 +- ...Flashforge PLA Color Change @FF G4 HF.json | 5 +- .../Flashforge PLA Color Change @FF G4.json | 5 +- ... PLA Color Change @FF G4P 0.25 nozzle.json | 4 +- ...LA Color Change @FF G4P 0.6 HF nozzle.json | 5 +- ...e PLA Color Change @FF G4P 0.6 nozzle.json | 5 +- ...LA Color Change @FF G4P 0.8 HF nozzle.json | 5 +- ...lashforge PLA Color Change @FF G4P HF.json | 5 +- .../Flashforge PLA Color Change @FF G4P.json | 5 +- .../filament/Flashforge PLA Color Change.json | 5 +- ...forge PLA Galaxy @FF AD5M 0.25 nozzle.json | 4 +- ...forge PLA Galaxy @FF AD5X 0.25 nozzle.json | 4 +- ...hforge PLA Galaxy @FF AD5X 0.6 nozzle.json | 5 +- ...hforge PLA Galaxy @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Galaxy @FF AD5X.json | 5 +- .../Flashforge PLA Galaxy @FF C5.json | 5 +- .../Flashforge PLA Galaxy @FF C5P.json | 5 +- ...shforge PLA Galaxy @FF G4 0.25 nozzle.json | 4 +- ...forge PLA Galaxy @FF G4 0.6 HF nozzle.json | 5 +- ...ashforge PLA Galaxy @FF G4 0.6 nozzle.json | 5 +- ...forge PLA Galaxy @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Galaxy @FF G4 HF.json | 5 +- .../Flashforge PLA Galaxy @FF G4.json | 5 +- ...hforge PLA Galaxy @FF G4P 0.25 nozzle.json | 4 +- ...orge PLA Galaxy @FF G4P 0.6 HF nozzle.json | 5 +- ...shforge PLA Galaxy @FF G4P 0.6 nozzle.json | 5 +- ...orge PLA Galaxy @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Galaxy @FF G4P HF.json | 5 +- .../Flashforge PLA Galaxy @FF G4P.json | 5 +- .../filament/Flashforge PLA Galaxy.json | 5 +- ...rge PLA Luminous @FF AD5M 0.25 nozzle.json | 4 +- ...rge PLA Luminous @FF AD5X 0.25 nozzle.json | 4 +- ...orge PLA Luminous @FF AD5X 0.6 nozzle.json | 5 +- ...orge PLA Luminous @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Luminous @FF AD5X.json | 5 +- .../Flashforge PLA Luminous @FF C5.json | 5 +- .../Flashforge PLA Luminous @FF C5P.json | 5 +- ...forge PLA Luminous @FF G4 0.25 nozzle.json | 4 +- ...rge PLA Luminous @FF G4 0.6 HF nozzle.json | 5 +- ...rge PLA Luminous @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Luminous @FF G4 HF.json | 5 +- .../Flashforge PLA Luminous @FF G4.json | 5 +- ...orge PLA Luminous @FF G4P 0.25 nozzle.json | 4 +- ...ge PLA Luminous @FF G4P 0.6 HF nozzle.json | 5 +- ...ge PLA Luminous @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Luminous @FF G4P HF.json | 5 +- .../Flashforge PLA Luminous @FF G4P.json | 5 +- .../filament/Flashforge PLA Luminous.json | 5 +- ...hforge PLA Matte @FF AD5M 0.25 nozzle.json | 4 +- ...hforge PLA Matte @FF AD5X 0.25 nozzle.json | 4 +- ...shforge PLA Matte @FF AD5X 0.6 nozzle.json | 5 +- ...shforge PLA Matte @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Matte @FF AD5X.json | 5 +- ....json => Flashforge PLA Matte @FF C5.json} | 12 +- ...json => Flashforge PLA Matte @FF C5P.json} | 12 +- ...ashforge PLA Matte @FF G4 0.25 nozzle.json | 4 +- ...hforge PLA Matte @FF G4 0.6 HF nozzle.json | 5 +- ...lashforge PLA Matte @FF G4 0.6 nozzle.json | 5 +- ...hforge PLA Matte @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Matte @FF G4 HF.json | 5 +- .../filament/Flashforge PLA Matte @FF G4.json | 5 +- ...shforge PLA Matte @FF G4P 0.25 nozzle.json | 4 +- ...forge PLA Matte @FF G4P 0.6 HF nozzle.json | 5 +- ...ashforge PLA Matte @FF G4P 0.6 nozzle.json | 5 +- ...forge PLA Matte @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Matte @FF G4P HF.json | 5 +- .../Flashforge PLA Matte @FF G4P.json | 5 +- .../filament/Flashforge PLA Matte.json | 5 +- ...hforge PLA Metal @FF AD5M 0.25 nozzle.json | 4 +- ...hforge PLA Metal @FF AD5X 0.25 nozzle.json | 4 +- ...shforge PLA Metal @FF AD5X 0.6 nozzle.json | 5 +- ...shforge PLA Metal @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Metal @FF AD5X.json | 5 +- ....json => Flashforge PLA Metal @FF C5.json} | 12 +- ...json => Flashforge PLA Metal @FF C5P.json} | 12 +- ...ashforge PLA Metal @FF G4 0.25 nozzle.json | 4 +- ...hforge PLA Metal @FF G4 0.6 HF nozzle.json | 5 +- ...lashforge PLA Metal @FF G4 0.6 nozzle.json | 5 +- ...hforge PLA Metal @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Metal @FF G4 HF.json | 5 +- .../filament/Flashforge PLA Metal @FF G4.json | 5 +- ...shforge PLA Metal @FF G4P 0.25 nozzle.json | 4 +- ...forge PLA Metal @FF G4P 0.6 HF nozzle.json | 5 +- ...ashforge PLA Metal @FF G4P 0.6 nozzle.json | 5 +- ...forge PLA Metal @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Metal @FF G4P HF.json | 5 +- .../Flashforge PLA Metal @FF G4P.json | 5 +- .../filament/Flashforge PLA Metal.json | 5 +- ...ashforge PLA Pro @FF AD5M 0.25 nozzle.json | 4 +- ...ashforge PLA Pro @FF AD5X 0.25 nozzle.json | 4 +- ...lashforge PLA Pro @FF AD5X 0.6 nozzle.json | 5 +- ...lashforge PLA Pro @FF AD5X 0.8 nozzle.json | 5 +- .../filament/Flashforge PLA Pro @FF AD5X.json | 5 +- ...C5.json => Flashforge PLA Pro @FF C5.json} | 12 +- ...P.json => Flashforge PLA Pro @FF C5P.json} | 12 +- ...Flashforge PLA Pro @FF G4 0.25 nozzle.json | 4 +- ...ashforge PLA Pro @FF G4 0.6 HF nozzle.json | 5 +- .../Flashforge PLA Pro @FF G4 0.6 nozzle.json | 5 +- ...ashforge PLA Pro @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Pro @FF G4 HF.json | 5 +- .../filament/Flashforge PLA Pro @FF G4.json | 5 +- ...lashforge PLA Pro @FF G4P 0.25 nozzle.json | 4 +- ...shforge PLA Pro @FF G4P 0.6 HF nozzle.json | 5 +- ...Flashforge PLA Pro @FF G4P 0.6 nozzle.json | 5 +- ...shforge PLA Pro @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Pro @FF G4P HF.json | 5 +- .../filament/Flashforge PLA Pro @FF G4P.json | 5 +- .../filament/Flashforge PLA Pro.json | 5 +- ...shforge PLA Silk @FF AD5M 0.25 nozzle.json | 5 +- ...shforge PLA Silk @FF AD5X 0.25 nozzle.json | 4 +- ...ashforge PLA Silk @FF AD5X 0.6 nozzle.json | 5 +- ...ashforge PLA Silk @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Silk @FF AD5X.json | 5 +- .../filament/Flashforge PLA Silk @FF C5.json | 5 +- .../filament/Flashforge PLA Silk @FF C5P.json | 5 +- ...lashforge PLA Silk @FF G4 0.25 nozzle.json | 4 +- ...shforge PLA Silk @FF G4 0.6 HF nozzle.json | 5 +- ...Flashforge PLA Silk @FF G4 0.6 nozzle.json | 5 +- ...shforge PLA Silk @FF G4 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Silk @FF G4 HF.json | 5 +- .../filament/Flashforge PLA Silk @FF G4.json | 5 +- ...ashforge PLA Silk @FF G4P 0.25 nozzle.json | 4 +- ...hforge PLA Silk @FF G4P 0.6 HF nozzle.json | 5 +- ...lashforge PLA Silk @FF G4P 0.6 nozzle.json | 5 +- ...hforge PLA Silk @FF G4P 0.8 HF nozzle.json | 5 +- .../Flashforge PLA Silk @FF G4P HF.json | 5 +- .../filament/Flashforge PLA Silk @FF G4P.json | 5 +- .../filament/Flashforge PLA Silk.json | 5 +- ...orge PLA Sparkle @FF AD5M 0.25 nozzle.json | 4 +- ...orge PLA Sparkle @FF AD5X 0.25 nozzle.json | 4 +- ...forge PLA Sparkle @FF AD5X 0.6 nozzle.json | 5 +- ...forge PLA Sparkle @FF AD5X 0.8 nozzle.json | 5 +- .../Flashforge PLA Sparkle @FF AD5X.json | 5 +- ...hforge PLA Sparkle @FF G4 0.25 nozzle.json | 4 +- ...orge PLA Sparkle @FF G4 0.6 HF nozzle.json | 5 +- ...shforge PLA Sparkle @FF G4 0.6 nozzle.json | 5 +- .../Flashforge PLA Sparkle @FF G4 HF.json | 5 +- .../Flashforge PLA Sparkle @FF G4.json | 5 +- ...forge PLA Sparkle @FF G4P 0.25 nozzle.json | 4 +- ...rge PLA Sparkle @FF G4P 0.6 HF nozzle.json | 5 +- ...hforge PLA Sparkle @FF G4P 0.6 nozzle.json | 5 +- .../Flashforge PLA Sparkle @FF G4P HF.json | 5 +- .../Flashforge PLA Sparkle @FF G4P.json | 5 +- .../filament/Flashforge PLA Sparkle.json | 5 +- ...Flashforge PLA-CF @FF AD5X 0.6 nozzle.json | 5 +- ...Flashforge PLA-CF @FF AD5X 0.8 nozzle.json | 5 +- .../filament/Flashforge PLA-CF @FF AD5X.json | 5 +- .../filament/Flashforge PLA-CF @FF C5.json | 5 +- .../filament/Flashforge PLA-CF @FF C5P.json | 5 +- .../Flashforge PLA-CF @FF G4 0.6 nozzle.json | 5 +- .../filament/Flashforge PLA-CF @FF G4.json | 5 +- .../Flashforge PLA-CF @FF G4P 0.6 nozzle.json | 5 +- .../filament/Flashforge PLA-CF @FF G4P.json | 5 +- .../filament/Flashforge PLA-CF.json | 5 +- ...shforge PLA-SILK @FF AD5M 0.25 Nozzle.json | 5 +- ... Flashforge PPS @FF G4 0.6 HF nozzle.json} | 11 +- ... => Flashforge PPS @FF G4 0.6 nozzle.json} | 11 +- ... Flashforge PPS @FF G4 0.8 HF nozzle.json} | 11 +- .../filament/Flashforge PPS @FF G4.json | 5 +- ...Flashforge PPS @FF G4P 0.6 HF nozzle.json} | 11 +- ...=> Flashforge PPS @FF G4P 0.6 nozzle.json} | 11 +- ...Flashforge PPS @FF G4P 0.8 HF nozzle.json} | 11 +- .../filament/Flashforge PPS @FF G4P.json | 5 +- ... Flashforge PPS-CF @FF G4 0.6 nozzle.json} | 11 +- ...Flashforge PPS-CF @FF G4P 0.6 nozzle.json} | 11 +- .../filament/Flashforge PVA @FF C5.json | 5 +- .../filament/Flashforge PVA @FF C5P.json | 5 +- ...ashforge TPU 65D @FF G4 0.6 HF nozzle.json | 5 +- .../Flashforge TPU 65D @FF G4 0.6 nozzle.json | 5 +- ...ashforge TPU 65D @FF G4 0.8 HF nozzle.json | 5 +- ...shforge TPU 65D @FF G4P 0.6 HF nozzle.json | 5 +- ...Flashforge TPU 65D @FF G4P 0.6 nozzle.json | 5 +- ...shforge TPU 65D @FF G4P 0.8 HF nozzle.json | 5 +- ...lashforge TPU 95A @FF AD5X 0.6 nozzle.json | 5 +- ...lashforge TPU 95A @FF AD5X 0.8 nozzle.json | 5 +- .../filament/Flashforge TPU 95A @FF AD5X.json | 5 +- ...ashforge TPU 95A @FF G4 0.6 HF nozzle.json | 5 +- .../Flashforge TPU 95A @FF G4 0.6 nozzle.json | 5 +- ...ashforge TPU 95A @FF G4 0.8 HF nozzle.json | 5 +- .../filament/Flashforge TPU 95A @FF G4.json | 5 +- ...shforge TPU 95A @FF G4P 0.6 HF nozzle.json | 5 +- ...Flashforge TPU 95A @FF G4P 0.6 nozzle.json | 5 +- ...shforge TPU 95A @FF G4P 0.8 HF nozzle.json | 5 +- .../filament/Flashforge TPU 95A @FF G4P.json | 5 +- .../filament/Flashforge TPU 95A.json | 5 +- .../filament/Flashforge TPU-64D @FF C5.json | 5 +- .../filament/Flashforge TPU-64D @FF C5P.json | 5 +- .../filament/Flashforge TPU-90A @FF C5.json | 5 +- .../filament/Flashforge TPU-90A @FF C5P.json | 5 +- .../filament/Flashforge TPU-95A @FF C5.json | 5 +- .../filament/Flashforge TPU-95A @FF C5P.json | 5 +- .../filament/FusRock PAHT-CF @FF C5.json | 1 + .../filament/FusRock PAHT-CF @FF C5P.json | 1 + .../filament/FusRock PAHT-CF @FF G4.json | 1 + .../filament/FusRock PAHT-CF @FF G4P.json | 1 + resources/profiles/Ratrig.json | 26 +- ...son => Generic ABS BigNozzle @RatRig.json} | 7 +- ...son => Generic ASA BigNozzle @RatRig.json} | 7 +- ...on => Generic PCTG BigNozzle @RatRig.json} | 7 +- ...on => Generic PETG BigNozzle @RatRig.json} | 7 +- ...son => Generic PLA BigNozzle @RatRig.json} | 7 +- ...son => Generic TPU BigNozzle @RatRig.json} | 7 +- resources/profiles/retired_filament_ids.json | 276 +++++ scripts/filament_id_snapshot.json | 946 ++++++++---------- 418 files changed, 2321 insertions(+), 1714 deletions(-) delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4 0.6 HF nozzle.json => Flashforge PC @FF G4 0.6 HF nozzle.json} (85%) rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4 0.6 nozzle.json => Flashforge PC @FF G4 0.6 nozzle.json} (85%) rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4 0.8 HF nozzle.json => Flashforge PC @FF G4 0.8 HF nozzle.json} (85%) rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4P 0.6 HF nozzle.json => Flashforge PC @FF G4P 0.6 HF nozzle.json} (85%) rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4P 0.6 nozzle.json => Flashforge PC @FF G4P 0.6 nozzle.json} (85%) rename resources/profiles/Flashforge/filament/{FlashForge PC @FF G4P 0.8 HF nozzle.json => Flashforge PC @FF G4P 0.8 HF nozzle.json} (85%) delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json delete mode 100644 resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json rename resources/profiles/Flashforge/filament/{Flashforge PLA Pro @FF C5.json => Flashforge PLA Matte @FF C5.json} (82%) rename resources/profiles/Flashforge/filament/{Flashforge PLA Matte @FF C5P.json => Flashforge PLA Matte @FF C5P.json} (80%) rename resources/profiles/Flashforge/filament/{Flashforge PLA Metal @FF C5.json => Flashforge PLA Metal @FF C5.json} (81%) rename resources/profiles/Flashforge/filament/{Flashforge PLA Metal @FF C5P.json => Flashforge PLA Metal @FF C5P.json} (80%) rename resources/profiles/Flashforge/filament/{Flashforge PLA Matte @FF C5.json => Flashforge PLA Pro @FF C5.json} (82%) rename resources/profiles/Flashforge/filament/{Flashforge PLA Pro @FF C5P.json => Flashforge PLA Pro @FF C5P.json} (81%) rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4 0.6 HF nozzle.json => Flashforge PPS @FF G4 0.6 HF nozzle.json} (86%) rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4 0.6 nozzle.json => Flashforge PPS @FF G4 0.6 nozzle.json} (87%) rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4 0.8 HF nozzle.json => Flashforge PPS @FF G4 0.8 HF nozzle.json} (86%) rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4P 0.6 HF nozzle.json => Flashforge PPS @FF G4P 0.6 HF nozzle.json} (86%) rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4P 0.6 nozzle.json => Flashforge PPS @FF G4P 0.6 nozzle.json} (87%) rename resources/profiles/Flashforge/filament/{FlashForge PPS @FF G4P 0.8 HF nozzle.json => Flashforge PPS @FF G4P 0.8 HF nozzle.json} (86%) rename resources/profiles/Flashforge/filament/{FlashForge PPS-CF @FF G4 0.6 nozzle.json => Flashforge PPS-CF @FF G4 0.6 nozzle.json} (85%) rename resources/profiles/Flashforge/filament/{FlashForge PPS-CF @FF G4P 0.6 nozzle.json => Flashforge PPS-CF @FF G4P 0.6 nozzle.json} (85%) rename resources/profiles/Ratrig/filament/{RatRig BigNozzle ABS.json => Generic ABS BigNozzle @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig BigNozzle ASA.json => Generic ASA BigNozzle @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig BigNozzle PCTG.json => Generic PCTG BigNozzle @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig BigNozzle PETG.json => Generic PETG BigNozzle @RatRig.json} (93%) rename resources/profiles/Ratrig/filament/{RatRig BigNozzle PLA.json => Generic PLA BigNozzle @RatRig.json} (92%) rename resources/profiles/Ratrig/filament/{RatRig BigNozzle TPU.json => Generic TPU BigNozzle @RatRig.json} (92%) diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index 63c09f65af..11b86ecc8d 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -1,7 +1,7 @@ { "name": "Flashforge", "url": "", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Flashforge configurations", "machine_model_list": [ @@ -1237,14 +1237,6 @@ "name": "Flashforge PA-CF @FF G4P", "sub_path": "filament/Flashforge PA-CF @FF G4P.json" }, - { - "name": "Flashforge PAHT-CF @FF G4", - "sub_path": "filament/Flashforge PAHT-CF @FF G4.json" - }, - { - "name": "Flashforge PAHT-CF @FF G4P", - "sub_path": "filament/Flashforge PAHT-CF @FF G4P.json" - }, { "name": "Flashforge PLA-CF", "sub_path": "filament/Flashforge PLA-CF.json" @@ -1898,36 +1890,36 @@ "sub_path": "filament/FusRock/FusRock PET-GF.json" }, { - "name": "FlashForge PPS @FF G4 0.6 HF nozzle", - "sub_path": "filament/FlashForge PPS @FF G4 0.6 HF nozzle.json" + "name": "Flashforge PPS @FF G4 0.6 HF nozzle", + "sub_path": "filament/Flashforge PPS @FF G4 0.6 HF nozzle.json" }, { - "name": "FlashForge PPS @FF G4 0.6 nozzle", - "sub_path": "filament/FlashForge PPS @FF G4 0.6 nozzle.json" + "name": "Flashforge PPS @FF G4 0.6 nozzle", + "sub_path": "filament/Flashforge PPS @FF G4 0.6 nozzle.json" }, { - "name": "FlashForge PPS @FF G4 0.8 HF nozzle", - "sub_path": "filament/FlashForge PPS @FF G4 0.8 HF nozzle.json" + "name": "Flashforge PPS @FF G4 0.8 HF nozzle", + "sub_path": "filament/Flashforge PPS @FF G4 0.8 HF nozzle.json" }, { - "name": "FlashForge PPS @FF G4P 0.6 HF nozzle", - "sub_path": "filament/FlashForge PPS @FF G4P 0.6 HF nozzle.json" + "name": "Flashforge PPS @FF G4P 0.6 HF nozzle", + "sub_path": "filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json" }, { - "name": "FlashForge PPS @FF G4P 0.6 nozzle", - "sub_path": "filament/FlashForge PPS @FF G4P 0.6 nozzle.json" + "name": "Flashforge PPS @FF G4P 0.6 nozzle", + "sub_path": "filament/Flashforge PPS @FF G4P 0.6 nozzle.json" }, { - "name": "FlashForge PPS @FF G4P 0.8 HF nozzle", - "sub_path": "filament/FlashForge PPS @FF G4P 0.8 HF nozzle.json" + "name": "Flashforge PPS @FF G4P 0.8 HF nozzle", + "sub_path": "filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json" }, { - "name": "FlashForge PPS-CF @FF G4 0.6 nozzle", - "sub_path": "filament/FlashForge PPS-CF @FF G4 0.6 nozzle.json" + "name": "Flashforge PPS-CF @FF G4 0.6 nozzle", + "sub_path": "filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json" }, { - "name": "FlashForge PPS-CF @FF G4P 0.6 nozzle", - "sub_path": "filament/FlashForge PPS-CF @FF G4P 0.6 nozzle.json" + "name": "Flashforge PPS-CF @FF G4P 0.6 nozzle", + "sub_path": "filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json" }, { "name": "FusRock PET @FF G4P 0.8 HF nozzle", @@ -1966,28 +1958,28 @@ "sub_path": "filament/Generic PET @FF G4P 0.8 HF nozzle.json" }, { - "name": "FlashForge PC @FF G4 0.6 HF nozzle", - "sub_path": "filament/FlashForge PC @FF G4 0.6 HF nozzle.json" + "name": "Flashforge PC @FF G4 0.6 HF nozzle", + "sub_path": "filament/Flashforge PC @FF G4 0.6 HF nozzle.json" }, { - "name": "FlashForge PC @FF G4 0.6 nozzle", - "sub_path": "filament/FlashForge PC @FF G4 0.6 nozzle.json" + "name": "Flashforge PC @FF G4 0.6 nozzle", + "sub_path": "filament/Flashforge PC @FF G4 0.6 nozzle.json" }, { - "name": "FlashForge PC @FF G4 0.8 HF nozzle", - "sub_path": "filament/FlashForge PC @FF G4 0.8 HF nozzle.json" + "name": "Flashforge PC @FF G4 0.8 HF nozzle", + "sub_path": "filament/Flashforge PC @FF G4 0.8 HF nozzle.json" }, { - "name": "FlashForge PC @FF G4P 0.6 HF nozzle", - "sub_path": "filament/FlashForge PC @FF G4P 0.6 HF nozzle.json" + "name": "Flashforge PC @FF G4P 0.6 HF nozzle", + "sub_path": "filament/Flashforge PC @FF G4P 0.6 HF nozzle.json" }, { - "name": "FlashForge PC @FF G4P 0.6 nozzle", - "sub_path": "filament/FlashForge PC @FF G4P 0.6 nozzle.json" + "name": "Flashforge PC @FF G4P 0.6 nozzle", + "sub_path": "filament/Flashforge PC @FF G4P 0.6 nozzle.json" }, { - "name": "FlashForge PC @FF G4P 0.8 HF nozzle", - "sub_path": "filament/FlashForge PC @FF G4P 0.8 HF nozzle.json" + "name": "Flashforge PC @FF G4P 0.8 HF nozzle", + "sub_path": "filament/Flashforge PC @FF G4P 0.8 HF nozzle.json" }, { "name": "FusRock PAHT @FF G4 0.6 HF nozzle", @@ -2117,14 +2109,6 @@ "name": "Flashforge PLA Basic @FF G4P 0.8 HF nozzle", "sub_path": "filament/Flashforge PLA Basic @FF G4P 0.8 HF nozzle.json" }, - { - "name": "Flashforge PLA Buint Ti @FF G4 0.8 nozzle", - "sub_path": "filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json" - }, - { - "name": "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle", - "sub_path": "filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json" - }, { "name": "Flashforge PLA Color Change @FF G4 0.6 HF nozzle", "sub_path": "filament/Flashforge PLA Color Change @FF G4 0.6 HF nozzle.json" @@ -2569,14 +2553,6 @@ "name": "Flashforge PA-CF @FF C5P", "sub_path": "filament/Flashforge PA-CF @FF C5P.json" }, - { - "name": "Flashforge PAHT-CF @FF C5", - "sub_path": "filament/Flashforge PAHT-CF @FF C5.json" - }, - { - "name": "Flashforge PAHT-CF @FF C5P", - "sub_path": "filament/Flashforge PAHT-CF @FF C5P.json" - }, { "name": "Flashforge PET-CF @FF C5", "sub_path": "filament/Flashforge PET-CF @FF C5.json" @@ -2610,28 +2586,28 @@ "sub_path": "filament/Flashforge PETG-CF @FF C5P.json" }, { - "name": "Flashforge PLA Matte @FF C5", - "sub_path": "filament/Flashforge PLA Matte @FF C5.json" + "name": "Flashforge PLA Matte @FF C5", + "sub_path": "filament/Flashforge PLA Matte @FF C5.json" }, { - "name": "Flashforge PLA Matte @FF C5P", - "sub_path": "filament/Flashforge PLA Matte @FF C5P.json" + "name": "Flashforge PLA Matte @FF C5P", + "sub_path": "filament/Flashforge PLA Matte @FF C5P.json" }, { - "name": "Flashforge PLA Metal @FF C5", - "sub_path": "filament/Flashforge PLA Metal @FF C5.json" + "name": "Flashforge PLA Metal @FF C5", + "sub_path": "filament/Flashforge PLA Metal @FF C5.json" }, { - "name": "Flashforge PLA Metal @FF C5P", - "sub_path": "filament/Flashforge PLA Metal @FF C5P.json" + "name": "Flashforge PLA Metal @FF C5P", + "sub_path": "filament/Flashforge PLA Metal @FF C5P.json" }, { - "name": "Flashforge PLA Pro @FF C5", - "sub_path": "filament/Flashforge PLA Pro @FF C5.json" + "name": "Flashforge PLA Pro @FF C5", + "sub_path": "filament/Flashforge PLA Pro @FF C5.json" }, { - "name": "Flashforge PLA Pro @FF C5P", - "sub_path": "filament/Flashforge PLA Pro @FF C5P.json" + "name": "Flashforge PLA Pro @FF C5P", + "sub_path": "filament/Flashforge PLA Pro @FF C5P.json" }, { "name": "Flashforge PLA Basic @FF C5", diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json index 836cd00898..93b640c5f2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "SuEfcE6AYK8N1FI4", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge ABS Basic @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json index 39cbd2de77..6245bcf02c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "gmkc6fRLMI73Iut8", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "cool_plate_temp": [ "0" 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 8ce05c7f1e..7ba9ffc527 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "fgEYZ1Mgyp1AvtwU", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 b3f51e2b63..d797114137 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "cIxbQMVdG5K85rJr", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 7457627179..82e08e3f49 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "9GXBeuCUrScJfmJB", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 0e39fc998e..5e5ce18eea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "ds0GgE1jssl4IbF3", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 4394ed643a..9ea370b14b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UTWbwTYuXYbBx3uw", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json index ec7afd1806..6be9c9ac5a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "CuckX5MsN69806ow", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "50" 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 136856bf4a..c38639dd89 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "NttDJCrfB01uwMDl", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 79ecbbdf9e..9709d11e22 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "hJd6dG6OdEffEFC7", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 dcc92a46c8..2f3d072baf 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8yFCuCnEuI3dUvQy", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 a824989281..a6badb7396 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "np4fP5kghRlczOTT", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 050606e773..c70351a9b1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "8o2maTFOXq0XR6Dm", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json index dea33f9ccb..ebacfbe35c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "MBo02hFXn0ebDRdb", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "50" 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 6055001320..d6be224ddc 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "vCsjC0UnKenzIR0O", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 c4295d0a31..9ff2f3f54a 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "xhxVdlmh5r7meoHo", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 30a2cdf399..d2c5c73541 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "6dlQN4Xhd6kGZ0Qn", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 ea68716e21..c4b58df04c 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "r8WVFPozL8f5oLVJ", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 95bc121e93..ebf003f20d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "xw0pZNmhw1K4tPQ1", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 b4b539a756..8be3cb0913 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "m6QLC2UaS3fW298i", - "filament_id": "OFShw1X8", + "filament_id": "OFibWuBd", + "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 95fab6bbc4..398f80f8a5 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Nx3Px0Zu356IKShT", - "filament_id": "OFi7Bf0F", + "filament_id": "OFYTIMbj", + "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 92ed5ff1cc..3fd0dc97ea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "d4EGsmMeEDCOUBF2", - "filament_id": "OFi7Bf0F", + "filament_id": "OFYTIMbj", + "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 4e5016999f..043e0ea208 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "9ziPFKsjESbw1pXL", - "filament_id": "OFi7Bf0F", + "filament_id": "OFYTIMbj", + "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 dceedb6fc5..77148bf480 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-CF @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "NzJJs6yrSik5xuyX", - "filament_id": "OFi7Bf0F", + "filament_id": "OFYTIMbj", + "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 dd285b07f6..8cb591fa47 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UinlbuXNbad2kN0s", - "filament_id": "OFH5UH6P", + "filament_id": "OFojbdhR", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 0244b1fa25..3fefbd7a96 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ABS-GF @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "ycgiXY41kqNgslE3", - "filament_id": "OFH5UH6P", + "filament_id": "OFojbdhR", + "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 1fe1013580..f7d1332ec2 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 @@ -3,7 +3,10 @@ "name": "Flashforge ASA @FF AD5M 0.25 Nozzle", "inherits": "Generic ASA @Flashforge", "from": "system", - "filament_id": "OFtTYl9Q", + "filament_id": "OFJS560n", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "false", "compatible_printers": [ "Flashforge Adventurer 5M 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 665b49d497..0f99d476fc 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 @@ -4,7 +4,10 @@ "inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "kjS4k8nrIdNNNoWw", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 42c9955886..9a3aac8573 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 @@ -4,7 +4,10 @@ "inherits": "Flashforge ASA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "Y647IFVkk5JIXzte", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 4cd916c615..7a199389af 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "vaOyXUcrJ97KE7ZW", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 c98dc7b59f..3c2e7173bf 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "iLWq5pJ3ox9EAM1Z", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 8b80a1d1c3..68f66a1f6b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "i7PUPYxy0Z9weyyA", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 48e7c83322..5aec1c1d8b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "UUSDyOetXSOuBIUd", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 886c3cf0c1..18ae2c78f1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "2r0kwhklE24Hp94O", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json index 52420cb125..051b069550 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "XWta5jJFsCxBdEPd", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "50" 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 012911ba4a..66ae12c06c 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "w8O6oenp0NymzCqf", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 dc42f97981..166d3a01ab 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "thhmWRzNYLYJOeR2", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 9cccf05b75..54e47a5e64 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "g5jiz6Q6or23BIo7", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 2b405b1fb6..01db10d49d 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "7xmWlHHNMvXBKdYS", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 ae0e3d9222..9cdc87b1e5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "r0B8KfZ1mNWMvGqE", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_chamber_temp_control": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json index 7a8035000c..f989622957 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge ABS @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "quOwRRLcNfOy0sYf", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "50" 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 01a5604125..d8801abca8 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "CBLZqLhkwf5XKO12", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 48e7d01b94..1cc08eabb3 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Df3anJxiRXLVO9hw", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 6c8441ee9f..30787c9de1 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Nu4WvBWuEhazZfh5", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 e30b784bfb..5b73e31a49 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "hF0h4ye3hMDtEba1", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 ce18c5a69f..05223314f5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge", "from": "system", "setting_id": "3isZCWr4CBjFtGDX", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "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 613efc2502..2500eacd3f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic.json @@ -4,7 +4,10 @@ "inherits": "Generic ASA @Flashforge", "from": "system", "setting_id": "SU6r879TbQMUFCij", - "filament_id": "OFaBwRvT", + "filament_id": "OFFFg2Pf", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge ASA Basic" 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 e1bb924d28..de98bbdf41 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "941E5MaAyFY3iv4V", - "filament_id": "OFWnSvGu", + "filament_id": "OFrZDhVt", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 0f1d63ca96..0bff2a9e2c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge ASA-GF @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @System", "from": "system", "setting_id": "RdmsxyUGUX8Ot4oj", - "filament_id": "OFWnSvGu", + "filament_id": "OFrZDhVt", + "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 798fbc6583..608d143031 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic HIPS @System", "from": "system", "setting_id": "ckwc7U0Q2eKHmCxY", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json index 4abf262f2f..14a3d39616 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic HIPS @System", "from": "system", "setting_id": "AEQYrT7e4Q5J2G6C", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 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 ae01f84a4b..bb2f4387b9 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "jUNUZhE0BJyB64fC", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 6658adabab..597e24ade7 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "0qMEqo9YMDLSVafs", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 4e2fd50066..5b17792267 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "ek749gIdUAPq6WxT", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 ed9d2cb9e4..b79fa3d0d2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4 HF.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "tEohTtyHofD6l6o3", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 10127abb22..96b5849040 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "oLeLrIjFJzoZha3E", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 f050371f1f..cb385fd395 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "HXGUlYY4X5IHhL3R", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 02d5c02b8c..a32508d8b0 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "g22Cv3zy3h5BhJYK", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 a99c168faf..b2958e0032 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "aDzBXuvN7IuSP5sa", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 436a4cba60..bbbaebe8b8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P HF.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "CIj24REX7BA8zPHQ", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "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 3b2a22ccbf..bc52c94e5b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HIPS @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "yAGyGjF6uDrjfjLn", - "filament_id": "OFaz8VoR", + "filament_id": "OFvaLVML", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json index 5f34ca9901..b9eb0a335b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "1NFhtEvvvgZiHcto", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge HS PETG @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json index a6229f92d8..fb96e1e846 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "eNOkWn5PT8rDpA0g", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "cool_plate_temp": [ "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 081ede7bc4..c1dd59623c 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "vOqAGzaYLz0XdRvC", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 8ea4960a88..21198590ac 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "KSuxZ3fpQz0khDSz", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 577b175cbe..23703621f3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "o4B1kAToVny7jw0M", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "cool_plate_temp": [ "0" 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 3e26d15964..a48606e3c0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG HF @System", "from": "system", "setting_id": "kpRved5M3NktqIYn", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 4cab6d97ae..9ceca02a50 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG HF @System", "from": "system", "setting_id": "ypxgjHl9uIMyZIce", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json index 21e54e38b4..5b64fa0f61 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "uXGuyvVxfdQW22vu", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "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 30ccd1a277..28565a5c3b 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "q9UbakUmZPzG3xU0", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 6e2c0ca19c..592b3fe094 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "IL18Lu0qHx1RVqKD", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 33696f6366..e4b953f089 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "2FQib7fZjcwfCnm2", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 2b3722dd0c..955235b442 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "CtwOm90WWD4S7U6j", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 83ebdfa2b1..5a47b94941 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "kvULpm0WhKiSPj8V", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json index b161612d91..9875a638ff 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "bFVYSPkynBBapFjq", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "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 cf4731f584..26df92ae7b 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "CUU7knzm4cbe1giE", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 78a554fec2..b936141d13 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "gcYvL572cumWZdnl", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 b00acd32da..f53c9c41e3 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "cx99AH0C575XxAj9", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 613a806f5a..82a8dc096a 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "RrrKoR7MVD8IFQlq", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 aa7bf4a40f..ff09b6e445 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "7VEPGuR16wNukAX2", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 8908833f96..3ee8ed9e42 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "H9uwlPw6m6Nf7qH5", - "filament_id": "OF5w29Kq", + "filament_id": "OFDxxTpW", + "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 d8dfd92fc6..d511cdafe6 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 @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "OmDped3weZ4uHAtY", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json index 12e9fe913f..c7060c9f4e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "bfPaqPGaR5zpTsLk", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 1f37c091d2..082b03f19b 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "oD592bif4ra0ADco", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 a8cf1c5bdc..6571d871b4 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "ldhMY6F7v6nK8wwf", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 ada09e1c19..a5b788402d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "5vzOmbjHbkJXrgYM", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 0d5e671f95..85c0b17327 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xSJk7LFpYKmckPQh", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 9aa4efc2e4..667e4045b9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xdFZUsj1cNLXdvT6", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json index 43f1bbf068..15551e3faa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "JCQtuv8Abfz4jVRV", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 42f009212d..ba4f6bc6d9 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "hzxRPyH1fqarsMuN", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 fcb55d2400..4e69e17253 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "oJsLlIIpxwGSoJTv", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 80c9e422d0..ad8f07ef26 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "hJbNZ381ERkZ0KUB", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 5072e86227..f202e50f11 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "BqavrNpwhXDXcZ3r", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 25a9130d9d..7472f78b02 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "cgf4Qk4iHZh7zHN5", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json index 8e228a364e..3d97511a29 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "jFUS6233aq4XPgrn", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 a1e58886d3..2bc30165fc 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "p31K69Srld6o4sQ2", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 7217ec8854..b5308a0f8c 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "MwbYvnRIzlNmH81h", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 fcf7f8a8c7..2c2ee97348 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "rKhHmkqXYD2xN4K9", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 c6d61c696b..88184f5a92 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "Dshsi3O7NvYYjXJt", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 a7fb05e8d6..cd59be156d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "mfnL6QEevCmTmOL0", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 117fe724a9..3281932fe8 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "AGLHrHKWye0YTtNK", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "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 806f9e4ed7..f5de82a8bb 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "px8qzmB2yFLoNl83", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "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 fecd582701..da6fd90d98 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "mwuIEsBz5bXEV68w", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "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 4ae6a84762..bb2d6256b6 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "TielygFT88owWg4J", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "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 f391f26c3a..149406f025 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "It2NI6OFhNEUvulz", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "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 a554fc2a59..d06a93931d 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 @@ -2,9 +2,13 @@ "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", "from": "system", "setting_id": "Qt3huWxoYpMEqEN6", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "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 f32d4697c0..6fb09f1458 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Y3XuavnnOMoHLGHA", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "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 7eddf0b7b5..13d1358b71 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 @@ -2,9 +2,13 @@ "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", "from": "system", "setting_id": "2HUxAWeolJIlxPs1", - "filament_id": "OFmQkb3c", + "filament_id": "OF8O09RG", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json index 120d8b317e..8002ac7ba9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "vdaZBnDsmUC1fhDp", - "filament_id": "OFnMv3W5", + "filament_id": "OFIK2H3G", + "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 af9159b1b6..f5d60553e6 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "u7rolQaTQz9U6veH", - "filament_id": "OFgf4gZa", + "filament_id": "OFEvEfw5", + "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 14e5f098ab..8b10616a83 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4 HF.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "qTGTwiliWj3dSo9y", - "filament_id": "OFgf4gZa", + "filament_id": "OFEvEfw5", + "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 2f7836790f..ec1ded13ea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "wAkuJRTLWxGyBU0b", - "filament_id": "OFgf4gZa", + "filament_id": "OFEvEfw5", + "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 dd3a5801f6..bc05757132 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "dbs29hQSQl9zuWis", - "filament_id": "OFgf4gZa", + "filament_id": "OFEvEfw5", + "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 dbbb88d9ee..1e5eb664ec 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P HF.json @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "XGNPvS2ps7Xn2fpx", - "filament_id": "OFgf4gZa", + "filament_id": "OFEvEfw5", + "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 6d34858446..21ee8da2a6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "h33iEGZ7wPeBYKYQ", - "filament_id": "OFgf4gZa", + "filament_id": "OFEvEfw5", + "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 687017cdba..2b4f6fc95a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "e58C9MdOWikIbbVR", - "filament_id": "OFuGRMNV", + "filament_id": "OFGxuI0n", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 4159a24737..b75438e584 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PA-CF @System", "from": "system", "setting_id": "RX2Tg8KpwQpCbkLI", - "filament_id": "OFuGRMNV", + "filament_id": "OFGxuI0n", + "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 d0589f6b1a..3379bd5c39 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "C4DfYuQgDXIgK7mk", - "filament_id": "OFuGRMNV", + "filament_id": "OFGxuI0n", + "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 6225424dc7..07653a9002 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PA-CF @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "Yu7hL4izNsgDVqMT", - "filament_id": "OFuGRMNV", + "filament_id": "OFGxuI0n", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json deleted file mode 100644 index 0491362ddf..0000000000 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "type": "filament", - "name": "Flashforge PAHT-CF @FF C5", - "inherits": "Generic PA-CF @System", - "from": "system", - "setting_id": "8ZR8o3MKYxXLd70k", - "filament_id": "OFuFqYyG", - "instantiation": "true", - "compatible_printers": [ - "Flashforge Creator 5 0.4 nozzle", - "Flashforge Creator 5 0.6 nozzle", - "Flashforge Creator 5 0.8 nozzle" - ], - "complete_print_exhaust_fan_speed": [ - "40" - ], - "during_print_exhaust_fan_speed": [ - "40" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "80" - ], - "eng_plate_temp_initial_layer": [ - "80" - ], - "fan_cooling_layer_time": [ - "5" - ], - "fan_max_speed": [ - "40" - ], - "fan_min_speed": [ - "10" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "7" - ], - "filament_settings_id": [ - "Flashforge PAHT-CF @FF C5" - ], - "filament_start_gcode": [ - "; filament start gcode" - ], - "filament_type": [ - "PAHT-CF" - ], - "hot_plate_temp": [ - "80" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "nozzle_temperature": [ - "310" - ], - "nozzle_temperature_initial_layer": [ - "310" - ], - "nozzle_temperature_range_high": [ - "320" - ], - "nozzle_temperature_range_low": [ - "300" - ], - "textured_cool_plate_temp": [ - "0" - ], - "textured_cool_plate_temp_initial_layer": [ - "0" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ] -} diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json deleted file mode 100644 index 1c142f11b5..0000000000 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF C5P.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "filament", - "name": "Flashforge PAHT-CF @FF C5P", - "inherits": "Generic PA-CF @System", - "from": "system", - "setting_id": "FSfGFl7FCutxXN2l", - "filament_id": "OFuFqYyG", - "instantiation": "true", - "activate_chamber_temp_control": [ - "1" - ], - "chamber_temperature": [ - "60" - ], - "compatible_printers": [ - "Flashforge Creator 5 Pro 0.4 nozzle", - "Flashforge Creator 5 Pro 0.6 nozzle", - "Flashforge Creator 5 Pro 0.8 nozzle" - ], - "complete_print_exhaust_fan_speed": [ - "40" - ], - "during_print_exhaust_fan_speed": [ - "40" - ], - "enable_pressure_advance": [ - "1" - ], - "eng_plate_temp": [ - "80" - ], - "eng_plate_temp_initial_layer": [ - "80" - ], - "fan_cooling_layer_time": [ - "5" - ], - "fan_max_speed": [ - "40" - ], - "fan_min_speed": [ - "10" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "7" - ], - "filament_settings_id": [ - "Flashforge PAHT-CF @FF C5P" - ], - "filament_start_gcode": [ - "; filament start gcode" - ], - "filament_type": [ - "PAHT-CF" - ], - "hot_plate_temp": [ - "80" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "nozzle_temperature": [ - "310" - ], - "nozzle_temperature_initial_layer": [ - "310" - ], - "nozzle_temperature_range_high": [ - "320" - ], - "nozzle_temperature_range_low": [ - "300" - ], - "textured_cool_plate_temp": [ - "0" - ], - "textured_cool_plate_temp_initial_layer": [ - "0" - ], - "textured_plate_temp": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ] -} diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json deleted file mode 100644 index 19abc27d75..0000000000 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "type": "filament", - "name": "Flashforge PAHT-CF @FF G4", - "inherits": "Generic PLA-CF10 @Flashforge", - "from": "system", - "setting_id": "ZlpBAM9uaS01sWAJ", - "filament_id": "OFuFqYyG", - "instantiation": "true", - "activate_chamber_temp_control": [ - "1" - ], - "additional_cooling_fan_speed": [ - "0" - ], - "chamber_temperature": [ - "60" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "complete_print_exhaust_fan_speed": [ - "50" - ], - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "40" - ], - "eng_plate_temp": [ - "100" - ], - "eng_plate_temp_initial_layer": [ - "100" - ], - "fan_cooling_layer_time": [ - "5" - ], - "fan_max_speed": [ - "60" - ], - "fan_min_speed": [ - "30" - ], - "filament_density": [ - "1.06" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "filament_settings_id": [ - "Flashforge PAHT-CF @FF G4" - ], - "filament_start_gcode": [ - "; filament start gcode\n;right_extruder_material:PA-CF\n" - ], - "filament_type": [ - "PAHT-CF" - ], - "compatible_printers": [ - "Flashforge Guider4 0.4 nozzle" - ], - "hot_plate_temp": [ - "100" - ], - "hot_plate_temp_initial_layer": [ - "100" - ], - "nozzle_temperature": [ - "290" - ], - "nozzle_temperature_initial_layer": [ - "290" - ], - "nozzle_temperature_range_high": [ - "300" - ], - "nozzle_temperature_range_low": [ - "260" - ], - "overhang_fan_speed": [ - "60" - ], - "pressure_advance": [ - "0.02" - ], - "slow_down_layer_time": [ - "2" - ], - "support_material_interface_fan_speed": [ - "60" - ], - "temperature_vitrification": [ - "180" - ], - "textured_plate_temp": [ - "100" - ], - "textured_plate_temp_initial_layer": [ - "100" - ] -} diff --git a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json deleted file mode 100644 index dff2e68ddd..0000000000 --- a/resources/profiles/Flashforge/filament/Flashforge PAHT-CF @FF G4P.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "type": "filament", - "name": "Flashforge PAHT-CF @FF G4P", - "inherits": "Generic PLA-CF10 @Flashforge", - "from": "system", - "setting_id": "9DaSYBA2OI7Jj5zS", - "filament_id": "OFuFqYyG", - "instantiation": "true", - "activate_chamber_temp_control": [ - "1" - ], - "additional_cooling_fan_speed": [ - "0" - ], - "chamber_temperature": [ - "60" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "complete_print_exhaust_fan_speed": [ - "50" - ], - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "during_print_exhaust_fan_speed": [ - "40" - ], - "eng_plate_temp": [ - "100" - ], - "eng_plate_temp_initial_layer": [ - "100" - ], - "fan_cooling_layer_time": [ - "5" - ], - "fan_max_speed": [ - "60" - ], - "fan_min_speed": [ - "30" - ], - "filament_density": [ - "1.06" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "filament_settings_id": [ - "Flashforge PAHT-CF @FF G4P" - ], - "filament_start_gcode": [ - "; filament start gcode\n;right_extruder_material:PA-CF\n" - ], - "filament_type": [ - "PAHT-CF" - ], - "compatible_printers": [ - "Flashforge Guider4 Pro 0.4 nozzle" - ], - "hot_plate_temp": [ - "100" - ], - "hot_plate_temp_initial_layer": [ - "100" - ], - "nozzle_temperature": [ - "290" - ], - "nozzle_temperature_initial_layer": [ - "290" - ], - "nozzle_temperature_range_high": [ - "300" - ], - "nozzle_temperature_range_low": [ - "260" - ], - "overhang_fan_speed": [ - "60" - ], - "pressure_advance": [ - "0.02" - ], - "slow_down_layer_time": [ - "2" - ], - "support_material_interface_fan_speed": [ - "60" - ], - "temperature_vitrification": [ - "180" - ], - "textured_plate_temp": [ - "100" - ], - "textured_plate_temp_initial_layer": [ - "100" - ] -} 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 HF nozzle.json index bd7ef806a7..e88cbb31c3 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PC @FF G4 0.6 HF nozzle", + "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", "from": "system", - "setting_id": "M9HM8tihJzV4crs8", - "filament_id": "OFe6sfXS", + "setting_id": "Tj504IYSj6mUDR6E", + "filament_id": "OFWXCbVF", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "3" @@ -43,7 +44,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PC @FF G4 0.6 HF nozzle" + "Flashforge PC @FF G4 0.6 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PC" 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.6 nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.6 nozzle.json index 1bbc7d1e11..6b1decef09 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PC @FF G4 0.6 nozzle", + "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", "from": "system", - "setting_id": "08VjBSha6gjhJYgk", - "filament_id": "OFe6sfXS", + "setting_id": "VfhBf8676qCWatKP", + "filament_id": "OFWXCbVF", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "3" @@ -43,7 +44,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PC @FF G4 0.6 nozzle" + "Flashforge PC @FF G4 0.6 nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PC" 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4 0.8 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4 0.8 HF nozzle.json index 9e7ebbdc89..e1740fb30d 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PC @FF G4 0.8 HF nozzle", + "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", "from": "system", - "setting_id": "JqgkmxnjlnQ3uw1u", - "filament_id": "OFe6sfXS", + "setting_id": "ILBm9zXX5U4Oh82h", + "filament_id": "OFWXCbVF", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "3" @@ -43,7 +44,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PC @FF G4 0.8 HF nozzle" + "Flashforge PC @FF G4 0.8 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PC" 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 HF nozzle.json index 5e6b9ca06c..11ec475184 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PC @FF G4P 0.6 HF nozzle", + "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", "from": "system", - "setting_id": "vvLLPvSeb5PYbT1R", - "filament_id": "OFe6sfXS", + "setting_id": "Kj6KWBfSuFALX2sd", + "filament_id": "OFWXCbVF", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "3" @@ -43,7 +44,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PC @FF G4P 0.6 HF nozzle" + "Flashforge PC @FF G4P 0.6 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PC" 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.6 nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.6 nozzle.json index 74fb0b79e2..38ca36a685 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PC @FF G4P 0.6 nozzle", + "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", "from": "system", - "setting_id": "mPJMPfFCyfWdKzMO", - "filament_id": "OFe6sfXS", + "setting_id": "XjAM4PMXLCBwdgQf", + "filament_id": "OFWXCbVF", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "3" @@ -43,7 +44,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PC @FF G4P 0.6 nozzle" + "Flashforge PC @FF G4P 0.6 nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PC" 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PC @FF G4P 0.8 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PC @FF G4P 0.8 HF nozzle.json index 81ee3e9c95..dfdda7bfe2 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PC @FF G4P 0.8 HF nozzle", + "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", "from": "system", - "setting_id": "HTgqTUTznOlfCRAd", - "filament_id": "OFe6sfXS", + "setting_id": "icAIkgRCZAjz6apM", + "filament_id": "OFWXCbVF", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "3" @@ -43,7 +44,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PC @FF G4P 0.8 HF nozzle" + "Flashforge PC @FF G4P 0.8 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PC" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json index 6ea60b3214..5dc78f3cdb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "xOZQvdZa1YCcnjor", - "filament_id": "OFEMfQsX", + "filament_id": "OFYYeMyQ", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PETG Basic @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json index 0d325d1c1a..3d5c4f4b0c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "YLLJ4xZI704GReej", - "filament_id": "OFEMfQsX", + "filament_id": "OFYYeMyQ", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "additional_cooling_fan_speed": [ "60" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json index a351fd284a..614ac50225 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "8EUg1hTLfsyDPbnG", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PETG Pro @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json index 153daf20e9..0ab5b18b04 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "UKhV8A2DBc1xyNWc", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "2" 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 d685b38547..e15f011f1f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "dFZ1MmHjj1AAIaMm", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 1a279d0591..a3d431030f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "Ro3rt7IAJrA5aZD6", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 4f839ae1b5..7cc361d89d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "cTxrnqzr2wVt4Nj7", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 bbf62043f7..0a1b47b916 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "QA1KD03F0zj2zsVi", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 fae56d5e11..69cb6ee5e8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "EU8Q0XLjED23MNer", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json index a22994d00b..fcb6cbcaad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "XFSgx95whLw5FD08", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "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 5c41866971..746eb1cc61 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8x6yU2U8d5f67N73", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 df04115fd9..ecafe03349 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4W0nfaSSZdg2HQkh", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 00878236df..94b757887a 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "AJcugKx4qHPJ3JAT", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 b73e951307..d1c404cd19 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "R0nZuLXEo5qA6Mt8", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 ccb1dd2f50..8c1de1d947 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "Ql2BBBymzqEG7GKk", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json index 295b0a313e..387adc60c7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "8Jc4eedkknqNB87s", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "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 c4f944cfc2..60bb0ae243 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "KU5tDHAKja1sCoHm", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 93664c46e2..24ed205273 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "sb6jD3UZmb0DNIsC", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 da54d45f51..d993d05592 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4BB1wJLtsXus5eyY", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 b2f8087db9..1385ac8454 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "m7oJx47UMlFctMkX", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 be118c9e69..1bd2c4cdbf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "ozD2wU5UiORTtJsa", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "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 00fffab83a..df9948d863 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "IQfUoy7gTmVmBDL5", - "filament_id": "OFPQfNAf", + "filament_id": "OFXiArjA", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "additional_cooling_fan_speed": [ "60" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json index b43b82c176..b1352eecc1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "W59yTyPnVv4LYiah", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PETG Transparent @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json index 54596db508..697cd7b714 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "NRY4fsPNtnqs0kyH", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "2" 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 fdc9c427d3..2d29ad79b5 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "Ht7wzk8l0b1kv5tZ", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 bbe03ece1f..f1b7a3b4ab 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "NJFHpa5HFHIyHSWu", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 4e0de85100..252e51750d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "UaObrRNSTwitC6jr", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "close_fan_the_first_x_layers": [ "2" 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 08e0076cb0..ed8c6fd0bb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "TtXy042wtT6nF3WB", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 4d40f2fbcb..b6395b0325 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @System", "from": "system", "setting_id": "66OWHhGyuaFISu6v", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json index 60bc613ad6..3f0f32fc0a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "p5c6XJ1VD8cn2Meh", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "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 5c9ccb693f..2ab27e8567 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "K8WkJmFy2V1zhYQO", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 7676d966b1..b3c10e9970 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "LLK1hwKZhDU8SaGJ", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 63c046558f..8c29f5a466 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "LaUF2HJtBnpZF7Cd", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 6adfb18f16..2736fea042 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "OUToXk8ddS1RPPUK", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 c8e5141713..d907e48ab5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "ywff8rI39XKjcocY", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json index 347a845f06..61db117e30 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PETG @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "C0VV5Uzsl4icRgKa", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "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 4ede8cb506..0dfa3dfee2 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "kuCvwo6Phr6Ywhm4", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 74d4250de0..91c49b1c85 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Z2E69w9AevYg15tl", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 d345b35e9f..0ac80ad83a 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "RkQaxwTjhJK0A3zr", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 3d6abe6ff3..bc6fbecdb4 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "YBQTMes2S9iJjKDf", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 bf76cf5bfa..0213d9e14b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "lCngVWG3q0FWsnrG", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 450c5f33d7..7502aa35b6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "3Gv6MJ3RRja5pbOM", - "filament_id": "OFMyLYV8", + "filament_id": "OFwjMiKL", + "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 d746b5348d..a516f371a2 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "bcqYod61blJRzhK2", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "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 1b5c706120..7a51f2615a 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "CnFKOi7fFyS8QlKK", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "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 0fbd657de5..e401baa389 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "eKWJW36I5fVHwjWD", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "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 16c5cce80d..52901dd534 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "RXRERfs2oQKewpPS", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 0.4 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 2be54257d3..dda9226bcd 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF @System", "from": "system", "setting_id": "8Ns75F5n2fdQ8sDk", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "compatible_printers": [ "Flashforge Creator 5 Pro 0.4 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 c0145120d7..71c68991d0 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4EgMPzlVo1rTeQ1e", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "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 fb095064f7..b0b2ec7360 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "K9ME1F4oJkPi8jRu", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "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 76d459de35..668e1af37a 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "9jCp0gTjB3Mt95Mj", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "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 14be746810..a0200ebe49 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge", "from": "system", "setting_id": "d5OleuNNZBJK9vxH", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "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 c92b4aa162..57b297768c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF.json @@ -4,7 +4,10 @@ "inherits": "Generic PETG-CF10 @Flashforge", "from": "system", "setting_id": "MpG61mwVUtJ7t602", - "filament_id": "OFBK6zAi", + "filament_id": "OFuFEtKX", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge PETG-CF" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json index 65741b1860..9a4844d6ea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "3fuVuyVcn8U0bRJQ", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Basic @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json index 64d564cfca..1a56e9f162 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "FrRRUl5OT773uCju", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 6248751055..7c929b1363 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "gMmhMDqjmJfAYcbV", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 d9041d25b7..7f66423bbe 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "0OsrtqfIxrEJMwac", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 110048dba4..f698b05b32 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "fuzWVrfZqekMETLK", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 8963823c97..6893946556 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "FmUnckQofjunAtwr", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 6fc821a49a..9a7c7080a0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "Q0RsVOPLuMByur9c", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json index 6969ef6263..bd42e42f74 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "QXJgY8OPyaoYUI1D", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 d0b03d8959..4ed8203529 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "R54l7TcwsjdPHvNB", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 a898615cfc..731b59748d 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "MELEwYupDkT2DPxL", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 8a98aa4445..24eb70b646 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "uGLvOoPAfksLO43M", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 c9cb6c8711..b9ab2a97ec 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "gGpKvk3rnLuTjOwo", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 94fee218f2..2d81ff10df 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "Yopqnj4b5ZVwigGx", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json index dcbfee57e3..eedd218625 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "GrwiA2dArUGV9x2g", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 0714764c1c..9c6d20e0e0 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "QEfQrqMwApuSMqih", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 afa79d4382..1285b05257 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "BAPIn3eJAPGpscRJ", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 1b7bd7a1dc..784f6dfd17 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "44BmRNRb6vlPq8qe", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 8f77560323..4fdcf94869 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "ltJbhoAeAec9gxrS", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 6cf9a832ff..57305d4cc5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "GxdZiXdqns72ibQl", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "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 8582b545c9..12a8f6cd79 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "5XKGaHUjxHECbnHO", - "filament_id": "OFIxitiU", + "filament_id": "OFJ3F2jm", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Basic" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json deleted file mode 100644 index 2728623e2e..0000000000 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4 0.8 nozzle.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "type": "filament", - "name": "Flashforge PLA Buint Ti @FF G4 0.8 nozzle", - "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", - "from": "system", - "setting_id": "H8IStdO8zEfSLYVE", - "filament_id": "OFQZeyZv", - "instantiation": "true", - "activate_air_filtration": [ - "1" - ], - "additional_cooling_fan_speed": [ - "40" - ], - "complete_print_exhaust_fan_speed": [ - "40" - ], - "cool_plate_temp": [ - "40" - ], - "cool_plate_temp_initial_layer": [ - "40" - ], - "during_print_exhaust_fan_speed": [ - "40" - ], - "eng_plate_temp": [ - "50" - ], - "eng_plate_temp_initial_layer": [ - "50" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "30" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_settings_id": [ - "Flashforge PLA Buint Ti @FF G4 0.8 nozzle" - ], - "filament_start_gcode": [ - "; filament start gcode\n;right_extruder_material:PLA\n\n" - ], - "compatible_printers": [ - "Flashforge Guider4 0.8 HF nozzle" - ], - "hot_plate_temp": [ - "50" - ], - "hot_plate_temp_initial_layer": [ - "50" - ], - "nozzle_temperature": [ - "200" - ], - "nozzle_temperature_initial_layer": [ - "205" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "overhang_fan_threshold": [ - "25%" - ], - "pressure_advance": [ - "0.025" - ], - "slow_down_layer_time": [ - "9" - ], - "slow_down_min_speed": [ - "20" - ], - "temperature_vitrification": [ - "45" - ], - "textured_plate_temp": [ - "50" - ], - "textured_plate_temp_initial_layer": [ - "50" - ] -} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json deleted file mode 100644 index 538d1415f1..0000000000 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "type": "filament", - "name": "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle", - "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", - "from": "system", - "setting_id": "4wlkoKnU2bA7xhYO", - "filament_id": "OFQZeyZv", - "instantiation": "true", - "activate_air_filtration": [ - "1" - ], - "additional_cooling_fan_speed": [ - "40" - ], - "complete_print_exhaust_fan_speed": [ - "40" - ], - "cool_plate_temp": [ - "40" - ], - "cool_plate_temp_initial_layer": [ - "40" - ], - "during_print_exhaust_fan_speed": [ - "40" - ], - "eng_plate_temp": [ - "50" - ], - "eng_plate_temp_initial_layer": [ - "50" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_max_volumetric_speed": [ - "30" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_settings_id": [ - "Flashforge PLA Buint Ti @FF G4P 0.8 nozzle" - ], - "filament_start_gcode": [ - "; filament start gcode\n;right_extruder_material:PLA\n\n" - ], - "compatible_printers": [ - "Flashforge Guider4 Pro 0.8 HF nozzle" - ], - "hot_plate_temp": [ - "50" - ], - "hot_plate_temp_initial_layer": [ - "50" - ], - "nozzle_temperature": [ - "200" - ], - "nozzle_temperature_initial_layer": [ - "205" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "overhang_fan_threshold": [ - "25%" - ], - "pressure_advance": [ - "0.025" - ], - "slow_down_layer_time": [ - "9" - ], - "slow_down_min_speed": [ - "20" - ], - "temperature_vitrification": [ - "45" - ], - "textured_plate_temp": [ - "50" - ], - "textured_plate_temp_initial_layer": [ - "50" - ] -} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json index 6cf9156ada..6947f2afbf 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "KXy0WyQp06VC2ICh", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Color Change @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json index d5e1624903..9e644f1006 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "9cGw7tXD8YJHEi1H", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 45e7ed6a32..4f5eca6889 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "TF6BeOl0patjpPaa", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 ed65db080c..950effa7cd 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "nkYeEBo8NdkJulAP", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 70991dff2d..bf6dfb230f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "yEDfsOsogfZbNBVX", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 2fc09d1cc1..23bfa9be0c 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "xZmQdh487UMtvBRu", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 707eb4e042..6f5e1afb0e 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "rc00SOyIg30uE3Da", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json index 5a35f8d82f..a465a78ea6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "k1OiugasUs7baG1f", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 9c64cff73b..31a99ea10e 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "G2Et7kPHptMESzQ0", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 f57fbdc47d..07fe12f973 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "zsOdmFGBSF9UySMN", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 963bd8152d..3a778e5472 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "oxRMuvBMu9qdQWUQ", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 608ef77d24..8657a4010e 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "5hwNJvvLtb75XBBg", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 78d56a62a5..c185b26f3d 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 @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "mGj8VEyOnnogpkmF", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json index 2542e59765..0709fa3e08 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "HXVX4mDeUSfW2RgL", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 9070fa4762..9742b8aefc 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "JDcRA6apekWLXPvH", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 01b3800053..4d3681736e 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "b5GJpvKYktP4vZpj", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 78aa762193..6eb75a8f52 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "RjUpQV6iQxTircwj", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 0241ed5dba..26609fd995 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "9DEZ6SmFdgfluhsR", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 7d3aa644c0..e660d0f569 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 @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "girTMkusNTfY04rz", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "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 75e3bc1a3f..29f68b0f62 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "pCQ2qmeXUyJzP7kS", - "filament_id": "OFkwIWwc", + "filament_id": "OFMkAW6r", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Color Change" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json index aa9433b6a2..b0f7d6bf89 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "a1jTbQsflD7SDFih", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Galaxy @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json index 979f2a51fd..df9cc2d3e6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "zyCRsy0mHRgyuQqt", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 d48f2944b6..d66bf2b24c 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "y8TNaRebTrmFem10", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 17a2bd1120..65dffd3601 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "qju0AMvvq0B5Glny", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 06e76b0a60..1067b50067 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "o8gGBOEcNvlbZxGW", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 929002ffac..2ce8486cb0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "0RkkIcIUFgwOFTBY", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 487f05b211..373a81bcdc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "9qVabnSl8xfKSIYX", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json index 0d81c49ca3..e44bbe16e5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DL7lxDI35YErCTWX", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 aa3a164d86..efb7dad130 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "koEC7DteUoXHUd2z", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 0517355c72..64b442938c 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "D69fWcXioFcpoUjC", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 2982fcfe42..d20dc55d41 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "rfiQUncdSExEaK0U", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 ef995df080..346dfad0a0 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "WX8lK8efXIVcpjFf", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 a301208f82..3b999c0734 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "Tzvo3oILQJc4SQko", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json index 7491d8dc7c..b29877be60 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ZQYrljZtu3es26hB", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 9b00f47fc6..1b8e75eb32 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Y5gm20O4yCCDIoC0", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 c92d0c95c3..d39114697f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "80vSQxnHfd5ZUy5h", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 fc02069f65..185440fba4 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "UZi7T5VoasmXWyH5", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 c86fa47d2f..ec0581df11 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "6UlSb4fqHIMdMxkO", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 22b40f77bb..c1818186cb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "H2Cr4B5VUaxyYsN0", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "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 ffff2b3523..785e26ace5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "NJrc0UZ54Fq8MaqF", - "filament_id": "OF5NQFKI", + "filament_id": "OFJJ0Ar3", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Galaxy" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json index ec022f475c..5702843039 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "k8iibCO2EnlTSRyi", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Luminous @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json index a6bc399396..44a6f663ef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "pACct3L7duMh3hfx", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 5898b4c1c2..3e106a6eda 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "GdvXL8SrKrYHxSgZ", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 227d392df3..446137267f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "SLYD2YcQTQgbSjIF", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 0b7704be7b..d605b1e444 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "kOobFSlqEG9Qe0d1", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 bb19b242a7..5efeada6af 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "4sE1LTVVuRglRbpD", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 f370433f16..485a3b51a2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @System", "from": "system", "setting_id": "jEUZyaEIBf2eXXeh", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json index 9e865d710f..3019fb194c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "qZ6kKjRCMfe4Ql3F", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 1dd346734f..0b58399215 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "xPPSRmadqfqCtRF2", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 19db33c12b..792049300a 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "aWVXIk1xVa9URR1D", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 85732db257..a218752f68 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "KhBF7hHHVPzqiAca", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 4a47c2e41d..615e05d2e6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "sTplnj3gMAzwtLWE", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json index 3f409afcef..cc630d58ab 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "zJFUJKDJRYi1pRL7", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 aab7e584c9..65e6995584 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "vXPXOKD8vNJlujM1", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 01c99d30bd..7704d5f2b8 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "purqxjmWiflDrnik", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 e11842c15a..b9f94e604e 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "qraQ97uusigB63hv", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 049325af4d..5ce6582146 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "Z1NCX8XMyIVlOlWn", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "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 e8f02f10a0..46151a4496 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "s620OFLTgFT4Ds2A", - "filament_id": "OFMIma8C", + "filament_id": "OFdqkWtz", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Luminous" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json index d9c3ffe33a..30c0a43a1e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DcbISTLvKNMZRzKx", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Matte @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json index 790c30cef0..98964015a5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "4fwlIrzy6O2EsyBZ", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 9788577dc8..2774450e57 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "BVmVfNCuy8HDhcEI", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 b044ecd47f..f03dc70fd1 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "WRMePGzDGdEGiqNv", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 1cdea005e4..f009759cad 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "thnbuaLDDlGrkrdY", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 Matte @FF C5.json similarity index 82% rename from resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json rename to resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json index 5aa386d441..230a723624 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json @@ -1,10 +1,14 @@ { "type": "filament", - "name": "Flashforge PLA Pro @FF C5", + "name": "Flashforge PLA Matte @FF C5", "inherits": "Generic PLA @System", + "renamed_from": "Flashforge PLA Matte @FF C5;Flashforge PLA Matte FF C5", "from": "system", - "setting_id": "47Q7YXoJ7rD7Vu21", - "filament_id": "OF6ueBwd", + "setting_id": "ct3nO6w9j58gqDI0", + "filament_id": "OF6qAuyi", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "additional_cooling_fan_speed": [ "40" @@ -45,7 +49,7 @@ "18" ], "filament_settings_id": [ - "Flashforge PLA Pro @FF C5" + "Flashforge PLA Matte @FF C5" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json similarity index 80% rename from resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json rename to resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json index 657898f301..0d7543cc09 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5P.json @@ -1,10 +1,14 @@ { "type": "filament", - "name": "Flashforge PLA Matte @FF C5P", + "name": "Flashforge PLA Matte @FF C5P", "inherits": "Generic PLA @System", + "renamed_from": "Flashforge PLA Matte @FF C5P;Flashforge PLA Matte FF C5P", "from": "system", - "setting_id": "FpLoe6QrPXnrH019", - "filament_id": "OFH6Pjxe", + "setting_id": "Bn2BaG7f1tkvlyYI", + "filament_id": "OF6qAuyi", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" @@ -48,7 +52,7 @@ "18" ], "filament_settings_id": [ - "Flashforge PLA Matte @FF C5P" + "Flashforge PLA Matte @FF C5P" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json index 548d627fa2..4898587111 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "cnPwhLyBq6JL8gEA", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 28809dc1c0..2ff2a07363 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8b9q1FfVljPmKoEt", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 2a2ac35fa8..f49e19c292 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "o9dOrLgL6efF19O1", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 d3d9ac763a..98e44f21f4 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "QoRmDvhoeGi6Z2xv", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 2cc4d75091..7eda7a4b62 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "dHyuoORAUGLtlGkJ", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 bc2daed905..698511967d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "OgqVyIHfy3U8Dc6d", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json index 2716d0f9fa..c9a63d60cb 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "g1gnICJ3u6hpGazQ", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 fa2c6322ea..c868aa0137 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "feXpVbDM5ON5mwg0", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 8ae39f5623..fc205bb684 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "XMnZQ1AxXPJqpqRX", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 e8a01ae3e0..42dc4c9c15 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Ke0bRKPNKSsVMO1Y", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 55571d70e5..1d76131870 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "IRC2n4GaofxvvyTt", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 75b6007012..63d6f372e3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "RN4wdTL0qccM4huZ", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "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 60488f6338..781357b1a1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "ipMevDMORKqZYdvD", - "filament_id": "OF1bQyX2", + "filament_id": "OF6qAuyi", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_max_volumetric_speed": [ "22" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json index a788ef51f7..1adef03eef 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "vwwb5nfO63U1ErCn", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Metal @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json index b6a2c35983..e786ecd378 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ekq4MRPyzlYxRhbX", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 231e4cf895..27caf06739 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "uusF7Vz94HOwoQF0", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 92a867b768..4f01562a04 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "sHZWzrZO8PP0QYZR", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 22abaf206a..f85391cb2b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "bxwjEFI8HmNY8JI6", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 similarity index 81% rename from resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json rename to resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json index e41c16e0cb..d382637556 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5.json @@ -1,10 +1,14 @@ { "type": "filament", - "name": "Flashforge PLA Metal @FF C5", + "name": "Flashforge PLA Metal @FF C5", "inherits": "Generic PLA @System", + "renamed_from": "Flashforge PLA Metal @FF C5;Flashforge PLA Metal FF C5", "from": "system", - "setting_id": "YFbZ472BRNga6OpQ", - "filament_id": "OFrnkURQ", + "setting_id": "AdjRSTc9RZG6mJ1e", + "filament_id": "OFAebKg8", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "additional_cooling_fan_speed": [ "40" @@ -45,7 +49,7 @@ "18" ], "filament_settings_id": [ - "Flashforge PLA Metal @FF C5" + "Flashforge PLA Metal @FF C5" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json similarity index 80% rename from resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json rename to resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json index fb5ba4bbf6..965b6fe595 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF C5P.json @@ -1,10 +1,14 @@ { "type": "filament", - "name": "Flashforge PLA Metal @FF C5P", + "name": "Flashforge PLA Metal @FF C5P", "inherits": "Generic PLA @System", + "renamed_from": "Flashforge PLA Metal @FF C5P;Flashforge PLA Metal FF C5P", "from": "system", - "setting_id": "AtVxriSKOrFZzUun", - "filament_id": "OFrnkURQ", + "setting_id": "k0AQO2dGbk0qvxzO", + "filament_id": "OFAebKg8", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" @@ -48,7 +52,7 @@ "18" ], "filament_settings_id": [ - "Flashforge PLA Metal @FF C5P" + "Flashforge PLA Metal @FF C5P" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json index 5f0dc7ac33..bf884cf46e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "VvMaIJwFk4Q6KX4p", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 682889ba46..8fcf56e6b6 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "5xqdqoj2l50FegPF", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 da2e664b20..352adaa681 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "R79SbWA9i2OAu2ee", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 56b51fbb39..8d78236629 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "zjIN4KzIOwI1VwOc", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 aa615d6c52..aaabcaac60 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "UxMNNil2KnWvAJ4q", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 18240ff4ab..b1035a4629 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "57i6iKrVYUS5UiBT", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json index 712410e542..d7697ccb8e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "vVKalJViJuBvlHkK", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 a8eea524f7..bf06971c23 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "IYPw8a9tkpuf95uH", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 eebeaeb9d4..7d85d6e56f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "I0bULoVAbtVfQoCy", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 48206bc4e6..9c6e1b92b0 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "DbPo3ay2e4a002AB", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 8d50a6ad0a..a79ce03a5b 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "uztv4hhm2O3T93zZ", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 cd239560be..82bf12c247 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "UFWWrhfgS7N36Y8W", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "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 368782f0fd..90d419bfa5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "UD5i0ijsirfieUvb", - "filament_id": "OFvVxvzZ", + "filament_id": "OFAebKg8", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Metal" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json index 15a01f350a..c956e6a5ec 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "DIMoIGOGedN17WbO", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Pro @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json index 9d4fb9f9a8..eda5f5745f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "SC5LJcecBaEG5by3", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 b25c6b56ab..d56ed06c1e 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "t9lPSFnwLDk0ARIp", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 d0a7d88e4f..423b8743a7 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "SBSlOEwZSvZHeX4r", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 f276a6e671..0ab1f650f2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "DbWTm2H71izMWmpx", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 Pro @FF C5.json similarity index 82% rename from resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json rename to resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json index 15b12ed8f9..e02f21dbd3 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5.json @@ -1,10 +1,14 @@ { "type": "filament", - "name": "Flashforge PLA Matte @FF C5", + "name": "Flashforge PLA Pro @FF C5", "inherits": "Generic PLA @System", + "renamed_from": "Flashforge PLA Pro @FF C5;Flashforge PLA Pro FF C5", "from": "system", - "setting_id": "UQF0kAaXnZgJGK4o", - "filament_id": "OFH6Pjxe", + "setting_id": "30eBjTZFg6vDZkc0", + "filament_id": "OFm4SivL", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "additional_cooling_fan_speed": [ "40" @@ -45,7 +49,7 @@ "18" ], "filament_settings_id": [ - "Flashforge PLA Matte @FF C5" + "Flashforge PLA Pro @FF C5" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json similarity index 81% rename from resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json rename to resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json index 025ddbf305..fedd74b2c5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF C5P.json @@ -1,10 +1,14 @@ { "type": "filament", - "name": "Flashforge PLA Pro @FF C5P", + "name": "Flashforge PLA Pro @FF C5P", "inherits": "Generic PLA @System", + "renamed_from": "Flashforge PLA Pro @FF C5P;Flashforge PLA Pro FF C5P", "from": "system", - "setting_id": "v7vYsiPVka4c1CUW", - "filament_id": "OF6ueBwd", + "setting_id": "xOvxorpWP37CQCfi", + "filament_id": "OFm4SivL", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" @@ -48,7 +52,7 @@ "18" ], "filament_settings_id": [ - "Flashforge PLA Pro @FF C5P" + "Flashforge PLA Pro @FF C5P" ], "filament_start_gcode": [ "; filament start gcode" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json index 174584294f..a2ea5e43ee 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ZENqqRqvEOeloAgs", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 e7b16bb162..f3dd8e04cf 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "YcXuvz3qYHtVoWxv", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 400fb84d2e..7dc8528606 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "prItyXNphhuPCAce", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 f044a481b4..57e815ab25 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "83zDmjaAgxxIt7KU", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 c40c210005..35bce9d866 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "px3O28Olb9LExqfT", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 71ad06d85a..b04f49d81b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "QYgsCCHP3Khqrzh3", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json index 6f675b36db..4e1e4c5ac7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "wV01bqvZ6MRaEibZ", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 aaab161802..07b82edf7f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "1ro9wHPYhuMHNiYe", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 20ee4d7163..433318fc86 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "4W4a7c9ugUVwvvmn", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 804c28cfe1..87031ba66b 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "CloRo3qxvzxHZuIP", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 b0f9655605..281a34a2c5 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "QgUbP07tIXmFysEb", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 50db881fc0..8d29d1823c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "6mvGOtkPZT6ROboo", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 2924f05d13..e70b87f9a9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "vI875WYbMyQeMwlh", - "filament_id": "OFK74HJD", + "filament_id": "OFm4SivL", + "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 13d04ff82c..b232f00632 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,7 +4,10 @@ "inherits": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "gxl3i7jTwkzrKxF4", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json index c3ece049cf..1a604e9250 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "mx6NWRkqyo2U12XQ", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 c39e501f5c..3bbc1afcb1 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "YH9IHXOFMKwcTLyA", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 58d57b30c2..36a3c15a4f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "IfAieG0OAG807xlu", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 dc7fb68745..ce5ecdb2aa 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "N6J7QqQ7TIgM3MyW", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "cool_plate_temp": [ "50" 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 3e65220aa5..de9c9be46a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "OIsfpi49wEoF0ekO", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 5943d800f7..f82bc5efc4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA Silk @System", "from": "system", "setting_id": "xxeZ6VPjRFevxDnK", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json index 1db32c1b42..84ee8494b5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "x5m17Z5UpqpTtwgF", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 0f6d8e0bbe..ec7a71f35f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "2GZp8yjrY1OioFDi", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 284128710c..36090afaf7 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "U0XtCVUhIMnidhbR", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 72d48ebb9b..558015cb87 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8j9kaYy3ghkF81Cu", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 00ddedabc1..c37e0f6341 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "E0LeJwSxaniDkB0b", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 536a4ac8ac..b7f4f619ec 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "8rggqgJ9kg9yLE28", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json index f8dbc1a5db..7e2cbef575 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "hnWRLUwnfXiwnqBM", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 96cc519bb4..047cdcf879 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "uY4OWhIytHMz4rWq", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 de21757695..b5f36b7483 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "YSkkXd9EhhEHvGpf", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 7a3f814c62..a41d10e40a 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "XlxXZj9Wi1D6IwCE", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 2723288b7d..e95f7ad1de 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "IPyXBSnMCAikjI9V", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 7837f5d704..df4894cdb1 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "f3gJsovSmDKoA7BP", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "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 16a44d9bf2..15239129d4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-Silk @Flashforge", "from": "system", "setting_id": "vZb7BvbyVWkZv3rR", - "filament_id": "OFLYDIb8", + "filament_id": "OFgjgN35", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "filament_settings_id": [ "Flashforge PLA Silk" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json index b9621303fe..c6e10f3502 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "ojYsAanAPqYhgFoe", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "filament_settings_id": [ "Flashforge PLA Sparkle @FF AD5M 0.25 nozzle" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json index e1df09f3fb..e90f5c1545 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "xVYaNvQwM2chTkPe", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "complete_print_exhaust_fan_speed": [ "80" 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 96d39efa5d..3786cf7abb 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "o8lsEnMIiHHorJhb", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 ee4824a8dd..c7fb93bca2 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "oXlxQJY0K6Dnri7e", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 06c4d3fb57..b6802db1b4 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "XKpFulrvvrfE56va", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "cool_plate_temp": [ "45" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json index b0d52bf934..3d35049e4e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "jmVmKMUCcowszvVp", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 296b827e39..5cf32f2c38 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "yeh5cd0tAHtHzdoQ", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 9dbe7d7af0..27380eb9e7 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "q2Zi0YluaYpG3Ktf", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 1eafaf0b40..42df4a0ea9 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "1qXV6AJqPpAwX1YK", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 1d93c10b5a..7a11476c06 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "YsyGGOGqUVkEqkIr", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json index b333c92f94..013e84740b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json @@ -4,10 +4,10 @@ "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", "from": "system", "setting_id": "4L3Zm1YIxs8J8dp9", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "additional_cooling_fan_speed": [ "40" 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 6459a6f8a8..4a975e6f20 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "UVvd018dTbygqTgy", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 410394cbce..0781dd641f 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "F0k8kkgWM5FkLAzo", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 7ecddf5859..9b4065c982 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 @@ -4,7 +4,10 @@ "inherits": "Generic ABS @Flashforge G3U", "from": "system", "setting_id": "Oapl8InwbkwNSIDl", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 0554f047e6..35ccf42632 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "NiB6Yb4b0auyn9KQ", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 ca024d690b..4be3dba6ea 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge", "from": "system", "setting_id": "LYtdPgec1hBLhoQA", - "filament_id": "OFec7Qiw", + "filament_id": "OFV5c8hG", + "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 8bb0d6980f..245e401283 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "QRyISvTy06kCwxKo", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 f63829709e..f456d8c7db 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "rmnF24E3SuwzRscH", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 2939f9ee4e..a39646f621 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "BXPI5Pkp7a6pLrCh", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 b2b8bcf477..a1b271569e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF @System", "from": "system", "setting_id": "rBm25DRY1PAkEJ4r", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 f5e734c62b..189dba715a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF @System", "from": "system", "setting_id": "xReo12oteZ4ECNJN", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 e441facb7d..292cf5972c 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "9PgjgxU7pLl2Dfpe", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 f2b5662c13..0faba78623 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "RuNKzuIsw7F1ogmG", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 62dd7a9ee9..77a590f1d6 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "YPuMCHNGDWh0FpIB", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 7958393b2b..3bd2e72000 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic HS PLA @Flashforge", "from": "system", "setting_id": "3uC056Y171ZjnQE6", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 5466774689..10f87a860a 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "JxNlb64lTODaaQhU", - "filament_id": "OF2bZtyg", + "filament_id": "OF9cAwMK", + "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 07744f726a..4242f0f8a5 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 @@ -3,7 +3,10 @@ "name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", "inherits": "Generic PLA-Silk @Flashforge", "from": "system", - "filament_id": "OFGc282l", + "filament_id": "OFV8Mxqx", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "false", "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle", 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 similarity index 86% rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 HF nozzle.json index e8de847c00..3df5398f11 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS @FF G4 0.6 HF nozzle", + "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", "from": "system", - "setting_id": "3w8fnDjkoFaJ6Nhw", - "filament_id": "OFUCpLaL", + "setting_id": "5x1ye2DAm3GvzmZJ", + "filament_id": "OFlgMgNM", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "activate_chamber_temp_control": [ "1" @@ -61,7 +62,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS @FF G4 0.6 HF nozzle" + "Flashforge PPS @FF G4 0.6 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" 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 similarity index 87% rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.6 nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.6 nozzle.json index 993a4dbf92..1de4d51745 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS @FF G4 0.6 nozzle", + "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", "from": "system", - "setting_id": "owHbDqY55rFtSegz", - "filament_id": "OFUCpLaL", + "setting_id": "yZoLC24CeKEyvkgA", + "filament_id": "OFlgMgNM", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "activate_chamber_temp_control": [ "1" @@ -61,7 +62,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS @FF G4 0.6 nozzle" + "Flashforge PPS @FF G4 0.6 nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" 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 similarity index 86% rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4 0.8 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4 0.8 HF nozzle.json index ff65c08991..e8014ddfec 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS @FF G4 0.8 HF nozzle", + "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", "from": "system", - "setting_id": "eFK1zzT1JY9ZnEl9", - "filament_id": "OFUCpLaL", + "setting_id": "EsrSpDB3Kx35qb76", + "filament_id": "OFlgMgNM", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "activate_chamber_temp_control": [ "1" @@ -61,7 +62,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS @FF G4 0.8 HF nozzle" + "Flashforge PPS @FF G4 0.8 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json index c8a1c2d800..fd2f854067 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "6NjEQ6RJKUAOrSLw", - "filament_id": "OFxMGIPt", + "filament_id": "OFlgMgNM", + "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 similarity index 86% rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 HF nozzle.json index 0f6fa82220..f731181d65 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS @FF G4P 0.6 HF nozzle", + "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", "from": "system", - "setting_id": "E8CcstoHzax78ZJY", - "filament_id": "OFUCpLaL", + "setting_id": "Uu82gm86ESeidnRT", + "filament_id": "OFlgMgNM", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "activate_chamber_temp_control": [ "1" @@ -61,7 +62,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS @FF G4P 0.6 HF nozzle" + "Flashforge PPS @FF G4P 0.6 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" 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 similarity index 87% rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.6 nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.6 nozzle.json index 581d855fe0..3eab34befc 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS @FF G4P 0.6 nozzle", + "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", "from": "system", - "setting_id": "xa22FD8bRVGsLiPJ", - "filament_id": "OFUCpLaL", + "setting_id": "G6pIMZA5RC15kJoC", + "filament_id": "OFlgMgNM", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "activate_chamber_temp_control": [ "1" @@ -61,7 +62,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS @FF G4P 0.6 nozzle" + "Flashforge PPS @FF G4P 0.6 nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" 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 similarity index 86% rename from resources/profiles/Flashforge/filament/FlashForge PPS @FF G4P 0.8 HF nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P 0.8 HF nozzle.json index dee62ada5b..a2662d8cc9 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS @FF G4P 0.8 HF nozzle", + "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", "from": "system", - "setting_id": "bZ9dbA8dIu9mjWyN", - "filament_id": "OFUCpLaL", + "setting_id": "SsK15iSJxrQWI5wy", + "filament_id": "OFlgMgNM", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "activate_chamber_temp_control": [ "1" @@ -61,7 +62,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS @FF G4P 0.8 HF nozzle" + "Flashforge PPS @FF G4P 0.8 HF nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" diff --git a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json index 76257267fe..b841f62e6c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PPS @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic PLA-CF10 @Flashforge", "from": "system", "setting_id": "vFMKqNjQjlNxwvDI", - "filament_id": "OFxMGIPt", + "filament_id": "OFlgMgNM", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_chamber_temp_control": [ "1" 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4 0.6 nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4 0.6 nozzle.json index 218d8add21..b33fcb95c9 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS-CF @FF G4 0.6 nozzle", + "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", "from": "system", - "setting_id": "4w0oK3F50O1DUqsu", - "filament_id": "OFogbnCb", + "setting_id": "mMTi9QaW5xVch3an", + "filament_id": "OFTSXxzE", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "2" @@ -49,7 +50,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS-CF @FF G4 0.6 nozzle" + "Flashforge PPS-CF @FF G4 0.6 nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" 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 similarity index 85% rename from resources/profiles/Flashforge/filament/FlashForge PPS-CF @FF G4P 0.6 nozzle.json rename to resources/profiles/Flashforge/filament/Flashforge PPS-CF @FF G4P 0.6 nozzle.json index 1213313096..48edb216c5 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,13 +1,14 @@ { "type": "filament", - "name": "FlashForge PPS-CF @FF G4P 0.6 nozzle", + "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", "from": "system", - "setting_id": "94vPnztRcpnbfAKx", - "filament_id": "OFogbnCb", + "setting_id": "dSI79hoaa9jLGvhz", + "filament_id": "OFTSXxzE", "instantiation": "true", "filament_vendor": [ - "Generic" + "Flashforge" ], "close_fan_the_first_x_layers": [ "2" @@ -49,7 +50,7 @@ "15" ], "filament_settings_id": [ - "FlashForge PPS-CF @FF G4P 0.6 nozzle" + "Flashforge PPS-CF @FF G4P 0.6 nozzle" ], "filament_start_gcode": [ "; filament start gcode\n;right_extruder_material:PPS" diff --git a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json index 4f3cc891e3..90d94b9c29 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic PVA @System", "from": "system", "setting_id": "rSYGG2ni41NDVw6l", - "filament_id": "OFQiq4fb", + "filament_id": "OFaaddbQ", + "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 206933a8fe..03fdb6117e 100644 --- a/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge PVA @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic PVA @System", "from": "system", "setting_id": "nwgbMjLRJLtJ04ri", - "filament_id": "OFQiq4fb", + "filament_id": "OFaaddbQ", + "filament_vendor": [ + "Flashforge" + ], "instantiation": "true", "activate_air_filtration": [ "1" 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 f3625e4bea..1514862e44 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "f75oElm4zB0hukIj", - "filament_id": "OFKpQTJI", + "filament_id": "OFSDfduA", + "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 c08ad7948b..d6fda96505 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "o4KYTpJF6KksX2mg", - "filament_id": "OFKpQTJI", + "filament_id": "OFSDfduA", + "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 e0d6448c72..27d6515ccb 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "HUSkDZL6rCpz0lRk", - "filament_id": "OFKpQTJI", + "filament_id": "OFSDfduA", + "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 a37ab23204..7db519170a 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "8xgu0AnMuKbPWyVd", - "filament_id": "OFKpQTJI", + "filament_id": "OFSDfduA", + "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 a9ceca338a..2123c33993 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "Rgqt3MjxOye5EaFt", - "filament_id": "OFKpQTJI", + "filament_id": "OFSDfduA", + "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 df74375b18..a5ce644702 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "PBFsW5qhVbQteYh5", - "filament_id": "OFKpQTJI", + "filament_id": "OFSDfduA", + "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 6eca69f2b4..897054d8ee 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 @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "TPbHmcFyPyjvoERv", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 c0e5b624e4..adb4820faa 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 @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "zLMgsyDmdoXHhqFv", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 06a632a6c5..5c5f690cd2 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF AD5X.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "ThakVhjfpgnAlEVH", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 676484711e..b67887cc8b 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "M0ozqaD3jSKoD6fm", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 01fd9f2752..ae6049673b 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "ob8IkvzNt9CWCzbk", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 9f72e9eaca..37bef9c3f6 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "NzxX1lyRJ7wLUihV", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 ecd3bbb764..c5b24e9e04 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "4FIGiheSGvSJPw3s", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 bcfe2516a2..23cd8d6326 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 @@ -4,7 +4,10 @@ "inherits": "Generic PETG @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "1GNqSBaQitzhYSx7", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 22373250ff..eb2a423bca 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "eOhMygyxaccdov7o", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 7d393a9b9d..f4b91222e7 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 @@ -4,7 +4,10 @@ "inherits": "Generic PLA @Flashforge G3U 0.6 Nozzle", "from": "system", "setting_id": "LxooKiOkRncktNLf", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 cdcee7c997..9e675ccd52 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF G4P.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "HdoJfbQr0uwQ6Vwb", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 c3042b14b1..aa2f6251dc 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @Flashforge", "from": "system", "setting_id": "J4EaFhnpkLDcl5wH", - "filament_id": "OFAf9pJF", + "filament_id": "OFSqIcJC", + "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 1daa3b0189..5a4e304862 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "fd5bACFa33J7aTdp", - "filament_id": "OF995YXg", + "filament_id": "OF8GtyKJ", + "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 3145267db2..428afe7f1c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-64D @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "hrcELA2qEMkZ6Wvj", - "filament_id": "OF995YXg", + "filament_id": "OF8GtyKJ", + "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 96c3798a71..407e92aed8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "Lis7BZ3lMkoX5KQt", - "filament_id": "OF41jaTh", + "filament_id": "OFwlZ7gH", + "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 18e401489e..611724b460 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-90A @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "xY03Hiidu5YNSUyZ", - "filament_id": "OF41jaTh", + "filament_id": "OFwlZ7gH", + "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 3fee2a98b2..0c27bb94c6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "AHu6wNV3zcPBusOF", - "filament_id": "OFNWnx2c", + "filament_id": "OFx0WlzS", + "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 d7625a7d8d..e3b05721e6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json +++ b/resources/profiles/Flashforge/filament/Flashforge TPU-95A @FF C5P.json @@ -4,7 +4,10 @@ "inherits": "Generic TPU @System", "from": "system", "setting_id": "8MBRqfLIRdhxk1dF", - "filament_id": "OFNWnx2c", + "filament_id": "OFx0WlzS", + "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 4b212a6283..5ad0cca8f6 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5.json @@ -2,6 +2,7 @@ "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", "from": "system", "setting_id": "gZqAGVOlWR79n7hN", "filament_id": "OFKW5hEW", 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 a9e1bce236..b23f871add 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF C5P.json @@ -2,6 +2,7 @@ "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", "from": "system", "setting_id": "nJF1lCOavNNh4yHs", "filament_id": "OFKW5hEW", 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 f8595f254b..22ea704736 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json @@ -2,6 +2,7 @@ "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", "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 8634877859..5156df9505 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json @@ -2,6 +2,7 @@ "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", "from": "system", "setting_id": "wmWMf3MfmbfZx2o8", "filament_id": "OFKW5hEW", diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json index 128926c992..710554df5a 100644 --- a/resources/profiles/Ratrig.json +++ b/resources/profiles/Ratrig.json @@ -1,6 +1,6 @@ { "name": "RatRig", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "RatRig configurations", "machine_model_list": [ @@ -313,8 +313,8 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "RatRig BigNozzle ABS", - "sub_path": "filament/RatRig BigNozzle ABS.json" + "name": "Generic ABS BigNozzle @RatRig", + "sub_path": "filament/Generic ABS BigNozzle @RatRig.json" }, { "name": "Generic ABS @RatRig", @@ -325,8 +325,8 @@ "sub_path": "filament/RatRig PunkFil ABS.json" }, { - "name": "RatRig BigNozzle ASA", - "sub_path": "filament/RatRig BigNozzle ASA.json" + "name": "Generic ASA BigNozzle @RatRig", + "sub_path": "filament/Generic ASA BigNozzle @RatRig.json" }, { "name": "Generic ASA @RatRig", @@ -345,12 +345,12 @@ "sub_path": "filament/Generic PC @RatRig.json" }, { - "name": "RatRig BigNozzle PCTG", - "sub_path": "filament/RatRig BigNozzle PCTG.json" + "name": "Generic PCTG BigNozzle @RatRig", + "sub_path": "filament/Generic PCTG BigNozzle @RatRig.json" }, { - "name": "RatRig BigNozzle PETG", - "sub_path": "filament/RatRig BigNozzle PETG.json" + "name": "Generic PETG BigNozzle @RatRig", + "sub_path": "filament/Generic PETG BigNozzle @RatRig.json" }, { "name": "Generic PCTG @RatRig", @@ -369,8 +369,8 @@ "sub_path": "filament/RatRig PunkFil PETG CF.json" }, { - "name": "RatRig BigNozzle PLA", - "sub_path": "filament/RatRig BigNozzle PLA.json" + "name": "Generic PLA BigNozzle @RatRig", + "sub_path": "filament/Generic PLA BigNozzle @RatRig.json" }, { "name": "Generic PLA @RatRig", @@ -385,8 +385,8 @@ "sub_path": "filament/Generic PVA @RatRig.json" }, { - "name": "RatRig BigNozzle TPU", - "sub_path": "filament/RatRig BigNozzle TPU.json" + "name": "Generic TPU BigNozzle @RatRig", + "sub_path": "filament/Generic TPU BigNozzle @RatRig.json" }, { "name": "Generic TPU @RatRig", diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json b/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json rename to resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json index 698d14aba2..3d071c779a 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ABS.json +++ b/resources/profiles/Ratrig/filament/Generic ABS BigNozzle @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig BigNozzle ABS", + "name": "Generic ABS BigNozzle @RatRig", "inherits": "fdm_filament_abs", + "renamed_from": "RatRig BigNozzle ABS", "from": "system", - "setting_id": "oE39mwr3PCpeBxZN", - "filament_id": "OFtplX8o", + "setting_id": "4GJ4GHOuApWBbQoS", + "filament_id": "OFnyHfcv", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json b/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json rename to resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json index c16d3c7869..f6f85f78e7 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle ASA.json +++ b/resources/profiles/Ratrig/filament/Generic ASA BigNozzle @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig BigNozzle ASA", + "name": "Generic ASA BigNozzle @RatRig", "inherits": "fdm_filament_asa", + "renamed_from": "RatRig BigNozzle ASA", "from": "system", - "setting_id": "GGkbwdd79jAXnwuf", - "filament_id": "OFgcryz4", + "setting_id": "n2V9gkhbqWJzsQBK", + "filament_id": "OF4GM5qX", "instantiation": "true", "filament_flow_ratio": [ "0.92" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json rename to resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json index ce0edbd3b0..0592709a82 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PCTG.json +++ b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig BigNozzle PCTG", + "name": "Generic PCTG BigNozzle @RatRig", "inherits": "fdm_filament_pet", + "renamed_from": "RatRig BigNozzle PCTG", "from": "system", - "setting_id": "uCKZhFAPvEa2wKnA", - "filament_id": "OFFC0VqZ", + "setting_id": "HPaol79uY9NdhasQ", + "filament_id": "OFYfAcLY", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json b/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json similarity index 93% rename from resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json rename to resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json index 1595d776b2..213f41628c 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PETG.json +++ b/resources/profiles/Ratrig/filament/Generic PETG BigNozzle @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig BigNozzle PETG", + "name": "Generic PETG BigNozzle @RatRig", "inherits": "fdm_filament_pet", + "renamed_from": "RatRig BigNozzle PETG", "from": "system", - "setting_id": "bf3YMNVRSE1i1E8N", - "filament_id": "OFmexHIS", + "setting_id": "pRM6IVX5T3y6Ywj4", + "filament_id": "OFvD0Qqt", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json b/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json similarity index 92% rename from resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json rename to resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json index 75be42804b..08d546aafc 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle PLA.json +++ b/resources/profiles/Ratrig/filament/Generic PLA BigNozzle @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig BigNozzle PLA", + "name": "Generic PLA BigNozzle @RatRig", "inherits": "fdm_filament_pla", + "renamed_from": "RatRig BigNozzle PLA", "from": "system", - "setting_id": "dyG3zLuhX2qe8XJP", - "filament_id": "OFiuJSmy", + "setting_id": "WEI4QiKyANQOK7dG", + "filament_id": "OFqFRiLb", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json b/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json similarity index 92% rename from resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json rename to resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json index c220b6dc58..4714f57d5a 100644 --- a/resources/profiles/Ratrig/filament/RatRig BigNozzle TPU.json +++ b/resources/profiles/Ratrig/filament/Generic TPU BigNozzle @RatRig.json @@ -1,10 +1,11 @@ { "type": "filament", - "name": "RatRig BigNozzle TPU", + "name": "Generic TPU BigNozzle @RatRig", "inherits": "fdm_filament_tpu", + "renamed_from": "RatRig BigNozzle TPU", "from": "system", - "setting_id": "wLJ3X05Jnz1EqeOI", - "filament_id": "OFsNJjpc", + "setting_id": "9UWg2cO61XFdlWxo", + "filament_id": "OF5tX6va", "instantiation": "true", "filament_max_volumetric_speed": [ "5" diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index b41888a840..0fb50e0560 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -2352,6 +2352,12 @@ ], "successor": "OFDvXujf" }, + "OF1bQyX2": { + "claims": [ + "Flashforge/Flashforge PLA Matte" + ], + "successor": "OF6qAuyi" + }, "OF1daEUW": { "claims": [ "Anker/Anker Generic PETG-CF" @@ -2370,6 +2376,12 @@ ], "successor": "OFcVLpNA" }, + "OF2bZtyg": { + "claims": [ + "Flashforge/Flashforge PLA-CF" + ], + "successor": "OF9cAwMK" + }, "OF2mgDsI": { "claims": [ "Vzbot/Vzbot Generic PLA" @@ -2396,6 +2408,12 @@ ], "successor": "OFYPdQJh" }, + "OF41jaTh": { + "claims": [ + "Flashforge/Flashforge TPU-90A" + ], + "successor": "OFwlZ7gH" + }, "OF42ZDpN": { "claims": [ "Flashforge/FusRock PAHT" @@ -2450,6 +2468,12 @@ ], "successor": "OFLakOUI" }, + "OF5NQFKI": { + "claims": [ + "Flashforge/Flashforge PLA Galaxy" + ], + "successor": "OFJJ0Ar3" + }, "OF5Zk4e1": { "claims": [ "Anycubic/Anycubic Generic ABS" @@ -2463,6 +2487,12 @@ ], "successor": "OFDSrzZ8" }, + "OF5w29Kq": { + "claims": [ + "Flashforge/Flashforge HS PETG" + ], + "successor": "OFDxxTpW" + }, "OF67EdL5": { "claims": [ "Sovol/Sovol SV06 ACE ABS" @@ -2523,6 +2553,12 @@ ], "successor": "OFgbpcy9" }, + "OF6ueBwd": { + "claims": [ + "Flashforge/Flashforge PLA Pro" + ], + "successor": "OFm4SivL" + }, "OF6vKLaU": { "claims": [ "Artillery/Artillery Generic ASA" @@ -2583,6 +2619,12 @@ ], "successor": "OFLakOUI" }, + "OF995YXg": { + "claims": [ + "Flashforge/Flashforge TPU-64D" + ], + "successor": "OF8GtyKJ" + }, "OF9fOPpd": { "claims": [ "Vzbot/Vzbot Generic PC" @@ -2601,6 +2643,12 @@ ], "successor": "OFDSrzZ8" }, + "OFAf9pJF": { + "claims": [ + "Flashforge/Flashforge TPU 95A" + ], + "successor": "OFSqIcJC" + }, "OFB09fpe": { "claims": [ "Ratrig/RatRig Generic TPU" @@ -2644,6 +2692,12 @@ ], "successor": "OFLPAxz3" }, + "OFBK6zAi": { + "claims": [ + "Flashforge/Flashforge PETG-CF" + ], + "successor": "OFuFEtKX" + }, "OFBpcB0a": { "claims": [ "TwoTrees/TwoTrees Generic HS PLA" @@ -2714,6 +2768,12 @@ ], "successor": "OFgbpcy9" }, + "OFEMfQsX": { + "claims": [ + "Flashforge/Flashforge PETG Basic" + ], + "successor": "OFYYeMyQ" + }, "OFENzGSm": { "claims": [ "FLSun/FLSun T1 TPU" @@ -2738,6 +2798,12 @@ ], "successor": "OFWbdGsC" }, + "OFFC0VqZ": { + "claims": [ + "Ratrig/RatRig BigNozzle PCTG" + ], + "successor": "OFYfAcLY" + }, "OFFZ0BBL": { "claims": [ "FlyingBear/FlyingBear Generic PLA" @@ -2786,6 +2852,18 @@ ], "successor": "OF6rdQ6M" }, + "OFH5UH6P": { + "claims": [ + "Flashforge/Flashforge ABS-GF" + ], + "successor": "OFojbdhR" + }, + "OFH6Pjxe": { + "claims": [ + "Flashforge/Flashforge PLA Matte" + ], + "successor": "OF6qAuyi" + }, "OFHFZ1Te": { "claims": [ "Prusa/Prusa Generic PLA Silk" @@ -2854,6 +2932,12 @@ ], "successor": "OFQyyO0l" }, + "OFIxitiU": { + "claims": [ + "Flashforge/Flashforge PLA Basic" + ], + "successor": "OFJ3F2jm" + }, "OFIy3kLw": { "claims": [ "Prusa/Prusa Generic PA" @@ -2902,6 +2986,12 @@ ], "successor": "OFzRtFM9" }, + "OFK74HJD": { + "claims": [ + "Flashforge/Flashforge PLA Pro" + ], + "successor": "OFm4SivL" + }, "OFKNAhls": { "claims": [ "Qidi/Qidi Generic PETG" @@ -2914,6 +3004,12 @@ ], "successor": "OFvmwTZE" }, + "OFKpQTJI": { + "claims": [ + "Flashforge/Flashforge TPU 65D" + ], + "successor": "OFSDfduA" + }, "OFKuTr12": { "claims": [ "Tiertime/Tiertime Generic PE" @@ -2944,6 +3040,12 @@ ], "successor": "OFhQfUQY" }, + "OFLYDIb8": { + "claims": [ + "Flashforge/Flashforge PLA Silk" + ], + "successor": "OFgjgN35" + }, "OFLrdHse": { "claims": [ "Flashforge/Flashforge Generic HS PLA" @@ -2968,6 +3070,12 @@ ], "successor": "OFgbpcy9" }, + "OFMIma8C": { + "claims": [ + "Flashforge/Flashforge PLA Luminous" + ], + "successor": "OFdqkWtz" + }, "OFMIurFh": { "claims": [ "Creality/Creality HF Generic Speed PLA" @@ -3006,6 +3114,12 @@ ], "successor": "OFg8ndtj" }, + "OFMyLYV8": { + "claims": [ + "Flashforge/Flashforge PETG Transparent" + ], + "successor": "OFwjMiKL" + }, "OFN7aNHe": { "claims": [ "Tiertime/Tiertime Generic PC" @@ -3036,6 +3150,12 @@ ], "successor": "OFDSrzZ8" }, + "OFNWnx2c": { + "claims": [ + "Flashforge/Flashforge TPU-95A" + ], + "successor": "OFx0WlzS" + }, "OFNX8GI1": { "claims": [ "Sovol/Sovol Zero ABS" @@ -3084,6 +3204,12 @@ ], "successor": "OF7lOgYF" }, + "OFPQfNAf": { + "claims": [ + "Flashforge/Flashforge PETG Pro" + ], + "successor": "OFXiArjA" + }, "OFPdhDlK": { "claims": [ "Anycubic/Anycubic Generic PA-CF" @@ -3132,12 +3258,24 @@ ], "successor": "OFWbdGsC" }, + "OFQZeyZv": { + "claims": [ + "Flashforge/Flashforge PLA Buint Ti" + ], + "successor": "OF8O09RG" + }, "OFQbqeN7": { "claims": [ "Qidi/Qidi Generic PA" ], "successor": "OFg8ndtj" }, + "OFQiq4fb": { + "claims": [ + "Flashforge/Flashforge PVA" + ], + "successor": "OFaaddbQ" + }, "OFQswlnF": { "claims": [ "Tiertime/Tiertime Generic PA" @@ -3224,6 +3362,12 @@ ], "successor": "OFmCOW2Y" }, + "OFShw1X8": { + "claims": [ + "Flashforge/Flashforge ABS Basic" + ], + "successor": "OFibWuBd" + }, "OFTKFAZ4": { "claims": [ "Tiertime/Tiertime Generic PCTG" @@ -3260,6 +3404,12 @@ ], "successor": "OFY9muEs" }, + "OFUCpLaL": { + "claims": [ + "Flashforge/FlashForge PPS" + ], + "successor": "OFlgMgNM" + }, "OFUScM0D": { "claims": [ "Flashforge/FusRock S-Multi" @@ -3338,6 +3488,12 @@ ], "successor": "OFY9muEs" }, + "OFWnSvGu": { + "claims": [ + "Flashforge/Flashforge ASA-GF" + ], + "successor": "OFrZDhVt" + }, "OFWof1Ap": { "claims": [ "FLSun/FLSun Generic ABS" @@ -3460,6 +3616,12 @@ ], "successor": "OFCn83wF" }, + "OFaBwRvT": { + "claims": [ + "Flashforge/Flashforge ASA Basic" + ], + "successor": "OFFFg2Pf" + }, "OFaFNP2U": { "claims": [ "Sovol/Sovol SV07 PLA" @@ -3478,6 +3640,12 @@ ], "successor": "OFLakOUI" }, + "OFaz8VoR": { + "claims": [ + "Flashforge/Flashforge HIPS" + ], + "successor": "OFvaLVML" + }, "OFbeeFkl": { "claims": [ "OrcaArena/OrcaArena Generic PLA Silk" @@ -3575,6 +3743,12 @@ ], "successor": "OFgbpcy9" }, + "OFe6sfXS": { + "claims": [ + "Flashforge/FlashForge PC" + ], + "successor": "OFWXCbVF" + }, "OFe7Sx5B": { "claims": [ "Sovol/Sovol SV06 ACE PETG" @@ -3606,6 +3780,12 @@ ], "successor": "OFi6PfUM" }, + "OFec7Qiw": { + "claims": [ + "Flashforge/Flashforge PLA Sparkle" + ], + "successor": "OFV5c8hG" + }, "OFetENFF": { "claims": [ "OrcaArena/OrcaArena Generic ABS" @@ -3654,6 +3834,18 @@ ], "successor": "OFWbdGsC" }, + "OFgcryz4": { + "claims": [ + "Ratrig/RatRig BigNozzle ASA" + ], + "successor": "OF4GM5qX" + }, + "OFgf4gZa": { + "claims": [ + "Flashforge/Flashforge PA" + ], + "successor": "OFEvEfw5" + }, "OFgvOmM2": { "claims": [ "Anker/Anker Generic PETG", @@ -3668,6 +3860,12 @@ ], "successor": "OFgbpcy9" }, + "OFi7Bf0F": { + "claims": [ + "Flashforge/Flashforge ABS-CF" + ], + "successor": "OFYTIMbj" + }, "OFiCHnso": { "claims": [ "Prusa/Prusa Generic PLA" @@ -3692,6 +3890,12 @@ ], "successor": "OFDvXujf" }, + "OFiuJSmy": { + "claims": [ + "Ratrig/RatRig BigNozzle PLA" + ], + "successor": "OFqFRiLb" + }, "OFixgF4N": { "claims": [ "Flashforge/FusRock S-Multi" @@ -3722,6 +3926,12 @@ ], "successor": "OFsijjtH" }, + "OFkwIWwc": { + "claims": [ + "Flashforge/Flashforge PLA Color Change" + ], + "successor": "OFMkAW6r" + }, "OFl2SXmv": { "claims": [ "Prusa/Prusa Generic FLEX" @@ -3764,12 +3974,24 @@ ], "successor": "OFWbdGsC" }, + "OFmQkb3c": { + "claims": [ + "Flashforge/Flashforge HS PLA Burnt Ti" + ], + "successor": "OF8O09RG" + }, "OFma52eS": { "claims": [ "Blocks/Blocks Generic ABS" ], "successor": "OFY9muEs" }, + "OFmexHIS": { + "claims": [ + "Ratrig/RatRig BigNozzle PETG" + ], + "successor": "OFvD0Qqt" + }, "OFmhWhEf": { "claims": [ "Creality/Creality HF Generic PLA" @@ -3788,6 +4010,12 @@ ], "successor": "OFLPAxz3" }, + "OFnMv3W5": { + "claims": [ + "Flashforge/Flashforge HS PLA" + ], + "successor": "OFIK2H3G" + }, "OFndmfJ1": { "claims": [ "Anker/Anker Generic PLA", @@ -3838,6 +4066,12 @@ ], "successor": "OFmpMwxS" }, + "OFogbnCb": { + "claims": [ + "Flashforge/FlashForge PPS-CF" + ], + "successor": "OFTSXxzE" + }, "OFoqrHTw": { "claims": [ "FLSun/FLSun S1 PLA High Speed" @@ -3928,6 +4162,12 @@ ], "successor": "OFCD8qiU" }, + "OFrnkURQ": { + "claims": [ + "Flashforge/Flashforge PLA Metal" + ], + "successor": "OFAebKg8" + }, "OFrrMLDw": { "claims": [ "Flashforge/Flashforge Generic PLA-SILK" @@ -3964,6 +4204,12 @@ ], "successor": "OFYPdQJh" }, + "OFsNJjpc": { + "claims": [ + "Ratrig/RatRig BigNozzle TPU" + ], + "successor": "OF5tX6va" + }, "OFsXOMoX": { "claims": [ "Qidi/Qidi Generic PLA+" @@ -4000,6 +4246,12 @@ ], "successor": "OFDSrzZ8" }, + "OFtplX8o": { + "claims": [ + "Ratrig/RatRig BigNozzle ABS" + ], + "successor": "OFnyHfcv" + }, "OFtsVp4v": { "claims": [ "SecKit/SecKit Generic PA-CF" @@ -4012,6 +4264,18 @@ ], "successor": "OFDSrzZ8" }, + "OFuFqYyG": { + "claims": [ + "Flashforge/Flashforge PAHT-CF" + ], + "successor": "OFKW5hEW" + }, + "OFuGRMNV": { + "claims": [ + "Flashforge/Flashforge PA-CF" + ], + "successor": "OFGxuI0n" + }, "OFuSwKgm": { "claims": [ "Tiertime/Tiertime Generic PLA" @@ -4048,6 +4312,12 @@ ], "successor": "OFq9svOz" }, + "OFvVxvzZ": { + "claims": [ + "Flashforge/Flashforge PLA Metal" + ], + "successor": "OFAebKg8" + }, "OFwMFLAm": { "claims": [ "Artillery/Artillery Generic ABS" @@ -4072,6 +4342,12 @@ ], "successor": "OFWbdGsC" }, + "OFxMGIPt": { + "claims": [ + "Flashforge/Flashforge PPS" + ], + "successor": "OFlgMgNM" + }, "OFxTMg1d": { "claims": [ "FlyingBear/FlyingBear Generic PC" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index b3e38041f3..5eedb85a5e 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -19,8 +19,6 @@ "Flashforge/Flashforge HS PLA @FF C5P", "Flashforge/Flashforge PA-CF @FF C5", "Flashforge/Flashforge PA-CF @FF C5P", - "Flashforge/Flashforge PAHT-CF @FF C5", - "Flashforge/Flashforge PAHT-CF @FF C5P", "Flashforge/Flashforge PET-CF @FF C5", "Flashforge/Flashforge PET-CF @FF C5P", "Flashforge/Flashforge PETG Pro @FF C5", @@ -29,12 +27,6 @@ "Flashforge/Flashforge PETG Transparent @FF C5P", "Flashforge/Flashforge PETG-CF @FF C5", "Flashforge/Flashforge PETG-CF @FF C5P", - "Flashforge/Flashforge PLA Matte @FF C5", - "Flashforge/Flashforge PLA Matte @FF C5P", - "Flashforge/Flashforge PLA Metal @FF C5", - "Flashforge/Flashforge PLA Metal @FF C5P", - "Flashforge/Flashforge PLA Pro @FF C5", - "Flashforge/Flashforge PLA Pro @FF C5P", "Flashforge/Flashforge PLA Basic @FF C5", "Flashforge/Flashforge PLA Basic @FF C5P", "Flashforge/Flashforge PLA Color Change @FF C5", @@ -43,6 +35,12 @@ "Flashforge/Flashforge PLA Galaxy @FF C5P", "Flashforge/Flashforge PLA Luminous @FF C5", "Flashforge/Flashforge PLA Luminous @FF C5P", + "Flashforge/Flashforge PLA Matte @FF C5", + "Flashforge/Flashforge PLA Matte @FF C5P", + "Flashforge/Flashforge PLA Metal @FF C5", + "Flashforge/Flashforge PLA Metal @FF C5P", + "Flashforge/Flashforge PLA Pro @FF C5", + "Flashforge/Flashforge PLA Pro @FF C5P", "Flashforge/Flashforge PLA Silk @FF C5", "Flashforge/Flashforge PLA Silk @FF C5P", "Flashforge/Flashforge PLA-CF @FF C5", @@ -247,20 +245,6 @@ "Elegoo/Generic PETG PRO @Elegoo", "Elegoo/Generic PETG-CF @Elegoo Centauri", "Elegoo/Generic PLA Matte @Elegoo", - "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", - "Flashforge/FlashForge PC @FF G4 0.6 nozzle", - "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", - "Flashforge/FlashForge PC @FF G4P 0.6 HF nozzle", - "Flashforge/FlashForge PC @FF G4P 0.6 nozzle", - "Flashforge/FlashForge PC @FF G4P 0.8 HF nozzle", - "Flashforge/FlashForge PPS @FF G4 0.6 HF nozzle", - "Flashforge/FlashForge PPS @FF G4 0.6 nozzle", - "Flashforge/FlashForge PPS @FF G4 0.8 HF nozzle", - "Flashforge/FlashForge PPS @FF G4P 0.6 HF nozzle", - "Flashforge/FlashForge PPS @FF G4P 0.6 nozzle", - "Flashforge/FlashForge PPS @FF G4P 0.8 HF nozzle", - "Flashforge/FlashForge PPS-CF @FF G4 0.6 nozzle", - "Flashforge/FlashForge PPS-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge ABS @FF AD5M 0.25 Nozzle", "Flashforge/Flashforge ABS Basic", "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle", @@ -389,10 +373,12 @@ "Flashforge/Flashforge PA12-CF", "Flashforge/Flashforge PA6-CF", "Flashforge/Flashforge PA66-CF", - "Flashforge/Flashforge PAHT-CF @FF C5", - "Flashforge/Flashforge PAHT-CF @FF C5P", - "Flashforge/Flashforge PAHT-CF @FF G4", - "Flashforge/Flashforge PAHT-CF @FF G4P", + "Flashforge/Flashforge PC @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PC @FF G4 0.6 nozzle", + "Flashforge/Flashforge PC @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PC @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PC @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PC @FF G4P 0.8 HF nozzle", "Flashforge/Flashforge PET-CF", "Flashforge/Flashforge PET-CF @FF C5", "Flashforge/Flashforge PET-CF @FF C5P", @@ -449,12 +435,6 @@ "Flashforge/Flashforge PETG-CF @FF G4 0.6 nozzle", "Flashforge/Flashforge PETG-CF @FF G4P", "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Matte @FF C5", - "Flashforge/Flashforge PLA Matte @FF C5P", - "Flashforge/Flashforge PLA Metal @FF C5", - "Flashforge/Flashforge PLA Metal @FF C5P", - "Flashforge/Flashforge PLA Pro @FF C5", - "Flashforge/Flashforge PLA Pro @FF C5P", "Flashforge/Flashforge PLA Basic", "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle", "Flashforge/Flashforge PLA Basic @FF AD5X", @@ -475,8 +455,6 @@ "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle", "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle", "Flashforge/Flashforge PLA Basic @FF G4P HF", - "Flashforge/Flashforge PLA Buint Ti @FF G4 0.8 nozzle", - "Flashforge/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle", "Flashforge/Flashforge PLA Color Change", "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle", "Flashforge/Flashforge PLA Color Change @FF AD5X", @@ -541,6 +519,8 @@ "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle", "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle", "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Matte @FF C5", + "Flashforge/Flashforge PLA Matte @FF C5P", "Flashforge/Flashforge PLA Matte @FF G4", "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle", "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle", @@ -559,6 +539,8 @@ "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle", "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle", "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Metal @FF C5", + "Flashforge/Flashforge PLA Metal @FF C5P", "Flashforge/Flashforge PLA Metal @FF G4", "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle", "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle", @@ -577,6 +559,8 @@ "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle", "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle", "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Pro @FF C5", + "Flashforge/Flashforge PLA Pro @FF C5P", "Flashforge/Flashforge PLA Pro @FF G4", "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle", "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle", @@ -641,12 +625,20 @@ "Flashforge/Flashforge PPA-CF @FF C5P", "Flashforge/Flashforge PPA-GF", "Flashforge/Flashforge PPS @FF G4", + "Flashforge/Flashforge PPS @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PPS @FF G4 0.6 nozzle", + "Flashforge/Flashforge PPS @FF G4 0.8 HF nozzle", "Flashforge/Flashforge PPS @FF G4P", + "Flashforge/Flashforge PPS @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PPS @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PPS @FF G4P 0.8 HF nozzle", "Flashforge/Flashforge PPS-CF", "Flashforge/Flashforge PPS-CF @FF C5", "Flashforge/Flashforge PPS-CF @FF C5P", "Flashforge/Flashforge PPS-CF @FF G4", + "Flashforge/Flashforge PPS-CF @FF G4 0.6 nozzle", "Flashforge/Flashforge PPS-CF @FF G4P", + "Flashforge/Flashforge PPS-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge PVA @FF C5", "Flashforge/Flashforge PVA @FF C5P", "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle", @@ -1592,9 +1584,6 @@ "OF1W7c76": [ "Qidi/QIDI ASA-CF" ], - "OF1bQyX2": [ - "Flashforge/Flashforge PLA Matte" - ], "OF1d7c3A": [ "Snapmaker/Snapmaker ASA" ], @@ -1628,9 +1617,6 @@ "OF2Z1nT5": [ "OrcaFilamentLibrary/FilAr PETG Azul Imperial" ], - "OF2bZtyg": [ - "Flashforge/Flashforge PLA-CF" - ], "OF2hfMcG": [ "OrcaArena/Arena PLA-CF" ], @@ -1671,9 +1657,6 @@ "OF3ydJTT": [ "InfiMech/InfiMech PLA Hyper" ], - "OF41jaTh": [ - "Flashforge/Flashforge TPU-90A" - ], "OF43Raws": [ "Snapmaker/PolyTerra J1 PLA" ], @@ -1686,6 +1669,9 @@ "OF4APyxe": [ "Creality/Hyper PAHT-CF" ], + "OF4GM5qX": [ + "Ratrig/Generic ASA BigNozzle" + ], "OF4KsW72": [], "OF4Nhggz": [ "Artillery/Artillery PLA Basic+" @@ -1732,9 +1718,6 @@ "Qidi/PolyLite PLA", "Snapmaker/PolyLite PLA" ], - "OF5NQFKI": [ - "Flashforge/Flashforge PLA Galaxy" - ], "OF5NqBfC": [ "Wanhao France/YUMI PETG" ], @@ -1767,15 +1750,15 @@ "Snapmaker/Polymaker PLA Pro" ], "OF5rnhjh": [], + "OF5tX6va": [ + "Ratrig/Generic TPU BigNozzle" + ], "OF5umxxT": [ "Snapmaker/PolyLite PLA Glow" ], "OF5vgi2G": [ "OrcaFilamentLibrary/FilAr PLA-mate Azul" ], - "OF5w29Kq": [ - "Flashforge/Flashforge HS PETG" - ], "OF65InrS": [ "Snapmaker/Snapmaker TPU" ], @@ -1808,13 +1791,13 @@ "OF6kj4jI": [ "iQ/Fiberthree PACF Pro P2" ], + "OF6qAuyi": [ + "Flashforge/Flashforge PLA Matte" + ], "OF6rdQ6M": [ "Creality/Generic PPS-CF", "Tiertime/Generic PPS-CF" ], - "OF6ueBwd": [ - "Flashforge/Flashforge PLA Pro" - ], "OF70zbGS": [ "Creality/Hyper L-W PLA" ], @@ -1859,12 +1842,18 @@ "OF8GnyFU": [ "Creality/Hyper ABS" ], + "OF8GtyKJ": [ + "Flashforge/Flashforge TPU-64D" + ], "OF8Hx3Pi": [ "Cubicon/Cubicon PETG" ], "OF8Jl6NT": [ "Snapmaker/Snapmaker J1 PET" ], + "OF8O09RG": [ + "Flashforge/Flashforge HS PLA Burnt Ti" + ], "OF8Tlg47": [ "OrcaFilamentLibrary/Generic PPA-GF", "Tiertime/Generic PPA-GF" @@ -1891,9 +1880,6 @@ "OF8wE5l7": [ "Artillery/Artillery PETG Basic" ], - "OF995YXg": [ - "Flashforge/Flashforge TPU-64D" - ], "OF99UMPq": [ "BBL/COEX ABS", "OrcaFilamentLibrary/COEX ABS" @@ -1914,6 +1900,9 @@ "OF9UJOGF": [ "Anycubic/Anycubic PETG-CF" ], + "OF9cAwMK": [ + "Flashforge/Flashforge PLA-CF" + ], "OF9emAI9": [ "Ratrig/RatRig PunkFil PETG" ], @@ -1938,8 +1927,8 @@ "OFAZllAN": [ "Artillery/Artillery PLA-CF" ], - "OFAf9pJF": [ - "Flashforge/Flashforge TPU 95A" + "OFAebKg8": [ + "Flashforge/Flashforge PLA Metal" ], "OFAnyRUI": [ "OrcaFilamentLibrary/Bambu Support For PLA" @@ -1956,9 +1945,6 @@ "OFBJAdLw": [ "LH/LHS PCTG" ], - "OFBK6zAi": [ - "Flashforge/Flashforge PETG-CF" - ], "OFBLktDy": [ "Creality/Soleyin Basic PETG" ], @@ -2141,6 +2127,9 @@ "OFDxfPgH": [ "OrcaFilamentLibrary/Bambu PLA Sparkle" ], + "OFDxxTpW": [ + "Flashforge/Flashforge HS PETG" + ], "OFE0NFRh": [ "BBL/COEX TPU 60A", "OrcaFilamentLibrary/COEX TPU 60A" @@ -2148,9 +2137,6 @@ "OFEGNJD4": [ "OrcaFilamentLibrary/Bambu PLA Silk" ], - "OFEMfQsX": [ - "Flashforge/Flashforge PETG Basic" - ], "OFEOnBj6": [ "Snapmaker/Snapmaker PLA Lite" ], @@ -2190,6 +2176,9 @@ "OFEswT5W": [ "OrcaFilamentLibrary/Bambu PLA-CF" ], + "OFEvEfw5": [ + "Flashforge/Flashforge PA" + ], "OFEwRwmL": [ "Cubicon/Cubicon PLA" ], @@ -2206,8 +2195,8 @@ "OFFAWVf0": [ "Qidi/QIDI PC-ABS-FR" ], - "OFFC0VqZ": [ - "Ratrig/RatRig BigNozzle PCTG" + "OFFFg2Pf": [ + "Flashforge/Flashforge ASA Basic" ], "OFFNYwWR": [ "OrcaFilamentLibrary/Bambu PA-CF" @@ -2250,7 +2239,6 @@ "OFGVwfK0": [ "OrcaFilamentLibrary/FilAr PLA-mate Gris" ], - "OFGc282l": [], "OFGcLA5R": [ "OrcaFilamentLibrary/FilAr PLA-mate Beige" ], @@ -2273,18 +2261,15 @@ "OFGxC8gB": [ "Creality/CR-Wood" ], + "OFGxuI0n": [ + "Flashforge/Flashforge PA-CF" + ], "OFH2nN08": [ "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" ], "OFH57ibH": [ "Snapmaker/Polymaker Silk PLA Family" ], - "OFH5UH6P": [ - "Flashforge/Flashforge ABS-GF" - ], - "OFH6Pjxe": [ - "Flashforge/Flashforge PLA Matte" - ], "OFH7b12v": [ "Creality/Generic PAHT-CF" ], @@ -2323,6 +2308,9 @@ "OFIE3vOf": [ "Anycubic/Anycubic PLA Matte" ], + "OFIK2H3G": [ + "Flashforge/Flashforge HS PLA" + ], "OFIKZxPF": [ "Creality/Generic PLA Wood" ], @@ -2356,13 +2344,16 @@ "OFIxOuOu": [ "Snapmaker/PolyLite PLA Starlight" ], - "OFIxitiU": [ + "OFJ3F2jm": [ "Flashforge/Flashforge PLA Basic" ], "OFJ3HRsR": [ "OrcaArena/Arena ABS" ], "OFJHBEGD": [], + "OFJJ0Ar3": [ + "Flashforge/Flashforge PLA Galaxy" + ], "OFJNeELv": [ "OrcaFilamentLibrary/FILL3D PA" ], @@ -2373,6 +2364,7 @@ "OFJQDUk3": [ "OrcaFilamentLibrary/FilAr PETG Cristal" ], + "OFJS560n": [], "OFJWKoYG": [ "iQ/Material4Print ABS Natur P1" ], @@ -2397,9 +2389,6 @@ "OFJxSqO4": [ "Wanhao France/YUMI PLA Direct Drive" ], - "OFK74HJD": [ - "Flashforge/Flashforge PLA Pro" - ], "OFK8XHPn": [ "Qidi/Overture ABS" ], @@ -2443,9 +2432,6 @@ "OrcaFilamentLibrary/Panchroma PLA Marble", "Snapmaker/Panchroma PLA Marble" ], - "OFKpQTJI": [ - "Flashforge/Flashforge TPU 65D" - ], "OFL9aRjN": [ "Snapmaker/Snapmaker PETG HF" ], @@ -2491,9 +2477,6 @@ "Elegoo/Elegoo Rapid PETG", "OrcaFilamentLibrary/Elegoo Rapid PETG" ], - "OFLYDIb8": [ - "Flashforge/Flashforge PLA Silk" - ], "OFLYDngx": [ "Qidi/Bambu PETG" ], @@ -2549,9 +2532,6 @@ "OFMDHOcT": [ "Qidi/QIDI TPU-Aero" ], - "OFMIma8C": [ - "Flashforge/Flashforge PLA Luminous" - ], "OFMK5gVo": [ "WonderMaker/WonderMaker PLA Basic" ], @@ -2575,6 +2555,9 @@ "OFMjtqTC": [ "OrcaFilamentLibrary/Bambu PLA Wood" ], + "OFMkAW6r": [ + "Flashforge/Flashforge PLA Color Change" + ], "OFMpxamb": [ "Flashforge/Flashforge PETG" ], @@ -2584,9 +2567,6 @@ "OFMuXBmO": [ "OrcaFilamentLibrary/Elas PLA Basic" ], - "OFMyLYV8": [ - "Flashforge/Flashforge PETG Transparent" - ], "OFN9fefN": [ "Cubicon/Cubicon ABS-A100" ], @@ -2605,9 +2585,6 @@ "OFNU9YIW": [ "OrcaFilamentLibrary/FilAr PETG Azul Boreal" ], - "OFNWnx2c": [ - "Flashforge/Flashforge TPU-95A" - ], "OFNemJM6": [ "OrcaFilamentLibrary/FilAr PLA Cobre" ], @@ -2682,9 +2659,6 @@ "OFPHLnoe": [ "Creality/HP-ASA" ], - "OFPQfNAf": [ - "Flashforge/Flashforge PETG Pro" - ], "OFPWPlSC": [ "OrcaFilamentLibrary/FILL3D PP" ], @@ -2764,9 +2738,6 @@ "OFQYaiGg": [ "Snapmaker/Snapmaker PET" ], - "OFQZeyZv": [ - "Flashforge/Flashforge PLA Buint Ti" - ], "OFQbjX3s": [ "OrcaFilamentLibrary/FILL3D PETG" ], @@ -2777,9 +2748,6 @@ "OFQe7sAx": [ "Anycubic/Anycubic PA6-CF" ], - "OFQiq4fb": [ - "Flashforge/Flashforge PVA" - ], "OFQyyO0l": [ "Flashforge/Polymaker CoPA" ], @@ -2833,14 +2801,17 @@ "OrcaFilamentLibrary/Panchroma PLA Silk", "Snapmaker/Panchroma PLA Silk" ], + "OFSDfduA": [ + "Flashforge/Flashforge TPU 65D" + ], "OFSa39yP": [ "Snapmaker/Snapmaker J1 PLA" ], "OFSbGfsz": [ "OrcaArena/Arena PLA Basic" ], - "OFShw1X8": [ - "Flashforge/Flashforge ABS Basic" + "OFSqIcJC": [ + "Flashforge/Flashforge TPU 95A" ], "OFSwbBWS": [], "OFT2jon4": [ @@ -2892,9 +2863,6 @@ "OFU7CKZt": [ "Volumic/Volumic ASA Ultra (Performance)" ], - "OFUCpLaL": [ - "Flashforge/FlashForge PPS" - ], "OFUF7oA4": [ "Creality/Hyper PC" ], @@ -2923,6 +2891,9 @@ "OFV5Q7j2": [ "Snapmaker/Snapmaker J1 TPE" ], + "OFV5c8hG": [ + "Flashforge/Flashforge PLA Sparkle" + ], "OFV5tNw6": [ "Elegoo/Elegoo PET-CF", "OrcaFilamentLibrary/Elegoo PET-CF" @@ -2930,6 +2901,7 @@ "OFV5wEMe": [ "Afinia/Afinia ABS" ], + "OFV8Mxqx": [], "OFVBlUFH": [], "OFVCkX5w": [ "OrcaFilamentLibrary/Bambu TPU 95A" @@ -2967,6 +2939,9 @@ "OFWTRJ1K": [ "OrcaFilamentLibrary/FilAr PLA Bronce" ], + "OFWXCbVF": [ + "Flashforge/Flashforge PC" + ], "OFWYtgCa": [ "Elegoo/Elegoo PLA Wood", "OrcaFilamentLibrary/Elegoo PLA Wood" @@ -2998,9 +2973,6 @@ "OFWgFOjn": [ "Snapmaker/Snapmaker PLA Silk" ], - "OFWnSvGu": [ - "Flashforge/Flashforge ASA-GF" - ], "OFWwF7K7": [ "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" ], @@ -3032,6 +3004,9 @@ "OFXi59OX": [ "Afinia/Afinia Value ABS" ], + "OFXiArjA": [ + "Flashforge/Flashforge PETG Pro" + ], "OFXk1emJ": [ "Artillery/Artillery PLA Basic" ], @@ -3142,10 +3117,19 @@ "Vzbot/Generic PETG", "Z-Bolt/Generic PETG" ], + "OFYTIMbj": [ + "Flashforge/Flashforge ABS-CF" + ], + "OFYYeMyQ": [ + "Flashforge/Flashforge PETG Basic" + ], "OFYd5uS3": [], "OFYezc6s": [ "FlyingBear/FlyingBear TPU" ], + "OFYfAcLY": [ + "Ratrig/Generic PCTG BigNozzle" + ], "OFYuowge": [ "FlyingBear/Other ABS", "InfiMech/Other ABS" @@ -3181,9 +3165,6 @@ "OFZtkHRq": [ "Anycubic/Anycubic PC" ], - "OFaBwRvT": [ - "Flashforge/Flashforge ASA Basic" - ], "OFaDOaNt": [ "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" ], @@ -3211,6 +3192,9 @@ "OFaYz8iE": [ "OrcaFilamentLibrary/Elas PLA Pro" ], + "OFaaddbQ": [ + "Flashforge/Flashforge PVA" + ], "OFaeIx7W": [ "iQ/Polymaker PETG Polymax black P1" ], @@ -3223,9 +3207,6 @@ "OFausr3F": [ "OrcaFilamentLibrary/FilAr PLA-mate Rosa" ], - "OFaz8VoR": [ - "Flashforge/Flashforge HIPS" - ], "OFb5EEM3": [ "Artillery/Artillery PET" ], @@ -3309,6 +3290,9 @@ "OFdkWDiy": [ "Cubicon/Cubicon PLAi21" ], + "OFdqkWtz": [ + "Flashforge/Flashforge PLA Luminous" + ], "OFdrYBmI": [ "Tiertime/Tiertime ASA" ], @@ -3321,9 +3305,6 @@ "OFe61n6v": [ "Ratrig/RatRig PunkFil PETG CF" ], - "OFe6sfXS": [ - "Flashforge/FlashForge PC" - ], "OFe8tuNb": [ "Tiertime/Tiertime PA6-CF" ], @@ -3345,9 +3326,6 @@ "OFeVzkSU": [ "Snapmaker/Fiberon PPS-GF20" ], - "OFec7Qiw": [ - "Flashforge/Flashforge PLA Sparkle" - ], "OFeelsSM": [ "Qidi/HATCHBOX PLA" ], @@ -3509,17 +3487,14 @@ "Tiertime/Generic TPU", "Vzbot/Generic TPU" ], - "OFgcryz4": [ - "Ratrig/RatRig BigNozzle ASA" - ], "OFgdaBOt": [ "Snapmaker/Polymaker Tough PLA Family" ], "OFgeM7nD": [ "Flashforge/Flashforge PA12-CF" ], - "OFgf4gZa": [ - "Flashforge/Flashforge PA" + "OFgjgN35": [ + "Flashforge/Flashforge PLA Silk" ], "OFglhKLM": [ "Qidi/QIDI PLA Rapido 0.8 nozzle" @@ -3616,9 +3591,6 @@ "Creality/Generic PLA-Silk", "Flashforge/Generic PLA-Silk" ], - "OFi7Bf0F": [ - "Flashforge/Flashforge ABS-CF" - ], "OFi90KlM": [ "Volumic/Volumic NYLON Ultra (Performance)" ], @@ -3631,6 +3603,9 @@ "OFiWaoqD": [ "OrcaFilamentLibrary/DREMC PPA-CF" ], + "OFibWuBd": [ + "Flashforge/Flashforge ABS Basic" + ], "OFilAA3b": [ "Eryone/Eryone PLA-CF" ], @@ -3646,9 +3621,6 @@ "OFitS8al": [ "Snapmaker/PolyLite PLA Neon" ], - "OFiuJSmy": [ - "Ratrig/RatRig BigNozzle PLA" - ], "OFiwEbze": [ "Volumic/PETG ESD (Performance)" ], @@ -3753,9 +3725,6 @@ "OFks6esg": [ "Creality/EN-PLA+" ], - "OFkwIWwc": [ - "Flashforge/Flashforge PLA Color Change" - ], "OFkx5MEe": [ "Artillery/Artillery PVA" ], @@ -3778,6 +3747,9 @@ "OFlSNkhc": [ "OrcaFilamentLibrary/Eolas Prints ASA" ], + "OFlgMgNM": [ + "Flashforge/Flashforge PPS" + ], "OFllmFhT": [ "Elegoo/Generic PETG PRO" ], @@ -3800,6 +3772,9 @@ "Elegoo/Elegoo PLA Basic", "OrcaFilamentLibrary/Elegoo PLA Basic" ], + "OFm4SivL": [ + "Flashforge/Flashforge PLA Pro" + ], "OFm4ysMO": [ "FlyingBear/FlyingBear ABS" ], @@ -3821,9 +3796,6 @@ "OFmKU2Ha": [ "Eryone/Eryone PLA" ], - "OFmQkb3c": [ - "Flashforge/Flashforge HS PLA Burnt Ti" - ], "OFmY0l6t": [ "Creality/Generic PLA Matte", "Elegoo/Generic PLA Matte", @@ -3835,9 +3807,6 @@ "OFmaeU4a": [ "OrcaFilamentLibrary/FilAr PLA-mate Naranja" ], - "OFmexHIS": [ - "Ratrig/RatRig BigNozzle PETG" - ], "OFmfizbq": [ "OrcaArena/Arena PLA Silk" ], @@ -3876,9 +3845,6 @@ "OFnHc3D6": [ "Creality/eSUN PLA-CF" ], - "OFnMv3W5": [ - "Flashforge/Flashforge HS PLA" - ], "OFnO4wnf": [ "Prusa/Prusament PLA" ], @@ -3915,6 +3881,9 @@ "OFnmp6rt": [ "Anycubic/Anycubic PLA+" ], + "OFnyHfcv": [ + "Ratrig/Generic ABS BigNozzle" + ], "OFo15hcT": [ "Qidi/QIDI PAHT-GF" ], @@ -3951,12 +3920,12 @@ "BBL/AliZ PETG", "OrcaFilamentLibrary/AliZ PETG" ], - "OFogbnCb": [ - "Flashforge/FlashForge PPS-CF" - ], "OFoiVqVM": [ "OrcaFilamentLibrary/Bambu PLA Basic" ], + "OFojbdhR": [ + "Flashforge/Flashforge ABS-GF" + ], "OForhBi4": [ "Cubicon/Cubicon ABSk" ], @@ -4005,6 +3974,9 @@ "Creality/Generic PPS", "Tiertime/Generic PPS" ], + "OFqFRiLb": [ + "Ratrig/Generic PLA BigNozzle" + ], "OFqGRZyH": [ "OrcaFilamentLibrary/Numakers PLA+" ], @@ -4042,15 +4014,15 @@ "OrcaFilamentLibrary/Panchroma PLA Matte", "Snapmaker/Panchroma PLA Matte" ], + "OFrZDhVt": [ + "Flashforge/Flashforge ASA-GF" + ], "OFrdZ0cK": [ "Creality/eSUN PETG+HS" ], "OFrjacXf": [ "Flashforge/Flashforge PET-CF" ], - "OFrnkURQ": [ - "Flashforge/Flashforge PLA Metal" - ], "OFrr67nG": [ "OrcaArena/Arena PC" ], @@ -4081,9 +4053,6 @@ "OFsHSVZc": [ "OrcaFilamentLibrary/Bambu Support W" ], - "OFsNJjpc": [ - "Ratrig/RatRig BigNozzle TPU" - ], "OFsP8PKH": [ "Z-Bolt/Generic ABS HT" ], @@ -4130,7 +4099,6 @@ "OFtRn8X8": [ "OrcaFilamentLibrary/FDplast SBS" ], - "OFtTYl9Q": [], "OFtefokm": [ "OrcaFilamentLibrary/FilAr PLA-mate Blanco" ], @@ -4138,9 +4106,6 @@ "BBL/COEX ASA PRIME", "OrcaFilamentLibrary/COEX ASA PRIME" ], - "OFtplX8o": [ - "Ratrig/RatRig BigNozzle ABS" - ], "OFtr8eZw": [ "OrcaFilamentLibrary/FDplast PLA" ], @@ -4165,11 +4130,8 @@ "Ratrig/Generic PCTG", "Tiertime/Generic PCTG" ], - "OFuFqYyG": [ - "Flashforge/Flashforge PAHT-CF" - ], - "OFuGRMNV": [ - "Flashforge/Flashforge PA-CF" + "OFuFEtKX": [ + "Flashforge/Flashforge PETG-CF" ], "OFuJ49uH": [ "Qidi/QIDI PETG Basic" @@ -4212,6 +4174,9 @@ "OFuxH0Uz": [ "Volumic/Volumic FLEX93 Ultra" ], + "OFvD0Qqt": [ + "Ratrig/Generic PETG BigNozzle" + ], "OFvDbkFq": [ "Prusa/Prusament PC Blend" ], @@ -4228,12 +4193,12 @@ "BBL/COEX PETG", "OrcaFilamentLibrary/COEX PETG" ], - "OFvVxvzZ": [ - "Flashforge/Flashforge PLA Metal" - ], "OFvVy7yo": [ "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant" ], + "OFvaLVML": [ + "Flashforge/Flashforge HIPS" + ], "OFvdZ2bx": [ "Qidi/QIDI WOOD Rapido" ], @@ -4284,6 +4249,12 @@ "OFwhLMs4": [ "Snapmaker/Snapmaker PLA SnapSpeed" ], + "OFwjMiKL": [ + "Flashforge/Flashforge PETG Transparent" + ], + "OFwlZ7gH": [ + "Flashforge/Flashforge TPU-90A" + ], "OFwu7IAG": [ "BBL/COEX PCTG PRIME", "OrcaFilamentLibrary/COEX PCTG PRIME" @@ -4294,6 +4265,9 @@ "OFwyt1xt": [ "Eryone/Eryone ASA-CF" ], + "OFx0WlzS": [ + "Flashforge/Flashforge TPU-95A" + ], "OFx8Lmsd": [ "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" ], @@ -4306,9 +4280,6 @@ "OFxJRuVF": [ "Anycubic/Anycubic PC-GF" ], - "OFxMGIPt": [ - "Flashforge/Flashforge PPS" - ], "OFxOHhZw": [ "Elegoo/Elegoo ABS", "OrcaFilamentLibrary/Elegoo ABS" @@ -5295,20 +5266,6 @@ "FLSun/Generic PLA-CF @FLSun", "FLSun/Generic PVA @FLSun", "FLSun/Generic TPU @FLSun", - "Flashforge/FlashForge PC @FF G4 0.6 HF nozzle", - "Flashforge/FlashForge PC @FF G4 0.6 nozzle", - "Flashforge/FlashForge PC @FF G4 0.8 HF nozzle", - "Flashforge/FlashForge PC @FF G4P 0.6 HF nozzle", - "Flashforge/FlashForge PC @FF G4P 0.6 nozzle", - "Flashforge/FlashForge PC @FF G4P 0.8 HF nozzle", - "Flashforge/FlashForge PPS @FF G4 0.6 HF nozzle", - "Flashforge/FlashForge PPS @FF G4 0.6 nozzle", - "Flashforge/FlashForge PPS @FF G4 0.8 HF nozzle", - "Flashforge/FlashForge PPS @FF G4P 0.6 HF nozzle", - "Flashforge/FlashForge PPS @FF G4P 0.6 nozzle", - "Flashforge/FlashForge PPS @FF G4P 0.8 HF nozzle", - "Flashforge/FlashForge PPS-CF @FF G4 0.6 nozzle", - "Flashforge/FlashForge PPS-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge ABS", "Flashforge/Flashforge ABS Basic", "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle", @@ -5436,10 +5393,12 @@ "Flashforge/Flashforge PA12-CF", "Flashforge/Flashforge PA6-CF", "Flashforge/Flashforge PA66-CF", - "Flashforge/Flashforge PAHT-CF @FF C5", - "Flashforge/Flashforge PAHT-CF @FF C5P", - "Flashforge/Flashforge PAHT-CF @FF G4", - "Flashforge/Flashforge PAHT-CF @FF G4P", + "Flashforge/Flashforge PC @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PC @FF G4 0.6 nozzle", + "Flashforge/Flashforge PC @FF G4 0.8 HF nozzle", + "Flashforge/Flashforge PC @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PC @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PC @FF G4P 0.8 HF nozzle", "Flashforge/Flashforge PET-CF", "Flashforge/Flashforge PET-CF @FF C5", "Flashforge/Flashforge PET-CF @FF C5P", @@ -5497,12 +5456,6 @@ "Flashforge/Flashforge PETG-CF @FF G4P", "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge PLA", - "Flashforge/Flashforge PLA Matte @FF C5", - "Flashforge/Flashforge PLA Matte @FF C5P", - "Flashforge/Flashforge PLA Metal @FF C5", - "Flashforge/Flashforge PLA Metal @FF C5P", - "Flashforge/Flashforge PLA Pro @FF C5", - "Flashforge/Flashforge PLA Pro @FF C5P", "Flashforge/Flashforge PLA Basic", "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle", "Flashforge/Flashforge PLA Basic @FF AD5X", @@ -5523,8 +5476,6 @@ "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle", "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle", "Flashforge/Flashforge PLA Basic @FF G4P HF", - "Flashforge/Flashforge PLA Buint Ti @FF G4 0.8 nozzle", - "Flashforge/Flashforge PLA Buint Ti @FF G4P 0.8 nozzle", "Flashforge/Flashforge PLA Color Change", "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle", "Flashforge/Flashforge PLA Color Change @FF AD5X", @@ -5589,6 +5540,8 @@ "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle", "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle", "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Matte @FF C5", + "Flashforge/Flashforge PLA Matte @FF C5P", "Flashforge/Flashforge PLA Matte @FF G4", "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle", "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle", @@ -5607,6 +5560,8 @@ "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle", "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle", "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Metal @FF C5", + "Flashforge/Flashforge PLA Metal @FF C5P", "Flashforge/Flashforge PLA Metal @FF G4", "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle", "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle", @@ -5625,6 +5580,8 @@ "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle", "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle", "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle", + "Flashforge/Flashforge PLA Pro @FF C5", + "Flashforge/Flashforge PLA Pro @FF C5P", "Flashforge/Flashforge PLA Pro @FF G4", "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle", "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle", @@ -5688,12 +5645,20 @@ "Flashforge/Flashforge PPA-CF @FF C5P", "Flashforge/Flashforge PPA-GF", "Flashforge/Flashforge PPS @FF G4", + "Flashforge/Flashforge PPS @FF G4 0.6 HF nozzle", + "Flashforge/Flashforge PPS @FF G4 0.6 nozzle", + "Flashforge/Flashforge PPS @FF G4 0.8 HF nozzle", "Flashforge/Flashforge PPS @FF G4P", + "Flashforge/Flashforge PPS @FF G4P 0.6 HF nozzle", + "Flashforge/Flashforge PPS @FF G4P 0.6 nozzle", + "Flashforge/Flashforge PPS @FF G4P 0.8 HF nozzle", "Flashforge/Flashforge PPS-CF", "Flashforge/Flashforge PPS-CF @FF C5", "Flashforge/Flashforge PPS-CF @FF C5P", "Flashforge/Flashforge PPS-CF @FF G4", + "Flashforge/Flashforge PPS-CF @FF G4 0.6 nozzle", "Flashforge/Flashforge PPS-CF @FF G4P", + "Flashforge/Flashforge PPS-CF @FF G4P 0.6 nozzle", "Flashforge/Flashforge PVA @FF C5", "Flashforge/Flashforge PVA @FF C5P", "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle", @@ -6761,22 +6726,22 @@ "RH3D/Generic PLA @E3NG v1.2S", "RH3D/Generic TPU @E3NG v1.2S", "Ratrig/Generic ABS @RatRig", + "Ratrig/Generic ABS BigNozzle @RatRig", "Ratrig/Generic ASA @RatRig", + "Ratrig/Generic ASA BigNozzle @RatRig", "Ratrig/Generic PA @RatRig", "Ratrig/Generic PA-CF @RatRig", "Ratrig/Generic PC @RatRig", "Ratrig/Generic PCTG @RatRig", + "Ratrig/Generic PCTG BigNozzle @RatRig", "Ratrig/Generic PETG @RatRig", + "Ratrig/Generic PETG BigNozzle @RatRig", "Ratrig/Generic PLA @RatRig", + "Ratrig/Generic PLA BigNozzle @RatRig", "Ratrig/Generic PLA-CF @RatRig", "Ratrig/Generic PVA @RatRig", "Ratrig/Generic TPU @RatRig", - "Ratrig/RatRig BigNozzle ABS", - "Ratrig/RatRig BigNozzle ASA", - "Ratrig/RatRig BigNozzle PCTG", - "Ratrig/RatRig BigNozzle PETG", - "Ratrig/RatRig BigNozzle PLA", - "Ratrig/RatRig BigNozzle TPU", + "Ratrig/Generic TPU BigNozzle @RatRig", "Ratrig/RatRig PunkFil ABS", "Ratrig/RatRig PunkFil PETG", "Ratrig/RatRig PunkFil PETG CF", @@ -7177,13 +7142,6 @@ "QIDI ASA-CF" ] ], - "OF1bQyX2": [ - [ - "Generic", - "PLA", - "Flashforge PLA Matte" - ] - ], "OF1d7c3A": [ [ "Snapmaker", @@ -7254,13 +7212,6 @@ "FilAr PETG Azul Imperial" ] ], - "OF2bZtyg": [ - [ - "Generic", - "PLA-CF", - "Flashforge PLA-CF" - ] - ], "OF2hfMcG": [ [ "Orca Arena", @@ -7352,13 +7303,6 @@ "InfiMech PLA Hyper" ] ], - "OF41jaTh": [ - [ - "Generic", - "TPU-90A", - "Flashforge TPU-90A" - ] - ], "OF43Raws": [ [ "Polymaker", @@ -7387,6 +7331,13 @@ "Hyper PAHT-CF" ] ], + "OF4GM5qX": [ + [ + "Generic", + "ASA", + "Generic ASA BigNozzle" + ] + ], "OF4KsW72": [ [ "FilAr", @@ -7492,13 +7443,6 @@ "PolyLite PLA" ] ], - "OF5NQFKI": [ - [ - "Generic", - "PLA", - "Flashforge PLA Galaxy" - ] - ], "OF5NqBfC": [ [ "Yumi", @@ -7576,6 +7520,13 @@ "FilAr PETG" ] ], + "OF5tX6va": [ + [ + "Generic", + "TPU", + "Generic TPU BigNozzle" + ] + ], "OF5umxxT": [ [ "Polymaker", @@ -7590,13 +7541,6 @@ "FilAr PLA-mate Azul" ] ], - "OF5w29Kq": [ - [ - "Generic", - "PETG", - "Flashforge HS PETG" - ] - ], "OF65InrS": [ [ "Snapmaker", @@ -7660,6 +7604,13 @@ "Fiberthree PACF Pro P2" ] ], + "OF6qAuyi": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA Matte" + ] + ], "OF6rdQ6M": [ [ "Generic", @@ -7667,13 +7618,6 @@ "Generic PPS-CF" ] ], - "OF6ueBwd": [ - [ - "Generic", - "PLA", - "Flashforge PLA Pro" - ] - ], "OF70zbGS": [ [ "Creality", @@ -7772,6 +7716,13 @@ "Hyper ABS" ] ], + "OF8GtyKJ": [ + [ + "Flashforge", + "TPU-64D", + "Flashforge TPU-64D" + ] + ], "OF8Hx3Pi": [ [ "Cubicon", @@ -7786,6 +7737,13 @@ "Snapmaker J1 PET" ] ], + "OF8O09RG": [ + [ + "Flashforge", + "PLA", + "Flashforge HS PLA Burnt Ti" + ] + ], "OF8Tlg47": [ [ "Generic", @@ -7842,13 +7800,6 @@ "Artillery PETG Basic" ] ], - "OF995YXg": [ - [ - "Generic", - "TPU-64D", - "Flashforge TPU-64D" - ] - ], "OF99UMPq": [ [ "COEX 3D", @@ -7898,6 +7849,13 @@ "Anycubic PETG-CF" ] ], + "OF9cAwMK": [ + [ + "Flashforge", + "PLA-CF", + "Flashforge PLA-CF" + ] + ], "OF9emAI9": [ [ "RatRig", @@ -7954,11 +7912,11 @@ "Artillery PLA-CF" ] ], - "OFAf9pJF": [ + "OFAebKg8": [ [ - "Generic", - "TPU", - "Flashforge TPU 95A" + "Flashforge", + "PLA", + "Flashforge PLA Metal" ] ], "OFAnyRUI": [ @@ -7996,13 +7954,6 @@ "LHS PCTG" ] ], - "OFBK6zAi": [ - [ - "Generic", - "PETG-CF", - "Flashforge PETG-CF" - ] - ], "OFBLktDy": [ [ "Creality", @@ -8297,6 +8248,13 @@ "Bambu PLA Sparkle" ] ], + "OFDxxTpW": [ + [ + "Flashforge", + "PETG", + "Flashforge HS PETG" + ] + ], "OFE0NFRh": [ [ "COEX 3D", @@ -8311,13 +8269,6 @@ "Bambu PLA Silk" ] ], - "OFEMfQsX": [ - [ - "Generic", - "PETG", - "Flashforge PETG Basic" - ] - ], "OFEOnBj6": [ [ "Snapmaker", @@ -8409,6 +8360,13 @@ "Bambu PLA-CF" ] ], + "OFEvEfw5": [ + [ + "Flashforge", + "PA", + "Flashforge PA" + ] + ], "OFEwRwmL": [ [ "Cubicon", @@ -8444,11 +8402,11 @@ "QIDI PC-ABS-FR" ] ], - "OFFC0VqZ": [ + "OFFFg2Pf": [ [ - "Generic", - "PETG", - "RatRig BigNozzle PCTG" + "Flashforge", + "ASA", + "Flashforge ASA Basic" ] ], "OFFNYwWR": [ @@ -8542,13 +8500,6 @@ "FilAr PLA-mate Gris" ] ], - "OFGc282l": [ - [ - "Generic", - "PLA", - "Flashforge PLA-SILK" - ] - ], "OFGcLA5R": [ [ "FilAr", @@ -8598,6 +8549,13 @@ "CR-Wood" ] ], + "OFGxuI0n": [ + [ + "Flashforge", + "PA-CF", + "Flashforge PA-CF" + ] + ], "OFH2nN08": [ [ "Eolas Prints", @@ -8612,20 +8570,6 @@ "Polymaker Silk PLA Family" ] ], - "OFH5UH6P": [ - [ - "Generic", - "ABS-GF", - "Flashforge ABS-GF" - ] - ], - "OFH6Pjxe": [ - [ - "Generic", - "PLA", - "Flashforge PLA Matte" - ] - ], "OFH7b12v": [ [ "Generic", @@ -8710,6 +8654,13 @@ "Anycubic PLA Matte" ] ], + "OFIK2H3G": [ + [ + "Flashforge", + "PLA", + "Flashforge HS PLA" + ] + ], "OFIKZxPF": [ [ "Generic", @@ -8787,9 +8738,9 @@ "PolyLite PLA Starlight" ] ], - "OFIxitiU": [ + "OFJ3F2jm": [ [ - "Generic", + "Flashforge", "PLA", "Flashforge PLA Basic" ] @@ -8808,6 +8759,13 @@ "DREMC PLA+ HS" ] ], + "OFJJ0Ar3": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA Galaxy" + ] + ], "OFJNeELv": [ [ "FILL3D", @@ -8829,6 +8787,13 @@ "FilAr PETG Cristal" ] ], + "OFJS560n": [ + [ + "Flashforge", + "ASA", + "Flashforge ASA" + ] + ], "OFJWKoYG": [ [ "iQ Materials", @@ -8885,13 +8850,6 @@ "YUMI PLA Direct Drive" ] ], - "OFK74HJD": [ - [ - "Generic", - "PLA", - "Flashforge PLA Pro" - ] - ], "OFK8XHPn": [ [ "Overture", @@ -8990,13 +8948,6 @@ "Panchroma PLA Marble" ] ], - "OFKpQTJI": [ - [ - "Generic", - "TPU", - "Flashforge TPU 65D" - ] - ], "OFL9aRjN": [ [ "Snapmaker", @@ -9060,13 +9011,6 @@ "Elegoo Rapid PETG" ] ], - "OFLYDIb8": [ - [ - "Generic", - "PLA", - "Flashforge PLA Silk" - ] - ], "OFLYDngx": [ [ "Bambu Lab", @@ -9151,13 +9095,6 @@ "QIDI TPU-Aero" ] ], - "OFMIma8C": [ - [ - "Generic", - "PLA", - "Flashforge PLA Luminous" - ] - ], "OFMK5gVo": [ [ "WonderMaker", @@ -9207,6 +9144,13 @@ "Bambu PLA Wood" ] ], + "OFMkAW6r": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA Color Change" + ] + ], "OFMpxamb": [ [ "Flashforge", @@ -9228,13 +9172,6 @@ "Elas PLA Basic" ] ], - "OFMyLYV8": [ - [ - "Generic", - "PETG", - "Flashforge PETG Transparent" - ] - ], "OFN9fefN": [ [ "Cubicon", @@ -9277,13 +9214,6 @@ "FilAr PETG Azul Boreal" ] ], - "OFNWnx2c": [ - [ - "Generic", - "TPU-95A", - "Flashforge TPU-95A" - ] - ], "OFNemJM6": [ [ "FilAr", @@ -9445,13 +9375,6 @@ "HP-ASA" ] ], - "OFPQfNAf": [ - [ - "Generic", - "PETG", - "Flashforge PETG Pro" - ] - ], "OFPWPlSC": [ [ "FILL3D", @@ -9592,13 +9515,6 @@ "Snapmaker PET" ] ], - "OFQZeyZv": [ - [ - "Generic", - "PLA", - "Flashforge PLA Buint Ti" - ] - ], "OFQbjX3s": [ [ "FILL3D", @@ -9620,13 +9536,6 @@ "Anycubic PA6-CF" ] ], - "OFQiq4fb": [ - [ - "Generic", - "PVA", - "Flashforge PVA" - ] - ], "OFQyyO0l": [ [ "Polymaker", @@ -9746,6 +9655,13 @@ "Panchroma PLA Silk" ] ], + "OFSDfduA": [ + [ + "Flashforge", + "TPU", + "Flashforge TPU 65D" + ] + ], "OFSa39yP": [ [ "Snapmaker", @@ -9760,11 +9676,11 @@ "Arena PLA Basic" ] ], - "OFShw1X8": [ + "OFSqIcJC": [ [ - "Generic", - "ABS", - "Flashforge ABS Basic" + "Flashforge", + "TPU", + "Flashforge TPU 95A" ] ], "OFSwbBWS": [ @@ -9886,13 +9802,6 @@ "Volumic ASA Ultra (Performance)" ] ], - "OFUCpLaL": [ - [ - "Generic", - "PPS", - "FlashForge PPS" - ] - ], "OFUF7oA4": [ [ "Creality", @@ -9956,6 +9865,13 @@ "Snapmaker J1 TPE" ] ], + "OFV5c8hG": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA Sparkle" + ] + ], "OFV5tNw6": [ [ "Elegoo", @@ -9970,6 +9886,13 @@ "Afinia ABS" ] ], + "OFV8Mxqx": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA-SILK" + ] + ], "OFVBlUFH": [ [ "DREMC", @@ -10054,6 +9977,13 @@ "FilAr PLA Bronce" ] ], + "OFWXCbVF": [ + [ + "Flashforge", + "PC", + "Flashforge PC" + ] + ], "OFWYtgCa": [ [ "Elegoo", @@ -10089,13 +10019,6 @@ "Snapmaker PLA Silk" ] ], - "OFWnSvGu": [ - [ - "Generic", - "ASA-GF", - "Flashforge ASA-GF" - ] - ], "OFWwF7K7": [ [ "FilAr", @@ -10166,6 +10089,13 @@ "Afinia Value ABS" ] ], + "OFXiArjA": [ + [ + "Flashforge", + "PETG", + "Flashforge PETG Pro" + ] + ], "OFXk1emJ": [ [ "Artillery", @@ -10278,6 +10208,20 @@ "Generic PETG" ] ], + "OFYTIMbj": [ + [ + "Flashforge", + "ABS-CF", + "Flashforge ABS-CF" + ] + ], + "OFYYeMyQ": [ + [ + "Flashforge", + "PETG", + "Flashforge PETG Basic" + ] + ], "OFYd5uS3": [ [ "DREMC", @@ -10292,6 +10236,13 @@ "FlyingBear TPU" ] ], + "OFYfAcLY": [ + [ + "Generic", + "PETG", + "Generic PCTG BigNozzle" + ] + ], "OFYuowge": [ [ "Other", @@ -10369,13 +10320,6 @@ "Anycubic PC" ] ], - "OFaBwRvT": [ - [ - "Generic", - "ASA", - "Flashforge ASA Basic" - ] - ], "OFaDOaNt": [ [ "FilAr", @@ -10439,6 +10383,13 @@ "Elas PLA Pro" ] ], + "OFaaddbQ": [ + [ + "Flashforge", + "PVA", + "Flashforge PVA" + ] + ], "OFaeIx7W": [ [ "iQ Materials", @@ -10467,13 +10418,6 @@ "FilAr PLA-mate Rosa" ] ], - "OFaz8VoR": [ - [ - "Generic", - "HIPS", - "Flashforge HIPS" - ] - ], "OFb5EEM3": [ [ "Artillery", @@ -10656,6 +10600,13 @@ "Cubicon PLAi21" ] ], + "OFdqkWtz": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA Luminous" + ] + ], "OFdrYBmI": [ [ "Tiertime", @@ -10684,13 +10635,6 @@ "RatRig PunkFil PETG CF" ] ], - "OFe6sfXS": [ - [ - "Generic", - "PC", - "FlashForge PC" - ] - ], "OFe8tuNb": [ [ "Tiertime", @@ -10740,13 +10684,6 @@ "Fiberon PPS-GF20" ] ], - "OFec7Qiw": [ - [ - "Generic", - "PLA", - "Flashforge PLA Sparkle" - ] - ], "OFeelsSM": [ [ "HATCHBOX", @@ -11006,13 +10943,6 @@ "Generic TPU" ] ], - "OFgcryz4": [ - [ - "Generic", - "ASA", - "RatRig BigNozzle ASA" - ] - ], "OFgdaBOt": [ [ "Polymaker", @@ -11027,11 +10957,11 @@ "Flashforge PA12-CF" ] ], - "OFgf4gZa": [ + "OFgjgN35": [ [ - "Generic", - "PA", - "Flashforge PA" + "Flashforge", + "PLA", + "Flashforge PLA Silk" ] ], "OFglhKLM": [ @@ -11237,13 +11167,6 @@ "Generic PLA-Silk" ] ], - "OFi7Bf0F": [ - [ - "Generic", - "ABS-CF", - "Flashforge ABS-CF" - ] - ], "OFi90KlM": [ [ "Volumic", @@ -11272,6 +11195,13 @@ "DREMC PPA-CF" ] ], + "OFibWuBd": [ + [ + "Flashforge", + "ABS", + "Flashforge ABS Basic" + ] + ], "OFilAA3b": [ [ "Eryone", @@ -11307,13 +11237,6 @@ "PolyLite PLA Neon" ] ], - "OFiuJSmy": [ - [ - "Generic", - "PLA", - "RatRig BigNozzle PLA" - ] - ], "OFiwEbze": [ [ "Volumic", @@ -11545,13 +11468,6 @@ "EN-PLA+" ] ], - "OFkwIWwc": [ - [ - "Generic", - "PLA", - "Flashforge PLA Color Change" - ] - ], "OFkx5MEe": [ [ "Artillery", @@ -11601,6 +11517,13 @@ "Eolas Prints ASA" ] ], + "OFlgMgNM": [ + [ + "Flashforge", + "PPS", + "Flashforge PPS" + ] + ], "OFllmFhT": [ [ "Generic", @@ -11643,6 +11566,13 @@ "Elegoo PLA Basic" ] ], + "OFm4SivL": [ + [ + "Flashforge", + "PLA", + "Flashforge PLA Pro" + ] + ], "OFm4ysMO": [ [ "FlyingBear", @@ -11692,13 +11622,6 @@ "Eryone PLA" ] ], - "OFmQkb3c": [ - [ - "Generic", - "PLA", - "Flashforge HS PLA Burnt Ti" - ] - ], "OFmY0l6t": [ [ "Generic", @@ -11720,13 +11643,6 @@ "FilAr PLA-mate Naranja" ] ], - "OFmexHIS": [ - [ - "Generic", - "PETG", - "RatRig BigNozzle PETG" - ] - ], "OFmfizbq": [ [ "Orca Arena", @@ -11797,13 +11713,6 @@ "eSUN PLA-CF" ] ], - "OFnMv3W5": [ - [ - "Generic", - "PLA", - "Flashforge HS PLA" - ] - ], "OFnO4wnf": [ [ "Prusa Polymers", @@ -11888,6 +11797,13 @@ "Anycubic PLA+" ] ], + "OFnyHfcv": [ + [ + "Generic", + "ABS", + "Generic ABS BigNozzle" + ] + ], "OFo15hcT": [ [ "QIDI", @@ -11944,13 +11860,6 @@ "AliZ PETG" ] ], - "OFogbnCb": [ - [ - "Generic", - "PPS-CF", - "FlashForge PPS-CF" - ] - ], "OFoiVqVM": [ [ "Bambu Lab", @@ -11958,6 +11867,13 @@ "Bambu PLA Basic" ] ], + "OFojbdhR": [ + [ + "Flashforge", + "ABS-GF", + "Flashforge ABS-GF" + ] + ], "OForhBi4": [ [ "Cubicon", @@ -12063,6 +11979,13 @@ "Generic PPS" ] ], + "OFqFRiLb": [ + [ + "Generic", + "PLA", + "Generic PLA BigNozzle" + ] + ], "OFqGRZyH": [ [ "Numakers", @@ -12140,6 +12063,13 @@ "Panchroma PLA Matte" ] ], + "OFrZDhVt": [ + [ + "Flashforge", + "ASA-GF", + "Flashforge ASA-GF" + ] + ], "OFrdZ0cK": [ [ "eSUN", @@ -12154,13 +12084,6 @@ "Flashforge PET-CF" ] ], - "OFrnkURQ": [ - [ - "Generic", - "PLA", - "Flashforge PLA Metal" - ] - ], "OFrr67nG": [ [ "Orca Arena", @@ -12217,13 +12140,6 @@ "Bambu Support W" ] ], - "OFsNJjpc": [ - [ - "Generic", - "TPU", - "RatRig BigNozzle TPU" - ] - ], "OFsP8PKH": [ [ "Generic", @@ -12329,13 +12245,6 @@ "FDplast SBS" ] ], - "OFtTYl9Q": [ - [ - "Generic", - "ASA", - "Flashforge ASA" - ] - ], "OFtefokm": [ [ "FilAr", @@ -12350,13 +12259,6 @@ "COEX ASA PRIME" ] ], - "OFtplX8o": [ - [ - "Generic", - "ABS", - "RatRig BigNozzle ABS" - ] - ], "OFtr8eZw": [ [ "FDplast", @@ -12406,18 +12308,11 @@ "Generic PCTG" ] ], - "OFuFqYyG": [ + "OFuFEtKX": [ [ - "Generic", - "PAHT-CF", - "Flashforge PAHT-CF" - ] - ], - "OFuGRMNV": [ - [ - "Generic", - "PA-CF", - "Flashforge PA-CF" + "Flashforge", + "PETG-CF", + "Flashforge PETG-CF" ] ], "OFuJ49uH": [ @@ -12511,6 +12406,13 @@ "Volumic FLEX93 Ultra" ] ], + "OFvD0Qqt": [ + [ + "Generic", + "PETG", + "Generic PETG BigNozzle" + ] + ], "OFvDbkFq": [ [ "Prusa Polymers", @@ -12546,13 +12448,6 @@ "COEX PETG" ] ], - "OFvVxvzZ": [ - [ - "Generic", - "PLA", - "Flashforge PLA Metal" - ] - ], "OFvVy7yo": [ [ "Eolas Prints", @@ -12560,6 +12455,13 @@ "Eolas Prints TPU D60 UV Resistant" ] ], + "OFvaLVML": [ + [ + "Flashforge", + "HIPS", + "Flashforge HIPS" + ] + ], "OFvdZ2bx": [ [ "QIDI", @@ -12672,6 +12574,20 @@ "Snapmaker PLA SnapSpeed" ] ], + "OFwjMiKL": [ + [ + "Flashforge", + "PETG", + "Flashforge PETG Transparent" + ] + ], + "OFwlZ7gH": [ + [ + "Flashforge", + "TPU-90A", + "Flashforge TPU-90A" + ] + ], "OFwu7IAG": [ [ "COEX 3D", @@ -12693,6 +12609,13 @@ "Eryone ASA-CF" ] ], + "OFx0WlzS": [ + [ + "Flashforge", + "TPU-95A", + "Flashforge TPU-95A" + ] + ], "OFx8Lmsd": [ [ "Eolas Prints", @@ -12721,13 +12644,6 @@ "Anycubic PC-GF" ] ], - "OFxMGIPt": [ - [ - "Generic", - "PPS", - "Flashforge PPS" - ] - ], "OFxOHhZw": [ [ "Elegoo", From afa806da182ae5570d2cc3859993ce30b56a532a Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 1 Sep 2026 23:45:55 +0800 Subject: [PATCH 32/52] Update Dremel and Ratrig filament profiles; remove deprecated entries and adjust versioning --- resources/profiles/Dremel.json | 6 +- .../Generic PLA @Dremel 3D20 all.json | 5 +- .../Generic PLA @Dremel 3D40 all.json | 5 +- .../Generic PLA @Dremel 3D45 all.json | 11 +- .../Dremel/filament/Generic PLA @Dremel.json | 24 --- .../Dremel/machine/fdm_dremel_common.json | 3 - resources/profiles/Ratrig.json | 38 +---- .../Generic PCTG BigNozzle @RatRig.json | 4 +- .../Ratrig/filament/fdm_filament_abs.json | 88 ----------- .../Ratrig/filament/fdm_filament_asa.json | 88 ----------- .../Ratrig/filament/fdm_filament_common.json | 141 ------------------ .../Ratrig/filament/fdm_filament_pa.json | 85 ----------- .../Ratrig/filament/fdm_filament_pc.json | 88 ----------- .../Ratrig/filament/fdm_filament_pet.json | 82 ---------- .../Ratrig/filament/fdm_filament_pla.json | 94 ------------ .../Ratrig/filament/fdm_filament_pva.json | 100 ------------- .../Ratrig/filament/fdm_filament_tpu.json | 88 ----------- resources/profiles/retired_filament_ids.json | 6 + scripts/filament_id_snapshot.json | 21 ++- 19 files changed, 38 insertions(+), 939 deletions(-) delete mode 100644 resources/profiles/Dremel/filament/Generic PLA @Dremel.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_abs.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_asa.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_common.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_pa.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_pc.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_pet.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_pla.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_pva.json delete mode 100644 resources/profiles/Ratrig/filament/fdm_filament_tpu.json diff --git a/resources/profiles/Dremel.json b/resources/profiles/Dremel.json index 951763b563..3d804f6a1b 100644 --- a/resources/profiles/Dremel.json +++ b/resources/profiles/Dremel.json @@ -1,6 +1,6 @@ { "name": "Dremel", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Dremel configurations", "machine_model_list": [ @@ -88,10 +88,6 @@ "name": "fdm_filament_pla", "sub_path": "filament/fdm_filament_pla.json" }, - { - "name": "Generic PLA @Dremel", - "sub_path": "filament/Generic PLA @Dremel.json" - }, { "name": "Generic PLA @Dremel 3D20 all", "sub_path": "filament/Generic PLA @Dremel 3D20 all.json" 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 e38769a288..2dbcc6184e 100644 --- a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D20 all.json @@ -1,12 +1,15 @@ { "type": "filament", "name": "Generic PLA @Dremel 3D20 all", - "inherits": "Generic PLA @Dremel", + "inherits": "fdm_filament_pla", "renamed_from": "Dremel Generic PLA @3D20 all;Dremel Generic PLA 3D20 all", "from": "system", "setting_id": "UggXEvCig0b6S8Vx", "filament_id": "OFDSrzZ8", "instantiation": "true", + "filament_flow_ratio": [ + "0.98" + ], "filament_max_volumetric_speed": [ "9" ], 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 4c7afbe819..03704ce5e9 100644 --- a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D40 all.json @@ -1,12 +1,15 @@ { "type": "filament", "name": "Generic PLA @Dremel 3D40 all", - "inherits": "Generic PLA @Dremel", + "inherits": "fdm_filament_pla", "renamed_from": "Dremel Generic PLA @3D40 all;Dremel Generic PLA 3D40 all", "from": "system", "setting_id": "VUOtsWfy46cvAyBT", "filament_id": "OFDSrzZ8", "instantiation": "true", + "filament_flow_ratio": [ + "0.98" + ], "filament_max_volumetric_speed": [ "9" ], 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 a40cebf06d..78f747e0f9 100644 --- a/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json +++ b/resources/profiles/Dremel/filament/Generic PLA @Dremel 3D45 all.json @@ -1,12 +1,21 @@ { "type": "filament", "name": "Generic PLA @Dremel 3D45 all", - "inherits": "Generic PLA @Dremel", + "inherits": "fdm_filament_pla", "renamed_from": "Dremel Generic PLA @3D45 all;Dremel Generic PLA 3D45 all", "from": "system", "setting_id": "qEeBb3Pix2iDT3SD", "filament_id": "OFDSrzZ8", "instantiation": "true", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "8" + ], "slow_down_min_speed": "10", "close_fan_the_first_x_layers": "3", "filament_loading_speed_start": "3", diff --git a/resources/profiles/Dremel/filament/Generic PLA @Dremel.json b/resources/profiles/Dremel/filament/Generic PLA @Dremel.json deleted file mode 100644 index 9cf4e162f0..0000000000 --- a/resources/profiles/Dremel/filament/Generic PLA @Dremel.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "name": "Generic PLA @Dremel", - "inherits": "fdm_filament_pla", - "renamed_from": "Dremel Generic PLA", - "from": "system", - "setting_id": "jYydSWbyE3JzoKnQ", - "filament_id": "OFDSrzZ8", - "instantiation": "true", - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "slow_down_layer_time": [ - "8" - ], - "compatible_printers": [ - "Dremel 3D45 0.4 nozzle", - "Dremel 3D40 0.4 nozzle", - "Dremel 3D20 0.4 nozzle" - ] -} diff --git a/resources/profiles/Dremel/machine/fdm_dremel_common.json b/resources/profiles/Dremel/machine/fdm_dremel_common.json index 6f7504f9fa..0dae7eb9ea 100644 --- a/resources/profiles/Dremel/machine/fdm_dremel_common.json +++ b/resources/profiles/Dremel/machine/fdm_dremel_common.json @@ -123,9 +123,6 @@ "wipe": [ "1" ], - "default_filament_profile": [ - "Generic PLA @Dremel" - ], "bed_exclude_area": [ "0x0" ], diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json index 710554df5a..a2b792ebdd 100644 --- a/resources/profiles/Ratrig.json +++ b/resources/profiles/Ratrig.json @@ -1,6 +1,6 @@ { "name": "RatRig", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "RatRig configurations", "machine_model_list": [ @@ -276,42 +276,6 @@ } ], "filament_list": [ - { - "name": "fdm_filament_common", - "sub_path": "filament/fdm_filament_common.json" - }, - { - "name": "fdm_filament_abs", - "sub_path": "filament/fdm_filament_abs.json" - }, - { - "name": "fdm_filament_asa", - "sub_path": "filament/fdm_filament_asa.json" - }, - { - "name": "fdm_filament_pa", - "sub_path": "filament/fdm_filament_pa.json" - }, - { - "name": "fdm_filament_pc", - "sub_path": "filament/fdm_filament_pc.json" - }, - { - "name": "fdm_filament_pet", - "sub_path": "filament/fdm_filament_pet.json" - }, - { - "name": "fdm_filament_pla", - "sub_path": "filament/fdm_filament_pla.json" - }, - { - "name": "fdm_filament_pva", - "sub_path": "filament/fdm_filament_pva.json" - }, - { - "name": "fdm_filament_tpu", - "sub_path": "filament/fdm_filament_tpu.json" - }, { "name": "Generic ABS BigNozzle @RatRig", "sub_path": "filament/Generic ABS BigNozzle @RatRig.json" diff --git a/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json index 0592709a82..2e47eb6765 100644 --- a/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json +++ b/resources/profiles/Ratrig/filament/Generic PCTG BigNozzle @RatRig.json @@ -1,11 +1,11 @@ { "type": "filament", "name": "Generic PCTG BigNozzle @RatRig", - "inherits": "fdm_filament_pet", + "inherits": "fdm_filament_pctg", "renamed_from": "RatRig BigNozzle PCTG", "from": "system", "setting_id": "HPaol79uY9NdhasQ", - "filament_id": "OFYfAcLY", + "filament_id": "OFXW4CDh", "instantiation": "true", "reduce_fan_stop_start_freq": [ "1" diff --git a/resources/profiles/Ratrig/filament/fdm_filament_abs.json b/resources/profiles/Ratrig/filament/fdm_filament_abs.json deleted file mode 100644 index 6232c6bf6d..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_abs.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_abs", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "105" - ], - "eng_plate_temp": [ - "105" - ], - "hot_plate_temp": [ - "105" - ], - "textured_plate_temp": [ - "105" - ], - "cool_plate_temp_initial_layer": [ - "105" - ], - "eng_plate_temp_initial_layer": [ - "105" - ], - "hot_plate_temp_initial_layer": [ - "105" - ], - "textured_plate_temp_initial_layer": [ - "105" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "fan_cooling_layer_time": [ - "30" - ], - "filament_max_volumetric_speed": [ - "28.6" - ], - "filament_type": [ - "ABS" - ], - "filament_density": [ - "1.04" - ], - "filament_cost": [ - "20" - ], - "nozzle_temperature_initial_layer": [ - "260" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "10" - ], - "overhang_fan_threshold": [ - "25%" - ], - "overhang_fan_speed": [ - "80" - ], - "nozzle_temperature": [ - "260" - ], - "temperature_vitrification": [ - "110" - ], - "nozzle_temperature_range_low": [ - "240" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "3" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_asa.json b/resources/profiles/Ratrig/filament/fdm_filament_asa.json deleted file mode 100644 index 0b3ca804e8..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_asa.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_asa", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "105" - ], - "eng_plate_temp": [ - "105" - ], - "hot_plate_temp": [ - "105" - ], - "textured_plate_temp": [ - "105" - ], - "cool_plate_temp_initial_layer": [ - "105" - ], - "eng_plate_temp_initial_layer": [ - "105" - ], - "hot_plate_temp_initial_layer": [ - "105" - ], - "textured_plate_temp_initial_layer": [ - "105" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "fan_cooling_layer_time": [ - "35" - ], - "filament_max_volumetric_speed": [ - "28.6" - ], - "filament_type": [ - "ASA" - ], - "filament_density": [ - "1.04" - ], - "filament_cost": [ - "20" - ], - "nozzle_temperature_initial_layer": [ - "260" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "10" - ], - "overhang_fan_threshold": [ - "25%" - ], - "overhang_fan_speed": [ - "80" - ], - "nozzle_temperature": [ - "260" - ], - "temperature_vitrification": [ - "110" - ], - "nozzle_temperature_range_low": [ - "240" - ], - "nozzle_temperature_range_high": [ - "270" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "3" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_common.json b/resources/profiles/Ratrig/filament/fdm_filament_common.json deleted file mode 100644 index ab5b8305a6..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_common.json +++ /dev/null @@ -1,141 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "hot_plate_temp": [ - "60" - ], - "textured_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "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": [ - "1" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "fan_cooling_layer_time": [ - "60" - ], - "filament_cost": [ - "0" - ], - "filament_density": [ - "0" - ], - "filament_deretraction_speed": [ - "nil" - ], - "filament_diameter": [ - "1.75" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_minimal_purge_on_wipe_tower": [ - "15" - ], - "filament_retraction_minimum_travel": [ - "nil" - ], - "filament_retract_before_wipe": [ - "nil" - ], - "filament_retract_when_changing_layer": [ - "nil" - ], - "filament_retraction_length": [ - "nil" - ], - "filament_z_hop": [ - "nil" - ], - "filament_retract_restart_extra": [ - "nil" - ], - "filament_retraction_speed": [ - "nil" - ], - "filament_settings_id": [ - "" - ], - "filament_soluble": [ - "0" - ], - "filament_type": [ - "PLA" - ], - "filament_vendor": [ - "Generic" - ], - "filament_wipe": [ - "nil" - ], - "filament_wipe_distance": [ - "nil" - ], - "bed_type": [ - "Cool Plate" - ], - "nozzle_temperature_initial_layer": [ - "200" - ], - "full_fan_speed_layer": [ - "0" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "35" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "8" - ], - "filament_start_gcode": [ - "; Filament gcode\n" - ], - "nozzle_temperature": [ - "200" - ], - "temperature_vitrification": [ - "100" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_pa.json b/resources/profiles/Ratrig/filament/fdm_filament_pa.json deleted file mode 100644 index 8b67678f9b..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_pa.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_pa", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "0" - ], - "eng_plate_temp": [ - "100" - ], - "hot_plate_temp": [ - "100" - ], - "textured_plate_temp": [ - "100" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "100" - ], - "hot_plate_temp_initial_layer": [ - "100" - ], - "textured_plate_temp_initial_layer": [ - "100" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "fan_cooling_layer_time": [ - "4" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "filament_type": [ - "PA" - ], - "filament_density": [ - "1.04" - ], - "filament_cost": [ - "20" - ], - "nozzle_temperature_initial_layer": [ - "290" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "fan_max_speed": [ - "60" - ], - "fan_min_speed": [ - "0" - ], - "overhang_fan_speed": [ - "30" - ], - "nozzle_temperature": [ - "290" - ], - "temperature_vitrification": [ - "108" - ], - "nozzle_temperature_range_low": [ - "270" - ], - "nozzle_temperature_range_high": [ - "300" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "2" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_pc.json b/resources/profiles/Ratrig/filament/fdm_filament_pc.json deleted file mode 100644 index ec102017fc..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_pc.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_pc", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "0" - ], - "eng_plate_temp": [ - "110" - ], - "hot_plate_temp": [ - "110" - ], - "textured_plate_temp": [ - "110" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "110" - ], - "hot_plate_temp_initial_layer": [ - "110" - ], - "textured_plate_temp_initial_layer": [ - "110" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "fan_cooling_layer_time": [ - "30" - ], - "filament_max_volumetric_speed": [ - "23.2" - ], - "filament_type": [ - "PC" - ], - "filament_density": [ - "1.04" - ], - "filament_cost": [ - "20" - ], - "nozzle_temperature_initial_layer": [ - "270" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_max_speed": [ - "60" - ], - "fan_min_speed": [ - "10" - ], - "overhang_fan_threshold": [ - "25%" - ], - "overhang_fan_speed": [ - "60" - ], - "nozzle_temperature": [ - "280" - ], - "temperature_vitrification": [ - "140" - ], - "nozzle_temperature_range_low": [ - "260" - ], - "nozzle_temperature_range_high": [ - "280" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "2" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_pet.json b/resources/profiles/Ratrig/filament/fdm_filament_pet.json deleted file mode 100644 index d056aa4e88..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_pet.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_pet", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "60" - ], - "eng_plate_temp": [ - "0" - ], - "hot_plate_temp": [ - "80" - ], - "textured_plate_temp": [ - "80" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "hot_plate_temp_initial_layer": [ - "80" - ], - "textured_plate_temp_initial_layer": [ - "80" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "fan_cooling_layer_time": [ - "20" - ], - "filament_max_volumetric_speed": [ - "25" - ], - "filament_type": [ - "PETG" - ], - "filament_density": [ - "1.27" - ], - "filament_cost": [ - "30" - ], - "nozzle_temperature_initial_layer": [ - "255" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "20" - ], - "overhang_fan_speed": [ - "100" - ], - "nozzle_temperature": [ - "255" - ], - "temperature_vitrification": [ - "80" - ], - "nozzle_temperature_range_low": [ - "220" - ], - "nozzle_temperature_range_high": [ - "260" - ], - "filament_start_gcode": [ - "; filament start gcode\n" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_pla.json b/resources/profiles/Ratrig/filament/fdm_filament_pla.json deleted file mode 100644 index ef1a11694d..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_pla.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_pla", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "fan_cooling_layer_time": [ - "100" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "filament_type": [ - "PLA" - ], - "filament_density": [ - "1.24" - ], - "filament_cost": [ - "20" - ], - "cool_plate_temp": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "hot_plate_temp": [ - "60" - ], - "textured_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "nozzle_temperature": [ - "220" - ], - "temperature_vitrification": [ - "60" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "4" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "filament_start_gcode": [ - "; filament start gcode\n" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_pva.json b/resources/profiles/Ratrig/filament/fdm_filament_pva.json deleted file mode 100644 index 860cba12e1..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_pva.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_pva", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "35" - ], - "eng_plate_temp": [ - "0" - ], - "hot_plate_temp": [ - "45" - ], - "textured_plate_temp": [ - "45" - ], - "cool_plate_temp_initial_layer": [ - "35" - ], - "eng_plate_temp_initial_layer": [ - "0" - ], - "hot_plate_temp_initial_layer": [ - "45" - ], - "textured_plate_temp_initial_layer": [ - "45" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "filament_soluble": [ - "1" - ], - "filament_is_support": [ - "1" - ], - "filament_type": [ - "PVA" - ], - "filament_density": [ - "1.24" - ], - "filament_cost": [ - "20" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "nozzle_temperature": [ - "220" - ], - "temperature_vitrification": [ - "50" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "slow_down_min_speed": [ - "10" - ], - "slow_down_layer_time": [ - "4" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "filament_start_gcode": [ - "; filament start gcode\n" - ] -} diff --git a/resources/profiles/Ratrig/filament/fdm_filament_tpu.json b/resources/profiles/Ratrig/filament/fdm_filament_tpu.json deleted file mode 100644 index d781fc067d..0000000000 --- a/resources/profiles/Ratrig/filament/fdm_filament_tpu.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "type": "filament", - "name": "fdm_filament_tpu", - "inherits": "fdm_filament_common", - "from": "system", - "instantiation": "false", - "cool_plate_temp": [ - "30" - ], - "eng_plate_temp": [ - "30" - ], - "hot_plate_temp": [ - "35" - ], - "textured_plate_temp": [ - "35" - ], - "cool_plate_temp_initial_layer": [ - "30" - ], - "eng_plate_temp_initial_layer": [ - "30" - ], - "hot_plate_temp_initial_layer": [ - "35" - ], - "textured_plate_temp_initial_layer": [ - "35" - ], - "fan_cooling_layer_time": [ - "100" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "filament_type": [ - "TPU" - ], - "filament_density": [ - "1.24" - ], - "filament_cost": [ - "20" - ], - "filament_retraction_length": [ - "0.4" - ], - "nozzle_temperature_initial_layer": [ - "240" - ], - "reduce_fan_stop_start_freq": [ - "1" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "fan_max_speed": [ - "100" - ], - "fan_min_speed": [ - "100" - ], - "overhang_fan_speed": [ - "100" - ], - "additional_cooling_fan_speed": [ - "70" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "nozzle_temperature": [ - "240" - ], - "temperature_vitrification": [ - "60" - ], - "nozzle_temperature_range_low": [ - "200" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "filament_start_gcode": [ - "; filament start gcode\n" - ] -} diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json index 0fb50e0560..7f5dda5901 100644 --- a/resources/profiles/retired_filament_ids.json +++ b/resources/profiles/retired_filament_ids.json @@ -3550,6 +3550,12 @@ ], "successor": "OFY9muEs" }, + "OFYfAcLY": { + "claims": [ + "Ratrig/Generic PCTG BigNozzle" + ], + "successor": "OFXW4CDh" + }, "OFYl0c8v": { "claims": [ "Flashforge/Flashforge Generic HIPS" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 5eedb85a5e..c9966fc8d6 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -3001,6 +3001,9 @@ "OFXTPuqV": [ "OrcaFilamentLibrary/Elas PETG Basic" ], + "OFXW4CDh": [ + "Ratrig/Generic PCTG BigNozzle" + ], "OFXi59OX": [ "Afinia/Afinia Value ABS" ], @@ -3127,9 +3130,6 @@ "OFYezc6s": [ "FlyingBear/FlyingBear TPU" ], - "OFYfAcLY": [ - "Ratrig/Generic PCTG BigNozzle" - ], "OFYuowge": [ "FlyingBear/Other ABS", "InfiMech/Other ABS" @@ -5227,7 +5227,6 @@ "DeltaMaker/Generic PETG @DeltaMaker", "DeltaMaker/Generic PLA @DeltaMaker", "DeltaMaker/Generic TPU @DeltaMaker", - "Dremel/Generic PLA @Dremel", "Dremel/Generic PLA @Dremel 3D20 all", "Dremel/Generic PLA @Dremel 3D40 all", "Dremel/Generic PLA @Dremel 3D45 all", @@ -10082,6 +10081,13 @@ "Elas PETG Basic" ] ], + "OFXW4CDh": [ + [ + "Generic", + "PCTG", + "Generic PCTG BigNozzle" + ] + ], "OFXi59OX": [ [ "Afinia", @@ -10236,13 +10242,6 @@ "FlyingBear TPU" ] ], - "OFYfAcLY": [ - [ - "Generic", - "PETG", - "Generic PCTG BigNozzle" - ] - ], "OFYuowge": [ [ "Other", From 44a617a40d475ac8bf1b3d6ce0e7dffa866a9900 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Wed, 2 Sep 2026 02:42:30 +0800 Subject: [PATCH 33/52] more fixes --- resources/profiles/Creality.json | 2 +- resources/profiles/Creality/machine/Creality CR-10 SE.json | 2 +- resources/profiles/Creality/machine/Creality K1 Max.json | 2 +- .../profiles/Creality/machine/Creality K1 Max_CFS-C.json | 2 +- resources/profiles/Creality/machine/Creality K1.json | 2 +- resources/profiles/Creality/machine/Creality K1_CFS-C.json | 2 +- resources/profiles/Flashforge.json | 2 +- .../Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle.json | 6 ++++++ .../Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle.json | 6 ++++++ .../Flashforge/filament/FusRock PAHT-CF @FF G4.json | 6 ++++++ .../Flashforge/filament/FusRock PAHT-CF @FF G4P.json | 6 ++++++ resources/profiles/Z-Bolt.json | 2 +- 12 files changed, 32 insertions(+), 8 deletions(-) diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index 29399dcade..a043d51433 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "02.03.02.77", + "version": "02.03.02.78", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE.json b/resources/profiles/Creality/machine/Creality CR-10 SE.json index bd39ea5ff1..56af1ec8a6 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE.json @@ -8,5 +8,5 @@ "bed_model": "creality_cr10se_buildplate_model.stl", "bed_texture": "creality_cr10se_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PETG @Creality;Generic TPU @Creality;Generic ABS @Creality" + "default_materials": "Generic PLA @Creality;Generic PLA HF @Creality;Generic Speed PLA @Creality HF;Generic PETG @Creality;Generic TPU @Creality;Generic ABS @Creality" } diff --git a/resources/profiles/Creality/machine/Creality K1 Max.json b/resources/profiles/Creality/machine/Creality K1 Max.json index 3acfd1ec99..5680990e70 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max.json +++ b/resources/profiles/Creality/machine/Creality K1 Max.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1max_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality;Generic PLA @Creality;Generic PLA HF @Creality;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality" } diff --git a/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json b/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json index 3016f2de6c..012ad881ea 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json +++ b/resources/profiles/Creality/machine/Creality K1 Max_CFS-C.json @@ -9,5 +9,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_K1_Max_CFS_C", - "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality;Generic PLA @Creality;Generic PLA HF @Creality;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality" } diff --git a/resources/profiles/Creality/machine/Creality K1.json b/resources/profiles/Creality/machine/Creality K1.json index 60cd9142f1..a70046460a 100644 --- a/resources/profiles/Creality/machine/Creality K1.json +++ b/resources/profiles/Creality/machine/Creality K1.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PC @Creality K1-all;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PETG @Creality;Generic TPU @Creality" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PC @Creality K1-all;Generic PLA @Creality;Generic PLA HF @Creality;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PETG @Creality;Generic TPU @Creality" } diff --git a/resources/profiles/Creality/machine/Creality K1_CFS-C.json b/resources/profiles/Creality/machine/Creality K1_CFS-C.json index d0d7124dd2..c5986ae635 100644 --- a/resources/profiles/Creality/machine/Creality K1_CFS-C.json +++ b/resources/profiles/Creality/machine/Creality K1_CFS-C.json @@ -9,5 +9,5 @@ "hotend_model": "", "machine_tech": "FFF", "model_id": "Creality_K1_CFS_C", - "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PC @Creality K1-all;Generic PLA @Creality;Generic PLA @Creality HF;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PETG @Creality;Generic TPU @Creality" + "default_materials": "Generic ABS @Creality;Generic ASA @Creality;Generic PC @Creality K1-all;Generic PLA @Creality;Generic PLA HF @Creality;Generic Speed PLA @Creality HF;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PETG @Creality;Generic TPU @Creality" } diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index 11b86ecc8d..e754ca729a 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -1,7 +1,7 @@ { "name": "Flashforge", "url": "", - "version": "02.04.00.06", + "version": "02.04.00.07", "force_update": "0", "description": "Flashforge configurations", "machine_model_list": [ 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 d06a93931d..22b1a35dcb 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 @@ -67,6 +67,12 @@ "nozzle_temperature_initial_layer": [ "205" ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], "overhang_fan_threshold": [ "25%" ], 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 13d1358b71..dccc672613 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 @@ -67,6 +67,12 @@ "nozzle_temperature_initial_layer": [ "205" ], + "nozzle_temperature_range_high": [ + "240" + ], + "nozzle_temperature_range_low": [ + "190" + ], "overhang_fan_threshold": [ "25%" ], 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 22ea704736..2fb2e00e21 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4.json @@ -10,9 +10,15 @@ "filament_vendor": [ "FusRock" ], + "activate_chamber_temp_control": [ + "1" + ], "additional_cooling_fan_speed": [ "0" ], + "chamber_temperature": [ + "60" + ], "close_fan_the_first_x_layers": [ "3" ], 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 5156df9505..263323a60a 100644 --- a/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json +++ b/resources/profiles/Flashforge/filament/FusRock PAHT-CF @FF G4P.json @@ -10,9 +10,15 @@ "filament_vendor": [ "FusRock" ], + "activate_chamber_temp_control": [ + "1" + ], "additional_cooling_fan_speed": [ "0" ], + "chamber_temperature": [ + "60" + ], "close_fan_the_first_x_layers": [ "3" ], diff --git a/resources/profiles/Z-Bolt.json b/resources/profiles/Z-Bolt.json index 8e3d3a0cd5..aa092cc8b2 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.01", + "version": "02.04.00.02", "force_update": "0", "description": "Z-Bolt configurations", "machine_model_list": [ From ab90aec001b0c78e9f4acefe5bab5bdf66842a9c Mon Sep 17 00:00:00 2001 From: SoftFever Date: Wed, 2 Sep 2026 18:50:50 +0800 Subject: [PATCH 34/52] add per vendor support for check_profile check --- scripts/check_profile.bat | 2 + scripts/check_profile.ps1 | 157 ++++++++++++++++++++++++++++++++++---- scripts/check_profile.sh | 153 ++++++++++++++++++++++++++++++++----- 3 files changed, 279 insertions(+), 33 deletions(-) diff --git a/scripts/check_profile.bat b/scripts/check_profile.bat index 231fa721d4..e92f9fe0e8 100644 --- a/scripts/check_profile.bat +++ b/scripts/check_profile.bat @@ -1,5 +1,7 @@ @echo off REM Runs check_profile.ps1, the Windows twin of check_profile.sh, from cmd. +REM Arguments are passed straight through, so anything the .ps1 takes works here: +REM scripts\check_profile.bat -Vendor Elegoo validate_custom REM -ExecutionPolicy Bypass is needed because a Windows client defaults to Restricted, REM which refuses to run a checked-out .ps1 at all. powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0check_profile.ps1" %* diff --git a/scripts/check_profile.ps1 b/scripts/check_profile.ps1 index 5c5dcb20c8..9c9bb6c506 100644 --- a/scripts/check_profile.ps1 +++ b/scripts/check_profile.ps1 @@ -23,6 +23,10 @@ has, is moved aside for the duration of the run and restored on exit. Only one run per work dir at a time. + -Vendor narrows a run to one vendor while working on that vendor's profiles - the one + deliberate divergence from CI, which always checks the whole tree. A check that cannot be + narrowed is left out of the run and reported as skipped. + x64 and ARM64 hosts are both supported. A locally built validator is chosen by the machine type in its PE header rather than by the name of its build tree, so build\ (x64) and build-arm64\ side by side resolve correctly; the published nightly is x64 only and runs @@ -32,6 +36,14 @@ Profile tree to validate (default: resources\profiles). extra_json_check always looks at the tree next to the script, so this only redirects the validator checks. +.PARAMETER Vendor + Check only this vendor, named after its .json (e.g. "Co Print"). validate_custom is + narrowed with it too, by keeping only that vendor's presets in each fixture tree. The one + check it cannot narrow is validate_slice for a vendor that ships no printers; the summary + reports that one as skipped, and naming it explicitly still runs it. extra_json_check keeps + its two cross-vendor checks (setting_id and filament_id) tree-wide, so a scoped run can still + fail on another vendor's files. + .PARAMETER Validator OrcaSlicer_profile_validator.exe to use; also $env:ORCA_PROFILE_VALIDATOR. Default: the local build*\ Release build (then RelWithDebInfo, MinSizeRel, Debug) for this architecture, else @@ -58,6 +70,9 @@ .EXAMPLE powershell -ExecutionPolicy Bypass -File scripts\check_profile.ps1 validate_system validate_slice + +.EXAMPLE + scripts\check_profile.bat -Vendor Elegoo #> # PositionalBinding is off so that the check names are the only positional arguments; left on, @@ -65,6 +80,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [Alias('p')] [string] $ProfilesDir, + [Alias('v')] [string] $Vendor, [string] $Validator, [string] $WorkDir, [Alias('l')] [int] $LogLevel = 2, @@ -156,12 +172,42 @@ foreach ($name in $Checks) { if ($name -like '-*') { Die "unknown option '$name' (try -Help)" } if ($AllChecks -notcontains $name) { Die "unknown check '$name' (try -Help)" } } +# A check named on the command line always runs; only the default set is narrowed (see the run +# loop below). +$NamedChecks = [bool] $Checks if (-not $Checks) { $Checks = $AllChecks } if (-not $ProfilesDir) { $ProfilesDir = Join-Path $RepoRoot 'resources\profiles' } if (-not (Test-Path -LiteralPath $ProfilesDir -PathType Container)) { Die "profile directory not found: $ProfilesDir" } $ProfilesDir = (Resolve-Path -LiteralPath $ProfilesDir).Path +# A vendor neither tool knows is not an error to them: the static checks load nothing of their own +# and still report success, so a typo would otherwise be three green checks and one baffling slice +# failure. The match has to be made on the names themselves rather than with a Test-Path - the +# validator compares the .json stem case-sensitively, while Windows' case-insensitive +# filesystem would let "creality" pass a path test and then match no vendor. A vendor is a +# .json with a sibling directory; that pair is also what tells one apart from +# blacklist.json and retired_filament_ids.json, which sit in the same folder. +if ($Vendor) { + $found = $false + $suggestion = '' + foreach ($file in (Get-ChildItem -LiteralPath $ProfilesDir -Filter '*.json' -File)) { + $name = [IO.Path]::GetFileNameWithoutExtension($file.Name) + if (-not (Test-Path -LiteralPath (Join-Path $ProfilesDir $name) -PathType Container)) { continue } + if ($name -ceq $Vendor) { $found = $true; break } + if ($name -eq $Vendor) { $suggestion = $name } + } + if (-not $found) { + if ($suggestion) { Die "unknown vendor '$Vendor'; vendor names are case-sensitive, did you mean '$suggestion'?" } + Die "unknown vendor '$Vendor': no such vendor in $ProfilesDir" + } +} + +# The validator's -v and orca_extra_profile_check.py's --vendor both take that stem; an unscoped +# run passes neither, so the checks below splat these in either way. +$VendorArgs = if ($Vendor) { @('-v', $Vendor) } else { @() } +$VendorPyArgs = if ($Vendor) { @('--vendor', $Vendor) } else { @() } + if (-not $WorkDir) { $WorkDir = Join-Path $RepoRoot '.test\check_profiles' } $LogDir = Join-Path $WorkDir 'logs' try { New-Item -ItemType Directory -Force -Path $LogDir | Out-Null } catch { Die "cannot create ${LogDir}: $_" } @@ -350,32 +396,77 @@ function Resolve-Python { Die 'no Python 3 found; install it (or the py launcher) and re-run' } +# The fixtures name every preset "__orca_test", after the "name" inside +# .json rather than the file stem -Vendor takes - BBL.json is "Bambulab", iQ.json is +# "innovatiQ". Falls back to the stem for a vendor file with no readable name. +function Get-VendorDisplayName { + $name = '' + try { $name = (Get-Content -LiteralPath (Join-Path $ProfilesDir "$Vendor.json") -Raw -ErrorAction Stop | ConvertFrom-Json).name } catch { } + if ($name) { return "$name" } + return $Vendor +} + +# Unpack just the presets one vendor's profiles own, and return how many that was. Each fixture +# preset was generated from a single system preset and inherits it by name - none inherits another +# user preset - so the selection is self-contained. +function Expand-VendorPresets([string] $Zip, [string] $Tree, [string] $Prefix) { + # .NET rather than Expand-Archive: a fixture holds around 20,000 entries, and unpacking every + # one of them to keep a twentieth costs more than the validation this is speeding up. + Add-Type -AssemblyName System.IO.Compression.FileSystem + $kept = 0 + $archive = [IO.Compression.ZipFile]::OpenRead($Zip) + try { + foreach ($entry in $archive.Entries) { + # A directory entry has an empty Name, so it never matches and is never created. + if (-not $entry.Name.StartsWith($Prefix, [StringComparison]::Ordinal)) { continue } + $dest = Join-Path $Tree $entry.FullName.Replace('/', [IO.Path]::DirectorySeparatorChar) + [IO.Directory]::CreateDirectory([IO.Path]::GetDirectoryName($dest)) | Out-Null + [IO.Compression.ZipFileExtensions]::ExtractToFile($entry, $dest, $true) + $kept++ + } + } finally { + $archive.Dispose() + } + return $kept +} + # ---------------------------------------------------------------------------- checks $CheckBodies = @{ extra_json_check = { - Invoke-Tool -Exe (Resolve-Python) -Arguments @((Join-Path $RepoRoot 'scripts\orca_extra_profile_check.py')) + Invoke-Tool -Exe (Resolve-Python) -Arguments (@((Join-Path $RepoRoot 'scripts\orca_extra_profile_check.py')) + $VendorPyArgs) } validate_system = { - Invoke-Tool -Exe $Validator -Arguments @('-p', $ProfilesDir, '-l', "$LogLevel") + Invoke-Tool -Exe $Validator -Arguments (@('-p', $ProfilesDir) + $VendorArgs + @('-l', "$LogLevel")) } # Slices a two-colour cube through every printer so all custom g-code (incl. # change_filament_gcode) is expanded - catches undefined-placeholder / invalid-flow bugs the # static checks cannot see. validate_slice = { - Invoke-Tool -Exe $Validator -Arguments @('-p', $ProfilesDir, '-s', '-l', "$LogLevel") + Invoke-Tool -Exe $Validator -Arguments (@('-p', $ProfilesDir) + $VendorArgs + @('-s', '-l', "$LogLevel")) } validate_filament_subtypes = { - Invoke-Tool -Exe $Validator -Arguments @('-p', $ProfilesDir, '-l', "$LogLevel", '-f') + Invoke-Tool -Exe $Validator -Arguments (@('-p', $ProfilesDir) + $VendorArgs + @('-l', "$LogLevel", '-f')) } # Every released fixture is a snapshot of user presets saved by that OrcaSlicer version; each # is unpacked over the current system profiles and validated, so a profile change that would # break an existing user's presets fails here. + # + # Under -Vendor only that vendor's presets are unpacked, which is what makes the validator's + # -v usable here: -v filters the system vendors but never the user presets, so on a whole-tree + # snapshot it reports every other vendor's presets as unresolvable parents - thousands of + # errors saying nothing about the vendor under test. Teaching -v to filter user presets too is + # the deeper fix, but this runs against whatever validator is to hand, the published nightly + # included, so the picking has to happen here. It picks on the "_" + # filename prefix that generate_custom_presets() (the validator's -g mode) gave every preset in + # these fixtures; a fixture cut from a renamed generator would surface as the "checked nothing" + # warning below. Presets whose source had no vendor carry no prefix - a few of those still name + # one in the middle, like "PET @BBL A1_orca_test" - and only an unscoped run covers them. validate_custom = { $fixturesDir = Join-Path $WorkDir 'profile-fixtures' $outputDir = Join-Path $WorkDir 'custom-preset-validation' @@ -392,6 +483,8 @@ $CheckBodies = @{ return 1 } + $vendorPrefix = if ($Vendor) { "$(Get-VendorDisplayName)_" } else { '' } + $totalKept = 0 $status = 0 $failedLogs = @() $summary = @('## Custom Preset Fixture Validation', '', '| Version | Status | Log |', '| --- | --- | --- |') @@ -424,12 +517,23 @@ $CheckBodies = @{ Remove-Item -LiteralPath $profileTree -Recurse -Force -ErrorAction SilentlyContinue New-Item -ItemType Directory -Force -Path $profileTree | Out-Null # Piped rather than copied through \*, so a vendor directory whose name - # holds a wildcard character is still copied by its literal path. - Get-ChildItem -LiteralPath $ProfilesDir -Force | Copy-Item -Destination $profileTree -Recurse -Force + # holds a wildcard character is still copied by its literal path. Under -Vendor the + # validator opens only that vendor and OrcaFilamentLibrary and skips the other sixty-odd + # (PresetBundle::load_system_presets_from_json), so the rest are left out of the copy: + # ~3s a fixture that was going on files nothing opens. + Get-ChildItem -LiteralPath $ProfilesDir -Force | + Where-Object { -not $Vendor -or -not $_.PSIsContainer -or $_.Name -eq $Vendor -or $_.Name -eq 'OrcaFilamentLibrary' } | + Copy-Item -Destination $profileTree -Recurse -Force Remove-Item -LiteralPath (Join-Path $profileTree 'user') -Recurse -Force -ErrorAction SilentlyContinue - Expand-Archive -LiteralPath $fixtureZip -DestinationPath $profileTree -Force + if ($Vendor) { + $kept = Expand-VendorPresets $fixtureZip $profileTree $vendorPrefix + $totalKept += $kept + Write-CheckLog " $kept $Vendor preset file(s)" + } else { + Expand-Archive -LiteralPath $fixtureZip -DestinationPath $profileTree -Force + } - $result = Invoke-Tool -Exe $Validator -Arguments @('-p', $profileTree, '-l', "$LogLevel") -OutFile $logPath + $result = Invoke-Tool -Exe $Validator -Arguments (@('-p', $profileTree) + $VendorArgs + @('-l', "$LogLevel")) -OutFile $logPath if ($result -eq 0) { $summary += "| $version | PASS | $version.log |" # Only failures are worth keeping; each tree is a full copy of resources\profiles. @@ -441,6 +545,12 @@ $CheckBodies = @{ } } + # A vendor added after the newest fixture was cut appears in none of them: nothing failed, + # but nothing was checked either. + if ($Vendor -and $totalKept -eq 0) { + Write-CheckLog "no $Vendor presets in any fixture; validate_custom checked nothing" + } + [IO.File]::WriteAllLines((Join-Path $outputDir 'summary.md'), [string[]] $summary) $summary | ForEach-Object { Write-CheckLog $_ } @@ -473,7 +583,7 @@ $CommentHeadings = @{ function Invoke-Check([string] $Name) { $log = Join-Path $LogDir "$Name.log" Write-Host '' - Write-Host "==> $Name" -ForegroundColor Cyan + Write-Host "==> $Name$(if ($Vendor) { " ($Vendor)" })" -ForegroundColor Cyan $script:LogWriter = New-LogWriter $log try { @@ -510,26 +620,41 @@ try { if ($Checks | Where-Object { $_ -ne 'extra_json_check' }) { $Validator = Resolve-Validator } + # An empty printer set is a failure to the sweep, so validate_slice is recorded as skipped + # rather than run for a vendor that ships no printers (the filament-only OrcaFilamentLibrary); + # naming the check explicitly still runs it. $results = [ordered] @{} + $skipReasons = @{} foreach ($name in $AllChecks) { - if ($Checks -contains $name) { $results[$name] = Invoke-Check $name } + if ($Checks -notcontains $name) { continue } + if ($name -eq 'validate_slice' -and -not $NamedChecks -and $Vendor -and + -not (Test-Path -LiteralPath (Join-Path (Join-Path $ProfilesDir $Vendor) 'machine') -PathType Container)) { + $results[$name] = 'skip' + $skipReasons[$name] = "$Vendor ships no printers" + } else { + $results[$name] = if (Invoke-Check $name) { 'pass' } else { 'fail' } + } } Write-Host '' Write-Host '==> summary' -ForegroundColor Cyan foreach ($name in $results.Keys) { - if ($results[$name]) { - Write-Host " PASS $name" -ForegroundColor Green - } else { - Write-Host " FAIL $name ($(Join-Path $LogDir "$name.log"))" -ForegroundColor Red + switch ($results[$name]) { + 'pass' { Write-Host " PASS $name" -ForegroundColor Green } + 'skip' { Write-Host " SKIP $name ($($skipReasons[$name]))" -ForegroundColor Yellow } + default { Write-Host " FAIL $name ($(Join-Path $LogDir "$name.log"))" -ForegroundColor Red } } } - $failed = @($results.Keys | Where-Object { -not $results[$_] }) + $failed = @($results.Keys | Where-Object { $results[$_] -eq 'fail' }) if (-not $failed) { Remove-Item -LiteralPath (Join-Path $WorkDir 'pr_comment.md') -Force -ErrorAction SilentlyContinue Write-Host '' - Write-Host "All checks passed. Logs: $LogDir" -ForegroundColor Green + if (@($results.Values) -contains 'skip') { + Write-Host "Every check that ran passed, but CI runs the skipped ones too. Logs: $LogDir" -ForegroundColor Green + } else { + Write-Host "All checks passed. Logs: $LogDir" -ForegroundColor Green + } exit 0 } diff --git a/scripts/check_profile.sh b/scripts/check_profile.sh index 9b841d0612..cb56258c9f 100755 --- a/scripts/check_profile.sh +++ b/scripts/check_profile.sh @@ -14,6 +14,10 @@ # has, is moved aside for the duration of the run and restored on exit. Only one run per work # dir at a time. # +# -v/--vendor narrows a run to one vendor while working on that vendor's profiles - the one +# deliberate divergence from CI, which always checks the whole tree. A check that cannot be +# narrowed is left out of the run and reported as skipped; see usage(). +# # Usage: scripts/check_profile.sh [OPTION]... [CHECK]... # The check_* functions run through run_check, which dispatches on the check name, so @@ -33,14 +37,20 @@ HOST_ARCH="$(uname -m)" PROFILES_DIR="${REPO_ROOT}/resources/profiles" WORK_DIR="${REPO_ROOT}/.test/check_profiles" VALIDATOR="${ORCA_PROFILE_VALIDATOR:-}" +# Vendor to check, named after its .json - empty means every vendor, which is exactly what +# both the validator's -v and orca_extra_profile_check.py's --vendor take an empty value to mean. +# So the flag is passed unconditionally below rather than kept in an array bash 3.2 cannot expand +# empty under `set -u`. +VENDOR="" LOG_LEVEL=2 PREFER_DOWNLOAD=0 REFRESH=0 ALL_CHECKS=(extra_json_check validate_system validate_slice validate_filament_subtypes validate_custom) CHECKS=() -# "pass|fail" per check that ran; a string rather than an array because bash 3.2 -# (still the /bin/bash on macOS) cannot expand an empty array under `set -u`. +# "pass|fail" per check that ran, plus "skipwhy" for one a vendor +# scope left out; a string rather than an array because bash 3.2 (still the /bin/bash on macOS) +# cannot expand an empty array under `set -u`. RESULTS="" usage() { @@ -58,6 +68,7 @@ Checks (default: all, in this order): Options: -p, --profiles DIR profile tree to validate (default: resources/profiles) + -v, --vendor NAME check only this vendor, named after its .json (e.g. "Co Print") --validator BIN OrcaSlicer_profile_validator to use; also \$ORCA_PROFILE_VALIDATOR. Default: the local build*/ Release build (then RelWithDebInfo, then Debug) for this architecture, else the nightly release build is @@ -70,6 +81,12 @@ Options: Note: extra_json_check always looks at the tree next to the script (/resources/profiles); --profiles only redirects the validator checks. + +Note: --vendor narrows validate_custom too, by keeping only that vendor's presets in each +fixture tree. The one check it cannot narrow is validate_slice for a vendor that ships no +printers; the summary reports that one as skipped, and naming it explicitly still runs it. +extra_json_check keeps its two cross-vendor checks (setting_id and filament_id) tree-wide, +so a scoped run can still fail on another vendor's files. EOF } @@ -88,6 +105,7 @@ while [ $# -gt 0 ]; do case "$1" in -h|--help) usage; exit 0 ;; -p|--profiles) [ $# -ge 2 ] || die "$1 needs a directory"; PROFILES_DIR="$2"; shift 2 ;; + -v|--vendor) [ $# -ge 2 ] || die "$1 needs a vendor name"; VENDOR="$2"; shift 2 ;; --validator) [ $# -ge 2 ] || die "$1 needs a path"; VALIDATOR="$2"; shift 2 ;; --work-dir) [ $# -ge 2 ] || die "$1 needs a directory"; WORK_DIR="$2"; shift 2 ;; -l|--log-level) [ $# -ge 2 ] || die "$1 needs a number"; LOG_LEVEL="$2"; shift 2 ;; @@ -106,11 +124,40 @@ while [ $# -gt 0 ]; do esac done -[ "${#CHECKS[@]}" -gt 0 ] || CHECKS=("${ALL_CHECKS[@]}") +# A check named on the command line always runs; only the default set is narrowed (see the run +# loop below). +NAMED_CHECKS="${#CHECKS[@]}" +[ "${NAMED_CHECKS}" -gt 0 ] || CHECKS=("${ALL_CHECKS[@]}") [ -d "${PROFILES_DIR}" ] || die "profile directory not found: ${PROFILES_DIR}" PROFILES_DIR="$(cd -- "${PROFILES_DIR}" && pwd)" +# A vendor neither tool knows is not an error to them: the static checks load nothing of their own +# and still report success, so a typo would otherwise be three green checks and one baffling slice +# failure. The match has to be made on the names themselves rather than with a -f test - the +# validator compares the .json stem case-sensitively, while a case-insensitive filesystem +# (macOS, Windows) would let "creality" pass a file test and then match no vendor. A vendor is a +# .json with a sibling / directory; that pair is also what tells one apart from +# blacklist.json and retired_filament_ids.json, which sit in the same folder. +if [ -n "${VENDOR}" ]; then + wanted="$(printf '%s' "${VENDOR}" | tr '[:upper:]' '[:lower:]')" + found="" + suggestion="" + for file in "${PROFILES_DIR}"/*.json; do + name="${file##*/}"; name="${name%.json}" + [ -d "${PROFILES_DIR}/${name}" ] || continue + if [ "${name}" = "${VENDOR}" ]; then + found=1 + break + fi + [ "$(printf '%s' "${name}" | tr '[:upper:]' '[:lower:]')" = "${wanted}" ] && suggestion="${name}" + done + if [ -z "${found}" ]; then + [ -z "${suggestion}" ] || die "unknown vendor '${VENDOR}'; vendor names are case-sensitive, did you mean '${suggestion}'?" + die "unknown vendor '${VENDOR}': no such vendor in ${PROFILES_DIR}" + fi +fi + LOG_DIR="${WORK_DIR}/logs" mkdir -p "${LOG_DIR}" || die "cannot create ${LOG_DIR}" WORK_DIR="$(cd -- "${WORK_DIR}" && pwd)" @@ -315,34 +362,65 @@ resolve_validator() { # ---------------------------------------------------------------------------- checks check_extra_json_check() { - python3 "${REPO_ROOT}/scripts/orca_extra_profile_check.py" + python3 "${REPO_ROOT}/scripts/orca_extra_profile_check.py" --vendor "${VENDOR}" } check_validate_system() { - "${VALIDATOR}" -p "${PROFILES_DIR}" -l "${LOG_LEVEL}" + "${VALIDATOR}" -p "${PROFILES_DIR}" -v "${VENDOR}" -l "${LOG_LEVEL}" } # Slices a two-colour cube through every printer so all custom g-code (incl. change_filament_gcode) # is expanded - catches undefined-placeholder / invalid-flow bugs the static checks cannot see. check_validate_slice() { - "${VALIDATOR}" -p "${PROFILES_DIR}" -s -l "${LOG_LEVEL}" + "${VALIDATOR}" -p "${PROFILES_DIR}" -v "${VENDOR}" -s -l "${LOG_LEVEL}" } check_validate_filament_subtypes() { - "${VALIDATOR}" -p "${PROFILES_DIR}" -l "${LOG_LEVEL}" -f + "${VALIDATOR}" -p "${PROFILES_DIR}" -v "${VENDOR}" -l "${LOG_LEVEL}" -f +} + +# The fixtures name every preset "__orca_test", after the "name" inside +# .json rather than the file stem --vendor takes - BBL.json is "Bambulab", iQ.json is +# "innovatiQ". Falls back to the stem for a vendor file with no readable name. +vendor_display_name() { + local name + name="$(VENDOR_JSON="${PROFILES_DIR}/${VENDOR}.json" python3 - <<'PY' +import json +import os + +try: + with open(os.environ["VENDOR_JSON"], encoding="utf-8") as fh: + print(json.load(fh).get("name", "")) +except Exception: + pass +PY +)" + printf '%s\n' "${name:-${VENDOR}}" } # Every released fixture is a snapshot of user presets saved by that OrcaSlicer version; each is # unpacked over the current system profiles and validated, so a profile change that would break # an existing user's presets fails here. +# +# Under --vendor only that vendor's presets are unpacked, which is what makes the validator's -v +# usable here: -v filters the system vendors but never the user presets, so on a whole-tree +# snapshot it reports every other vendor's presets as unresolvable parents - thousands of errors +# saying nothing about the vendor under test. Teaching -v to filter user presets too is the deeper +# fix, but this runs against whatever validator is to hand, the published nightly included, so the +# picking has to happen here. It picks on the "_" filename prefix that +# generate_custom_presets() (the validator's -g mode) gave every preset in these fixtures; a +# fixture cut from a renamed generator would surface as the "checked nothing" warning below. +# Presets whose source had no vendor carry no prefix - a few of those still name one in the +# middle, like "PET @BBL A1_orca_test" - and only an unscoped run covers them. check_validate_custom() { local fixtures_dir="${WORK_DIR}/profile-fixtures" local output_dir="${WORK_DIR}/custom-preset-validation" local summary="${output_dir}/summary.md" - local status=0 failed_logs="" - local version asset expected_sha256 asset_url fixture_zip profile_tree log_path actual_sha256 result + local status=0 failed_logs="" vendor_prefix="" total_kept=0 + local version asset expected_sha256 asset_url fixture_zip profile_tree log_path actual_sha256 result kept command -v unzip >/dev/null 2>&1 || { msg "unzip is required for validate_custom"; return 1; } + [ -z "${VENDOR}" ] || vendor_prefix="$(vendor_display_name)_" mkdir -p "${fixtures_dir}" "${output_dir}" || return 1 fetch "${FIXTURE_RELEASE_URL}/manifest.json" "${fixtures_dir}/manifest.json" force || return 1 @@ -407,11 +485,28 @@ PY msg "validating custom presets from ${version} ..." rm -rf "${profile_tree}" mkdir -p "${profile_tree}" || return 1 - cp -a "${PROFILES_DIR}/." "${profile_tree}/" || return 1 - rm -rf "${profile_tree}/user" - unzip -q "${fixture_zip}" -d "${profile_tree}" || return 1 + if [ -n "${VENDOR}" ]; then + # -v has the validator open this vendor and OrcaFilamentLibrary and skip the rest + # (PresetBundle::load_system_presets_from_json), and unzip's * spans '/', so one + # pattern reaches every preset type. Copying and unpacking only those turns a ~5s + # setup per fixture into ~0.5s. Naming the vendor twice, when it is the library + # itself, is not an error to cp; exit 11 is unzip's "nothing matched", which is the + # fixture-predates-the-vendor case the warning below reports. + cp -a "${PROFILES_DIR}"/*.json "${PROFILES_DIR}/${VENDOR}" \ + "${PROFILES_DIR}/OrcaFilamentLibrary" "${profile_tree}/" || return 1 + unzip -q "${fixture_zip}" "user/*/${vendor_prefix}*" -d "${profile_tree}" + result=$? + [ "${result}" -eq 0 ] || [ "${result}" -eq 11 ] || return 1 + kept="$(find "${profile_tree}/user" -type f 2>/dev/null | wc -l | tr -d ' ')" + total_kept=$((total_kept + kept)) + msg " ${kept} ${VENDOR} preset file(s)" + else + cp -a "${PROFILES_DIR}/." "${profile_tree}/" || return 1 + rm -rf "${profile_tree}/user" + unzip -q "${fixture_zip}" -d "${profile_tree}" || return 1 + fi - "${VALIDATOR}" -p "${profile_tree}" -l "${LOG_LEVEL}" > "${log_path}" 2>&1 + "${VALIDATOR}" -p "${profile_tree}" -v "${VENDOR}" -l "${LOG_LEVEL}" > "${log_path}" 2>&1 result=$? if [ "${result}" -eq 0 ]; then @@ -425,6 +520,12 @@ PY fi done < "${fixtures_dir}/fixtures.tsv" + # A vendor added after the newest fixture was cut appears in none of them: nothing failed, but + # nothing was checked either. + if [ -n "${VENDOR}" ] && [ "${total_kept}" -eq 0 ]; then + msg "no ${VENDOR} presets in any fixture; validate_custom checked nothing" + fi + cat "${summary}" if [ -n "${failed_logs}" ]; then echo "" @@ -461,7 +562,7 @@ run_check() { local name="$1" local log="${LOG_DIR}/${name}.log" local result - printf '\n%s==> %s%s\n' "${C_BOLD}" "${name}" "${C_RESET}" + printf '\n%s==> %s%s%s\n' "${C_BOLD}" "${name}" "${VENDOR:+ (${VENDOR})}" "${C_RESET}" "check_${name}" 2>&1 | tee "${log}" result="${PIPESTATUS[0]}" if [ "${result}" -eq 0 ]; then @@ -477,17 +578,30 @@ if wants validate_system || wants validate_slice || wants validate_filament_subt resolve_validator fi +# An empty printer set is a failure to the sweep, so validate_slice is recorded as skipped rather +# than run for a vendor that ships no printers (the filament-only OrcaFilamentLibrary); naming the +# check explicitly still runs it. for check in "${ALL_CHECKS[@]}"; do - wants "${check}" && run_check "${check}" + wants "${check}" || continue + if [ "${check}" = validate_slice ] && [ "${NAMED_CHECKS}" -eq 0 ] && [ -n "${VENDOR}" ] && + [ ! -d "${PROFILES_DIR}/${VENDOR}/machine" ]; then + RESULTS="${RESULTS}${check}"$'\t'"skip"$'\t'"${VENDOR} ships no printers"$'\n' + else + run_check "${check}" + fi done # Summary, plus the comment check_profiles_comment.yml would post when something fails. failed=0 +skipped=0 printf '\n%s==> summary%s\n' "${C_BOLD}" "${C_RESET}" -while IFS=$'\t' read -r name result; do +while IFS=$'\t' read -r name result why; do [ -n "${name}" ] || continue if [ "${result}" = "pass" ]; then printf '%s PASS%s %s\n' "${C_GREEN}" "${C_RESET}" "${name}" + elif [ "${result}" = "skip" ]; then + printf '%s SKIP%s %s (%s)\n' "${C_BOLD}" "${C_RESET}" "${name}" "${why}" + skipped=1 else printf '%s FAIL%s %s (%s)\n' "${C_RED}" "${C_RESET}" "${name}" "${LOG_DIR}/${name}.log" failed=1 @@ -498,7 +612,12 @@ EOF if [ "${failed}" -eq 0 ]; then rm -f "${WORK_DIR}/pr_comment.md" - printf '\n%sAll checks passed.%s Logs: %s\n' "${C_GREEN}" "${C_RESET}" "${LOG_DIR}" + if [ "${skipped}" -eq 0 ]; then + printf '\n%sAll checks passed.%s Logs: %s\n' "${C_GREEN}" "${C_RESET}" "${LOG_DIR}" + else + printf '\n%sEvery check that ran passed%s, but CI runs the skipped ones too. Logs: %s\n' \ + "${C_GREEN}" "${C_RESET}" "${LOG_DIR}" + fi exit 0 fi From 21fdd7028fda2e1eb0da70ab6d120f8936e2a5f8 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 3 Sep 2026 11:25:49 +0800 Subject: [PATCH 35/52] Fix spurious slice-validation failures when checking all vendors The sweep now validates each printer with the filament that printer ships, so a run over every vendor reports what a single-vendor run does. Validator only - no change to slicing output or shipped profiles. --- src/dev-utils/OrcaSlicer_profile_validator.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/dev-utils/OrcaSlicer_profile_validator.cpp b/src/dev-utils/OrcaSlicer_profile_validator.cpp index 49a38cd1c4..21c6b33180 100644 --- a/src/dev-utils/OrcaSlicer_profile_validator.cpp +++ b/src/dev-utils/OrcaSlicer_profile_validator.cpp @@ -175,6 +175,17 @@ void select_printer_default_presets(PresetBundle &bundle) if (const auto *def_fil = printer_preset.config.option("default_filament_profile"); def_fil != nullptr && !def_fil->values.empty()) bundle.filaments.select_preset_by_name(def_fil->values.front(), /*force=*/true); + // Re-seed the per-slot filament list from that selection, or the sweep's result depends on the + // printer sliced before it. Once there are 2+ slots, full_config() builds the filament config from + // filament_presets and ignores the selected preset (PresetBundle::full_fff_config), while + // update_compatible() only replaces a slot that has gone *incompatible* - and when it does, it ranks + // the outgoing preset's alias, then its filament type, above the printer's own default. The sweep + // grows every printer to 2 slots and update_multi_material_filament_presets() never shrinks them, so + // a material picked up on the first printer rides the whole run. With all vendors loaded the first + // printer inherits a TPU (the load-time pick is whichever filament sorts first), the type match + // re-resolves it to "Generic TPU @System", and its alias then pins every later printer to that + // vendor's own "Generic TPU @..." - which the BBL dual-nozzle profiles rightly refuse to group. + bundle.filament_presets.assign(1, bundle.filaments.get_selected_preset_name()); } // The vendor/printer currently being sliced, stamped onto every engine log record by the sink below so From e2b251c145620fc6b0214202a4fc863fa73ca9ed Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 3 Sep 2026 12:14:14 +0800 Subject: [PATCH 36/52] Fix generic PLA and default filaments on the Creality Hi --- resources/profiles/Creality.json | 6 +++--- ...c PLA @Hi-all.json => Generic PLA @Creality Hi-all.json} | 5 +++-- .../profiles/Creality/filament/Generic PLA @Hi-all.json | 2 -- .../filament/Generic PLA High Speed @Creality Hi-all.json | 2 +- .../filament/Generic PLA Matte @Creality Hi-all.json | 2 +- .../filament/Generic PLA Silk @Creality Hi-all.json | 2 +- .../filament/Generic PLA Wood @Creality Hi-all.json | 2 +- .../profiles/Creality/machine/Creality Hi 0.2 nozzle.json | 2 +- .../profiles/Creality/machine/Creality Hi 0.4 nozzle.json | 2 +- .../profiles/Creality/machine/Creality Hi 0.6 nozzle.json | 2 +- .../profiles/Creality/machine/Creality Hi 0.8 nozzle.json | 2 +- resources/profiles/Creality/machine/Creality Hi.json | 2 +- scripts/filament_id_snapshot.json | 1 - 13 files changed, 15 insertions(+), 17 deletions(-) rename resources/profiles/Creality/filament/{Creality Generic PLA @Hi-all.json => Generic PLA @Creality Hi-all.json} (91%) diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index a043d51433..7db87efed7 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "02.03.02.78", + "version": "02.03.02.79", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ @@ -1809,8 +1809,8 @@ "sub_path": "filament/Generic PLA @Creality Ender-3V3-all.json" }, { - "name": "Creality Generic PLA @Hi-all", - "sub_path": "filament/Creality Generic PLA @Hi-all.json" + "name": "Generic PLA @Creality Hi-all", + "sub_path": "filament/Generic PLA @Creality Hi-all.json" }, { "name": "Generic PLA @Creality K1-all", diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality Hi-all.json similarity index 91% rename from resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json rename to resources/profiles/Creality/filament/Generic PLA @Creality Hi-all.json index 63f51623a0..452c7854ae 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Creality Hi-all.json @@ -1,9 +1,10 @@ { "type": "filament", - "name": "Creality Generic PLA @Hi-all", + "name": "Generic PLA @Creality Hi-all", "inherits": "Generic PLA @Creality", + "renamed_from": "Creality Generic PLA @Hi-all;Creality Generic PLA Hi-all", "from": "system", - "setting_id": "3gf0CImK4nJwfXrB", + "setting_id": "6rwK4GqvNrgaw4kF", "instantiation": "true", "filament_max_volumetric_speed": [ "18" diff --git a/resources/profiles/Creality/filament/Generic PLA @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA @Hi-all.json index b79aa1d05f..43bb0786ea 100644 --- a/resources/profiles/Creality/filament/Generic PLA @Hi-all.json +++ b/resources/profiles/Creality/filament/Generic PLA @Hi-all.json @@ -136,8 +136,6 @@ "pressure_advance": "0.04", "support_material_interface_fan_speed": "-1", "compatible_printers": [ - "Creality Hi 0.4 nozzle", - "Creality Hi 0.6 nozzle", "Creality Hi 0.8 nozzle" ], "filament_id": "OFDSrzZ8" 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 0e64943dd5..cb184a432a 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,7 +1,7 @@ { "type": "filament", "name": "Generic PLA High Speed @Creality Hi-all", - "inherits": "Creality Generic PLA @Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA High Speed @Hi-all;Creality Generic PLA High Speed Hi-all", "from": "system", "setting_id": "KJZ1ztg3jL2Cg4fi", 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 c657630c40..1cff84c8bf 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,7 +1,7 @@ { "type": "filament", "name": "Generic PLA Matte @Creality Hi-all", - "inherits": "Creality Generic PLA @Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA Matte @Hi-all;Creality Generic PLA Matte Hi-all", "from": "system", "setting_id": "pFxJgjam0WAeSKqf", 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 bd41fff189..3358b98c75 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,7 +1,7 @@ { "type": "filament", "name": "Generic PLA Silk @Creality Hi-all", - "inherits": "Creality Generic PLA @Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA Silk @Hi-all;Creality Generic PLA Silk Hi-all", "from": "system", "setting_id": "k1ofgUXqhHGSPDPY", 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 b272cb185a..62f6ddf42c 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,7 +1,7 @@ { "type": "filament", "name": "Generic PLA Wood @Creality Hi-all", - "inherits": "Creality Generic PLA @Hi-all", + "inherits": "Generic PLA @Creality Hi-all", "renamed_from": "Creality Generic PLA Wood @Hi-all;Creality Generic PLA Wood Hi-all", "from": "system", "setting_id": "PNqfF5ecYqqpobdh", 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 b7a1676baa..57dcd7e949 100644 --- a/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json @@ -91,7 +91,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @Hi-all" + "Generic PLA @System" ], "deretraction_speed": "40", "extruder_colour": "#018001", diff --git a/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json index 74cd4559d5..0372431a1e 100644 --- a/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json @@ -135,7 +135,7 @@ "machine_pause_gcode": "PAUSE", "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X260 Y180 F30000\nG1 Z{z_after_toolchange} F600", "default_filament_profile": [ - "Creality Generic PLA @Hi-all" + "Generic PLA @Creality Hi-all" ], "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM104 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 E0.8 F300\nG1 X0 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X150 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "G1 X0 Y180 F8000\nEND_PRINT", diff --git a/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json index 402771c410..f7bcd5884d 100644 --- a/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json @@ -135,7 +135,7 @@ "machine_pause_gcode": "PAUSE", "change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X260 Y180 F30000\nG1 Z{z_after_toolchange} F600", "default_filament_profile": [ - "Creality Generic PLA @Hi-all" + "Generic PLA @Creality Hi-all" ], "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM104 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 E0.8 F300\nG1 X0 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X150 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG92 E0\nG1 Z1 F600", "machine_end_gcode": "G1 X0 Y180 F8000\nEND_PRINT", 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 5f43c0992c..23e19a2a66 100644 --- a/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json @@ -86,7 +86,7 @@ "use_relative_e_distances": "1", "z_offset": "0", "default_filament_profile": [ - "Creality Generic PLA @Hi-all" + "Generic PLA @Hi-all" ], "deretraction_speed": "40", "extruder_colour": "#018001", diff --git a/resources/profiles/Creality/machine/Creality Hi.json b/resources/profiles/Creality/machine/Creality Hi.json index 107d587cc5..279daf531c 100644 --- a/resources/profiles/Creality/machine/Creality Hi.json +++ b/resources/profiles/Creality/machine/Creality Hi.json @@ -9,5 +9,5 @@ "bed_texture": "creality_hi_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "", - "default_materials": "Generic ABS @Creality Hi-all;Generic ASA @Creality Hi-all;Generic ASA-CF @Creality Hi-all;Generic PETG @Creality Hi-all;Generic PETG-CF @Creality Hi-all;Generic PLA @Creality Hi-all;Generic PLA High Speed @Creality Hi-all;Generic PLA Matte @Creality Hi-all;Generic PLA Silk @Creality Hi-all;Generic PLA-CF @Creality Hi-all;Generic PLA Wood @Creality Hi-all;Generic TPU @Creality Hi-all" + "default_materials": "Generic ABS @Creality Hi-all;Generic ABS @Hi-all;Generic ASA @Creality Hi-all;Generic ASA-CF @Creality Hi-all;Generic PETG @Creality Hi-all;Generic PETG @Hi-all;Generic PETG-CF @Creality Hi-all;Generic PLA @Creality Hi-all;Generic PLA @Hi-all;Generic PLA High Speed @Creality Hi-all;Generic PLA Matte @Creality Hi-all;Generic PLA Silk @Creality Hi-all;Generic PLA-CF @Creality Hi-all;Generic PLA Wood @Creality Hi-all;Generic TPU @Creality Hi-all" } diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index c9966fc8d6..efaffb0654 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -2055,7 +2055,6 @@ "Co Print/Generic PLA", "CoLiDo/Generic PLA", "Comgrow/Generic PLA", - "Creality/Creality Generic PLA", "Creality/Generic PLA", "Custom/Generic PLA", "DeltaMaker/Generic PLA", From fdc0ee18f11f22766e1e22e66fe0304fedadb086 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 3 Sep 2026 17:47:29 +0800 Subject: [PATCH 37/52] fix vendor version --- resources/profiles/Afinia.json | 2 +- resources/profiles/Chuanying.json | 2 +- resources/profiles/Comgrow.json | 2 +- resources/profiles/Creality.json | 2 +- resources/profiles/Cubicon.json | 2 +- resources/profiles/Custom.json | 2 +- resources/profiles/Dremel.json | 2 +- resources/profiles/Elegoo.json | 2 +- resources/profiles/Eryone.json | 2 +- resources/profiles/FLSun.json | 2 +- resources/profiles/Flashforge.json | 2 +- resources/profiles/LH.json | 2 +- resources/profiles/LONGER.json | 2 +- resources/profiles/Qidi.json | 2 +- resources/profiles/RH3D.json | 2 +- resources/profiles/Ratrig.json | 2 +- resources/profiles/SeeMeCNC.json | 2 +- resources/profiles/Snapmaker.json | 2 +- resources/profiles/Volumic.json | 2 +- resources/profiles/WonderMaker.json | 2 +- resources/profiles/iQ.json | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/resources/profiles/Afinia.json b/resources/profiles/Afinia.json index a11cc0ecf6..517d0148c3 100644 --- a/resources/profiles/Afinia.json +++ b/resources/profiles/Afinia.json @@ -1,6 +1,6 @@ { "name": "Afinia", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Afinia configurations", "machine_model_list": [ diff --git a/resources/profiles/Chuanying.json b/resources/profiles/Chuanying.json index d994843f60..f32b4f84ae 100644 --- a/resources/profiles/Chuanying.json +++ b/resources/profiles/Chuanying.json @@ -1,7 +1,7 @@ { "name": "Chuanying", "url": "", - "version": "02.04.00.04", + "version": "02.04.00.03", "force_update": "0", "description": "Chuanying configurations", "machine_model_list": [ diff --git a/resources/profiles/Comgrow.json b/resources/profiles/Comgrow.json index e3eb237518..d506431ce8 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.04", "force_update": "0", "description": "Comgrow configurations", "machine_model_list": [ diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index 7db87efed7..23b8b3799b 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "02.03.02.79", + "version": "02.03.02.77", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ diff --git a/resources/profiles/Cubicon.json b/resources/profiles/Cubicon.json index 9f2100a187..1fca49355c 100644 --- a/resources/profiles/Cubicon.json +++ b/resources/profiles/Cubicon.json @@ -1,6 +1,6 @@ { "name": "Cubicon", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Cubicon configurations", "machine_model_list": [ diff --git a/resources/profiles/Custom.json b/resources/profiles/Custom.json index 7eba013111..a8cef36ca5 100644 --- a/resources/profiles/Custom.json +++ b/resources/profiles/Custom.json @@ -1,6 +1,6 @@ { "name": "Custom Printer", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "My configurations", "machine_model_list": [ diff --git a/resources/profiles/Dremel.json b/resources/profiles/Dremel.json index 3d804f6a1b..71f13d0dc8 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.02", "force_update": "0", "description": "Dremel configurations", "machine_model_list": [ diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json index 3813f93348..c5412c53bd 100644 --- a/resources/profiles/Elegoo.json +++ b/resources/profiles/Elegoo.json @@ -1,6 +1,6 @@ { "name": "Elegoo", - "version": "02.04.00.06", + "version": "02.04.00.07", "force_update": "0", "description": "Elegoo configurations", "machine_model_list": [ diff --git a/resources/profiles/Eryone.json b/resources/profiles/Eryone.json index b3bec6e892..488ba18337 100644 --- a/resources/profiles/Eryone.json +++ b/resources/profiles/Eryone.json @@ -1,6 +1,6 @@ { "name": "Eryone", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Eryone configurations", "machine_model_list": [ diff --git a/resources/profiles/FLSun.json b/resources/profiles/FLSun.json index 67ce8c2583..1e0c76d458 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.03", "force_update": "0", "description": "FLSun configurations", "machine_model_list": [ diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index e754ca729a..f3923c435a 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -1,7 +1,7 @@ { "name": "Flashforge", "url": "", - "version": "02.04.00.07", + "version": "02.04.00.05", "force_update": "0", "description": "Flashforge configurations", "machine_model_list": [ diff --git a/resources/profiles/LH.json b/resources/profiles/LH.json index 12f8c4cbda..99a7049fa5 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.02", + "version": "02.04.00.03", "force_update": "0", "description": "LH 3D Printer Configuration", "machine_model_list": [ diff --git a/resources/profiles/LONGER.json b/resources/profiles/LONGER.json index 723bb43e91..dbf3cc3277 100644 --- a/resources/profiles/LONGER.json +++ b/resources/profiles/LONGER.json @@ -1,6 +1,6 @@ { "name": "LONGER", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "LONGER configurations", "machine_model_list": [ diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index a831bb268c..f49413601a 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -1,6 +1,6 @@ { "name": "Qidi", - "version": "02.04.00.14", + "version": "02.04.00.12", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ diff --git a/resources/profiles/RH3D.json b/resources/profiles/RH3D.json index fc8aa57484..4cb9ab573e 100644 --- a/resources/profiles/RH3D.json +++ b/resources/profiles/RH3D.json @@ -1,6 +1,6 @@ { "name": "RH3D", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "RH3D - printer profiles", "machine_model_list": [ diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json index a2b792ebdd..dbe4c3cc56 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.03", "force_update": "0", "description": "RatRig configurations", "machine_model_list": [ diff --git a/resources/profiles/SeeMeCNC.json b/resources/profiles/SeeMeCNC.json index e3674f8709..4bc30dee93 100644 --- a/resources/profiles/SeeMeCNC.json +++ b/resources/profiles/SeeMeCNC.json @@ -1,6 +1,6 @@ { "name": "SeeMeCNC", - "version": "2.4.0.02", + "version": "2.4.0.03", "force_update": "1", "description": "SeeMeCNC configurations - Full profile set for Artemis, BOSSdelta, and RostockMAX printers", "machine_model_list": [ diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index 50aaad2715..65b1d12a3a 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -1,6 +1,6 @@ { "name": "Snapmaker", - "version": "02.04.00.11", + "version": "02.04.00.10", "force_update": "0", "description": "Snapmaker configurations", "machine_model_list": [ diff --git a/resources/profiles/Volumic.json b/resources/profiles/Volumic.json index 08a313b008..af7aa294bc 100644 --- a/resources/profiles/Volumic.json +++ b/resources/profiles/Volumic.json @@ -1,6 +1,6 @@ { "name": "Volumic", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "1", "description": "VOLUMIC configurations", "machine_model_list": [ diff --git a/resources/profiles/WonderMaker.json b/resources/profiles/WonderMaker.json index c65bc82729..0eeffdb045 100755 --- a/resources/profiles/WonderMaker.json +++ b/resources/profiles/WonderMaker.json @@ -1,7 +1,7 @@ { "name": "WonderMaker", "url": "", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "0", "description": "WonderMaker configurations", "machine_model_list": [ diff --git a/resources/profiles/iQ.json b/resources/profiles/iQ.json index 4afcb18328..050a0a2eb2 100644 --- a/resources/profiles/iQ.json +++ b/resources/profiles/iQ.json @@ -1,6 +1,6 @@ { "name": "innovatiQ", - "version": "02.04.00.01", + "version": "02.04.00.02", "force_update": "1", "description": "innovatiQ configuration", "machine_model_list": [ From 7c9b38ba04ce63f8181258c0f32ff2911e87c04f Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 3 Sep 2026 21:03:42 +0800 Subject: [PATCH 38/52] remove retired_filament_ids.json --- docs/HLSD/filament_id.md | 121 +- resources/profiles/retired_filament_ids.json | 6983 ----------------- scripts/assign_filament_ids.py | 548 +- scripts/check_profile.ps1 | 2 +- scripts/check_profile.sh | 2 +- scripts/tests/test_filament_id.py | 544 +- src/libslic3r/Preset.cpp | 54 - src/libslic3r/Preset.hpp | 17 - src/libslic3r/PresetBundle.cpp | 25 - src/slic3r/GUI/CaliHistoryDialog.cpp | 8 +- src/slic3r/GUI/DeviceManager.cpp | 22 +- src/slic3r/GUI/PresetComboBoxes.cpp | 7 - src/slic3r/Utils/QidiPrinterAgent.cpp | 12 +- task.md | 13 - tests/libslic3r/CMakeLists.txt | 1 - .../libslic3r/test_filament_id_succession.cpp | 69 - 16 files changed, 119 insertions(+), 8309 deletions(-) delete mode 100644 resources/profiles/retired_filament_ids.json delete mode 100644 task.md delete mode 100644 tests/libslic3r/test_filament_id_succession.cpp diff --git a/docs/HLSD/filament_id.md b/docs/HLSD/filament_id.md index 0dfc5471b0..980d830d7d 100644 --- a/docs/HLSD/filament_id.md +++ b/docs/HLSD/filament_id.md @@ -23,8 +23,9 @@ When a printer reports what a tray holds (Bambu AMS, Qidi box, Creality CFS, Klipper, Snapmaker), OrcaSlicer matches the reported id against the filament presets compatible with that printer to select the right profile; other features — tray display names, support-material detection, vitrification warnings, multi-nozzle filament grouping — -look up material properties by id alone. When an id has been retired, a shipped succession -ledger forwards it to its successor so old trays and records keep resolving. +look up material properties by id alone. An id that changes is not forwarded anywhere: a +tray or record still holding the old value falls back to matching by material type until the +user re-selects the filament, so identity changes are made deliberately and rarely. This page is the rule for authoring `filament_id` in system profiles (`resources/profiles/**`). CI enforces everything below; the short version is: @@ -33,13 +34,13 @@ This page is the rule for authoring `filament_id` in system profiles > **Never write a `filament_id` value by hand.** New families get their id from > `python scripts/assign_filament_ids.py`; existing families already have one — inherit it. -## The design, in three pieces +## The design, in two pieces Because several consumers match **globally by id alone, first hit wins** (see the next section), any two materials sharing one id feed wrong data somewhere — a wrong tray name, a wrong support-material flag, a wrong nozzle grouping — and inside one printer a duplicated id makes AMS spool matching a coin toss. Hand-written ids produce such collisions constantly, so -the system is built to make them impossible and to make identity corrections safe: +the system is built to make them impossible: 1. **Deterministic minting.** An id is a pure hash of the product's identity — no registry to maintain, no next-free-number ceremony, no way for two concurrent PRs to race for the same @@ -48,9 +49,6 @@ the system is built to make them impossible and to make identity corrections saf `scripts/filament_id_snapshot.json` exactly, so every change to ids, claims (which bundles ship which id, and for which family), or product identity surfaces as a reviewable diff to one file — the maintainer gate. -3. **A shipped succession ledger.** Ids live outside the tree too — on device trays, in - calibration records, in user presets, in project files. When an id is retired, the ledger - forwards it to its successor so none of those references degrade to a generic fallback. ## Who consumes the id @@ -60,9 +58,8 @@ friends) resolves it to a preset. The matcher is printer-scoped and first-match- scanning only compatible family roots — system roots plus user-made custom filaments, which are user roots carrying their own `P*` ids; a preset derived from another resolves through its root and never matches directly — it picks the first one whose `filament_id` equals the -tray's and retries once through the succession ledger on a miss. Only then does it fall back -by filament type: a system `Generic ` preset (matched by name, then by type -similarity), else the slot's previous selection, else any compatible system generic or, +tray's. On a miss it falls back by filament type: a system `Generic ` preset +(matched by name, then by type similarity), else the slot's previous selection, else any compatible system generic or, failing that, any compatible system preset, else the slot is skipped — every fallback selection surfaces a user-visible notice. @@ -75,7 +72,7 @@ pattern, with the device-reported tray material id flowing through the shared ma | Ecosystem | Where the tray id comes from today | | --- | --- | | Bambu AMS | the device itself (RFID / user tray setting) — the `GF*` catalog | -| Qidi box | composed at runtime as `QD___` — vendor and type indices from the device's per-slot saved variables, the series digit inferred client-side from the printer model/name — then translated through the succession ledger to the family's minted id (the `QD_*` values themselves no longer exist as preset ids — see the reserved-namespaces section) | +| Qidi box | composed at runtime as `QD___` — vendor and type indices from the device's per-slot saved variables, the series digit inferred client-side from the printer model/name. No preset carries a `QD_*` value, so the slot currently resolves by filament type; mapping the composed id onto the family's minted id belongs in the agent | | Creality CFS | runtime brand/type scoring returns the winning preset's id | | Klipper (AFC / Happy Hare) | runtime lookup by filament type | | Snapmaker | runtime color/vendor/type match | @@ -155,12 +152,12 @@ the `Generic X` base name, write no id key). e.g. `Generic PLA @Sovol SV08 MAX` inherits `Generic PLA @System` and lists three Sovol nozzles. A vendor-*branded* filament never rides a generic family id. 5. **Ids follow the product identity.** The id is a pure function of the product triple - `(filament_vendor, filament_type, family name)` — correcting any of them re-mints the id - **by design** (via `--remint `; the exact sequence is in the FAQ), and - `--update-snapshot` records the old id in the shipped succession ledger with its successor - so device trays, calibration records, and user presets keep resolving (`renamed_from` - still gates preset-*name* compatibility as before). A shipped id is never recycled for a - different material: retired ids are blocked forever. + `(filament_vendor, filament_type, family name)`, so correcting any of them re-mints the id + **by design** (via `--remint `; the exact sequence is in the FAQ). Nothing forwards + the old value, so anything outside the tree that stored it — a device tray, a calibration + record, a saved project — falls back to matching by filament type until the user re-selects + the filament. Re-mint deliberately, and only to fix a genuinely wrong identity. + (`renamed_from` still gates preset-*name* compatibility, as before.) ## Minting — nobody invents ids @@ -191,7 +188,7 @@ Snapmaker bundles alike; the OFL generic `Generic/PLA/Generic PLA` mints `OFDSrz by ten bundles — most by independent declarations converging on the same mint, the rest purely through inheritance from the OFL family. -On the rare collision with any existing or retired id, the minter salts the input (`…/1`, +On the rare collision with an existing id, the minter salts the input (`…/1`, `…/2`, …) until free, and the result is frozen in the profile file. Salting is also used deliberately: a *salt split* keeps two presets of one product on distinct ids where a single id would be AMS-ambiguous on the same printer — the "selectable alongside" situation from the @@ -224,14 +221,6 @@ normally only used by id migrations): *same* triple is legal by design — that is the point. - `--drop-redundant-ids VENDOR` deletes declarations that merely re-declare an inherited OrcaFilamentLibrary id. -- `--add-hint "OLD=NEW"` records a succession hint for an id a foreign catalog owns - (`GF*` only — see the ledger section). -- `--retire "OLD=NEW"` records succession for a shipped id that vanished while another - declarer kept it alive — lineage the automatic claim vote (see the succession-ledger - section) can no longer see. -- `--forget-never-shipped FILE` (with `--update-snapshot`) — given a JSON list of ids that - never shipped in any release, drops them from the lineage entirely (no retirement entry) - and splices succession chains that pointed through them. - `--profiles DIR` points the tooling at a different profile tree (default `resources/profiles`). @@ -248,10 +237,9 @@ or device contract owns it. | Space | Status | Rule | | --- | --- | --- | | `GF*` | Bambu AMS/RFID catalog — the one remaining *island* | BBL vendor only; a claim by anyone else is refused unless the snapshot sanctions that exact claim (via `--allow-shared-catalog` — see the CI section) | -| `QD_*` | Qidi device protocol — *dissolved island* | declarable by **nobody**, Qidi included; every shipped `QD_*` id is retired in the ledger with a live successor | +| `QD_*` | Qidi device protocol | declarable by **nobody**, Qidi included: the box composes these ids at runtime and they are not preset ids | | `P` + 7 hex chars (case-insensitive), `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp`) | never appears in system profiles | | every already-shipped id | frozen in the snapshot (grandfathered) | frozen as-is; new claims need maintainer sign-off | -| every retired id | `resources/profiles/retired_filament_ids.json` | never used again, for anything | The two device namespaces, in detail: @@ -259,43 +247,14 @@ The two device namespaces, in detail: declarations are frozen as-is and never re-minted. BBL also carries several dozen grandfathered legacy codes that are neither `GF*` nor `OF*` (the `BETA` family's `B*` ids, plus `Generic SBS`'s legacy `BFLSBS99`) — frozen the same way, via the snapshot. -- **Qidi (`QD_*`) — dissolved.** `QD_*` is a device-*protocol* namespace, not a preset id - space: the Qidi box path composes `QD___` ids at runtime (slot - vendor and type indices reported by the device, the series digit inferred client-side - from the printer model/name), and the Qidi agent translates a composed id through the - succession ledger to the family's minted id. Qidi presets themselves carry ordinary minted - `OF*` ids (generics share the OFL ids), and all 204 `QD_*` ids that ever shipped sit in - the ledger as retired entries with live successors — which is also what makes CI refuse - any future `QD_*` occurrence permanently. The alternative — treating per-series protocol ids - as preset ids — would put one product under five ids (`QIDI PLA Rapido` would be `QD_0_1_1` - through `QD_4_1_1`), exactly the fragmentation the mint rule removes. - -## The succession ledger - -`resources/profiles/retired_filament_ids.json` ships with the app and has two maps: - -- **`retired`** — ids Orca owned and withdrew. Each maps to - `{"claims": [...], "successor": }`; successor chains are followed to the live end. - When `--update-snapshot` retires a vanished id, it picks the successor by an automatic - *claim vote*: every old claim whose family still exists votes for that family's current id, - most votes wins. Alongside the deliberate re-mints, this map carries the whole pre-rule - legacy — old ad-hoc vendor codes, Creality's and Snapmaker's numeric ids, and the 204 - `QD_*` protocol ids. -- **`hints`** — the same forwarding for ids Orca *cannot* retire because a foreign island owns - them and may legitimately keep shipping them. That means `GF*` only: e.g. - `GFL99 → OFDSrzZ8` forwards Bambu's Generic PLA catalog id to the OFL generic family on - installs where no live preset carries `GFL99`. - -The client consults the ledger **only on resolution miss** — AMS tray sync and the sync-AMS -dialog's filament listing, the sidebar AMS dropdown, tray-id type lookup, calibration -history, the global filament-id preset lookup, and the Qidi box path. A live preset always -wins first, so BBL installs resolve `GF*` natively and behavior is unchanged wherever the -raw id still exists. This on-miss rule is what makes -identity-driven re-mints (structure rule 5) safe: the old id keeps resolving to the family's -current preset instead of degrading to a `Generic ` fallback. The file is append-only in -its keys — entries are never removed and a retired id never returns — and maintained -exclusively by `--update-snapshot` / `--add-hint` / `--retire` (`--forget-never-shipped`, an -`--update-snapshot` mode, may rewrite an existing entry's successor when splicing chains). +- **Qidi (`QD_*`).** `QD_*` is a device-*protocol* namespace, not a preset id space: the + Qidi box path composes `QD___` ids at runtime (slot vendor and + type indices reported by the device, the series digit inferred client-side from the printer + model/name). Qidi presets carry ordinary minted `OF*` ids (generics share the OFL ids), so + a composed id matches no preset and the slot falls back to filament type; translating it to + the family's id belongs in `QidiPrinterAgent`. The alternative — treating per-series + protocol ids as preset ids — would put one product under five ids (`QIDI PLA Rapido` would + be `QD_0_1_1` through `QD_4_1_1`), exactly the fragmentation the mint rule removes. ## How CI enforces this @@ -319,11 +278,6 @@ The checks, in brief: - **Mint conformance** — a non-grandfathered `OF*` id must equal the mint (or a low salt iteration) of its declarer's product triple; the error prints the expected id to paste into the family root. -- **Retired reuse** — any tree id present in the `retired` map of - `resources/profiles/retired_filament_ids.json` is an error, with no grandfathering (keys in - the same file's `hints` map may legitimately stay live — BBL still ships them). Ids that - fully vanish from the tree are appended to the `retired` map by `--update-snapshot`; ids - are only ever added there, never removed or reused. - **Alias hygiene** — a vendor preset riding an OFL family id must keep the library preset's base name (a rename re-exposes the library preset, since alias shadowing is name-based), a non-empty `compatible_printers` (an empty one shadows nothing), and no own id key @@ -331,12 +285,8 @@ The checks, in brief: - **Triple integrity** — every declarer outside the BBL island must resolve a non-empty `filament_vendor` and `filament_type` (generics use `"Generic"`), and all declarers of one family within a bundle must agree on the triple. -- **Succession integrity** — retired successor chains terminate at a live id (or null) with - no cycles; `hints` keys stay in the island namespace (`GF*`), are never also retired, and - their chains end at a live tree id. - **Reserved namespaces** — `GF*` outside BBL, `P<7-hex>` or `"null"` anywhere, unless that - exact claim is grandfathered in the snapshot; `QD_*` anywhere, with no exception (all are - retired). + exact claim is grandfathered in the snapshot; `QD_*` anywhere, with no exception. - **Structure** — no `filament_id` key on newly instantiated presets; no new declared-vs-inherited id drift; every instantiated system filament must resolve an effective id through its `inherits` chain (recall: an id-less one is a hard load error in @@ -364,18 +314,15 @@ ambiguity check behind structure rule 3. - **A tuned generic ("our profile for Generic PLA")?** Inherit `Generic PLA @System`, keep the `Generic PLA` base name, set `compatible_printers`, write no id key. - **I need to fix a family's `filament_vendor` or `filament_type`.** Fix the config, run - `--remint ` then `--update-snapshot`: the id re-derives from the corrected identity - and the old id lands in the succession ledger pointing at the new one. Commit the profile, - snapshot, and ledger diffs together. -- **I need to rename a family.** Renames need one extra step, because the succession vote - follows family names (`renamed_from` gates preset-name compatibility but is not read by the - id tooling): rename the presets (adding `renamed_from`), run `--update-snapshot` once to - sanction the renamed claims on the old id, then `--remint `, then `--update-snapshot` - again — the old id now lands in the ledger pointing at the new one. Re-minting first would - retire the old id *heirless* (successor `null`), which cannot be repaired afterwards. -- **Can I reuse a `QD_*` id for a Qidi profile?** No — nobody can. The namespace is a - dissolved island: the device still composes those ids at runtime, and the succession ledger - translates them to the families' minted ids. Author Qidi filaments like any other vendor's. + `--remint ` then `--update-snapshot`, and commit the profile and snapshot diffs + together. The id re-derives from the corrected identity, and nothing forwards the old + value, so a tray or record still holding it falls back to matching by filament type. +- **I need to rename a family.** Rename the presets (adding `renamed_from`, which keeps the + preset *name* resolving), then `--remint `, then `--update-snapshot`. The id follows + the new family name; as with any identity fix, the old id is not forwarded. +- **Can I reuse a `QD_*` id for a Qidi profile?** No — nobody can. It is the device protocol's + own id space: the box composes those values at runtime and no preset carries one. Author + Qidi filaments like any other vendor's. - **CI says my family needs an id.** Run `python scripts/assign_filament_ids.py`, then `--update-snapshot`, and commit both diffs. Do not type an id by hand. diff --git a/resources/profiles/retired_filament_ids.json b/resources/profiles/retired_filament_ids.json deleted file mode 100644 index 7f5dda5901..0000000000 --- a/resources/profiles/retired_filament_ids.json +++ /dev/null @@ -1,6983 +0,0 @@ -{ - "hints": { - "GFA00_01": "OF9HCdyQ", - "GFA03": "OFjXrKFO", - "GFA50_01": "OF7OqDp3", - "GFA99": "OF0yFLkY", - "GFASA": "OF0yFLkY", - "GFB00_01": "OFNQKF0M", - "GFB01_01": "OFdrYBmI", - "GFB98": "OFLPAxz3", - "GFB98_01": "OFUaVAdj", - "GFB98_2": "OFoJcr46", - "GFB98_3": "OFoJcr46", - "GFB98_4": "OFoJcr46", - "GFB98_5": "OFK4LdYI", - "GFB98_6": "OFK4LdYI", - "GFB98_7": "OFK4LdYI", - "GFB99": "OFY9muEs", - "GFB99_01": "OFNLXV8X", - "GFB99_2": "OFvGc67v", - "GFB99_3": "OFvGc67v", - "GFB99_4": "OFvGc67v", - "GFB99_5": "OFvGc67v", - "GFB99_6": "OFyeSq8A", - "GFB99_7": "OFyeSq8A", - "GFC00_01": "OFdXVjGZ", - "GFC98": "OFjz0a3m", - "GFC99": "OFLakOUI", - "GFC99_01": "OFN7aNHe", - "GFC99_1": "OF97ru74", - "GFC99_2": "OF97ru74", - "GFC99_3": "OF97ru74", - "GFC99_4": "OF97ru74", - "GFC99_5": "OFq5QANf", - "GFC99_6": "OFq5QANf", - "GFG00_01": "OFObyktP", - "GFG03": "OF3F63OE", - "GFG96": "OF7lOgYF", - "GFG97": "OFu1evlr", - "GFG97-01": "OFTKFAZ4", - "GFG98": "OFoYSJKi", - "GFG98_01": "OFWadebJ", - "GFG99": "OFYPdQJh", - "GFG99_01": "OF1uR1t2", - "GFG99_2": "OF1Id239", - "GFG99_3": "OF1Id239", - "GFG99_4": "OF1Id239", - "GFG99_5": "OF1Id239", - "GFG99_6": "OFOKYhi6", - "GFG99_7": "OFOKYhi6", - "GFL100": "OFBpcB0a", - "GFL106": "OFDSrzZ8", - "GFL108": "OFDSrzZ8", - "GFL204": "OFY9muEs", - "GFL206": "OFY9muEs", - "GFL208": "OFY9muEs", - "GFL304": "OFYPdQJh", - "GFL306": "OFYPdQJh", - "GFL308": "OFYPdQJh", - "GFL404": "OFg8ndtj", - "GFL406": "OFg8ndtj", - "GFL408": "OFg8ndtj", - "GFL504": "OFsP8PKH", - "GFL506": "OFsP8PKH", - "GFL508": "OFsP8PKH", - "GFL71": "OF0omtEb", - "GFL72": "OFFZ458u", - "GFL73": "OFeVzkSU", - "GFL74": "OF0VpkBM", - "GFL75": "OFnXwW8l", - "GFL76": "OF6H51Xx", - "GFL77": "OFtFtiS0", - "GFL78": "OFelDBgv", - "GFL79": "OF5oXk4M", - "GFL80": "OFHknN4v", - "GFL94": "OFrGJ4tR", - "GFL95": "OFmpMwxS", - "GFL95_01": "OFodPDxO", - "GFL96": "OFesA6rF", - "GFL96_01": "OF0GIkJm", - "GFL97": "OFCp3Bgo", - "GFL98": "OFWbdGsC", - "GFL98_01": "OFgVJhVt", - "GFL98_1": "OFQ7I5vC", - "GFL98_3": "OFQ7I5vC", - "GFL98_4": "OFQ7I5vC", - "GFL98_5": "OFQ7I5vC", - "GFL99": "OFDSrzZ8", - "GFL99_01": "OFuSwKgm", - "GFL99_2": "OFiCHnso", - "GFL99_3": "OFiCHnso", - "GFL99_4": "OFiCHnso", - "GFL99_5": "OFiCHnso", - "GFL99_6": "OFl4ItvQ", - "GFL99_7": "OFl4ItvQ", - "GFLLK10PETG": "OFYPdQJh", - "GFLLK10PLA": "OFDSrzZ8", - "GFLLK10PPETG": "OFYPdQJh", - "GFLLK10PPLA": "OFDSrzZ8", - "GFLSBS99": "OFhQfUQY", - "GFN05_01": "OFe8tuNb", - "GFN96": "OF8Tlg47", - "GFN96_01": "OFptvi3F", - "GFN97": "OF8tPByX", - "GFN97_01": "OFSPdsuW", - "GFN98": "OFQLcbps", - "GFN98_02": "OFHa3RZT", - "GFN98_1": "OFfznI0Q", - "GFN98_2": "OFfznI0Q", - "GFN98_3": "OFfznI0Q", - "GFN98_4": "OFfznI0Q", - "GFN99": "OFg8ndtj", - "GFN99_01": "OFQswlnF", - "GFN99_1": "OFIy3kLw", - "GFN99_2": "OFIy3kLw", - "GFN99_3": "OFIy3kLw", - "GFN99_4": "OFIy3kLw", - "GFOT001": "OFxA1p01", - "GFOT002": "OFGkyftV", - "GFOT003": "OF1Pke8t", - "GFOT004": "OFMZvH0z", - "GFOT005": "OF2pj5l5", - "GFOT006": "OFcfQk4h", - "GFOT008": "OFcvKkrs", - "GFOT009": "OFM91vZs", - "GFP95": "OFNiSLfL", - "GFP95_01": "OFkYkQGO", - "GFP96": "OFXkm8q1", - "GFP96_01": "OFMTBcnz", - "GFP97": "OF1UNk9P", - "GFP97_01": "OF3s929u", - "GFP98": "OFd0Fv0k", - "GFP98_01": "OFkUaDnU", - "GFP99": "OFPklMI1", - "GFP99_01": "OFKuTr12", - "GFPA": "OFzS7zt4", - "GFPA6-CF": "OFQe7sAx", - "GFPAHT-CF": "OFaEuvNF", - "GFPC": "OFZtkHRq", - "GFPC-CF": "OFeIyhUx", - "GFPC-GF": "OFxJRuVF", - "GFPEBA": "OFjLAYgO", - "GFPET-CF": "OFRhCTUg", - "GFPETG": "OFYPdQJh", - "GFPETG-1": "OFIeCuXj", - "GFPETG-CF": "OF9UJOGF", - "GFPLA Glow": "OF5PtjTp", - "GFPLA Translucent": "OF7c9fln", - "GFPLA-CF": "OFZ0mR5b", - "GFPVA": "OFTkj6DR", - "GFR98": "OF74KeQR", - "GFR98_01": "OFxvKuYW", - "GFR99": "OFCD8qiU", - "GFR99_01": "OFrnJJEa", - "GFS04_01": "OFyreocX", - "GFS97": "OFo2UF2C", - "GFS97_01": "OFGDaEHO", - "GFS98": "OFsFon5l", - "GFS98_01": "OFW9uIkE", - "GFS99": "OFDvXujf", - "GFS99_01": "OFMZAoqa", - "GFS99_1": "OFcCzEkS", - "GFS99_2": "OFcCzEkS", - "GFS99_3": "OFcCzEkS", - "GFS99_4": "OFcCzEkS", - "GFS99_5": "OFoT8F7Y", - "GFS99_6": "OFoT8F7Y", - "GFSEP001": "OFtudokz", - "GFSEP002": "OFf5awy4", - "GFSEP003": "OFbP8zEO", - "GFSEP004": "OFrFBEfd", - "GFSEP005": "OFvzvwCu", - "GFSEP006": "OFH2nN08", - "GFSEP007": "OFPc4zVY", - "GFSEP008": "OFkzr35f", - "GFSEP009": "OFHfzQXo", - "GFSEP010": "OFhWhL1i", - "GFSEP011": "OFx8Lmsd", - "GFSEP012": "OFRiFnfQ", - "GFSEP013": "OFhfd722", - "GFSEP014": "OFIegjmD", - "GFSEP015": "OFvVy7yo", - "GFSEP016": "OFTOPcx0", - "GFSEP017": "OFXCBZTA", - "GFSEP018": "OFlSNkhc", - "GFSL99": "OFqOk9Ww", - "GFT01_01": "OFCnywiC", - "GFT97_01": "OFvPomQf", - "GFT98_01": "OFGzUNbm", - "GFTPU 95A": "OFML2aVd", - "GFTPU for ACE": "OF0FfcAG", - "GFU01_01": "OFDJU6R3", - "GFU99": "OFgbpcy9", - "GFU99_01": "OFCVUEaV", - "GFU99_2": "OFbenYUK", - "GFU99_3": "OFU3zwPc" - }, - "retired": { - "00001": { - "claims": [ - "Creality/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "00002": { - "claims": [ - "Creality/Generic PLA-Silk" - ], - "successor": "OFi6PfUM" - }, - "00003": { - "claims": [ - "Creality/Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "00004": { - "claims": [ - "Creality/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "00005": { - "claims": [ - "Creality/Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "00006": { - "claims": [ - "Creality/Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "00007": { - "claims": [ - "Creality/Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "00008": { - "claims": [ - "Creality/Generic PA" - ], - "successor": "OFg8ndtj" - }, - "00009": { - "claims": [ - "Creality/Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "00010": { - "claims": [ - "Creality/Generic BVOH" - ], - "successor": "OFo2UF2C" - }, - "00011": { - "claims": [ - "Creality/Generic PVA" - ], - "successor": "OFDvXujf" - }, - "00012": { - "claims": [ - "Creality/Generic HIPS" - ], - "successor": "OFsFon5l" - }, - "00013": { - "claims": [ - "Creality/Generic PET-CF" - ], - "successor": "OFQdaVZS" - }, - "00014": { - "claims": [ - "Creality/Generic PETG-CF" - ], - "successor": "OFoYSJKi" - }, - "00015": { - "claims": [ - "Creality/Generic PA6-CF" - ], - "successor": "OFhTPf6L" - }, - "00016": { - "claims": [ - "Creality/Generic PAHT-CF" - ], - "successor": "OFH7b12v" - }, - "00017": { - "claims": [ - "Creality/Generic PPS" - ], - "successor": "OFq9svOz" - }, - "00018": { - "claims": [ - "Creality/Generic PPS-CF" - ], - "successor": "OF6rdQ6M" - }, - "00019": { - "claims": [ - "Creality/Generic PP" - ], - "successor": "OF1UNk9P" - }, - "00020": { - "claims": [ - "Creality/Generic PET" - ], - "successor": "OF6MOPWx" - }, - "00021": { - "claims": [ - "Creality/Generic PC" - ], - "successor": "OFLakOUI" - }, - "00022": { - "claims": [ - "Creality/Generic PA612-CF" - ], - "successor": "OF8eaY7j" - }, - "00023": { - "claims": [ - "Creality/Generic Support for PA" - ], - "successor": "OFDtop41" - }, - "00024": { - "claims": [ - "Creality/Generic Support for PLA" - ], - "successor": "OFin64Qg" - }, - "00025": { - "claims": [ - "Creality/Generic PA12-CF" - ], - "successor": "OFM4iJlv" - }, - "00026": { - "claims": [ - "Creality/Generic TPU 64D" - ], - "successor": "OFF3cuzT" - }, - "00027": { - "claims": [ - "Creality/Generic PETG-GF" - ], - "successor": "OFyLWVF3" - }, - "00031": { - "claims": [ - "Creality/Generic PP-CF" - ], - "successor": "OFXkm8q1" - }, - "00032": { - "claims": [ - "Creality/Generic PCTG" - ], - "successor": "OFu1evlr" - }, - "00033": { - "claims": [ - "Creality/Generic ASA-CF" - ], - "successor": "OF53eLVD" - }, - "00034": { - "claims": [ - "Creality/Generic PA6-GF" - ], - "successor": "OFh9u9c0" - }, - "00035": { - "claims": [ - "Creality/eSUN PLA-LW" - ], - "successor": "OFi5RSve" - }, - "01001": { - "claims": [ - "Creality/Creality Hyper PLA", - "Creality/Hyper PLA" - ], - "successor": "OFAIrQXu" - }, - "01002": { - "claims": [ - "Creality/Hyper L-W PLA" - ], - "successor": "OF70zbGS" - }, - "01003": { - "claims": [ - "Creality/Hyper Luminous" - ], - "successor": "OFC1PzXz" - }, - "01004": { - "claims": [ - "Creality/Hyper Stardust" - ], - "successor": "OFXnToSX" - }, - "01601": { - "claims": [ - "Creality/Soleyin Ultra PLA" - ], - "successor": "OF02UAVh" - }, - "02001": { - "claims": [ - "Creality/Creality Hyper PLA-CF", - "Creality/Hyper PLA-CF" - ], - "successor": "OFGwT5Av" - }, - "03001": { - "claims": [ - "Creality/Creality Hyper ABS", - "Creality/Hyper ABS" - ], - "successor": "OF8GnyFU" - }, - "04001": { - "claims": [ - "Creality/CR-PLA", - "Creality/Creality Generic PLA" - ], - "successor": "OFACSw9O" - }, - "05001": { - "claims": [ - "Creality/CR-Silk", - "Creality/Creality Silk PLA" - ], - "successor": "OF3OMgrI" - }, - "06001": { - "claims": [ - "Creality/CR-PETG", - "Creality/Creality Generic PETG" - ], - "successor": "OF3WQaKK" - }, - "06002": { - "claims": [ - "Creality/Hyper PETG" - ], - "successor": "OFujZSdh" - }, - "06003": { - "claims": [ - "Creality/Hyper PETG-CF" - ], - "successor": "OFusbWjj" - }, - "06004": { - "claims": [ - "Creality/Hyper PETG-GF" - ], - "successor": "OFLgwqp2" - }, - "06005": { - "claims": [ - "Creality/Soleyin Basic PETG" - ], - "successor": "OFBLktDy" - }, - "07001": { - "claims": [ - "Creality/CR-ABS", - "Creality/Creality Generic ABS" - ], - "successor": "OFGwZmgS" - }, - "07002": { - "claims": [ - "Creality/Hyper PC" - ], - "successor": "OFUF7oA4" - }, - "08001": { - "claims": [ - "Creality/Ender-PLA" - ], - "successor": "OFWao3Ic" - }, - "09001": { - "claims": [ - "Creality/EN-PLA+" - ], - "successor": "OFks6esg" - }, - "09002": { - "claims": [ - "Creality/ENDER FAST PLA" - ], - "successor": "OFfSqS4R" - }, - "10001": { - "claims": [ - "Creality/Creality Generic TPU", - "Creality/HP-TPU" - ], - "successor": "OFGcMkEB" - }, - "1009481135": { - "claims": [ - "Snapmaker/Snapmaker J1 PET" - ], - "successor": "OF8Jl6NT" - }, - "1042511226": { - "claims": [ - "Snapmaker/Snapmaker Dual PETG-CF" - ], - "successor": "OF3msXEa" - }, - "10425112260": { - "claims": [ - "Snapmaker/Snapmaker PETG-CF" - ], - "successor": "OFOwQuZM" - }, - "11001": { - "claims": [ - "Creality/CR-Nylon", - "Creality/Creality Generic PA" - ], - "successor": "OFMqYusc" - }, - "1172603684": { - "claims": [ - "Snapmaker/Snapmaker J1 PETG" - ], - "successor": "OFQMTRc8" - }, - "1181363872": { - "claims": [ - "Snapmaker/Snapmaker Dual PLA Silk" - ], - "successor": "OFyj3m13" - }, - "11813638720": { - "claims": [ - "Snapmaker/Snapmaker PLA Silk" - ], - "successor": "OFWgFOjn" - }, - "1192769348": { - "claims": [ - "Snapmaker/Snapmaker J1 PLA Matte" - ], - "successor": "OFY3AB7j" - }, - "12002": { - "claims": [ - "Creality/Hyper PPA-CF" - ], - "successor": "OFNvBIL0" - }, - "12003": { - "claims": [ - "Creality/Hyper PAHT-CF" - ], - "successor": "OF4APyxe" - }, - "12004": { - "claims": [ - "Creality/Hyper PA612-CF" - ], - "successor": "OFhkN0a7" - }, - "12005": { - "claims": [ - "Creality/Hyper PA6-CF" - ], - "successor": "OFn2GlhY" - }, - "1207881278": { - "claims": [ - "Snapmaker/Snapmaker Dual Breakaway" - ], - "successor": "OFfmHUkQ" - }, - "1210173120": { - "claims": [ - "Snapmaker/Snapmaker J1 PA-CF" - ], - "successor": "OFYEtXuk" - }, - "1223824394": { - "claims": [ - "Snapmaker/Snapmaker J1 ABS" - ], - "successor": "OFy14TRA" - }, - "1247172706": { - "claims": [ - "Snapmaker/Snapmaker Dual ASA" - ], - "successor": "OFKUEXPA" - }, - "12471727060": { - "claims": [ - "Snapmaker/Snapmaker ASA" - ], - "successor": "OF1d7c3A" - }, - "13001": { - "claims": [ - "Creality/CR-PLA Carbon" - ], - "successor": "OFrM4hdm" - }, - "1344609062": { - "claims": [ - "Snapmaker/Snapmaker PVA" - ], - "successor": "OFyhjiNs" - }, - "1355502217": { - "claims": [ - "Snapmaker/Snapmaker PETG-CF" - ], - "successor": "OFOwQuZM" - }, - "1393866034": { - "claims": [ - "Snapmaker/PolyLite Dual PLA", - "Snapmaker/PolyLite J1 PLA", - "Snapmaker/PolyLite PLA" - ], - "successor": "OF5CgdDq" - }, - "14001": { - "claims": [ - "Creality/CR-PLA Matte" - ], - "successor": "OFM0xjBG" - }, - "1417031127": { - "claims": [ - "Snapmaker/Snapmaker Dual PLA" - ], - "successor": "OFZivHGL" - }, - "14170311270": { - "claims": [ - "Snapmaker/Snapmaker PLA" - ], - "successor": "OFlufQpZ" - }, - "141703112701": { - "claims": [ - "Snapmaker/Snapmaker PLA SnapSpeed" - ], - "successor": "OFwhLMs4" - }, - "1417031127011": { - "claims": [ - "Snapmaker/Snapmaker PLA Lite" - ], - "successor": "OFEOnBj6" - }, - "144877656": { - "claims": [ - "Snapmaker/Snapmaker J1 ASA" - ], - "successor": "OFt7SngH" - }, - "1480063856": { - "claims": [ - "Snapmaker/Snapmaker TPU" - ], - "successor": "OF65InrS" - }, - "15001": { - "claims": [ - "Creality/CR-PLA Fluo" - ], - "successor": "OFgpQwkk" - }, - "1528786603": { - "claims": [ - "Snapmaker/Snapmaker J1 PLA Silk" - ], - "successor": "OFQ1KzO8" - }, - "16001": { - "claims": [ - "Creality/CR-TPU" - ], - "successor": "OFG2RkhN" - }, - "1655727393": { - "claims": [ - "Snapmaker/Snapmaker PLA Silk" - ], - "successor": "OFWgFOjn" - }, - "168223792": { - "claims": [ - "Snapmaker/Snapmaker Dual ABS" - ], - "successor": "OFJhT2fd" - }, - "1682237920": { - "claims": [ - "Snapmaker/Snapmaker ABS" - ], - "successor": "OF72YYTd" - }, - "1695556157": { - "claims": [ - "Snapmaker/Snapmaker PLA Eco" - ], - "successor": "OFpu74Qe" - }, - "17001": { - "claims": [ - "Creality/CR-Wood" - ], - "successor": "OFGxC8gB" - }, - "1702147325": { - "claims": [ - "Snapmaker/Snapmaker Dual PLA-CF" - ], - "successor": "OF6ATsCF" - }, - "17021473250": { - "claims": [ - "Snapmaker/Snapmaker PLA-CF" - ], - "successor": "OFhQf8ou" - }, - "18001": { - "claims": [ - "Creality/HP Ultra PLA" - ], - "successor": "OFCJpR7a" - }, - "1895495477": { - "claims": [ - "Snapmaker/Snapmaker PETG" - ], - "successor": "OF4WB37S" - }, - "19001": { - "claims": [ - "Creality/Creality Generic ASA", - "Creality/HP-ASA" - ], - "successor": "OFPHLnoe" - }, - "200803790": { - "claims": [ - "Snapmaker/Snapmaker Dual PLA Eco" - ], - "successor": "OFyPG8v2" - }, - "2008037900": { - "claims": [ - "Snapmaker/Snapmaker PLA Eco" - ], - "successor": "OFpu74Qe" - }, - "2029994346": { - "claims": [ - "Snapmaker/Snapmaker Dual PLA Metal" - ], - "successor": "OFg3cWVt" - }, - "20299943460": { - "claims": [ - "Snapmaker/Snapmaker PLA Metal" - ], - "successor": "OFtybfNX" - }, - "2128577941": { - "claims": [ - "Snapmaker/Snapmaker Dual PET" - ], - "successor": "OFUIfGoh" - }, - "21285779410": { - "claims": [ - "Snapmaker/Snapmaker PET" - ], - "successor": "OFQYaiGg" - }, - "2209001062": { - "claims": [ - "Snapmaker/Snapmaker Dual PETG" - ], - "successor": "OFBlFMVp" - }, - "22090010620": { - "claims": [ - "Snapmaker/Snapmaker PETG" - ], - "successor": "OF4WB37S" - }, - "2549587591": { - "claims": [ - "Snapmaker/Snapmaker PET" - ], - "successor": "OFQYaiGg" - }, - "2742961008": { - "claims": [ - "Snapmaker/Snapmaker ASA" - ], - "successor": "OF1d7c3A" - }, - "29001": { - "claims": [ - "Creality/Hyper Marble" - ], - "successor": "OFLzx3J4" - }, - "2971656290": { - "claims": [ - "Snapmaker/Snapmaker Dual TPU" - ], - "successor": "OFjkdnyN" - }, - "29716562900": { - "claims": [ - "Snapmaker/Snapmaker TPU" - ], - "successor": "OF65InrS" - }, - "297165629001": { - "claims": [ - "Snapmaker/Snapmaker TPU 95A" - ], - "successor": "OFKo87c6" - }, - "3104636980": { - "claims": [ - "Snapmaker/Snapmaker Dual PVA" - ], - "successor": "OFDKIKyw" - }, - "31046369800": { - "claims": [ - "Snapmaker/Snapmaker PVA" - ], - "successor": "OFyhjiNs" - }, - "3177068229": { - "claims": [ - "Snapmaker/Snapmaker PLA" - ], - "successor": "OFlufQpZ" - }, - "3383257822": { - "claims": [ - "Snapmaker/Snapmaker J1 PLA Eco" - ], - "successor": "OFLbdkrE" - }, - "3492897526": { - "claims": [ - "Snapmaker/Snapmaker J1 Breakaway" - ], - "successor": "OFeTATC7" - }, - "3493177425": { - "claims": [ - "Snapmaker/Snapmaker Dual PA-CF" - ], - "successor": "OFRooa0F" - }, - "34931774250": { - "claims": [ - "Snapmaker/Snapmaker PA-CF" - ], - "successor": "OFEmsric" - }, - "3503790988": { - "claims": [ - "Snapmaker/Snapmaker Dual PLA Matte" - ], - "successor": "OFlIsW6f" - }, - "377675245": { - "claims": [ - "Snapmaker/Snapmaker J1 PLA" - ], - "successor": "OFSa39yP" - }, - "3806593857": { - "claims": [ - "Snapmaker/Snapmaker J1 PLA-CF" - ], - "successor": "OFdD5Wbu" - }, - "3811508002": { - "claims": [ - "Snapmaker/Snapmaker ABS" - ], - "successor": "OF72YYTd" - }, - "3864371306": { - "claims": [ - "Snapmaker/Snapmaker PLA-CF" - ], - "successor": "OFhQf8ou" - }, - "4012961186": { - "claims": [ - "Snapmaker/Snapmaker J1 PLA Metal" - ], - "successor": "OFt0JbR7" - }, - "4092268632": { - "claims": [ - "Snapmaker/Snapmaker J1 TPU" - ], - "successor": "OFyrnlUn" - }, - "4227461134": { - "claims": [ - "Snapmaker/Snapmaker Breakaway Support For PLA", - "Snapmaker/Snapmaker J1 PVA" - ], - "successor": "OF6TuVAg" - }, - "4235401834": { - "claims": [ - "Snapmaker/Snapmaker J1 PETG-CF" - ], - "successor": "OFxYB4Sw" - }, - "581236806": { - "claims": [ - "Snapmaker/Snapmaker PA-CF" - ], - "successor": "OFEmsric" - }, - "AZ01-1": { - "claims": [ - "BBL/AliZ PETG-CF", - "OrcaFilamentLibrary/AliZ PETG-CF" - ], - "successor": "OFJOFnOZ" - }, - "AZ01-2": { - "claims": [ - "BBL/AliZ PETG-Metal", - "OrcaFilamentLibrary/AliZ PETG-Metal" - ], - "successor": "OFOABq7t" - }, - "AliZ001": { - "claims": [ - "BBL/AliZ PETG", - "OrcaFilamentLibrary/AliZ PETG" - ], - "successor": "OFocyw69" - }, - "AliZ002": { - "claims": [ - "BBL/AliZ PLA", - "OrcaFilamentLibrary/AliZ PLA" - ], - "successor": "OFyxayW4" - }, - "AliZ003": { - "claims": [ - "BBL/AliZ PA-CF", - "OrcaFilamentLibrary/AliZ PA-CF" - ], - "successor": "OFd4zw5l" - }, - "BSFI001": { - "claims": [ - "Blocks/Blocks Generic PLA" - ], - "successor": "OFNYewRS" - }, - "BSFI002": { - "claims": [ - "Blocks/Blocks Generic PETG" - ], - "successor": "OFrgGex8" - }, - "BSFI003": { - "claims": [ - "Blocks/Blocks Generic TPU" - ], - "successor": "OFMEbuBE" - }, - "BSFI004": { - "claims": [ - "Blocks/Blocks Generic ABS" - ], - "successor": "OFma52eS" - }, - "BSFI005": { - "claims": [ - "Blocks/Blocks Generic ASA" - ], - "successor": "OFB9dx27" - }, - "BSFI006": { - "claims": [ - "Blocks/Blocks Generic PA" - ], - "successor": "OFiUSDih" - }, - "BSFI007": { - "claims": [ - "Blocks/Blocks Generic PA-CF" - ], - "successor": "OF8bLDu7" - }, - "BSFI008": { - "claims": [ - "Blocks/Blocks Generic PC" - ], - "successor": "OFahE7HP" - }, - "BSFI009": { - "claims": [ - "Blocks/Blocks Generic PVA" - ], - "successor": "OFiorRtJ" - }, - "BSFI010": { - "claims": [ - "Blocks/Blocks Generic PLA-CF" - ], - "successor": "OFupq0tY" - }, - "CX30DB20": { - "claims": [ - "BBL/COEX TPE 30D", - "OrcaFilamentLibrary/COEX TPE 30D" - ], - "successor": "OFVptRxp" - }, - "CX40DB20": { - "claims": [ - "BBL/COEX TPE 40D", - "OrcaFilamentLibrary/COEX TPE 40D" - ], - "successor": "OFfnXFie" - }, - "CX60AB17": { - "claims": [ - "BBL/COEX TPU 60A", - "OrcaFilamentLibrary/COEX TPU 60A" - ], - "successor": "OFE0NFRh" - }, - "CX60DB19": { - "claims": [ - "BBL/COEX TPE 60D", - "OrcaFilamentLibrary/COEX TPE 60D" - ], - "successor": "OFfr4XNO" - }, - "CXABPB09": { - "claims": [ - "BBL/COEX ABS PRIME", - "OrcaFilamentLibrary/COEX ABS PRIME" - ], - "successor": "OFuWCQXN" - }, - "CXABSB01": { - "claims": [ - "BBL/COEX ABS", - "OrcaFilamentLibrary/COEX ABS" - ], - "successor": "OF99UMPq" - }, - "CXASAB04": { - "claims": [ - "BBL/COEX ASA PRIME", - "OrcaFilamentLibrary/COEX ASA PRIME" - ], - "successor": "OFtpXCCv" - }, - "CXPACB23": { - "claims": [ - "BBL/COEX NYLEX PA6-CF", - "OrcaFilamentLibrary/COEX NYLEX PA6-CF" - ], - "successor": "OF0NgY1y" - }, - "CXPAUB21": { - "claims": [ - "BBL/COEX NYLEX UNFILLED " - ], - "successor": "OFJs1ToM" - }, - "CXPCTB15": { - "claims": [ - "BBL/COEX PCTG PRIME", - "OrcaFilamentLibrary/COEX PCTG PRIME" - ], - "successor": "OFwu7IAG" - }, - "CXPETB13": { - "claims": [ - "BBL/COEX PETG", - "OrcaFilamentLibrary/COEX PETG" - ], - "successor": "OFvTVZc3" - }, - "CXPLAB02": { - "claims": [ - "BBL/COEX PLA", - "OrcaFilamentLibrary/COEX PLA" - ], - "successor": "OFhlCNqq" - }, - "CXPLAB08": { - "claims": [ - "BBL/COEX PLA PRIME", - "OrcaFilamentLibrary/COEX PLA PRIME" - ], - "successor": "OFd2vX0G" - }, - "CXPLSB03": { - "claims": [ - "BBL/COEX PLA+Silk", - "OrcaFilamentLibrary/COEX PLA+Silk" - ], - "successor": "OF0pzFLc" - }, - "DFL99": { - "claims": [ - "Volumic/Désactivé" - ], - "successor": "OFCuaCer" - }, - "DREMC001": { - "claims": [], - "successor": null - }, - "DREMC002": { - "claims": [], - "successor": null - }, - "DREMC003": { - "claims": [], - "successor": null - }, - "DREMC004": { - "claims": [], - "successor": null - }, - "DREMC005": { - "claims": [], - "successor": null - }, - "DREMC006": { - "claims": [ - "OrcaFilamentLibrary/DREMC PA6-CF" - ], - "successor": "OFsoykbm" - }, - "DREMC007": { - "claims": [], - "successor": null - }, - "DREMC008": { - "claims": [], - "successor": null - }, - "DREMC009": { - "claims": [ - "OrcaFilamentLibrary/DREMC ABS-GF" - ], - "successor": "OFCidU7j" - }, - "DREMC010": { - "claims": [ - "OrcaFilamentLibrary/DREMC PPA-CF" - ], - "successor": "OFiWaoqD" - }, - "DREMC011": { - "claims": [], - "successor": null - }, - "DREMC012": { - "claims": [], - "successor": null - }, - "DREMC013": { - "claims": [], - "successor": null - }, - "E1001": { - "claims": [ - "Creality/eSUN PLA+" - ], - "successor": "OFqINlYj" - }, - "E1002": { - "claims": [ - "Creality/eSUN PLA-Silk" - ], - "successor": "OFIRUqWi" - }, - "E1003": { - "claims": [ - "Creality/eSUN PLA-Matte" - ], - "successor": "OFDETOM6" - }, - "E1004": { - "claims": [ - "Creality/eSUN PLA-Lite" - ], - "successor": "OFhbolij" - }, - "E1005": { - "claims": [ - "Creality/eSUN PLA-CF" - ], - "successor": "OFnHc3D6" - }, - "E1006": { - "claims": [ - "Creality/eSUN PLA-HS" - ], - "successor": "OFOHOf2F" - }, - "E2001": { - "claims": [ - "Creality/eSUN PETG" - ], - "successor": "OF3kBrdA" - }, - "E2002": { - "claims": [ - "Creality/eSUN PETG+HS" - ], - "successor": "OFrdZ0cK" - }, - "E2003": { - "claims": [ - "Creality/eSUN PETG-Basic" - ], - "successor": "OFFbQscs" - }, - "E3001": { - "claims": [ - "Creality/eSUN ABS+" - ], - "successor": "OFTXduCM" - }, - "E4001": { - "claims": [ - "Creality/eSUN ASA+" - ], - "successor": "OFUmS5z5" - }, - "E8001": { - "claims": [ - "Creality/eSUN PET-Basic" - ], - "successor": "OFHaYaB1" - }, - "EABSB00": { - "claims": [ - "Elegoo/Elegoo ABS" - ], - "successor": "OFxOHhZw" - }, - "EASAB00": { - "claims": [ - "Elegoo/Elegoo ASA" - ], - "successor": "OFobDOW5" - }, - "EFL33": { - "claims": [ - "Eryone/Eryone PP-CF" - ], - "successor": "OFbh7HcA" - }, - "EFL40": { - "claims": [ - "Eryone/Eryone PLA-CF" - ], - "successor": "OFilAA3b" - }, - "EFL43": { - "claims": [ - "Eryone/Eryone PETG-CF" - ], - "successor": "OFNstOna" - }, - "EFL71": { - "claims": [ - "Eryone/Eryone PA" - ], - "successor": "OFS4jbj3" - }, - "EFL72": { - "claims": [ - "Eryone/Eryone PA-CF" - ], - "successor": "OFp9wdmf" - }, - "EFL73": { - "claims": [ - "Eryone/Eryone PA-GF" - ], - "successor": "OFkq7rPy" - }, - "EFL81": { - "claims": [ - "Eryone/Eryone ABS-CF" - ], - "successor": "OFQ1zgm3" - }, - "EFL82": { - "claims": [ - "Eryone/Eryone ASA-CF" - ], - "successor": "OFwyt1xt" - }, - "EFL90": { - "claims": [ - "Eryone/Eryone PLA" - ], - "successor": "OFmKU2Ha" - }, - "EFL91": { - "claims": [ - "Eryone/Eryone ABS" - ], - "successor": "OFOzwywz" - }, - "EFL92": { - "claims": [ - "Eryone/Eryone ASA" - ], - "successor": "OFVtIasg" - }, - "EFL93": { - "claims": [ - "Eryone/Eryone PETG" - ], - "successor": "OF8kJys9" - }, - "EFL941": { - "claims": [ - "Eryone/Eryone Silk PLA" - ], - "successor": "OF7nBAd3" - }, - "EFL95": { - "claims": [ - "Eryone/Eryone TPU" - ], - "successor": "OFhUjPA5" - }, - "EPAHTB00": { - "claims": [ - "Elegoo/Elegoo PAHT-CF" - ], - "successor": "OF0h7ERL" - }, - "EPCB00": { - "claims": [ - "Elegoo/Elegoo PC" - ], - "successor": "OFUyDDNv" - }, - "EPETGB00": { - "claims": [ - "Elegoo/Elegoo PETG" - ], - "successor": "OFLcd093" - }, - "EPLAB00": { - "claims": [ - "Elegoo/Elegoo PLA" - ], - "successor": "OFvgE0Zh" - }, - "ESN02": { - "claims": [ - "OrcaFilamentLibrary/eSUN ePLA-LW" - ], - "successor": "OFRzR5mi" - }, - "ESN03": { - "claims": [ - "OrcaFilamentLibrary/eSUN PETG" - ], - "successor": "OF3kBrdA" - }, - "ETPUB00": { - "claims": [ - "Elegoo/Elegoo TPU 95A" - ], - "successor": "OFmhJs5V" - }, - "FDPLAST01": { - "claims": [ - "OrcaFilamentLibrary/FDplast ABS" - ], - "successor": "OFjorDcx" - }, - "FDPLAST02": { - "claims": [ - "OrcaFilamentLibrary/FDplast HIPS" - ], - "successor": "OFmJAd3A" - }, - "FDPLAST03": { - "claims": [ - "OrcaFilamentLibrary/FDplast PETG" - ], - "successor": "OFfJSCzm" - }, - "FDPLAST04": { - "claims": [ - "OrcaFilamentLibrary/FDplast PLA" - ], - "successor": "OFtr8eZw" - }, - "FDPLAST05": { - "claims": [ - "OrcaFilamentLibrary/FDplast SBS" - ], - "successor": "OFtRn8X8" - }, - "FDPLAST06": { - "claims": [ - "OrcaFilamentLibrary/FDplast TPU" - ], - "successor": "OFfmZrI3" - }, - "FFF01": { - "claims": [ - "Flashforge/Flashforge PLA" - ], - "successor": "OFDKgoqx" - }, - "FFF02": { - "claims": [ - "Flashforge/Flashforge ABS" - ], - "successor": "OF5SJ3jz" - }, - "FFF03": { - "claims": [ - "Flashforge/Flashforge PETG", - "Flashforge/Generic PETG" - ], - "successor": "OFMpxamb" - }, - "FFG01": { - "claims": [ - "Flashforge/Flashforge Generic PLA" - ], - "successor": "OFtTHNTj" - }, - "FILAR0001": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Bronce" - ], - "successor": "OFWTRJ1K" - }, - "FILAR0002": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Gris Plata" - ], - "successor": "OFKKajh6" - }, - "FILAR0003": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Cobre" - ], - "successor": "OFNemJM6" - }, - "FILAR0004": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Titanio" - ], - "successor": "OFQWIKbV" - }, - "FILAR0005": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Tabaco" - ], - "successor": "OFjT9PkZ" - }, - "FILAR0006": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" - ], - "successor": "OFWwF7K7" - }, - "FILAR0007": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Manteca" - ], - "successor": "OFexaZU2" - }, - "FILAR0008": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Marron Oxido" - ], - "successor": "OFAt6ec0" - }, - "FILAR0009": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Carpincho" - ], - "successor": "OFKWWgyp" - }, - "FILAR0010": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" - ], - "successor": "OFPqX3x2" - }, - "FILAR0011": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" - ], - "successor": "OFZ4QbfK" - }, - "FILAR0012": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Piel" - ], - "successor": "OFsDXRpS" - }, - "FILAR0013": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Verde FilAr" - ], - "successor": "OFvPPMxL" - }, - "FILAR0014": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Verde Manzana" - ], - "successor": "OFdb8YNz" - }, - "FILAR0015": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Verde Pixel" - ], - "successor": "OFkGvN4d" - }, - "FILAR0016": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Verde Oliva" - ], - "successor": "OFkoLUtR" - }, - "FILAR0017": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" - ], - "successor": "OFHAccHz" - }, - "FILAR0018": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Blanco Calido" - ], - "successor": "OFKTSiYF" - }, - "FILAR0019": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Negro Azabache" - ], - "successor": "OFgMWJ8T" - }, - "FILAR0020": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" - ], - "successor": "OFKZ9skj" - }, - "FILAR0021": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" - ], - "successor": "OFaEesXQ" - }, - "FILAR0022": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" - ], - "successor": "OF8aFWfQ" - }, - "FILAR0023": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" - ], - "successor": "OFP26zNb" - }, - "FILAR0024": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" - ], - "successor": "OFTlRzpe" - }, - "FILAR0025": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" - ], - "successor": "OFIamQnD" - }, - "FILAR0026": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Azul Francia" - ], - "successor": "OFnYVFk2" - }, - "FILAR0027": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" - ], - "successor": "OFaDOaNt" - }, - "FILAR0028": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Oro" - ], - "successor": "OF5nlfKY" - }, - "FILAR0029": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA Dorado" - ], - "successor": "OF5P4jgA" - }, - "FILAR0030": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" - ], - "successor": "OFj3bTjw" - }, - "FILAR0031": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Azul" - ], - "successor": "OF5vgi2G" - }, - "FILAR0032": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Beige" - ], - "successor": "OFGcLA5R" - }, - "FILAR0033": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Blanco" - ], - "successor": "OFtefokm" - }, - "FILAR0034": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Bordo" - ], - "successor": "OFiDpM1B" - }, - "FILAR0035": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" - ], - "successor": "OFqtx549" - }, - "FILAR0036": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" - ], - "successor": "OFdzlrhi" - }, - "FILAR0037": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Gris" - ], - "successor": "OFGVwfK0" - }, - "FILAR0038": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Marron" - ], - "successor": "OF8jh0Lk" - }, - "FILAR0039": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Naranja" - ], - "successor": "OFmaeU4a" - }, - "FILAR0040": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Negro" - ], - "successor": "OFufTAK9" - }, - "FILAR0041": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Piel" - ], - "successor": "OFfZcoKr" - }, - "FILAR0042": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Rojo" - ], - "successor": "OFIBXa0k" - }, - "FILAR0043": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Rosa" - ], - "successor": "OFausr3F" - }, - "FILAR0044": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Uva" - ], - "successor": "OFEZ449N" - }, - "FILAR0045": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Verde" - ], - "successor": "OFCjG251" - }, - "FILAR0046": { - "claims": [ - "OrcaFilamentLibrary/FilAr PLA-mate Violeta" - ], - "successor": "OF2EK9F1" - }, - "FILAR0047": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" - ], - "successor": "OFt6e0US" - }, - "FILAR0048": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" - ], - "successor": "OF0Vtzaw" - }, - "FILAR0049": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Azul Boreal" - ], - "successor": "OFNU9YIW" - }, - "FILAR0050": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Azul Francia" - ], - "successor": "OF44VYzK" - }, - "FILAR0051": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Azul Imperial" - ], - "successor": "OF2Z1nT5" - }, - "FILAR0052": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" - ], - "successor": "OFsXQXbs" - }, - "FILAR0053": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Cian" - ], - "successor": "OFnejEt4" - }, - "FILAR0054": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Coral" - ], - "successor": "OFysxCep" - }, - "FILAR0055": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Cristal" - ], - "successor": "OFJQDUk3" - }, - "FILAR0056": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" - ], - "successor": "OFybzvQN" - }, - "FILAR0057": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Gris Plata" - ], - "successor": "OFgpLTMR" - }, - "FILAR0058": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Magenta" - ], - "successor": "OFurdQxc" - }, - "FILAR0059": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Negro Azabache" - ], - "successor": "OFq8gfS4" - }, - "FILAR0060": { - "claims": [ - "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" - ], - "successor": "OFPbyOSk" - }, - "FILARB01": { - "claims": [], - "successor": null - }, - "FILARB02": { - "claims": [], - "successor": null - }, - "FILARB03": { - "claims": [], - "successor": null - }, - "FILL3D001": { - "claims": [ - "OrcaFilamentLibrary/FILL3D PLA Turbo" - ], - "successor": "OFoSknDB" - }, - "FILL3D002": { - "claims": [ - "OrcaFilamentLibrary/FILL3D PLA Basic" - ], - "successor": "OFDpW3J8" - }, - "FILL3D003": { - "claims": [ - "OrcaFilamentLibrary/FILL3D PETG" - ], - "successor": "OFQbjX3s" - }, - "FILL3D004": { - "claims": [ - "OrcaFilamentLibrary/FILL3D PP" - ], - "successor": "OFPWPlSC" - }, - "FILL3D005": { - "claims": [ - "OrcaFilamentLibrary/FILL3D PPCF" - ], - "successor": "OFg8hMzT" - }, - "FILL3D006": { - "claims": [ - "OrcaFilamentLibrary/FILL3D PA" - ], - "successor": "OFJNeELv" - }, - "FILL3D007": { - "claims": [ - "OrcaFilamentLibrary/FILL3D PETG CF" - ], - "successor": "OFOiJfLM" - }, - "GABSB00": { - "claims": [ - "Elegoo/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "GASAB00": { - "claims": [ - "Elegoo/Generic ASA", - "Elegoo/Generic ASA-CF" - ], - "successor": "OFLPAxz3" - }, - "GFABS": { - "claims": [ - "Anycubic/Anycubic ABS" - ], - "successor": "OF223rZv" - }, - "GFL92": { - "claims": [ - "Anycubic/Anycubic PLA" - ], - "successor": "OFmjN2bc" - }, - "GFL93": { - "claims": [ - "Anycubic/Anycubic PLA+" - ], - "successor": "OFnmp6rt" - }, - "GFPLA": { - "claims": [ - "Anycubic/Anycubic PLA" - ], - "successor": "OFmjN2bc" - }, - "GFPLA High Speed": { - "claims": [ - "Anycubic/Anycubic PLA High Speed" - ], - "successor": "OFjVOWfJ" - }, - "GFPLA Matte": { - "claims": [ - "Anycubic/Anycubic PLA Matte" - ], - "successor": "OFIE3vOf" - }, - "GFPLA Silk": { - "claims": [ - "Anycubic/Anycubic PLA Silk" - ], - "successor": "OFFwJWea" - }, - "GFPLA+": { - "claims": [ - "Anycubic/Anycubic PLA+" - ], - "successor": "OFnmp6rt" - }, - "GPAB00": { - "claims": [ - "Elegoo/Generic PA" - ], - "successor": "OFg8ndtj" - }, - "GPCB00": { - "claims": [ - "Elegoo/Generic PC" - ], - "successor": "OFLakOUI" - }, - "GPETB00": { - "claims": [ - "Elegoo/Generic PET" - ], - "successor": "OF6MOPWx" - }, - "GPETGB00": { - "claims": [ - "Elegoo/Generic PETG", - "Elegoo/Generic PETG-CF" - ], - "successor": "OFYPdQJh" - }, - "GPLAB00": { - "claims": [ - "Elegoo/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "Generic ABS @E3NG v1.2S": { - "claims": [ - "RH3D/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "Generic ABS @MK4S": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Generic ABS @MK4S 0.6": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Generic ABS @MK4S 0.8": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Generic ABS @MK4S HF0.4": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Generic ABS @MK4S HF0.5": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Generic ABS @MK4S HF0.6": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Generic ABS @MK4S HF0.8": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Generic ASA @E3NG v1.2S": { - "claims": [ - "RH3D/Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "Generic FLEX @MK4S": { - "claims": [ - "Prusa/Prusa Generic TPU" - ], - "successor": "OFbenYUK" - }, - "Generic FLEX @MK4S 0.6": { - "claims": [ - "Prusa/Prusa Generic TPU" - ], - "successor": "OFbenYUK" - }, - "Generic FLEX @MK4S 0.8": { - "claims": [ - "Prusa/Prusa Generic TPU" - ], - "successor": "OFbenYUK" - }, - "Generic PCCF @E3NG v1.2S": { - "claims": [ - "RH3D/Generic PCCF" - ], - "successor": "OFC5f4Ay" - }, - "Generic PETG @E3NG v1.2S": { - "claims": [ - "RH3D/Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "Generic PETG @MK4S": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Generic PETG @MK4S 0.6": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Generic PETG @MK4S 0.8": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Generic PETG @MK4S HF0.4": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Generic PETG @MK4S HF0.5": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Generic PETG @MK4S HF0.6": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Generic PETG @MK4S HF0.8": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Generic PLA @E3NG v1.2S": { - "claims": [ - "RH3D/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "Generic PLA @MK4S": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Generic PLA @MK4S 0.6": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Generic PLA @MK4S 0.8": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Generic PLA @MK4S HF0.4": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Generic PLA @MK4S HF0.5": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Generic PLA @MK4S HF0.6": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Generic PLA @MK4S HF0.8": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Generic PLA Silk @MK4S": { - "claims": [ - "Prusa/Prusa Generic PLA Silk" - ], - "successor": "OFHFZ1Te" - }, - "Generic PLA Silk @MK4S 0.6": { - "claims": [ - "Prusa/Prusa Generic PLA Silk" - ], - "successor": "OFHFZ1Te" - }, - "Generic PLA Silk @MK4S 0.8": { - "claims": [ - "Prusa/Prusa Generic PLA Silk" - ], - "successor": "OFHFZ1Te" - }, - "Generic TPU @E3NG v1.2S": { - "claims": [ - "RH3D/Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "IQM1": { - "claims": [ - "iQ/Fiberthree PACF Pro P1" - ], - "successor": "OFjUGUIK" - }, - "IQM1011": { - "claims": [ - "iQ/VXL90 TiQ2 P2" - ], - "successor": "OFOJPAAS" - }, - "IQM2": { - "claims": [ - "iQ/Material4Print ABS Natur P1" - ], - "successor": "OFJWKoYG" - }, - "IQM3": { - "claims": [ - "iQ/Polymaker PETG Polymax black P1" - ], - "successor": "OFaeIx7W" - }, - "IQM7": { - "claims": [ - "iQ/Fiberthree PACF Pro P2" - ], - "successor": "OF6kj4jI" - }, - "LHF_abs": { - "claims": [ - "LH/LHS ABS" - ], - "successor": "OFztQ7rO" - }, - "LHF_asa": { - "claims": [ - "LH/LHS ASA" - ], - "successor": "OFaP2SsH" - }, - "LHF_ftpuf": { - "claims": [ - "LH/LHS TPU Foamy 78A" - ], - "successor": "OFngcE81" - }, - "LHF_pccf": { - "claims": [ - "LH/LHS PC CF" - ], - "successor": "OFu0fjPJ" - }, - "LHF_pctg": { - "claims": [ - "LH/LHS PCTG" - ], - "successor": "OFBJAdLw" - }, - "LHF_petg": { - "claims": [ - "LH/LHS PETG" - ], - "successor": "OFRJ325z" - }, - "LHF_pla": { - "claims": [ - "LH/LHS PLA" - ], - "successor": "OFyoBZdm" - }, - "LHF_ptpu_pl": { - "claims": [ - "LH/LHS TPU" - ], - "successor": "OFIZMQwM" - }, - "NIT01": { - "claims": [ - "OrcaFilamentLibrary/NIT ABS" - ], - "successor": "OFhWc5Bv" - }, - "NIT02": { - "claims": [ - "OrcaFilamentLibrary/NIT PLA" - ], - "successor": "OFwRJ4g0" - }, - "NIT03": { - "claims": [ - "OrcaFilamentLibrary/NIT PETG" - ], - "successor": "OFJu1XwK" - }, - "OEABSB00": { - "claims": [ - "OrcaFilamentLibrary/Elegoo ABS" - ], - "successor": "OFxOHhZw" - }, - "OEASAB00": { - "claims": [ - "OrcaFilamentLibrary/Elegoo ASA" - ], - "successor": "OFobDOW5" - }, - "OEPAHTB0": { - "claims": [ - "OrcaFilamentLibrary/Elegoo PAHT-CF" - ], - "successor": "OF0h7ERL" - }, - "OEPCB00": { - "claims": [ - "OrcaFilamentLibrary/Elegoo PC" - ], - "successor": "OFUyDDNv" - }, - "OEPETGB0": { - "claims": [ - "OrcaFilamentLibrary/Elegoo PETG" - ], - "successor": "OFLcd093" - }, - "OEPLAB00": { - "claims": [ - "OrcaFilamentLibrary/Elegoo PLA" - ], - "successor": "OFvgE0Zh" - }, - "OETPUB00": { - "claims": [ - "OrcaFilamentLibrary/Elegoo TPU 95A" - ], - "successor": "OFmhJs5V" - }, - "OF016CJw": { - "claims": [ - "Sovol/Sovol SV08 ABS" - ], - "successor": "OFY9muEs" - }, - "OF0GIkJm": { - "claims": [ - "Tiertime/Tiertime Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OF0zx94L": { - "claims": [ - "Vzbot/Vzbot Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OF1Id239": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OF1OZujR": { - "claims": [ - "Flashforge/Flashforge Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OF1bQyX2": { - "claims": [ - "Flashforge/Flashforge PLA Matte" - ], - "successor": "OF6qAuyi" - }, - "OF1daEUW": { - "claims": [ - "Anker/Anker Generic PETG-CF" - ], - "successor": "OFoYSJKi" - }, - "OF1uR1t2": { - "claims": [ - "Tiertime/Tiertime Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OF2RjrWH": { - "claims": [ - "Flashforge/FusRock Generic PAHT-GF" - ], - "successor": "OFcVLpNA" - }, - "OF2bZtyg": { - "claims": [ - "Flashforge/Flashforge PLA-CF" - ], - "successor": "OF9cAwMK" - }, - "OF2mgDsI": { - "claims": [ - "Vzbot/Vzbot Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OF3P0BQA": { - "claims": [ - "Anker/Anker Generic ABS", - "Anker/Anker Generic ABS 0.2 nozzle", - "Anker/Anker Generic ABS 0.25 nozzle" - ], - "successor": "OFY9muEs" - }, - "OF3s929u": { - "claims": [ - "Tiertime/Tiertime Generic PP" - ], - "successor": "OF1UNk9P" - }, - "OF3wxlw9": { - "claims": [ - "CoLiDo/CoLiDo Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OF41jaTh": { - "claims": [ - "Flashforge/Flashforge TPU-90A" - ], - "successor": "OFwlZ7gH" - }, - "OF42ZDpN": { - "claims": [ - "Flashforge/FusRock PAHT" - ], - "successor": "OF7pjCsO" - }, - "OF48L671": { - "claims": [ - "Ratrig/RatRig Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OF4Mf5Gz": { - "claims": [ - "Creality/Creality Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OF4XAUnp": { - "claims": [ - "Vzbot/Vzbot Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OF4oCRKe": { - "claims": [ - "DeltaMaker/DeltaMaker Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OF4xhTuK": { - "claims": [ - "OrcaArena/OrcaArena Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OF4zzGwp": { - "claims": [ - "Flashforge/FusRock Generic PET-GF" - ], - "successor": "OFzwA5Z9" - }, - "OF51XQar": { - "claims": [ - "CONSTRUCT3D/C1 Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OF5E5KNA": { - "claims": [ - "SecKit/SecKit Generic PC" - ], - "successor": "OFLakOUI" - }, - "OF5NQFKI": { - "claims": [ - "Flashforge/Flashforge PLA Galaxy" - ], - "successor": "OFJJ0Ar3" - }, - "OF5Zk4e1": { - "claims": [ - "Anycubic/Anycubic Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OF5vzBhb": { - "claims": [ - "Chuanying/Chuanying Generic PLA", - "Chuanying/Chuanying PLA" - ], - "successor": "OFDSrzZ8" - }, - "OF5w29Kq": { - "claims": [ - "Flashforge/Flashforge HS PETG" - ], - "successor": "OFDxxTpW" - }, - "OF67EdL5": { - "claims": [ - "Sovol/Sovol SV06 ACE ABS" - ], - "successor": "OFY9muEs" - }, - "OF6Fpw1E": { - "claims": [ - "Comgrow/Comgrow Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OF6K467o": { - "claims": [ - "InfiMech/InfiMech Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OF6KELDx": { - "claims": [ - "Co Print/CoPrint Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OF6O67Xk": { - "claims": [ - "Lulzbot/Lulzbot 2.85mm ABS" - ], - "successor": "OFY9muEs" - }, - "OF6VgL2U": { - "claims": [ - "Phrozen/Phrozen PLA" - ], - "successor": "OFDSrzZ8" - }, - "OF6WddJ1": { - "claims": [ - "Flashforge/FusRock S-PAHT" - ], - "successor": "OFCn83wF" - }, - "OF6ooviO": { - "claims": [ - "FLSun/FLSun S1 TPU" - ], - "successor": "OFgbpcy9" - }, - "OF6rMr3U": { - "claims": [ - "Flashforge/FusRock Generic S-Multi" - ], - "successor": "OF0AquDh" - }, - "OF6tKa1Z": { - "claims": [ - "Anker/Anker Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OF6ueBwd": { - "claims": [ - "Flashforge/Flashforge PLA Pro" - ], - "successor": "OFm4SivL" - }, - "OF6vKLaU": { - "claims": [ - "Artillery/Artillery Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OF6xLvYg": { - "claims": [ - "InfiMech/InfiMech Generic PC" - ], - "successor": "OFLakOUI" - }, - "OF6zAVFj": { - "claims": [ - "Sovol/Sovol Zero TPU" - ], - "successor": "OFgbpcy9" - }, - "OF7VJMYM": { - "claims": [ - "Sovol/Sovol Zero PLA Basic" - ], - "successor": "OFDSrzZ8" - }, - "OF7g2vYQ": { - "claims": [ - "Co Print/CoPrint Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OF7uE5KB": { - "claims": [ - "Anker/Anker Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OF8CXrvm": { - "claims": [ - "SecKit/SecKit Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OF8bLDu7": { - "claims": [ - "Blocks/Blocks Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OF8eQjjt": { - "claims": [ - "Lulzbot/Lulzbot 2.85mm PETG" - ], - "successor": "OFYPdQJh" - }, - "OF97ru74": { - "claims": [ - "Prusa/Prusa Generic PC" - ], - "successor": "OFLakOUI" - }, - "OF995YXg": { - "claims": [ - "Flashforge/Flashforge TPU-64D" - ], - "successor": "OF8GtyKJ" - }, - "OF9fOPpd": { - "claims": [ - "Vzbot/Vzbot Generic PC" - ], - "successor": "OFLakOUI" - }, - "OF9z5LZ9": { - "claims": [ - "FLSun/FLSun S1 PETG" - ], - "successor": "OFYPdQJh" - }, - "OFACSw9O": { - "claims": [ - "Creality/Creality Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFAf9pJF": { - "claims": [ - "Flashforge/Flashforge TPU 95A" - ], - "successor": "OFSqIcJC" - }, - "OFB09fpe": { - "claims": [ - "Ratrig/RatRig Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFB0a3hT": { - "claims": [ - "Anker/Anker Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFB1Tv1E": { - "claims": [ - "Anycubic/Anycubic Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFB8wSps": { - "claims": [ - "Flashforge/FusRock PET-CF" - ], - "successor": "OFDu1qE7" - }, - "OFB9dx27": { - "claims": [ - "Blocks/Blocks Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFBC32Wb": { - "claims": [ - "Flashforge/FusRock PET" - ], - "successor": "OFKTGKJU" - }, - "OFBIadjM": { - "claims": [ - "Chuanying/Chuanying ASA", - "Chuanying/Chuanying Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFBK6zAi": { - "claims": [ - "Flashforge/Flashforge PETG-CF" - ], - "successor": "OFuFEtKX" - }, - "OFBpcB0a": { - "claims": [ - "TwoTrees/TwoTrees Generic HS PLA" - ], - "successor": "OFvxghTE" - }, - "OFBtlI8M": { - "claims": [ - "FlyingBear/FlyingBear Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFC20UMj": { - "claims": [ - "Flashforge/Flashforge Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFCEA7Nt": { - "claims": [ - "Sovol/Sovol SV06 Plus ACE ABS" - ], - "successor": "OFY9muEs" - }, - "OFCVUEaV": { - "claims": [ - "Tiertime/Tiertime Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFCaJHAA": { - "claims": [ - "Flashforge/FusRock Generic S-PAHT" - ], - "successor": "OFCn83wF" - }, - "OFCcsYtf": { - "claims": [ - "FLSun/FLSun Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFCu3jES": { - "claims": [], - "successor": null - }, - "OFD2JNS1": { - "claims": [ - "Dremel/Dremel Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFD6kN7F": { - "claims": [ - "OrcaArena/OrcaArena Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFDeTsJw": { - "claims": [ - "Chuanying/Chuanying Generic HIPS" - ], - "successor": "OFsFon5l" - }, - "OFEE1Dld": { - "claims": [ - "Artillery/Artillery Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFEMfQsX": { - "claims": [ - "Flashforge/Flashforge PETG Basic" - ], - "successor": "OFYYeMyQ" - }, - "OFENzGSm": { - "claims": [ - "FLSun/FLSun T1 TPU" - ], - "successor": "OFgbpcy9" - }, - "OFETFWx7": { - "claims": [ - "SecKit/SecKit Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFEZNNw1": { - "claims": [ - "Ratrig/RatRig Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFF73Bvp": { - "claims": [ - "SecKit/SecKit Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFFC0VqZ": { - "claims": [ - "Ratrig/RatRig BigNozzle PCTG" - ], - "successor": "OFYfAcLY" - }, - "OFFZ0BBL": { - "claims": [ - "FlyingBear/FlyingBear Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFFxZ7hZ": { - "claims": [ - "Chuanying/Chuanying Generic PLA-CF10" - ], - "successor": "OFX2zcrM" - }, - "OFGDaEHO": { - "claims": [ - "Tiertime/Tiertime Generic BVOH" - ], - "successor": "OFo2UF2C" - }, - "OFGGyAgJ": { - "claims": [ - "Vzbot/Vzbot Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFGKLoUm": { - "claims": [ - "Anycubic/Anycubic Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFGLeiNL": { - "claims": [], - "successor": null - }, - "OFGPJxnt": { - "claims": [ - "Anker/Anker Generic PC", - "Anker/Anker Generic PC 0.2 nozzle", - "Anker/Anker Generic PC 0.25 nozzle" - ], - "successor": "OFLakOUI" - }, - "OFGzUNbm": { - "claims": [ - "Tiertime/Tiertime Generic PPS-CF" - ], - "successor": "OF6rdQ6M" - }, - "OFH5UH6P": { - "claims": [ - "Flashforge/Flashforge ABS-GF" - ], - "successor": "OFojbdhR" - }, - "OFH6Pjxe": { - "claims": [ - "Flashforge/Flashforge PLA Matte" - ], - "successor": "OF6qAuyi" - }, - "OFHFZ1Te": { - "claims": [ - "Prusa/Prusa Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OFHQUAoZ": { - "claims": [ - "FLSun/FLSun Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFHTVfaU": { - "claims": [ - "Sovol/Sovol Zero PETG" - ], - "successor": "OFYPdQJh" - }, - "OFHUnLY2": { - "claims": [ - "Vzbot/Vzbot Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFHa3RZT": { - "claims": [ - "Tiertime/Tiertime Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFI80Hct": { - "claims": [ - "Anycubic/Anycubic Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFIK0xFa": { - "claims": [ - "FLSun/FLSun S1 ASA" - ], - "successor": "OFLPAxz3" - }, - "OFIYTy8S": { - "claims": [ - "Anker/Anker Generic PLA+", - "Anker/Anker Generic PLA+ 0.2 nozzle", - "Anker/Anker Generic PLA+ 0.25 nozzle" - ], - "successor": "OFEWYR89" - }, - "OFIda816": { - "claims": [ - "Vzbot/Vzbot Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFIeCuXj": { - "claims": [ - "Peopoly/Peopoly Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFIieIka": { - "claims": [ - "Flashforge/Polymaker CoPA" - ], - "successor": "OFQyyO0l" - }, - "OFIxitiU": { - "claims": [ - "Flashforge/Flashforge PLA Basic" - ], - "successor": "OFJ3F2jm" - }, - "OFIy3kLw": { - "claims": [ - "Prusa/Prusa Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFJ80y1e": { - "claims": [ - "FLSun/FLSun T1 PETG" - ], - "successor": "OFYPdQJh" - }, - "OFJJpaLS": { - "claims": [ - "FLSun/FLSun Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFJSksUs": { - "claims": [ - "FLSun/FLSun Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFJVFpJz": { - "claims": [ - "Sovol/Sovol Zero PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OFJfv07m": { - "claims": [ - "Sovol/Sovol SV06 ACE TPU" - ], - "successor": "OFgbpcy9" - }, - "OFK01afJ": { - "claims": [ - "Qidi/Qidi Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFK4LdYI": { - "claims": [ - "Prusa/Prusa Generic ASA HF" - ], - "successor": "OFzRtFM9" - }, - "OFK74HJD": { - "claims": [ - "Flashforge/Flashforge PLA Pro" - ], - "successor": "OFm4SivL" - }, - "OFKNAhls": { - "claims": [ - "Qidi/Qidi Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFKo87c6": { - "claims": [ - "Snapmaker/Snapmaker TPU 95A" - ], - "successor": "OFvmwTZE" - }, - "OFKpQTJI": { - "claims": [ - "Flashforge/Flashforge TPU 65D" - ], - "successor": "OFSDfduA" - }, - "OFKuTr12": { - "claims": [ - "Tiertime/Tiertime Generic PE" - ], - "successor": "OFPklMI1" - }, - "OFKyCgaK": { - "claims": [ - "Anycubic/Anycubic Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFLBUkwC": { - "claims": [ - "Vzbot/Vzbot Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFLDSqqi": { - "claims": [ - "Flashforge/Flashforge Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFLSBS99": { - "claims": [ - "OrcaFilamentLibrary/Generic SBS" - ], - "successor": "OFhQfUQY" - }, - "OFLYDIb8": { - "claims": [ - "Flashforge/Flashforge PLA Silk" - ], - "successor": "OFgjgN35" - }, - "OFLrdHse": { - "claims": [ - "Flashforge/Flashforge Generic HS PLA" - ], - "successor": "OFvxghTE" - }, - "OFLuczRG": { - "claims": [ - "Creality/Creality Generic ASA-CF" - ], - "successor": "OF53eLVD" - }, - "OFM87w9T": { - "claims": [ - "Tiertime/Tiertime Generic SBS" - ], - "successor": "OFhQfUQY" - }, - "OFMEbuBE": { - "claims": [ - "Blocks/Blocks Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFMIma8C": { - "claims": [ - "Flashforge/Flashforge PLA Luminous" - ], - "successor": "OFdqkWtz" - }, - "OFMIurFh": { - "claims": [ - "Creality/Creality HF Generic Speed PLA" - ], - "successor": "OFXmv5p0" - }, - "OFMTBcnz": { - "claims": [ - "Tiertime/Tiertime Generic PP-CF" - ], - "successor": "OFXkm8q1" - }, - "OFMZAoqa": { - "claims": [ - "Tiertime/Tiertime Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFMgJQCZ": { - "claims": [ - "Anker/Anker Generic PA", - "Anker/Anker Generic PA 0.2 nozzle", - "Anker/Anker Generic PA 0.25 nozzle" - ], - "successor": "OFg8ndtj" - }, - "OFMoLF46": { - "claims": [ - "FLSun/FLSun Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFMqYusc": { - "claims": [ - "Creality/Creality Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFMyLYV8": { - "claims": [ - "Flashforge/Flashforge PETG Transparent" - ], - "successor": "OFwjMiKL" - }, - "OFN7aNHe": { - "claims": [ - "Tiertime/Tiertime Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFNLXV8X": { - "claims": [ - "Tiertime/Tiertime Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFNOxcYl": { - "claims": [ - "Ratrig/RatRig Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFNW4ZTC": { - "claims": [ - "Creality/Creality Generic PLA Wood" - ], - "successor": "OFIKZxPF" - }, - "OFNWcJsM": { - "claims": [ - "Comgrow/Comgrow T300 PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFNWnx2c": { - "claims": [ - "Flashforge/Flashforge TPU-95A" - ], - "successor": "OFx0WlzS" - }, - "OFNX8GI1": { - "claims": [ - "Sovol/Sovol Zero ABS" - ], - "successor": "OFY9muEs" - }, - "OFNYewRS": { - "claims": [ - "Blocks/Blocks Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFNZYgLA": { - "claims": [ - "Qidi/Qidi Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFNZjrLo": { - "claims": [ - "Sovol/Sovol SV06 Plus ACE PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFNcdCrm": { - "claims": [ - "Anycubic/Anycubic Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFNiSLfL": { - "claims": [ - "OrcaFilamentLibrary/Generic PP-GF" - ], - "successor": "OFsijjtH" - }, - "OFNn21yM": { - "claims": [ - "Vzbot/Vzbot Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFOKYhi6": { - "claims": [ - "Prusa/Prusa Generic PETG HF" - ], - "successor": "OF7lOgYF" - }, - "OFPQfNAf": { - "claims": [ - "Flashforge/Flashforge PETG Pro" - ], - "successor": "OFXiArjA" - }, - "OFPdhDlK": { - "claims": [ - "Anycubic/Anycubic Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFPjOUtz": { - "claims": [ - "Flashforge/FusRock Generic PAHT-CF" - ], - "successor": "OFKW5hEW" - }, - "OFPryWt5": { - "claims": [ - "Lulzbot/Lulzbot 2.85mm PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFPy0Ogq": { - "claims": [ - "Qidi/Qidi Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFQ7I5vC": { - "claims": [ - "Prusa/Prusa Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFQ9qnkd": { - "claims": [ - "FLSun/FLSun T1 PLA High Speed" - ], - "successor": "OFmpMwxS" - }, - "OFQC8Vna": { - "claims": [ - "Flashforge/Flashforge Generic PETG-CF" - ], - "successor": "OFoYSJKi" - }, - "OFQTrLXB": { - "claims": [ - "Qidi/Qidi Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFQZeyZv": { - "claims": [ - "Flashforge/Flashforge PLA Buint Ti" - ], - "successor": "OF8O09RG" - }, - "OFQbqeN7": { - "claims": [ - "Qidi/Qidi Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFQiq4fb": { - "claims": [ - "Flashforge/Flashforge PVA" - ], - "successor": "OFaaddbQ" - }, - "OFQswlnF": { - "claims": [ - "Tiertime/Tiertime Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFRDLNM9": { - "claims": [ - "Peopoly/Peopoly Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFRPEs5o": { - "claims": [ - "Flashforge/Flashforge Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFRi7v0b": { - "claims": [ - "Sovol/Sovol SV08 PETG" - ], - "successor": "OFYPdQJh" - }, - "OFRiyes1": { - "claims": [ - "Anker/Anker Generic ASA", - "Anker/Anker Generic ASA 0.2 nozzle", - "Anker/Anker Generic ASA 0.25 nozzle" - ], - "successor": "OFLPAxz3" - }, - "OFRujL0v": { - "claims": [ - "Flashforge/FusRock Generic PET-CF" - ], - "successor": "OFDu1qE7" - }, - "OFRusgEn": { - "claims": [ - "Chuanying/Chuanying Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFRzsaDK": { - "claims": [ - "FlyingBear/FlyingBear Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFS8JF3S": { - "claims": [ - "Qidi/Qidi Generic PLA High Speed" - ], - "successor": "OFmpMwxS" - }, - "OFSDFYs4": { - "claims": [ - "Creality/Creality Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFSGbf2I": { - "claims": [ - "Anycubic/Anycubic Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFSPdsuW": { - "claims": [ - "Tiertime/Tiertime Generic PPA-CF" - ], - "successor": "OF8tPByX" - }, - "OFSStjay": { - "claims": [ - "FLSun/FLSun S1 PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OFSTCno1": { - "claims": [ - "re3D/re3D Greengate rPETG" - ], - "successor": "OFmCOW2Y" - }, - "OFShw1X8": { - "claims": [ - "Flashforge/Flashforge ABS Basic" - ], - "successor": "OFibWuBd" - }, - "OFTKFAZ4": { - "claims": [ - "Tiertime/Tiertime Generic PCTG" - ], - "successor": "OFu1evlr" - }, - "OFTvvox9": { - "claims": [ - "Sovol/Sovol SV06 ACE PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFU0n0zW": { - "claims": [ - "FLSun/FLSun T1 PLA Generic" - ], - "successor": "OFDSrzZ8" - }, - "OFU3zwPc": { - "claims": [ - "Prusa/Prusa Generic TPU HF" - ], - "successor": "OFnT7Qpb" - }, - "OFU5N9jI": { - "claims": [ - "OrcaArena/OrcaArena Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFU6fjbi": { - "claims": [ - "Co Print/CoPrint Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFUCpLaL": { - "claims": [ - "Flashforge/FlashForge PPS" - ], - "successor": "OFlgMgNM" - }, - "OFUScM0D": { - "claims": [ - "Flashforge/FusRock S-Multi" - ], - "successor": "OF0AquDh" - }, - "OFUWRqwb": { - "claims": [ - "Creality/Creality Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFUaVAdj": { - "claims": [ - "Tiertime/Tiertime Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFUrStd6": { - "claims": [ - "Ratrig/RatRig Generic PCTG" - ], - "successor": "OFu1evlr" - }, - "OFUtGagr": { - "claims": [ - "Artillery/Artillery Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFV0KrAG": { - "claims": [ - "FLSun/FLSun T1 ABS" - ], - "successor": "OFY9muEs" - }, - "OFVKADz5": { - "claims": [ - "Comgrow/Comgrow Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFVqZ2H0": { - "claims": [ - "FLSun/FLSun Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFW9uIkE": { - "claims": [ - "Tiertime/Tiertime Generic HIPS" - ], - "successor": "OFsFon5l" - }, - "OFWIr7ZE": { - "claims": [ - "CoLiDo/CoLiDo Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFWY6vBh": { - "claims": [ - "Anycubic/Anycubic Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFWadebJ": { - "claims": [ - "Tiertime/Tiertime Generic PETG-CF" - ], - "successor": "OFoYSJKi" - }, - "OFWbbuRY": { - "claims": [ - "InfiMech/InfiMech Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFWnSvGu": { - "claims": [ - "Flashforge/Flashforge ASA-GF" - ], - "successor": "OFrZDhVt" - }, - "OFWof1Ap": { - "claims": [ - "FLSun/FLSun Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFWukXja": { - "claims": [ - "Qidi/Qidi Generic TPU 95A" - ], - "successor": "OFjiXpyf" - }, - "OFWzr7m0": { - "claims": [ - "Anycubic/Anycubic Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFXXUHSG": { - "claims": [ - "Chuanying/Chuanying Generic PETG-CF10" - ], - "successor": "OFO5djrM" - }, - "OFXhZ3uY": { - "claims": [ - "OrcaArena/OrcaArena Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFXuwtnq": { - "claims": [ - "Co Print/CoPrint Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFXyyfX6": { - "claims": [ - "Anker/Anker Generic PLA Silk", - "Anker/Anker Generic PLA Silk 0.2 nozzle", - "Anker/Anker Generic PLA Silk 0.25 nozzle" - ], - "successor": "OFesA6rF" - }, - "OFYHzKyS": { - "claims": [ - "Vzbot/Vzbot Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFYPdJ7t": { - "claims": [ - "Creality/Creality Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFYfAcLY": { - "claims": [ - "Ratrig/Generic PCTG BigNozzle" - ], - "successor": "OFXW4CDh" - }, - "OFYl0c8v": { - "claims": [ - "Flashforge/Flashforge Generic HIPS" - ], - "successor": "OFsFon5l" - }, - "OFYlZMmy": { - "claims": [ - "Chuanying/Chuanying Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFYlthXI": { - "claims": [ - "Flashforge/Flashforge Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFYtS9zg": { - "claims": [ - "Flashforge/FusRock PAHT-CF" - ], - "successor": "OFKW5hEW" - }, - "OFYvSO1W": { - "claims": [ - "Flashforge/Flashforge Generic PLA-Silk" - ], - "successor": "OFi6PfUM" - }, - "OFZ1hANN": { - "claims": [ - "Flashforge/FusRock Generic NexPA-CF25" - ], - "successor": "OFjt8dDO" - }, - "OFZ4fTO8": { - "claims": [ - "CONSTRUCT3D/C1 Generic High Flow PETG" - ], - "successor": "OFNjku08" - }, - "OFZHgTVI": { - "claims": [ - "Flashforge/Flashforge Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFZPlCck": { - "claims": [ - "Chuanying/Chuanying Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFZsChIG": { - "claims": [ - "Qidi/Qidi Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFa9X7yl": { - "claims": [ - "Flashforge/FusRock S-PAHT" - ], - "successor": "OFCn83wF" - }, - "OFaBwRvT": { - "claims": [ - "Flashforge/Flashforge ASA Basic" - ], - "successor": "OFFFg2Pf" - }, - "OFaFNP2U": { - "claims": [ - "Sovol/Sovol SV07 PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFaU2JxD": { - "claims": [ - "Dremel/Dremel Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFahE7HP": { - "claims": [ - "Blocks/Blocks Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFaz8VoR": { - "claims": [ - "Flashforge/Flashforge HIPS" - ], - "successor": "OFvaLVML" - }, - "OFbeeFkl": { - "claims": [ - "OrcaArena/OrcaArena Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OFbenYUK": { - "claims": [ - "Prusa/Prusa Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFbjtPQy": { - "claims": [ - "FLSun/FLSun T1 ASA" - ], - "successor": "OFLPAxz3" - }, - "OFbt04e0": { - "claims": [ - "DeltaMaker/DeltaMaker Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFc0xiCz": { - "claims": [ - "InfiMech/InfiMech Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFcCzEkS": { - "claims": [ - "Prusa/Prusa Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFcJ7AKd": { - "claims": [ - "Sovol/Sovol SV08 PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFcdqaWI": { - "claims": [ - "Sovol/Sovol Zero PC" - ], - "successor": "OFLakOUI" - }, - "OFctbSkL": { - "claims": [ - "Blocks/Blocks Generic ASA-CF" - ], - "successor": "OF53eLVD" - }, - "OFd10YeG": { - "claims": [ - "Ratrig/RatRig Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFdEIwxy": { - "claims": [ - "Flashforge/Flashforge Generic PLA-CF10" - ], - "successor": "OFX2zcrM" - }, - "OFdHsxB4": { - "claims": [ - "TwoTrees/TwoTrees Generic 95A TPU" - ], - "successor": "OF6MMR8P" - }, - "OFdLdGgJ": { - "claims": [ - "OrcaArena/OrcaArena Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFdOWhCa": { - "claims": [ - "Ratrig/RatRig Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFdXgp2K": { - "claims": [ - "Chuanying/Chuanying Generic HS PLA", - "Chuanying/Chuanying HS PLA" - ], - "successor": "OFvxghTE" - }, - "OFdlGycb": { - "claims": [ - "CoLiDo/CoLiDo Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFe6sfXS": { - "claims": [ - "Flashforge/FlashForge PC" - ], - "successor": "OFWXCbVF" - }, - "OFe7Sx5B": { - "claims": [ - "Sovol/Sovol SV06 ACE PETG" - ], - "successor": "OFYPdQJh" - }, - "OFe8UJXH": { - "claims": [ - "Creality/Creality Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFeDfaCh": { - "claims": [ - "CoLiDo/CoLiDo Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFeJjoKF": { - "claims": [ - "FLSun/FLSun Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFeK2vkS": { - "claims": [ - "Chuanying/Chuanying Generic PLA-Silk", - "Chuanying/Chuanying PLA-SILK" - ], - "successor": "OFi6PfUM" - }, - "OFec7Qiw": { - "claims": [ - "Flashforge/Flashforge PLA Sparkle" - ], - "successor": "OFV5c8hG" - }, - "OFetENFF": { - "claims": [ - "OrcaArena/OrcaArena Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFfZ0lTS": { - "claims": [ - "Qidi/Qidi Generic PETG-CF" - ], - "successor": "OFoYSJKi" - }, - "OFfegVpA": { - "claims": [ - "Flashforge/Polymaker Generic S1" - ], - "successor": "OFaDsTE0" - }, - "OFfxFQf9": { - "claims": [ - "Chuanying/Chuanying Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFfznI0Q": { - "claims": [ - "Prusa/Prusa Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFgSEwOZ": { - "claims": [ - "OrcaArena/OrcaArena Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFgSPtDn": { - "claims": [ - "MagicMaker/MM Generic PEEK" - ], - "successor": "OFz5oHgf" - }, - "OFgVJhVt": { - "claims": [ - "Tiertime/Tiertime Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFgcryz4": { - "claims": [ - "Ratrig/RatRig BigNozzle ASA" - ], - "successor": "OF4GM5qX" - }, - "OFgf4gZa": { - "claims": [ - "Flashforge/Flashforge PA" - ], - "successor": "OFEvEfw5" - }, - "OFgvOmM2": { - "claims": [ - "Anker/Anker Generic PETG", - "Anker/Anker Generic PETG 0.2 nozzle", - "Anker/Anker Generic PETG 0.25 nozzle" - ], - "successor": "OFYPdQJh" - }, - "OFhcrFw9": { - "claims": [ - "Creality/Creality Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFi7Bf0F": { - "claims": [ - "Flashforge/Flashforge ABS-CF" - ], - "successor": "OFYTIMbj" - }, - "OFiCHnso": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFiUSDih": { - "claims": [ - "Blocks/Blocks Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFifxPW1": { - "claims": [ - "DeltaMaker/DeltaMaker Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFiorRtJ": { - "claims": [ - "Blocks/Blocks Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFiuJSmy": { - "claims": [ - "Ratrig/RatRig BigNozzle PLA" - ], - "successor": "OFqFRiLb" - }, - "OFixgF4N": { - "claims": [ - "Flashforge/FusRock S-Multi" - ], - "successor": "OF0AquDh" - }, - "OFjoIVZ6": { - "claims": [ - "FlyingBear/FlyingBear Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFkUaDnU": { - "claims": [ - "Tiertime/Tiertime Generic PE-CF" - ], - "successor": "OFd0Fv0k" - }, - "OFkWaWRo": { - "claims": [ - "Sovol/Sovol SV06 Plus ACE TPU" - ], - "successor": "OFgbpcy9" - }, - "OFkYkQGO": { - "claims": [ - "Tiertime/Tiertime Generic PP-GF" - ], - "successor": "OFsijjtH" - }, - "OFkwIWwc": { - "claims": [ - "Flashforge/Flashforge PLA Color Change" - ], - "successor": "OFMkAW6r" - }, - "OFl2SXmv": { - "claims": [ - "Prusa/Prusa Generic FLEX" - ], - "successor": "OFbPuPKY" - }, - "OFl4ItvQ": { - "claims": [ - "Prusa/Prusa Generic PLA HF" - ], - "successor": "OFZr862X" - }, - "OFl7nOAf": { - "claims": [ - "Sovol/Sovol SV06 Plus ACE PETG" - ], - "successor": "OFYPdQJh" - }, - "OFlLmUeV": { - "claims": [ - "Ginger Additive/Ginger Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFlNWVr5": { - "claims": [ - "Flashforge/Flashforge Generic PETG-CF10" - ], - "successor": "OFO5djrM" - }, - "OFlXJxX1": { - "claims": [ - "Chuanying/Chuanying PETG" - ], - "successor": "OFYPdQJh" - }, - "OFlx52rn": { - "claims": [ - "Ratrig/RatRig Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFmQkb3c": { - "claims": [ - "Flashforge/Flashforge HS PLA Burnt Ti" - ], - "successor": "OF8O09RG" - }, - "OFma52eS": { - "claims": [ - "Blocks/Blocks Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFmexHIS": { - "claims": [ - "Ratrig/RatRig BigNozzle PETG" - ], - "successor": "OFvD0Qqt" - }, - "OFmhWhEf": { - "claims": [ - "Creality/Creality HF Generic PLA" - ], - "successor": "OFZr862X" - }, - "OFmnJNqY": { - "claims": [ - "OrcaArena/OrcaArena Generic PA" - ], - "successor": "OFg8ndtj" - }, - "OFmzftED": { - "claims": [ - "OrcaArena/OrcaArena Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFnMv3W5": { - "claims": [ - "Flashforge/Flashforge HS PLA" - ], - "successor": "OFIK2H3G" - }, - "OFndmfJ1": { - "claims": [ - "Anker/Anker Generic PLA", - "Anker/Anker Generic PLA 0.2 nozzle", - "Anker/Anker Generic PLA 0.25 nozzle" - ], - "successor": "OFDSrzZ8" - }, - "OFnfBvn5": { - "claims": [ - "Artillery/Artillery Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFnh79eM": { - "claims": [ - "SecKit/SecKit Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFoDgVnY": { - "claims": [ - "FLSun/FLSun S1 PLA Generic" - ], - "successor": "OFDSrzZ8" - }, - "OFoJcr46": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFoT8F7Y": { - "claims": [ - "Prusa/Prusa Generic PVA HF" - ], - "successor": "OFDwBwO5" - }, - "OFoVZg32": { - "claims": [ - "SecKit/SecKit Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OFodPDxO": { - "claims": [ - "Tiertime/Tiertime Generic PLA High Speed" - ], - "successor": "OFmpMwxS" - }, - "OFogbnCb": { - "claims": [ - "Flashforge/FlashForge PPS-CF" - ], - "successor": "OFTSXxzE" - }, - "OFoqrHTw": { - "claims": [ - "FLSun/FLSun S1 PLA High Speed" - ], - "successor": "OFmpMwxS" - }, - "OFp8gtPH": { - "claims": [ - "Creality/Creality Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OFpAaY6w": { - "claims": [ - "Creality/Creality Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFpBV2Ma": { - "claims": [ - "Qidi/Tinmorry PETG-ECO" - ], - "successor": "OFYE7YZw" - }, - "OFpSYJLI": { - "claims": [ - "Creality/Creality Generic PLA Matte" - ], - "successor": "OFmY0l6t" - }, - "OFptvi3F": { - "claims": [ - "Tiertime/Tiertime Generic PPA-GF" - ], - "successor": "OF8Tlg47" - }, - "OFq5QANf": { - "claims": [ - "Prusa/Prusa Generic PC HF" - ], - "successor": "OFwwAQnA" - }, - "OFqKmLJe": { - "claims": [ - "Creality/Creality Generic PETG-CF" - ], - "successor": "OFoYSJKi" - }, - "OFqOk9Ww": { - "claims": [ - "Peopoly/Peopoly Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFqS8fzK": { - "claims": [ - "SecKit/SecKit Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFrO2zyn": { - "claims": [ - "Creality/Creality Generic PLA High Speed" - ], - "successor": "OFmpMwxS" - }, - "OFrQqCwL": { - "claims": [ - "InfiMech/InfiMech Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFrgGex8": { - "claims": [ - "Blocks/Blocks Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFrh4bBH": { - "claims": [ - "SecKit/SecKit Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFrnJJEa": { - "claims": [ - "Tiertime/Tiertime Generic EVA" - ], - "successor": "OFCD8qiU" - }, - "OFrnkURQ": { - "claims": [ - "Flashforge/Flashforge PLA Metal" - ], - "successor": "OFAebKg8" - }, - "OFrrMLDw": { - "claims": [ - "Flashforge/Flashforge Generic PLA-SILK" - ], - "successor": "OFkf1HHw" - }, - "OFs1sNLz": { - "claims": [ - "Chuanying/Chuanying ABS" - ], - "successor": "OFY9muEs" - }, - "OFs2ReMr": { - "claims": [ - "InfiMech/InfiMech Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFsCbVbN": { - "claims": [ - "Anker/Anker Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFsF96Gt": { - "claims": [ - "FLSun/FLSun Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFsGqI4y": { - "claims": [ - "Ginger Additive/Ginger Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFsNJjpc": { - "claims": [ - "Ratrig/RatRig BigNozzle TPU" - ], - "successor": "OF5tX6va" - }, - "OFsXOMoX": { - "claims": [ - "Qidi/Qidi Generic PLA+" - ], - "successor": "OFEWYR89" - }, - "OFsoQ12i": { - "claims": [ - "Comgrow/Comgrow Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFsxRSwr": { - "claims": [ - "Ratrig/RatRig Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFsxlLdo": { - "claims": [ - "Qidi/Qidi Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OFtP1rqJ": { - "claims": [ - "FLSun/FLSun Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFtTHNTj": { - "claims": [ - "Flashforge/Flashforge Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFtplX8o": { - "claims": [ - "Ratrig/RatRig BigNozzle ABS" - ], - "successor": "OFnyHfcv" - }, - "OFtsVp4v": { - "claims": [ - "SecKit/SecKit Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OFu79SUH": { - "claims": [ - "Qidi/Qidi Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFuFqYyG": { - "claims": [ - "Flashforge/Flashforge PAHT-CF" - ], - "successor": "OFKW5hEW" - }, - "OFuGRMNV": { - "claims": [ - "Flashforge/Flashforge PA-CF" - ], - "successor": "OFGxuI0n" - }, - "OFuSwKgm": { - "claims": [ - "Tiertime/Tiertime Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OFuUJyRx": { - "claims": [ - "FLSun/FLSun T1 PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OFupq0tY": { - "claims": [ - "Blocks/Blocks Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFv4VZCd": { - "claims": [ - "Qidi/Qidi Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFvGc67v": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFvPomQf": { - "claims": [ - "Tiertime/Tiertime Generic PPS" - ], - "successor": "OFq9svOz" - }, - "OFvVxvzZ": { - "claims": [ - "Flashforge/Flashforge PLA Metal" - ], - "successor": "OFAebKg8" - }, - "OFwMFLAm": { - "claims": [ - "Artillery/Artillery Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFwpkvqf": { - "claims": [ - "OrcaArena/OrcaArena Generic PETG-CF" - ], - "successor": "OFoYSJKi" - }, - "OFwxpmHM": { - "claims": [ - "Flashforge/Polymaker Generic CoPA" - ], - "successor": "OFQyyO0l" - }, - "OFx0ZzFV": { - "claims": [ - "OrcaArena/OrcaArena Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OFxMGIPt": { - "claims": [ - "Flashforge/Flashforge PPS" - ], - "successor": "OFlgMgNM" - }, - "OFxTMg1d": { - "claims": [ - "FlyingBear/FlyingBear Generic PC" - ], - "successor": "OFLakOUI" - }, - "OFxg7n2G": { - "claims": [ - "Ratrig/RatRig Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFxvKuYW": { - "claims": [ - "Tiertime/Tiertime Generic PHA" - ], - "successor": "OF74KeQR" - }, - "OFy4ajVZ": { - "claims": [ - "Qidi/Qidi Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OFyCToOV": { - "claims": [ - "Sovol/Sovol SV08 TPU" - ], - "successor": "OFgbpcy9" - }, - "OFyFRojy": { - "claims": [ - "Ratrig/RatRig Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OFyK5Lt9": { - "claims": [ - "Artillery/Artillery Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFyeSq8A": { - "claims": [ - "Prusa/Prusa Generic ABS HF" - ], - "successor": "OF55jHAJ" - }, - "OFyySVby": { - "claims": [ - "SecKit/SecKit Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OFz3q5Xz": { - "claims": [ - "CONSTRUCT3D/C1 Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFzXURfo": { - "claims": [ - "FlyingBear/FlyingBear Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "OFzzmK2Q": { - "claims": [ - "FLSun/FLSun S1 ABS" - ], - "successor": "OFY9muEs" - }, - "OGFA00": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Basic" - ], - "successor": "OFoiVqVM" - }, - "OGFA01": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Matte" - ], - "successor": "OFXIbw5D" - }, - "OGFA02": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Metal" - ], - "successor": "OFrKLeE3" - }, - "OGFA03": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Impact" - ], - "successor": "OFTGHyNC" - }, - "OGFA05": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Silk" - ], - "successor": "OFEGNJD4" - }, - "OGFA06": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Silk+" - ], - "successor": "OFUanySo" - }, - "OGFA07": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Marble" - ], - "successor": "OF9OlTWH" - }, - "OGFA08": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Sparkle" - ], - "successor": "OFDxfPgH" - }, - "OGFA09": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Tough" - ], - "successor": "OFaQMgRH" - }, - "OGFA11": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Aero" - ], - "successor": "OFBSW57R" - }, - "OGFA12": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Glow" - ], - "successor": "OFEkPBwx" - }, - "OGFA13": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Dynamic" - ], - "successor": "OFDGigEI" - }, - "OGFA15": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Galaxy" - ], - "successor": "OFQ3e56w" - }, - "OGFA16": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA Wood" - ], - "successor": "OFMjtqTC" - }, - "OGFA50": { - "claims": [ - "OrcaFilamentLibrary/Bambu PLA-CF" - ], - "successor": "OFEswT5W" - }, - "OGFB00": { - "claims": [ - "OrcaFilamentLibrary/Bambu ABS" - ], - "successor": "OFhuaUQB" - }, - "OGFB01": { - "claims": [ - "OrcaFilamentLibrary/Bambu ASA" - ], - "successor": "OFfBpSRI" - }, - "OGFB02": { - "claims": [ - "OrcaFilamentLibrary/Bambu ASA-Aero" - ], - "successor": "OFXzQ4yL" - }, - "OGFB50": { - "claims": [ - "OrcaFilamentLibrary/Bambu ABS-GF" - ], - "successor": "OFknl9Iz" - }, - "OGFB51": { - "claims": [ - "OrcaFilamentLibrary/Bambu ASA-CF" - ], - "successor": "OF0wBGNx" - }, - "OGFB60": { - "claims": [ - "OrcaFilamentLibrary/PolyLite ABS" - ], - "successor": "OFOvv91M" - }, - "OGFB61": { - "claims": [ - "OrcaFilamentLibrary/PolyLite ASA" - ], - "successor": "OFvrXuV7" - }, - "OGFB98": { - "claims": [ - "Custom/Generic ASA", - "OrcaFilamentLibrary/Generic ASA" - ], - "successor": "OFLPAxz3" - }, - "OGFB99": { - "claims": [ - "Custom/Generic ABS", - "OrcaFilamentLibrary/Generic ABS", - "Sovol/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "OGFC00": { - "claims": [ - "OrcaFilamentLibrary/Bambu PC" - ], - "successor": "OFKhMPeX" - }, - "OGFC01": { - "claims": [ - "OrcaFilamentLibrary/Bambu PC FR" - ], - "successor": "OFg57Nmc" - }, - "OGFC99": { - "claims": [], - "successor": "OFLakOUI" - }, - "OGFG00": { - "claims": [ - "OrcaFilamentLibrary/Bambu PETG Basic" - ], - "successor": "OFFvzqcd" - }, - "OGFG01": { - "claims": [ - "OrcaFilamentLibrary/Bambu PETG Translucent" - ], - "successor": "OFwPrlCM" - }, - "OGFG02": { - "claims": [ - "OrcaFilamentLibrary/Bambu PETG HF" - ], - "successor": "OFovEIbw" - }, - "OGFG50": { - "claims": [ - "OrcaFilamentLibrary/Bambu PETG-CF" - ], - "successor": "OFTRZ8Y4" - }, - "OGFG60": { - "claims": [ - "OrcaFilamentLibrary/PolyLite PETG" - ], - "successor": "OF0UJcb6" - }, - "OGFG97": { - "claims": [ - "OrcaFilamentLibrary/Generic PCTG" - ], - "successor": "OFu1evlr" - }, - "OGFG99": { - "claims": [], - "successor": "OFYPdQJh" - }, - "OGFGG300": { - "claims": [ - "OrcaFilamentLibrary/GreenGate3D PETG" - ], - "successor": "OFhMO9Kh" - }, - "OGFL00": { - "claims": [ - "OrcaFilamentLibrary/PolyLite PLA" - ], - "successor": "OF5CgdDq" - }, - "OGFL00-1": { - "claims": [ - "OrcaFilamentLibrary/PolyTerra Dual PLA" - ], - "successor": "OFCccVrQ" - }, - "OGFL01": { - "claims": [ - "OrcaFilamentLibrary/PolyTerra PLA", - "Snapmaker/PolyTerra PLA" - ], - "successor": "OFW29a9R" - }, - "OGFL03": { - "claims": [ - "OrcaFilamentLibrary/eSUN PLA+" - ], - "successor": "OFqINlYj" - }, - "OGFL04": { - "claims": [ - "OrcaFilamentLibrary/Overture PLA" - ], - "successor": "OFc3xdm9" - }, - "OGFL05": { - "claims": [ - "OrcaFilamentLibrary/Overture Matte PLA" - ], - "successor": "OFBw6eEG" - }, - "OGFL06": { - "claims": [ - "OrcaFilamentLibrary/Fiberon PETG-ESD" - ], - "successor": "OFcytyoA" - }, - "OGFL50": { - "claims": [ - "OrcaFilamentLibrary/Fiberon PA6-CF" - ], - "successor": "OFkOviHk" - }, - "OGFL51": { - "claims": [ - "OrcaFilamentLibrary/Fiberon PA6-GF" - ], - "successor": "OFwaYjL6" - }, - "OGFL52": { - "claims": [ - "OrcaFilamentLibrary/Fiberon PA12-CF" - ], - "successor": "OFX0ycRQ" - }, - "OGFL53": { - "claims": [ - "OrcaFilamentLibrary/Fiberon PA612-CF" - ], - "successor": "OFS2tn6G" - }, - "OGFL54": { - "claims": [ - "OrcaFilamentLibrary/Fiberon PET-CF" - ], - "successor": "OFHWSM21" - }, - "OGFL55": { - "claims": [ - "OrcaFilamentLibrary/Fiberon PETG-rCF" - ], - "successor": "OFk8t9mz" - }, - "OGFL95": { - "claims": [ - "OrcaFilamentLibrary/Generic PLA High Speed" - ], - "successor": "OFmpMwxS" - }, - "OGFL96": { - "claims": [ - "Flashforge/Generic PLA Silk", - "Sovol/Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "OGFL98": { - "claims": [ - "OrcaFilamentLibrary/Generic PLA-CF" - ], - "successor": "OFWbdGsC" - }, - "OGFL99": { - "claims": [ - "Flashforge/Generic PLA", - "OrcaFilamentLibrary/Generic PLA", - "Sovol/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "OGFLC99": { - "claims": [ - "OrcaFilamentLibrary/Generic CoPE" - ], - "successor": "OFjt9en1" - }, - "OGFN03": { - "claims": [ - "OrcaFilamentLibrary/Bambu PA-CF" - ], - "successor": "OFFNYwWR" - }, - "OGFN04": { - "claims": [ - "OrcaFilamentLibrary/Bambu PAHT-CF" - ], - "successor": "OF2VFe4J" - }, - "OGFN05": { - "claims": [ - "OrcaFilamentLibrary/Bambu PA6-CF" - ], - "successor": "OFniMuTN" - }, - "OGFN06": { - "claims": [ - "OrcaFilamentLibrary/Bambu PPA-CF" - ], - "successor": "OF54B0S0" - }, - "OGFN08": { - "claims": [ - "OrcaFilamentLibrary/Bambu PA6-GF" - ], - "successor": "OFNk8bxk" - }, - "OGFN96": { - "claims": [ - "OrcaFilamentLibrary/Generic PPA-GF" - ], - "successor": "OF8Tlg47" - }, - "OGFN97": { - "claims": [ - "OrcaFilamentLibrary/Generic PPA-CF" - ], - "successor": "OF8tPByX" - }, - "OGFN98": { - "claims": [ - "Custom/Generic PA-CF", - "OrcaFilamentLibrary/Generic PA-CF" - ], - "successor": "OFQLcbps" - }, - "OGFN99": { - "claims": [], - "successor": "OFg8ndtj" - }, - "OGFNMK00": { - "claims": [ - "OrcaFilamentLibrary/Numakers PLA+" - ], - "successor": "OFqGRZyH" - }, - "OGFP97": { - "claims": [ - "OrcaFilamentLibrary/Generic PP" - ], - "successor": "OF1UNk9P" - }, - "OGFP99": { - "claims": [ - "OrcaFilamentLibrary/Generic PE" - ], - "successor": "OFPklMI1" - }, - "OGFPM001": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA" - ], - "successor": "OFsRDvTM" - }, - "OGFPM002": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Matte" - ], - "successor": "OFrOh600" - }, - "OGFPM003": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Marble" - ], - "successor": "OFKiSMWR" - }, - "OGFPM004": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Silk" - ], - "successor": "OFS8lTQt" - }, - "OGFPM005": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Satin" - ], - "successor": "OFPkCJKE" - }, - "OGFPM006": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Translucent" - ], - "successor": "OFCIUsWh" - }, - "OGFPM007": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Galaxy" - ], - "successor": "OFFkCLBl" - }, - "OGFPM008": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Celestial" - ], - "successor": "OFRiYgMK" - }, - "OGFPM009": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Starlight" - ], - "successor": "OFC78WGQ" - }, - "OGFPM010": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Glow" - ], - "successor": "OF0gGRWk" - }, - "OGFPM011": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Luminous" - ], - "successor": "OF0kCNDK" - }, - "OGFPM012": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Metallic" - ], - "successor": "OFjb0wos" - }, - "OGFPM013": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Neon" - ], - "successor": "OFO1GEq6" - }, - "OGFPM014": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA UV Shift" - ], - "successor": "OF1N1qMK" - }, - "OGFPM015": { - "claims": [ - "OrcaFilamentLibrary/Panchroma PLA Temp Shift" - ], - "successor": "OFhASRWj" - }, - "OGFPM016": { - "claims": [ - "OrcaFilamentLibrary/Panchroma CoPE" - ], - "successor": "OFqw2PQA" - }, - "OGFPM017": { - "claims": [ - "OrcaFilamentLibrary/Polymaker HT-PLA" - ], - "successor": "OFPoyiFs" - }, - "OGFPM018": { - "claims": [ - "OrcaFilamentLibrary/Polymaker HT-PLA-GF" - ], - "successor": "OFlwmqrC" - }, - "OGFPM019": { - "claims": [ - "OrcaFilamentLibrary/PolyLite PLA Pro" - ], - "successor": "OFF9OKoY" - }, - "OGFR00": { - "claims": [ - "OrcaFilamentLibrary/FusRock ABS-GF" - ], - "successor": "OFmn9NZL" - }, - "OGFR98": { - "claims": [ - "OrcaFilamentLibrary/Generic PHA" - ], - "successor": "OF74KeQR" - }, - "OGFR99": { - "claims": [ - "OrcaFilamentLibrary/Generic EVA" - ], - "successor": "OFCD8qiU" - }, - "OGFS00": { - "claims": [ - "OrcaFilamentLibrary/Bambu Support W" - ], - "successor": "OFsHSVZc" - }, - "OGFS01": { - "claims": [ - "OrcaFilamentLibrary/Bambu Support G" - ], - "successor": "OFQHiNJs" - }, - "OGFS02": { - "claims": [ - "OrcaFilamentLibrary/Bambu Support For PLA" - ], - "successor": "OFAnyRUI" - }, - "OGFS03": { - "claims": [ - "OrcaFilamentLibrary/Bambu Support For PA/PET" - ], - "successor": "OFMTK0UC" - }, - "OGFS04": { - "claims": [ - "OrcaFilamentLibrary/Bambu PVA" - ], - "successor": "OFzyIxba" - }, - "OGFS05": { - "claims": [ - "OrcaFilamentLibrary/Bambu Support For PLA/PETG" - ], - "successor": "OFIfnzxC" - }, - "OGFS06": { - "claims": [ - "OrcaFilamentLibrary/Bambu Support for ABS" - ], - "successor": "OFf6mfQO" - }, - "OGFS97": { - "claims": [ - "Flashforge/Generic BVOH", - "OrcaFilamentLibrary/Generic BVOH" - ], - "successor": "OFo2UF2C" - }, - "OGFS98": { - "claims": [ - "OrcaFilamentLibrary/Generic HIPS" - ], - "successor": "OFsFon5l" - }, - "OGFS99": { - "claims": [ - "OrcaFilamentLibrary/Generic PVA" - ], - "successor": "OFDvXujf" - }, - "OGFSNL02": { - "claims": [ - "OrcaFilamentLibrary/SUNLU PLA Matte" - ], - "successor": "OFpW4gdi" - }, - "OGFSNL03": { - "claims": [ - "OrcaFilamentLibrary/SUNLU PLA+" - ], - "successor": "OFMUWNkp" - }, - "OGFSNL04": { - "claims": [ - "OrcaFilamentLibrary/SUNLU PLA+ 2.0" - ], - "successor": "OFHmPYRy" - }, - "OGFSNL05": { - "claims": [ - "OrcaFilamentLibrary/SUNLU Silk PLA+" - ], - "successor": "OFpPGSKG" - }, - "OGFSNL06": { - "claims": [ - "OrcaFilamentLibrary/SUNLU PLA Marble" - ], - "successor": "OFxUwUeW" - }, - "OGFSNL07": { - "claims": [ - "OrcaFilamentLibrary/SUNLU Wood PLA" - ], - "successor": "OFLJ8S6I" - }, - "OGFSNL08": { - "claims": [ - "Sovol/SUNLU PETG" - ], - "successor": "OF2GCW1l" - }, - "OGFT01": { - "claims": [ - "OrcaFilamentLibrary/Bambu PET-CF" - ], - "successor": "OFHa48An" - }, - "OGFT02": { - "claims": [], - "successor": null - }, - "OGFU00": { - "claims": [ - "OrcaFilamentLibrary/Bambu TPU 95A HF" - ], - "successor": "OFvKUnLh" - }, - "OGFU01": { - "claims": [ - "OrcaFilamentLibrary/Bambu TPU 95A" - ], - "successor": "OFVCkX5w" - }, - "OGFU99": { - "claims": [ - "OrcaFilamentLibrary/Generic TPU", - "Sovol/Generic TPU" - ], - "successor": "OFgbpcy9" - }, - "OVTABS08": { - "claims": [ - "OrcaFilamentLibrary/Overture ABS Basic" - ], - "successor": "OFDvqJ6n" - }, - "P1001": { - "claims": [ - "Creality/Panchroma PLA Satin" - ], - "successor": "OFPkCJKE" - }, - "P1002": { - "claims": [ - "Creality/PolySonic PLA Pro" - ], - "successor": "OFKbdiiJ" - }, - "P1003": { - "claims": [ - "Creality/Panchroma PLA Matte" - ], - "successor": "OFrOh600" - }, - "P1004": { - "claims": [ - "Creality/PolySonic PLA" - ], - "successor": "OF66KUAN" - }, - "P11851ba": { - "claims": [ - "Artillery/Artillery PET" - ], - "successor": "OFb5EEM3" - }, - "P284941e": { - "claims": [ - "Artillery/Artillery PETG", - "Artillery/Artillery PETG Basic" - ], - "successor": "OFilnglt" - }, - "P2fbf0c0": { - "claims": [ - "Artillery/Artillery TPU" - ], - "successor": "OFcJDtTx" - }, - "P39db358": { - "claims": [ - "Artillery/Artillery ABS" - ], - "successor": "OFgXgt98" - }, - "P510cfa0": { - "claims": [ - "Cubicon/Cubicon PLA" - ], - "successor": "OFEwRwmL" - }, - "P510cfa1": { - "claims": [ - "Cubicon/Cubicon PLA+" - ], - "successor": "OF7tt7DO" - }, - "P510cfa2": { - "claims": [ - "Cubicon/Cubicon PLAi21" - ], - "successor": "OFRhBryT" - }, - "P510cfb0": { - "claims": [ - "Cubicon/Cubicon ABS" - ], - "successor": "OFpDo5Ix" - }, - "P510cfb1": { - "claims": [ - "Cubicon/Cubicon ABS-A100" - ], - "successor": "OFy8tYJE" - }, - "P510cfb2": { - "claims": [ - "Cubicon/Cubicon ABSk" - ], - "successor": "OForhBi4" - }, - "P510cfc0": { - "claims": [ - "Cubicon/Cubicon PETG" - ], - "successor": "OFoBTKmn" - }, - "P510cfd0": { - "claims": [ - "Cubicon/Cubicon PA-CF" - ], - "successor": "OFiEz2XI" - }, - "P510eff9": { - "claims": [ - "Ginger Additive/Ginger Generic PETG" - ], - "successor": "OFsGqI4y" - }, - "P8163162": { - "claims": [ - "Artillery/Artillery PVA" - ], - "successor": "OFkx5MEe" - }, - "P87436f6": { - "claims": [ - "Artillery/Artillery ASA" - ], - "successor": "OF5YVJXH" - }, - "Pfcf9c4c": { - "claims": [ - "Artillery/Artillery PLA" - ], - "successor": "OFzY7N3Z" - }, - "Prusa Generic ABS @CORE One": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Prusa Generic ABS @CORE One 0.6": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Prusa Generic ABS @CORE One 0.8": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Prusa Generic ABS @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Prusa Generic ABS @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Prusa Generic ABS @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Prusa Generic ABS @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusa Generic ABS" - ], - "successor": "OFvGc67v" - }, - "Prusa Generic ASA @CORE One": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusa Generic ASA @CORE One 0.6": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusa Generic ASA @CORE One 0.8": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusa Generic ASA @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusa Generic ASA @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusa Generic ASA @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusa Generic ASA @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusa Generic PETG @CORE One": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Prusa Generic PETG @CORE One 0.6": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Prusa Generic PETG @CORE One 0.8": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Prusa Generic PETG @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Prusa Generic PETG @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Prusa Generic PETG @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Prusa Generic PETG @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusa Generic PETG" - ], - "successor": "OF1Id239" - }, - "Prusa Generic PLA @CORE One": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Prusa Generic PLA @CORE One 0.6": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Prusa Generic PLA @CORE One 0.8": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Prusa Generic PLA @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Prusa Generic PLA @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Prusa Generic PLA @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Prusa Generic PLA @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusa Generic PLA" - ], - "successor": "OFiCHnso" - }, - "Prusa Generic PLA Silk @CORE One": { - "claims": [ - "Prusa/Prusa Generic PLA Silk" - ], - "successor": "OFHFZ1Te" - }, - "Prusa Generic PLA Silk @CORE One 0.6": { - "claims": [ - "Prusa/Prusa Generic PLA Silk" - ], - "successor": "OFHFZ1Te" - }, - "Prusa Generic PLA Silk @CORE One 0.8": { - "claims": [ - "Prusa/Prusa Generic PLA Silk" - ], - "successor": "OFHFZ1Te" - }, - "Prusa Generic TPU @CORE One": { - "claims": [ - "Prusa/Prusa Generic TPU" - ], - "successor": "OFbenYUK" - }, - "Prusa Generic TPU @CORE One 0.6": { - "claims": [ - "Prusa/Prusa Generic TPU" - ], - "successor": "OFbenYUK" - }, - "Prusa Generic TPU @CORE One 0.8": { - "claims": [ - "Prusa/Prusa Generic TPU" - ], - "successor": "OFbenYUK" - }, - "Prusament ASA @CORE One": { - "claims": [ - "Prusa/Prusament ASA" - ], - "successor": "OFmFwUWM" - }, - "Prusament ASA @CORE One 0.6": { - "claims": [ - "Prusa/Prusament ASA" - ], - "successor": "OFmFwUWM" - }, - "Prusament ASA @CORE One 0.8": { - "claims": [ - "Prusa/Prusament ASA" - ], - "successor": "OFmFwUWM" - }, - "Prusament ASA @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusament ASA" - ], - "successor": "OFmFwUWM" - }, - "Prusament ASA @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusament ASA" - ], - "successor": "OFmFwUWM" - }, - "Prusament ASA @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusament ASA" - ], - "successor": "OFmFwUWM" - }, - "Prusament ASA @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusament ASA" - ], - "successor": "OFmFwUWM" - }, - "Prusament ASA @MK4S": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusament ASA @MK4S 0.6": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusament ASA @MK4S 0.8": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusament ASA @MK4S HF0.4": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusament ASA @MK4S HF0.5": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusament ASA @MK4S HF0.6": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusament ASA @MK4S HF0.8": { - "claims": [ - "Prusa/Prusa Generic ASA" - ], - "successor": "OFoJcr46" - }, - "Prusament PA-CF @CORE One": { - "claims": [ - "Prusa/Prusament PA-CF" - ], - "successor": "OF54SvEe" - }, - "Prusament PA-CF @CORE One 0.6": { - "claims": [ - "Prusa/Prusament PA-CF" - ], - "successor": "OF54SvEe" - }, - "Prusament PA-CF @CORE One 0.8": { - "claims": [ - "Prusa/Prusament PA-CF" - ], - "successor": "OF54SvEe" - }, - "Prusament PC Blend @CORE One": { - "claims": [ - "Prusa/Prusament PC Blend" - ], - "successor": "OFvDbkFq" - }, - "Prusament PC Blend @CORE One 0.6": { - "claims": [ - "Prusa/Prusament PC Blend" - ], - "successor": "OFvDbkFq" - }, - "Prusament PC Blend @CORE One 0.8": { - "claims": [ - "Prusa/Prusament PC Blend" - ], - "successor": "OFvDbkFq" - }, - "Prusament PC Blend @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusament PC Blend" - ], - "successor": "OFvDbkFq" - }, - "Prusament PC Blend @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusament PC Blend" - ], - "successor": "OFvDbkFq" - }, - "Prusament PC Blend @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusament PC Blend" - ], - "successor": "OFvDbkFq" - }, - "Prusament PC Blend @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusament PC Blend" - ], - "successor": "OFvDbkFq" - }, - "Prusament PC-CF @CORE One": { - "claims": [ - "Prusa/Prusament PC-CF" - ], - "successor": "OFjz0a3m" - }, - "Prusament PC-CF @CORE One 0.6": { - "claims": [ - "Prusa/Prusament PC-CF" - ], - "successor": "OFjz0a3m" - }, - "Prusament PC-CF @CORE One 0.8": { - "claims": [ - "Prusa/Prusament PC-CF" - ], - "successor": "OFjz0a3m" - }, - "Prusament PETG @CORE One": { - "claims": [ - "Prusa/Prusament PETG" - ], - "successor": "OFkR8E2c" - }, - "Prusament PETG @CORE One 0.6": { - "claims": [ - "Prusa/Prusament PETG" - ], - "successor": "OFkR8E2c" - }, - "Prusament PETG @CORE One 0.8": { - "claims": [ - "Prusa/Prusament PETG" - ], - "successor": "OFkR8E2c" - }, - "Prusament PETG @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusament PETG" - ], - "successor": "OFkR8E2c" - }, - "Prusament PETG @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusament PETG" - ], - "successor": "OFkR8E2c" - }, - "Prusament PETG @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusament PETG" - ], - "successor": "OFkR8E2c" - }, - "Prusament PETG @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusament PETG" - ], - "successor": "OFkR8E2c" - }, - "Prusament PLA @CORE One": { - "claims": [ - "Prusa/Prusament PLA" - ], - "successor": "OFnO4wnf" - }, - "Prusament PLA @CORE One 0.6": { - "claims": [ - "Prusa/Prusament PLA" - ], - "successor": "OFnO4wnf" - }, - "Prusament PLA @CORE One 0.8": { - "claims": [ - "Prusa/Prusament PLA" - ], - "successor": "OFnO4wnf" - }, - "Prusament PLA @CORE One HF 0.4": { - "claims": [ - "Prusa/Prusament PLA" - ], - "successor": "OFnO4wnf" - }, - "Prusament PLA @CORE One HF 0.5": { - "claims": [ - "Prusa/Prusament PLA" - ], - "successor": "OFnO4wnf" - }, - "Prusament PLA @CORE One HF 0.6": { - "claims": [ - "Prusa/Prusament PLA" - ], - "successor": "OFnO4wnf" - }, - "Prusament PLA @CORE One HF 0.8": { - "claims": [ - "Prusa/Prusament PLA" - ], - "successor": "OFnO4wnf" - }, - "Prusament PVB @CORE One": { - "claims": [ - "Prusa/Prusament PVB" - ], - "successor": "OFh7mvPO" - }, - "Prusament PVB @CORE One 0.6": { - "claims": [ - "Prusa/Prusament PVB" - ], - "successor": "OFh7mvPO" - }, - "Prusament PVB @CORE One 0.8": { - "claims": [ - "Prusa/Prusament PVB" - ], - "successor": "OFh7mvPO" - }, - "Prusament rPLA @CORE One": { - "claims": [ - "Prusa/Prusament rPLA" - ], - "successor": "OFWRITFw" - }, - "Prusament rPLA @CORE One 0.6": { - "claims": [ - "Prusa/Prusament rPLA" - ], - "successor": "OFWRITFw" - }, - "Prusament rPLA @CORE One 0.8": { - "claims": [ - "Prusa/Prusament rPLA" - ], - "successor": "OFWRITFw" - }, - "QD_0_1_1": { - "claims": [ - "Qidi/QIDI PLA Rapido" - ], - "successor": "OFKIQO2W" - }, - "QD_0_1_15": { - "claims": [ - "Qidi/QIDI TPU-GF" - ], - "successor": "OF9EHUKK" - }, - "QD_0_1_2": { - "claims": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "successor": "OF3IKafc" - }, - "QD_0_1_20": { - "claims": [ - "Qidi/QIDI ASA-CF" - ], - "successor": "OF1W7c76" - }, - "QD_0_1_24": { - "claims": [ - "Qidi/QIDI PA-Ultra" - ], - "successor": "OFlN6DL1" - }, - "QD_0_1_26": { - "claims": [ - "Qidi/QIDI UltraPA-CF25" - ], - "successor": "OF9PELEb" - }, - "QD_0_1_27": { - "claims": [ - "Qidi/QIDI PA12-CF" - ], - "successor": "OFn6WpN7" - }, - "QD_0_1_3": { - "claims": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "successor": "OFANFm4x" - }, - "QD_0_1_30": { - "claims": [ - "Qidi/QIDI PAHT-CF" - ], - "successor": "OFKgmsqE" - }, - "QD_0_1_31": { - "claims": [ - "Qidi/QIDI PAHT-GF" - ], - "successor": "OFo15hcT" - }, - "QD_0_1_32": { - "claims": [ - "Qidi/QIDI Support For PAHT" - ], - "successor": "OFXn3Vd9" - }, - "QD_0_1_33": { - "claims": [ - "Qidi/QIDI Support For PET/PA" - ], - "successor": "OFqcL5UF" - }, - "QD_0_1_34": { - "claims": [ - "Qidi/Qidi PC-ABS-FR" - ], - "successor": "OFjD3YTW" - }, - "QD_0_1_36": { - "claims": [ - "Qidi/QIDI PEBA 95A" - ], - "successor": "OFhiJE7Y" - }, - "QD_0_1_37": { - "claims": [ - "Qidi/QIDI PET-CF" - ], - "successor": "OFKfJTwL" - }, - "QD_0_1_38": { - "claims": [ - "Qidi/QIDI PET-GF" - ], - "successor": "OFhx4uOG" - }, - "QD_0_1_39": { - "claims": [ - "Qidi/QIDI PETG Basic" - ], - "successor": "OFuJ49uH" - }, - "QD_0_1_4": { - "claims": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "successor": "OFW5FqkL" - }, - "QD_0_1_40": { - "claims": [ - "Qidi/QIDI PETG Tough" - ], - "successor": "OFQ40XeN" - }, - "QD_0_1_41": { - "claims": [ - "Qidi/QIDI PETG Rapido" - ], - "successor": "OF4S3To3" - }, - "QD_0_1_42": { - "claims": [ - "Qidi/QIDI PETG-CF" - ], - "successor": "OF4iWKrE" - }, - "QD_0_1_43": { - "claims": [ - "Qidi/QIDI PETG-GF" - ], - "successor": "OFdtPd9h" - }, - "QD_0_1_44": { - "claims": [ - "Qidi/QIDI PPS-CF" - ], - "successor": "OFZOuWrO" - }, - "QD_0_1_45": { - "claims": [ - "Qidi/QIDI PETG Translucent" - ], - "successor": "OFf0MkD5" - }, - "QD_0_1_46": { - "claims": [ - "Qidi/QIDI PPS-GF" - ], - "successor": "OFp57RRC" - }, - "QD_0_1_49": { - "claims": [ - "Qidi/QIDI TPU-Aero" - ], - "successor": "OFMDHOcT" - }, - "QD_0_1_5": { - "claims": [ - "Qidi/QIDI PLA-CF" - ], - "successor": "OFhWrAuP" - }, - "QD_0_1_50": { - "claims": [ - "Qidi/Qidi TPU 95A-HF" - ], - "successor": "OFzAWsca" - }, - "QD_0_1_6": { - "claims": [ - "Qidi/QIDI WOOD Rapido" - ], - "successor": "OFvdZ2bx" - }, - "QD_0_1_7": { - "claims": [ - "Qidi/QIDI PLA Basic" - ], - "successor": "OF4nQ62r" - }, - "QD_0_1_8": { - "claims": [ - "Qidi/QIDI PLA Matte Basic" - ], - "successor": "OFughwKn" - }, - "QD_1_0_1": { - "claims": [ - "Qidi/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "QD_1_0_11": { - "claims": [ - "Qidi/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "QD_1_0_23": { - "claims": [ - "Qidi/Generic PC" - ], - "successor": "OFLakOUI" - }, - "QD_1_0_4": { - "claims": [ - "Qidi/Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "QD_1_0_41": { - "claims": [ - "Qidi/Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "QD_1_0_50": { - "claims": [ - "Qidi/Generic TPU 95A" - ], - "successor": "OFjiXpyf" - }, - "QD_1_1_1": { - "claims": [ - "Qidi/QIDI PLA Rapido" - ], - "successor": "OFKIQO2W" - }, - "QD_1_1_11": { - "claims": [ - "Qidi/QIDI ABS Rapido" - ], - "successor": "OFT2jon4" - }, - "QD_1_1_12": { - "claims": [ - "Qidi/QIDI ABS-GF" - ], - "successor": "OFt3HtlG" - }, - "QD_1_1_13": { - "claims": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "successor": "OFeCJqxx" - }, - "QD_1_1_14": { - "claims": [ - "Qidi/QIDI ABS Odorless" - ], - "successor": "OFma5TXH" - }, - "QD_1_1_15": { - "claims": [ - "Qidi/QIDI TPU-GF" - ], - "successor": "OF9EHUKK" - }, - "QD_1_1_18": { - "claims": [ - "Qidi/QIDI ASA" - ], - "successor": "OFTsHNQi" - }, - "QD_1_1_19": { - "claims": [ - "Qidi/QIDI ASA-Aero" - ], - "successor": "OFu1E4ur" - }, - "QD_1_1_2": { - "claims": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "successor": "OF3IKafc" - }, - "QD_1_1_20": { - "claims": [ - "Qidi/QIDI ASA-CF" - ], - "successor": "OF1W7c76" - }, - "QD_1_1_24": { - "claims": [ - "Qidi/QIDI UltraPA" - ], - "successor": "OFWDe7YH" - }, - "QD_1_1_26": { - "claims": [ - "Qidi/QIDI UltraPA-CF25" - ], - "successor": "OF9PELEb" - }, - "QD_1_1_27": { - "claims": [ - "Qidi/QIDI PA12-CF" - ], - "successor": "OFn6WpN7" - }, - "QD_1_1_3": { - "claims": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "successor": "OFANFm4x" - }, - "QD_1_1_30": { - "claims": [ - "Qidi/QIDI PAHT-CF" - ], - "successor": "OFKgmsqE" - }, - "QD_1_1_31": { - "claims": [ - "Qidi/QIDI PAHT-GF" - ], - "successor": "OFo15hcT" - }, - "QD_1_1_32": { - "claims": [ - "Qidi/QIDI Support For PAHT" - ], - "successor": "OFXn3Vd9" - }, - "QD_1_1_33": { - "claims": [ - "Qidi/QIDI Support For PET/PA" - ], - "successor": "OFqcL5UF" - }, - "QD_1_1_34": { - "claims": [ - "Qidi/QIDI PC-ABS-FR" - ], - "successor": "OFFAWVf0" - }, - "QD_1_1_36": { - "claims": [ - "Qidi/QIDI PEBA 95A" - ], - "successor": "OFhiJE7Y" - }, - "QD_1_1_37": { - "claims": [ - "Qidi/QIDI PET-CF" - ], - "successor": "OFKfJTwL" - }, - "QD_1_1_38": { - "claims": [ - "Qidi/QIDI PET-GF" - ], - "successor": "OFhx4uOG" - }, - "QD_1_1_39": { - "claims": [ - "Qidi/QIDI PETG Basic" - ], - "successor": "OFuJ49uH" - }, - "QD_1_1_4": { - "claims": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "successor": "OFW5FqkL" - }, - "QD_1_1_40": { - "claims": [ - "Qidi/QIDI PETG Tough" - ], - "successor": "OFQ40XeN" - }, - "QD_1_1_41": { - "claims": [ - "Qidi/QIDI PETG Rapido" - ], - "successor": "OF4S3To3" - }, - "QD_1_1_42": { - "claims": [ - "Qidi/QIDI PETG-CF" - ], - "successor": "OF4iWKrE" - }, - "QD_1_1_43": { - "claims": [ - "Qidi/QIDI PETG-GF" - ], - "successor": "OFdtPd9h" - }, - "QD_1_1_44": { - "claims": [ - "Qidi/QIDI PPS-CF" - ], - "successor": "OFZOuWrO" - }, - "QD_1_1_45": { - "claims": [ - "Qidi/QIDI PETG Translucent" - ], - "successor": "OFf0MkD5" - }, - "QD_1_1_46": { - "claims": [ - "Qidi/QIDI PPS-GF" - ], - "successor": "OFp57RRC" - }, - "QD_1_1_49": { - "claims": [ - "Qidi/QIDI TPU-Aero" - ], - "successor": "OFMDHOcT" - }, - "QD_1_1_5": { - "claims": [ - "Qidi/QIDI PLA-CF" - ], - "successor": "OFhWrAuP" - }, - "QD_1_1_50": { - "claims": [ - "Qidi/QIDI TPU 95A-HF" - ], - "successor": "OFR1XLMN" - }, - "QD_1_1_6": { - "claims": [ - "Qidi/QIDI WOOD Rapido" - ], - "successor": "OFvdZ2bx" - }, - "QD_1_1_7": { - "claims": [ - "Qidi/QIDI PLA Basic" - ], - "successor": "OF4nQ62r" - }, - "QD_1_1_8": { - "claims": [ - "Qidi/QIDI PLA Matte Basic" - ], - "successor": "OFughwKn" - }, - "QD_2_0_1": { - "claims": [ - "Qidi/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "QD_2_0_11": { - "claims": [ - "Qidi/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "QD_2_0_23": { - "claims": [ - "Qidi/Generic PC" - ], - "successor": "OFLakOUI" - }, - "QD_2_0_4": { - "claims": [ - "Qidi/Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "QD_2_0_41": { - "claims": [ - "Qidi/Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "QD_2_0_50": { - "claims": [ - "Qidi/Generic TPU 95A" - ], - "successor": "OFjiXpyf" - }, - "QD_2_1_1": { - "claims": [ - "Qidi/QIDI PLA Rapido" - ], - "successor": "OFKIQO2W" - }, - "QD_2_1_11": { - "claims": [ - "Qidi/QIDI ABS Rapido" - ], - "successor": "OFT2jon4" - }, - "QD_2_1_12": { - "claims": [ - "Qidi/QIDI ABS-GF" - ], - "successor": "OFt3HtlG" - }, - "QD_2_1_13": { - "claims": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "successor": "OFeCJqxx" - }, - "QD_2_1_14": { - "claims": [ - "Qidi/QIDI ABS Odorless" - ], - "successor": "OFma5TXH" - }, - "QD_2_1_15": { - "claims": [ - "Qidi/QIDI TPU-GF" - ], - "successor": "OF9EHUKK" - }, - "QD_2_1_18": { - "claims": [ - "Qidi/QIDI ASA" - ], - "successor": "OFTsHNQi" - }, - "QD_2_1_19": { - "claims": [ - "Qidi/QIDI ASA-Aero" - ], - "successor": "OFu1E4ur" - }, - "QD_2_1_2": { - "claims": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "successor": "OF3IKafc" - }, - "QD_2_1_20": { - "claims": [ - "Qidi/QIDI ASA-CF" - ], - "successor": "OF1W7c76" - }, - "QD_2_1_24": { - "claims": [ - "Qidi/QIDI UltraPA" - ], - "successor": "OFWDe7YH" - }, - "QD_2_1_26": { - "claims": [ - "Qidi/QIDI UltraPA-CF25" - ], - "successor": "OF9PELEb" - }, - "QD_2_1_27": { - "claims": [ - "Qidi/QIDI PA12-CF" - ], - "successor": "OFn6WpN7" - }, - "QD_2_1_3": { - "claims": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "successor": "OFANFm4x" - }, - "QD_2_1_30": { - "claims": [ - "Qidi/QIDI PAHT-CF" - ], - "successor": "OFKgmsqE" - }, - "QD_2_1_31": { - "claims": [ - "Qidi/QIDI PAHT-GF" - ], - "successor": "OFo15hcT" - }, - "QD_2_1_32": { - "claims": [ - "Qidi/QIDI Support For PAHT" - ], - "successor": "OFXn3Vd9" - }, - "QD_2_1_33": { - "claims": [ - "Qidi/QIDI Support For PET/PA" - ], - "successor": "OFqcL5UF" - }, - "QD_2_1_34": { - "claims": [ - "Qidi/QIDI PC-ABS-FR" - ], - "successor": "OFFAWVf0" - }, - "QD_2_1_36": { - "claims": [ - "Qidi/QIDI PEBA 95A" - ], - "successor": "OFhiJE7Y" - }, - "QD_2_1_37": { - "claims": [ - "Qidi/QIDI PET-CF" - ], - "successor": "OFKfJTwL" - }, - "QD_2_1_38": { - "claims": [ - "Qidi/QIDI PET-GF" - ], - "successor": "OFhx4uOG" - }, - "QD_2_1_39": { - "claims": [ - "Qidi/QIDI PETG Basic" - ], - "successor": "OFuJ49uH" - }, - "QD_2_1_4": { - "claims": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "successor": "OFW5FqkL" - }, - "QD_2_1_40": { - "claims": [ - "Qidi/QIDI PETG Tough" - ], - "successor": "OFQ40XeN" - }, - "QD_2_1_41": { - "claims": [ - "Qidi/QIDI PETG Rapido" - ], - "successor": "OF4S3To3" - }, - "QD_2_1_42": { - "claims": [ - "Qidi/QIDI PETG-CF" - ], - "successor": "OF4iWKrE" - }, - "QD_2_1_43": { - "claims": [ - "Qidi/QIDI PETG-GF" - ], - "successor": "OFdtPd9h" - }, - "QD_2_1_44": { - "claims": [ - "Qidi/QIDI PPS-CF" - ], - "successor": "OFZOuWrO" - }, - "QD_2_1_45": { - "claims": [ - "Qidi/QIDI PETG Translucent" - ], - "successor": "OFf0MkD5" - }, - "QD_2_1_46": { - "claims": [ - "Qidi/QIDI PPS-GF" - ], - "successor": "OFp57RRC" - }, - "QD_2_1_49": { - "claims": [ - "Qidi/QIDI TPU-Aero" - ], - "successor": "OFMDHOcT" - }, - "QD_2_1_5": { - "claims": [ - "Qidi/QIDI PLA-CF" - ], - "successor": "OFhWrAuP" - }, - "QD_2_1_50": { - "claims": [ - "Qidi/QIDI TPU 95A-HF" - ], - "successor": "OFR1XLMN" - }, - "QD_2_1_6": { - "claims": [ - "Qidi/QIDI WOOD Rapido" - ], - "successor": "OFvdZ2bx" - }, - "QD_2_1_7": { - "claims": [ - "Qidi/QIDI PLA Basic" - ], - "successor": "OF4nQ62r" - }, - "QD_2_1_8": { - "claims": [ - "Qidi/QIDI PLA Matte Basic" - ], - "successor": "OFughwKn" - }, - "QD_3_0_1": { - "claims": [ - "Qidi/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "QD_3_0_11": { - "claims": [ - "Qidi/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "QD_3_0_23": { - "claims": [ - "Qidi/Generic PC" - ], - "successor": "OFLakOUI" - }, - "QD_3_0_4": { - "claims": [ - "Qidi/Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "QD_3_0_41": { - "claims": [ - "Qidi/Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "QD_3_0_50": { - "claims": [ - "Qidi/Generic TPU 95A" - ], - "successor": "OFjiXpyf" - }, - "QD_3_1_1": { - "claims": [ - "Qidi/QIDI PLA Rapido" - ], - "successor": "OFKIQO2W" - }, - "QD_3_1_11": { - "claims": [ - "Qidi/QIDI ABS Rapido" - ], - "successor": "OFT2jon4" - }, - "QD_3_1_12": { - "claims": [ - "Qidi/QIDI ABS-GF" - ], - "successor": "OFt3HtlG" - }, - "QD_3_1_13": { - "claims": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "successor": "OFeCJqxx" - }, - "QD_3_1_14": { - "claims": [ - "Qidi/QIDI ABS Odorless" - ], - "successor": "OFma5TXH" - }, - "QD_3_1_15": { - "claims": [ - "Qidi/QIDI TPU-GF" - ], - "successor": "OF9EHUKK" - }, - "QD_3_1_18": { - "claims": [ - "Qidi/QIDI ASA" - ], - "successor": "OFTsHNQi" - }, - "QD_3_1_19": { - "claims": [ - "Qidi/QIDI ASA-Aero" - ], - "successor": "OFu1E4ur" - }, - "QD_3_1_2": { - "claims": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "successor": "OF3IKafc" - }, - "QD_3_1_20": { - "claims": [ - "Qidi/QIDI ASA-CF" - ], - "successor": "OF1W7c76" - }, - "QD_3_1_24": { - "claims": [ - "Qidi/QIDI UltraPA" - ], - "successor": "OFWDe7YH" - }, - "QD_3_1_26": { - "claims": [ - "Qidi/QIDI UltraPA-CF25" - ], - "successor": "OF9PELEb" - }, - "QD_3_1_27": { - "claims": [ - "Qidi/QIDI PA12-CF" - ], - "successor": "OFn6WpN7" - }, - "QD_3_1_3": { - "claims": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "successor": "OFANFm4x" - }, - "QD_3_1_30": { - "claims": [ - "Qidi/QIDI PAHT-CF" - ], - "successor": "OFKgmsqE" - }, - "QD_3_1_31": { - "claims": [ - "Qidi/QIDI PAHT-GF" - ], - "successor": "OFo15hcT" - }, - "QD_3_1_32": { - "claims": [ - "Qidi/QIDI Support For PAHT" - ], - "successor": "OFXn3Vd9" - }, - "QD_3_1_33": { - "claims": [ - "Qidi/QIDI Support For PET/PA" - ], - "successor": "OFqcL5UF" - }, - "QD_3_1_34": { - "claims": [ - "Qidi/QIDI PC/ABS-FR" - ], - "successor": "OFDIrhbu" - }, - "QD_3_1_36": { - "claims": [ - "Qidi/QIDI PEBA 95A" - ], - "successor": "OFhiJE7Y" - }, - "QD_3_1_37": { - "claims": [ - "Qidi/QIDI PET-CF" - ], - "successor": "OFKfJTwL" - }, - "QD_3_1_38": { - "claims": [ - "Qidi/QIDI PET-GF" - ], - "successor": "OFhx4uOG" - }, - "QD_3_1_39": { - "claims": [ - "Qidi/QIDI PETG Basic" - ], - "successor": "OFuJ49uH" - }, - "QD_3_1_4": { - "claims": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "successor": "OFW5FqkL" - }, - "QD_3_1_40": { - "claims": [ - "Qidi/QIDI PETG Tough" - ], - "successor": "OFQ40XeN" - }, - "QD_3_1_41": { - "claims": [ - "Qidi/QIDI PETG Rapido" - ], - "successor": "OF4S3To3" - }, - "QD_3_1_42": { - "claims": [ - "Qidi/QIDI PETG-CF" - ], - "successor": "OF4iWKrE" - }, - "QD_3_1_43": { - "claims": [ - "Qidi/QIDI PETG-GF" - ], - "successor": "OFdtPd9h" - }, - "QD_3_1_44": { - "claims": [ - "Qidi/QIDI PPS-CF" - ], - "successor": "OFZOuWrO" - }, - "QD_3_1_45": { - "claims": [ - "Qidi/QIDI PETG Translucent" - ], - "successor": "OFf0MkD5" - }, - "QD_3_1_46": { - "claims": [ - "Qidi/QIDI PPS-GF" - ], - "successor": "OFp57RRC" - }, - "QD_3_1_49": { - "claims": [ - "Qidi/QIDI TPU-Aero" - ], - "successor": "OFMDHOcT" - }, - "QD_3_1_5": { - "claims": [ - "Qidi/QIDI PLA-CF" - ], - "successor": "OFhWrAuP" - }, - "QD_3_1_50": { - "claims": [ - "Qidi/QIDI TPU 95A-HF" - ], - "successor": "OFR1XLMN" - }, - "QD_3_1_6": { - "claims": [ - "Qidi/QIDI WOOD Rapido" - ], - "successor": "OFvdZ2bx" - }, - "QD_3_1_7": { - "claims": [ - "Qidi/QIDI PLA Basic" - ], - "successor": "OF4nQ62r" - }, - "QD_3_1_8": { - "claims": [ - "Qidi/QIDI PLA Matte Basic" - ], - "successor": "OFughwKn" - }, - "QD_4_0_1": { - "claims": [ - "Qidi/Generic PLA" - ], - "successor": "OFDSrzZ8" - }, - "QD_4_0_11": { - "claims": [ - "Qidi/Generic ABS" - ], - "successor": "OFY9muEs" - }, - "QD_4_0_23": { - "claims": [ - "Qidi/Generic PC" - ], - "successor": "OFLakOUI" - }, - "QD_4_0_4": { - "claims": [ - "Qidi/Generic PLA Silk" - ], - "successor": "OFesA6rF" - }, - "QD_4_0_41": { - "claims": [ - "Qidi/Generic PETG" - ], - "successor": "OFYPdQJh" - }, - "QD_4_0_50": { - "claims": [ - "Qidi/Generic TPU 95A" - ], - "successor": "OFjiXpyf" - }, - "QD_4_1_1": { - "claims": [ - "Qidi/QIDI PLA Rapido" - ], - "successor": "OFKIQO2W" - }, - "QD_4_1_11": { - "claims": [ - "Qidi/QIDI ABS Rapido" - ], - "successor": "OFT2jon4" - }, - "QD_4_1_12": { - "claims": [ - "Qidi/QIDI ABS-GF" - ], - "successor": "OFt3HtlG" - }, - "QD_4_1_13": { - "claims": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "successor": "OFeCJqxx" - }, - "QD_4_1_14": { - "claims": [ - "Qidi/QIDI ABS Odorless" - ], - "successor": "OFma5TXH" - }, - "QD_4_1_15": { - "claims": [ - "Qidi/QIDI TPU-GF" - ], - "successor": "OF9EHUKK" - }, - "QD_4_1_18": { - "claims": [ - "Qidi/QIDI ASA" - ], - "successor": "OFTsHNQi" - }, - "QD_4_1_19": { - "claims": [ - "Qidi/QIDI ASA-Aero" - ], - "successor": "OFu1E4ur" - }, - "QD_4_1_2": { - "claims": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "successor": "OF3IKafc" - }, - "QD_4_1_20": { - "claims": [ - "Qidi/QIDI ASA-CF" - ], - "successor": "OF1W7c76" - }, - "QD_4_1_24": { - "claims": [ - "Qidi/QIDI UltraPA" - ], - "successor": "OFWDe7YH" - }, - "QD_4_1_25": { - "claims": [ - "Qidi/QIDI PA6-CF" - ], - "successor": "OFZ3K2cL" - }, - "QD_4_1_26": { - "claims": [ - "Qidi/QIDI UltraPA-CF25" - ], - "successor": "OF9PELEb" - }, - "QD_4_1_27": { - "claims": [ - "Qidi/QIDI PA12-CF" - ], - "successor": "OFn6WpN7" - }, - "QD_4_1_3": { - "claims": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "successor": "OFANFm4x" - }, - "QD_4_1_30": { - "claims": [ - "Qidi/QIDI PAHT-CF" - ], - "successor": "OFKgmsqE" - }, - "QD_4_1_31": { - "claims": [ - "Qidi/QIDI PAHT-GF" - ], - "successor": "OFo15hcT" - }, - "QD_4_1_32": { - "claims": [ - "Qidi/QIDI Support For PAHT" - ], - "successor": "OFXn3Vd9" - }, - "QD_4_1_33": { - "claims": [ - "Qidi/QIDI Support For PET/PA" - ], - "successor": "OFqcL5UF" - }, - "QD_4_1_34": { - "claims": [ - "Qidi/QIDI PC/ABS-FR" - ], - "successor": "OFDIrhbu" - }, - "QD_4_1_36": { - "claims": [ - "Qidi/QIDI PEBA 95A" - ], - "successor": "OFhiJE7Y" - }, - "QD_4_1_37": { - "claims": [ - "Qidi/QIDI PET-CF" - ], - "successor": "OFKfJTwL" - }, - "QD_4_1_38": { - "claims": [ - "Qidi/QIDI PET-GF" - ], - "successor": "OFhx4uOG" - }, - "QD_4_1_39": { - "claims": [ - "Qidi/QIDI PETG Basic" - ], - "successor": "OFuJ49uH" - }, - "QD_4_1_4": { - "claims": [ - "Qidi/QIDI PLA Silk" - ], - "successor": "OF2TQpOO" - }, - "QD_4_1_40": { - "claims": [ - "Qidi/QIDI PETG Tough" - ], - "successor": "OFQ40XeN" - }, - "QD_4_1_41": { - "claims": [ - "Qidi/QIDI PETG Rapido" - ], - "successor": "OF4S3To3" - }, - "QD_4_1_42": { - "claims": [ - "Qidi/QIDI PETG-CF" - ], - "successor": "OF4iWKrE" - }, - "QD_4_1_43": { - "claims": [ - "Qidi/QIDI PETG-GF" - ], - "successor": "OFdtPd9h" - }, - "QD_4_1_44": { - "claims": [ - "Qidi/QIDI PPS-CF" - ], - "successor": "OFZOuWrO" - }, - "QD_4_1_45": { - "claims": [ - "Qidi/QIDI PETG Translucent" - ], - "successor": "OFf0MkD5" - }, - "QD_4_1_46": { - "claims": [ - "Qidi/QIDI PPS-GF" - ], - "successor": "OFp57RRC" - }, - "QD_4_1_49": { - "claims": [ - "Qidi/QIDI TPU-Aero" - ], - "successor": "OFMDHOcT" - }, - "QD_4_1_5": { - "claims": [ - "Qidi/QIDI PLA-CF" - ], - "successor": "OFhWrAuP" - }, - "QD_4_1_50": { - "claims": [ - "Qidi/QIDI TPU 95A-HF" - ], - "successor": "OFR1XLMN" - }, - "QD_4_1_6": { - "claims": [ - "Qidi/QIDI WOOD Rapido" - ], - "successor": "OFvdZ2bx" - }, - "QD_4_1_7": { - "claims": [ - "Qidi/QIDI PLA Basic" - ], - "successor": "OF4nQ62r" - }, - "QD_4_1_8": { - "claims": [ - "Qidi/QIDI PLA Matte Basic" - ], - "successor": "OFughwKn" - }, - "SMCFB001": { - "claims": [ - "SeeMeCNC/SeeMeCNC ABS" - ], - "successor": "OFR0gODA" - }, - "SMCFG001": { - "claims": [ - "SeeMeCNC/SeeMeCNC PETG" - ], - "successor": "OFxDHUX8" - }, - "SMCFG002": { - "claims": [ - "SeeMeCNC/SeeMeCNC PETG-CF" - ], - "successor": "OFaRjiIm" - }, - "SMCFL001": { - "claims": [ - "SeeMeCNC/SeeMeCNC PLA" - ], - "successor": "OFbSChKb" - }, - "SMCFN001": { - "claims": [ - "SeeMeCNC/SeeMeCNC PA-CF" - ], - "successor": "OF0b7M1z" - }, - "SMCFU001": { - "claims": [ - "SeeMeCNC/SeeMeCNC TPU" - ], - "successor": "OFyFyLIp" - }, - "VLMNT01": { - "claims": [ - "OrcaFilamentLibrary/Valment PLA" - ], - "successor": "OFDe8uyM" - }, - "VLMNT02": { - "claims": [ - "OrcaFilamentLibrary/Valment PLA Silk" - ], - "successor": "OFpBlrvY" - }, - "VLMNT03": { - "claims": [ - "OrcaFilamentLibrary/Valment PLA-CF" - ], - "successor": "OFfq5YXA" - }, - "VLMNT04": { - "claims": [ - "OrcaFilamentLibrary/Valment PLA Galaxy" - ], - "successor": "OFB5SmWk" - } - } -} diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index 34ff667ed0..46a138253c 100755 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 """ Mint deterministic filament_id values for OrcaSlicer system filament products and -validate the tree against the sanctioned-state ledger. +validate the tree against the sanctioned-state snapshot. -Policy (companion to assign_vendor_setting_ids.py; see filament_id_plan_v3.md): +Policy (companion to assign_vendor_setting_ids.py; see docs/HLSD/filament_id.md): * filament_id is a PRODUCT id: one commercial product line = one id, shared by all of that material's per-printer/per-nozzle variants in every bundle. OrcaFilamentLibrary (OFL) is the product catalog: a family's id is declared @@ -19,34 +19,22 @@ Policy (companion to assign_vendor_setting_ids.py; see filament_id_plan_v3.md): filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, "filament_product///") ) 8 chars total, which satisfies the AMS length limit. Nobody invents ids by - hand; on the astronomically rare collision with any existing or retired id - the input is salted ("/1", "/2", ...) until free and the result is frozen - in file. Identity changes (a family rename, a filament_vendor/filament_type - fix) change the id BY DESIGN — the succession ledger keeps old ids - resolving. + hand; on the astronomically rare collision with an existing id the input + is salted ("/1", "/2", ...) until free and the result is frozen in file. + Identity changes (a family rename, a filament_vendor/filament_type fix) + change the id BY DESIGN. * Reserved id spaces that are never minted into or altered: - GF* Bambu AMS/RFID catalog (vendor BBL untouchable) - - QD_* Qidi device protocol (dissolved island, plan v4: - every shipped QD_* id is retired in the ledger and - the QidiPrinterAgent translates device-composed - QD_* ids through the succession walk; no preset - may ever declare one again) + - QD_* Qidi device protocol: the box composes these ids + at runtime, they are not preset ids, and no + preset may declare one - P + 7 hex chars (case-insensitive) and the literal "null" user-custom presets (CreatePresetsDialog.cpp) - every already-shipped id, grandfathered via scripts/filament_id_snapshot.json - * scripts/filament_id_snapshot.json is the sanctioned-state ledger (ids, + * scripts/filament_id_snapshot.json is the sanctioned-state snapshot (ids, claims and declared triples): it must exactly equal the tree-derived state at all times, so any id/claim/triple change shows up as a reviewable diff to - that file (the maintainer gate). Ids that fully vanish from the tree are - appended to the SHIPPED succession ledger - resources/profiles/retired_filament_ids.json as - {"claims": [...], "successor": } — successor picked by the mode - rule over the vanished id's old claims — and the runtime follows those - chains (plus cross-island "hints" for ids Orca cannot retire, e.g. GF*) - on resolution miss. A retired id may never be used again for anything. - Vanished ids in a FOREIGN island's space (GF*) are released with a - hint instead of retired: the island's catalog owns them and may - legitimately (re)ship them. + that file (the maintainer gate). The effective-id resolution below is loader-faithful (PresetBundle.cpp load_vendor_configs_from_json): own filament_id key, else walk `inherits` within @@ -59,16 +47,7 @@ Run from anywhere: python3 scripts/assign_filament_ids.py rewrites a valid existing id; a no-op on a fully-idded tree --mint "Vendor/Type/Family" print the id that triple would mint; touches nothing - --update-snapshot regenerate the snapshot from the tree; retire vanished ids - with a mode-rule successor (--forget-never-shipped FILE - drops listed never-shipped ids from lineage instead) - --add-hint "OLD=NEW" - record a cross-island succession hint (standalone) - --retire "OLD=NEW" - retire a vanished non-island shipped id with an explicit - successor (standalone; for lineage the claim vote can no - longer see because the claims migrated while another - declarer kept the id alive) + --update-snapshot regenerate the snapshot from the tree --remint VENDOR re-derive VENDOR's declared ids from their triples and rewrite mismatches in place (repeatable) --drop-redundant-ids VENDOR @@ -96,10 +75,6 @@ FILAMENT_ID_LENGTH = 6 # base62 digits after the "OF" prefix -> 8 chars total SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) PROFILES_DIR = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "resources", "profiles")) SNAPSHOT_PATH = os.path.join(SCRIPTS_DIR, "filament_id_snapshot.json") -# The succession ledger ships with the app (resources/) so the runtime can -# follow retired->successor chains and cross-island hints on resolution miss. -RETIRED_PATH = os.path.join(PROFILES_DIR, "retired_filament_ids.json") -RETIRED_REL = "resources/profiles/retired_filament_ids.json" OFL = "OrcaFilamentLibrary" @@ -171,7 +146,7 @@ def generate_filament_id(filament_vendor, filament_type, family, salt=0): def mint_filament_id(filament_vendor, filament_type, family, taken): - """Mint the product's id, salting past any id in `taken` (existing + retired).""" + """Mint the product's id, salting past any id in `taken`.""" for salt in range(10000): candidate = generate_filament_id(filament_vendor, filament_type, family, salt) if candidate not in taken: @@ -193,7 +168,7 @@ def list_vendor_names(profiles_dir): """Vendor bundles = subdirectories with a matching .json index file. (Ignores stray non-bundle entries such as the tracked "user" directory, - which has no user.json index, and the retired_filament_ids.json ledger.) + which has no user.json index.) """ profiles_dir = str(profiles_dir) return sorted( @@ -250,7 +225,7 @@ def resolve_filament_id(name, filaments, ofl_filaments, seen=None, in_ofl=False, vendor is re-tried against the OFL map keyed by its direct parent name. skip_own ignores the first preset's own filament_id key (used to compute the - id its inherits chain would resolve WITHOUT the declaration — check 7b drift). + id its inherits chain would resolve WITHOUT the declaration — check 6b drift). Returns (filament_id or None, source, ofl_entry) where source is one of "own"/"inherited"/"missing"/"dangling"/"cycle" and ofl_entry is the name of @@ -379,7 +354,6 @@ def analyze_tree(profiles_dir): triples = {} # fid -> set of triples of its non-island declarers declarer_triples = [] # (vendor, rec, fid, triple) per non-island declarer family_triples = {} # (vendor, family) -> {triple: [declarer names]} - renamed_claims = {} # "Vendor/OldFamily" -> set of ids the rename now carries for vendor, filaments in vendors.items(): occurring = vendor_ids.setdefault(vendor, set()) @@ -413,19 +387,12 @@ def analyze_tree(profiles_dir): continue occurring.add(eff) ids.setdefault(eff, set()).add(f"{vendor}/{base_name(rec['name'])}") - # A renamed preset keeps voting under the names it used to have, so - # the id its old family carried retires to the id the rename minted. - renamed = rec.get("renamed_from") - for old in (renamed if isinstance(renamed, str) else "").split(";"): - if old.strip(): - renamed_claims.setdefault( - f"{vendor}/{base_name(old.strip())}", set()).add(eff) if rec.get("filament_id"): instantiated_with_id.append(f"{vendor}/{rec['name']}") if vendor != OFL and rec["ofl_entry"] and eff in ofl_declared: alias_candidates.append((vendor, rec, rec["ofl_entry"], False)) - # Alias hygiene (check 5): a vendor preset that rides an OFL family (its id + # Alias hygiene (check 4): a vendor preset that rides an OFL family (its id # resolves through OFL) is matched to the OFL preset by ALIAS (base name); # renaming it re-exposes the OFL preset and creates a live duplicate, empty # compatible_printers cannot claim any printer, and declaring its own @@ -452,7 +419,7 @@ def analyze_tree(profiles_dir): "empty compatible_printers cannot shadow the OFL preset anywhere", rec["file"])) - # Cross-bundle triple divergence (check 8, warning only): the same family + # Cross-bundle triple divergence (check 7, warning only): the same family # name declared in several bundles with different triples cannot converge # on one id until the divergence is fixed. name_bundles = {} @@ -468,7 +435,6 @@ def analyze_tree(profiles_dir): "vendors": vendors, "read_errors": read_errors, "ids": {fid: sorted(claims) for fid, claims in ids.items()}, - "renamed_claims": {claim: sorted(fids) for claim, fids in renamed_claims.items()}, "vendor_ids": vendor_ids, "declared_ids": declared_ids, "instantiated_with_id": sorted(instantiated_with_id), @@ -488,7 +454,7 @@ def analyze_tree(profiles_dir): # --------------------------------------------------------------------------- -# Snapshot / succession-ledger IO +# Snapshot IO # --------------------------------------------------------------------------- def snapshot_from_analysis(analysis): @@ -515,102 +481,13 @@ def load_snapshot(path): return data -def load_ledger(path): - """The shipped succession ledger: - {"retired": {id: {"claims": [...], "successor": id|None}}, "hints": {id: id}}. - Empty maps when the file is absent. - """ - if not os.path.exists(path): - return {"retired": {}, "hints": {}} - data = load_json(path) - return {"retired": data.get("retired", {}), "hints": data.get("hints", {})} - - -def load_retired(path): - """The ledger's retired map (see load_ledger); {} when the file is absent.""" - return load_ledger(path)["retired"] - - -def write_ledger(path, obj): +def write_snapshot(path, obj): """Deterministic serialization: sorted keys, indent 1, LF, trailing newline.""" with open(path, "w", encoding="utf-8", newline="\n") as f: json.dump(obj, f, indent=1, ensure_ascii=False, sort_keys=True) f.write("\n") -def claim_effective_ids(analysis): - """Reverse of analysis["ids"]: claim "Vendor/Family" -> set of effective ids. - - A preset's "renamed_from" names count as claims of that preset too, so an id - whose family was renamed still finds a successor in the claim vote. - """ - claim_ids = {} - for fid, claims in analysis["ids"].items(): - for claim in claims: - claim_ids.setdefault(claim, set()).add(fid) - for claim, fids in analysis.get("renamed_claims", {}).items(): - if claim not in claim_ids: - claim_ids[claim] = set(fids) - return claim_ids - - -def successor_by_mode(claims, claim_ids): - """Mode rule for a retiring id's successor: every old claim whose family - still exists votes for the family's current effective id(s); most votes - wins, ties break to the lexicographically smallest id, no votes -> None. - Returns (successor_or_None, vote_counts). - """ - counts = {} - for claim in claims: - for fid in claim_ids.get(claim, ()): - counts[fid] = counts.get(fid, 0) + 1 - if not counts: - return None, counts - best = max(counts.values()) - return min(f for f, n in counts.items() if n == best), counts - - -def migrate_retired_entries(old_retired, claim_ids): - """One-shot v3 schema migration: list-valued entries {id: [claims]} become - {id: {"claims": [...], "successor": }}; object entries - pass through untouched. - """ - migrated = {} - for fid, entry in old_retired.items(): - if isinstance(entry, dict): - migrated[fid] = entry - continue - successor, _counts = successor_by_mode(entry, claim_ids) - migrated[fid] = {"claims": sorted(entry), "successor": successor} - return migrated - - -def follow_succession(fid, seen, retired, hints, live): - """Follow retired->successor / hints->target forwarding starting at `fid`. - - Returns (status, node): "null" (chain ended on an heirless retirement), - "live" (reached a live tree id), "cycle", or "dead-end" (an id that is - neither live nor forwarded anywhere). `seen` pre-seeds the cycle guard. - """ - seen = set(seen) - cur = fid - while True: - if cur is None: - return "null", None - if cur in seen: - return "cycle", cur - seen.add(cur) - if cur in live: - return "live", cur - entry = retired.get(cur) - if entry is not None: - cur = entry.get("successor") if isinstance(entry, dict) else None - elif cur in hints: - cur = hints[cur] - else: - return "dead-end", cur - - # --------------------------------------------------------------------------- # Reserved namespaces # --------------------------------------------------------------------------- @@ -631,7 +508,7 @@ def reserved_space_desc(fid, owner): if owner: return f"owned by {owner}" if fid.startswith("QD_"): - return "Qidi device protocol; dissolved island — ids are retired, never declarable" + return "Qidi device protocol; composed by the device, never a preset id" return "reserved for user-custom presets" @@ -639,8 +516,7 @@ def reserved_space_desc(fid, owner): # Checks (imported and called tree-wide by orca_extra_profile_check.py) # --------------------------------------------------------------------------- -def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, - retired_path=RETIRED_PATH): +def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): """Validate filament_id state across every vendor. Returns the error count. 1. Format: every id occurring in the tree (declared or effective) must be in @@ -651,23 +527,19 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, 3. Mint conformance: a non-island OF-format declaration must equal the mint of the declarer's triple or a salted iteration, unless that exact (id, triple) pair is grandfathered in the snapshot. - 4. Retired ids may never occur again. - 5. Alias hygiene: a vendor preset riding an OFL family must keep the OFL + 4. Alias hygiene: a vendor preset riding an OFL family must keep the OFL base name, claim printers via non-empty compatible_printers, and declare no filament_id key of its own. - 6. Reserved namespaces (GF* for BBL; QD_*/P-hex/"null" for nobody) must not + 5. Reserved namespaces (GF* for BBL; QD_*/P-hex/"null" for nobody) must not be claimed by other vendors, except claims grandfathered in the snapshot. - 7. Structure ratchet: (a) no NEW instantiated preset carries its own + 6. Structure ratchet: (a) no NEW instantiated preset carries its own filament_id key; (b) no NEW declared-vs-inherited id drift; (c) every instantiated filament resolves an effective id (a hard load error in C++). - 8. Triple integrity: (a) every non-island declarer resolves non-empty + 7. Triple integrity: (a) every non-island declarer resolves non-empty filament_vendor and filament_type (hard error, no grandfathering); (b) declarers of one (bundle, family) resolve identical triples, unless grandfathered in snapshot triple_exceptions; cross-bundle divergence on the same family name is a warning only. - 9. Succession integrity: retired successor chains terminate at a live id or - null without cycles; hint keys are live island-declared ids and hint - chains terminate live. """ _utf8_console() errors = 0 @@ -676,10 +548,6 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, if snapshot is None: print_error(f"filament_id snapshot not found at {snapshot_path}; {UPDATE_HINT}") return 1 - ledger = load_ledger(retired_path) - retired = ledger["retired"] - hints = ledger["hints"] - for msg in analysis["read_errors"]: print_error(msg) errors += 1 @@ -717,8 +585,8 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, for fid in sorted(snap_ids): if fid not in tree_ids: print_error( - f'filament_id stability: snapshot id "{fid}" vanished from the tree ' - f"(shipped ids retire through the succession ledger); {UPDATE_HINT}") + f'filament_id stability: snapshot id "{fid}" vanished from the tree; ' + f"{UPDATE_HINT}") errors += 1 continue for claim in snap_ids[fid]: @@ -761,16 +629,7 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"family root (or, for an intentionally kept id, {UPDATE_HINT})") errors += 1 - # -- 4. retired ids may never come back --------------------------------- - for vendor in sorted(analysis["vendor_ids"]): - for fid in sorted(analysis["vendor_ids"][vendor]): - if fid in retired: - print_error( - f'filament_id "{fid}" ({vendor}) is retired ' - f"({RETIRED_REL}) and may never be reused") - errors += 1 - - # -- 5. alias hygiene for presets riding OFL families -------------------- + # -- 4. alias hygiene for presets riding OFL families -------------------- exceptions = set(snapshot["alias_exceptions"]) for vendor, name, entry, reason, file in analysis["alias_violations"]: if f"{vendor}/{name}" in exceptions: @@ -782,7 +641,7 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"gets its own minted id") errors += 1 - # -- 6. reserved namespaces ---------------------------------------------- + # -- 5. reserved namespaces ---------------------------------------------- for fid in sorted(tree_ids): is_reserved, owner = reserved_space_owner(fid) if not is_reserved: @@ -799,7 +658,7 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"({space}) and must not be claimed by system presets of other vendors") errors += 1 - # -- 7. structure ratchet ------------------------------------------------- + # -- 6. structure ratchet ------------------------------------------------- grandfathered = set(snapshot["instantiated_with_id"]) for key in analysis["instantiated_with_id"]: if key not in grandfathered: @@ -827,7 +686,7 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f'"{vendor}/{base_name(name)}": "{expected}", salted if taken)') errors += 1 - # -- 8. triple integrity --------------------------------------------------- + # -- 7. triple integrity --------------------------------------------------- for vendor, rec, fid, triple in sorted( analysis["declarer_triples"], key=lambda x: (x[0], x[1]["file"])): if triple[0] and triple[1]: @@ -860,62 +719,6 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"({detail}); bundles of one product converge on one id only once " f"their triples agree") - # -- 9. succession integrity (ledger-internal) ----------------------------- - live = set(tree_ids) - for fid in sorted(retired): - entry = retired[fid] - if (not isinstance(entry, dict) - or not isinstance(entry.get("claims", []), list) - or not (entry.get("successor") is None - or isinstance(entry.get("successor"), str))): - print_error( - f'retired entry "{fid}" ({RETIRED_REL}) is not of the form ' - f'{{"claims": [...], "successor": }}') - errors += 1 - continue - status, node = follow_succession(entry.get("successor"), {fid}, retired, hints, live) - if status == "cycle": - print_error( - f'succession chain of retired id "{fid}" cycles at "{node}" ({RETIRED_REL})') - errors += 1 - elif status == "dead-end": - print_error( - f'succession chain of retired id "{fid}" dead-ends at "{node}", which is ' - f"neither a live tree id nor retired/hinted ({RETIRED_REL})") - errors += 1 - for key in sorted(hints): - target = hints[key] - _is_reserved, island = reserved_space_owner(key) - if island is None: - print_error( - f'hint key "{key}" ({RETIRED_REL}) is not in an island id space ' - f"(GF*); non-island ids are retired with a successor instead") - errors += 1 - continue - if key in retired: - print_error( - f'hint key "{key}" ({RETIRED_REL}) is also retired; an id is either ' - f"retired (Orca-owned) or hinted (island-owned), never both") - errors += 1 - continue - # A hint key may be absent from the tree (released to its island); when - # live, only island vendors may declare it. - outsiders = sorted( - v for v in analysis["declared_ids"] - if key in analysis["declared_ids"][v] and not is_island_declaration(v, key)) - if outsiders: - print_error( - f'hint key "{key}" ({RETIRED_REL}) is declared by non-island vendor(s) ' - f"{outsiders}; hints apply only once no non-island vendor declares the " - f"id — re-mint those declarers first") - errors += 1 - status, node = follow_succession(target, {key}, retired, hints, live) - if status != "live": - print_error( - f'hint "{key}" -> "{target}" ({RETIRED_REL}) must chain-terminate at a ' - f"live tree id (got {status} at \"{node}\")") - errors += 1 - return errors @@ -924,18 +727,8 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, # --------------------------------------------------------------------------- def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, - retired_path=RETIRED_PATH, allow_shared_catalog=False, - forget_path=None): - """Regenerate the snapshot from the tree; retire ids that fully vanished. - - Vanished ids gain a succession-ledger entry whose successor is picked by - the mode rule over their old claims (None when the family died heirless); - vanished ids in a foreign island's space (GF*) are released with a - hint instead — the island catalog owns them, so they must stay mintable - there and must never be blocked by check 4. - --forget-never-shipped lists ids to drop from lineage instead of retiring - (never shipped => nothing outside the tree references them); succession - chains through them are spliced to their mode-rule successor. + allow_shared_catalog=False): + """Regenerate the snapshot from the tree. Refuses to sanction NEW reserved-namespace ids (or new claims on them) for non-owner vendors unless --allow-shared-catalog is passed. Idempotent: a @@ -948,21 +741,6 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, old_snap = load_snapshot(snapshot_path) old_ids = old_snap["ids"] if old_snap else {} - forget = set() - if forget_path: - data = load_json(forget_path) - if not isinstance(data, list) or not all(isinstance(x, str) for x in data): - print_error(f"--forget-never-shipped expects a JSON list of ids: {forget_path}") - return 1 - forget = set(data) - still_live = sorted(forget & set(new_snap["ids"])) - if still_live: - for fid in still_live: - print_error( - f'--forget-never-shipped: id "{fid}" is still in the tree and can ' - f"neither be forgotten nor retired") - return 1 - # Gate: new reserved-namespace ids / claims for non-owner vendors. refusals = [] for fid, claims in sorted(new_snap["ids"].items()): @@ -990,72 +768,6 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"maintainer-approved shared-catalog families") return 1 - # Retirement is permanent: refuse to sanction a tree that resurrects a - # retired id (check 4 would reject the resulting snapshot forever anyway). - ledger = load_ledger(retired_path) - retired = ledger["retired"] - reused = sorted(set(new_snap["ids"]) & set(retired)) - if reused: - for fid in reused: - print_error( - f'refusing to sanction retired filament_id "{fid}" ' - f"({RETIRED_REL} is append-only; retired ids may " - f"never be reused — mint a fresh id for the family instead)") - return 1 - - # Retire ids that fully vanished from the tree (append-only ledger), with a - # mode-rule successor so devices and user presets keep resolving. Vanished - # ids in a FOREIGN island's reserved space (GF*) are never retired — - # the island's catalog still owns them and may legitimately (re)ship them — - # they are RELEASED, with a succession hint so they keep resolving on miss. - claim_ids = claim_effective_ids(analysis) - newly_retired = [] - forgotten = [] - released = [] - for fid in sorted(old_ids): - if fid in new_snap["ids"]: - continue - if fid in forget: - forgotten.append(fid) - print_info(f'forgotten (never shipped): "{fid}" — no retirement entry') - continue - _is_reserved, island = reserved_space_owner(fid) - if island is not None: - successor, _counts = successor_by_mode(old_ids[fid], claim_ids) - if successor and fid not in ledger["hints"]: - ledger["hints"][fid] = successor - released.append(fid) - print_info( - f'released to the {island} island space: "{fid}"' - + (f' — hint -> "{ledger["hints"][fid]}"' if fid in ledger["hints"] - else " (no successor computable; --add-hint if one is needed)")) - continue - entry = retired.get(fid) - if not isinstance(entry, dict): - successor, counts = successor_by_mode(old_ids[fid], claim_ids) - if len(counts) > 1: - losers = sorted(set(counts) - {successor}) - print_warning( - f'retiring "{fid}": successor "{successor}" won the claim vote ' - f"({counts[successor]}); losing candidate(s): {', '.join(losers)}") - entry = {"claims": list(entry) if entry else [], "successor": successor} - entry["claims"] = sorted(set(entry["claims"]) | set(old_ids[fid])) - retired[fid] = entry - newly_retired.append(fid) - - # Splice succession chains through forgotten ids so they stay live. - spliced = [] - for fid in sorted(retired): - entry = retired[fid] - successor = entry.get("successor") if isinstance(entry, dict) else None - if successor in forget: - new_successor, _counts = successor_by_mode(old_ids.get(successor, []), claim_ids) - entry["successor"] = new_successor - spliced.append(fid) - print_info( - f'spliced succession: "{fid}" -> {json.dumps(new_successor)} ' - f'(through forgotten "{successor}")') - # Diff summary. added_ids = sorted(set(new_snap["ids"]) - set(old_ids)) removed_ids = sorted(set(old_ids) - set(new_snap["ids"])) @@ -1071,22 +783,12 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, changed = new_snap != old_snap if changed: - write_ledger(snapshot_path, new_snap) - if newly_retired or spliced or released or not os.path.exists(retired_path): - write_ledger(retired_path, {"retired": retired, "hints": ledger["hints"]}) + write_snapshot(snapshot_path, new_snap) print_info(f"snapshot ids : {len(new_snap['ids'])} (+{len(added_ids)} / -{len(removed_ids)})") print_info(f"claims added : {added_claims}") print_info(f"claims removed : {removed_claims}") print_info(f"declared triples : {len(new_snap['triples'])}") - print_info(f"ids retired now : {len(newly_retired)}" + - (f" ({', '.join(newly_retired)})" if newly_retired else "")) - if forgotten: - print_info(f"ids forgotten : {len(forgotten)} ({', '.join(forgotten)})") - if released: - print_info(f"ids released : {len(released)} ({', '.join(released)})") - if spliced: - print_info(f"chains spliced : {len(spliced)} ({', '.join(spliced)})") for section in ("instantiated_with_id", "id_overrides", "alias_exceptions", "triple_exceptions"): before, after = len(old_snap.get(section, [])), len(new_snap[section]) @@ -1098,125 +800,6 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, return 0 -def add_hints(pairs, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): - """--add-hint "OLD=NEW": forward an island-space id to a live id. - - OLD must sit in an island id space (GF*), must not be retired, and — - when live in the tree — may be declared only by island vendors (Orca cannot - retire it). An absent OLD is fine: island catalogs own ids Orca never - shipped or has released. NEW must be live in the tree. All pairs validate - before anything is written. Returns 0 on success. - """ - _utf8_console() - analysis = analyze_tree(profiles_dir) - errors = 0 - for msg in analysis["read_errors"]: - print_error(msg) - errors += 1 - ledger = load_ledger(retired_path) - live = set(analysis["ids"]) - parsed = [] - for pair in pairs: - if "=" not in pair: - print_error(f'--add-hint expects "OLD=NEW", got "{pair}"') - errors += 1 - continue - old, new = pair.split("=", 1) - _is_reserved, island = reserved_space_owner(old) - outsiders = sorted( - v for v in analysis["declared_ids"] - if old in analysis["declared_ids"][v] and not is_island_declaration(v, old)) - if old in ledger["retired"]: - print_error(f'--add-hint: "{old}" is retired; its succession entry already forwards it') - errors += 1 - elif island is None: - print_error( - f'--add-hint: "{old}" is not in an island id space (GF*); ' - f"non-island ids are retired with a successor by --update-snapshot") - errors += 1 - elif outsiders: - print_error( - f'--add-hint: "{old}" is declared by non-island vendor(s) {outsiders}; ' - f"hints apply only once no non-island vendor declares the id — re-mint " - f"those declarers first") - errors += 1 - elif new not in live: - print_error(f'--add-hint: target "{new}" is not a live tree id') - errors += 1 - else: - parsed.append((old, new)) - if errors: - return 1 - for old, new in parsed: - ledger["hints"][old] = new - print_info(f'hint added: "{old}" -> "{new}"') - write_ledger(retired_path, {"retired": ledger["retired"], "hints": ledger["hints"]}) - return 0 - - -def retire_ids(pairs, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): - """--retire "OLD=NEW": retire a vanished non-island id with an explicit successor. - - For shipped ids whose lineage the claim vote can no longer see: the id - vanished from the tree in an earlier phase's shadow — another declarer kept - it alive while its claims migrated — so no --update-snapshot run ever saw - the id vanish while its claims could still vote. OLD must be absent from - the tree (declared or effective) and outside every reserved id space - (island ids forward via --add-hint; user-custom ids are never system ids), - and must not already be retired or hinted. NEW must be a live tree id. - Appends {"claims": [], "successor": NEW}. All pairs validate before - anything is written. Returns 0 on success. - """ - _utf8_console() - analysis = analyze_tree(profiles_dir) - errors = 0 - for msg in analysis["read_errors"]: - print_error(msg) - errors += 1 - ledger = load_ledger(retired_path) - live = set(analysis["ids"]) - declared_anywhere = set() - for vids in analysis["declared_ids"].values(): - declared_anywhere |= set(vids) - parsed = [] - for pair in pairs: - if "=" not in pair: - print_error(f'--retire expects "OLD=NEW", got "{pair}"') - errors += 1 - continue - old, new = pair.split("=", 1) - is_reserved, _island = reserved_space_owner(old) - if old in ledger["retired"]: - print_error(f'--retire: "{old}" is already retired') - errors += 1 - elif old in ledger["hints"]: - print_error(f'--retire: "{old}" is a hint key; it already forwards') - errors += 1 - elif is_reserved: - print_error( - f'--retire: "{old}" sits in a reserved id space; island ids ' - f"forward via --add-hint, user-custom ids are never retired") - errors += 1 - elif old in live or old in declared_anywhere: - print_error( - f'--retire: "{old}" still lives in the tree; re-mint or delete ' - f"its declarers first (an id that vanishes normally gets its " - f"successor voted by --update-snapshot)") - errors += 1 - elif new not in live: - print_error(f'--retire: successor "{new}" is not a live tree id') - errors += 1 - else: - parsed.append((old, new)) - if errors: - return 1 - for old, new in parsed: - ledger["retired"][old] = {"claims": [], "successor": new} - print_info(f'retired: "{old}" -> "{new}"') - write_ledger(retired_path, {"retired": ledger["retired"], "hints": ledger["hints"]}) - return 0 - - # --------------------------------------------------------------------------- # Byte-preserving profile edits # --------------------------------------------------------------------------- @@ -1313,8 +896,7 @@ def remove_filament_id(path, old_id): # Default run: mint + insert ids for id-less families # --------------------------------------------------------------------------- -def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, - retired_path=RETIRED_PATH): +def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): """Mint + insert ids for id-less families. Never rewrites a valid existing id. A family = (vendor, base name) group over instantiated filaments with no @@ -1346,9 +928,9 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, "nothing to do (0 files changed)") return 0, errors - # Ids already spoken for: whole tree (declared or effective) + ledgers. + # Ids already spoken for: the whole tree (declared or effective) + snapshot. snapshot = load_snapshot(snapshot_path) or {"ids": {}} - taken = set(snapshot["ids"]) | set(load_retired(retired_path)) + taken = set(snapshot["ids"]) for occurring in analysis["vendor_ids"].values(): taken |= occurring @@ -1427,7 +1009,7 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, # --remint / --drop-redundant-ids (v3.1/v3.2 migration modes) # --------------------------------------------------------------------------- -def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR, retired_path=RETIRED_PATH): +def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR): """Re-derive every non-island declared id in the given vendors from its triple; rewrite mismatching declarations in place (byte-preserving). Never touches the snapshot — run --update-snapshot afterwards and review the diff. @@ -1435,8 +1017,8 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR, retired_path=RETIRED_ A declaration already equal to ANY salt iteration of its own triple is mint-conformant (check 3) and left alone — deliberate salt splits (distinct presets of one product kept apart for per-printer AMS matching) survive. - A candidate id is blocked when it is a retired key, a hints key, or occurs - in the tree with any triple set other than exactly {T}. Equal-triple reuse + A candidate id is blocked when it occurs in the tree with any triple set + other than exactly {T}. Equal-triple reuse is convergence: the same product must end up under the same id everywhere. Returns (rewritten, errors). """ @@ -1455,8 +1037,6 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR, retired_path=RETIRED_ print_error(f"--remint: unknown vendor {v!r}") return 0, errors + len(unknown) - ledger = load_ledger(retired_path) - blocked_keys = set(ledger["retired"]) | set(ledger["hints"]) occurring = set() for vids in analysis["vendor_ids"].values(): occurring |= vids @@ -1470,8 +1050,6 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR, retired_path=RETIRED_ return assigned[triple] for salt in range(10000): cand = generate_filament_id(*triple, salt=salt) - if cand in blocked_keys: - continue if cand in occurring and triple_sets.get(cand, set()) != {triple}: continue if run_taken.get(cand, triple) != triple: @@ -1570,27 +1148,13 @@ def main(argv=None): help="print the id the (filament_vendor, filament_type, " "family name) triple would mint; touches nothing") parser.add_argument("--update-snapshot", action="store_true", - help="regenerate scripts/filament_id_snapshot.json from the " - "tree; ids that fully vanished are retired with a " - "mode-rule successor") + help="regenerate scripts/filament_id_snapshot.json from " + "the tree") parser.add_argument("--check", action="store_true", help="run the filament_id checks; exit nonzero on errors") parser.add_argument("--allow-shared-catalog", action="store_true", help="with --update-snapshot: allow sanctioning new claims " "on reserved-namespace ids for non-owner vendors") - parser.add_argument("--forget-never-shipped", metavar="JSON_FILE", - help="with --update-snapshot: vanished ids listed in the file " - "(JSON list) are dropped without a retirement entry and " - "succession chains are spliced through them; refused if " - "a listed id is still in the tree") - parser.add_argument("--add-hint", metavar='"OLD=NEW"', action="append", - help="record a cross-island succession hint (island-owned " - "live id -> live id) in the shipped ledger; standalone, " - "repeatable") - parser.add_argument("--retire", metavar='"OLD=NEW"', action="append", - help="retire a vanished non-island shipped id with an " - "explicit successor (for lineage the claim vote can " - "no longer see); standalone, repeatable") parser.add_argument("--remint", metavar="VENDOR", action="append", help="re-derive VENDOR's declared filament_ids from their " "triples and rewrite mismatches in place; repeatable") @@ -1602,35 +1166,22 @@ def main(argv=None): help="profiles directory (default: resources/profiles)") args = parser.parse_args(argv) - if args.forget_never_shipped and not args.update_snapshot: - parser.error("--forget-never-shipped requires --update-snapshot") if args.mint: parts = args.mint.split("/", 2) if len(parts) != 3 or not all(parts): parser.error('--mint expects "filament_vendor/filament_type/family_name" ' - "with all three components non-empty (check 8 rejects empty " + "with all three components non-empty (check 7 rejects empty " "vendor/type in the tree)") snapshot = load_snapshot(SNAPSHOT_PATH) or {"ids": {}} - taken = set(snapshot["ids"]) | set(load_retired(RETIRED_PATH)) + taken = set(snapshot["ids"]) print(mint_filament_id(parts[0], parts[1], parts[2], taken)) return 0 - if args.add_hint: - if (args.update_snapshot or args.check or args.remint - or args.drop_redundant_ids or args.retire): - parser.error("--add-hint runs standalone") - return add_hints(args.add_hint, args.profiles, RETIRED_PATH) - - if args.retire: - if args.update_snapshot or args.check or args.remint or args.drop_redundant_ids: - parser.error("--retire runs standalone") - return retire_ids(args.retire, args.profiles, RETIRED_PATH) - if args.remint: if args.update_snapshot or args.check or args.drop_redundant_ids: parser.error("--remint cannot be combined with other modes") - _changed, errors = remint_vendors(args.remint, args.profiles, RETIRED_PATH) + _changed, errors = remint_vendors(args.remint, args.profiles) return 1 if errors else 0 if args.drop_redundant_ids: @@ -1640,19 +1191,18 @@ def main(argv=None): return 1 if errors else 0 if args.update_snapshot: - return update_snapshot(args.profiles, SNAPSHOT_PATH, RETIRED_PATH, - allow_shared_catalog=args.allow_shared_catalog, - forget_path=args.forget_never_shipped) + return update_snapshot(args.profiles, SNAPSHOT_PATH, + allow_shared_catalog=args.allow_shared_catalog) if args.check: - errors = check_filament_ids(args.profiles, SNAPSHOT_PATH, RETIRED_PATH) + errors = check_filament_ids(args.profiles, SNAPSHOT_PATH) if errors: print_error(f"filament_id check: {errors} error(s)") return 1 print_success("filament_id check: no errors") return 0 - _changed, errors = assign_missing_ids(args.profiles, SNAPSHOT_PATH, RETIRED_PATH) + _changed, errors = assign_missing_ids(args.profiles, SNAPSHOT_PATH) return 1 if errors else 0 diff --git a/scripts/check_profile.ps1 b/scripts/check_profile.ps1 index 9c9bb6c506..66ed33c31d 100644 --- a/scripts/check_profile.ps1 +++ b/scripts/check_profile.ps1 @@ -187,7 +187,7 @@ $ProfilesDir = (Resolve-Path -LiteralPath $ProfilesDir).Path # validator compares the .json stem case-sensitively, while Windows' case-insensitive # filesystem would let "creality" pass a path test and then match no vendor. A vendor is a # .json with a sibling directory; that pair is also what tells one apart from -# blacklist.json and retired_filament_ids.json, which sit in the same folder. +# blacklist.json, which sits in the same folder. if ($Vendor) { $found = $false $suggestion = '' diff --git a/scripts/check_profile.sh b/scripts/check_profile.sh index cb56258c9f..51c8599b60 100755 --- a/scripts/check_profile.sh +++ b/scripts/check_profile.sh @@ -138,7 +138,7 @@ PROFILES_DIR="$(cd -- "${PROFILES_DIR}" && pwd)" # validator compares the .json stem case-sensitively, while a case-insensitive filesystem # (macOS, Windows) would let "creality" pass a file test and then match no vendor. A vendor is a # .json with a sibling / directory; that pair is also what tells one apart from -# blacklist.json and retired_filament_ids.json, which sit in the same folder. +# blacklist.json, which sits in the same folder. if [ -n "${VENDOR}" ]; then wanted="$(printf '%s' "${VENDOR}" | tr '[:upper:]' '[:lower:]')" found="" diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index 41df9c582e..ef61992784 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -54,14 +54,13 @@ def preset(name, filament_id=None, inherits=None, instantiation=True, class SyntheticTree: - """A throwaway resources/profiles-shaped directory plus ledger paths.""" + """A throwaway resources/profiles-shaped directory plus a snapshot path.""" def __init__(self): self.dir = tempfile.mkdtemp(prefix="filament_id_test_") self.profiles = os.path.join(self.dir, "profiles") os.makedirs(self.profiles) self.snapshot = os.path.join(self.dir, "filament_id_snapshot.json") - self.retired = os.path.join(self.dir, "retired_filament_ids.json") def cleanup(self): shutil.rmtree(self.dir, ignore_errors=True) @@ -109,37 +108,31 @@ class SyntheticTree: with open(idx_path, "w", encoding="utf-8") as f: json.dump(index, f, indent=4, ensure_ascii=False) - def write_ledger(self, retired=None, hints=None): - afi.write_ledger(self.retired, {"retired": retired or {}, - "hints": hints or {}}) - # -- pipeline wrappers --------------------------------------------------- - def update_snapshot(self, allow_shared_catalog=False, forget_path=None): + def update_snapshot(self, allow_shared_catalog=False): buf = io.StringIO() with contextlib.redirect_stdout(buf): - rc = afi.update_snapshot(self.profiles, self.snapshot, self.retired, - allow_shared_catalog=allow_shared_catalog, - forget_path=forget_path) + rc = afi.update_snapshot(self.profiles, self.snapshot, + allow_shared_catalog=allow_shared_catalog) return rc, buf.getvalue() def check(self): buf = io.StringIO() with contextlib.redirect_stdout(buf): - errors = afi.check_filament_ids(self.profiles, self.snapshot, self.retired) + errors = afi.check_filament_ids(self.profiles, self.snapshot) return errors, buf.getvalue() def assign(self): buf = io.StringIO() with contextlib.redirect_stdout(buf): - changed, errors = afi.assign_missing_ids(self.profiles, self.snapshot, - self.retired) + changed, errors = afi.assign_missing_ids(self.profiles, self.snapshot) return changed, errors, buf.getvalue() def remint(self, vendors): buf = io.StringIO() with contextlib.redirect_stdout(buf): - changed, errors = afi.remint_vendors(vendors, self.profiles, self.retired) + changed, errors = afi.remint_vendors(vendors, self.profiles) return changed, errors, buf.getvalue() def drop_redundant(self, vendor): @@ -148,19 +141,6 @@ class SyntheticTree: dropped, errors = afi.drop_redundant_ids(vendor, self.profiles) return dropped, errors, buf.getvalue() - def add_hint(self, pairs): - buf = io.StringIO() - with contextlib.redirect_stdout(buf): - rc = afi.add_hints(pairs, self.profiles, self.retired) - return rc, buf.getvalue() - - def retire(self, pairs): - buf = io.StringIO() - with contextlib.redirect_stdout(buf): - rc = afi.retire_ids(pairs, self.profiles, self.retired) - return rc, buf.getvalue() - - def make_clean_tree(): """Baseline tree: OFL base+generic, a vendor family, a clean tuned generic.""" t = SyntheticTree() @@ -196,7 +176,7 @@ class SyntheticTreeCase(unittest.TestCase): class TestMint(unittest.TestCase): def test_namespace_literal(self): - # Frozen: derived from the setting_id namespace; baked into the ledger. + # Frozen: derived from the setting_id namespace; baked into the snapshot. self.assertEqual(afi.FILAMENT_ID_NAMESPACE, uuid.UUID("c4d3ff49-4c32-5534-a3e3-00894157ab97")) @@ -401,7 +381,7 @@ class TestTripleResolution(unittest.TestCase): class TestReservedSpaces(unittest.TestCase): def test_owners(self): self.assertEqual(afi.reserved_space_owner("GFL99"), (True, "BBL")) - # dissolved island (plan v4): reserved, but no vendor may declare it + # Qidi device protocol: reserved, but no vendor may declare it self.assertEqual(afi.reserved_space_owner("QD_X4_PLA"), (True, None)) self.assertEqual(afi.reserved_space_owner("P1234abc"), (True, None)) self.assertEqual(afi.reserved_space_owner("pAbCdEf1"), (True, None)) # case-insensitive @@ -412,7 +392,7 @@ class TestReservedSpaces(unittest.TestCase): def test_island_declarations(self): self.assertTrue(afi.is_island_declaration("BBL", "GFL99")) self.assertTrue(afi.is_island_declaration("BBL", "OF5CgdDq")) - # dissolved island (plan v4): Qidi declarations mint like any other + # Qidi presets mint like any other vendor's: self.assertFalse(afi.is_island_declaration("Qidi", "QD_X4_PLA")) self.assertFalse(afi.is_island_declaration("Qidi", "OF5CgdDq")) self.assertFalse(afi.is_island_declaration("VendorA", "GFL99")) @@ -503,15 +483,7 @@ class TestChecks(SyntheticTreeCase): errors, out = self.t.check() self.assertEqual(errors, 0, out) - def test_check4_retired_id_reuse(self): - self.t.write_ledger(retired={"AX01": {"claims": ["VendorA/APLA"], - "successor": None}}) - errors, out = self.t.check() - self.assertGreater(errors, 0) - self.assertIn("retired", out) - self.assertIn("AX01", out) - - def test_check5_renamed_tuned_generic(self): + def test_check4_renamed_tuned_generic(self): self.t.write_preset("VendorA", preset("Tuned PLA @P1", inherits="Generic PLA @System", compatible_printers=["P1"])) @@ -520,7 +492,7 @@ class TestChecks(SyntheticTreeCase): self.assertIn("rename re-exposes the OFL preset", out) self.assertIn("Tuned PLA @P1", out) - def test_check5_empty_compatible_printers(self): + def test_check4_empty_compatible_printers(self): self.t.write_preset("VendorA", preset("Generic PLA @P2", inherits="Generic PLA @System", compatible_printers=[])) @@ -528,7 +500,7 @@ class TestChecks(SyntheticTreeCase): self.assertGreater(errors, 0) self.assertIn("cannot shadow the OFL preset", out) - def test_check5_own_id_key_on_ofl_rider(self): + def test_check4_own_id_key_on_ofl_rider(self): # A vendor root that declares its own id while inheriting an OFL family # forks the family off the catalog id. self.t.write_preset("VendorA", preset("GPLA @base", filament_id="AX77", @@ -540,7 +512,7 @@ class TestChecks(SyntheticTreeCase): self.assertGreater(errors, 0) self.assertIn('declares its own filament_id "AX77"', out) - def test_check5_applies_to_non_generic_ofl_families(self): + def test_check4_applies_to_non_generic_ofl_families(self): fid = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA") self.t.write_preset(OFL, preset("poly_pla_base", filament_id=fid, instantiation=False, @@ -559,7 +531,7 @@ class TestChecks(SyntheticTreeCase): self.assertIn("rename re-exposes the OFL preset", out) self.assertIn("PolyX PLA @P1", out) - def test_check5_exception_is_grandfathered(self): + def test_check4_exception_is_grandfathered(self): self.t.write_preset("VendorA", preset("Tuned PLA @P1", inherits="Generic PLA @System", compatible_printers=["P1"])) @@ -568,9 +540,9 @@ class TestChecks(SyntheticTreeCase): errors, out = self.t.check() self.assertEqual(errors, 0, out) - def test_check6_reserved_namespace_claims(self): + def test_check5_reserved_namespace_claims(self): for fid, marker in [("GFX99", "owned by BBL"), - ("QD_X_PLA", "dissolved island"), + ("QD_X_PLA", "composed by the device"), ("P1a2b3c4", "user-custom"), ("null", "user-custom")]: with self.subTest(fid=fid): @@ -586,7 +558,7 @@ class TestChecks(SyntheticTreeCase): self.assertIn("reserved id space", out) self.assertIn(marker, out) - def test_check7a_instantiated_preset_with_own_key(self): + def test_check6a_instantiated_preset_with_own_key(self): self.t.write_preset("VendorA", preset("APLA @P1", filament_id="AX01", inherits="APLA @base", compatible_printers=["P1 0.4 nozzle"]), @@ -595,7 +567,7 @@ class TestChecks(SyntheticTreeCase): self.assertGreater(errors, 0) self.assertIn("declares its own filament_id key", out) - def test_check7b_declared_vs_inherited_drift(self): + def test_check6b_declared_vs_inherited_drift(self): self.t.write_preset("VendorA", preset("APLA @P1", filament_id="AX02", inherits="APLA @base", compatible_printers=["P1 0.4 nozzle"]), @@ -604,7 +576,7 @@ class TestChecks(SyntheticTreeCase): self.assertGreater(errors, 0) self.assertIn('declares filament_id "AX02" but its inherits chain resolves "AX01"', out) - def test_check7c_unresolvable_instantiated_filament(self): + def test_check6c_unresolvable_instantiated_filament(self): self.t.write_preset("VendorA", preset("DNEW @P1", compatible_printers=["P1"])) errors, out = self.t.check() self.assertGreater(errors, 0) @@ -618,8 +590,8 @@ class TestChecks(SyntheticTreeCase): self.assertIn("snapshot not found", out) -class TestCheck8(SyntheticTreeCase): - def test_8a_empty_vendor_is_hard_error(self): +class TestCheck7(SyntheticTreeCase): + def test_7a_empty_vendor_is_hard_error(self): fid = afi.generate_filament_id("", "PLA", "NVPLA") self.t.write_preset("VendorA", preset("NVPLA @base", filament_id=fid, instantiation=False, @@ -637,7 +609,7 @@ class TestCheck8(SyntheticTreeCase): self.assertEqual(errors, 1, out) self.assertIn("resolves empty filament_vendor", out) - def test_8b_divergent_family_triples(self): + def test_7b_divergent_family_triples(self): id1 = afi.generate_filament_id("MV", "PLA", "MPLA") id2 = afi.generate_filament_id("MV", "PETG", "MPLA") self.t.write_preset("VendorA", preset("MPLA @base1", filament_id=id1, @@ -660,7 +632,7 @@ class TestCheck8(SyntheticTreeCase): errors, out = self.t.check() self.assertEqual(errors, 0, out) - def test_8_cross_bundle_divergence_is_warning_only(self): + def test_7_cross_bundle_divergence_is_warning_only(self): fid = afi.generate_filament_id("BV", "PETG", "APLA") self.t.add_vendor("VendorB", [ preset("APLA @base", filament_id=fid, instantiation=False, @@ -677,125 +649,6 @@ class TestCheck8(SyntheticTreeCase): self.assertIn('"APLA"', out) -class TestCheck9(SyntheticTreeCase): - def test_ok_chain_null_and_live(self): - self.t.write_ledger(retired={ - "R1": {"claims": ["VendorA/Gone1"], "successor": "AX01"}, - "R2": {"claims": ["VendorA/Gone2"], "successor": "R1"}, - "R3": {"claims": ["VendorA/Gone3"], "successor": None}, - }) - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - - def test_cycle_is_an_error(self): - self.t.write_ledger(retired={ - "C1": {"claims": [], "successor": "C2"}, - "C2": {"claims": [], "successor": "C1"}, - }) - errors, out = self.t.check() - self.assertEqual(errors, 2, out) - self.assertIn("cycles", out) - - def test_dead_end_is_an_error(self): - self.t.write_ledger(retired={ - "D1": {"claims": [], "successor": "OFnope99"}, - }) - errors, out = self.t.check() - self.assertEqual(errors, 1, out) - self.assertIn("dead-ends", out) - self.assertIn("OFnope99", out) - - def test_hint_key_must_be_in_island_space(self): - self.t.write_ledger(hints={"AX01": "OGFL99"}) - errors, out = self.t.check() - self.assertEqual(errors, 1, out) - self.assertIn("not in an island id space", out) - - def test_hint_key_may_be_absent_island_id(self): - # Released / never-shipped island-catalog ids are valid hint keys. - self.t.write_ledger(hints={"GFXX99": "AX01"}) - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - - def test_hint_key_must_not_be_retired_too(self): - self.t.write_ledger(retired={"GFXX99": {"claims": [], "successor": "AX01"}}, - hints={"GFXX99": "AX01"}) - errors, out = self.t.check() - self.assertEqual(errors, 1, out) - self.assertIn("never both", out) - - def test_live_hint_key_with_non_island_declarer_is_an_error(self): - self.t.write_preset("VendorA", preset( - "GPLA @base", filament_id="GFZZ01", instantiation=False, - filament_vendor="Generic", filament_type="PLA")) - self.t.write_preset("VendorA", preset( - "GPLA @P1", inherits="GPLA @base", - compatible_printers=["P1 0.4 nozzle"])) - rc, _out = self.t.update_snapshot(allow_shared_catalog=True) - self.assertEqual(rc, 0) - self.t.write_ledger(hints={"GFZZ01": "AX01"}) - errors, out = self.t.check() - self.assertEqual(errors, 1, out) - self.assertIn("re-mint those declarers first", out) - - def test_island_hint_ok_and_value_must_chain_live(self): - self.t.add_vendor("BBL", [ - preset("BPLA @base", filament_id="GFB01", instantiation=False), - preset("BPLA @X1C", inherits="BPLA @base", - compatible_printers=["X1C 0.4 nozzle"]), - ]) - rc, _out = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.t.write_ledger(hints={"GFB01": "AX01"}) - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - # A hint chain ending on a null retirement is dead for the runtime. - self.t.write_ledger(retired={"R9": {"claims": [], "successor": None}}, - hints={"GFB01": "R9"}) - errors, out = self.t.check() - self.assertEqual(errors, 1, out) - self.assertIn("chain-terminate at a live tree id", out) - - -# --------------------------------------------------------------------------- -# successor mode rule + ledger schema migration -# --------------------------------------------------------------------------- - -class TestSuccessorMode(unittest.TestCase): - def test_majority_wins(self): - claim_ids = {"V/A": {"ID1"}, "V/B": {"ID1"}, "V/C": {"ID2"}} - succ, counts = afi.successor_by_mode(["V/A", "V/B", "V/C"], claim_ids) - self.assertEqual(succ, "ID1") - self.assertEqual(counts, {"ID1": 2, "ID2": 1}) - - def test_tie_breaks_lexicographically(self): - claim_ids = {"V/A": {"IDB"}, "V/B": {"IDA"}} - succ, counts = afi.successor_by_mode(["V/A", "V/B"], claim_ids) - self.assertEqual(succ, "IDA") - self.assertEqual(counts, {"IDA": 1, "IDB": 1}) - - def test_no_surviving_family_means_null(self): - self.assertEqual(afi.successor_by_mode(["V/GONE"], {}), (None, {})) - self.assertEqual(afi.successor_by_mode([], {"V/A": {"ID1"}}), (None, {})) - - -class TestLedgerMigration(SyntheticTreeCase): - def test_backfill_successors_via_mode_rule(self): - analysis = afi.analyze_tree(self.t.profiles) - claim_ids = afi.claim_effective_ids(analysis) - old = { - "X9": ["VendorA/APLA"], # family lives on - "Y9": ["VendorA/GONE"], # family died - "Z9": {"claims": ["kept"], "successor": "AX01"}, # already migrated - } - migrated = afi.migrate_retired_entries(old, claim_ids) - self.assertEqual(migrated["X9"], - {"claims": ["VendorA/APLA"], "successor": "AX01"}) - self.assertEqual(migrated["Y9"], - {"claims": ["VendorA/GONE"], "successor": None}) - self.assertEqual(migrated["Z9"], old["Z9"]) - - # --------------------------------------------------------------------------- # --update-snapshot # --------------------------------------------------------------------------- @@ -820,108 +673,6 @@ class TestUpdateSnapshot(SyntheticTreeCase): self.assertEqual(snap["triples"]["OGFL99"], [["Generic", "PLA", "fdm_pla"]]) self.assertEqual(snap["triple_exceptions"], []) - def test_vanished_island_id_released_with_hint_not_retired(self): - self.t.write_preset("VendorA", preset( - "GPLA @base", filament_id="GFZZ01", instantiation=False, - filament_vendor="Generic", filament_type="PLA")) - self.t.write_preset("VendorA", preset( - "GPLA @P1", inherits="GPLA @base", - compatible_printers=["P1 0.4 nozzle"])) - rc, _out = self.t.update_snapshot(allow_shared_catalog=True) - self.assertEqual(rc, 0) - # The family re-mints away from the island id: released, not retired. - self.t.write_preset("VendorA", preset( - "GPLA @base", filament_id="OFaaaaaa", instantiation=False, - filament_vendor="Generic", filament_type="PLA"), register=False) - rc, out = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.assertIn("released to the BBL island space", out) - ledger = afi.load_ledger(self.t.retired) - self.assertNotIn("GFZZ01", ledger["retired"]) - self.assertEqual(ledger["hints"].get("GFZZ01"), "OFaaaaaa") - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - # The island may legitimately (re)ship a released id later. - self.t.add_vendor("BBL", [ - preset("BPLA @base", filament_id="GFZZ01", instantiation=False), - preset("BPLA @X1C", inherits="BPLA @base", - compatible_printers=["X1C 0.4 nozzle"]), - ]) - rc, _out = self.t.update_snapshot() - self.assertEqual(rc, 0) - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - - def test_vanished_id_is_retired_with_null_successor(self): - self.t.remove_preset("VendorA", "APLA @base") - self.t.remove_preset("VendorA", "APLA @P1") - rc, out = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.assertIn("AX01", out) - retired = load_json_file(self.t.retired)["retired"] - self.assertEqual(retired, - {"AX01": {"claims": ["VendorA/APLA"], "successor": None}}) - snap = load_json_file(self.t.snapshot) - self.assertNotIn("AX01", snap["ids"]) - self.assertNotIn("AX01", snap["triples"]) - # append-only + idempotent: a second run keeps the ledger intact - rc, out = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.assertIn("nothing changed", out) - self.assertEqual(retired, load_json_file(self.t.retired)["retired"]) - # ... and a retired id may never be minted again - self.assertNotIn(afi.mint_filament_id("AVendor", "PLA", "APLA", - set(retired)), retired) - - def test_vanished_id_successor_follows_surviving_family(self): - # The family lives on under a new id (a re-mint): the mode rule finds it. - self.t.write_preset("VendorA", preset("APLA @base", filament_id="AXNEW", - instantiation=False, - filament_vendor="AVendor", - filament_type="PLA"), - register=False) - rc, out = self.t.update_snapshot() - self.assertEqual(rc, 0) - retired = load_json_file(self.t.retired)["retired"] - self.assertEqual(retired["AX01"], - {"claims": ["VendorA/APLA"], "successor": "AXNEW"}) - - def test_multi_candidate_retirement_warns_and_ties_break(self): - self.t.write_preset("VendorA", preset("SHRD @base", filament_id="SH01", - instantiation=False, - filament_vendor="SV", - filament_type="PLA")) - self.t.write_preset("VendorA", preset("CH1 @P1", inherits="SHRD @base", - compatible_printers=["P1"])) - self.t.write_preset("VendorA", preset("CH2 @P1", inherits="SHRD @base", - compatible_printers=["P1"])) - rc, _out = self.t.update_snapshot() - self.assertEqual(rc, 0) - # Split the two families onto their own roots and drop the shared id. - self.t.write_preset("VendorA", preset("CH1 @base", filament_id="SA01", - instantiation=False, - filament_vendor="SV", - filament_type="PLA")) - self.t.write_preset("VendorA", preset("CH2 @base", filament_id="SB01", - instantiation=False, - filament_vendor="SV", - filament_type="PLA")) - self.t.write_preset("VendorA", preset("CH1 @P1", inherits="CH1 @base", - compatible_printers=["P1"]), - register=False) - self.t.write_preset("VendorA", preset("CH2 @P1", inherits="CH2 @base", - compatible_printers=["P1"]), - register=False) - self.t.remove_preset("VendorA", "SHRD @base") - rc, out = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.assertIn("[WARNING]", out) - self.assertIn("SB01", out) # the losing candidate is named - retired = load_json_file(self.t.retired)["retired"] - self.assertEqual(retired["SH01"]["successor"], "SA01") - self.assertEqual(retired["SH01"]["claims"], - ["VendorA/CH1", "VendorA/CH2"]) - def test_refuses_new_reserved_namespace_claims(self): self.t.write_preset("VendorA", preset("CNEW @base", filament_id="GFX99", instantiation=False, @@ -942,181 +693,6 @@ class TestUpdateSnapshot(SyntheticTreeCase): self.assertEqual(snap["ids"]["GFX99"], ["VendorA/CNEW"]) -class TestForgetNeverShipped(SyntheticTreeCase): - def forget_file(self, ids): - path = os.path.join(self.t.dir, "forget.json") - with open(path, "w", encoding="utf-8") as f: - json.dump(ids, f) - return path - - def test_refuses_when_listed_id_is_live(self): - with open(self.t.snapshot, "rb") as f: - before = f.read() - rc, out = self.t.update_snapshot(forget_path=self.forget_file(["AX01"])) - self.assertEqual(rc, 1) - self.assertIn("still in the tree", out) - with open(self.t.snapshot, "rb") as f: - self.assertEqual(f.read(), before) - - def test_forgotten_id_is_not_retired(self): - self.t.write_preset("VendorA", preset("ZN @base", filament_id="Y999", - instantiation=False, - filament_vendor="ZV", - filament_type="PLA")) - self.t.write_preset("VendorA", preset("ZN @P1", inherits="ZN @base", - compatible_printers=["P1"])) - rc, _out = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.t.remove_preset("VendorA", "ZN @base") - self.t.remove_preset("VendorA", "ZN @P1") - rc, out = self.t.update_snapshot(forget_path=self.forget_file(["Y999"])) - self.assertEqual(rc, 0) - self.assertIn("forgotten (never shipped)", out) - self.assertNotIn("Y999", load_json_file(self.t.retired)["retired"]) - self.assertNotIn("Y999", load_json_file(self.t.snapshot)["ids"]) - - def test_splices_chains_through_forgotten_id(self): - self.t.write_preset("VendorA", preset("ZN @base", filament_id="Y999", - instantiation=False, - filament_vendor="ZV", - filament_type="PLA")) - self.t.write_preset("VendorA", preset("ZN @P1", inherits="ZN @base", - compatible_printers=["P1"])) - rc, _out = self.t.update_snapshot() - self.assertEqual(rc, 0) - # A shipped id already forwards to Y999, which turns out never shipped. - self.t.write_ledger(retired={ - "OLD1": {"claims": ["VendorA/ZN"], "successor": "Y999"}}) - # The family re-mints to NEWZ and Y999 vanishes. - self.t.write_preset("VendorA", preset("ZN @base", filament_id="NEWZ", - instantiation=False, - filament_vendor="ZV", - filament_type="PLA"), - register=False) - rc, out = self.t.update_snapshot(forget_path=self.forget_file(["Y999"])) - self.assertEqual(rc, 0) - self.assertIn("spliced succession", out) - retired = load_json_file(self.t.retired)["retired"] - self.assertNotIn("Y999", retired) - self.assertEqual(retired["OLD1"], - {"claims": ["VendorA/ZN"], "successor": "NEWZ"}) - - -# --------------------------------------------------------------------------- -# --add-hint -# --------------------------------------------------------------------------- - -class TestAddHint(SyntheticTreeCase): - def add_bbl(self): - self.t.add_vendor("BBL", [ - preset("BPLA @base", filament_id="GFB01", instantiation=False), - preset("BPLA @X1C", inherits="BPLA @base", - compatible_printers=["X1C 0.4 nozzle"]), - ]) - rc, _out = self.t.update_snapshot() - assert rc == 0 - - def test_adds_island_hint(self): - self.add_bbl() - rc, out = self.t.add_hint(["GFB01=AX01"]) - self.assertEqual(rc, 0, out) - self.assertEqual(load_json_file(self.t.retired)["hints"], - {"GFB01": "AX01"}) - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - - def test_rejects_non_island_old(self): - rc, out = self.t.add_hint(["AX01=OGFL99"]) - self.assertEqual(rc, 1) - self.assertIn("not in an island id space", out) - self.assertEqual(afi.load_ledger(self.t.retired)["hints"], {}) - - def test_accepts_absent_island_old(self): - # Island catalogs own ids Orca never shipped (or has released). - rc, out = self.t.add_hint(["GFXX99=AX01"]) - self.assertEqual(rc, 0, out) - self.assertEqual(load_json_file(self.t.retired)["hints"], - {"GFXX99": "AX01"}) - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - - def test_rejects_retired_old(self): - self.t.write_ledger(retired={"ROLD": {"claims": [], "successor": None}}) - rc, out = self.t.add_hint(["ROLD=AX01"]) - self.assertEqual(rc, 1) - self.assertIn("is retired", out) - - def test_rejects_dead_target(self): - self.add_bbl() - rc, out = self.t.add_hint(["GFB01=OFnope99"]) - self.assertEqual(rc, 1) - self.assertIn("not a live tree id", out) - - def test_rejects_malformed_pair(self): - rc, out = self.t.add_hint(["GFB01"]) - self.assertEqual(rc, 1) - self.assertIn('expects "OLD=NEW"', out) - - -class TestRetire(SyntheticTreeCase): - def test_retires_vanished_id_with_successor(self): - rc, out = self.t.retire(["OFOLD001=AX01"]) - self.assertEqual(rc, 0, out) - self.assertEqual(load_json_file(self.t.retired)["retired"]["OFOLD001"], - {"claims": [], "successor": "AX01"}) - errors, out = self.t.check() - self.assertEqual(errors, 0, out) - - def test_rejects_live_old(self): - rc, out = self.t.retire(["AX01=OGFL99"]) - self.assertEqual(rc, 1) - self.assertIn("still lives in the tree", out) - self.assertEqual(afi.load_ledger(self.t.retired)["retired"], {}) - - def test_rejects_declaration_only_old(self): - # The inert-fork case: an id declared by a claim-less root still lives - # in the tree; the declaration must be deleted before --retire. - self.t.write_preset("VendorA", preset("ZOLD @base", filament_id="ZDECL01", - instantiation=False, - filament_vendor="ZV", - filament_type="PLA")) - rc, out = self.t.retire(["ZDECL01=AX01"]) - self.assertEqual(rc, 1) - self.assertIn("still lives in the tree", out) - - def test_rejects_island_space_old(self): - rc, out = self.t.retire(["GFXX99=AX01"]) - self.assertEqual(rc, 1) - self.assertIn("reserved id space", out) - - def test_rejects_user_space_old(self): - rc, out = self.t.retire(["P1234ABC=AX01"]) - self.assertEqual(rc, 1) - self.assertIn("reserved id space", out) - - def test_rejects_already_retired_old(self): - self.t.write_ledger(retired={"ROLD": {"claims": [], "successor": None}}) - rc, out = self.t.retire(["ROLD=AX01"]) - self.assertEqual(rc, 1) - self.assertIn("already retired", out) - - def test_rejects_hinted_old(self): - self.t.write_ledger(hints={"HOLD": "AX01"}) - rc, out = self.t.retire(["HOLD=AX01"]) - self.assertEqual(rc, 1) - self.assertIn("hint key", out) - - def test_rejects_dead_successor(self): - rc, out = self.t.retire(["OFOLD001=OFnope99"]) - self.assertEqual(rc, 1) - self.assertIn("not a live tree id", out) - - def test_rejects_malformed_pair(self): - rc, out = self.t.retire(["OFOLD001"]) - self.assertEqual(rc, 1) - self.assertIn('expects "OLD=NEW"', out) - - # --------------------------------------------------------------------------- # default run: mint + insert # --------------------------------------------------------------------------- @@ -1373,24 +949,6 @@ class TestRemint(SyntheticTreeCase): a = load_json_file(self.t.preset_path("VendorA", "APLA @base")) self.assertEqual(a["filament_id"], want) - def test_blocked_by_retired_id(self): - want0 = afi.generate_filament_id(*self.TRIPLE) - self.t.write_ledger(retired={want0: {"claims": [], "successor": None}}) - changed, errors, _out = self.t.remint(["VendorA"]) - self.assertEqual((changed, errors), (1, 0)) - root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) - self.assertEqual(root["filament_id"], - afi.generate_filament_id(*self.TRIPLE, salt=1)) - - def test_blocked_by_hint_key(self): - want0 = afi.generate_filament_id(*self.TRIPLE) - self.t.write_ledger(hints={want0: "AX01"}) - changed, errors, _out = self.t.remint(["VendorA"]) - self.assertEqual((changed, errors), (1, 0)) - root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) - self.assertEqual(root["filament_id"], - afi.generate_filament_id(*self.TRIPLE, salt=1)) - def test_blocked_by_other_triple_occurrence(self): want0 = afi.generate_filament_id(*self.TRIPLE) self.t.add_vendor("VendorB", [ @@ -1481,63 +1039,11 @@ class TestRealTree(unittest.TestCase): self.assertEqual(analysis["missing_effective"], []) self.assertEqual(analysis["read_errors"], []) - # Code<->ledger lockstep for the Qidi box (plan v4 SS2): the QD_* literals - # QidiPrinterAgent::map_filament_type_to_setting_id returns must stay - # retired ledger keys whose chains end at a live preset id, because the - # agent resolves them through resolve_filament_id_succession() at runtime. - def test_qidi_agent_fallback_ids_resolve_through_ledger(self): - cpp = os.path.join(REPO_ROOT, "src", "slic3r", "Utils", "QidiPrinterAgent.cpp") - with open(cpp, encoding="utf-8") as f: - src = f.read() - m = re.search( - r"map_filament_type_to_setting_id\(const std::string& filament_type\)" - r"\s*\{(.*?)\n\}", src, re.DOTALL) - self.assertIsNotNone(m, "map_filament_type_to_setting_id not found in QidiPrinterAgent.cpp") - qd_ids = re.findall(r'return "(QD_[0-9_]+)";', m.group(1)) - self.assertTrue(qd_ids, "no QD_* literals parsed from map_filament_type_to_setting_id") - ledger = afi.load_ledger(afi.RETIRED_PATH) - live = set(afi.analyze_tree(REAL_PROFILES)["ids"]) - for fid in qd_ids: - self.assertIn(fid, ledger["retired"], f'"{fid}" must be a retired ledger key') - status, node = afi.follow_succession( - fid, set(), ledger["retired"], ledger["hints"], live) - self.assertEqual( - status, "live", - f'"{fid}" succession must end at a live id (got {status} at "{node}")') - - # --------------------------------------------------------------------------- # review-fix regressions # --------------------------------------------------------------------------- class TestReviewFixes(SyntheticTreeCase): - def test_update_snapshot_refuses_retired_id_reuse(self): - fid = afi.generate_filament_id("LV", "PLA", "LONER") - self.t.write_preset("VendorA", preset("LONER @base", filament_id=fid, - instantiation=False, - filament_vendor="LV", - filament_type="PLA")) - self.t.write_preset("VendorA", preset("LONER @P1", inherits="LONER @base", - compatible_printers=["P1 0.4 nozzle"])) - rc, _ = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.t.remove_preset("VendorA", "LONER @base") - self.t.remove_preset("VendorA", "LONER @P1") - rc, out = self.t.update_snapshot() - self.assertEqual(rc, 0, out) - self.assertIn(fid, afi.load_retired(self.t.retired)) - # Resurrect the same id: --update-snapshot must refuse, not sanction. - self.t.write_preset("VendorA", preset("LONER @base", filament_id=fid, - instantiation=False, - filament_vendor="LV", - filament_type="PLA")) - self.t.write_preset("VendorA", preset("LONER @P1", inherits="LONER @base", - compatible_printers=["P1 0.4 nozzle"])) - rc, out = self.t.update_snapshot() - self.assertEqual(rc, 1) - self.assertIn("retired", out) - self.assertNotIn(fid, load_json_file(self.t.snapshot)["ids"]) - def test_check3_skips_of_id_inherited_from_other_vendor(self): # An OFL family carries its own minted OF id and a vendor tunes it # correctly (same base name, non-empty printers). The new claim must @@ -1565,7 +1071,7 @@ class TestReviewFixes(SyntheticTreeCase): errors, out = self.t.check() self.assertEqual(errors, 0, out) - def test_check7c_prints_expected_mint(self): + def test_check6c_prints_expected_mint(self): self.t.write_preset("VendorA", preset("Orphan PLA @P1", compatible_printers=["P1 0.4 nozzle"], filament_vendor="OV", diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 7306d0db07..304c8957d5 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -572,60 +572,6 @@ std::string generate_preset_setting_id(const std::string& vendor, const std::str return std::string(out, 16); } -std::string follow_filament_id_succession(const std::string& id, const std::map& forwards) -{ - auto it = forwards.find(id); - if (it == forwards.end()) - return std::string(); - std::set visited { id }; - std::string current = id; - while (it != forwards.end() && visited.insert(it->second).second) { - current = it->second; - it = forwards.find(current); - } - // it == end(): current is the live end of the chain; otherwise the ledger is - // cyclic and current is the last id reached before a repeat. - return current; -} - -const std::map& filament_id_succession_map() -{ - // Loaded once; C++11 magic-static initialization makes this thread-safe. - // Succession is a best-effort miss-path fallback, so a missing or corrupt - // ledger is not an error for the client - it just yields an empty map. - static const std::map forwards = []() { - std::map map; - const std::string path = Slic3r::resources_dir() + "/profiles/retired_filament_ids.json"; - boost::nowide::ifstream file(path.c_str()); - if (!file.is_open()) { - BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": cannot open " << path; - return map; - } - try { - nlohmann::json ledger; - file >> ledger; - if (ledger.contains("retired") && ledger["retired"].is_object()) - for (auto& [old_id, entry] : ledger["retired"].items()) - if (entry.is_object() && entry.contains("successor") && entry["successor"].is_string()) - map[old_id] = entry["successor"].get(); - if (ledger.contains("hints") && ledger["hints"].is_object()) - for (auto& [old_id, target] : ledger["hints"].items()) - if (target.is_string()) - map[old_id] = target.get(); - } catch (...) { - BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": failed to parse " << path; - map.clear(); - } - return map; - }(); - return forwards; -} - -std::string resolve_filament_id_succession(const std::string& id) -{ - return follow_filament_id_succession(id, filament_id_succession_map()); -} - std::string Preset::get_iot_type_string(Preset::Type type) { switch (type) { diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp index ca1513a4bb..c9b3197a6f 100644 --- a/src/libslic3r/Preset.hpp +++ b/src/libslic3r/Preset.hpp @@ -101,23 +101,6 @@ std::string generate_preset_setting_id(const std::string& vendor, const std::string& type, const std::string& name); -// Succession forwarding for retired/renamed filament_ids, backed by the shipped -// ledger resources/profiles/retired_filament_ids.json. Consulted on a filament_id -// resolution miss only, so live ids always resolve natively first. -// -// Pure chain walk over `forwards` (old id -> successor). Returns the final id of the -// chain, or an empty string when `id` has no entry. Cycle-guarded: on a malformed -// cyclic ledger it stops at the last id reached before any repeat (a self-loop -// returns `id` itself). -std::string follow_filament_id_succession(const std::string& id, - const std::map& forwards); -// Forwarding map loaded once (thread-safe) from the ledger, merging -// "retired" {id -> non-null successor} and "hints" {island-owned id -> live id}. -// A missing or corrupt file yields an empty map. -const std::map& filament_id_succession_map(); -// Convenience: follow_filament_id_succession(id, filament_id_succession_map()). -std::string resolve_filament_id_succession(const std::string& id); - enum ConfigFileType { CONFIG_FILE_TYPE_UNKNOWN, diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index c6cd6d28dd..5542191964 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -801,12 +801,6 @@ std::optional PresetBundle::get_filament_by_filament_id(const } } } - // Miss: a retired/renamed id may forward to a live successor through the shipped - // succession ledger. resolve() returns a chain-final id, so the retry below cannot - // recurse further (a malformed cyclic ledger yields a non-final id, rejected here). - const std::string successor = resolve_filament_id_succession(filament_id); - if (!successor.empty() && resolve_filament_id_succession(successor).empty()) - return get_filament_by_filament_id(successor, printer_name); return std::nullopt; } @@ -3420,15 +3414,6 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info) auto iter = std::find_if(filaments.begin(), filaments.end(), [this, &filament_id](auto &f) { return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == filament_id; }); warn_ambiguous_filament_id_match(filaments, iter, filament_id); - if (iter == filaments.end()) { - // Retired/renamed ids forward to a live successor through the shipped succession ledger. - const std::string successor = resolve_filament_id_succession(filament_id); - if (!successor.empty()) { - iter = std::find_if(filaments.begin(), filaments.end(), - [this, &successor](auto &f) { return f.is_compatible && filaments.get_preset_base(f) == &f && f.filament_id == successor; }); - warn_ambiguous_filament_id_match(filaments, iter, successor); - } - } if (iter == filaments.end()) { BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": filament_id %1% not found or system or compatible") % filament_id; auto filament_type = ams.opt_string("filament_type", 0u); @@ -3532,16 +3517,6 @@ unsigned int PresetBundle::sync_ams_list(std::vectorfilaments; @@ -103,12 +103,6 @@ static wxString get_preset_name_by_filament_id(std::string filament_id, bool fol } } } - if (preset_name.empty() && follow_succession) { - // Retired/renamed ids forward to a live successor through the shipped succession ledger. - const std::string successor = resolve_filament_id_succession(filament_id); - if (!successor.empty()) - preset_name = get_preset_name_by_filament_id(successor, false); - } return preset_name; } diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 2e814a84e2..b28e410557 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -2764,22 +2764,14 @@ std::string MachineObject::setting_id_to_type(std::string setting_id, std::strin std::string type; PresetBundle* preset_bundle = GUI::wxGetApp().preset_bundle; if (preset_bundle) { - auto lookup_system_type = [preset_bundle](const std::string &id) { - std::string display_filament_type; - for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) { - if (it->filament_id.compare(id) == 0 && it->is_system) { - it->config.get_filament_type(display_filament_type); - break; - } + for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) { + + if (it->filament_id.compare(setting_id) == 0 && it->is_system) { + std::string display_filament_type; + it->config.get_filament_type(display_filament_type); + type = display_filament_type; + break; } - return display_filament_type; - }; - type = lookup_system_type(setting_id); - if (type.empty()) { - // Retired/renamed ids forward to a live successor through the shipped succession ledger. - const std::string successor = resolve_filament_id_succession(setting_id); - if (!successor.empty()) - type = lookup_system_type(successor); } } diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 338095b462..837f4ebe0c 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -556,13 +556,6 @@ bool PresetComboBox::add_ams_filaments(std::string selected, bool alias_name) } auto iter = std::find_if(filaments.begin(), filaments.end(), [&filament_id, this](auto &f) { return f.is_compatible && m_collection->get_preset_base(f) == &f && f.filament_id == filament_id; }); - if (iter == filaments.end()) { - // Retired/renamed ids forward to a live successor through the shipped succession ledger. - const std::string successor = resolve_filament_id_succession(filament_id); - if (!successor.empty()) - iter = std::find_if(filaments.begin(), filaments.end(), - [&successor, this](auto &f) { return f.is_compatible && m_collection->get_preset_base(f) == &f && f.filament_id == successor; }); - } if (iter == filaments.end()) { auto filament_type = tray.opt_string("filament_type", 0u); if (!filament_type.empty()) { diff --git a/src/slic3r/Utils/QidiPrinterAgent.cpp b/src/slic3r/Utils/QidiPrinterAgent.cpp index 22b8d37735..6b05480194 100644 --- a/src/slic3r/Utils/QidiPrinterAgent.cpp +++ b/src/slic3r/Utils/QidiPrinterAgent.cpp @@ -188,13 +188,7 @@ bool QidiPrinterAgent::fetch_slot_info(const std::string& base_url, } else if (!setting_id.empty() && has_visible_base_preset(bundle->filaments, setting_id)) { tray.tray_info_idx = setting_id; } else { - // Retired QD_* protocol ids forward to their minted successors via the shipped ledger. - const std::string successor = setting_id.empty() ? std::string() - : resolve_filament_id_succession(setting_id); - if (!successor.empty() && has_visible_base_preset(bundle->filaments, successor)) - tray.tray_info_idx = successor; - else - tray.tray_info_idx = bundle->filaments.filament_id_by_type(tray.tray_type); + tray.tray_info_idx = bundle->filaments.filament_id_by_type(tray.tray_type); } // Look up color from dictionary @@ -330,10 +324,6 @@ void QidiPrinterAgent::parse_filament_sections(const std::string& content, std:: std::string QidiPrinterAgent::map_filament_type_to_setting_id(const std::string& filament_type) { - // These QD_* protocol ids no longer appear on any preset: they are retired ledger keys - // that parse_box_status resolves through resolve_filament_id_succession(). Each literal - // must stay a ledger key whose chain ends at a live preset id — - // scripts/tests/test_filament_id.py parses this function and enforces that. const std::string upper = trim_and_upper(filament_type); if (upper == "PLA") { diff --git a/task.md b/task.md deleted file mode 100644 index b563759767..0000000000 --- a/task.md +++ /dev/null @@ -1,13 +0,0 @@ -check commit c2e91cb86ce013dc0486419f21620975c220c3be and it's related PR. -currently most of the system profiles didn't follow the Bambu's profiles rule of filemant id. -we want to come up a rule for filament id generation for all vendors and a fixing plan for existing system profiles so that there is no ambiguous filament ids for any given printer. - -We have two major goals: -### goal 1 -figure out a strategy or filament id generation rule. we want to follow bambu's rule but they only care about their own profiles while we need to consider generic. and the filament id generation rule should be easy to understand and maintain for not just us but other profiles creators too. either a determistic rule by using script like setting_id rule. or a documented rule so developers can refer when manually creating profiles. and figure out a way to fix migrate/fix existing filament ids in current profiles. note: bambu profiles shouldn't be touch to maintain interoperbitly with their AMS. - -### goal 2 -in existing system profiles, the ambiguous can caused by different error patterns: -1. legit sub type don't have unique filament id due to copy-paste when creating profiles. in this case, we should assign filament unique filament id to it. -2. generic and specific filament with legit same filament id adds same printer into it's compatible_printers. in this case we should remove the printer from the generic filament's compatible_printers. -3. we need to figure out more error patterns and figure out the fix strategy diff --git a/tests/libslic3r/CMakeLists.txt b/tests/libslic3r/CMakeLists.txt index 7093f44405..bf3981f519 100644 --- a/tests/libslic3r/CMakeLists.txt +++ b/tests/libslic3r/CMakeLists.txt @@ -16,7 +16,6 @@ add_executable(${_TEST_NAME}_tests test_toolordering_nozzle_group.cpp test_preset_bundle_loading.cpp test_preset_setting_id.cpp - test_filament_id_succession.cpp test_preset_diff.cpp test_vendor_cache.cpp test_elephant_foot_compensation.cpp diff --git a/tests/libslic3r/test_filament_id_succession.cpp b/tests/libslic3r/test_filament_id_succession.cpp deleted file mode 100644 index 12fa82f9bb..0000000000 --- a/tests/libslic3r/test_filament_id_succession.cpp +++ /dev/null @@ -1,69 +0,0 @@ -#include - -#include "libslic3r/Preset.hpp" - -using namespace Slic3r; - -// Pure-function coverage of the succession chain walk (follow_filament_id_succession). -// The ledger-file loader (filament_id_succession_map) is deliberately untested here so -// the test carries no resources-dir dependency. -TEST_CASE("filament_id succession follows forwarding chains", "[Preset][filament_id]") { - SECTION("empty map returns empty") { - const std::map empty; - CHECK(follow_filament_id_succession("OFabc123", empty).empty()); - CHECK(follow_filament_id_succession("", empty).empty()); - } - - const std::map forwards = { - {"OFold001", "OFnew001"}, - {"OFchainA", "OFchainB"}, - {"OFchainB", "OFchainC"}, - {"OFchainC", "OFlive00"}, - }; - - SECTION("absent id returns empty") { - CHECK(follow_filament_id_succession("GFL99", forwards).empty()); - } - - SECTION("single hop resolves to the successor") { - CHECK(follow_filament_id_succession("OFold001", forwards) == "OFnew001"); - } - - SECTION("multi-hop chain resolves to the live end") { - CHECK(follow_filament_id_succession("OFchainA", forwards) == "OFlive00"); - CHECK(follow_filament_id_succession("OFchainB", forwards) == "OFlive00"); - CHECK(follow_filament_id_succession("OFchainC", forwards) == "OFlive00"); - } - - // QidiPrinterAgent resolves device-composed QD_* protocol ids through this same walk; - // the map key format carries no OF assumption. - SECTION("device-protocol QD_* keys forward like any other id") { - const std::map qd = {{"QD_2_1_11", "OFnew001"}}; - CHECK(follow_filament_id_succession("QD_2_1_11", qd) == "OFnew001"); - CHECK(follow_filament_id_succession("QD_2_1_12", qd).empty()); - } -} - -// Cycles are a ledger-validation error (script check 9) and never ship, but the client -// walk must still terminate on corrupt data: it stops at the last id reached before any -// id would repeat. -TEST_CASE("filament_id succession terminates on malformed cycles", "[Preset][filament_id]") { - SECTION("two-node cycle returns the last id before revisiting") { - const std::map cycle = {{"A", "B"}, {"B", "A"}}; - CHECK(follow_filament_id_succession("A", cycle) == "B"); - CHECK(follow_filament_id_succession("B", cycle) == "A"); - } - - SECTION("cycle entered through a tail stops before re-entering it") { - // T -> A -> B -> C -> A: stops at C, the last id reached before repeating A. - const std::map cycle = { - {"T", "A"}, {"A", "B"}, {"B", "C"}, {"C", "A"}}; - CHECK(follow_filament_id_succession("T", cycle) == "C"); - CHECK(follow_filament_id_succession("A", cycle) == "C"); - } - - SECTION("self-loop returns the id itself") { - const std::map loop = {{"A", "A"}}; - CHECK(follow_filament_id_succession("A", loop) == "A"); - } -} From df101ead91da5643413a291eb2c8bccffa73d2db Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 4 Sep 2026 00:29:52 +0800 Subject: [PATCH 39/52] fix more issues --- .../Creality/machine/Creality K1 SE.json | 2 +- .../Creality/machine/Creality K1C.json | 2 +- .../Creality/machine/Creality K2 Plus.json | 2 +- .../Creality/machine/Creality K2 Pro.json | 2 +- .../Creality/machine/Creality K2.json | 2 +- .../machine/Flashforge Guider 3 Ultra.json | 2 +- .../machine/D12 230 PRO M2 DIRECT.json | 2 +- .../machine/D12 230 PRO SMARTPAD DIRECT.json | 2 +- .../machine/D12 300 PRO M2 DIRECT.json | 2 +- .../machine/D12 300 PRO SMARTPAD DIRECT.json | 2 +- .../machine/D12 500 PRO M2 DIRECT.json | 2 +- .../machine/D12 500 PRO SMARTPAD DIRECT.json | 2 +- .../OrcaSlicer_profile_validator.cpp | 2 +- src/slic3r/Utils/CrealityPrintAgent.cpp | 79 ++++++++-- tests/slic3rutils/CMakeLists.txt | 1 + tests/slic3rutils/test_creality_cfs_match.cpp | 141 ++++++++++++++++++ 16 files changed, 218 insertions(+), 29 deletions(-) create mode 100644 tests/slic3rutils/test_creality_cfs_match.cpp diff --git a/resources/profiles/Creality/machine/Creality K1 SE.json b/resources/profiles/Creality/machine/Creality K1 SE.json index 9f6806ee46..1cb9769e0e 100644 --- a/resources/profiles/Creality/machine/Creality K1 SE.json +++ b/resources/profiles/Creality/machine/Creality K1 SE.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1se_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Generic ABS @Creality K1-all;Generic ASA @Creality K1-all;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality K1-all;Generic PLA @Creality K1-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality K1-all" + "default_materials": "Generic ABS @Creality K1-all;Generic ABS @K1 SE-all;Generic ASA @Creality K1-all;Generic ASA @K1 SE-all;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality K1-all;Generic PETG @K1 SE-all;Generic PLA @Creality K1-all;Generic PLA @K1 SE-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic PLA-CF @K1 SE-all;Generic TPU @Creality K1-all;Generic TPU @K1 SE-all" } diff --git a/resources/profiles/Creality/machine/Creality K1C.json b/resources/profiles/Creality/machine/Creality K1C.json index 4283aabfd4..18e80dab92 100644 --- a/resources/profiles/Creality/machine/Creality K1C.json +++ b/resources/profiles/Creality/machine/Creality K1C.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k1c_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Generic ABS @Creality K1-all;Generic ASA @Creality K1-all;Generic PA-CF @Creality K1-all;Generic PC @Creality K1-all;Generic PETG @Creality K1-all;Generic PLA @Creality K1-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic TPU @Creality K1-all" + "default_materials": "Generic ABS @Creality K1-all;Generic ABS @K1C-all;Generic ASA @Creality K1-all;Generic ASA @K1C-all;Generic PA-CF @Creality K1-all;Generic PA-CF @K1C-all;Generic PC @Creality K1-all;Generic PC @K1C-all;Generic PETG @Creality K1-all;Generic PETG @K1C-all;Generic PLA @Creality K1-all;Generic PLA @K1C-all;Generic PLA High Speed @Creality K1-all;Generic PLA Matte @Creality K1-all;Generic PLA Silk @Creality K1-all;Generic PLA-CF @Creality K1-all;Generic PLA-CF @K1C-all;Generic TPU @Creality K1-all;Generic TPU @K1C-all" } diff --git a/resources/profiles/Creality/machine/Creality K2 Plus.json b/resources/profiles/Creality/machine/Creality K2 Plus.json index d70e5e517a..ea4430128a 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k2plus_buildplate_texture.svg", "hotend_model": "", "default_bed_type": "Textured PEI Plate", - "default_materials": "Generic ABS @Creality K2-all;Generic ASA @Creality K2-all;Generic PETG @Creality K2-all;Generic PLA @Creality K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" + "default_materials": "Generic ABS @Creality K2-all;Generic ABS @K2 Plus-all;Generic ASA @Creality K2-all;Generic ASA @K2 Plus-all;Generic PETG @Creality K2-all;Generic PETG @K2 Plus-all;Generic PLA @Creality K2-all;Generic PLA @K2 Plus-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" } diff --git a/resources/profiles/Creality/machine/Creality K2 Pro.json b/resources/profiles/Creality/machine/Creality K2 Pro.json index 3df797399b..937117d11d 100644 --- a/resources/profiles/Creality/machine/Creality K2 Pro.json +++ b/resources/profiles/Creality/machine/Creality K2 Pro.json @@ -9,5 +9,5 @@ "bed_texture": "creality_k2pro_buildplate_texture.svg", "default_bed_type": "Textured PEI Plate", "hotend_model": "", - "default_materials": "Generic ABS @Creality K2-all;Generic ASA @Creality K2-all;Generic PETG @Creality K2-all;Generic PLA @Creality K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" + "default_materials": "Generic ABS @Creality K2-all;Generic ABS @K2 Pro-all;Generic ASA @Creality K2-all;Generic ASA @K2 Pro-all;Generic PETG @Creality K2-all;Generic PETG @K2 Pro-all;Generic PLA @Creality K2-all;Generic PLA @K2 Pro-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" } diff --git a/resources/profiles/Creality/machine/Creality K2.json b/resources/profiles/Creality/machine/Creality K2.json index 3ea29942b7..cc852576fe 100644 --- a/resources/profiles/Creality/machine/Creality K2.json +++ b/resources/profiles/Creality/machine/Creality K2.json @@ -9,5 +9,5 @@ "default_bed_type": "Textured PEI Plate", "bed_texture": "creality_k2_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic ABS @Creality K2-all;Generic ASA @Creality K2-all;Generic PETG @Creality K2-all;Generic PLA @Creality K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" + "default_materials": "Generic ABS @Creality K2-all;Generic ABS @K2-all;Generic ASA @Creality K2-all;Generic ASA @K2-all;Generic PETG @Creality K2-all;Generic PETG @K2-all;Generic PLA @Creality K2-all;Generic PLA @K2-all;Generic PLA High Speed @Creality K2-all;Generic PLA Matte @Creality K2-all;Generic PLA Silk @Creality K2-all" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json index c95215a762..a830f2db98 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json +++ b/resources/profiles/Flashforge/machine/Flashforge Guider 3 Ultra.json @@ -8,5 +8,5 @@ "bed_model": "flashforge_g3u_buildplate_model.stl", "bed_texture": "flashforge_g3u_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PVA @Flashforge;Generic HIPS @Flashforge;Generic PETG-CF @Flashforge G3U;Generic PETG @Flashforge G3U;Generic PLA-CF @Flashforge G3U;Generic PLA @Flashforge G3U;Generic ASA @Flashforge G3U;Generic ABS @Flashforge G3U;FusRock PET-CF;FusRock PAHT-CF;FusRock NexPA-CF25;FusRock S-Multi;FusRock S-PAHT;Polymaker CoPA;Polymaker S1" + "default_materials": "FusRock NexPA-CF25;FusRock PAHT-CF;FusRock PAHT-CF @G3U 0.6 Nozzle;FusRock PET-CF;FusRock PET-CF @G3U 0.6 Nozzle;FusRock S-Multi;FusRock S-PAHT;Generic ABS @Flashforge G3U;Generic ABS @Flashforge G3U 0.6 Nozzle;Generic ASA @Flashforge G3U;Generic ASA @Flashforge G3U 0.6 Nozzle;Generic HIPS @Flashforge;Generic HIPS @Flashforge G3U 0.6 Nozzle;Generic PETG @Flashforge G3U;Generic PETG @Flashforge G3U 0.6 Nozzle;Generic PETG @Flashforge G3U 0.8 Nozzle;Generic PETG-CF @Flashforge G3U;Generic PETG-CF @Flashforge G3U 0.6 Nozzle;Generic PETG-CF @Flashforge G3U 0.8 Nozzle;Generic PLA @Flashforge G3U;Generic PLA-CF @Flashforge G3U;Generic PLA-CF @Flashforge G3U 0.6 Nozzle;Generic PLA-CF @Flashforge G3U 0.8 Nozzle;Generic PVA @Flashforge;Polymaker CoPA;Polymaker S1" } diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT.json b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT.json index 45e7243ee3..cf912002ee 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO M2 DIRECT.json @@ -8,5 +8,5 @@ "bed_model": "Wanhao_D12-230_buildplate_model.stl", "bed_texture": "D12_texture.png", "hotend_model": "Wanhao D12-300_hotend.stl", - "default_materials": "YUMI PLA Bowden;YUMI PETG;" + "default_materials": "YUMI PLA Direct Drive;YUMI PETG;" } diff --git a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT.json b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT.json index b74b11321e..24a798c531 100644 --- a/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT.json +++ b/resources/profiles/Wanhao France/machine/D12 230 PRO SMARTPAD DIRECT.json @@ -8,5 +8,5 @@ "bed_model": "Wanhao_D12-230_buildplate_model.stl", "bed_texture": "D12_texture.png", "hotend_model": "Wanhao D12-300_hotend.stl", - "default_materials": "YUMI PLA Bowden;YUMI PETG;" + "default_materials": "YUMI PLA Direct Drive;YUMI PETG;" } diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT.json b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT.json index a51f0bafbf..7447f4481b 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO M2 DIRECT.json @@ -8,5 +8,5 @@ "bed_model": "Wanhao_D12-300_buildplate_model.stl", "bed_texture": "D12_texture.png", "hotend_model": "Wanhao D12-300_hotend.stl", - "default_materials": "YUMI PLA Bowden;YUMI PETG;" + "default_materials": "YUMI PLA Direct Drive;YUMI PETG;" } diff --git a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT.json b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT.json index 563d05ca53..8290a99d9e 100644 --- a/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT.json +++ b/resources/profiles/Wanhao France/machine/D12 300 PRO SMARTPAD DIRECT.json @@ -8,5 +8,5 @@ "bed_model": "Wanhao_D12-300_buildplate_model.stl", "bed_texture": "D12_texture.png", "hotend_model": "Wanhao D12-300_hotend.stl", - "default_materials": "YUMI PLA Bowden;YUMI PETG;" + "default_materials": "YUMI PLA Direct Drive;YUMI PETG;" } diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT.json b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT.json index d54d0d6e51..3c85fac7eb 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO M2 DIRECT.json @@ -8,5 +8,5 @@ "bed_model": "Wanhao_D12-500_buildplate_model.stl", "bed_texture": "D12_texture.png", "hotend_model": "Wanhao D12-300_hotend.stl", - "default_materials": "YUMI PLA Bowden;YUMI PETG;" + "default_materials": "YUMI PLA Direct Drive;YUMI PETG;" } diff --git a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT.json b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT.json index 2fe6842bc8..3588797494 100644 --- a/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT.json +++ b/resources/profiles/Wanhao France/machine/D12 500 PRO SMARTPAD DIRECT.json @@ -8,5 +8,5 @@ "bed_model": "Wanhao_D12-500_buildplate_model.stl", "bed_texture": "D12_texture.png", "hotend_model": "Wanhao D12-300_hotend.stl", - "default_materials": "YUMI PLA Bowden;YUMI PETG;" + "default_materials": "YUMI PLA Direct Drive;YUMI PETG;" } diff --git a/src/dev-utils/OrcaSlicer_profile_validator.cpp b/src/dev-utils/OrcaSlicer_profile_validator.cpp index 21c6b33180..67d0ba444d 100644 --- a/src/dev-utils/OrcaSlicer_profile_validator.cpp +++ b/src/dev-utils/OrcaSlicer_profile_validator.cpp @@ -392,7 +392,7 @@ int main(int argc, char* argv[]) ("generate_presets,g", po::value()->default_value(false), "Generate user presets for mock test") ("slice,s", po::bool_switch()->default_value(false), "Slice a two-colour cube through every printer to expand all custom g-code (catches placeholder/flow errors that static checks miss). Off unless this flag is present.") ("outdir,o", po::value()->default_value(""), "With -s, also save each printer's g-code to this folder (as __.gcode) for manual inspection. Optional.") - ("check_filament_subtypes,f", po::bool_switch()->default_value(false), "Also flag printers with duplicate (ambiguous) filament subtypes. Off unless this flag is present.") + ("check_filament_subtypes,f", po::bool_switch()->default_value(true), "Also flag printers with duplicate (ambiguous) filament subtypes. Off unless this flag is present.") ("log_level,l", po::value()->default_value(2), "Log level. Optional, default is 2 (warning). Higher values produce more detailed logs."); // clang-format on diff --git a/src/slic3r/Utils/CrealityPrintAgent.cpp b/src/slic3r/Utils/CrealityPrintAgent.cpp index 55d99ff07b..9b3bd5843e 100644 --- a/src/slic3r/Utils/CrealityPrintAgent.cpp +++ b/src/slic3r/Utils/CrealityPrintAgent.cpp @@ -8,7 +8,9 @@ #include #include +#include #include +#include namespace Slic3r { @@ -16,6 +18,12 @@ namespace { constexpr const char* CrealityPrintAgent_VERSION = "0.1.0"; +std::string to_lower(std::string s) +{ + for (auto& c : s) c = static_cast(std::tolower(static_cast(c))); + return s; +} + bool has_visible_base_preset(const PresetCollection& filaments, const std::string& filament_id) { for (const auto& p : filaments.get_presets()) { @@ -27,19 +35,47 @@ bool has_visible_base_preset(const PresetCollection& filaments, const std::strin return false; } +// Lower-case words of a preset name with the "@scope" suffix dropped: +// "Generic PLA Matte @Creality K2-all" -> {"generic", "pla", "matte"}. +std::vector name_words(const std::string& name) +{ + std::vector words; + std::string word; + for (char c : name.substr(0, name.find('@'))) { + if (std::isalnum(static_cast(c))) { + word += static_cast(std::tolower(static_cast(c))); + } else if (!word.empty()) { + words.push_back(word); + word.clear(); + } + } + if (!word.empty()) + words.push_back(word); + return words; +} + } // namespace // Score visible compatible filament presets against the CFS spool metadata and // return the best-matching filament_id. Scoring: // +20 preset name contains brand_name as a substring // (e.g. "Hyper PLA" in "Hyper PLA @Creality K2 0.4 nozzle") -// +10 preset name contains the vendor substring (e.g. "Creality") -// Tiebreak: prefer the SYSTEM (shipped) preset over user copies. Brand- -// specific system presets carry their own filament_id; user copies of -// generic presets inherit a generic filament_id from their parent, so -// preferring the user copy can collapse a brand-specific match back to -// "Generic PLA" via the inherited id. Plus: this code targets upstream -// OrcaSlicer where shipping the user's local tuning would be wrong. +// +10 the preset belongs to the spool's vendor - by its owning VendorProfile OR by +// its name. The profile test is what finds the vendor's own generics, which are +// named "Generic @" and do not repeat the vendor; the name test +// still finds a third party filament shipped inside that vendor's bundle, which +// carries the bundle owner's profile but names its real brand. +// -5 per word of the preset name the spool never mentioned ("generic" excepted - +// it marks the unbranded base product rather than a qualifier), so the least +// specific preset that still explains the spool wins. Without it a spool +// reporting only "PLA" scores "Generic PLA High Speed" and "Generic PLA Matte" +// exactly as high as "Generic PLA"; those are three products with three +// filament_ids, so whichever sorted first won and the printer got the wrong +// one. Applied after the score gate, so it only reorders genuine matches. +// Tiebreak: prefer the SYSTEM (shipped) preset over user copies, then by name so the +// winner never depends on how std::sort leaves equal elements. User copies of generic +// presets inherit a generic filament_id from their parent, so preferring the user copy +// can collapse a brand-specific match back to "Generic PLA" via the inherited id. // Requires the preset's declared filament_type to equal the spool's base type // (PLA/PETG/ABS/...) so we never auto-pick a PETG preset for a PLA spool. // Falls back to filaments.filament_id_by_type(base_type) when nothing scores. @@ -48,15 +84,17 @@ std::string CrealityPrintAgent::match_filament_preset(const PresetCollection& fi const std::string& brand_name, const std::string& base_type) { - auto to_lower = [](std::string s) { - for (auto& c : s) c = static_cast(std::tolower(static_cast(c))); - return s; - }; - const std::string vendor_lower = to_lower(vendor); const std::string brand_lower = to_lower(brand_name); const std::string type_lower = to_lower(base_type); + // Everything the spool told us about itself, as words. A word in a preset's name + // that is not in here is a qualifier the spool never claimed. + std::set spool_words{"generic"}; + for (const std::string& src : {brand_lower, vendor_lower, type_lower}) + for (auto& w : name_words(src)) + spool_words.insert(std::move(w)); + struct Match { const Preset* preset; int score; @@ -83,11 +121,20 @@ std::string CrealityPrintAgent::match_filament_preset(const PresetCollection& fi int score = 0; if (!brand_lower.empty() && name_lower.find(brand_lower) != std::string::npos) score += 20; - if (!vendor_lower.empty() && name_lower.find(vendor_lower) != std::string::npos) + // Profile OR name - neither alone covers both the vendor's own generics and the + // third party filaments shipped inside its bundle. See the header comment. + if (!vendor_lower.empty() + && ((p.vendor != nullptr && to_lower(p.vendor->name) == vendor_lower) + || name_lower.find(vendor_lower) != std::string::npos)) score += 10; - if (score > 0) - matches.push_back({&p, score, !p.is_system && !p.is_default}); + if (score == 0) continue; + + for (const auto& w : name_words(p.name)) + if (spool_words.count(w) == 0) + score -= 5; + + matches.push_back({&p, score, !p.is_system && !p.is_default}); } if (matches.empty()) { @@ -105,7 +152,7 @@ std::string CrealityPrintAgent::match_filament_preset(const PresetCollection& fi [](const Match& a, const Match& b) { if (a.score != b.score) return a.score > b.score; if (a.is_user != b.is_user) return !a.is_user; // prefer system over user - return false; + return a.preset->name < b.preset->name; // keep the winner deterministic }); BOOST_LOG_TRIVIAL(info) diff --git a/tests/slic3rutils/CMakeLists.txt b/tests/slic3rutils/CMakeLists.txt index ebbd62b820..eca1af2b86 100644 --- a/tests/slic3rutils/CMakeLists.txt +++ b/tests/slic3rutils/CMakeLists.txt @@ -1,6 +1,7 @@ get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME) add_executable(${_TEST_NAME}_tests ${_TEST_NAME}_tests_main.cpp + test_creality_cfs_match.cpp test_dev_mapping.cpp test_filament_bitmap_utils.cpp test_network_versions.cpp diff --git a/tests/slic3rutils/test_creality_cfs_match.cpp b/tests/slic3rutils/test_creality_cfs_match.cpp new file mode 100644 index 0000000000..06606684b7 --- /dev/null +++ b/tests/slic3rutils/test_creality_cfs_match.cpp @@ -0,0 +1,141 @@ +#include + +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/Utils/CrealityPrintAgent.hpp" + +using namespace Slic3r; + +namespace { + +// A standalone filament collection, built the same way PresetBundle builds its own, so the +// CFS matcher can be exercised without loading the shipped profiles or touching a printer. +struct FilamentTestCollection : public PresetCollection +{ + FilamentTestCollection() + : PresetCollection(Preset::TYPE_FILAMENT, Preset::filament_options(), + static_cast(FullPrintConfig::defaults())) + {} +}; + +struct FilamentSpec +{ + const char *name; + const char *filament_id; + const char *filament_type; + bool is_library = false; // belongs to the Orca Filament Library, not the printer vendor + bool is_system = true; +}; + +// Load the specs into the collection, then stamp the fields the matcher reads. Done in a second +// pass because load_preset() keeps m_presets sorted, so a reference taken during the first pass +// can be left dangling by a later load. +void populate(PresetCollection &filaments, const std::vector &specs, + const VendorProfile &vendor, const VendorProfile &library) +{ + for (const FilamentSpec &spec : specs) { + DynamicPrintConfig config(filaments.default_preset().config); + config.option("filament_type", true)->values = {spec.filament_type}; + filaments.load_preset(std::string(), spec.name, config, /*select=*/false); + } + for (auto it = filaments.begin(); it != filaments.end(); ++it) { + const auto spec = std::find_if(specs.begin(), specs.end(), + [&](const FilamentSpec &s) { return it->name == s.name; }); + if (spec == specs.end()) + continue; + it->filament_id = spec->filament_id; + it->vendor = spec->is_library ? &library : &vendor; + it->is_system = spec->is_system; + it->is_default = false; + it->is_visible = true; + it->is_compatible = true; + } +} + +// What a stock K2 with a 0.4 nozzle sees after the filament_id rework: the vendor's plain generics +// carry no "Creality" in their name (they are "Generic @"), while the subtype +// variants that do keep a vendor scope are separate products with their own filament_ids. +const std::vector k2_stock_nozzle{ + {"AliZ PLA @System", "ALIZ-PLA", "PLA", /*is_library=*/true}, + {"Generic PETG @K2-all", "PETG-GENERIC", "PETG"}, + {"Generic PLA @K2-all", "PLA-GENERIC", "PLA"}, + {"Generic PLA High Speed @Creality K2-all","PLA-HS", "PLA"}, + {"Generic PLA Matte @Creality K2-all", "PLA-MATTE", "PLA"}, + {"Generic PLA Silk @Creality K2-all", "PLA-SILK", "PLA"}, + {"Hyper PLA @K2-all", "PLA-HYPER", "PLA"}, +}; + +std::string match(const std::vector &specs, const std::string &spool_vendor, + const std::string &spool_name, const std::string &base_type) +{ + FilamentTestCollection filaments; + VendorProfile vendor("Creality"); + VendorProfile library(PresetBundle::ORCA_FILAMENT_LIBRARY); + vendor.name = "Creality"; + library.name = PresetBundle::ORCA_FILAMENT_LIBRARY; + populate(filaments, specs, vendor, library); + return CrealityPrintAgent::match_filament_preset(filaments, spool_vendor, spool_name, base_type); +} + +} // namespace + +// Orca: a CFS spool that names no recognised product must map to the vendor's plain generic. The +// subtype variants ("High Speed", "Matte", "Silk") score just as well on vendor alone, and since +// each is its own product with its own filament_id, letting one of them win sends the printer the +// id of a filament the user does not have loaded. +TEST_CASE("An unbranded CFS spool maps to the vendor's plain generic, not a subtype", "[CFS][Creality]") +{ + CHECK(match(k2_stock_nozzle, "Creality", "", "PLA") == "PLA-GENERIC"); +} + +// Orca: the vendor bonus reads the preset's owning VendorProfile. "Generic PETG @K2-all" does not +// repeat "Creality" anywhere in its name, so a name based vendor test scored nothing for it and the +// spool fell through to the collection wide first-of-type - an unrelated third party PETG. +TEST_CASE("A CFS spool matches its vendor's presets even when the name omits the vendor", "[CFS][Creality]") +{ + CHECK(match(k2_stock_nozzle, "Creality", "", "PETG") == "PETG-GENERIC"); +} + +TEST_CASE("A branded CFS spool still beats the generic", "[CFS][Creality]") +{ + CHECK(match(k2_stock_nozzle, "Creality", "Hyper PLA", "PLA") == "PLA-HYPER"); +} + +// Orca: the specificity penalty must not stop a spool that genuinely asks for a subtype from +// getting it - only unclaimed qualifiers are penalised. +TEST_CASE("A CFS spool that names a subtype gets that subtype", "[CFS][Creality]") +{ + CHECK(match(k2_stock_nozzle, "Creality", "Generic PLA Silk", "PLA") == "PLA-SILK"); + CHECK(match(k2_stock_nozzle, "Creality", "Generic PLA Matte", "PLA") == "PLA-MATTE"); +} + +// Orca: a third party spool matches no preset by brand or vendor, so it falls back to the first +// visible preset of the same type rather than returning nothing. Which one that is depends on the +// collection's ordering, so only the type is pinned here - what matters is that a PLA spool never +// comes back empty and never comes back as another material. +TEST_CASE("A CFS spool from an unknown vendor falls back to a preset of the same type", "[CFS][Creality]") +{ + const std::string matched = match(k2_stock_nozzle, "SomeOtherBrand", "", "PLA"); + REQUIRE_FALSE(matched.empty()); + const auto spec = std::find_if(k2_stock_nozzle.begin(), k2_stock_nozzle.end(), + [&](const FilamentSpec &s) { return matched == s.filament_id; }); + REQUIRE(spec != k2_stock_nozzle.end()); + CHECK(std::string(spec->filament_type) == "PLA"); +} + + +// Orca: Creality's bundle also ships third party filaments ("eSUN PLA+ @K2 Plus-all"). Those carry +// Creality's VendorProfile but name their real brand, so the vendor bonus has to accept a name +// match as well as a profile match - otherwise an eSUN spool stops matching its own preset. +TEST_CASE("A third party spool matches its preset inside the printer vendor's bundle", "[CFS][Creality]") +{ + const std::vector with_third_party{ + {"Generic PLA @K2-all", "PLA-GENERIC", "PLA"}, + {"eSUN PLA+ @K2 Plus-all", "ESUN-PLA", "PLA"}, // shipped by Creality, branded eSUN + }; + CHECK(match(with_third_party, "eSUN", "", "PLA") == "ESUN-PLA"); + // ... and a Creality spool still prefers Creality's own generic over the eSUN preset, which + // carries Creality's profile too but adds a brand word the spool never claimed. + CHECK(match(with_third_party, "Creality", "", "PLA") == "PLA-GENERIC"); +} From a4382ce3b335c7be6367dfc996510d723ceaa0c1 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 4 Sep 2026 01:06:04 +0800 Subject: [PATCH 40/52] reanme --- resources/profiles/TwoTrees.json | 4 ++-- ...K1.json => Generic TPU 95A @TwoTrees SK1.json} | 6 +++--- .../profiles/TwoTrees/machine/TwoTrees SK1.json | 2 +- scripts/filament_id_snapshot.json | 15 +++------------ 4 files changed, 9 insertions(+), 18 deletions(-) rename resources/profiles/TwoTrees/filament/{Generic 95A TPU @TwoTrees SK1.json => Generic TPU 95A @TwoTrees SK1.json} (85%) diff --git a/resources/profiles/TwoTrees.json b/resources/profiles/TwoTrees.json index 5c8349181f..3cd77c911b 100644 --- a/resources/profiles/TwoTrees.json +++ b/resources/profiles/TwoTrees.json @@ -81,8 +81,8 @@ ], "filament_list": [ { - "name": "Generic 95A TPU @TwoTrees SK1", - "sub_path": "filament/Generic 95A TPU @TwoTrees SK1.json" + "name": "Generic TPU 95A @TwoTrees SK1", + "sub_path": "filament/Generic TPU 95A @TwoTrees SK1.json" }, { "name": "Generic HS PLA @TwoTrees SK1", diff --git a/resources/profiles/TwoTrees/filament/Generic 95A TPU @TwoTrees SK1.json b/resources/profiles/TwoTrees/filament/Generic TPU 95A @TwoTrees SK1.json similarity index 85% rename from resources/profiles/TwoTrees/filament/Generic 95A TPU @TwoTrees SK1.json rename to resources/profiles/TwoTrees/filament/Generic TPU 95A @TwoTrees SK1.json index 46b9d1f100..6f0221b92c 100644 --- a/resources/profiles/TwoTrees/filament/Generic 95A TPU @TwoTrees SK1.json +++ b/resources/profiles/TwoTrees/filament/Generic TPU 95A @TwoTrees SK1.json @@ -1,11 +1,11 @@ { "type": "filament", - "name": "Generic 95A TPU @TwoTrees SK1", + "name": "Generic TPU 95A @TwoTrees SK1", "inherits": "fdm_filament_tpu", "renamed_from": "TwoTrees Generic 95A TPU @SK1;TwoTrees Generic 95A TPU SK1", "from": "system", - "setting_id": "LR7ufBEnGhieNdB7", - "filament_id": "OF6MMR8P", + "setting_id": "hAqaYYR7xzkcr2xC", + "filament_id": "OFjiXpyf", "instantiation": "true", "compatible_printers": [ "TwoTrees SK1 0.4 nozzle" diff --git a/resources/profiles/TwoTrees/machine/TwoTrees SK1.json b/resources/profiles/TwoTrees/machine/TwoTrees SK1.json index 964d47c813..5674e7c408 100644 --- a/resources/profiles/TwoTrees/machine/TwoTrees SK1.json +++ b/resources/profiles/TwoTrees/machine/TwoTrees SK1.json @@ -8,5 +8,5 @@ "bed_model": "TwoTrees SK1_buildplate_model.stl", "bed_texture": "TwoTrees SK1_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic 95A TPU @TwoTrees SK1;TwoTrees Generic PETG @SK1;Generic HS PLA @TwoTrees SK1;TwoTrees Generic PLA @SK1;TwoTrees Generic PLA-CF @SK1;TwoTrees Generic PLA Matte @SK1;TwoTrees Generic PLA Silk @SK1" + "default_materials": "Generic TPU 95A @TwoTrees SK1;TwoTrees Generic PETG @SK1;Generic HS PLA @TwoTrees SK1;TwoTrees Generic PLA @SK1;TwoTrees Generic PLA-CF @SK1;TwoTrees Generic PLA Matte @SK1;TwoTrees Generic PLA Silk @SK1" } diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index efaffb0654..9a4b4a2abd 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1776,9 +1776,6 @@ "Elegoo/Elegoo PETG Translucent", "OrcaFilamentLibrary/Elegoo PETG Translucent" ], - "OF6MMR8P": [ - "TwoTrees/Generic 95A TPU" - ], "OF6MOPWx": [ "Creality/Generic PET", "Elegoo/Generic PET", @@ -3662,7 +3659,8 @@ "Cubicon/Cubicon PLA" ], "OFjiXpyf": [ - "Qidi/Generic TPU 95A" + "Qidi/Generic TPU 95A", + "TwoTrees/Generic TPU 95A" ], "OFjkdnyN": [ "Snapmaker/Snapmaker Dual TPU" @@ -6879,8 +6877,8 @@ "Tiertime/Tiertime PVA@300HS", "Tiertime/Tiertime TPU 95A", "Tiertime/Tiertime TPU 95A@300HS", - "TwoTrees/Generic 95A TPU @TwoTrees SK1", "TwoTrees/Generic HS PLA @TwoTrees SK1", + "TwoTrees/Generic TPU 95A @TwoTrees SK1", "Volumic/Désactivé", "Volumic/PA6 CF20 (Performance)", "Volumic/PETG ESD (Performance)", @@ -7574,13 +7572,6 @@ "Elegoo PETG Translucent" ] ], - "OF6MMR8P": [ - [ - "Generic", - "TPU", - "Generic 95A TPU" - ] - ], "OF6MOPWx": [ [ "Generic", From 25e020f5c927350a7491aef21c318604d00d1abc Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 4 Sep 2026 13:31:19 +0800 Subject: [PATCH 41/52] Add the generated map from Orca filament ids to Bambu catalog ids scripts/update_bambu_filament_ids.py derives resources/printers/bambu_filament_ids.json from BambuStudio's own shipped BBL bundle (cloned from upstream, or read from a local checkout via --bambustudio-dir), pairing each Bambu catalog id with the Orca filament_id we already ship for that product where we ship one, else a freshly generated one. Nothing reads the map yet; later work uses it to translate ids at the Bambu printer boundary. --- resources/printers/bambu_filament_ids.json | 607 +++++++++++++++++++++ scripts/tests/test_filament_id.py | 133 +++++ scripts/update_bambu_filament_ids.py | 291 ++++++++++ 3 files changed, 1031 insertions(+) create mode 100644 resources/printers/bambu_filament_ids.json create mode 100644 scripts/update_bambu_filament_ids.py diff --git a/resources/printers/bambu_filament_ids.json b/resources/printers/bambu_filament_ids.json new file mode 100644 index 0000000000..b21946f1a3 --- /dev/null +++ b/resources/printers/bambu_filament_ids.json @@ -0,0 +1,607 @@ +{ + "bambustudio_commit": "66e405477", + "filaments": { + "OF0UJcb6": { + "bambu_id": "GFG60", + "name": "PolyLite PETG", + "type": "PETG", + "vendor": "Polymaker" + }, + "OF0wBGNx": { + "bambu_id": "GFB51", + "name": "Bambu ASA-CF", + "type": "ASA-CF", + "vendor": "Bambu Lab" + }, + "OF1UNk9P": { + "bambu_id": "GFP97", + "name": "Generic PP", + "type": "PP", + "vendor": "Generic" + }, + "OF2GCW1l": { + "bambu_id": "GFSNL08", + "name": "SUNLU PETG", + "type": "PETG", + "vendor": "SUNLU" + }, + "OF2VFe4J": { + "bambu_id": "GFN04", + "name": "Bambu PAHT-CF", + "type": "PA-CF", + "vendor": "Bambu Lab" + }, + "OF342jVN": { + "bambu_id": "GFA10", + "name": "Bambu PLA Tough+", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OF4RvVuU": { + "bambu_id": "GFT02", + "name": "Bambu PPS-CF", + "type": "PPS-CF", + "vendor": "Bambu Lab" + }, + "OF54B0S0": { + "bambu_id": "GFN06", + "name": "Bambu PPA-CF", + "type": "PPA-CF", + "vendor": "Bambu Lab" + }, + "OF5CgdDq": { + "bambu_id": "GFL00", + "name": "PolyLite PLA", + "type": "PLA", + "vendor": "Polymaker" + }, + "OF6rdQ6M": { + "bambu_id": "GFT98", + "name": "Generic PPS-CF", + "type": "PPS-CF", + "vendor": "Generic" + }, + "OF74KeQR": { + "bambu_id": "GFR98", + "name": "Generic PHA", + "type": "PHA", + "vendor": "Generic" + }, + "OF7lOgYF": { + "bambu_id": "GFG96", + "name": "Generic PETG HF", + "type": "PETG", + "vendor": "Generic" + }, + "OF8Tlg47": { + "bambu_id": "GFN96", + "name": "Generic PPA-GF", + "type": "PPA-GF", + "vendor": "Generic" + }, + "OF8tPByX": { + "bambu_id": "GFN97", + "name": "Generic PPA-CF", + "type": "PPA-CF", + "vendor": "Generic" + }, + "OF9OlTWH": { + "bambu_id": "GFA07", + "name": "Bambu PLA Marble", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFAnyRUI": { + "bambu_id": "GFS02", + "name": "Bambu Support For PLA", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFBSW57R": { + "bambu_id": "GFA11", + "name": "Bambu PLA Aero", + "type": "PLA-AERO", + "vendor": "Bambu Lab" + }, + "OFBw6eEG": { + "bambu_id": "GFL05", + "name": "Overture Matte PLA", + "type": "PLA", + "vendor": "Overture" + }, + "OFCD8qiU": { + "bambu_id": "GFR99", + "name": "Generic EVA", + "type": "EVA", + "vendor": "Generic" + }, + "OFDGigEI": { + "bambu_id": "GFA13", + "name": "Bambu PLA Dynamic", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFDSrzZ8": { + "bambu_id": "GFL99", + "name": "Generic PLA", + "type": "PLA", + "vendor": "Generic" + }, + "OFDvXujf": { + "bambu_id": "GFS99", + "name": "Generic PVA", + "type": "PVA", + "vendor": "Generic" + }, + "OFDxfPgH": { + "bambu_id": "GFA08", + "name": "Bambu PLA Sparkle", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFEGNJD4": { + "bambu_id": "GFA05", + "name": "Bambu PLA Silk", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFEkPBwx": { + "bambu_id": "GFA12", + "name": "Bambu PLA Glow", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFEswT5W": { + "bambu_id": "GFA50", + "name": "Bambu PLA-CF", + "type": "PLA-CF", + "vendor": "Bambu Lab" + }, + "OFFNYwWR": { + "bambu_id": "GFN03", + "name": "Bambu PA-CF", + "type": "PA-CF", + "vendor": "Bambu Lab" + }, + "OFFbSnCD": { + "bambu_id": "GFA17", + "name": "Bambu PLA Translucent", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFFvzqcd": { + "bambu_id": "GFG00", + "name": "Bambu PETG Basic", + "type": "PETG", + "vendor": "Bambu Lab" + }, + "OFHWSM21": { + "bambu_id": "GFL54", + "name": "Fiberon PET-CF", + "type": "PET-CF", + "vendor": "Polymaker" + }, + "OFHa48An": { + "bambu_id": "GFT01", + "name": "Bambu PET-CF", + "type": "PET-CF", + "vendor": "Bambu Lab" + }, + "OFHmPYRy": { + "bambu_id": "GFSNL04", + "name": "SUNLU PLA+ 2.0", + "type": "PLA", + "vendor": "SUNLU" + }, + "OFIBbYO5": { + "bambu_id": "GFU02", + "name": "Bambu TPU for AMS", + "type": "TPU-AMS", + "vendor": "Bambu Lab" + }, + "OFIfnzxC": { + "bambu_id": "GFS05", + "name": "Bambu Support For PLA/PETG", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFKhMPeX": { + "bambu_id": "GFC00", + "name": "Bambu PC", + "type": "PC", + "vendor": "Bambu Lab" + }, + "OFLJ8S6I": { + "bambu_id": "GFSNL07", + "name": "SUNLU Wood PLA", + "type": "PLA", + "vendor": "SUNLU" + }, + "OFLPAxz3": { + "bambu_id": "GFB98", + "name": "Generic ASA", + "type": "ASA", + "vendor": "Generic" + }, + "OFLakOUI": { + "bambu_id": "GFC99", + "name": "Generic PC", + "type": "PC", + "vendor": "Generic" + }, + "OFMTK0UC": { + "bambu_id": "GFS03", + "name": "Bambu Support For PA/PET", + "type": "PA", + "vendor": "Bambu Lab" + }, + "OFMUWNkp": { + "bambu_id": "GFSNL03", + "name": "SUNLU PLA+", + "type": "PLA", + "vendor": "SUNLU" + }, + "OFMjtqTC": { + "bambu_id": "GFA16", + "name": "Bambu PLA Wood", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFNk8bxk": { + "bambu_id": "GFN08", + "name": "Bambu PA6-GF", + "type": "PA-GF", + "vendor": "Bambu Lab" + }, + "OFOvv91M": { + "bambu_id": "GFB60", + "name": "PolyLite ABS", + "type": "ABS", + "vendor": "Polymaker" + }, + "OFPklMI1": { + "bambu_id": "GFP99", + "name": "Generic PE", + "type": "PE", + "vendor": "Generic" + }, + "OFQ3e56w": { + "bambu_id": "GFA15", + "name": "Bambu PLA Galaxy", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFQHiNJs": { + "bambu_id": "GFS01", + "name": "Bambu Support G", + "type": "PA", + "vendor": "Bambu Lab" + }, + "OFQLcbps": { + "bambu_id": "GFN98", + "name": "Generic PA-CF", + "type": "PA-CF", + "vendor": "Generic" + }, + "OFS2tn6G": { + "bambu_id": "GFL53", + "name": "Fiberon PA612-CF", + "type": "PA", + "vendor": "Polymaker" + }, + "OFTHDCqA": { + "bambu_id": "GFA19", + "name": "Bambu PLA Pure", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFTRZ8Y4": { + "bambu_id": "GFG50", + "name": "Bambu PETG-CF", + "type": "PETG-CF", + "vendor": "Bambu Lab" + }, + "OFUanySo": { + "bambu_id": "GFA06", + "name": "Bambu PLA Silk+", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFVCkX5w": { + "bambu_id": "GFU01", + "name": "Bambu TPU 95A", + "type": "TPU", + "vendor": "Bambu Lab" + }, + "OFW29a9R": { + "bambu_id": "GFL01", + "name": "PolyTerra PLA", + "type": "PLA", + "vendor": "Polymaker" + }, + "OFWbdGsC": { + "bambu_id": "GFL98", + "name": "Generic PLA-CF", + "type": "PLA-CF", + "vendor": "Generic" + }, + "OFX0ycRQ": { + "bambu_id": "GFL52", + "name": "Fiberon PA12-CF", + "type": "PA-CF", + "vendor": "Polymaker" + }, + "OFXIbw5D": { + "bambu_id": "GFA01", + "name": "Bambu PLA Matte", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFXkm8q1": { + "bambu_id": "GFP96", + "name": "Generic PP-CF", + "type": "PP-CF", + "vendor": "Generic" + }, + "OFXzQ4yL": { + "bambu_id": "GFB02", + "name": "Bambu ASA-Aero", + "type": "ASA-AERO", + "vendor": "Bambu Lab" + }, + "OFY9muEs": { + "bambu_id": "GFB99", + "name": "Generic ABS", + "type": "ABS", + "vendor": "Generic" + }, + "OFYPdQJh": { + "bambu_id": "GFG99", + "name": "Generic PETG", + "type": "PETG", + "vendor": "Generic" + }, + "OFaQMgRH": { + "bambu_id": "GFA09", + "name": "Bambu PLA Tough", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFc3xdm9": { + "bambu_id": "GFL04", + "name": "Overture PLA", + "type": "PLA", + "vendor": "Overture" + }, + "OFcytyoA": { + "bambu_id": "GFL06", + "name": "Fiberon PETG-ESD", + "type": "PETG", + "vendor": "Polymaker" + }, + "OFd0Fv0k": { + "bambu_id": "GFP98", + "name": "Generic PE-CF", + "type": "PE-CF", + "vendor": "Generic" + }, + "OFdyfQvU": { + "bambu_id": "GFG03", + "name": "Bambu PETG Matte", + "type": "PETG", + "vendor": "Bambu Lab" + }, + "OFesA6rF": { + "bambu_id": "GFL96", + "name": "Generic PLA Silk", + "type": "PLA", + "vendor": "Generic" + }, + "OFf6mfQO": { + "bambu_id": "GFS06", + "name": "Bambu Support for ABS", + "type": "ABS", + "vendor": "Bambu Lab" + }, + "OFfBpSRI": { + "bambu_id": "GFB01", + "name": "Bambu ASA", + "type": "ASA", + "vendor": "Bambu Lab" + }, + "OFg57Nmc": { + "bambu_id": "GFC01", + "name": "Bambu PC FR", + "type": "PC", + "vendor": "Bambu Lab" + }, + "OFg8ndtj": { + "bambu_id": "GFN99", + "name": "Generic PA", + "type": "PA", + "vendor": "Generic" + }, + "OFgbpcy9": { + "bambu_id": "GFU99", + "name": "Generic TPU", + "type": "TPU", + "vendor": "Generic" + }, + "OFhuaUQB": { + "bambu_id": "GFB00", + "name": "Bambu ABS", + "type": "ABS", + "vendor": "Bambu Lab" + }, + "OFk8t9mz": { + "bambu_id": "GFL55", + "name": "Fiberon PETG-rCF", + "type": "PETG-CF", + "vendor": "Polymaker" + }, + "OFkOviHk": { + "bambu_id": "GFL50", + "name": "Fiberon PA6-CF", + "type": "PA6-CF", + "vendor": "Polymaker" + }, + "OFknl9Iz": { + "bambu_id": "GFB50", + "name": "Bambu ABS-GF", + "type": "ABS-GF", + "vendor": "Bambu Lab" + }, + "OFlfuj2k": { + "bambu_id": "GFU04", + "name": "Bambu TPU 85A", + "type": "TPU", + "vendor": "Bambu Lab" + }, + "OFmN2lvw": { + "bambu_id": "GFU98", + "name": "Generic TPU for AMS", + "type": "TPU-AMS", + "vendor": "Generic" + }, + "OFmpMwxS": { + "bambu_id": "GFL95", + "name": "Generic PLA High Speed", + "type": "PLA", + "vendor": "Generic" + }, + "OFnfxTvi": { + "bambu_id": "GFA18", + "name": "Bambu PLA Lite", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFniMuTN": { + "bambu_id": "GFN05", + "name": "Bambu PA6-CF", + "type": "PA6-CF", + "vendor": "Bambu Lab" + }, + "OFo2UF2C": { + "bambu_id": "GFS97", + "name": "Generic BVOH", + "type": "BVOH", + "vendor": "Generic" + }, + "OFoYSJKi": { + "bambu_id": "GFG98", + "name": "Generic PETG-CF", + "type": "PETG-CF", + "vendor": "Generic" + }, + "OFoiVqVM": { + "bambu_id": "GFA00", + "name": "Bambu PLA Basic", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFovEIbw": { + "bambu_id": "GFG02", + "name": "Bambu PETG HF", + "type": "PETG", + "vendor": "Bambu Lab" + }, + "OFpPGSKG": { + "bambu_id": "GFSNL05", + "name": "SUNLU Silk PLA+", + "type": "PLA", + "vendor": "SUNLU" + }, + "OFpW4gdi": { + "bambu_id": "GFSNL02", + "name": "SUNLU PLA Matte", + "type": "PLA", + "vendor": "SUNLU" + }, + "OFq9svOz": { + "bambu_id": "GFT97", + "name": "Generic PPS", + "type": "PPS", + "vendor": "Generic" + }, + "OFqINlYj": { + "bambu_id": "GFL03", + "name": "eSUN PLA+", + "type": "PLA", + "vendor": "eSUN" + }, + "OFrKLeE3": { + "bambu_id": "GFA02", + "name": "Bambu PLA Metal", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFsFon5l": { + "bambu_id": "GFS98", + "name": "Generic HIPS", + "type": "HIPS", + "vendor": "Generic" + }, + "OFsHSVZc": { + "bambu_id": "GFS00", + "name": "Bambu Support W", + "type": "PLA", + "vendor": "Bambu Lab" + }, + "OFsijjtH": { + "bambu_id": "GFP95", + "name": "Generic PP-GF", + "type": "PP-GF", + "vendor": "Generic" + }, + "OFtkLO6q": { + "bambu_id": "GFU03", + "name": "Bambu TPU 90A", + "type": "TPU", + "vendor": "Bambu Lab" + }, + "OFu1evlr": { + "bambu_id": "GFG97", + "name": "Generic PCTG", + "type": "PCTG", + "vendor": "Generic" + }, + "OFvKUnLh": { + "bambu_id": "GFU00", + "name": "Bambu TPU 95A HF", + "type": "TPU", + "vendor": "Bambu Lab" + }, + "OFvrXuV7": { + "bambu_id": "GFB61", + "name": "PolyLite ASA", + "type": "ASA", + "vendor": "Polymaker" + }, + "OFwPrlCM": { + "bambu_id": "GFG01", + "name": "Bambu PETG Translucent", + "type": "PETG", + "vendor": "Bambu Lab" + }, + "OFwaYjL6": { + "bambu_id": "GFL51", + "name": "Fiberon PA6-GF", + "type": "PA-GF", + "vendor": "Polymaker" + }, + "OFxUwUeW": { + "bambu_id": "GFSNL06", + "name": "SUNLU PLA Marble", + "type": "PLA", + "vendor": "SUNLU" + }, + "OFzyIxba": { + "bambu_id": "GFS04", + "name": "Bambu PVA", + "type": "PVA", + "vendor": "Bambu Lab" + } + }, + "generated": "2026-09-04", + "source": "https://github.com/bambulab/BambuStudio" +} diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index ef61992784..2ff0e42a7c 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -18,6 +18,7 @@ import uuid sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) import assign_filament_ids as afi # noqa: E402 +import update_bambu_filament_ids as ubfi # noqa: E402 REPO_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")) REAL_PROFILES = os.path.join(REPO_ROOT, "resources", "profiles") @@ -1081,5 +1082,137 @@ class TestReviewFixes(SyntheticTreeCase): self.assertIn(afi.generate_filament_id("OV", "PLA", "Orphan PLA"), out) +# --------------------------------------------------------------------------- +# scripts/update_bambu_filament_ids.py: the generated Bambu catalog id map +# --------------------------------------------------------------------------- + +class TestBambuMap(unittest.TestCase): + def _bs_tree(self, families): + # families: list of (family, bambu_id, vendor, type); builds a minimal BBL bundle + # with an @base per family carrying the id and one instantiated child. + t = SyntheticTree() + self.addCleanup(t.cleanup) + presets = [] + for family, bambu_id, vendor, ftype in families: + presets.append(preset(f"{family} @base", filament_id=bambu_id, + instantiation=False, filament_vendor=vendor, + filament_type=ftype)) + presets.append(preset(f"{family} @P1", inherits=f"{family} @base", + compatible_printers=["P1 0.4 nozzle"])) + t.add_vendor("BBL", presets) + filaments, errors = afi.load_vendor_filaments(t.profiles, "BBL") + self.assertEqual(errors, []) + return filaments + + def test_one_row_per_family(self): + rows = ubfi.derive_rows(self._bs_tree([("Bambu ABS", "GFB00", "Bambu Lab", "ABS")]), {}) + self.assertEqual(rows, {afi.generate_filament_id("Bambu Lab", "ABS", "Bambu ABS"): + {"bambu_id": "GFB00", "vendor": "Bambu Lab", "type": "ABS", "name": "Bambu ABS"}}) + + def test_shared_bambu_id_is_an_error(self): + with self.assertRaises(SystemExit): + ubfi.derive_rows(self._bs_tree([("A", "GFX00", "V", "PLA"), ("B", "GFX00", "V", "PLA")]), {}) + + def test_reuses_the_id_we_ship_for_that_triple(self): + rows = ubfi.derive_rows(self._bs_tree([("Bambu ABS", "GFB00", "Bambu Lab", "ABS")]), + {("Bambu Lab", "ABS", "Bambu ABS"): "OFsalted1"}) + self.assertIn("OFsalted1", rows) + + @unittest.skipUnless(os.path.isdir("/Users/lijiang/codes/BambuStudio/resources/profiles"), "no local clone") + def test_local_clone_yields_the_catalog(self): + rows = ubfi.derive_rows(afi.load_vendor_filaments("/Users/lijiang/codes/BambuStudio/resources/profiles", "BBL")[0], {}) + self.assertEqual(len(rows), 100) + self.assertEqual(len({r["bambu_id"] for r in rows.values()}), 100) + + +class TestOrcaTriplesFromAnalysis(unittest.TestCase): + def _tree(self): + t = SyntheticTree() + self.addCleanup(t.cleanup) + t.add_vendor("VendorA", [ + # Same triple declared under two different ids on purpose: mirrors + # a real, sanctioned case (Cubicon's xCeler line keeps its own id + # per printer instead of inheriting the family's @base id). + # Ambiguous, but must stay harmless unless something needs it. + preset("Ambig PLA @base", filament_id="OF111111", instantiation=False, + filament_vendor="V", filament_type="PLA"), + preset("Ambig PLA @P1", filament_id="OF222222", inherits="Ambig PLA @base", + compatible_printers=["P1"]), + # An unambiguous family elsewhere in the same tree. + preset("Needed PLA @base", filament_id="OF333333", instantiation=False, + filament_vendor="V2", filament_type="PLA"), + preset("Needed PLA @P1", inherits="Needed PLA @base", + compatible_printers=["P1"]), + ]) + return afi.analyze_tree(t.profiles) + + def test_ambiguity_outside_needed_triples_is_ignored(self): + analysis = self._tree() + result = ubfi.orca_triples_from_analysis(analysis, {("V2", "PLA", "Needed PLA")}) + self.assertEqual(result, {("V2", "PLA", "Needed PLA"): "OF333333"}) + + def test_ambiguity_inside_needed_triples_is_an_error(self): + analysis = self._tree() + with self.assertRaises(SystemExit): + ubfi.orca_triples_from_analysis(analysis, {("V", "PLA", "Ambig PLA")}) + + +class TestWriteMap(unittest.TestCase): + def test_format(self): + d = tempfile.mkdtemp(prefix="bambu_map_test_") + self.addCleanup(shutil.rmtree, d, ignore_errors=True) + # nested, not-yet-existing directory: write_map must create it + path = os.path.join(d, "out", "bambu_filament_ids.json") + rows = {"OFabc123": {"bambu_id": "GFB00", "vendor": "Bambu Lab", "type": "ABS", "name": "Bambu ABS"}} + + ubfi.write_map(path, rows, "66e405477", "2026-09-04") + + with open(path, "rb") as f: + raw = f.read() + self.assertTrue(raw.endswith(b"\n")) + self.assertNotIn(b"\r", raw) + text = raw.decode("utf-8") + self.assertEqual(json.loads(text), { + "source": "https://github.com/bambulab/BambuStudio", + "bambustudio_commit": "66e405477", + "generated": "2026-09-04", + "filaments": rows, + }) + # sorted top-level keys + self.assertLess(text.index('"bambustudio_commit"'), text.index('"filaments"')) + self.assertLess(text.index('"filaments"'), text.index('"generated"')) + self.assertLess(text.index('"generated"'), text.index('"source"')) + + +class TestDriftReport(unittest.TestCase): + def test_reports_both_directions(self): + t = SyntheticTree() + self.addCleanup(t.cleanup) + t.add_vendor("BBL", [ + preset("Match PLA @base", filament_id="GFX01", instantiation=False, + filament_vendor="V", filament_type="PLA"), + preset("Match PLA @P1", inherits="Match PLA @base", + compatible_printers=["P1"]), + preset("Orphan PLA @base", filament_id="GFX03", instantiation=False, + filament_vendor="V", filament_type="PLA"), + preset("Orphan PLA @P1", inherits="Orphan PLA @base", + compatible_printers=["P1"]), + ]) + rows = { + # matches the BBL bundle's "Match PLA" family: no drift either way + "OFmatch01": {"bambu_id": "GFX01", "vendor": "V", "type": "PLA", "name": "Match PLA"}, + # no family of this identity in the BBL bundle above + "OFghost01": {"bambu_id": "GFX02", "vendor": "V", "type": "PLA", "name": "Upstream Only PLA"}, + } + orca_analysis = afi.analyze_tree(t.profiles) + + lines = ubfi.drift_report(rows, orca_analysis) + + report = "\n".join(lines) + self.assertIn("Upstream Only PLA", report) + self.assertIn("Orca BBL families with no row: 1", report) + self.assertNotIn("Match PLA", report) # the matched family is not drift + + if __name__ == "__main__": unittest.main() diff --git a/scripts/update_bambu_filament_ids.py b/scripts/update_bambu_filament_ids.py new file mode 100644 index 0000000000..744fcc0401 --- /dev/null +++ b/scripts/update_bambu_filament_ids.py @@ -0,0 +1,291 @@ +#!/usr/bin/env python3 +""" +Generate resources/printers/bambu_filament_ids.json: the map from Orca's +content-addressed filament_id ("OF" + 6 base62 chars, see assign_filament_ids.py) +to Bambu Lab's own AMS/RFID catalog id ("GF..." etc.) for the subset of filament +products Bambu ships. + +The map is generated from BambuStudio's OWN shipped BBL bundle, never from +Orca's: Orca's BBL bundle is a fork of Bambu's, tuned and extended +independently, so it is not the source of truth for Bambu's catalog ids. +Nothing in OrcaSlicer consumes this map yet; it exists so a later change can +translate an id only where it crosses to or from a Bambu printer, without +hand-maintaining the correspondence. + +One row per BambuStudio filament PRODUCT: one commercial line = one +"@base"-declared filament_id, shared by every per-printer/per-nozzle +instantiation of it (BambuStudio follows the same one-product-one-id shape +Orca's own filament_id policy does). A row's key reuses whatever OF id Orca +already ships for that same (filament_vendor, filament_type, family) triple; +a triple Orca does not ship anywhere yet gets a freshly generated one. + +Map format: +{ + "source": "https://github.com/bambulab/BambuStudio", + "bambustudio_commit": "66e405477", + "generated": "2026-09-04", + "filaments": { + "OFhuaUQB": {"bambu_id": "GFB00", "vendor": "Bambu Lab", "type": "ABS", "name": "Bambu ABS"} + } +} + +Run from anywhere: python3 scripts/update_bambu_filament_ids.py + (default) shallow-clone BambuStudio's master branch (sparse: just + the BBL filament bundle) and regenerate the map + --bambustudio-dir DIR + read DIR (a BambuStudio resources/profiles checkout) + instead of cloning + --ref REF clone this BambuStudio ref instead of master + --output PATH write here instead of resources/printers/bambu_filament_ids.json + +After writing, an informational drift report is printed: BambuStudio families +Orca ships nothing with the same identity for, and a count of Orca's own BBL +families that matched no BambuStudio row. Neither blocks the write; both are +for a human to read. +""" + +import argparse +import json +import os +import shutil +import subprocess +import sys +import tempfile +import datetime + +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) +from assign_filament_ids import ( # noqa: E402 + OFL, + OF_ID_RE, + PROFILES_DIR, + analyze_tree, + base_name, + generate_filament_id, + load_vendor_filaments, + print_error, + print_info, + print_success, + resolve_filament_id, + resolve_triple, +) + +SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) +BAMBU_MAP_PATH = os.path.normpath( + os.path.join(SCRIPTS_DIR, "..", "resources", "printers", "bambu_filament_ids.json")) + +BAMBUSTUDIO_REPO = "https://github.com/bambulab/BambuStudio" + + +# --------------------------------------------------------------------------- +# Row derivation +# --------------------------------------------------------------------------- + +def derive_rows(bs_filaments, orca_triples): + """orca_triples: {(vendor, type, family): orca_id} built from analyze_tree()["triples"].""" + by_family = {} # family -> (bambu_id, triple) + for rec in bs_filaments.values(): + if not rec["instantiation"]: + continue + bambu_id, _src, _entry = resolve_filament_id(rec["name"], bs_filaments, {}) + if not bambu_id: + continue + family = base_name(rec["name"]) + triple = resolve_triple(rec["name"], bs_filaments, {}) + prev = by_family.setdefault(family, (bambu_id, triple)) + if prev != (bambu_id, triple): + raise SystemExit(f"BambuStudio family {family!r} is not one product: {prev} vs {(bambu_id, triple)}") + rows, seen = {}, {} + for family, (bambu_id, triple) in sorted(by_family.items()): + if bambu_id in seen: + raise SystemExit(f"Bambu id {bambu_id} is shared by {seen[bambu_id]!r} and {family!r}") + seen[bambu_id] = family + orca_id = orca_triples.get(triple) or generate_filament_id(*triple) # reuse a salted id if we ship one + rows[orca_id] = {"bambu_id": bambu_id, "vendor": triple[0], "type": triple[1], "name": triple[2]} + return rows + + +def orca_triples_from_analysis(orca_analysis, needed_triples): + """{(vendor, type, family): orca_id}, inverted from analyze_tree()["triples"] + (id -> [[vendor, type, family], ...]) and restricted to `needed_triples` + (the triples BambuStudio's own bundle ships, i.e. the only ones derive_rows + will ever look up). + + Kept to ids matching the OF format: our own BBL bundle still declares + Bambu's GF ids today (analyze_tree already excludes those as BBL-island + declarations), but filtering here too means a future triple shipped under + a non-OF scheme can never key a map row, which must always be keyed by + the OF id the BBL bundle receives once it is re-minted onto the OF space. + + A needed triple owned by more than one OF id would make derive_rows's + reuse step a guess, so that is a hard error rather than a silent pick. + Restricting the scan to needed_triples matters for that check: elsewhere + in the tree one triple legitimately resolves two different ids on purpose + (e.g. Cubicon's xCeler line declares its own id per printer instead of + inheriting its family's, sanctioned in scripts/filament_id_snapshot.json) + and that pre-existing, Bambu-unrelated divergence must not block a map + that never reads it. + """ + needed_triples = set(needed_triples) + result = {} + for fid, triple_list in orca_analysis["triples"].items(): + if not OF_ID_RE.match(fid): + continue + for triple in triple_list: + triple = tuple(triple) + if triple not in needed_triples: + continue + owner = result.get(triple) + if owner and owner != fid: + raise SystemExit( + f"Orca triple {triple} resolves to more than one filament_id: " + f"{owner!r} and {fid!r}") + result[triple] = fid + return result + + +# --------------------------------------------------------------------------- +# Drift report (informational only) +# --------------------------------------------------------------------------- + +def drift_report(rows, orca_analysis): + """Two triple-identity comparisons between the map just derived and Orca's + own BBL bundle (never id-based: the two bundles assign filament_id + independently, so only the (vendor, type, name) identity is comparable). + + Returns print-ready lines: one per BambuStudio row triple with no + same-triple family in Orca's BBL bundle (upstream ships it, we ship + nothing with that identity there — sometimes a genuinely missing product, + sometimes a renamed one), then a count of Orca's own BBL families that + matched no BambuStudio row (Orca-only products, e.g. a name-drifted + duplicate of one already counted in the first list). + """ + row_triples = {(r["vendor"], r["type"], r["name"]) for r in rows.values()} + + bbl_filaments = orca_analysis["vendors"].get("BBL", {}) + ofl_filaments = orca_analysis["vendors"].get(OFL, {}) + orca_families = {} + for rec in bbl_filaments.values(): + if not rec["instantiation"]: + continue + triple = resolve_triple(rec["name"], bbl_filaments, ofl_filaments) + orca_families.setdefault(base_name(rec["name"]), triple) + + lines = [] + for triple in sorted(row_triples - set(orca_families.values())): + lines.append(f'upstream ships {triple[2]!r} ({triple[0]}/{triple[1]}), ' + "we ship nothing with that identity") + orca_only = [family for family, triple in orca_families.items() if triple not in row_triples] + lines.append(f"Orca BBL families with no row: {len(orca_only)} Orca-only product(s)") + return lines + + +# --------------------------------------------------------------------------- +# Map IO +# --------------------------------------------------------------------------- + +def write_map(path, rows, commit, date): + """Write the map: sorted keys, indent 2, LF, trailing newline.""" + payload = { + "source": BAMBUSTUDIO_REPO, + "bambustudio_commit": commit, + "generated": date, + "filaments": rows, + } + os.makedirs(os.path.dirname(path), exist_ok=True) + with open(path, "w", encoding="utf-8", newline="\n") as f: + json.dump(payload, f, indent=2, ensure_ascii=False, sort_keys=True) + f.write("\n") + + +# --------------------------------------------------------------------------- +# BambuStudio fetch +# --------------------------------------------------------------------------- + +def run(command, cwd=None): + """Run a command, streaming its output; raise SystemExit on failure.""" + print("+ " + " ".join(command)) + try: + subprocess.run(command, cwd=cwd, check=True) + except subprocess.CalledProcessError as e: + raise SystemExit(f"command failed ({e.returncode}): {' '.join(command)}") from e + + +def run_out(command, cwd=None): + """Run a command and return its stripped stdout; raise SystemExit on failure.""" + try: + result = subprocess.run(command, cwd=cwd, check=True, capture_output=True, text=True) + except subprocess.CalledProcessError as e: + raise SystemExit( + f"command failed ({e.returncode}): {' '.join(command)}\n{e.stderr}") from e + return result.stdout.strip() + + +def fetch_bambustudio(ref, workdir): + run(["git", "clone", "--depth=1", "--filter=blob:none", "--sparse", "--branch", ref, + BAMBUSTUDIO_REPO + ".git", workdir]) + run(["git", "-C", workdir, "sparse-checkout", "set", "--no-cone", + "resources/profiles/BBL.json", "resources/profiles/BBL/filament"]) + return os.path.join(workdir, "resources", "profiles"), run_out(["git", "-C", workdir, "rev-parse", "--short", "HEAD"]) + + +def local_dir_commit(dir_path): + """git rev-parse --short HEAD of dir_path, or "local" when it is not a repo.""" + result = subprocess.run(["git", "-C", dir_path, "rev-parse", "--short", "HEAD"], + capture_output=True, text=True) + return result.stdout.strip() if result.returncode == 0 else "local" + + +# --------------------------------------------------------------------------- +# CLI +# --------------------------------------------------------------------------- + +def main(argv=None): + parser = argparse.ArgumentParser( + description="Regenerate resources/printers/bambu_filament_ids.json from " + "BambuStudio's shipped BBL bundle.") + source = parser.add_mutually_exclusive_group() + source.add_argument("--bambustudio-dir", metavar="DIR", + help="a BambuStudio resources/profiles directory to read " + "instead of cloning") + source.add_argument("--ref", default="master", + help='BambuStudio git ref to shallow-clone when ' + '--bambustudio-dir is not given (default: "master")') + parser.add_argument("--output", default=BAMBU_MAP_PATH, + help="output path (default: resources/printers/bambu_filament_ids.json)") + args = parser.parse_args(argv) + + workdir = None + if args.bambustudio_dir: + profiles_dir = args.bambustudio_dir + commit = local_dir_commit(profiles_dir) + else: + workdir = tempfile.mkdtemp(prefix="bambustudio_") + profiles_dir, commit = fetch_bambustudio(args.ref, workdir) + + try: + bs_filaments, errors = load_vendor_filaments(profiles_dir, "BBL") + if errors: + for e in errors: + print_error(e) + raise SystemExit("unreadable BambuStudio filament profile(s)") + + orca_analysis = analyze_tree(PROFILES_DIR) + needed_triples = {resolve_triple(rec["name"], bs_filaments, {}) + for rec in bs_filaments.values() if rec["instantiation"]} + orca_triples = orca_triples_from_analysis(orca_analysis, needed_triples) + + rows = derive_rows(bs_filaments, orca_triples) + write_map(args.output, rows, commit, datetime.date.today().isoformat()) + print_success(f"wrote {len(rows)} row(s) to {args.output} (BambuStudio @ {commit})") + + for line in drift_report(rows, orca_analysis): + print_info(line) + finally: + if workdir: + shutil.rmtree(workdir, ignore_errors=True) + + return 0 + + +if __name__ == "__main__": + sys.exit(main()) From 40cc3340b1ccbc94a3aca9d7146641efd3cce021 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 4 Sep 2026 14:25:00 +0800 Subject: [PATCH 42/52] Content-address Bambu filament ids and check profiles against the catalog map Every vendor's filament_id declarations, Bambu's own bundle included, are now minted and checked the same way: the GF* catalog space is reserved but ownerless, format is validated unconditionally with no snapshot or BBL exemption, and both --remint and the default assign pass treat a non-OF declaration as one needing a fresh mint (so a future BambuStudio sync self-heals instead of needing a manual pass). A new check validates resources/printers/bambu_filament_ids.json against the tree it describes: that it parses, carries its header, keys only OF ids, maps each Bambu id once, and agrees with the tree on every product it shares. The redundant BBL/OFL carve-out in the profile checker's length check is dropped too, so it runs the same way for every vendor. The BBL bundle itself hasn't been touched yet and still declares its old GF ids, so TestRealTree.test_shipped_snapshot_matches_tree is expected to fail here (209 declarations flagged) until the next commit re-mints the bundle onto OF ids. --- scripts/assign_filament_ids.py | 193 ++++++++++++++++++++-------- scripts/orca_extra_profile_check.py | 17 +-- scripts/tests/test_filament_id.py | 179 +++++++++++++++++++++----- 3 files changed, 297 insertions(+), 92 deletions(-) diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index 46a138253c..cc3adeab4a 100755 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -24,7 +24,10 @@ Policy (companion to assign_vendor_setting_ids.py; see docs/HLSD/filament_id.md) Identity changes (a family rename, a filament_vendor/filament_type fix) change the id BY DESIGN. * Reserved id spaces that are never minted into or altered: - - GF* Bambu AMS/RFID catalog (vendor BBL untouchable) + - GF* Bambu AMS/RFID catalog: frozen, no preset of any + vendor (including BBL) may declare one; the + generated resources/printers/bambu_filament_ids.json + carries the correspondence instead - QD_* Qidi device protocol: the box composes these ids at runtime, they are not preset ids, and no preset may declare one @@ -43,8 +46,9 @@ OFL it stays in OFL; a vendor chain that dead-ends id-less retries its direct parent in the OFL map. filament_vendor / filament_type resolve the same way. Run from anywhere: python3 scripts/assign_filament_ids.py - (default) mint + insert ids for id-less families; idempotent, never - rewrites a valid existing id; a no-op on a fully-idded tree + (default) mint + insert ids for id-less families, mint + replace + non-OF-format declarations; idempotent, never rewrites a + valid OF-format id; a no-op once every family has one --mint "Vendor/Type/Family" print the id that triple would mint; touches nothing --update-snapshot regenerate the snapshot from the tree @@ -75,6 +79,10 @@ FILAMENT_ID_LENGTH = 6 # base62 digits after the "OF" prefix -> 8 chars total SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) PROFILES_DIR = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "resources", "profiles")) SNAPSHOT_PATH = os.path.join(SCRIPTS_DIR, "filament_id_snapshot.json") +# Same path update_bambu_filament_ids.BAMBU_MAP_PATH computes; kept as a sibling +# constant (not imported) because that module imports FROM this one already. +BAMBU_MAP_PATH = os.path.normpath( + os.path.join(SCRIPTS_DIR, "..", "resources", "printers", "bambu_filament_ids.json")) OFL = "OrcaFilamentLibrary" @@ -89,6 +97,7 @@ BASE_NAME_RE = re.compile(r"\s?@.*$") MAX_CHECK_SALT = 8 UPDATE_HINT = 'run "python scripts/assign_filament_ids.py --update-snapshot" and commit the diff for maintainer review' +BAMBU_MAP_HINT = 'regenerate the map with "python scripts/update_bambu_filament_ids.py" and commit the diff for maintainer review' # Same output helpers/format as orca_extra_profile_check.py (not imported from @@ -304,12 +313,6 @@ def resolve_triple(name, filaments, ofl_filaments): base_name(name)) -def is_island_declaration(vendor, fid): - """Declarations frozen outside the OF mint domain: all of BBL (the QD_* - island was dissolved by plan v4 — Qidi declarations mint like any other).""" - return vendor == "BBL" - - def analyze_tree(profiles_dir): """Load every vendor bundle and derive the full filament_id state. @@ -351,8 +354,8 @@ def analyze_tree(profiles_dir): overrides = [] # (vendor, name, declared, inherited, file) missing_effective = [] # (vendor, name, file) instantiated presets resolving no id alias_candidates = [] # (vendor, rec, ofl_entry, own_key) presets riding an OFL family - triples = {} # fid -> set of triples of its non-island declarers - declarer_triples = [] # (vendor, rec, fid, triple) per non-island declarer + triples = {} # fid -> set of triples of its declarers + declarer_triples = [] # (vendor, rec, fid, triple) per declarer family_triples = {} # (vendor, family) -> {triple: [declarer names]} for vendor, filaments in vendors.items(): @@ -363,14 +366,13 @@ def analyze_tree(profiles_dir): occurring.add(fid) declared_ids.setdefault(vendor, set()).add(fid) ids.setdefault(fid, set()) - if not is_island_declaration(vendor, fid): - triple = resolve_triple(rec["name"], filaments, ofl_filaments) - rec["triple"] = triple - declarer_triples.append((vendor, rec, fid, triple)) - triples.setdefault(fid, set()).add(triple) - family_triples.setdefault( - (vendor, base_name(rec["name"])), {}).setdefault( - triple, []).append(rec["name"]) + triple = resolve_triple(rec["name"], filaments, ofl_filaments) + rec["triple"] = triple + declarer_triples.append((vendor, rec, fid, triple)) + triples.setdefault(fid, set()).add(triple) + family_triples.setdefault( + (vendor, base_name(rec["name"])), {}).setdefault( + triple, []).append(rec["name"]) if rec.get("inherits"): inherited, _src, skip_entry = resolve_filament_id( rec["name"], filaments, ofl_filaments, skip_own=True) @@ -495,7 +497,7 @@ def write_snapshot(path, obj): def reserved_space_owner(fid): """(is_reserved, owner_vendor or None) for the frozen id spaces.""" if fid.startswith("GF"): - return True, "BBL" + return True, None # Bambu AMS/RFID catalog: frozen, no vendor (not even BBL) may declare it if fid.startswith("QD_"): return True, None # dissolved Qidi device-protocol space: NO vendor may declare it if USER_CUSTOM_ID_RE.match(fid) or fid == "null": @@ -507,6 +509,8 @@ def reserved_space_desc(fid, owner): """Human description of a reserved space for error messages.""" if owner: return f"owned by {owner}" + if fid.startswith("GF"): + return "Bambu AMS/RFID catalog; frozen, no preset may declare it" if fid.startswith("QD_"): return "Qidi device protocol; composed by the device, never a preset id" return "reserved for user-custom presets" @@ -516,30 +520,35 @@ def reserved_space_desc(fid, owner): # Checks (imported and called tree-wide by orca_extra_profile_check.py) # --------------------------------------------------------------------------- -def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): +def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, + map_path=BAMBU_MAP_PATH): """Validate filament_id state across every vendor. Returns the error count. - 1. Format: every id occurring in the tree (declared or effective) must be in - the snapshot, or match ^OF[0-9A-Za-z]{6}$, or belong to vendor BBL. + 1. Format: every id occurring in the tree (declared or effective) must + match ^OF[0-9A-Za-z]{6}$. No exceptions: not the snapshot, not BBL. 2. Snapshot equality, both directions: the tree-derived id->families multimap AND the id->triples map of the declarers must equal the snapshot exactly (the snapshot diff is the maintainer gate). - 3. Mint conformance: a non-island OF-format declaration must equal the mint - of the declarer's triple or a salted iteration, unless that exact - (id, triple) pair is grandfathered in the snapshot. + 3. Mint conformance: an OF-format declaration must equal the mint of the + declarer's triple or a salted iteration, unless that exact (id, triple) + pair is grandfathered in the snapshot. 4. Alias hygiene: a vendor preset riding an OFL family must keep the OFL base name, claim printers via non-empty compatible_printers, and declare no filament_id key of its own. - 5. Reserved namespaces (GF* for BBL; QD_*/P-hex/"null" for nobody) must not - be claimed by other vendors, except claims grandfathered in the snapshot. + 5. Reserved namespaces (GF*/QD_*/P-hex/"null", all ownerless) must not be + claimed by any vendor, except claims grandfathered in the snapshot. 6. Structure ratchet: (a) no NEW instantiated preset carries its own filament_id key; (b) no NEW declared-vs-inherited id drift; (c) every instantiated filament resolves an effective id (a hard load error in C++). - 7. Triple integrity: (a) every non-island declarer resolves non-empty - filament_vendor and filament_type (hard error, no grandfathering); - (b) declarers of one (bundle, family) resolve identical triples, unless - grandfathered in snapshot triple_exceptions; cross-bundle divergence on - the same family name is a warning only. + 7. Triple integrity: (a) every declarer resolves non-empty filament_vendor + and filament_type (hard error, no grandfathering); (b) declarers of one + (bundle, family) resolve identical triples, unless grandfathered in + snapshot triple_exceptions; cross-bundle divergence on the same family + name is a warning only. + 8. Bambu catalog map: resources/printers/bambu_filament_ids.json must parse, + carry source/bambustudio_commit/generated, key only OF-format ids, map + each Bambu id at most once, and for every row whose key the tree claims, + the tree's triple for that id must equal the row's (vendor, type, name). """ _utf8_console() errors = 0 @@ -558,14 +567,12 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): # -- 1. format ---------------------------------------------------------- for vendor in sorted(analysis["vendor_ids"]): for fid in sorted(analysis["vendor_ids"][vendor]): - if fid in snap_ids or OF_ID_RE.match(fid): - continue - if vendor == "BBL": + if OF_ID_RE.match(fid): continue print_error( - f'filament_id "{fid}" ({vendor}) is neither grandfathered in the ' - f'snapshot nor a minted "OF" id; new family ids must come from ' - f'"python scripts/assign_filament_ids.py" (see --mint)') + f'filament_id "{fid}" ({vendor}) is not a minted "OF" id; new ' + f'family ids must come from "python scripts/assign_filament_ids.py" ' + f'(see --mint)') errors += 1 # -- 2. snapshot equality (both directions) ----------------------------- @@ -719,6 +726,43 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): f"({detail}); bundles of one product converge on one id only once " f"their triples agree") + # -- 8. Bambu catalog map -------------------------------------------------- + try: + bambu_map = load_json(map_path) + except (OSError, ValueError) as e: + print_error(f"Bambu catalog map {map_path} does not parse ({e}); {BAMBU_MAP_HINT}") + errors += 1 + else: + for key in ("source", "bambustudio_commit", "generated"): + if not bambu_map.get(key): + print_error(f'Bambu catalog map {map_path} is missing "{key}"; {BAMBU_MAP_HINT}') + errors += 1 + rows = bambu_map.get("filaments", {}) + bambu_id_owners = {} + for fid, row in sorted(rows.items()): + if not OF_ID_RE.match(fid): + print_error(f'Bambu catalog map key "{fid}" is not a minted "OF" id; ' + f"{BAMBU_MAP_HINT}") + errors += 1 + bambu_id = row.get("bambu_id") + if bambu_id in bambu_id_owners: + print_error( + f'Bambu catalog map: Bambu id "{bambu_id}" is mapped by both ' + f'"{bambu_id_owners[bambu_id]}" and "{fid}"; {BAMBU_MAP_HINT}') + errors += 1 + else: + bambu_id_owners[bambu_id] = fid + claimed = tree_triples.get(fid) + if not claimed: + continue # a product BambuStudio ships that the tree does not (yet) + row_triple = [row.get("vendor", ""), row.get("type", ""), row.get("name", "")] + if row_triple not in claimed: + print_error( + f'Bambu catalog map row "{fid}" claims triple "{"/".join(row_triple)}" ' + f'but the tree declares "{"; ".join("/".join(t) for t in claimed)}" for ' + f"that id; {BAMBU_MAP_HINT}") + errors += 1 + return errors @@ -897,13 +941,25 @@ def remove_filament_id(path, old_id): # --------------------------------------------------------------------------- def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): - """Mint + insert ids for id-less families. Never rewrites a valid existing id. + """Mint + insert ids for id-less families; mint + replace non-OF-format + declarations. Never rewrites a valid (OF-format) existing id. A family = (vendor, base name) group over instantiated filaments with no effective id. The minted id is a pure function of the family's triple — (filament_vendor, filament_type) resolved on the root(s), family name — and is inserted into the family's root(s): the presets its members inherit that carry no id, or the member itself when it has no vendor-side parent. + + A declaration whose value is not OF-format (e.g. a vendor bundle synced + from an upstream source that ships its own catalog ids, such as BBL's GF*) + is treated the same as a missing family: a fresh id is minted for the + declarer's triple and the value is replaced in place (declarers that share + one triple across several per-printer roots converge on the same id, same + as the multi-root families above). This is what makes a future BBL sync + self-healing: upstream files arrive with GF ids, this pass replaces them, + and the generated Bambu catalog map (keyed by the ids this mints) already + knows the resulting rows. + Returns (files_changed, errors). """ analysis = analyze_tree(profiles_dir) @@ -923,9 +979,17 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): continue families.setdefault((vendor, base_name(name)), []).append(rec) - if not families: - print_success("every instantiated filament already resolves a filament_id; " - "nothing to do (0 files changed)") + # Declarations whose value is not OF-format: treated as missing too (see + # docstring). Grouped by triple, not by (vendor, family), so declarers + # that legitimately share one triple across several files converge on one + # freshly minted id instead of each getting their own. + non_of_declarers = [ + (vendor, rec, fid, triple) for vendor, rec, fid, triple in analysis["declarer_triples"] + if not OF_ID_RE.match(fid)] + + if not families and not non_of_declarers: + print_success("every instantiated filament already resolves an OF-format " + "filament_id; nothing to do (0 files changed)") return 0, errors # Ids already spoken for: the whole tree (declared or effective) + snapshot. @@ -998,7 +1062,34 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): files_changed += 1 print_info(f'family "{vendor}/{family}": filament_id "{new_id}" -> {root["file"]}') + # Non-OF-format declarations: mint once per triple, rewrite every declarer + # that shares it (see docstring). + declarations_reminted = 0 + assigned = {} # triple -> id chosen this run + for vendor, rec, fid, triple in sorted(non_of_declarers, key=lambda x: (x[0], x[1]["file"])): + fvendor, ftype, family = triple + if not fvendor or not ftype: + missing = " and ".join( + k for k, v in (("filament_vendor", fvendor), + ("filament_type", ftype)) if not v) + print_error( + f'cannot re-mint "{rec["file"]}" (non-OF filament_id "{fid}"): resolves ' + f'empty {missing}; the mint key needs both (generic materials use ' + f'filament_vendor "Generic")') + errors += 1 + continue + if triple not in assigned: + assigned[triple] = mint_filament_id(fvendor, ftype, family, taken) + taken.add(assigned[triple]) + new_id = assigned[triple] + rewrite_filament_id(rec["path"], fid, new_id) + files_changed += 1 + declarations_reminted += 1 + print_info(f'family "{vendor}/{family}": non-OF filament_id "{fid}" -> "{new_id}" ' + f'({rec["file"]})') + print_info(f"families minted : {families_minted}") + print_info(f"non-OF reminted : {declarations_reminted}") print_info(f"files changed : {files_changed}") if files_changed: print_warning(f"now {UPDATE_HINT}") @@ -1010,9 +1101,12 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): # --------------------------------------------------------------------------- def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR): - """Re-derive every non-island declared id in the given vendors from its - triple; rewrite mismatching declarations in place (byte-preserving). Never - touches the snapshot — run --update-snapshot afterwards and review the diff. + """Re-derive every declared id in the given vendors from its triple; + rewrite mismatching declarations in place (byte-preserving). Never touches + the snapshot — run --update-snapshot afterwards and review the diff. + Accepts BBL like any other vendor: the GF* catalog is reserved and + ownerless, so BBL's own declarations mint OF ids the same as everyone + else's. A declaration already equal to ANY salt iteration of its own triple is mint-conformant (check 3) and left alone — deliberate salt splits (distinct @@ -1028,9 +1122,6 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR): for msg in analysis["read_errors"]: print_error(msg) errors += 1 - if "BBL" in vendor_list: - print_error("--remint BBL is forbidden (the GF* catalog is frozen)") - return 0, errors + 1 unknown = sorted(set(vendor_list) - set(analysis["vendors"])) if unknown: for v in unknown: @@ -1067,8 +1158,6 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR): key=lambda r: r["file"]) for rec in recs: fid = rec["filament_id"] - if is_island_declaration(vendor, fid): - continue scanned += 1 # Any salt iteration of the declarer's own triple is already # mint-conformant (check 3) — leave it. This keeps deliberate salt @@ -1117,7 +1206,7 @@ def drop_redundant_ids(vendor, profiles_dir=PROFILES_DIR): dropped = 0 for rec in sorted(vendor_map.values(), key=lambda r: r["file"]): fid = rec.get("filament_id") - if not fid or is_island_declaration(vendor, fid) or not rec.get("inherits"): + if not fid or not rec.get("inherits"): continue resolved, _src, entry = resolve_filament_id( rec["name"], vendor_map, ofl_map, skip_own=True) diff --git a/scripts/orca_extra_profile_check.py b/scripts/orca_extra_profile_check.py index 0bca29a985..62bd8c2916 100644 --- a/scripts/orca_extra_profile_check.py +++ b/scripts/orca_extra_profile_check.py @@ -290,19 +290,14 @@ def check_name_consistency(profiles_dir, vendor_name): return error_count, 0 -def check_filament_id(vendor, vendor_folder): +def check_filament_id(vendor_folder): """ - Make sure filament_id is not longer than 8 characters, otherwise AMS won't work properly + Make sure filament_id is not longer than 8 characters, otherwise AMS won't work properly. - NOTE: superseded by check_filament_ids (assign_filament_ids.py) for non-BBL/OFL - vendors, which validates format/uniqueness/structure tree-wide against the - grandfather snapshot. This length check stays scoped to BBL/OFL because other - vendors ship grandfathered >8-char ids (e.g. Prusa's 36-char name-ids), so it - cannot simply go tree-wide. + Runs tree-wide, every vendor alike: check_filament_ids (assign_filament_ids.py) + already requires every id in the tree to match the fixed-length "OF" format, + so this is a redundant belt-and-suspenders check, not a substitute for it. """ - if vendor not in ('BBL', 'OrcaFilamentLibrary'): - return 0 - error = 0 vendor_path = Path(vendor_folder) if not vendor_path.exists(): @@ -602,7 +597,7 @@ def main(): errors_found += check_vector_type_keys(profiles_dir, vendor_name) - errors_found += check_filament_id(vendor_name, vendor_path / "filament") + errors_found += check_filament_id(vendor_path / "filament") checked_vendor_count += 1 if args.vendor: diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index 2ff0e42a7c..3d668d4fc3 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -118,10 +118,11 @@ class SyntheticTree: allow_shared_catalog=allow_shared_catalog) return rc, buf.getvalue() - def check(self): + def check(self, map_path=None): buf = io.StringIO() + kwargs = {} if map_path is None else {"map_path": map_path} with contextlib.redirect_stdout(buf): - errors = afi.check_filament_ids(self.profiles, self.snapshot) + errors = afi.check_filament_ids(self.profiles, self.snapshot, **kwargs) return errors, buf.getvalue() def assign(self): @@ -142,17 +143,24 @@ class SyntheticTree: dropped, errors = afi.drop_redundant_ids(vendor, self.profiles) return dropped, errors, buf.getvalue() -def make_clean_tree(): - """Baseline tree: OFL base+generic, a vendor family, a clean tuned generic.""" +def make_clean_tree(apla_id="AX01", generic_id="OGFL99"): + """Baseline tree: OFL base+generic, a vendor family, a clean tuned generic. + + apla_id/generic_id default to arbitrary non-OF placeholders (grandfathered + into the snapshot below) since most tests only need "already assigned, + don't touch". TestAssign passes real OF-format ids instead: assign_missing_ids + now treats a non-OF declaration as missing and remints it, so a non-OF + baseline would no longer be a no-op there. + """ t = SyntheticTree() t.add_vendor(OFL, [ - preset("fdm_pla", filament_id="OGFL99", instantiation=False, + preset("fdm_pla", filament_id=generic_id, instantiation=False, filament_vendor="Generic", filament_type="PLA"), preset("Generic PLA @System", inherits="fdm_pla", compatible_printers=[]), ]) t.add_vendor("VendorA", [ - preset("APLA @base", filament_id="AX01", instantiation=False, + preset("APLA @base", filament_id=apla_id, instantiation=False, filament_vendor="AVendor", filament_type="PLA"), preset("APLA @P1", inherits="APLA @base", compatible_printers=["P1 0.4 nozzle"]), @@ -171,6 +179,21 @@ class SyntheticTreeCase(unittest.TestCase): self.addCleanup(self.t.cleanup) +class OfCleanTreeCase(unittest.TestCase): + """Like SyntheticTreeCase, but the baseline family/generic already carry + real OF-format ids (check 1 now rejects "AX01"/"OGFL99" unconditionally, + with no snapshot exemption), so an otherwise-untouched tree still passes + check_filament_ids. Tests that specifically need a non-OF baseline to + remint or drop (TestRemint, TestDropRedundantIds, TestUpdateSnapshot) keep + using SyntheticTreeCase instead. + """ + def setUp(self): + self.t = make_clean_tree( + apla_id=afi.generate_filament_id("AVendor", "PLA", "APLA"), + generic_id=afi.generate_filament_id("Generic", "PLA", "fdm_pla")) + self.addCleanup(self.t.cleanup) + + # --------------------------------------------------------------------------- # mint # --------------------------------------------------------------------------- @@ -376,12 +399,13 @@ class TestTripleResolution(unittest.TestCase): # --------------------------------------------------------------------------- -# reserved namespaces / islands +# reserved namespaces # --------------------------------------------------------------------------- class TestReservedSpaces(unittest.TestCase): def test_owners(self): - self.assertEqual(afi.reserved_space_owner("GFL99"), (True, "BBL")) + # Bambu AMS/RFID catalog: reserved, but no vendor (not even BBL) may declare it + self.assertEqual(afi.reserved_space_owner("GFL99"), (True, None)) # Qidi device protocol: reserved, but no vendor may declare it self.assertEqual(afi.reserved_space_owner("QD_X4_PLA"), (True, None)) self.assertEqual(afi.reserved_space_owner("P1234abc"), (True, None)) @@ -390,20 +414,15 @@ class TestReservedSpaces(unittest.TestCase): self.assertEqual(afi.reserved_space_owner("OF5CgdDq"), (False, None)) self.assertEqual(afi.reserved_space_owner("P1234abcd"), (False, None)) # 8 hex chars: not the user space - def test_island_declarations(self): - self.assertTrue(afi.is_island_declaration("BBL", "GFL99")) - self.assertTrue(afi.is_island_declaration("BBL", "OF5CgdDq")) - # Qidi presets mint like any other vendor's: - self.assertFalse(afi.is_island_declaration("Qidi", "QD_X4_PLA")) - self.assertFalse(afi.is_island_declaration("Qidi", "OF5CgdDq")) - self.assertFalse(afi.is_island_declaration("VendorA", "GFL99")) + def test_gf_is_reserved_and_ownerless(self): + self.assertEqual(afi.reserved_space_owner("GFA00"), (True, None)) # --------------------------------------------------------------------------- # checks on synthetic trees # --------------------------------------------------------------------------- -class TestChecks(SyntheticTreeCase): +class TestChecks(OfCleanTreeCase): def test_clean_tree_is_silent(self): errors, out = self.t.check() self.assertEqual(errors, 0, out) @@ -418,7 +437,7 @@ class TestChecks(SyntheticTreeCase): compatible_printers=["P1"])) errors, out = self.t.check() self.assertGreater(errors, 0) - self.assertIn("neither grandfathered in the snapshot", out) + self.assertIn('is not a minted "OF" id', out) self.assertIn("BOGUS_9", out) def test_check2_new_claim_needs_snapshot_update(self): @@ -437,7 +456,8 @@ class TestChecks(SyntheticTreeCase): self.assertIn('"VendorA/APLA"', out) def test_check2_triple_change_needs_snapshot_update(self): - self.t.write_preset("VendorA", preset("APLA @base", filament_id="AX01", + apla_id = afi.generate_filament_id("AVendor", "PLA", "APLA") + self.t.write_preset("VendorA", preset("APLA @base", filament_id=apla_id, instantiation=False, filament_vendor="AVendor", filament_type="PETG"), @@ -542,7 +562,7 @@ class TestChecks(SyntheticTreeCase): self.assertEqual(errors, 0, out) def test_check5_reserved_namespace_claims(self): - for fid, marker in [("GFX99", "owned by BBL"), + for fid, marker in [("GFX99", "Bambu AMS/RFID catalog"), ("QD_X_PLA", "composed by the device"), ("P1a2b3c4", "user-custom"), ("null", "user-custom")]: @@ -560,7 +580,10 @@ class TestChecks(SyntheticTreeCase): self.assertIn(marker, out) def test_check6a_instantiated_preset_with_own_key(self): - self.t.write_preset("VendorA", preset("APLA @P1", filament_id="AX01", + # Same value the child would already resolve through inherits: this + # isolates check 6a (own key present) from check 6b (value drift). + apla_id = afi.generate_filament_id("AVendor", "PLA", "APLA") + self.t.write_preset("VendorA", preset("APLA @P1", filament_id=apla_id, inherits="APLA @base", compatible_printers=["P1 0.4 nozzle"]), register=False) @@ -569,13 +592,16 @@ class TestChecks(SyntheticTreeCase): self.assertIn("declares its own filament_id key", out) def test_check6b_declared_vs_inherited_drift(self): - self.t.write_preset("VendorA", preset("APLA @P1", filament_id="AX02", + apla_id = afi.generate_filament_id("AVendor", "PLA", "APLA") + drifted = afi.generate_filament_id("AVendor", "PLA", "APLA", salt=1) + self.t.write_preset("VendorA", preset("APLA @P1", filament_id=drifted, inherits="APLA @base", compatible_printers=["P1 0.4 nozzle"]), register=False) errors, out = self.t.check() self.assertGreater(errors, 0) - self.assertIn('declares filament_id "AX02" but its inherits chain resolves "AX01"', out) + self.assertIn(f'declares filament_id "{drifted}" but its inherits chain resolves ' + f'"{apla_id}"', out) def test_check6c_unresolvable_instantiated_filament(self): self.t.write_preset("VendorA", preset("DNEW @P1", compatible_printers=["P1"])) @@ -591,7 +617,7 @@ class TestChecks(SyntheticTreeCase): self.assertIn("snapshot not found", out) -class TestCheck7(SyntheticTreeCase): +class TestCheck7(OfCleanTreeCase): def test_7a_empty_vendor_is_hard_error(self): fid = afi.generate_filament_id("", "PLA", "NVPLA") self.t.write_preset("VendorA", preset("NVPLA @base", filament_id=fid, @@ -650,6 +676,43 @@ class TestCheck7(SyntheticTreeCase): self.assertIn('"APLA"', out) +class TestCheck8(OfCleanTreeCase): + def _write_map(self, rows): + path = os.path.join(self.t.dir, "bambu_filament_ids.json") + ubfi.write_map(path, rows, "testcommit", "2026-09-04") + return path + + def test_row_triple_must_match_tree(self): + fid = afi.generate_filament_id("V", "PLA", "Foo") + self.t.write_preset("VendorA", preset("Foo @base", filament_id=fid, + instantiation=False, + filament_vendor="V", filament_type="PLA")) + self.t.write_preset("VendorA", preset("Foo @P1", inherits="Foo @base", + compatible_printers=["P1"])) + map_path = self._write_map( + {fid: {"bambu_id": "GFZ00", "vendor": "V", "type": "PLA", "name": "Bar"}}) + errors, out = self.t.check(map_path) + self.assertGreater(errors, 0) + self.assertIn("regenerate the map", out) + + def test_duplicate_bambu_id_is_an_error(self): + map_path = self._write_map({ + "OFaaaaaa": {"bambu_id": "GFZ00", "vendor": "V", "type": "PLA", "name": "Foo"}, + "OFbbbbbb": {"bambu_id": "GFZ00", "vendor": "V", "type": "PETG", "name": "Bar"}, + }) + errors, out = self.t.check(map_path) + self.assertGreater(errors, 0) + self.assertIn("GFZ00", out) + + def test_row_for_unshipped_product_is_fine(self): + map_path = self._write_map({ + "OFcccccc": {"bambu_id": "GFZ99", "vendor": "Nobody", "type": "PLA", + "name": "Ships Nothing"}, + }) + errors, out = self.t.check(map_path) + self.assertEqual(errors, 0, out) + + # --------------------------------------------------------------------------- # --update-snapshot # --------------------------------------------------------------------------- @@ -698,7 +761,7 @@ class TestUpdateSnapshot(SyntheticTreeCase): # default run: mint + insert # --------------------------------------------------------------------------- -class TestAssign(SyntheticTreeCase): +class TestAssign(OfCleanTreeCase): def test_noop_on_fully_idded_tree(self): changed, errors, out = self.t.assign() self.assertEqual((changed, errors), (0, 0)) @@ -771,6 +834,56 @@ class TestAssign(SyntheticTreeCase): self.assertGreater(errors, 0) self.assertIn("shared with famil", out) + def test_non_of_declaration_is_treated_as_missing(self): + # A declaration that isn't OF-format (e.g. a vendor bundle synced from + # an upstream catalog, like BBL's GF ids) is reminted like a missing + # family, not left alone. + self.t.write_preset("VendorA", preset("Synced PLA @base", filament_id="GFZZ00", + instantiation=False, + filament_vendor="ZV", filament_type="PLA")) + self.t.write_preset("VendorA", preset("Synced PLA @P1", + inherits="Synced PLA @base", + compatible_printers=["P1"])) + changed, errors, out = self.t.assign() + self.assertEqual(errors, 0, out) + self.assertEqual(changed, 1) + path = self.t.preset_path("VendorA", "Synced PLA @base") + root = load_json_file(path) + want = afi.generate_filament_id("ZV", "PLA", "Synced PLA") + self.assertEqual(root["filament_id"], want) + # the value was replaced in place, not appended as a second key + raw = open(path, encoding="utf-8").read() + self.assertEqual(raw.count('"filament_id"'), 1) + # idempotent: the id is OF-format now, so a second run is a no-op + changed, errors, _out = self.t.assign() + self.assertEqual((changed, errors), (0, 0)) + + def test_non_of_multi_root_family_converges_on_one_id(self): + # Two per-printer roots of one product (same triple), both carrying + # the SAME non-OF id — the shape a synced vendor bundle ships (e.g. + # BambuStudio's own per-printer @base files). They must converge on + # one freshly minted id, not split into two. + self.t.write_preset("VendorA", preset("Synced ABS @P1base", filament_id="GFSYNC0", + instantiation=False, + filament_vendor="ZV", filament_type="ABS")) + self.t.write_preset("VendorA", preset("Synced ABS @P2base", filament_id="GFSYNC0", + instantiation=False, + filament_vendor="ZV", filament_type="ABS")) + self.t.write_preset("VendorA", preset("Synced ABS @P1", + inherits="Synced ABS @P1base", + compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("Synced ABS @P2", + inherits="Synced ABS @P2base", + compatible_printers=["P2"])) + changed, errors, out = self.t.assign() + self.assertEqual(errors, 0, out) + self.assertEqual(changed, 2) + want = afi.generate_filament_id("ZV", "ABS", "Synced ABS") + b1 = load_json_file(self.t.preset_path("VendorA", "Synced ABS @P1base")) + b2 = load_json_file(self.t.preset_path("VendorA", "Synced ABS @P2base")) + self.assertEqual(b1["filament_id"], want) + self.assertEqual(b2["filament_id"], want) + # --------------------------------------------------------------------------- # byte-preserving profile edits @@ -962,11 +1075,19 @@ class TestRemint(SyntheticTreeCase): self.assertEqual(root["filament_id"], afi.generate_filament_id(*self.TRIPLE, salt=1)) - def test_bbl_is_forbidden(self): + def test_bbl_is_reminted_like_any_vendor(self): + self.t.add_vendor("BBL", [ + preset("Bambu ABS @base", filament_id="GFB00", instantiation=False, + filament_vendor="Bambu Lab", filament_type="ABS"), + preset("Bambu ABS @P1", inherits="Bambu ABS @base", + compatible_printers=["P1"]), + ]) changed, errors, out = self.t.remint(["BBL"]) - self.assertEqual(changed, 0) - self.assertGreater(errors, 0) - self.assertIn("forbidden", out) + self.assertEqual(errors, 0, out) + self.assertEqual(changed, 1) + root = load_json_file(self.t.preset_path("BBL", "Bambu ABS @base")) + self.assertEqual(root["filament_id"], + afi.generate_filament_id("Bambu Lab", "ABS", "Bambu ABS")) # --------------------------------------------------------------------------- @@ -1044,7 +1165,7 @@ class TestRealTree(unittest.TestCase): # review-fix regressions # --------------------------------------------------------------------------- -class TestReviewFixes(SyntheticTreeCase): +class TestReviewFixes(OfCleanTreeCase): def test_check3_skips_of_id_inherited_from_other_vendor(self): # An OFL family carries its own minted OF id and a vendor tunes it # correctly (same base name, non-empty printers). The new claim must From db3d684ee00fab86f817eaa6d858157c0cc735de Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 4 Sep 2026 14:42:57 +0800 Subject: [PATCH 43/52] Scope the filament AMS length check to presets the vendor bundle references The tree-wide length check (freed from its BBL/OFL carve-out last commit) was flagging 21 pre-existing SeeMeCNC files that no vendor index references and that therefore never load, turning CI red for files with no bearing on what ships. The rule now only fires on presets a vendor's filament_list actually references; every .json under the vendor's filament directory is still parsed through the duplicate-key hook, so that coverage is unchanged. Also removed a duplicated BAMBU_MAP_PATH definition: update_bambu_filament_ids.py now imports the constant from assign_filament_ids.py, which it already imports several other constants from, instead of recomputing the same path independently. --- scripts/assign_filament_ids.py | 4 +-- scripts/orca_extra_profile_check.py | 37 +++++++++++++++++++++------- scripts/update_bambu_filament_ids.py | 5 +--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index cc3adeab4a..7ce907f816 100755 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -79,8 +79,8 @@ FILAMENT_ID_LENGTH = 6 # base62 digits after the "OF" prefix -> 8 chars total SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) PROFILES_DIR = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "resources", "profiles")) SNAPSHOT_PATH = os.path.join(SCRIPTS_DIR, "filament_id_snapshot.json") -# Same path update_bambu_filament_ids.BAMBU_MAP_PATH computes; kept as a sibling -# constant (not imported) because that module imports FROM this one already. +# The single source of truth for the map path; update_bambu_filament_ids.py +# imports this rather than recomputing it. BAMBU_MAP_PATH = os.path.normpath( os.path.join(SCRIPTS_DIR, "..", "resources", "printers", "bambu_filament_ids.json")) diff --git a/scripts/orca_extra_profile_check.py b/scripts/orca_extra_profile_check.py index 62bd8c2916..285b2fbf64 100644 --- a/scripts/orca_extra_profile_check.py +++ b/scripts/orca_extra_profile_check.py @@ -290,19 +290,38 @@ def check_name_consistency(profiles_dir, vendor_name): return error_count, 0 -def check_filament_id(vendor_folder): +def check_filament_id(profiles_dir, vendor_name): """ Make sure filament_id is not longer than 8 characters, otherwise AMS won't work properly. - Runs tree-wide, every vendor alike: check_filament_ids (assign_filament_ids.py) - already requires every id in the tree to match the fixed-length "OF" format, - so this is a redundant belt-and-suspenders check, not a substitute for it. + Runs tree-wide, every vendor alike (BBL included: the id format is what + matters, not the vendor). Every .json file under the vendor's filament + directory is still parsed through the duplicate-key hook below, so that + coverage is unchanged; only the length rule itself is scoped to presets + the vendor's index (.json filament_list) actually references. A + file the index does not reference never loads, so its filament_id length + cannot break AMS -- and some vendors (e.g. SeeMeCNC) ship such orphaned + files pre-dating this check, with no bearing on what ships. """ error = 0 - vendor_path = Path(vendor_folder) + vendor_path = profiles_dir / vendor_name / "filament" if not vendor_path.exists(): return 0 + referenced = set() + vendor_file = profiles_dir / (vendor_name + ".json") + if vendor_file.exists(): + try: + with open(vendor_file, 'r', encoding='UTF-8') as fp: + index = json.load(fp) + for entry in index.get('filament_list', []): + sub_path = entry.get('sub_path') + if sub_path: + referenced.add((profiles_dir / vendor_name / sub_path).resolve()) + except Exception as e: + print_error(f"Error loading vendor profile {vendor_file}: {e}") + error += 1 + # Use rglob to recursively find .json files. for file_path in vendor_path.rglob("*.json"): try: @@ -320,13 +339,13 @@ def check_filament_id(vendor_folder): if 'filament_id' not in data: continue - + filament_id = data['filament_id'] - if len(filament_id) > 8: + if len(filament_id) > 8 and file_path.resolve() in referenced: error += 1 print_error(f"Filament id too long \"{filament_id}\": {file_path}") - + return error def check_obsolete_keys(profiles_dir, vendor_name): @@ -597,7 +616,7 @@ def main(): errors_found += check_vector_type_keys(profiles_dir, vendor_name) - errors_found += check_filament_id(vendor_path / "filament") + errors_found += check_filament_id(profiles_dir, vendor_name) checked_vendor_count += 1 if args.vendor: diff --git a/scripts/update_bambu_filament_ids.py b/scripts/update_bambu_filament_ids.py index 744fcc0401..cd5e05e3bc 100644 --- a/scripts/update_bambu_filament_ids.py +++ b/scripts/update_bambu_filament_ids.py @@ -55,6 +55,7 @@ import datetime sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) from assign_filament_ids import ( # noqa: E402 + BAMBU_MAP_PATH, OFL, OF_ID_RE, PROFILES_DIR, @@ -69,10 +70,6 @@ from assign_filament_ids import ( # noqa: E402 resolve_triple, ) -SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) -BAMBU_MAP_PATH = os.path.normpath( - os.path.join(SCRIPTS_DIR, "..", "resources", "printers", "bambu_filament_ids.json")) - BAMBUSTUDIO_REPO = "https://github.com/bambulab/BambuStudio" From ec207e67a31784eaa9c803190a8f9db2abf7b3b8 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 4 Sep 2026 15:01:58 +0800 Subject: [PATCH 44/52] Mint content-addressed ids for the Bambu bundle --- resources/profiles/BBL.json | 2 +- .../BBL/filament/BETA/BETA ABS @base.json | 2 +- .../BBL/filament/BETA/BETA ASA @base.json | 2 +- .../BBL/filament/BETA/BETA HIPS @base.json | 2 +- .../BBL/filament/BETA/BETA PAHT-CF @base.json | 2 +- .../filament/BETA/BETA PEBA 90A @base.json | 2 +- .../BBL/filament/BETA/BETA PETG @base.json | 2 +- .../BETA/BETA PETG Fluorescence @base.json | 2 +- .../BETA/BETA PETG Glitter @base.json | 2 +- .../filament/BETA/BETA PETG Glow @base.json | 2 +- .../BETA/BETA PETG Gradient @base.json | 2 +- .../BBL/filament/BETA/BETA PETG HF @base.json | 2 +- .../BETA PETG Heat Color Change @base.json | 2 +- .../filament/BETA/BETA PETG Marble @base.json | 2 +- .../filament/BETA/BETA PETG Matte @base.json | 2 +- .../BETA/BETA PETG Metallic @base.json | 2 +- .../BETA/BETA PETG Transparent @base.json | 2 +- .../BETA/BETA PETG UV Color Change @base.json | 2 +- .../BBL/filament/BETA/BETA PETG-CF @base.json | 2 +- .../BBL/filament/BETA/BETA PETG-GF @base.json | 2 +- .../filament/BETA/BETA PLA Basic @base.json | 2 +- .../BETA/BETA PLA Chameleon @base.json | 2 +- .../BETA/BETA PLA Fluorescence @base.json | 2 +- .../filament/BETA/BETA PLA Glitter @base.json | 2 +- .../filament/BETA/BETA PLA Glow @base.json | 2 +- .../BETA/BETA PLA Gradient @base.json | 2 +- .../BETA PLA Heat Color Change @base.json | 2 +- .../BETA/BETA PLA High Speed @base.json | 2 +- .../BETA/BETA PLA High Temp @base.json | 2 +- .../filament/BETA/BETA PLA Marble @base.json | 2 +- .../filament/BETA/BETA PLA Matte @base.json | 2 +- .../filament/BETA/BETA PLA Metal @base.json | 2 +- .../BETA/BETA PLA Metallic @base.json | 2 +- .../BBL/filament/BETA/BETA PLA PRO @base.json | 2 +- .../filament/BETA/BETA PLA Silk @base.json | 2 +- .../filament/BETA/BETA PLA Silk+ @base.json | 2 +- .../BETA/BETA PLA Transparent @base.json | 2 +- .../BETA/BETA PLA UV Color Change @base.json | 2 +- .../filament/BETA/BETA PLA Wood @base.json | 2 +- .../filament/BETA/BETA PLA Youth @base.json | 2 +- .../BBL/filament/BETA/BETA PLA-CF @base.json | 2 +- .../BBL/filament/BETA/BETA TPU 90A @base.json | 2 +- .../BBL/filament/BETA/BETA TPU 95A @base.json | 2 +- .../BBL/filament/BETA/BETA TPU 98A @base.json | 2 +- .../filament/BETA/BETA TPU Matte @base.json | 2 +- .../BBL/filament/Bambu ABS @base.json | 2 +- .../BBL/filament/Bambu ABS-GF @base.json | 2 +- .../BBL/filament/Bambu ASA @base.json | 2 +- .../BBL/filament/Bambu ASA-Aero @base.json | 2 +- .../BBL/filament/Bambu ASA-CF @base.json | 2 +- .../BBL/filament/Bambu PA-CF @base.json | 2 +- .../BBL/filament/Bambu PA6-CF @base.json | 2 +- .../BBL/filament/Bambu PA6-GF @base.json | 2 +- .../BBL/filament/Bambu PAHT-CF @base.json | 2 +- .../profiles/BBL/filament/Bambu PC @base.json | 2 +- .../BBL/filament/Bambu PC FR @base.json | 2 +- .../BBL/filament/Bambu PET-CF @base.json | 2 +- .../BBL/filament/Bambu PETG Basic @base.json | 2 +- .../BBL/filament/Bambu PETG HF @base.json | 2 +- .../Bambu PETG Translucent @base.json | 2 +- .../BBL/filament/Bambu PETG-CF @base.json | 2 +- .../BBL/filament/Bambu PLA Aero @base.json | 2 +- .../BBL/filament/Bambu PLA Basic @base.json | 2 +- .../BBL/filament/Bambu PLA Dynamic @base.json | 2 +- .../BBL/filament/Bambu PLA Galaxy @base.json | 2 +- .../BBL/filament/Bambu PLA Glow @base.json | 2 +- .../BBL/filament/Bambu PLA Lite @base.json | 2 +- .../BBL/filament/Bambu PLA Marble @base.json | 2 +- .../BBL/filament/Bambu PLA Matte @base.json | 2 +- .../BBL/filament/Bambu PLA Metal @base.json | 2 +- .../BBL/filament/Bambu PLA Pure @base.json | 2 +- .../BBL/filament/Bambu PLA Silk @base.json | 2 +- .../BBL/filament/Bambu PLA Silk+ @base.json | 2 +- .../BBL/filament/Bambu PLA Sparkle @base.json | 2 +- .../BBL/filament/Bambu PLA Tough @base.json | 2 +- .../BBL/filament/Bambu PLA Tough+ @base.json | 2 +- .../filament/Bambu PLA Translucent @base.json | 2 +- .../BBL/filament/Bambu PLA Wood @base.json | 2 +- .../BBL/filament/Bambu PLA-CF @base.json | 2 +- .../BBL/filament/Bambu PPA-CF @base.json | 2 +- .../BBL/filament/Bambu PPS-CF @base.json | 2 +- .../BBL/filament/Bambu PVA @base.json | 2 +- .../Bambu Support For PA PET @base.json | 2 +- .../filament/Bambu Support For PLA @base.json | 2 +- .../Bambu Support For PLA-PETG @base.json | 2 +- .../BBL/filament/Bambu Support G @base.json | 2 +- .../BBL/filament/Bambu Support W @base.json | 2 +- .../filament/Bambu Support for ABS @base.json | 2 +- .../BBL/filament/Bambu TPU 85A @base.json | 2 +- .../BBL/filament/Bambu TPU 90A @base.json | 2 +- .../BBL/filament/Bambu TPU 95A @base.json | 2 +- .../BBL/filament/Bambu TPU 95A HF @base.json | 2 +- .../BBL/filament/Bambu TPU for AMS @base.json | 2 +- .../FusRock/FusRock ABS-GF @base.json | 2 +- .../BBL/filament/Generic ABS @base.json | 2 +- .../BBL/filament/Generic ASA @base.json | 2 +- .../BBL/filament/Generic BVOH @base.json | 2 +- .../BBL/filament/Generic EVA @base.json | 2 +- .../BBL/filament/Generic HIPS @base.json | 2 +- .../BBL/filament/Generic PA @base.json | 2 +- .../BBL/filament/Generic PA-CF @base.json | 2 +- .../BBL/filament/Generic PC @base.json | 2 +- .../BBL/filament/Generic PCTG @base.json | 2 +- .../BBL/filament/Generic PE @base.json | 2 +- .../BBL/filament/Generic PE-CF @base.json | 2 +- .../BBL/filament/Generic PETG @base.json | 2 +- .../BBL/filament/Generic PETG HF @base.json | 2 +- .../BBL/filament/Generic PETG-CF @base.json | 2 +- .../BBL/filament/Generic PHA @base.json | 2 +- .../BBL/filament/Generic PLA @base.json | 2 +- .../Generic PLA High Speed @base.json | 2 +- .../BBL/filament/Generic PLA Silk @base.json | 2 +- .../BBL/filament/Generic PLA-CF @base.json | 2 +- .../BBL/filament/Generic PP @base.json | 2 +- .../BBL/filament/Generic PP-CF @base.json | 2 +- .../BBL/filament/Generic PP-GF @base.json | 2 +- .../BBL/filament/Generic PPA-CF @base.json | 2 +- .../BBL/filament/Generic PPA-GF @base.json | 2 +- .../BBL/filament/Generic PPS @base.json | 2 +- .../BBL/filament/Generic PPS-CF @base.json | 2 +- .../BBL/filament/Generic PVA @base.json | 2 +- .../BBL/filament/Generic SBS @base.json | 2 +- .../profiles/BBL/filament/Generic SBS.json | 2 +- .../BBL/filament/Generic TPU @base.json | 2 +- .../filament/Generic TPU for AMS @base.json | 2 +- .../Numakers/Numakers PLA+ @base.json | 2 +- .../Overture/Overture Matte PLA @base.json | 2 +- .../filament/Overture/Overture PLA @base.json | 2 +- .../Overture/Overture PLA Pro @base.json | 2 +- .../Polymaker/Fiberon PA12-CF @base.json | 2 +- .../Polymaker/Fiberon PA12-CF10 @base.json | 2 +- .../Polymaker/Fiberon PA6-CF @base.json | 2 +- .../Polymaker/Fiberon PA6-CF20 @base.json | 2 +- .../Polymaker/Fiberon PA6-GF @base.json | 2 +- .../Polymaker/Fiberon PA6-GF25 @base.json | 2 +- .../Polymaker/Fiberon PA612-CF @base.json | 2 +- .../Polymaker/Fiberon PA612-CF15 @base.json | 2 +- .../Polymaker/Fiberon PET-CF @base.json | 2 +- .../Polymaker/Fiberon PET-CF17 @base.json | 2 +- .../Polymaker/Fiberon PETG-ESD @base.json | 2 +- .../Polymaker/Fiberon PETG-rCF @base.json | 2 +- .../Polymaker/Fiberon PETG-rCF08 @base.json | 2 +- .../Polymaker/Panchroma CoPE @base.json | 2 +- .../Polymaker/Panchroma PLA @base.json | 2 +- .../Panchroma PLA Celestial @base.json | 2 +- .../Polymaker/Panchroma PLA Galaxy @base.json | 2 +- .../Polymaker/Panchroma PLA Glow @base.json | 2 +- .../Panchroma PLA Luminous @base.json | 2 +- .../Polymaker/Panchroma PLA Marble @base.json | 2 +- .../Polymaker/Panchroma PLA Matte @base.json | 2 +- .../Panchroma PLA Metallic @base.json | 2 +- .../Polymaker/Panchroma PLA Neon @base.json | 2 +- .../Polymaker/Panchroma PLA Satin @base.json | 2 +- .../Polymaker/Panchroma PLA Silk @base.json | 2 +- .../Panchroma PLA Starlight @base.json | 2 +- .../Panchroma PLA Temp Shift @base.json | 2 +- .../Panchroma PLA Translucent @base.json | 2 +- .../Panchroma PLA UV Shift @base.json | 2 +- .../Polymaker/PolyLite ABS @base.json | 2 +- .../Polymaker/PolyLite ASA @base.json | 2 +- .../Polymaker/PolyLite CosPLA @base.json | 2 +- .../Polymaker/PolyLite PETG @base.json | 2 +- .../Polymaker/PolyLite PLA @base.json | 2 +- .../Polymaker/PolyLite PLA Galaxy @base.json | 2 +- .../Polymaker/PolyLite PLA Glow @base.json | 2 +- .../PolyLite PLA Luminous @base.json | 2 +- .../Polymaker/PolyLite PLA Neon @base.json | 2 +- .../Polymaker/PolyLite PLA Pro @base.json | 2 +- .../PolyLite PLA Starlight @base.json | 2 +- .../PolyLite PLA Translucent @base.json | 2 +- .../Polymaker/PolyTerra PLA @base.json | 2 +- .../Polymaker/PolyTerra PLA Marble @base.json | 2 +- .../Polymaker/PolyTerra PLA+ @base.json | 2 +- .../Polymaker/Polymaker HT-PLA @base.json | 2 +- .../Polymaker/Polymaker HT-PLA-GF @base.json | 2 +- .../SUNLU/SUNLU Marble PLA @base.json | 2 +- .../BBL/filament/SUNLU/SUNLU PETG @base.json | 2 +- .../filament/SUNLU/SUNLU PLA Matte @base.json | 2 +- .../filament/SUNLU/SUNLU PLA+ 2.0 @base.json | 2 +- .../BBL/filament/SUNLU/SUNLU PLA+ @base.json | 2 +- .../filament/SUNLU/SUNLU Silk PLA+ @base.json | 2 +- .../filament/SUNLU/SUNLU Wood PLA @base.json | 2 +- .../filament/addnorth/addnorth ABS rABS.json | 2 +- .../addnorth/addnorth PA Adura FDA.json | 2 +- .../filament/addnorth/addnorth PA Adura.json | 2 +- .../addnorth/addnorth PA-CF Adura X.json | 2 +- .../addnorth/addnorth PA6 Addlantis.json | 2 +- .../addnorth/addnorth PC BLend HT LCF.json | 2 +- .../filament/addnorth/addnorth PETG Base.json | 2 +- .../filament/addnorth/addnorth PETG ESD.json | 2 +- .../addnorth/addnorth PETG Economy.json | 2 +- .../addnorth/addnorth PETG Flame v0.json | 2 +- .../addnorth/addnorth PETG PRO Matte.json | 2 +- .../addnorth/addnorth PETG rPETG Matte.json | 2 +- .../addnorth/addnorth PETG-CF Rigid X.json | 2 +- .../filament/addnorth/addnorth PLA E-PLA.json | 2 +- .../addnorth/addnorth PLA Economy.json | 2 +- .../addnorth PLA HT-PLA PRO Matte.json | 2 +- .../addnorth/addnorth PLA Premium Silk.json | 2 +- .../addnorth/addnorth PLA Textura.json | 2 +- .../filament/addnorth/addnorth PLA Wood.json | 2 +- .../addnorth PLA X-PLA High Speed.json | 2 +- .../filament/addnorth/addnorth PLA X-PLA.json | 2 +- .../addnorth/addnorth PLA rPLA RE-ADD.json | 2 +- .../addnorth PLA-CF Carbon Fiber.json | 2 +- .../addnorth/addnorth PVDF Adamant S1.json | 2 +- .../addnorth/addnorth TPU EasyFlex.json | 2 +- .../addnorth/addnorth TPU Pro Matte 85A.json | 2 +- .../addnorth/addnorth TPU Pro Matte 95A.json | 2 +- .../BBL/filament/eSUN/eSUN PLA+ @base.json | 2 +- scripts/filament_id_snapshot.json | 1584 ++++++++++------- 211 files changed, 1167 insertions(+), 837 deletions(-) diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index a2e72e00cb..723a907f52 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.01.00.23", + "version": "02.01.00.24", "force_update": "0", "description": "BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @base.json b/resources/profiles/BBL/filament/BETA/BETA ABS @base.json index 38e7aa5c12..bbed068703 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ABS @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA ABS @base.json @@ -3,7 +3,7 @@ "name": "BETA ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "BABB00", + "filament_id": "OFjUXn67", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @base.json b/resources/profiles/BBL/filament/BETA/BETA ASA @base.json index a36f654b02..a525f16bb1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ASA @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA ASA @base.json @@ -3,7 +3,7 @@ "name": "BETA ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "BASB00", + "filament_id": "OFZqZMuv", "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.", "eng_plate_temp": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json b/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json index 2647bc3397..4d244f9fe1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json @@ -3,7 +3,7 @@ "name": "BETA HIPS @base", "inherits": "fdm_filament_hips", "from": "system", - "filament_id": "BHIB00", + "filament_id": "OFlmxlDG", "instantiation": "false", "filament_is_support": [ "1" diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json index c0116f418c..1c140e3720 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json @@ -3,7 +3,7 @@ "name": "BETA PAHT-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "BPAB00", + "filament_id": "OF6qw3Wb", "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json index d92ceb29b1..fe1d3cd5b6 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json @@ -3,7 +3,7 @@ "name": "BETA PEBA 90A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "BPBB00", + "filament_id": "OFI2MKy7", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG @base.json index 9d15c065f5..07a25f9233 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB00", + "filament_id": "OFrqMlGt", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json index b9b0032612..b79699b9fc 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Fluorescence @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB02", + "filament_id": "OFYGrfHY", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json index 70d84d21d3..c6b7b96de5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glitter @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB03", + "filament_id": "OFjogeYN", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json index 7da99e23fc..30c8cc2783 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glow @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB04", + "filament_id": "OFFfJ09N", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json index 6f6e891503..cff77a0d6c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Gradient @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB05", + "filament_id": "OFNk8AvA", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json index 1ce6e4299e..b7aa43b6b5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG HF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB06", + "filament_id": "OFxqf79Q", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json index 32a62c63b7..254cf9e4c1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Heat Color Change @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB01", + "filament_id": "OFyPTnSk", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json index 30c79b2db5..335a3f59b2 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Marble @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB07", + "filament_id": "OF4XTfoI", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json index c7278e20dd..52a838f323 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Matte @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB08", + "filament_id": "OFnpX8uh", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json index b2d9ce8524..9c276bcf4d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Metallic @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB09", + "filament_id": "OFz1a1fy", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json index 6378e0cfdd..781d69af3a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG Transparent @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB10", + "filament_id": "OFmt513L", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json index 53717f5be3..42fa3bd62b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG UV Color Change @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB11", + "filament_id": "OFKyNkQz", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json index 165d5a56b8..8e3514f0ad 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB12", + "filament_id": "OFtndTHe", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json index 6261eaa7d2..d530f7a1d7 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json @@ -3,7 +3,7 @@ "name": "BETA PETG-GF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "BPGB13", + "filament_id": "OFSiCZP3", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json index 1653813bc1..429ecceda1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB00", + "filament_id": "OFuvOt0r", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json index cb618e7bd0..5054237514 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Chameleon @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB02", + "filament_id": "OFW8M3CY", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json index 684ce8866f..d9198287aa 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Fluorescence @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB04", + "filament_id": "OF4PKvem", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json index d180d4fb04..545a34dd92 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glitter @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB05", + "filament_id": "OFcnWTJB", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json index 05657ebd86..6be0a9da33 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glow @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB06", + "filament_id": "OFGc9l16", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json index f6cb4e3193..9609ff08d3 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Gradient @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB07", + "filament_id": "OF5LAnla", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json index 6f55ffdab8..958b999d91 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Heat Color Change @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB03", + "filament_id": "OFSfm8iP", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json index 604604cb04..7b93695099 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Speed @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB20", + "filament_id": "OF3PDEw3", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json index 7ac72d59fa..d900b28794 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Temp @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB18", + "filament_id": "OF5BXhHF", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json index c27f1b4fd1..a472446d9a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB08", + "filament_id": "OFKYBAWe", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json index d67331d549..32bd79b43b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB09", + "filament_id": "OFwc74ck", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json index 3a5668800d..607e20fa4e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metal @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB10", + "filament_id": "OF03RK6r", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json index 5c1c8f3ddf..c03bc0a8c7 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metallic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB11", + "filament_id": "OFkHbjUv", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json index 340b2c88ec..6938382062 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA PRO @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB12", + "filament_id": "OFMzRg65", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json index fb445eed6b..a0c61acd51 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB13", + "filament_id": "OFeF4UNh", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json index 3320396323..0bedc9186a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB01", + "filament_id": "OF8QdQwS", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json index ce0c342852..be62c10734 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Transparent @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB14", + "filament_id": "OFJnEaCp", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json index 033d1ef2ce..d95a0d8411 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA UV Color Change @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB15", + "filament_id": "OFpdjFI3", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json index 471c5709cd..c5eeae9995 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Wood @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB19", + "filament_id": "OFGVxj2A", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json index b63dc707e0..5fa118d566 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA Youth @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB16", + "filament_id": "OFF5o7b2", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json index 88028090da..f0f632adfa 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "BETA PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "BPLB17", + "filament_id": "OFLqgSuX", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json index 6664874f99..bba256fd74 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json @@ -3,7 +3,7 @@ "name": "BETA TPU 90A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "BTUB00", + "filament_id": "OF6Yn69v", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json index 2ec4a56075..87f7757c3f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json @@ -3,7 +3,7 @@ "name": "BETA TPU 95A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "BTUB02", + "filament_id": "OFK7830e", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json index 58ef5a5c21..cd106a6bf6 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json @@ -3,7 +3,7 @@ "name": "BETA TPU 98A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "BTUB03", + "filament_id": "OFzaq7Yg", "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": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json index 20d773373f..272e9be1ed 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json +++ b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json @@ -3,7 +3,7 @@ "name": "BETA TPU Matte @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "BTUB01", + "filament_id": "OF4QZANi", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu ABS @base.json b/resources/profiles/BBL/filament/Bambu ABS @base.json index 4940032f5e..5f395440eb 100644 --- a/resources/profiles/BBL/filament/Bambu ABS @base.json +++ b/resources/profiles/BBL/filament/Bambu ABS @base.json @@ -3,7 +3,7 @@ "name": "Bambu ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB00", + "filament_id": "OFhuaUQB", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu ABS-GF @base.json b/resources/profiles/BBL/filament/Bambu ABS-GF @base.json index b93c7e82cf..a14581034d 100644 --- a/resources/profiles/BBL/filament/Bambu ABS-GF @base.json +++ b/resources/profiles/BBL/filament/Bambu ABS-GF @base.json @@ -3,7 +3,7 @@ "name": "Bambu ABS-GF @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB50", + "filament_id": "OFknl9Iz", "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA @base.json b/resources/profiles/BBL/filament/Bambu ASA @base.json index 31d4c2d758..5e66d50419 100644 --- a/resources/profiles/BBL/filament/Bambu ASA @base.json +++ b/resources/profiles/BBL/filament/Bambu ASA @base.json @@ -3,7 +3,7 @@ "name": "Bambu ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFB01", + "filament_id": "OFfBpSRI", "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.", "eng_plate_temp": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json b/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json index 1a36118d7f..43c69be716 100644 --- a/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json +++ b/resources/profiles/BBL/filament/Bambu ASA-Aero @base.json @@ -3,7 +3,7 @@ "name": "Bambu ASA-Aero @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFB02", + "filament_id": "OFXzQ4yL", "instantiation": "false", "description": "This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: ASA Aero Printing Guide.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu ASA-CF @base.json b/resources/profiles/BBL/filament/Bambu ASA-CF @base.json index 69624032bb..bf957889b6 100644 --- a/resources/profiles/BBL/filament/Bambu ASA-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu ASA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu ASA-CF @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFB51", + "filament_id": "OF0wBGNx", "instantiation": "false", "eng_plate_temp": [ "100" diff --git a/resources/profiles/BBL/filament/Bambu PA-CF @base.json b/resources/profiles/BBL/filament/Bambu PA-CF @base.json index 587812d37b..47e1cc6ae1 100644 --- a/resources/profiles/BBL/filament/Bambu PA-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN03", + "filament_id": "OFFNYwWR", "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.", "filament_cost": [ diff --git a/resources/profiles/BBL/filament/Bambu PA6-CF @base.json b/resources/profiles/BBL/filament/Bambu PA6-CF @base.json index 10737491fe..0bb143c6ef 100644 --- a/resources/profiles/BBL/filament/Bambu PA6-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PA6-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PA6-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN05", + "filament_id": "OFniMuTN", "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu PA6-GF @base.json b/resources/profiles/BBL/filament/Bambu PA6-GF @base.json index 1997ec6a1e..2f9a674e54 100644 --- a/resources/profiles/BBL/filament/Bambu PA6-GF @base.json +++ b/resources/profiles/BBL/filament/Bambu PA6-GF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PA6-GF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN08", + "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu PAHT-CF @base.json b/resources/profiles/BBL/filament/Bambu PAHT-CF @base.json index 28b1391f84..80c0599caa 100644 --- a/resources/profiles/BBL/filament/Bambu PAHT-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PAHT-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PAHT-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN04", + "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu PC @base.json b/resources/profiles/BBL/filament/Bambu PC @base.json index 4bf37c3adb..ee235b17d6 100644 --- a/resources/profiles/BBL/filament/Bambu PC @base.json +++ b/resources/profiles/BBL/filament/Bambu PC @base.json @@ -3,7 +3,7 @@ "name": "Bambu PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GFC00", + "filament_id": "OFKhMPeX", "instantiation": "false", "filament_vendor": [ "Bambu Lab" diff --git a/resources/profiles/BBL/filament/Bambu PC FR @base.json b/resources/profiles/BBL/filament/Bambu PC FR @base.json index 5c10a4e424..0ee463d08f 100644 --- a/resources/profiles/BBL/filament/Bambu PC FR @base.json +++ b/resources/profiles/BBL/filament/Bambu PC FR @base.json @@ -3,7 +3,7 @@ "name": "Bambu PC FR @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GFC01", + "filament_id": "OFg57Nmc", "instantiation": "false", "filament_cost": [ "0" diff --git a/resources/profiles/BBL/filament/Bambu PET-CF @base.json b/resources/profiles/BBL/filament/Bambu PET-CF @base.json index ff8b40070f..c84d423f0e 100644 --- a/resources/profiles/BBL/filament/Bambu PET-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PET-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PET-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFT01", + "filament_id": "OFHa48An", "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.", "cool_plate_temp": [ diff --git a/resources/profiles/BBL/filament/Bambu PETG Basic @base.json b/resources/profiles/BBL/filament/Bambu PETG Basic @base.json index fd33eb2191..619483a4b4 100644 --- a/resources/profiles/BBL/filament/Bambu PETG Basic @base.json +++ b/resources/profiles/BBL/filament/Bambu PETG Basic @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG Basic @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG00", + "filament_id": "OFFvzqcd", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu PETG HF @base.json b/resources/profiles/BBL/filament/Bambu PETG HF @base.json index e05c34035b..1c12d679fd 100644 --- a/resources/profiles/BBL/filament/Bambu PETG HF @base.json +++ b/resources/profiles/BBL/filament/Bambu PETG HF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG HF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG02", + "filament_id": "OFovEIbw", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Bambu PETG Translucent @base.json b/resources/profiles/BBL/filament/Bambu PETG Translucent @base.json index 8cb30c5583..372c2e5c26 100644 --- a/resources/profiles/BBL/filament/Bambu PETG Translucent @base.json +++ b/resources/profiles/BBL/filament/Bambu PETG Translucent @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG Translucent @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG01", + "filament_id": "OFwPrlCM", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu PETG-CF @base.json b/resources/profiles/BBL/filament/Bambu PETG-CF @base.json index da39340dcb..9c1d80768d 100644 --- a/resources/profiles/BBL/filament/Bambu PETG-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG50", + "filament_id": "OFTRZ8Y4", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Bambu PLA Aero @base.json b/resources/profiles/BBL/filament/Bambu PLA Aero @base.json index ea1315636a..b941bed495 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Aero @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Aero @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Aero @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA11", + "filament_id": "OFBSW57R", "instantiation": "false", "description": "This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: Instructions for printing RC model with foaming PLA (PLA Aero).", "fan_min_speed": [ diff --git a/resources/profiles/BBL/filament/Bambu PLA Basic @base.json b/resources/profiles/BBL/filament/Bambu PLA Basic @base.json index f05bdb20e4..6d25d0ece0 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Basic @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Basic @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Basic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA00", + "filament_id": "OFoiVqVM", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Dynamic @base.json b/resources/profiles/BBL/filament/Bambu PLA Dynamic @base.json index a5a1306eef..b21b156082 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Dynamic @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Dynamic @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Dynamic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA13", + "filament_id": "OFDGigEI", "instantiation": "false", "filament_cost": [ "31.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Galaxy @base.json b/resources/profiles/BBL/filament/Bambu PLA Galaxy @base.json index 046610b2e2..baeb6a1ab8 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Galaxy @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Galaxy @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Galaxy @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA15", + "filament_id": "OFQ3e56w", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Glow @base.json b/resources/profiles/BBL/filament/Bambu PLA Glow @base.json index 005d759df2..7556361f81 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Glow @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Glow @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Glow @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA12", + "filament_id": "OFEkPBwx", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Lite @base.json b/resources/profiles/BBL/filament/Bambu PLA Lite @base.json index 72c3bb4e4f..4a21717d9e 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Lite @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Lite @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Lite @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA18", + "filament_id": "OFnfxTvi", "instantiation": "false", "filament_cost": [ "0" diff --git a/resources/profiles/BBL/filament/Bambu PLA Marble @base.json b/resources/profiles/BBL/filament/Bambu PLA Marble @base.json index 6dd5f815dc..4c9ecb2ff5 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Marble @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Marble @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA07", + "filament_id": "OF9OlTWH", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Matte @base.json b/resources/profiles/BBL/filament/Bambu PLA Matte @base.json index 15fb527bde..e98b6c3633 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Matte @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA01", + "filament_id": "OFXIbw5D", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Metal @base.json b/resources/profiles/BBL/filament/Bambu PLA Metal @base.json index 630ffcd61f..9a12d97f4d 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Metal @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Metal @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Metal @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA02", + "filament_id": "OFrKLeE3", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu PLA Pure @base.json b/resources/profiles/BBL/filament/Bambu PLA Pure @base.json index ae1b796a47..f947b2efaa 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Pure @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Pure @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Pure @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA19", + "filament_id": "OFTHDCqA", "instantiation": "false", "filament_cost": [ "21.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Silk @base.json b/resources/profiles/BBL/filament/Bambu PLA Silk @base.json index cfe83dabdd..da20a689ee 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Silk @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA05", + "filament_id": "OFEGNJD4", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu PLA Silk+ @base.json b/resources/profiles/BBL/filament/Bambu PLA Silk+ @base.json index c81147eb58..17a7e21b79 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Silk+ @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Silk+ @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Silk+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA06", + "filament_id": "OFUanySo", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu PLA Sparkle @base.json b/resources/profiles/BBL/filament/Bambu PLA Sparkle @base.json index ae49d594fd..6ecad9584e 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Sparkle @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Sparkle @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Sparkle @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA08", + "filament_id": "OFDxfPgH", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Tough @base.json b/resources/profiles/BBL/filament/Bambu PLA Tough @base.json index 9710767264..09b71a842d 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Tough @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Tough @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Tough @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA09", + "filament_id": "OFaQMgRH", "instantiation": "false", "filament_cost": [ "28.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Tough+ @base.json b/resources/profiles/BBL/filament/Bambu PLA Tough+ @base.json index 9b1b0b167e..ccc534d02f 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Tough+ @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Tough+ @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Tough+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA10", + "filament_id": "OF342jVN", "instantiation": "false", "additional_cooling_fan_speed": [ "80" diff --git a/resources/profiles/BBL/filament/Bambu PLA Translucent @base.json b/resources/profiles/BBL/filament/Bambu PLA Translucent @base.json index d32d781e70..ada0a501fc 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Translucent @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Translucent @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Translucent @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA17", + "filament_id": "OFFbSnCD", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA Wood @base.json b/resources/profiles/BBL/filament/Bambu PLA Wood @base.json index 882e00dc0a..3ba638569b 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Wood @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Wood @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA Wood @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA16", + "filament_id": "OFMjtqTC", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Bambu PLA-CF @base.json b/resources/profiles/BBL/filament/Bambu PLA-CF @base.json index e24e6a11af..5567889cae 100644 --- a/resources/profiles/BBL/filament/Bambu PLA-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFA50", + "filament_id": "OFEswT5W", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/BBL/filament/Bambu PPA-CF @base.json b/resources/profiles/BBL/filament/Bambu PPA-CF @base.json index a7efc6a3c3..48355afad1 100644 --- a/resources/profiles/BBL/filament/Bambu PPA-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PPA-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PPA-CF @base", "inherits": "fdm_filament_ppa", "from": "system", - "filament_id": "GFN06", + "filament_id": "OF54B0S0", "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.", "impact_strength_z": [ diff --git a/resources/profiles/BBL/filament/Bambu PPS-CF @base.json b/resources/profiles/BBL/filament/Bambu PPS-CF @base.json index a94234bb34..3985fcbe02 100644 --- a/resources/profiles/BBL/filament/Bambu PPS-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PPS-CF @base.json @@ -3,7 +3,7 @@ "name": "Bambu PPS-CF @base", "inherits": "fdm_filament_pps", "from": "system", - "filament_id": "GFT02", + "filament_id": "OF4RvVuU", "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.", "fan_max_speed": [ diff --git a/resources/profiles/BBL/filament/Bambu PVA @base.json b/resources/profiles/BBL/filament/Bambu PVA @base.json index fea0298ccc..1c6e0f2201 100644 --- a/resources/profiles/BBL/filament/Bambu PVA @base.json +++ b/resources/profiles/BBL/filament/Bambu PVA @base.json @@ -3,7 +3,7 @@ "name": "Bambu PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "GFS04", + "filament_id": "OFzyIxba", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json b/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json index d199cdb0a0..70724ff11f 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support For PA/PET @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFS03", + "filament_id": "OFMTK0UC", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu Support For PLA @base.json b/resources/profiles/BBL/filament/Bambu Support For PLA @base.json index 9bfdef5bf9..495291a3cf 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PLA @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PLA @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support For PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFS02", + "filament_id": "OFAnyRUI", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "cool_plate_temp": [ diff --git a/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json b/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json index 38443f5be3..6a6ff6aa6b 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support For PLA/PETG @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFS05", + "filament_id": "OFIfnzxC", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu Support G @base.json b/resources/profiles/BBL/filament/Bambu Support G @base.json index 9cb01972b8..38c7f500f5 100644 --- a/resources/profiles/BBL/filament/Bambu Support G @base.json +++ b/resources/profiles/BBL/filament/Bambu Support G @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support G @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFS01", + "filament_id": "OFQHiNJs", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Bambu Support W @base.json b/resources/profiles/BBL/filament/Bambu Support W @base.json index e847cd1865..1391587ef0 100644 --- a/resources/profiles/BBL/filament/Bambu Support W @base.json +++ b/resources/profiles/BBL/filament/Bambu Support W @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support W @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFS00", + "filament_id": "OFsHSVZc", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "cool_plate_temp": [ diff --git a/resources/profiles/BBL/filament/Bambu Support for ABS @base.json b/resources/profiles/BBL/filament/Bambu Support for ABS @base.json index bc8867db2a..25f62a07c3 100644 --- a/resources/profiles/BBL/filament/Bambu Support for ABS @base.json +++ b/resources/profiles/BBL/filament/Bambu Support for ABS @base.json @@ -3,7 +3,7 @@ "name": "Bambu Support for ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFS06", + "filament_id": "OFf6mfQO", "instantiation": "false", "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.", "fan_max_speed": [ diff --git a/resources/profiles/BBL/filament/Bambu TPU 85A @base.json b/resources/profiles/BBL/filament/Bambu TPU 85A @base.json index bc8c9f698c..fc7f67bc45 100644 --- a/resources/profiles/BBL/filament/Bambu TPU 85A @base.json +++ b/resources/profiles/BBL/filament/Bambu TPU 85A @base.json @@ -3,7 +3,7 @@ "name": "Bambu TPU 85A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU04", + "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": [ diff --git a/resources/profiles/BBL/filament/Bambu TPU 90A @base.json b/resources/profiles/BBL/filament/Bambu TPU 90A @base.json index 191d06e562..2f2ae95b02 100644 --- a/resources/profiles/BBL/filament/Bambu TPU 90A @base.json +++ b/resources/profiles/BBL/filament/Bambu TPU 90A @base.json @@ -3,7 +3,7 @@ "name": "Bambu TPU 90A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU03", + "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": [ diff --git a/resources/profiles/BBL/filament/Bambu TPU 95A @base.json b/resources/profiles/BBL/filament/Bambu TPU 95A @base.json index 2670e250e9..7d94b0256c 100644 --- a/resources/profiles/BBL/filament/Bambu TPU 95A @base.json +++ b/resources/profiles/BBL/filament/Bambu TPU 95A @base.json @@ -3,7 +3,7 @@ "name": "Bambu TPU 95A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU01", + "filament_id": "OFVCkX5w", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu TPU 95A HF @base.json b/resources/profiles/BBL/filament/Bambu TPU 95A HF @base.json index 7610fa2bf3..9f977eb5b2 100644 --- a/resources/profiles/BBL/filament/Bambu TPU 95A HF @base.json +++ b/resources/profiles/BBL/filament/Bambu TPU 95A HF @base.json @@ -3,7 +3,7 @@ "name": "Bambu TPU 95A HF @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU00", + "filament_id": "OFvKUnLh", "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": [ diff --git a/resources/profiles/BBL/filament/Bambu TPU for AMS @base.json b/resources/profiles/BBL/filament/Bambu TPU for AMS @base.json index 21a1e70fea..5f0b03329f 100644 --- a/resources/profiles/BBL/filament/Bambu TPU for AMS @base.json +++ b/resources/profiles/BBL/filament/Bambu TPU for AMS @base.json @@ -3,7 +3,7 @@ "name": "Bambu TPU for AMS @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU02", + "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": [ diff --git a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @base.json b/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @base.json index e9e45915f4..95a8fd47ea 100644 --- a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @base.json +++ b/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @base.json @@ -3,7 +3,7 @@ "name": "FusRock ABS-GF @base", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "GFR00", + "filament_id": "OFmn9NZL", "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（https://wiki.fusrock.com）.", "filament_extruder_variant": [ diff --git a/resources/profiles/BBL/filament/Generic ABS @base.json b/resources/profiles/BBL/filament/Generic ABS @base.json index 4a30d790f8..d15a7cdfea 100644 --- a/resources/profiles/BBL/filament/Generic ABS @base.json +++ b/resources/profiles/BBL/filament/Generic ABS @base.json @@ -3,7 +3,7 @@ "name": "Generic ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB99", + "filament_id": "OFY9muEs", "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_flow_ratio": [ diff --git a/resources/profiles/BBL/filament/Generic ASA @base.json b/resources/profiles/BBL/filament/Generic ASA @base.json index e1acd0504d..699fc64f7c 100644 --- a/resources/profiles/BBL/filament/Generic ASA @base.json +++ b/resources/profiles/BBL/filament/Generic ASA @base.json @@ -3,7 +3,7 @@ "name": "Generic ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFB98", + "filament_id": "OFLPAxz3", "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.", "eng_plate_temp": [ diff --git a/resources/profiles/BBL/filament/Generic BVOH @base.json b/resources/profiles/BBL/filament/Generic BVOH @base.json index 848e67c6c9..4a0fdf358e 100644 --- a/resources/profiles/BBL/filament/Generic BVOH @base.json +++ b/resources/profiles/BBL/filament/Generic BVOH @base.json @@ -3,7 +3,7 @@ "name": "Generic BVOH @base", "inherits": "fdm_filament_bvoh", "from": "system", - "filament_id": "GFS97", + "filament_id": "OFo2UF2C", "instantiation": "false", "filament_adhesiveness_category": [ "797" diff --git a/resources/profiles/BBL/filament/Generic EVA @base.json b/resources/profiles/BBL/filament/Generic EVA @base.json index 8799903ab5..79308d5d37 100644 --- a/resources/profiles/BBL/filament/Generic EVA @base.json +++ b/resources/profiles/BBL/filament/Generic EVA @base.json @@ -3,7 +3,7 @@ "name": "Generic EVA @base", "inherits": "fdm_filament_eva", "from": "system", - "filament_id": "GFR99", + "filament_id": "OFCD8qiU", "instantiation": "false", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/BBL/filament/Generic HIPS @base.json b/resources/profiles/BBL/filament/Generic HIPS @base.json index c4147f8098..a0df005ecc 100644 --- a/resources/profiles/BBL/filament/Generic HIPS @base.json +++ b/resources/profiles/BBL/filament/Generic HIPS @base.json @@ -3,7 +3,7 @@ "name": "Generic HIPS @base", "inherits": "fdm_filament_hips", "from": "system", - "filament_id": "GFS98", + "filament_id": "OFsFon5l", "instantiation": "false", "filament_is_support": [ "1" diff --git a/resources/profiles/BBL/filament/Generic PA @base.json b/resources/profiles/BBL/filament/Generic PA @base.json index fe819487b0..e6dad20449 100644 --- a/resources/profiles/BBL/filament/Generic PA @base.json +++ b/resources/profiles/BBL/filament/Generic PA @base.json @@ -3,7 +3,7 @@ "name": "Generic PA @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN99", + "filament_id": "OFg8ndtj", "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.", "chamber_temperatures": [ diff --git a/resources/profiles/BBL/filament/Generic PA-CF @base.json b/resources/profiles/BBL/filament/Generic PA-CF @base.json index 6fdbd0c8bb..7c77ffe482 100644 --- a/resources/profiles/BBL/filament/Generic PA-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PA-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PA-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFN98", + "filament_id": "OFQLcbps", "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.", "fan_cooling_layer_time": [ diff --git a/resources/profiles/BBL/filament/Generic PC @base.json b/resources/profiles/BBL/filament/Generic PC @base.json index a98c5a4183..b61c2296b5 100644 --- a/resources/profiles/BBL/filament/Generic PC @base.json +++ b/resources/profiles/BBL/filament/Generic PC @base.json @@ -3,7 +3,7 @@ "name": "Generic PC @base", "inherits": "fdm_filament_pc", "from": "system", - "filament_id": "GFC99", + "filament_id": "OFLakOUI", "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_flow_ratio": [ diff --git a/resources/profiles/BBL/filament/Generic PCTG @base.json b/resources/profiles/BBL/filament/Generic PCTG @base.json index e8b7c1ce0a..2eea3496a3 100644 --- a/resources/profiles/BBL/filament/Generic PCTG @base.json +++ b/resources/profiles/BBL/filament/Generic PCTG @base.json @@ -3,7 +3,7 @@ "name": "Generic PCTG @base", "inherits": "fdm_filament_pctg", "from": "system", - "filament_id": "GFG97", + "filament_id": "OFu1evlr", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Generic PE @base.json b/resources/profiles/BBL/filament/Generic PE @base.json index 22a5162c90..d9bdfc84a5 100644 --- a/resources/profiles/BBL/filament/Generic PE @base.json +++ b/resources/profiles/BBL/filament/Generic PE @base.json @@ -3,7 +3,7 @@ "name": "Generic PE @base", "inherits": "fdm_filament_pe", "from": "system", - "filament_id": "GFP99", + "filament_id": "OFPklMI1", "instantiation": "false", "filament_cost": [ "40.99" diff --git a/resources/profiles/BBL/filament/Generic PE-CF @base.json b/resources/profiles/BBL/filament/Generic PE-CF @base.json index 6dafa3535a..655a30e41e 100644 --- a/resources/profiles/BBL/filament/Generic PE-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PE-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PE-CF @base", "inherits": "fdm_filament_pe", "from": "system", - "filament_id": "GFP98", + "filament_id": "OFd0Fv0k", "instantiation": "false", "filament_cost": [ "65.99" diff --git a/resources/profiles/BBL/filament/Generic PETG @base.json b/resources/profiles/BBL/filament/Generic PETG @base.json index 8d59f692a3..9fce0893ce 100644 --- a/resources/profiles/BBL/filament/Generic PETG @base.json +++ b/resources/profiles/BBL/filament/Generic PETG @base.json @@ -3,7 +3,7 @@ "name": "Generic PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG99", + "filament_id": "OFYPdQJh", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Generic PETG HF @base.json b/resources/profiles/BBL/filament/Generic PETG HF @base.json index 6a5ce9f063..c756285013 100644 --- a/resources/profiles/BBL/filament/Generic PETG HF @base.json +++ b/resources/profiles/BBL/filament/Generic PETG HF @base.json @@ -3,7 +3,7 @@ "name": "Generic PETG HF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG96", + "filament_id": "OF7lOgYF", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Generic PETG-CF @base.json b/resources/profiles/BBL/filament/Generic PETG-CF @base.json index c1d7338bd4..4f2f6ed3f9 100644 --- a/resources/profiles/BBL/filament/Generic PETG-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PETG-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PETG-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG98", + "filament_id": "OFoYSJKi", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Generic PHA @base.json b/resources/profiles/BBL/filament/Generic PHA @base.json index 8e3a7e5f6a..fe2373ff7c 100644 --- a/resources/profiles/BBL/filament/Generic PHA @base.json +++ b/resources/profiles/BBL/filament/Generic PHA @base.json @@ -3,6 +3,6 @@ "name": "Generic PHA @base", "inherits": "fdm_filament_pha", "from": "system", - "filament_id": "GFR98", + "filament_id": "OF74KeQR", "instantiation": "false" } diff --git a/resources/profiles/BBL/filament/Generic PLA @base.json b/resources/profiles/BBL/filament/Generic PLA @base.json index f5c584bc3e..8e166fe212 100644 --- a/resources/profiles/BBL/filament/Generic PLA @base.json +++ b/resources/profiles/BBL/filament/Generic PLA @base.json @@ -3,7 +3,7 @@ "name": "Generic PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL99", + "filament_id": "OFDSrzZ8", "instantiation": "false", "description": "The generic presets are conservatively tuned for compatibility with a wider range of filaments. For higher printing quality and speeds, please use Bambu filaments with Bambu presets.", "filament_flow_ratio": [ diff --git a/resources/profiles/BBL/filament/Generic PLA High Speed @base.json b/resources/profiles/BBL/filament/Generic PLA High Speed @base.json index f03e30f5ec..9fd751ae44 100644 --- a/resources/profiles/BBL/filament/Generic PLA High Speed @base.json +++ b/resources/profiles/BBL/filament/Generic PLA High Speed @base.json @@ -3,7 +3,7 @@ "name": "Generic PLA High Speed @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL95", + "filament_id": "OFmpMwxS", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/BBL/filament/Generic PLA Silk @base.json b/resources/profiles/BBL/filament/Generic PLA Silk @base.json index 4dfe033cb3..41bc486e88 100644 --- a/resources/profiles/BBL/filament/Generic PLA Silk @base.json +++ b/resources/profiles/BBL/filament/Generic PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Generic PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL96", + "filament_id": "OFesA6rF", "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_flow_ratio": [ diff --git a/resources/profiles/BBL/filament/Generic PLA-CF @base.json b/resources/profiles/BBL/filament/Generic PLA-CF @base.json index 8f59df41a8..ffbcaad864 100644 --- a/resources/profiles/BBL/filament/Generic PLA-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PLA-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PLA-CF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL98", + "filament_id": "OFWbdGsC", "instantiation": "false", "additional_cooling_fan_speed": [ "0" diff --git a/resources/profiles/BBL/filament/Generic PP @base.json b/resources/profiles/BBL/filament/Generic PP @base.json index 14c266404a..94847d67e9 100644 --- a/resources/profiles/BBL/filament/Generic PP @base.json +++ b/resources/profiles/BBL/filament/Generic PP @base.json @@ -3,6 +3,6 @@ "name": "Generic PP @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "GFP97", + "filament_id": "OF1UNk9P", "instantiation": "false" } diff --git a/resources/profiles/BBL/filament/Generic PP-CF @base.json b/resources/profiles/BBL/filament/Generic PP-CF @base.json index 307793d371..e04ee56b6d 100644 --- a/resources/profiles/BBL/filament/Generic PP-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PP-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PP-CF @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "GFP96", + "filament_id": "OFXkm8q1", "instantiation": "false", "filament_cost": [ "77.99" diff --git a/resources/profiles/BBL/filament/Generic PP-GF @base.json b/resources/profiles/BBL/filament/Generic PP-GF @base.json index d17fa31d68..5d82e8223a 100644 --- a/resources/profiles/BBL/filament/Generic PP-GF @base.json +++ b/resources/profiles/BBL/filament/Generic PP-GF @base.json @@ -3,7 +3,7 @@ "name": "Generic PP-GF @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "GFP95", + "filament_id": "OFsijjtH", "instantiation": "false", "filament_cost": [ "59.99" diff --git a/resources/profiles/BBL/filament/Generic PPA-CF @base.json b/resources/profiles/BBL/filament/Generic PPA-CF @base.json index 6287533414..78ad9bca5e 100644 --- a/resources/profiles/BBL/filament/Generic PPA-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PPA-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PPA-CF @base", "inherits": "fdm_filament_ppa", "from": "system", - "filament_id": "GFN97", + "filament_id": "OF8tPByX", "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.", "filament_max_volumetric_speed": [ diff --git a/resources/profiles/BBL/filament/Generic PPA-GF @base.json b/resources/profiles/BBL/filament/Generic PPA-GF @base.json index 6220abbeef..72ff99cd16 100644 --- a/resources/profiles/BBL/filament/Generic PPA-GF @base.json +++ b/resources/profiles/BBL/filament/Generic PPA-GF @base.json @@ -3,7 +3,7 @@ "name": "Generic PPA-GF @base", "inherits": "fdm_filament_ppa", "from": "system", - "filament_id": "GFN96", + "filament_id": "OF8Tlg47", "instantiation": "false", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/BBL/filament/Generic PPS @base.json b/resources/profiles/BBL/filament/Generic PPS @base.json index 882fea94e0..08ba73cba8 100644 --- a/resources/profiles/BBL/filament/Generic PPS @base.json +++ b/resources/profiles/BBL/filament/Generic PPS @base.json @@ -3,7 +3,7 @@ "name": "Generic PPS @base", "inherits": "fdm_filament_pps", "from": "system", - "filament_id": "GFT97", + "filament_id": "OFq9svOz", "instantiation": "false", "filament_dev_chamber_drying_bed_temperature": [ "90" diff --git a/resources/profiles/BBL/filament/Generic PPS-CF @base.json b/resources/profiles/BBL/filament/Generic PPS-CF @base.json index f003a7b470..76aab2de8b 100644 --- a/resources/profiles/BBL/filament/Generic PPS-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PPS-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PPS-CF @base", "inherits": "fdm_filament_pps", "from": "system", - "filament_id": "GFT98", + "filament_id": "OF6rdQ6M", "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.", "fan_max_speed": [ diff --git a/resources/profiles/BBL/filament/Generic PVA @base.json b/resources/profiles/BBL/filament/Generic PVA @base.json index ca3dae82a4..4021f07f45 100644 --- a/resources/profiles/BBL/filament/Generic PVA @base.json +++ b/resources/profiles/BBL/filament/Generic PVA @base.json @@ -3,7 +3,7 @@ "name": "Generic PVA @base", "inherits": "fdm_filament_pva", "from": "system", - "filament_id": "GFS99", + "filament_id": "OFDvXujf", "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_flow_ratio": [ diff --git a/resources/profiles/BBL/filament/Generic SBS @base.json b/resources/profiles/BBL/filament/Generic SBS @base.json index 6decbf2213..fbf9b8a403 100644 --- a/resources/profiles/BBL/filament/Generic SBS @base.json +++ b/resources/profiles/BBL/filament/Generic SBS @base.json @@ -3,7 +3,7 @@ "name": "Generic SBS @base", "inherits": "fdm_filament_sbs", "from": "system", - "filament_id": "GFLSBS99", + "filament_id": "OFhQfUQY", "instantiation": "false", "filament_flow_ratio": [ "0.98" diff --git a/resources/profiles/BBL/filament/Generic SBS.json b/resources/profiles/BBL/filament/Generic SBS.json index 2e38a46fde..ffa36a9abb 100644 --- a/resources/profiles/BBL/filament/Generic SBS.json +++ b/resources/profiles/BBL/filament/Generic SBS.json @@ -4,7 +4,7 @@ "inherits": "Generic SBS @base", "from": "system", "setting_id": "BFLSBS99-1", - "filament_id": "BFLSBS99", + "filament_id": "OFhQfUQY", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic TPU @base.json b/resources/profiles/BBL/filament/Generic TPU @base.json index 78fe4c1b1a..f2bc7049aa 100644 --- a/resources/profiles/BBL/filament/Generic TPU @base.json +++ b/resources/profiles/BBL/filament/Generic TPU @base.json @@ -3,7 +3,7 @@ "name": "Generic TPU @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU99", + "filament_id": "OFgbpcy9", "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_max_volumetric_speed": [ diff --git a/resources/profiles/BBL/filament/Generic TPU for AMS @base.json b/resources/profiles/BBL/filament/Generic TPU for AMS @base.json index eb42aa3df2..1432bdfbe2 100644 --- a/resources/profiles/BBL/filament/Generic TPU for AMS @base.json +++ b/resources/profiles/BBL/filament/Generic TPU for AMS @base.json @@ -3,7 +3,7 @@ "name": "Generic TPU for AMS @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "GFU98", + "filament_id": "OFmN2lvw", "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.", "filament_cost": [ diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @base.json b/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @base.json index 91080469cd..b77157064b 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @base.json +++ b/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @base.json @@ -3,7 +3,7 @@ "name": "Numakers PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFNMK00", + "filament_id": "OFqGRZyH", "instantiation": "false", "filament_cost": [ "20.99" diff --git a/resources/profiles/BBL/filament/Overture/Overture Matte PLA @base.json b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @base.json index 469116c778..bccfb1f17b 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Matte PLA @base.json +++ b/resources/profiles/BBL/filament/Overture/Overture Matte PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture Matte PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL05", + "filament_id": "OFBw6eEG", "instantiation": "false", "filament_cost": [ "24.52" diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA @base.json b/resources/profiles/BBL/filament/Overture/Overture PLA @base.json index c31f99f8c8..0f302d4798 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA @base.json +++ b/resources/profiles/BBL/filament/Overture/Overture PLA @base.json @@ -3,7 +3,7 @@ "name": "Overture PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL04", + "filament_id": "OFc3xdm9", "instantiation": "false", "filament_cost": [ "24.15" diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json index 80525e03b2..454c36e7b0 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json +++ b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json @@ -3,7 +3,7 @@ "name": "Overture PLA Pro @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFOT001", + "filament_id": "OFxA1p01", "instantiation": "false", "filament_cost": [ "26.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF @base.json index d98490f1d7..a5aa03bf9b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA12-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL52", + "filament_id": "OFX0ycRQ", "instantiation": "false", "eng_plate_temp": [ "40" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @base.json index 368abf5570..674d5acb38 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA12-CF10 @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL56", + "filament_id": "OFvxIS9g", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF @base.json index d0424d164b..823e8a0ff1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL50", + "filament_id": "OFkOviHk", "instantiation": "false", "eng_plate_temp": [ "40" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @base.json index 65fee6a5bb..f28ee154b8 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-CF20 @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL57", + "filament_id": "OFEabreg", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF @base.json index 6ad501fdfc..607b1c8e00 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-GF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL51", + "filament_id": "OFwaYjL6", "instantiation": "false", "eng_plate_temp": [ "40" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @base.json index af2b6d92e1..426e4175db 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-GF25 @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL58", + "filament_id": "OF5B9sUc", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF @base.json index bd7d52f415..3765f754f5 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA612-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL53", + "filament_id": "OFS2tn6G", "instantiation": "false", "fan_cooling_layer_time": [ "5" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @base.json index dc7194aad0..310a2229d9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PA612-CF15 @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "GFL59", + "filament_id": "OFcBl0nJ", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF @base.json index 365ebb2fd7..2ca2a42d04 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PET-CF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFL54", + "filament_id": "OFHWSM21", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @base.json index adcbf5c9ef..d55b7d2daf 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PET-CF17 @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFL60", + "filament_id": "OFAc0Pr3", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-ESD @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-ESD @base.json index 11c846ff78..b459cc68a1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-ESD @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-ESD @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PETG-ESD @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFL06", + "filament_id": "OFcytyoA", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF @base.json index f5674437e8..f052304624 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PETG-rCF @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFL55", + "filament_id": "OFk8t9mz", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @base.json index da9cdeb43c..fe8eca06cb 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @base.json @@ -3,7 +3,7 @@ "name": "Fiberon PETG-rCF08 @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFL61", + "filament_id": "OFw4WD4T", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @base.json index b79b34db77..e3e21d17a1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @base.json @@ -3,7 +3,7 @@ "name": "Panchroma CoPE @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM016", + "filament_id": "OFqw2PQA", "instantiation": "false", "filament_cost": [ "19.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @base.json index 284ad94032..5f4c2682db 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM001", + "filament_id": "OFsRDvTM", "instantiation": "false", "filament_cost": [ "19.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @base.json index 5a1bfdd22a..18382eb7a0 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Celestial @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM008", + "filament_id": "OFRiYgMK", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @base.json index 6cc9094d1a..bf84a536a4 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Galaxy @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM007", + "filament_id": "OFFkCLBl", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @base.json index c1ded4c198..ab3032ad57 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Glow @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM010", + "filament_id": "OF0gGRWk", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @base.json index 8c9a74ad88..14a805212e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Luminous @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM011", + "filament_id": "OF0kCNDK", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @base.json index cf1574fa9c..63680ba1b7 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM003", + "filament_id": "OFKiSMWR", "instantiation": "false", "filament_cost": [ "21.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @base.json index 71dda06b1e..33d880ac08 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM002", + "filament_id": "OFrOh600", "instantiation": "false", "filament_cost": [ "20.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @base.json index 6cda256ff4..89ce745162 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Metallic @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM012", + "filament_id": "OFjb0wos", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @base.json index 3d8f857e56..bd8f5fc0d6 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Neon @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM013", + "filament_id": "OFO1GEq6", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json index 6af2ad1bbe..c8ef69cf88 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Satin @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM005", + "filament_id": "OFPkCJKE", "instantiation": "false", "filament_cost": [ "20.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @base.json index b21d127b41..94c2cb7c0b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Silk @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM004", + "filament_id": "OFS8lTQt", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @base.json index 57ddbd09b3..8622a109f2 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Starlight @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM009", + "filament_id": "OFC78WGQ", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @base.json index 322f91be2b..d0d6f6b057 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Temp Shift @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM015", + "filament_id": "OFhASRWj", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @base.json index 7c7e5eedb7..ac8842d912 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA Translucent @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM006", + "filament_id": "OFCIUsWh", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @base.json index 5ab8d5b81c..986b46fd5d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @base.json @@ -3,7 +3,7 @@ "name": "Panchroma PLA UV Shift @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM014", + "filament_id": "OF1N1qMK", "instantiation": "false", "filament_cost": [ "29.99" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite ABS @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite ABS @base.json index 8e1ec42a79..11be66397d 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite ABS @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite ABS @base.json @@ -3,7 +3,7 @@ "name": "PolyLite ABS @base", "inherits": "fdm_filament_abs", "from": "system", - "filament_id": "GFB60", + "filament_id": "OFOvv91M", "instantiation": "false", "filament_cost": [ "26.9" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite ASA @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite ASA @base.json index 88e453e0e5..026efbfb61 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite ASA @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite ASA @base.json @@ -3,7 +3,7 @@ "name": "PolyLite ASA @base", "inherits": "fdm_filament_asa", "from": "system", - "filament_id": "GFB61", + "filament_id": "OFvrXuV7", "instantiation": "false", "eng_plate_temp": [ "100" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @base.json index 18f38f0c68..92739d13bb 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @base.json @@ -3,7 +3,7 @@ "name": "PolyLite CosPLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL62", + "filament_id": "OFJgijky", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PETG @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PETG @base.json index 87e9a1194a..365f5f1460 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PETG @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PETG @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFG60", + "filament_id": "OF0UJcb6", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA @base.json index cbfe608b4e..55ea664946 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL00", + "filament_id": "OF5CgdDq", "instantiation": "false", "filament_cost": [ "25.4" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @base.json index 9480b33392..90996083f1 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Galaxy @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL63", + "filament_id": "OFvyB0Bz", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @base.json index ab4b717dbb..3a70d3a83f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Glow @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL64", + "filament_id": "OF5umxxT", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @base.json index a6bb2746c1..14131c0348 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Luminous @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL65", + "filament_id": "OFBoSWxb", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @base.json index 5a0ec60465..b9fc01a700 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Neon @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL66", + "filament_id": "OFitS8al", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @base.json index bf2867a702..93c6cf8c9f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Pro @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM019", + "filament_id": "OFF9OKoY", "instantiation": "false", "filament_cost": [ "24.99" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @base.json index ecc73602c3..3c8a79ed3f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Starlight @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL67", + "filament_id": "OFIxOuOu", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @base.json index f5f9c89720..9a6155e283 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @base.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Translucent @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL68", + "filament_id": "OFy02QHU", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA @base.json b/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA @base.json index e844afc545..3b13c5b55c 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA @base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL01", + "filament_id": "OFW29a9R", "instantiation": "false", "filament_cost": [ "25.4" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @base.json b/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @base.json index 2b64adc51c..ea65b41ec4 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL69", + "filament_id": "OFxe4rXr", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @base.json b/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @base.json index 15fccef9e3..1d322a6c3e 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @base.json +++ b/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @base.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL70", + "filament_id": "OFEjbwqG", "instantiation": "false", "bed_type": [ "Cool Plate" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @base.json b/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @base.json index 22b1a0d5ce..94ab2b2fd9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @base.json @@ -3,7 +3,7 @@ "name": "Polymaker HT-PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM017", + "filament_id": "OFPoyiFs", "instantiation": "false", "filament_cost": [ "26.99" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @base.json b/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @base.json index 55173547e9..585a6dd554 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @base.json +++ b/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @base.json @@ -3,7 +3,7 @@ "name": "Polymaker HT-PLA-GF @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFPM018", + "filament_id": "OFlwmqrC", "instantiation": "false", "filament_cost": [ "32.99" diff --git a/resources/profiles/BBL/filament/SUNLU/SUNLU Marble PLA @base.json b/resources/profiles/BBL/filament/SUNLU/SUNLU Marble PLA @base.json index 099f90ce9c..d2f34323a0 100644 --- a/resources/profiles/BBL/filament/SUNLU/SUNLU Marble PLA @base.json +++ b/resources/profiles/BBL/filament/SUNLU/SUNLU Marble PLA @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA Marble @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL06", + "filament_id": "OFxUwUeW", "instantiation": "false", "filament_cost": [ "31.99" diff --git a/resources/profiles/BBL/filament/SUNLU/SUNLU PETG @base.json b/resources/profiles/BBL/filament/SUNLU/SUNLU PETG @base.json index 523468391e..6e3eaf356e 100644 --- a/resources/profiles/BBL/filament/SUNLU/SUNLU PETG @base.json +++ b/resources/profiles/BBL/filament/SUNLU/SUNLU PETG @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PETG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "GFSNL08", + "filament_id": "OF2GCW1l", "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": [ diff --git a/resources/profiles/BBL/filament/SUNLU/SUNLU PLA Matte @base.json b/resources/profiles/BBL/filament/SUNLU/SUNLU PLA Matte @base.json index f99bbc84bf..f3b92cdb2f 100644 --- a/resources/profiles/BBL/filament/SUNLU/SUNLU PLA Matte @base.json +++ b/resources/profiles/BBL/filament/SUNLU/SUNLU PLA Matte @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA Matte @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL02", + "filament_id": "OFpW4gdi", "instantiation": "false", "filament_cost": [ "25.99" diff --git a/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ 2.0 @base.json b/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ 2.0 @base.json index 47f103af84..d2b1087f28 100644 --- a/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ 2.0 @base.json +++ b/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ 2.0 @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA+ 2.0 @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL04", + "filament_id": "OFHmPYRy", "instantiation": "false", "filament_cost": [ "18.99" diff --git a/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ @base.json b/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ @base.json index ffe454c74f..c46fb9affc 100644 --- a/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ @base.json +++ b/resources/profiles/BBL/filament/SUNLU/SUNLU PLA+ @base.json @@ -3,7 +3,7 @@ "name": "SUNLU PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL03", + "filament_id": "OFMUWNkp", "instantiation": "false", "filament_cost": [ "18.99" diff --git a/resources/profiles/BBL/filament/SUNLU/SUNLU Silk PLA+ @base.json b/resources/profiles/BBL/filament/SUNLU/SUNLU Silk PLA+ @base.json index e83ae1a411..22e7994783 100644 --- a/resources/profiles/BBL/filament/SUNLU/SUNLU Silk PLA+ @base.json +++ b/resources/profiles/BBL/filament/SUNLU/SUNLU Silk PLA+ @base.json @@ -3,7 +3,7 @@ "name": "SUNLU Silk PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL05", + "filament_id": "OFpPGSKG", "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": [ diff --git a/resources/profiles/BBL/filament/SUNLU/SUNLU Wood PLA @base.json b/resources/profiles/BBL/filament/SUNLU/SUNLU Wood PLA @base.json index 8cc3cd97a7..e13c06ceb8 100644 --- a/resources/profiles/BBL/filament/SUNLU/SUNLU Wood PLA @base.json +++ b/resources/profiles/BBL/filament/SUNLU/SUNLU Wood PLA @base.json @@ -3,7 +3,7 @@ "name": "SUNLU Wood PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFSNL07", + "filament_id": "OFLJ8S6I", "instantiation": "false", "filament_cost": [ "26.99" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth ABS rABS.json b/resources/profiles/BBL/filament/addnorth/addnorth ABS rABS.json index 2889bc0a39..ecc4aa62f4 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth ABS rABS.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth ABS rABS.json @@ -4,7 +4,7 @@ "inherits": "Generic ABS @base", "from": "system", "setting_id": "GF_ANRA_00", - "filament_id": "GF_ANRA", + "filament_id": "OFzk5oAo", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura FDA.json b/resources/profiles/BBL/filament/addnorth/addnorth PA Adura FDA.json index 9da0cc2b6e..3d4fbe9c88 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura FDA.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PA Adura FDA.json @@ -4,7 +4,7 @@ "inherits": "Generic PA @base", "from": "system", "setting_id": "GF_ANAF_00", - "filament_id": "GF_ANAF", + "filament_id": "OFSw6Mor", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura.json b/resources/profiles/BBL/filament/addnorth/addnorth PA Adura.json index 037ae82eed..5486b65d44 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PA Adura.json @@ -4,7 +4,7 @@ "inherits": "Generic PA @base", "from": "system", "setting_id": "GF_ANAD_00", - "filament_id": "GF_ANAD", + "filament_id": "OFWK0Y9A", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA-CF Adura X.json b/resources/profiles/BBL/filament/addnorth/addnorth PA-CF Adura X.json index 3b8f50c799..1881e454f5 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA-CF Adura X.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PA-CF Adura X.json @@ -4,7 +4,7 @@ "inherits": "Generic PA-CF @base", "from": "system", "setting_id": "GF_ANAX_00", - "filament_id": "GF_ANAX", + "filament_id": "OFBsbMMF", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA6 Addlantis.json b/resources/profiles/BBL/filament/addnorth/addnorth PA6 Addlantis.json index dc5e815df5..e0696d14fe 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA6 Addlantis.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PA6 Addlantis.json @@ -4,7 +4,7 @@ "inherits": "Generic PA @base", "from": "system", "setting_id": "GF_ANLA_00", - "filament_id": "GF_ANLA", + "filament_id": "OF1ID4N1", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PC BLend HT LCF.json b/resources/profiles/BBL/filament/addnorth/addnorth PC BLend HT LCF.json index e1e67fbb71..d64bb0629e 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PC BLend HT LCF.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PC BLend HT LCF.json @@ -4,7 +4,7 @@ "inherits": "Generic PC @base", "from": "system", "setting_id": "GF_ANPBX_00", - "filament_id": "GF_ANPBX", + "filament_id": "OFhN09f0", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG Base.json b/resources/profiles/BBL/filament/addnorth/addnorth PETG Base.json index 288368dd07..6a4af4f908 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG Base.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PETG Base.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @base", "from": "system", "setting_id": "GF_ANPE_00", - "filament_id": "GF_ANPE", + "filament_id": "OFHHwrd1", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG ESD.json b/resources/profiles/BBL/filament/addnorth/addnorth PETG ESD.json index 060ffe6b56..ff647879dc 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG ESD.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PETG ESD.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @base", "from": "system", "setting_id": "GF_ANEG_00", - "filament_id": "GF_ANEG", + "filament_id": "OFUtiVRn", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG Economy.json b/resources/profiles/BBL/filament/addnorth/addnorth PETG Economy.json index c83d353302..fdbaa361f2 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG Economy.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PETG Economy.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @base", "from": "system", "setting_id": "GF_ANGE_00", - "filament_id": "GF_ANGE", + "filament_id": "OFZGrQTU", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG Flame v0.json b/resources/profiles/BBL/filament/addnorth/addnorth PETG Flame v0.json index 96aec4f471..12849a851d 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG Flame v0.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PETG Flame v0.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @base", "from": "system", "setting_id": "GF_ANPF_00", - "filament_id": "GF_ANPF", + "filament_id": "OF0EYBWQ", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG PRO Matte.json b/resources/profiles/BBL/filament/addnorth/addnorth PETG PRO Matte.json index a73d5ae48a..bdbecc7722 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG PRO Matte.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PETG PRO Matte.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @base", "from": "system", "setting_id": "GF_ANPM_00", - "filament_id": "GF_ANPM", + "filament_id": "OFU5JPDy", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG rPETG Matte.json b/resources/profiles/BBL/filament/addnorth/addnorth PETG rPETG Matte.json index 1c4f092d54..a466f88b0a 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG rPETG Matte.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PETG rPETG Matte.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG @base", "from": "system", "setting_id": "GF_ANRM_00", - "filament_id": "GF_ANRM", + "filament_id": "OFqTwtXM", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG-CF Rigid X.json b/resources/profiles/BBL/filament/addnorth/addnorth PETG-CF Rigid X.json index 927ef1ca6e..a5c78fe215 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG-CF Rigid X.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PETG-CF Rigid X.json @@ -4,7 +4,7 @@ "inherits": "Generic PETG-CF @base", "from": "system", "setting_id": "GF_ANRX_00", - "filament_id": "GF_ANRX", + "filament_id": "OFAcJkl1", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA E-PLA.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA E-PLA.json index d008217fcf..f32705ba65 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA E-PLA.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA E-PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @base", "from": "system", "setting_id": "GF_ANEP_00", - "filament_id": "GF_ANEP", + "filament_id": "OF71b7qO", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Economy.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA Economy.json index 51b2924577..fa2c0e9ae0 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Economy.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA Economy.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @base", "from": "system", "setting_id": "GF_ANPL_00", - "filament_id": "GF_ANPL", + "filament_id": "OFZJft47", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA HT-PLA PRO Matte.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA HT-PLA PRO Matte.json index 5ab0cc036a..1dc1796d4b 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA HT-PLA PRO Matte.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA HT-PLA PRO Matte.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @base", "from": "system", "setting_id": "GF_ANHTP_00", - "filament_id": "GF_ANHTP", + "filament_id": "OFVDWuxl", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Premium Silk.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA Premium Silk.json index caa3fb10ed..f64767d1e3 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Premium Silk.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA Premium Silk.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA Silk @base", "from": "system", "setting_id": "GF_ANPS_00", - "filament_id": "GF_ANPS", + "filament_id": "OFOQCfVa", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Textura.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA Textura.json index 97c7026910..1bbfb305b2 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Textura.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA Textura.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @base", "from": "system", "setting_id": "GF_ANTE_00", - "filament_id": "GF_ANTE", + "filament_id": "OFRFhdqy", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Wood.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA Wood.json index faa711ee14..99ec158160 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Wood.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA Wood.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @base", "from": "system", "setting_id": "GF_ANPLW_00", - "filament_id": "GF_ANPLW", + "filament_id": "OFN8QBhu", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA High Speed.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA High Speed.json index 3ffec96061..ffe91af773 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA High Speed.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA High Speed.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA High Speed @base", "from": "system", "setting_id": "GF_ANXPH_00", - "filament_id": "GF_ANXPH", + "filament_id": "OFLjDYxH", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA.json index b8016af159..073b96a224 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @base", "from": "system", "setting_id": "GF_ANXP_00", - "filament_id": "GF_ANXP", + "filament_id": "OFtdVZpV", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA rPLA RE-ADD.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA rPLA RE-ADD.json index ad47884179..b6a2695235 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA rPLA RE-ADD.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA rPLA RE-ADD.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA @base", "from": "system", "setting_id": "GF_ANRPL_00", - "filament_id": "GF_ANRPL", + "filament_id": "OFnBvPhb", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA-CF Carbon Fiber.json b/resources/profiles/BBL/filament/addnorth/addnorth PLA-CF Carbon Fiber.json index 608be46906..7910e3c772 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA-CF Carbon Fiber.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PLA-CF Carbon Fiber.json @@ -4,7 +4,7 @@ "inherits": "Generic PLA-CF @base", "from": "system", "setting_id": "GF_ANPCF_00", - "filament_id": "GF_ANPCF", + "filament_id": "OFcpa50Z", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PVDF Adamant S1.json b/resources/profiles/BBL/filament/addnorth/addnorth PVDF Adamant S1.json index 8ca7e5e5ab..13604f5832 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PVDF Adamant S1.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth PVDF Adamant S1.json @@ -4,7 +4,7 @@ "inherits": "Generic PA @base", "from": "system", "setting_id": "GF_ANPV_00", - "filament_id": "GF_ANPV", + "filament_id": "OFQ5TxZ2", "instantiation": "true", "activate_air_filtration": [ "1" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth TPU EasyFlex.json b/resources/profiles/BBL/filament/addnorth/addnorth TPU EasyFlex.json index 05c7af8947..d8a9ca5ca3 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth TPU EasyFlex.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth TPU EasyFlex.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @base", "from": "system", "setting_id": "GF_ANEF_00", - "filament_id": "GF_ANEF", + "filament_id": "OFO6GMJ3", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 85A.json b/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 85A.json index e6236ed79a..f4d1beac7d 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 85A.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 85A.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @base", "from": "system", "setting_id": "GF_ANTA_00", - "filament_id": "GF_ANTA", + "filament_id": "OFvcIGee", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 95A.json b/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 95A.json index 6b971b7d5c..61d6100a71 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 95A.json +++ b/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 95A.json @@ -4,7 +4,7 @@ "inherits": "Generic TPU @base", "from": "system", "setting_id": "GF_ANTM_00", - "filament_id": "GF_ANTM", + "filament_id": "OFyJjkek", "instantiation": "true", "activate_air_filtration": [ "0" diff --git a/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @base.json b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @base.json index 544608b91a..6820e79489 100644 --- a/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @base.json +++ b/resources/profiles/BBL/filament/eSUN/eSUN PLA+ @base.json @@ -3,7 +3,7 @@ "name": "eSUN PLA+ @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "GFL03", + "filament_id": "OFqINlYj", "instantiation": "false", "filament_cost": [ "22.99" diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 9a4b4a2abd..cf4d13c987 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -135,7 +135,6 @@ "Artillery/Artillery PVA @Artillery M1 Pro 0.4 nozzle", "Artillery/Artillery TPU", "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "BBL/Generic SBS", "BBL/addnorth ABS rABS", "BBL/addnorth PA Adura", "BBL/addnorth PA Adura FDA", @@ -877,637 +876,18 @@ "Z-Bolt/Generic ABS HT @Z-Bolt Base" ], "ids": { - "BABB00": [ - "BBL/BETA ABS" - ], - "BASB00": [ - "BBL/BETA ASA" - ], - "BFLSBS99": [ - "BBL/Generic SBS" - ], - "BHIB00": [ - "BBL/BETA HIPS" - ], - "BPAB00": [ - "BBL/BETA PAHT-CF" - ], - "BPBB00": [ - "BBL/BETA PEBA 90A" - ], - "BPGB00": [ - "BBL/BETA PETG" - ], - "BPGB01": [ - "BBL/BETA PETG Heat Color Change" - ], - "BPGB02": [ - "BBL/BETA PETG Fluorescence" - ], - "BPGB03": [ - "BBL/BETA PETG Glitter" - ], - "BPGB04": [ - "BBL/BETA PETG Glow" - ], - "BPGB05": [ - "BBL/BETA PETG Gradient" - ], - "BPGB06": [ - "BBL/BETA PETG HF" - ], - "BPGB07": [ - "BBL/BETA PETG Marble" - ], - "BPGB08": [ - "BBL/BETA PETG Matte" - ], - "BPGB09": [ - "BBL/BETA PETG Metallic" - ], - "BPGB10": [ - "BBL/BETA PETG Transparent" - ], - "BPGB11": [ - "BBL/BETA PETG UV Color Change" - ], - "BPGB12": [ - "BBL/BETA PETG-CF" - ], - "BPGB13": [ - "BBL/BETA PETG-GF" - ], - "BPLB00": [ - "BBL/BETA PLA Basic" - ], - "BPLB01": [ - "BBL/BETA PLA Silk+" - ], - "BPLB02": [ - "BBL/BETA PLA Chameleon" - ], - "BPLB03": [ - "BBL/BETA PLA Heat Color Change" - ], - "BPLB04": [ - "BBL/BETA PLA Fluorescence" - ], - "BPLB05": [ - "BBL/BETA PLA Glitter" - ], - "BPLB06": [ - "BBL/BETA PLA Glow" - ], - "BPLB07": [ - "BBL/BETA PLA Gradient" - ], - "BPLB08": [ - "BBL/BETA PLA Marble" - ], - "BPLB09": [ - "BBL/BETA PLA Matte" - ], - "BPLB10": [ - "BBL/BETA PLA Metal" - ], - "BPLB11": [ - "BBL/BETA PLA Metallic" - ], - "BPLB12": [ - "BBL/BETA PLA PRO" - ], - "BPLB13": [ - "BBL/BETA PLA Silk" - ], - "BPLB14": [ - "BBL/BETA PLA Transparent" - ], - "BPLB15": [ - "BBL/BETA PLA UV Color Change" - ], - "BPLB16": [ - "BBL/BETA PLA Youth" - ], - "BPLB17": [ - "BBL/BETA PLA-CF" - ], - "BPLB18": [ - "BBL/BETA PLA High Temp" - ], - "BPLB19": [ - "BBL/BETA PLA Wood" - ], - "BPLB20": [ - "BBL/BETA PLA High Speed" - ], - "BTUB00": [ - "BBL/BETA TPU 90A" - ], - "BTUB01": [ - "BBL/BETA TPU Matte" - ], - "BTUB02": [ - "BBL/BETA TPU 95A" - ], - "BTUB03": [ - "BBL/BETA TPU 98A" - ], - "GFA00": [ - "BBL/Bambu PLA Basic" - ], - "GFA01": [ - "BBL/Bambu PLA Matte" - ], - "GFA02": [ - "BBL/Bambu PLA Metal" - ], - "GFA05": [ - "BBL/Bambu PLA Silk" - ], - "GFA06": [ - "BBL/Bambu PLA Silk+" - ], - "GFA07": [ - "BBL/Bambu PLA Marble" - ], - "GFA08": [ - "BBL/Bambu PLA Sparkle" - ], - "GFA09": [ - "BBL/Bambu PLA Tough" - ], - "GFA10": [ - "BBL/Bambu PLA Tough+" - ], - "GFA11": [ - "BBL/Bambu PLA Aero" - ], - "GFA12": [ - "BBL/Bambu PLA Glow" - ], - "GFA13": [ - "BBL/Bambu PLA Dynamic" - ], - "GFA15": [ - "BBL/Bambu PLA Galaxy" - ], - "GFA16": [ - "BBL/Bambu PLA Wood" - ], - "GFA17": [ - "BBL/Bambu PLA Translucent" - ], - "GFA18": [ - "BBL/Bambu PLA Lite" - ], - "GFA19": [ - "BBL/Bambu PLA Pure" - ], - "GFA50": [ - "BBL/Bambu PLA-CF" - ], - "GFB00": [ - "BBL/Bambu ABS" - ], - "GFB01": [ - "BBL/Bambu ASA" - ], - "GFB02": [ - "BBL/Bambu ASA-Aero" - ], - "GFB50": [ - "BBL/Bambu ABS-GF" - ], - "GFB51": [ - "BBL/Bambu ASA-CF" - ], - "GFB60": [ - "BBL/PolyLite ABS" - ], - "GFB61": [ - "BBL/PolyLite ASA" - ], - "GFB98": [ - "BBL/Generic ASA" - ], - "GFB99": [ - "BBL/Generic ABS" - ], - "GFC00": [ - "BBL/Bambu PC" - ], - "GFC01": [ - "BBL/Bambu PC FR" - ], - "GFC99": [ - "BBL/Generic PC" - ], - "GFG00": [ - "BBL/Bambu PETG Basic" - ], - "GFG01": [ - "BBL/Bambu PETG Translucent" - ], - "GFG02": [ - "BBL/Bambu PETG HF" - ], - "GFG50": [ - "BBL/Bambu PETG-CF" - ], - "GFG60": [ - "BBL/PolyLite PETG" - ], - "GFG96": [ - "BBL/Generic PETG HF" - ], - "GFG97": [ - "BBL/Generic PCTG" - ], - "GFG98": [ - "BBL/Generic PETG-CF" - ], - "GFG99": [ - "BBL/Generic PETG" - ], - "GFL00": [ - "BBL/PolyLite PLA" - ], - "GFL01": [ - "BBL/PolyTerra PLA" - ], - "GFL03": [ - "BBL/eSUN PLA+" - ], - "GFL04": [ - "BBL/Overture PLA" - ], - "GFL05": [ - "BBL/Overture Matte PLA" - ], - "GFL06": [ - "BBL/Fiberon PETG-ESD" - ], - "GFL50": [ - "BBL/Fiberon PA6-CF" - ], - "GFL51": [ - "BBL/Fiberon PA6-GF" - ], - "GFL52": [ - "BBL/Fiberon PA12-CF" - ], - "GFL53": [ - "BBL/Fiberon PA612-CF" - ], - "GFL54": [ - "BBL/Fiberon PET-CF" - ], - "GFL55": [ - "BBL/Fiberon PETG-rCF" - ], - "GFL56": [ - "BBL/Fiberon PA12-CF10" - ], - "GFL57": [ - "BBL/Fiberon PA6-CF20" - ], - "GFL58": [ - "BBL/Fiberon PA6-GF25" - ], - "GFL59": [ - "BBL/Fiberon PA612-CF15" - ], - "GFL60": [ - "BBL/Fiberon PET-CF17" - ], - "GFL61": [ - "BBL/Fiberon PETG-rCF08" - ], - "GFL62": [ - "BBL/PolyLite CosPLA" - ], - "GFL63": [ - "BBL/PolyLite PLA Galaxy" - ], - "GFL64": [ - "BBL/PolyLite PLA Glow" - ], - "GFL65": [ - "BBL/PolyLite PLA Luminous" - ], - "GFL66": [ - "BBL/PolyLite PLA Neon" - ], - "GFL67": [ - "BBL/PolyLite PLA Starlight" - ], - "GFL68": [ - "BBL/PolyLite PLA Translucent" - ], - "GFL69": [ - "BBL/PolyTerra PLA Marble" - ], - "GFL70": [ - "BBL/PolyTerra PLA+" - ], - "GFL95": [ - "BBL/Generic PLA High Speed" - ], - "GFL96": [ - "BBL/Generic PLA Silk" - ], - "GFL98": [ - "BBL/Generic PLA-CF" - ], - "GFL99": [ - "BBL/Generic PLA" - ], - "GFLSBS99": [], - "GFN03": [ - "BBL/Bambu PA-CF" - ], - "GFN04": [ - "BBL/Bambu PAHT-CF" - ], - "GFN05": [ - "BBL/Bambu PA6-CF" - ], - "GFN06": [ - "BBL/Bambu PPA-CF" - ], - "GFN08": [ - "BBL/Bambu PA6-GF" - ], - "GFN96": [ - "BBL/Generic PPA-GF" - ], - "GFN97": [ - "BBL/Generic PPA-CF" - ], - "GFN98": [ - "BBL/Generic PA-CF" - ], - "GFN99": [ - "BBL/Generic PA" - ], - "GFNMK00": [ - "BBL/Numakers PLA+" - ], - "GFOT001": [ - "BBL/Overture PLA Pro" - ], - "GFP95": [ - "BBL/Generic PP-GF" - ], - "GFP96": [ - "BBL/Generic PP-CF" - ], - "GFP97": [ - "BBL/Generic PP" - ], - "GFP98": [ - "BBL/Generic PE-CF" - ], - "GFP99": [ - "BBL/Generic PE" - ], - "GFPM001": [ - "BBL/Panchroma PLA" - ], - "GFPM002": [ - "BBL/Panchroma PLA Matte" - ], - "GFPM003": [ - "BBL/Panchroma PLA Marble" - ], - "GFPM004": [ - "BBL/Panchroma PLA Silk" - ], - "GFPM005": [ - "BBL/Panchroma PLA Satin" - ], - "GFPM006": [ - "BBL/Panchroma PLA Translucent" - ], - "GFPM007": [ - "BBL/Panchroma PLA Galaxy" - ], - "GFPM008": [ - "BBL/Panchroma PLA Celestial" - ], - "GFPM009": [ - "BBL/Panchroma PLA Starlight" - ], - "GFPM010": [ - "BBL/Panchroma PLA Glow" - ], - "GFPM011": [ - "BBL/Panchroma PLA Luminous" - ], - "GFPM012": [ - "BBL/Panchroma PLA Metallic" - ], - "GFPM013": [ - "BBL/Panchroma PLA Neon" - ], - "GFPM014": [ - "BBL/Panchroma PLA UV Shift" - ], - "GFPM015": [ - "BBL/Panchroma PLA Temp Shift" - ], - "GFPM016": [ - "BBL/Panchroma CoPE" - ], - "GFPM017": [ - "BBL/Polymaker HT-PLA" - ], - "GFPM018": [ - "BBL/Polymaker HT-PLA-GF" - ], - "GFPM019": [ - "BBL/PolyLite PLA Pro" - ], - "GFR00": [ - "BBL/FusRock ABS-GF" - ], - "GFR98": [ - "BBL/Generic PHA" - ], - "GFR99": [ - "BBL/Generic EVA" - ], - "GFS00": [ - "BBL/Bambu Support W" - ], - "GFS01": [ - "BBL/Bambu Support G" - ], - "GFS02": [ - "BBL/Bambu Support For PLA" - ], - "GFS03": [ - "BBL/Bambu Support For PA/PET" - ], - "GFS04": [ - "BBL/Bambu PVA" - ], - "GFS05": [ - "BBL/Bambu Support For PLA/PETG" - ], - "GFS06": [ - "BBL/Bambu Support for ABS" - ], - "GFS97": [ - "BBL/Generic BVOH" - ], - "GFS98": [ - "BBL/Generic HIPS" - ], - "GFS99": [ - "BBL/Generic PVA" - ], - "GFSNL02": [ - "BBL/SUNLU PLA Matte" - ], - "GFSNL03": [ - "BBL/SUNLU PLA+" - ], - "GFSNL04": [ - "BBL/SUNLU PLA+ 2.0" - ], - "GFSNL05": [ - "BBL/SUNLU Silk PLA+" - ], - "GFSNL06": [ - "BBL/SUNLU PLA Marble" - ], - "GFSNL07": [ - "BBL/SUNLU Wood PLA" - ], - "GFSNL08": [ - "BBL/SUNLU PETG" - ], - "GFT01": [ - "BBL/Bambu PET-CF" - ], - "GFT02": [ - "BBL/Bambu PPS-CF" - ], - "GFT97": [ - "BBL/Generic PPS" - ], - "GFT98": [ - "BBL/Generic PPS-CF" - ], - "GFU00": [ - "BBL/Bambu TPU 95A HF" - ], - "GFU01": [ - "BBL/Bambu TPU 95A" - ], - "GFU02": [ - "BBL/Bambu TPU for AMS" - ], - "GFU03": [ - "BBL/Bambu TPU 90A" - ], - "GFU04": [ - "BBL/Bambu TPU 85A" - ], - "GFU98": [ - "BBL/Generic TPU for AMS" - ], - "GFU99": [ - "BBL/Generic TPU" - ], - "GF_ANAD": [ - "BBL/addnorth PA Adura" - ], - "GF_ANAF": [ - "BBL/addnorth PA Adura FDA" - ], - "GF_ANAX": [ - "BBL/addnorth PA-CF Adura X" - ], - "GF_ANEF": [ - "BBL/addnorth TPU EasyFlex" - ], - "GF_ANEG": [ - "BBL/addnorth PETG ESD" - ], - "GF_ANEP": [ - "BBL/addnorth PLA E-PLA" - ], - "GF_ANGE": [ - "BBL/addnorth PETG Economy" - ], - "GF_ANHTP": [ - "BBL/addnorth PLA HT-PLA PRO Matte" - ], - "GF_ANLA": [ - "BBL/addnorth PA6 Addlantis" - ], - "GF_ANPBX": [ - "BBL/addnorth PC BLend HT LCF" - ], - "GF_ANPCF": [ - "BBL/addnorth PLA-CF Carbon Fiber" - ], - "GF_ANPE": [ - "BBL/addnorth PETG Base" - ], - "GF_ANPF": [ - "BBL/addnorth PETG Flame v0" - ], - "GF_ANPL": [ - "BBL/addnorth PLA Economy" - ], - "GF_ANPLW": [ - "BBL/addnorth PLA Wood" - ], - "GF_ANPM": [ - "BBL/addnorth PETG PRO Matte" - ], - "GF_ANPS": [ - "BBL/addnorth PLA Premium Silk" - ], - "GF_ANPV": [ - "BBL/addnorth PVDF Adamant S1" - ], - "GF_ANRA": [ - "BBL/addnorth ABS rABS" - ], - "GF_ANRM": [ - "BBL/addnorth PETG rPETG Matte" - ], - "GF_ANRPL": [ - "BBL/addnorth PLA rPLA RE-ADD" - ], - "GF_ANRX": [ - "BBL/addnorth PETG-CF Rigid X" - ], - "GF_ANTA": [ - "BBL/addnorth TPU Pro Matte 85A" - ], - "GF_ANTE": [ - "BBL/addnorth PLA Textura" - ], - "GF_ANTM": [ - "BBL/addnorth TPU Pro Matte 95A" - ], - "GF_ANXP": [ - "BBL/addnorth PLA X-PLA" - ], - "GF_ANXPH": [ - "BBL/addnorth PLA X-PLA High Speed" - ], "OF02UAVh": [ "Creality/Soleyin Ultra PLA" ], + "OF03RK6r": [ + "BBL/BETA PLA Metal" + ], "OF0AquDh": [ "Flashforge/FusRock S-Multi" ], + "OF0EYBWQ": [ + "BBL/addnorth PETG Flame v0" + ], "OF0FfcAG": [ "Anycubic/Anycubic TPU for ACE" ], @@ -1519,6 +899,7 @@ "Artillery/Artillery PLA Tough" ], "OF0UJcb6": [ + "BBL/PolyLite PETG", "OrcaFilamentLibrary/PolyLite PETG", "Snapmaker/PolyLite PETG" ], @@ -1535,6 +916,7 @@ "InfiMech/InfiMech ABS" ], "OF0gGRWk": [ + "BBL/Panchroma PLA Glow", "OrcaFilamentLibrary/Panchroma PLA Glow", "Snapmaker/Panchroma PLA Glow" ], @@ -1543,6 +925,7 @@ "OrcaFilamentLibrary/Elegoo PAHT-CF" ], "OF0kCNDK": [ + "BBL/Panchroma PLA Luminous", "OrcaFilamentLibrary/Panchroma PLA Luminous", "Snapmaker/Panchroma PLA Luminous" ], @@ -1557,6 +940,7 @@ "Qidi/QIDI ABS Rapido 0.8 nozzle" ], "OF0wBGNx": [ + "BBL/Bambu ASA-CF", "OrcaFilamentLibrary/Bambu ASA-CF" ], "OF0wz84w": [ @@ -1568,7 +952,11 @@ "OF112FvY": [ "Anycubic/Generic PETG Basic" ], + "OF1ID4N1": [ + "BBL/addnorth PA6 Addlantis" + ], "OF1N1qMK": [ + "BBL/Panchroma PLA UV Shift", "OrcaFilamentLibrary/Panchroma PLA UV Shift", "Snapmaker/Panchroma PLA UV Shift" ], @@ -1577,6 +965,7 @@ "OrcaFilamentLibrary/Overture Easy PLA" ], "OF1UNk9P": [ + "BBL/Generic PP", "Creality/Generic PP", "OrcaFilamentLibrary/Generic PP", "Tiertime/Generic PP" @@ -1604,6 +993,7 @@ "OrcaFilamentLibrary/FilAr PLA-mate Violeta" ], "OF2GCW1l": [ + "BBL/SUNLU PETG", "Flashforge/SUNLU PETG", "OrcaFilamentLibrary/SUNLU PETG", "Sovol/SUNLU PETG" @@ -1612,6 +1002,7 @@ "Qidi/QIDI PLA Silk" ], "OF2VFe4J": [ + "BBL/Bambu PAHT-CF", "OrcaFilamentLibrary/Bambu PAHT-CF" ], "OF2Z1nT5": [ @@ -1629,6 +1020,9 @@ "Elegoo/Elegoo Rapid TPU 95A", "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" ], + "OF342jVN": [ + "BBL/Bambu PLA Tough+" + ], "OF3F63OE": [ "re3D/re3D PETG" ], @@ -1638,6 +1032,9 @@ "OF3OMgrI": [ "Creality/CR-Silk" ], + "OF3PDEw3": [ + "BBL/BETA PLA High Speed" + ], "OF3WQaKK": [ "Creality/CR-PETG" ], @@ -1676,13 +1073,24 @@ "OF4Nhggz": [ "Artillery/Artillery PLA Basic+" ], - "OF4RvVuU": [], + "OF4PKvem": [ + "BBL/BETA PLA Fluorescence" + ], + "OF4QZANi": [ + "BBL/BETA TPU Matte" + ], + "OF4RvVuU": [ + "BBL/Bambu PPS-CF" + ], "OF4S3To3": [ "Qidi/QIDI PETG Rapido" ], "OF4WB37S": [ "Snapmaker/Snapmaker PETG" ], + "OF4XTfoI": [ + "BBL/BETA PETG Marble" + ], "OF4f8vVp": [ "WonderMaker/WonderMaker PET-CF" ], @@ -1701,6 +1109,7 @@ "Elegoo/Generic ASA-CF" ], "OF54B0S0": [ + "BBL/Bambu PPA-CF", "OrcaFilamentLibrary/Bambu PPA-CF" ], "OF54SvEe": [ @@ -1709,15 +1118,25 @@ "OF55jHAJ": [ "Prusa/Generic ABS HF" ], + "OF5B9sUc": [ + "BBL/Fiberon PA6-GF25" + ], "OF5BN24W": [ "Flashforge/Flashforge PPA-GF" ], + "OF5BXhHF": [ + "BBL/BETA PLA High Temp" + ], "OF5CgdDq": [ + "BBL/PolyLite PLA", "OrcaArena/PolyLite PLA", "OrcaFilamentLibrary/PolyLite PLA", "Qidi/PolyLite PLA", "Snapmaker/PolyLite PLA" ], + "OF5LAnla": [ + "BBL/BETA PLA Gradient" + ], "OF5NqBfC": [ "Wanhao France/YUMI PETG" ], @@ -1754,6 +1173,7 @@ "Ratrig/Generic TPU BigNozzle" ], "OF5umxxT": [ + "BBL/PolyLite PLA Glow", "Snapmaker/PolyLite PLA Glow" ], "OF5vgi2G": [ @@ -1785,23 +1205,34 @@ "Snapmaker/Snapmaker Breakaway Support For PLA", "Snapmaker/Snapmaker J1 PVA" ], + "OF6Yn69v": [ + "BBL/BETA TPU 90A" + ], "OF6kj4jI": [ "iQ/Fiberthree PACF Pro P2" ], "OF6qAuyi": [ "Flashforge/Flashforge PLA Matte" ], + "OF6qw3Wb": [ + "BBL/BETA PAHT-CF" + ], "OF6rdQ6M": [ + "BBL/Generic PPS-CF", "Creality/Generic PPS-CF", "Tiertime/Generic PPS-CF" ], "OF70zbGS": [ "Creality/Hyper L-W PLA" ], + "OF71b7qO": [ + "BBL/addnorth PLA E-PLA" + ], "OF72YYTd": [ "Snapmaker/Snapmaker ABS" ], "OF74KeQR": [ + "BBL/Generic PHA", "OrcaFilamentLibrary/Generic PHA", "Tiertime/Generic PHA" ], @@ -1821,6 +1252,7 @@ "Anycubic/Anycubic PLA Translucent" ], "OF7lOgYF": [ + "BBL/Generic PETG HF", "OrcaFilamentLibrary/Generic PETG HF", "Prusa/Generic PETG HF" ], @@ -1851,7 +1283,11 @@ "OF8O09RG": [ "Flashforge/Flashforge HS PLA Burnt Ti" ], + "OF8QdQwS": [ + "BBL/BETA PLA Silk+" + ], "OF8Tlg47": [ + "BBL/Generic PPA-GF", "OrcaFilamentLibrary/Generic PPA-GF", "Tiertime/Generic PPA-GF" ], @@ -1871,6 +1307,7 @@ "Eryone/Eryone PETG" ], "OF8tPByX": [ + "BBL/Generic PPA-CF", "OrcaFilamentLibrary/Generic PPA-CF", "Tiertime/Generic PPA-CF" ], @@ -1889,6 +1326,7 @@ "Afinia/Afinia PLA" ], "OF9OlTWH": [ + "BBL/Bambu PLA Marble", "OrcaFilamentLibrary/Bambu PLA Marble" ], "OF9PELEb": [ @@ -1924,10 +1362,17 @@ "OFAZllAN": [ "Artillery/Artillery PLA-CF" ], + "OFAc0Pr3": [ + "BBL/Fiberon PET-CF17" + ], + "OFAcJkl1": [ + "BBL/addnorth PETG-CF Rigid X" + ], "OFAebKg8": [ "Flashforge/Flashforge PLA Metal" ], "OFAnyRUI": [ + "BBL/Bambu Support For PLA", "OrcaFilamentLibrary/Bambu Support For PLA" ], "OFAt6ec0": [ @@ -1946,6 +1391,7 @@ "Creality/Soleyin Basic PETG" ], "OFBSW57R": [ + "BBL/Bambu PLA Aero", "OrcaFilamentLibrary/Bambu PLA Aero" ], "OFBUIlZ7": [ @@ -1956,9 +1402,14 @@ "Snapmaker/Snapmaker Dual PETG" ], "OFBoSWxb": [ + "BBL/PolyLite PLA Luminous", "Snapmaker/PolyLite PLA Luminous" ], + "OFBsbMMF": [ + "BBL/addnorth PA-CF Adura X" + ], "OFBw6eEG": [ + "BBL/Overture Matte PLA", "OrcaFilamentLibrary/Overture Matte PLA" ], "OFC1PzXz": [ @@ -1968,14 +1419,17 @@ "RH3D/Generic PCCF" ], "OFC78WGQ": [ + "BBL/Panchroma PLA Starlight", "OrcaFilamentLibrary/Panchroma PLA Starlight", "Snapmaker/Panchroma PLA Starlight" ], "OFCD8qiU": [ + "BBL/Generic EVA", "OrcaFilamentLibrary/Generic EVA", "Tiertime/Generic EVA" ], "OFCIUsWh": [ + "BBL/Panchroma PLA Translucent", "OrcaFilamentLibrary/Panchroma PLA Translucent", "Snapmaker/Panchroma PLA Translucent" ], @@ -2024,6 +1478,7 @@ "OrcaFilamentLibrary/eSUN PLA-Matte" ], "OFDGigEI": [ + "BBL/Bambu PLA Dynamic", "OrcaFilamentLibrary/Bambu PLA Dynamic" ], "OFDIrhbu": [ @@ -2046,6 +1501,7 @@ "Anker/Generic PLA", "Anycubic/Generic PLA", "Artillery/Generic PLA", + "BBL/Generic PLA", "Blocks/Generic PLA", "CONSTRUCT3D/Generic PLA", "Chuanying/Generic PLA", @@ -2099,6 +1555,7 @@ "OFDvXujf": [ "Anker/Generic PVA", "Anycubic/Generic PVA", + "BBL/Generic PVA", "Blocks/Generic PVA", "Chuanying/Generic PVA", "Creality/Generic PVA", @@ -2121,6 +1578,7 @@ "Prusa/Generic PVA HF" ], "OFDxfPgH": [ + "BBL/Bambu PLA Sparkle", "OrcaFilamentLibrary/Bambu PLA Sparkle" ], "OFDxxTpW": [ @@ -2131,6 +1589,7 @@ "OrcaFilamentLibrary/COEX TPU 60A" ], "OFEGNJD4": [ + "BBL/Bambu PLA Silk", "OrcaFilamentLibrary/Bambu PLA Silk" ], "OFEOnBj6": [ @@ -2148,6 +1607,7 @@ ], "OFEabreg": [ "Anycubic/Fiberon PA6-CF20", + "BBL/Fiberon PA6-CF20", "Snapmaker/Fiberon PA6-CF20" ], "OFEbIx49": [ @@ -2158,9 +1618,11 @@ "Cubicon/Cubicon PC" ], "OFEjbwqG": [ + "BBL/PolyTerra PLA+", "Snapmaker/PolyTerra PLA+" ], "OFEkPBwx": [ + "BBL/Bambu PLA Glow", "OrcaFilamentLibrary/Bambu PLA Glow" ], "OFEmsric": [ @@ -2170,6 +1632,7 @@ "Peopoly/Peopoly Lancer PLA-C" ], "OFEswT5W": [ + "BBL/Bambu PLA-CF", "OrcaFilamentLibrary/Bambu PLA-CF" ], "OFEvEfw5": [ @@ -2181,7 +1644,11 @@ "OFF3cuzT": [ "Creality/Generic TPU 64D" ], + "OFF5o7b2": [ + "BBL/BETA PLA Youth" + ], "OFF9OKoY": [ + "BBL/PolyLite PLA Pro", "OrcaFilamentLibrary/PolyLite PLA Pro", "Snapmaker/PolyLite PLA Pro" ], @@ -2195,6 +1662,7 @@ "Flashforge/Flashforge ASA Basic" ], "OFFNYwWR": [ + "BBL/Bambu PA-CF", "OrcaFilamentLibrary/Bambu PA-CF" ], "OFFP4ORR": [ @@ -2209,11 +1677,19 @@ "OFFbQscs": [ "Creality/eSUN PETG-Basic" ], + "OFFbSnCD": [ + "BBL/Bambu PLA Translucent" + ], + "OFFfJ09N": [ + "BBL/BETA PETG Glow" + ], "OFFkCLBl": [ + "BBL/Panchroma PLA Galaxy", "OrcaFilamentLibrary/Panchroma PLA Galaxy", "Snapmaker/Panchroma PLA Galaxy" ], "OFFvzqcd": [ + "BBL/Bambu PETG Basic", "OrcaFilamentLibrary/Bambu PETG Basic" ], "OFFwJWea": [ @@ -2235,6 +1711,12 @@ "OFGVwfK0": [ "OrcaFilamentLibrary/FilAr PLA-mate Gris" ], + "OFGVxj2A": [ + "BBL/BETA PLA Wood" + ], + "OFGc9l16": [ + "BBL/BETA PLA Glow" + ], "OFGcLA5R": [ "OrcaFilamentLibrary/FilAr PLA-mate Beige" ], @@ -2272,10 +1754,15 @@ "OFHAccHz": [ "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" ], + "OFHHwrd1": [ + "BBL/addnorth PETG Base" + ], "OFHWSM21": [ + "BBL/Fiberon PET-CF", "OrcaFilamentLibrary/Fiberon PET-CF" ], "OFHa48An": [ + "BBL/Bambu PET-CF", "OrcaFilamentLibrary/Bambu PET-CF" ], "OFHaYaB1": [ @@ -2292,15 +1779,22 @@ "Snapmaker/Polymaker PLA Pro Metallic" ], "OFHmPYRy": [ + "BBL/SUNLU PLA+ 2.0", "Flashforge/SUNLU PLA+ 2.0", "OrcaFilamentLibrary/SUNLU PLA+ 2.0" ], + "OFI2MKy7": [ + "BBL/BETA PEBA 90A" + ], "OFI6WZpn": [ "OrcaArena/Arena Support W" ], "OFIBXa0k": [ "OrcaFilamentLibrary/FilAr PLA-mate Rojo" ], + "OFIBbYO5": [ + "BBL/Bambu TPU for AMS" + ], "OFIE3vOf": [ "Anycubic/Anycubic PLA Matte" ], @@ -2332,12 +1826,14 @@ "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" ], "OFIfnzxC": [ + "BBL/Bambu Support For PLA/PETG", "OrcaFilamentLibrary/Bambu Support For PLA/PETG" ], "OFIgbDHq": [ "Anycubic/Anycubic PLA Luminous" ], "OFIxOuOu": [ + "BBL/PolyLite PLA Starlight", "Snapmaker/PolyLite PLA Starlight" ], "OFJ3F2jm": [ @@ -2368,11 +1864,15 @@ "Flashforge/Generic TPU-90A" ], "OFJgijky": [ + "BBL/PolyLite CosPLA", "Snapmaker/PolyLite CosPLA" ], "OFJhT2fd": [ "Snapmaker/Snapmaker Dual ABS" ], + "OFJnEaCp": [ + "BBL/BETA PLA Transparent" + ], "OFJrvXth": [ "Snapmaker/Snapmaker ABS Benchy" ], @@ -2385,6 +1885,9 @@ "OFJxSqO4": [ "Wanhao France/YUMI PLA Direct Drive" ], + "OFK7830e": [ + "BBL/BETA TPU 95A" + ], "OFK8XHPn": [ "Qidi/Overture ABS" ], @@ -2409,6 +1912,9 @@ "OFKWWgyp": [ "OrcaFilamentLibrary/FilAr PLA Carpincho" ], + "OFKYBAWe": [ + "BBL/BETA PLA Marble" + ], "OFKZ9skj": [ "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" ], @@ -2422,12 +1928,17 @@ "Qidi/QIDI PAHT-CF" ], "OFKhMPeX": [ + "BBL/Bambu PC", "OrcaFilamentLibrary/Bambu PC" ], "OFKiSMWR": [ + "BBL/Panchroma PLA Marble", "OrcaFilamentLibrary/Panchroma PLA Marble", "Snapmaker/Panchroma PLA Marble" ], + "OFKyNkQz": [ + "BBL/BETA PETG UV Color Change" + ], "OFL9aRjN": [ "Snapmaker/Snapmaker PETG HF" ], @@ -2438,6 +1949,7 @@ "Flashforge/Flashforge PPA-CF" ], "OFLJ8S6I": [ + "BBL/SUNLU Wood PLA", "Flashforge/SUNLU Wood PLA", "OrcaFilamentLibrary/SUNLU Wood PLA" ], @@ -2449,6 +1961,7 @@ "Anker/Generic ASA", "Anycubic/Generic ASA", "Artillery/Generic ASA", + "BBL/Generic ASA", "Blocks/Generic ASA", "Chuanying/Generic ASA", "Creality/Generic ASA", @@ -2479,6 +1992,7 @@ "OFLakOUI": [ "Anker/Generic PC", "Anycubic/Generic PC", + "BBL/Generic PC", "Blocks/Generic PC", "Creality/Generic PC", "Custom/Generic PC", @@ -2512,6 +2026,12 @@ "OFLgwqp2": [ "Creality/Hyper PETG-GF" ], + "OFLjDYxH": [ + "BBL/addnorth PLA X-PLA High Speed" + ], + "OFLqgSuX": [ + "BBL/BETA PLA-CF" + ], "OFLzx3J4": [ "Creality/Hyper Marble" ], @@ -2538,9 +2058,11 @@ "Artillery/Artillery PA" ], "OFMTK0UC": [ + "BBL/Bambu Support For PA/PET", "OrcaFilamentLibrary/Bambu Support For PA/PET" ], "OFMUWNkp": [ + "BBL/SUNLU PLA+", "Flashforge/SUNLU PLA+", "OrcaFilamentLibrary/SUNLU PLA+" ], @@ -2549,6 +2071,7 @@ "OrcaFilamentLibrary/Overture Rock PLA" ], "OFMjtqTC": [ + "BBL/Bambu PLA Wood", "OrcaFilamentLibrary/Bambu PLA Wood" ], "OFMkAW6r": [ @@ -2563,6 +2086,12 @@ "OFMuXBmO": [ "OrcaFilamentLibrary/Elas PLA Basic" ], + "OFMzRg65": [ + "BBL/BETA PLA PRO" + ], + "OFN8QBhu": [ + "BBL/addnorth PLA Wood" + ], "OFN9fefN": [ "Cubicon/Cubicon ABS-A100" ], @@ -2587,7 +2116,11 @@ "OFNjku08": [ "CONSTRUCT3D/Generic High Flow PETG" ], + "OFNk8AvA": [ + "BBL/BETA PETG Gradient" + ], "OFNk8bxk": [ + "BBL/Bambu PA6-GF", "OrcaFilamentLibrary/Bambu PA6-GF" ], "OFNstOna": [ @@ -2597,6 +2130,7 @@ "Creality/Hyper PPA-CF" ], "OFO1GEq6": [ + "BBL/Panchroma PLA Neon", "OrcaFilamentLibrary/Panchroma PLA Neon", "Snapmaker/Panchroma PLA Neon" ], @@ -2604,6 +2138,9 @@ "Chuanying/Generic PETG-CF10", "Flashforge/Generic PETG-CF10" ], + "OFO6GMJ3": [ + "BBL/addnorth TPU EasyFlex" + ], "OFOABq7t": [ "BBL/AliZ PETG-Metal", "OrcaFilamentLibrary/AliZ PETG-Metal" @@ -2620,6 +2157,9 @@ "OFOPU1xv": [ "Snapmaker/Snapmaker PLA Full Spectrum" ], + "OFOQCfVa": [ + "BBL/addnorth PLA Premium Silk" + ], "OFObG16Q": [ "InfiMech/InfiMech PLA Basic" ], @@ -2640,6 +2180,7 @@ "Qidi/QIDI ABS Rapido 0.2 nozzle" ], "OFOvv91M": [ + "BBL/PolyLite ABS", "OrcaFilamentLibrary/PolyLite ABS", "Qidi/PolyLite ABS" ], @@ -2668,15 +2209,18 @@ "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" ], "OFPkCJKE": [ + "BBL/Panchroma PLA Satin", "Creality/Panchroma PLA Satin", "OrcaFilamentLibrary/Panchroma PLA Satin", "Snapmaker/Panchroma PLA Satin" ], "OFPklMI1": [ + "BBL/Generic PE", "OrcaFilamentLibrary/Generic PE", "Tiertime/Generic PE" ], "OFPoyiFs": [ + "BBL/Polymaker HT-PLA", "OrcaFilamentLibrary/Polymaker HT-PLA", "Snapmaker/Polymaker HT-PLA" ], @@ -2690,11 +2234,15 @@ "Eryone/Eryone ABS-CF" ], "OFQ3e56w": [ + "BBL/Bambu PLA Galaxy", "OrcaFilamentLibrary/Bambu PLA Galaxy" ], "OFQ40XeN": [ "Qidi/QIDI PETG Tough" ], + "OFQ5TxZ2": [ + "BBL/addnorth PVDF Adamant S1" + ], "OFQEGL7z": [ "FlyingBear/FlyingBear PA-CF" ], @@ -2702,11 +2250,13 @@ "OrcaArena/Arena TPU 95A" ], "OFQHiNJs": [ + "BBL/Bambu Support G", "OrcaFilamentLibrary/Bambu Support G" ], "OFQLcbps": [ "Anker/Generic PA-CF", "Anycubic/Generic PA-CF", + "BBL/Generic PA-CF", "Blocks/Generic PA-CF", "Creality/Generic PA-CF", "Custom/Generic PA-CF", @@ -2753,6 +2303,9 @@ "OFR1XLMN": [ "Qidi/QIDI TPU 95A-HF" ], + "OFRFhdqy": [ + "BBL/addnorth PLA Textura" + ], "OFRJ325z": [ "LH/LHS PETG" ], @@ -2766,6 +2319,7 @@ "OrcaFilamentLibrary/Eolas Prints PETG Transition" ], "OFRiYgMK": [ + "BBL/Panchroma PLA Celestial", "OrcaFilamentLibrary/Panchroma PLA Celestial", "Snapmaker/Panchroma PLA Celestial" ], @@ -2788,12 +2342,14 @@ "OrcaFilamentLibrary/eSUN ePLA-LW" ], "OFS2tn6G": [ + "BBL/Fiberon PA612-CF", "OrcaFilamentLibrary/Fiberon PA612-CF" ], "OFS4jbj3": [ "Eryone/Eryone PA" ], "OFS8lTQt": [ + "BBL/Panchroma PLA Silk", "OrcaFilamentLibrary/Panchroma PLA Silk", "Snapmaker/Panchroma PLA Silk" ], @@ -2806,9 +2362,18 @@ "OFSbGfsz": [ "OrcaArena/Arena PLA Basic" ], + "OFSfm8iP": [ + "BBL/BETA PLA Heat Color Change" + ], + "OFSiCZP3": [ + "BBL/BETA PETG-GF" + ], "OFSqIcJC": [ "Flashforge/Flashforge TPU 95A" ], + "OFSw6Mor": [ + "BBL/addnorth PA Adura FDA" + ], "OFSwbBWS": [], "OFT2jon4": [ "Qidi/QIDI ABS Rapido" @@ -2816,10 +2381,14 @@ "OFTGHyNC": [ "OrcaFilamentLibrary/Bambu PLA Impact" ], + "OFTHDCqA": [ + "BBL/Bambu PLA Pure" + ], "OFTOPcx0": [ "OrcaFilamentLibrary/Eolas Prints TPU Transition" ], "OFTRZ8Y4": [ + "BBL/Bambu PETG-CF", "OrcaFilamentLibrary/Bambu PETG-CF" ], "OFTSXxzE": [ @@ -2856,6 +2425,9 @@ "OFU3QXL7": [ "re3D/re3D PC" ], + "OFU5JPDy": [ + "BBL/addnorth PETG PRO Matte" + ], "OFU7CKZt": [ "Volumic/Volumic ASA Ultra (Performance)" ], @@ -2875,11 +2447,15 @@ "Anycubic/Anycubic PEBA 95A" ], "OFUanySo": [ + "BBL/Bambu PLA Silk+", "OrcaFilamentLibrary/Bambu PLA Silk+" ], "OFUmS5z5": [ "Creality/eSUN ASA+" ], + "OFUtiVRn": [ + "BBL/addnorth PETG ESD" + ], "OFUyDDNv": [ "Elegoo/Elegoo PC", "OrcaFilamentLibrary/Elegoo PC" @@ -2900,8 +2476,12 @@ "OFV8Mxqx": [], "OFVBlUFH": [], "OFVCkX5w": [ + "BBL/Bambu TPU 95A", "OrcaFilamentLibrary/Bambu TPU 95A" ], + "OFVDWuxl": [ + "BBL/addnorth PLA HT-PLA PRO Matte" + ], "OFVHMFJX": [ "Qidi/QIDI PETG Tough 0.2 nozzle" ], @@ -2913,6 +2493,7 @@ "Eryone/Eryone ASA" ], "OFW29a9R": [ + "BBL/PolyTerra PLA", "OrcaArena/PolyTerra PLA", "OrcaFilamentLibrary/PolyTerra PLA", "Snapmaker/PolyTerra PLA" @@ -2920,12 +2501,18 @@ "OFW5FqkL": [ "Qidi/QIDI PLA Rapido Silk" ], + "OFW8M3CY": [ + "BBL/BETA PLA Chameleon" + ], "OFW8lqnb": [ "Snapmaker/Snapmaker PETG Translucent" ], "OFWDe7YH": [ "Qidi/QIDI UltraPA" ], + "OFWK0Y9A": [ + "BBL/addnorth PA Adura" + ], "OFWRITFw": [ "Prusa/Prusament rPLA" ], @@ -2952,6 +2539,7 @@ "Anker/Generic PLA-CF", "Anycubic/Generic PLA-CF", "Artillery/Generic PLA-CF", + "BBL/Generic PLA-CF", "Blocks/Generic PLA-CF", "Creality/Generic PLA-CF", "Custom/Generic PLA-CF", @@ -2976,6 +2564,7 @@ "re3D/re3D PETG" ], "OFX0ycRQ": [ + "BBL/Fiberon PA12-CF", "OrcaFilamentLibrary/Fiberon PA12-CF" ], "OFX2zcrM": [ @@ -2986,6 +2575,7 @@ "OrcaFilamentLibrary/Eolas Prints ABS" ], "OFXIbw5D": [ + "BBL/Bambu PLA Matte", "OrcaFilamentLibrary/Bambu PLA Matte" ], "OFXJ9iom": [ @@ -3010,6 +2600,7 @@ "Artillery/Artillery PLA Basic" ], "OFXkm8q1": [ + "BBL/Generic PP-CF", "Creality/Generic PP-CF", "OrcaFilamentLibrary/Generic PP-CF", "Tiertime/Generic PP-CF" @@ -3031,6 +2622,7 @@ "OrcaFilamentLibrary/Elegoo PLA Silk" ], "OFXzQ4yL": [ + "BBL/Bambu ASA-Aero", "OrcaFilamentLibrary/Bambu ASA-Aero" ], "OFY0F5qA": [ @@ -3046,6 +2638,7 @@ "Anker/Generic ABS", "Anycubic/Generic ABS", "Artillery/Generic ABS", + "BBL/Generic ABS", "Blocks/Generic ABS", "Chuanying/Generic ABS", "Co Print/Generic ABS", @@ -3082,10 +2675,14 @@ "OrcaFilamentLibrary/PolyLite Dual PLA", "Snapmaker/PolyLite Dual PLA" ], + "OFYGrfHY": [ + "BBL/BETA PETG Fluorescence" + ], "OFYPdQJh": [ "Anker/Generic PETG", "Anycubic/Generic PETG", "Artillery/Generic PETG", + "BBL/Generic PETG", "Blocks/Generic PETG", "CONSTRUCT3D/Generic PETG", "Chuanying/Generic PETG", @@ -3142,6 +2739,12 @@ "OFZ4QbfK": [ "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" ], + "OFZGrQTU": [ + "BBL/addnorth PETG Economy" + ], + "OFZJft47": [ + "BBL/addnorth PLA Economy" + ], "OFZLtWYs": [ "Qidi/QIDI ABS-GF25" ], @@ -3151,6 +2754,9 @@ "OFZivHGL": [ "Snapmaker/Snapmaker Dual PLA" ], + "OFZqZMuv": [ + "BBL/BETA ASA" + ], "OFZr862X": [ "Creality/Generic PLA HF", "Prusa/Generic PLA HF" @@ -3180,6 +2786,7 @@ "LH/LHS ASA" ], "OFaQMgRH": [ + "BBL/Bambu PLA Tough", "OrcaFilamentLibrary/Bambu PLA Tough" ], "OFaRjiIm": [ @@ -3222,6 +2829,7 @@ "Eryone/Eryone PP-CF" ], "OFc3xdm9": [ + "BBL/Overture PLA", "OrcaFilamentLibrary/Overture PLA", "Qidi/Overture PLA" ], @@ -3231,6 +2839,9 @@ "OFcBJQcC": [ "Snapmaker/Snapmaker Dual TPU High-Flow" ], + "OFcBl0nJ": [ + "BBL/Fiberon PA612-CF15" + ], "OFcJDtTx": [ "Artillery/Artillery TPU" ], @@ -3244,9 +2855,15 @@ "BBL/Overture Air PLA", "OrcaFilamentLibrary/Overture Air PLA" ], + "OFcnWTJB": [ + "BBL/BETA PLA Glitter" + ], "OFcogyWl": [ "WonderMaker/WonderMaker PLA Metal" ], + "OFcpa50Z": [ + "BBL/addnorth PLA-CF Carbon Fiber" + ], "OFctg8r1": [ "CoLiDo/CoLiDo PLA+" ], @@ -3255,10 +2872,12 @@ "OrcaFilamentLibrary/Overture TPU" ], "OFcytyoA": [ + "BBL/Fiberon PETG-ESD", "OrcaFilamentLibrary/Fiberon PETG-ESD", "Snapmaker/Fiberon PETG-ESD" ], "OFd0Fv0k": [ + "BBL/Generic PE-CF", "OrcaFilamentLibrary/Generic PE-CF", "Tiertime/Generic PE-CF" ], @@ -3313,6 +2932,9 @@ "OFeCJqxx": [ "Qidi/QIDI ABS Rapido Metal" ], + "OFeF4UNh": [ + "BBL/BETA PLA Silk" + ], "OFeIyhUx": [ "Anycubic/Anycubic PC-CF" ], @@ -3333,6 +2955,7 @@ ], "OFesA6rF": [ "Anker/Generic PLA Silk", + "BBL/Generic PLA Silk", "Creality/Generic PLA Silk", "FLSun/Generic PLA Silk", "Flashforge/Generic PLA Silk", @@ -3359,12 +2982,14 @@ "InfiMech/InfiMech PC" ], "OFf6mfQO": [ + "BBL/Bambu Support for ABS", "OrcaFilamentLibrary/Bambu Support for ABS" ], "OFf6ynfH": [ "FlyingBear/FlyingBear PETG Basic" ], "OFfBpSRI": [ + "BBL/Bambu ASA", "OrcaFilamentLibrary/Bambu ASA" ], "OFfD87Gy": [ @@ -3419,6 +3044,7 @@ "Snapmaker/Snapmaker Dual PLA Metal" ], "OFg57Nmc": [ + "BBL/Bambu PC FR", "OrcaFilamentLibrary/Bambu PC FR" ], "OFg8hMzT": [ @@ -3427,6 +3053,7 @@ "OFg8ndtj": [ "Anker/Generic PA", "Anycubic/Generic PA", + "BBL/Generic PA", "Blocks/Generic PA", "Creality/Generic PA", "Custom/Generic PA", @@ -3461,6 +3088,7 @@ "Anker/Generic TPU", "Anycubic/Generic TPU", "Artillery/Generic TPU", + "BBL/Generic TPU", "Blocks/Generic TPU", "Chuanying/Generic TPU", "Co Print/Generic TPU", @@ -3514,12 +3142,16 @@ "Creality/Generic PA6-GF" ], "OFhASRWj": [ + "BBL/Panchroma PLA Temp Shift", "OrcaFilamentLibrary/Panchroma PLA Temp Shift", "Snapmaker/Panchroma PLA Temp Shift" ], "OFhMO9Kh": [ "OrcaFilamentLibrary/GreenGate3D PETG" ], + "OFhN09f0": [ + "BBL/addnorth PC BLend HT LCF" + ], "OFhO5aEJ": [ "Ratrig/RatRig PunkFil ABS" ], @@ -3527,6 +3159,7 @@ "Snapmaker/Snapmaker PLA-CF" ], "OFhQfUQY": [ + "BBL/Generic SBS", "OrcaFilamentLibrary/Generic SBS", "Tiertime/Generic SBS" ], @@ -3570,6 +3203,7 @@ "Snapmaker/Snapmaker PLA Basic" ], "OFhuaUQB": [ + "BBL/Bambu ABS", "OrcaFilamentLibrary/Bambu ABS", "Qidi/Bambu ABS" ], @@ -3615,6 +3249,7 @@ "Creality/Generic Support for PLA" ], "OFitS8al": [ + "BBL/PolyLite PLA Neon", "Snapmaker/PolyLite PLA Neon" ], "OFiwEbze": [ @@ -3645,6 +3280,9 @@ "OFjUGUIK": [ "iQ/Fiberthree PACF Pro P1" ], + "OFjUXn67": [ + "BBL/BETA ABS" + ], "OFjVOWfJ": [ "Anycubic/Anycubic PLA High Speed" ], @@ -3652,6 +3290,7 @@ "OrcaArena/Arena PLA Impact" ], "OFjb0wos": [ + "BBL/Panchroma PLA Metallic", "OrcaFilamentLibrary/Panchroma PLA Metallic", "Snapmaker/Panchroma PLA Metallic" ], @@ -3668,6 +3307,9 @@ "OFjoAe0R": [ "Qidi/Qidi PLA-CF" ], + "OFjogeYN": [ + "BBL/BETA PETG Glitter" + ], "OFjorDcx": [ "OrcaFilamentLibrary/FDplast ABS" ], @@ -3681,6 +3323,7 @@ "Prusa/Prusament PC-CF" ], "OFk8t9mz": [ + "BBL/Fiberon PETG-rCF", "OrcaFilamentLibrary/Fiberon PETG-rCF" ], "OFkAltI8": [ @@ -3693,7 +3336,11 @@ "OFkGvN4d": [ "OrcaFilamentLibrary/FilAr PLA Verde Pixel" ], + "OFkHbjUv": [ + "BBL/BETA PLA Metallic" + ], "OFkOviHk": [ + "BBL/Fiberon PA6-CF", "OrcaFilamentLibrary/Fiberon PA6-CF" ], "OFkR8E2c": [ @@ -3711,6 +3358,7 @@ "InfiMech/Other PLA Hyper" ], "OFknl9Iz": [ + "BBL/Bambu ABS-GF", "OrcaFilamentLibrary/Bambu ABS-GF" ], "OFkoLUtR": [ @@ -3744,12 +3392,18 @@ "OFlSNkhc": [ "OrcaFilamentLibrary/Eolas Prints ASA" ], + "OFlfuj2k": [ + "BBL/Bambu TPU 85A" + ], "OFlgMgNM": [ "Flashforge/Flashforge PPS" ], "OFllmFhT": [ "Elegoo/Generic PETG PRO" ], + "OFlmxlDG": [ + "BBL/BETA HIPS" + ], "OFln72PT": [ "Elegoo/Elegoo PLA-CF", "OrcaFilamentLibrary/Elegoo PLA-CF" @@ -3762,6 +3416,7 @@ "Snapmaker/Snapmaker PLA" ], "OFlwmqrC": [ + "BBL/Polymaker HT-PLA-GF", "OrcaFilamentLibrary/Polymaker HT-PLA-GF", "Snapmaker/Polymaker HT-PLA-GF" ], @@ -3793,6 +3448,9 @@ "OFmKU2Ha": [ "Eryone/Eryone PLA" ], + "OFmN2lvw": [ + "BBL/Generic TPU for AMS" + ], "OFmY0l6t": [ "Creality/Generic PLA Matte", "Elegoo/Generic PLA Matte", @@ -3815,9 +3473,11 @@ "Anycubic/Anycubic PLA" ], "OFmn9NZL": [ + "BBL/FusRock ABS-GF", "OrcaFilamentLibrary/FusRock ABS-GF" ], "OFmpMwxS": [ + "BBL/Generic PLA High Speed", "Creality/Generic PLA High Speed", "FLSun/Generic PLA High Speed", "Flashforge/Generic PLA High Speed", @@ -3825,6 +3485,9 @@ "Qidi/Generic PLA High Speed", "Tiertime/Generic PLA High Speed" ], + "OFmt513L": [ + "BBL/BETA PETG Transparent" + ], "OFmveLWz": [ "Elegoo/Elegoo PETG-GF", "OrcaFilamentLibrary/Elegoo PETG-GF" @@ -3839,6 +3502,9 @@ "OFn6WpN7": [ "Qidi/QIDI PA12-CF" ], + "OFnBvPhb": [ + "BBL/addnorth PLA rPLA RE-ADD" + ], "OFnHc3D6": [ "Creality/eSUN PLA-CF" ], @@ -3869,15 +3535,22 @@ "OFnejEt4": [ "OrcaFilamentLibrary/FilAr PETG Cian" ], + "OFnfxTvi": [ + "BBL/Bambu PLA Lite" + ], "OFngcE81": [ "LH/LHS TPU Foamy 78A" ], "OFniMuTN": [ + "BBL/Bambu PA6-CF", "OrcaFilamentLibrary/Bambu PA6-CF" ], "OFnmp6rt": [ "Anycubic/Anycubic PLA+" ], + "OFnpX8uh": [ + "BBL/BETA PETG Matte" + ], "OFnyHfcv": [ "Ratrig/Generic ABS BigNozzle" ], @@ -3885,6 +3558,7 @@ "Qidi/QIDI PAHT-GF" ], "OFo2UF2C": [ + "BBL/Generic BVOH", "Creality/Generic BVOH", "Flashforge/Generic BVOH", "OrcaFilamentLibrary/Generic BVOH", @@ -3901,6 +3575,7 @@ ], "OFoYSJKi": [ "Anker/Generic PETG-CF", + "BBL/Generic PETG-CF", "Creality/Generic PETG-CF", "Elegoo/Generic PETG-CF", "Flashforge/Generic PETG-CF", @@ -3918,6 +3593,7 @@ "OrcaFilamentLibrary/AliZ PETG" ], "OFoiVqVM": [ + "BBL/Bambu PLA Basic", "OrcaFilamentLibrary/Bambu PLA Basic" ], "OFojbdhR": [ @@ -3927,6 +3603,7 @@ "Cubicon/Cubicon ABSk" ], "OFovEIbw": [ + "BBL/Bambu PETG HF", "OrcaFilamentLibrary/Bambu PETG HF" ], "OFp4ETDP": [ @@ -3945,6 +3622,7 @@ "Cubicon/Cubicon ABS" ], "OFpPGSKG": [ + "BBL/SUNLU Silk PLA+", "Flashforge/SUNLU Silk PLA+", "OrcaFilamentLibrary/SUNLU Silk PLA+" ], @@ -3952,9 +3630,13 @@ "Peopoly/Peopoly Lancer PETG-C" ], "OFpW4gdi": [ + "BBL/SUNLU PLA Matte", "Flashforge/SUNLU PLA Matte", "OrcaFilamentLibrary/SUNLU PLA Matte" ], + "OFpdjFI3": [ + "BBL/BETA PLA UV Color Change" + ], "OFpu74Qe": [ "Snapmaker/Snapmaker PLA Eco" ], @@ -3968,6 +3650,7 @@ "OrcaFilamentLibrary/FilAr PETG Negro Azabache" ], "OFq9svOz": [ + "BBL/Generic PPS", "Creality/Generic PPS", "Tiertime/Generic PPS" ], @@ -3975,12 +3658,17 @@ "Ratrig/Generic PLA BigNozzle" ], "OFqGRZyH": [ + "BBL/Numakers PLA+", "OrcaFilamentLibrary/Numakers PLA+" ], "OFqINlYj": [ + "BBL/eSUN PLA+", "Creality/eSUN PLA+", "OrcaFilamentLibrary/eSUN PLA+" ], + "OFqTwtXM": [ + "BBL/addnorth PETG rPETG Matte" + ], "OFqcL5UF": [ "Qidi/QIDI Support For PET/PA" ], @@ -3988,6 +3676,7 @@ "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" ], "OFqw2PQA": [ + "BBL/Panchroma CoPE", "OrcaFilamentLibrary/Panchroma CoPE", "Snapmaker/Panchroma CoPE" ], @@ -3998,6 +3687,7 @@ "Anycubic/Anycubic PLA Slik" ], "OFrKLeE3": [ + "BBL/Bambu PLA Metal", "OrcaFilamentLibrary/Bambu PLA Metal" ], "OFrLiqiM": [ @@ -4007,6 +3697,7 @@ "Creality/CR-PLA Carbon" ], "OFrOh600": [ + "BBL/Panchroma PLA Matte", "Creality/Panchroma PLA Matte", "OrcaFilamentLibrary/Panchroma PLA Matte", "Snapmaker/Panchroma PLA Matte" @@ -4020,6 +3711,9 @@ "OFrjacXf": [ "Flashforge/Flashforge PET-CF" ], + "OFrqMlGt": [ + "BBL/BETA PETG" + ], "OFrr67nG": [ "OrcaArena/Arena PC" ], @@ -4041,6 +3735,7 @@ "Volumic/Volumic PP Ultra" ], "OFsFon5l": [ + "BBL/Generic HIPS", "Chuanying/Generic HIPS", "Creality/Generic HIPS", "Flashforge/Generic HIPS", @@ -4048,6 +3743,7 @@ "Tiertime/Generic HIPS" ], "OFsHSVZc": [ + "BBL/Bambu Support W", "OrcaFilamentLibrary/Bambu Support W" ], "OFsP8PKH": [ @@ -4055,6 +3751,7 @@ ], "OFsRDvTM": [ "Anycubic/Panchroma PLA", + "BBL/Panchroma PLA", "OrcaFilamentLibrary/Panchroma PLA", "Snapmaker/Panchroma PLA" ], @@ -4062,6 +3759,7 @@ "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" ], "OFsijjtH": [ + "BBL/Generic PP-GF", "OrcaFilamentLibrary/Generic PP-GF", "Tiertime/Generic PP-GF" ], @@ -4096,9 +3794,18 @@ "OFtRn8X8": [ "OrcaFilamentLibrary/FDplast SBS" ], + "OFtdVZpV": [ + "BBL/addnorth PLA X-PLA" + ], "OFtefokm": [ "OrcaFilamentLibrary/FilAr PLA-mate Blanco" ], + "OFtkLO6q": [ + "BBL/Bambu TPU 90A" + ], + "OFtndTHe": [ + "BBL/BETA PETG-CF" + ], "OFtpXCCv": [ "BBL/COEX ASA PRIME", "OrcaFilamentLibrary/COEX ASA PRIME" @@ -4122,6 +3829,7 @@ "Qidi/QIDI ASA-Aero" ], "OFu1evlr": [ + "BBL/Generic PCTG", "Creality/Generic PCTG", "OrcaFilamentLibrary/Generic PCTG", "Ratrig/Generic PCTG", @@ -4168,6 +3876,9 @@ "OFusbWjj": [ "Creality/Hyper PETG-CF" ], + "OFuvOt0r": [ + "BBL/BETA PLA Basic" + ], "OFuxH0Uz": [ "Volumic/Volumic FLEX93 Ultra" ], @@ -4178,6 +3889,7 @@ "Prusa/Prusament PC Blend" ], "OFvKUnLh": [ + "BBL/Bambu TPU 95A HF", "OrcaFilamentLibrary/Bambu TPU 95A HF" ], "OFvLppPU": [ @@ -4196,6 +3908,9 @@ "OFvaLVML": [ "Flashforge/Flashforge HIPS" ], + "OFvcIGee": [ + "BBL/addnorth TPU Pro Matte 85A" + ], "OFvdZ2bx": [ "Qidi/QIDI WOOD Rapido" ], @@ -4207,9 +3922,11 @@ "Snapmaker/Snapmaker TPU 95A" ], "OFvrXuV7": [ + "BBL/PolyLite ASA", "OrcaFilamentLibrary/PolyLite ASA" ], "OFvxIS9g": [ + "BBL/Fiberon PA12-CF10", "Snapmaker/Fiberon PA12-CF10" ], "OFvxghTE": [ @@ -4218,16 +3935,21 @@ "TwoTrees/Generic HS PLA" ], "OFvyB0Bz": [ + "BBL/PolyLite PLA Galaxy", "Snapmaker/PolyLite PLA Galaxy" ], "OFvzvwCu": [ "OrcaFilamentLibrary/Eolas Prints PLA High Speed" ], + "OFw4WD4T": [ + "BBL/Fiberon PETG-rCF08" + ], "OFwJ0qu2": [], "OFwLBAGf": [ "Qidi/HATCHBOX ABS" ], "OFwPrlCM": [ + "BBL/Bambu PETG Translucent", "OrcaFilamentLibrary/Bambu PETG Translucent" ], "OFwRJ4g0": [ @@ -4238,11 +3960,15 @@ "InfiMech/Other TPU" ], "OFwaYjL6": [ + "BBL/Fiberon PA6-GF", "OrcaFilamentLibrary/Fiberon PA6-GF" ], "OFwbsgWj": [ "re3D/re3D PC" ], + "OFwc74ck": [ + "BBL/BETA PLA Matte" + ], "OFwhLMs4": [ "Snapmaker/Snapmaker PLA SnapSpeed" ], @@ -4269,6 +3995,7 @@ "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" ], "OFxA1p01": [ + "BBL/Overture PLA Pro", "OrcaFilamentLibrary/Overture PLA Pro" ], "OFxDHUX8": [ @@ -4282,6 +4009,7 @@ "OrcaFilamentLibrary/Elegoo ABS" ], "OFxUwUeW": [ + "BBL/SUNLU PLA Marble", "Flashforge/SUNLU PLA Marble", "OrcaFilamentLibrary/SUNLU PLA Marble" ], @@ -4289,9 +4017,14 @@ "Snapmaker/Snapmaker J1 PETG-CF" ], "OFxe4rXr": [ + "BBL/PolyTerra PLA Marble", "Snapmaker/PolyTerra PLA Marble" ], + "OFxqf79Q": [ + "BBL/BETA PETG HF" + ], "OFy02QHU": [ + "BBL/PolyLite PLA Translucent", "Snapmaker/PolyLite PLA Translucent" ], "OFy14TRA": [ @@ -4312,12 +4045,18 @@ "OFyHgT60": [ "OrcaArena/Arena PLA Sparkle" ], + "OFyJjkek": [ + "BBL/addnorth TPU Pro Matte 95A" + ], "OFyLWVF3": [ "Creality/Generic PETG-GF" ], "OFyPG8v2": [ "Snapmaker/Snapmaker Dual PLA Eco" ], + "OFyPTnSk": [ + "BBL/BETA PETG Heat Color Change" + ], "OFyQwdaM": [ "Volumic/Volumic ABS Ultra (Performance)" ], @@ -4356,6 +4095,9 @@ "BBL/AliZ PLA", "OrcaFilamentLibrary/AliZ PLA" ], + "OFz1a1fy": [ + "BBL/BETA PETG Metallic" + ], "OFz5oHgf": [ "MagicMaker/Generic PEEK" ], @@ -4374,6 +4116,12 @@ "OFzY7N3Z": [ "Artillery/Artillery PLA" ], + "OFzaq7Yg": [ + "BBL/BETA TPU 98A" + ], + "OFzk5oAo": [ + "BBL/addnorth ABS rABS" + ], "OFzrUUxc": [], "OFztQ7rO": [ "LH/LHS ABS" @@ -4382,6 +4130,7 @@ "Flashforge/FusRock PET-GF" ], "OFzyIxba": [ + "BBL/Bambu PVA", "OrcaFilamentLibrary/Bambu PVA" ] }, @@ -6977,6 +6726,13 @@ "Soleyin Ultra PLA" ] ], + "OF03RK6r": [ + [ + "BETA", + "PLA", + "BETA PLA Metal" + ] + ], "OF0AquDh": [ [ "FusRock", @@ -6984,6 +6740,13 @@ "FusRock S-Multi" ] ], + "OF0EYBWQ": [ + [ + "addnorth", + "PETG", + "addnorth PETG Flame v0" + ] + ], "OF0FfcAG": [ [ "Anycubic", @@ -7110,6 +6873,13 @@ "Generic PETG Basic" ] ], + "OF1ID4N1": [ + [ + "addnorth", + "PA6", + "addnorth PA6 Addlantis" + ] + ], "OF1N1qMK": [ [ "Polymaker", @@ -7236,6 +7006,13 @@ "Elegoo Rapid TPU 95A" ] ], + "OF342jVN": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Tough+" + ] + ], "OF3F63OE": [ [ "re3D", @@ -7257,6 +7034,13 @@ "CR-Silk" ] ], + "OF3PDEw3": [ + [ + "BETA", + "PLA", + "BETA PLA High Speed" + ] + ], "OF3WQaKK": [ [ "Creality", @@ -7348,6 +7132,20 @@ "Artillery PLA Basic+" ] ], + "OF4PKvem": [ + [ + "BETA", + "PLA", + "BETA PLA Fluorescence" + ] + ], + "OF4QZANi": [ + [ + "BETA", + "TPU", + "BETA TPU Matte" + ] + ], "OF4RvVuU": [ [ "Bambu Lab", @@ -7369,6 +7167,13 @@ "Snapmaker PETG" ] ], + "OF4XTfoI": [ + [ + "BETA", + "PETG", + "BETA PETG Marble" + ] + ], "OF4f8vVp": [ [ "WonderMaker", @@ -7425,6 +7230,13 @@ "Generic ABS HF" ] ], + "OF5B9sUc": [ + [ + "Polymaker", + "PA-GF", + "Fiberon PA6-GF25" + ] + ], "OF5BN24W": [ [ "Flashforge", @@ -7432,6 +7244,13 @@ "Flashforge PPA-GF" ] ], + "OF5BXhHF": [ + [ + "BETA", + "PLA", + "BETA PLA High Temp" + ] + ], "OF5CgdDq": [ [ "Polymaker", @@ -7439,6 +7258,13 @@ "PolyLite PLA" ] ], + "OF5LAnla": [ + [ + "BETA", + "PLA", + "BETA PLA Gradient" + ] + ], "OF5NqBfC": [ [ "Yumi", @@ -7586,6 +7412,13 @@ "Snapmaker J1 PVA" ] ], + "OF6Yn69v": [ + [ + "BETA", + "TPU", + "BETA TPU 90A" + ] + ], "OF6kj4jI": [ [ "iQ Materials", @@ -7600,6 +7433,13 @@ "Flashforge PLA Matte" ] ], + "OF6qw3Wb": [ + [ + "BETA", + "PA-CF", + "BETA PAHT-CF" + ] + ], "OF6rdQ6M": [ [ "Generic", @@ -7614,6 +7454,13 @@ "Hyper L-W PLA" ] ], + "OF71b7qO": [ + [ + "addnorth", + "PLA", + "addnorth PLA E-PLA" + ] + ], "OF72YYTd": [ [ "Snapmaker", @@ -7733,6 +7580,13 @@ "Flashforge HS PLA Burnt Ti" ] ], + "OF8QdQwS": [ + [ + "BETA", + "PLA", + "BETA PLA Silk+" + ] + ], "OF8Tlg47": [ [ "Generic", @@ -7901,6 +7755,20 @@ "Artillery PLA-CF" ] ], + "OFAc0Pr3": [ + [ + "Polymaker", + "PET-CF", + "Fiberon PET-CF17" + ] + ], + "OFAcJkl1": [ + [ + "addnorth", + "PETG-CF", + "addnorth PETG-CF Rigid X" + ] + ], "OFAebKg8": [ [ "Flashforge", @@ -7978,6 +7846,13 @@ "PolyLite PLA Luminous" ] ], + "OFBsbMMF": [ + [ + "addnorth", + "PA-CF", + "addnorth PA-CF Adura X" + ] + ], "OFBw6eEG": [ [ "Overture", @@ -8370,6 +8245,13 @@ "Generic TPU 64D" ] ], + "OFF5o7b2": [ + [ + "BETA", + "PLA", + "BETA PLA Youth" + ] + ], "OFF9OKoY": [ [ "Polymaker", @@ -8433,6 +8315,20 @@ "eSUN PETG-Basic" ] ], + "OFFbSnCD": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Translucent" + ] + ], + "OFFfJ09N": [ + [ + "BETA", + "PETG", + "BETA PETG Glow" + ] + ], "OFFkCLBl": [ [ "Polymaker", @@ -8489,6 +8385,20 @@ "FilAr PLA-mate Gris" ] ], + "OFGVxj2A": [ + [ + "BETA", + "PLA", + "BETA PLA Wood" + ] + ], + "OFGc9l16": [ + [ + "BETA", + "PLA", + "BETA PLA Glow" + ] + ], "OFGcLA5R": [ [ "FilAr", @@ -8573,6 +8483,13 @@ "FilAr PLA Blanco Antartida" ] ], + "OFHHwrd1": [ + [ + "addnorth", + "PETG", + "addnorth PETG Base" + ] + ], "OFHWSM21": [ [ "Polymaker", @@ -8622,6 +8539,13 @@ "SUNLU PLA+ 2.0" ] ], + "OFI2MKy7": [ + [ + "BETA", + "TPU", + "BETA PEBA 90A" + ] + ], "OFI6WZpn": [ [ "Orca Arena", @@ -8636,6 +8560,13 @@ "FilAr PLA-mate Rojo" ] ], + "OFIBbYO5": [ + [ + "Bambu Lab", + "TPU-AMS", + "Bambu TPU for AMS" + ] + ], "OFIE3vOf": [ [ "Anycubic", @@ -8811,6 +8742,13 @@ "Snapmaker Dual ABS" ] ], + "OFJnEaCp": [ + [ + "BETA", + "PLA", + "BETA PLA Transparent" + ] + ], "OFJrvXth": [ [ "Snapmaker", @@ -8839,6 +8777,13 @@ "YUMI PLA Direct Drive" ] ], + "OFK7830e": [ + [ + "BETA", + "TPU", + "BETA TPU 95A" + ] + ], "OFK8XHPn": [ [ "Overture", @@ -8895,6 +8840,13 @@ "FilAr PLA Carpincho" ] ], + "OFKYBAWe": [ + [ + "BETA", + "PLA", + "BETA PLA Marble" + ] + ], "OFKZ9skj": [ [ "FilAr", @@ -8937,6 +8889,13 @@ "Panchroma PLA Marble" ] ], + "OFKyNkQz": [ + [ + "BETA", + "PETG", + "BETA PETG UV Color Change" + ] + ], "OFL9aRjN": [ [ "Snapmaker", @@ -9049,6 +9008,20 @@ "Hyper PETG-GF" ] ], + "OFLjDYxH": [ + [ + "addnorth", + "PLA", + "addnorth PLA X-PLA High Speed" + ] + ], + "OFLqgSuX": [ + [ + "BETA", + "PLA-CF", + "BETA PLA-CF" + ] + ], "OFLzx3J4": [ [ "Creality", @@ -9161,6 +9134,20 @@ "Elas PLA Basic" ] ], + "OFMzRg65": [ + [ + "BETA", + "PLA", + "BETA PLA PRO" + ] + ], + "OFN8QBhu": [ + [ + "addnorth", + "PLA", + "addnorth PLA Wood" + ] + ], "OFN9fefN": [ [ "Cubicon", @@ -9217,6 +9204,13 @@ "Generic High Flow PETG" ] ], + "OFNk8AvA": [ + [ + "BETA", + "PETG", + "BETA PETG Gradient" + ] + ], "OFNk8bxk": [ [ "Bambu Lab", @@ -9252,6 +9246,13 @@ "Generic PETG-CF10" ] ], + "OFO6GMJ3": [ + [ + "addnorth", + "TPU", + "addnorth TPU EasyFlex" + ] + ], "OFOABq7t": [ [ "Aliz", @@ -9287,6 +9288,13 @@ "Snapmaker PLA Full Spectrum" ] ], + "OFOQCfVa": [ + [ + "addnorth", + "PLA", + "addnorth PLA Premium Silk" + ] + ], "OFObG16Q": [ [ "InfiMech", @@ -9448,6 +9456,13 @@ "QIDI PETG Tough" ] ], + "OFQ5TxZ2": [ + [ + "addnorth", + "PA", + "addnorth PVDF Adamant S1" + ] + ], "OFQEGL7z": [ [ "FlyingBear", @@ -9546,6 +9561,13 @@ "QIDI TPU 95A-HF" ] ], + "OFRFhdqy": [ + [ + "addnorth", + "PLA", + "addnorth PLA Textura" + ] + ], "OFRJ325z": [ [ "LH Stinger", @@ -9665,6 +9687,20 @@ "Arena PLA Basic" ] ], + "OFSfm8iP": [ + [ + "BETA", + "PLA", + "BETA PLA Heat Color Change" + ] + ], + "OFSiCZP3": [ + [ + "BETA", + "PETG-CF", + "BETA PETG-GF" + ] + ], "OFSqIcJC": [ [ "Flashforge", @@ -9672,6 +9708,13 @@ "Flashforge TPU 95A" ] ], + "OFSw6Mor": [ + [ + "addnorth", + "PA", + "addnorth PA Adura FDA" + ] + ], "OFSwbBWS": [ [ "DREMC", @@ -9693,6 +9736,13 @@ "Bambu PLA Impact" ] ], + "OFTHDCqA": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Pure" + ] + ], "OFTOPcx0": [ [ "Eolas Prints", @@ -9784,6 +9834,13 @@ "re3D PC" ] ], + "OFU5JPDy": [ + [ + "addnorth", + "PETG", + "addnorth PETG PRO Matte" + ] + ], "OFU7CKZt": [ [ "Volumic", @@ -9840,6 +9897,13 @@ "eSUN ASA+" ] ], + "OFUtiVRn": [ + [ + "addnorth", + "PETG", + "addnorth PETG ESD" + ] + ], "OFUyDDNv": [ [ "Elegoo", @@ -9896,6 +9960,13 @@ "Bambu TPU 95A" ] ], + "OFVDWuxl": [ + [ + "addnorth", + "PLA", + "addnorth PLA HT-PLA PRO Matte" + ] + ], "OFVHMFJX": [ [ "QIDI", @@ -9931,6 +10002,13 @@ "QIDI PLA Rapido Silk" ] ], + "OFW8M3CY": [ + [ + "BETA", + "PLA", + "BETA PLA Chameleon" + ] + ], "OFW8lqnb": [ [ "Snapmaker", @@ -9945,6 +10023,13 @@ "QIDI UltraPA" ] ], + "OFWK0Y9A": [ + [ + "addnorth", + "PA", + "addnorth PA Adura" + ] + ], "OFWRITFw": [ [ "Prusa Polymers", @@ -10197,6 +10282,13 @@ "PolyLite Dual PLA" ] ], + "OFYGrfHY": [ + [ + "BETA", + "PETG", + "BETA PETG Fluorescence" + ] + ], "OFYPdQJh": [ [ "Generic", @@ -10267,6 +10359,20 @@ "FilAr PLA Rosa Flamenco" ] ], + "OFZGrQTU": [ + [ + "addnorth", + "PETG", + "addnorth PETG Economy" + ] + ], + "OFZJft47": [ + [ + "addnorth", + "PLA", + "addnorth PLA Economy" + ] + ], "OFZLtWYs": [ [ "QIDI", @@ -10288,6 +10394,13 @@ "Snapmaker Dual PLA" ] ], + "OFZqZMuv": [ + [ + "BETA", + "ASA", + "BETA ASA" + ] + ], "OFZr862X": [ [ "Generic", @@ -10470,6 +10583,13 @@ "Snapmaker Dual TPU High-Flow" ] ], + "OFcBl0nJ": [ + [ + "Polymaker", + "PA-CF", + "Fiberon PA612-CF15" + ] + ], "OFcJDtTx": [ [ "Artillery", @@ -10498,6 +10618,13 @@ "Overture Air PLA" ] ], + "OFcnWTJB": [ + [ + "BETA", + "PLA", + "BETA PLA Glitter" + ] + ], "OFcogyWl": [ [ "WonderMaker", @@ -10505,6 +10632,13 @@ "WonderMaker PLA Metal" ] ], + "OFcpa50Z": [ + [ + "addnorth", + "PLA-CF", + "addnorth PLA-CF Carbon Fiber" + ] + ], "OFctg8r1": [ [ "CoLiDo", @@ -10652,6 +10786,13 @@ "QIDI ABS Rapido Metal" ] ], + "OFeF4UNh": [ + [ + "BETA", + "PLA", + "BETA PLA Silk" + ] + ], "OFeIyhUx": [ [ "Anycubic", @@ -11016,6 +11157,13 @@ "GreenGate3D PETG" ] ], + "OFhN09f0": [ + [ + "addnorth", + "PC", + "addnorth PC BLend HT LCF" + ] + ], "OFhO5aEJ": [ [ "RatRig", @@ -11289,6 +11437,13 @@ "Fiberthree PACF Pro P1" ] ], + "OFjUXn67": [ + [ + "BETA", + "ABS", + "BETA ABS" + ] + ], "OFjVOWfJ": [ [ "Anycubic", @@ -11338,6 +11493,13 @@ "Qidi PLA-CF" ] ], + "OFjogeYN": [ + [ + "BETA", + "PETG", + "BETA PETG Glitter" + ] + ], "OFjorDcx": [ [ "FDplast", @@ -11394,6 +11556,13 @@ "FilAr PLA Verde Pixel" ] ], + "OFkHbjUv": [ + [ + "BETA", + "PLA", + "BETA PLA Metallic" + ] + ], "OFkOviHk": [ [ "Polymaker", @@ -11506,6 +11675,13 @@ "Eolas Prints ASA" ] ], + "OFlfuj2k": [ + [ + "Bambu Lab", + "TPU", + "Bambu TPU 85A" + ] + ], "OFlgMgNM": [ [ "Flashforge", @@ -11520,6 +11696,13 @@ "Generic PETG PRO" ] ], + "OFlmxlDG": [ + [ + "BETA", + "HIPS", + "BETA HIPS" + ] + ], "OFln72PT": [ [ "Elegoo", @@ -11611,6 +11794,13 @@ "Eryone PLA" ] ], + "OFmN2lvw": [ + [ + "Generic", + "TPU-AMS", + "Generic TPU for AMS" + ] + ], "OFmY0l6t": [ [ "Generic", @@ -11667,6 +11857,13 @@ "Generic PLA High Speed" ] ], + "OFmt513L": [ + [ + "BETA", + "PETG", + "BETA PETG Transparent" + ] + ], "OFmveLWz": [ [ "Elegoo", @@ -11695,6 +11892,13 @@ "QIDI PA12-CF" ] ], + "OFnBvPhb": [ + [ + "addnorth", + "PLA", + "addnorth PLA rPLA RE-ADD" + ] + ], "OFnHc3D6": [ [ "eSUN", @@ -11765,6 +11969,13 @@ "FilAr PETG Cian" ] ], + "OFnfxTvi": [ + [ + "Bambu Lab", + "PLA", + "Bambu PLA Lite" + ] + ], "OFngcE81": [ [ "LH Stinger", @@ -11786,6 +11997,13 @@ "Anycubic PLA+" ] ], + "OFnpX8uh": [ + [ + "BETA", + "PETG", + "BETA PETG Matte" + ] + ], "OFnyHfcv": [ [ "Generic", @@ -11933,6 +12151,13 @@ "SUNLU PLA Matte" ] ], + "OFpdjFI3": [ + [ + "BETA", + "PLA", + "BETA PLA UV Color Change" + ] + ], "OFpu74Qe": [ [ "Snapmaker", @@ -11989,6 +12214,13 @@ "eSUN PLA+" ] ], + "OFqTwtXM": [ + [ + "addnorth", + "PETG", + "addnorth PETG rPETG Matte" + ] + ], "OFqcL5UF": [ [ "QIDI", @@ -12073,6 +12305,13 @@ "Flashforge PET-CF" ] ], + "OFrqMlGt": [ + [ + "BETA", + "PETG", + "BETA PETG" + ] + ], "OFrr67nG": [ [ "Orca Arena", @@ -12234,6 +12473,13 @@ "FDplast SBS" ] ], + "OFtdVZpV": [ + [ + "addnorth", + "PLA", + "addnorth PLA X-PLA" + ] + ], "OFtefokm": [ [ "FilAr", @@ -12241,6 +12487,20 @@ "FilAr PLA-mate Blanco" ] ], + "OFtkLO6q": [ + [ + "Bambu Lab", + "TPU", + "Bambu TPU 90A" + ] + ], + "OFtndTHe": [ + [ + "BETA", + "PETG-CF", + "BETA PETG-CF" + ] + ], "OFtpXCCv": [ [ "COEX 3D", @@ -12388,6 +12648,13 @@ "Hyper PETG-CF" ] ], + "OFuvOt0r": [ + [ + "BETA", + "PLA", + "BETA PLA Basic" + ] + ], "OFuxH0Uz": [ [ "Volumic", @@ -12451,6 +12718,13 @@ "Flashforge HIPS" ] ], + "OFvcIGee": [ + [ + "addnorth", + "TPU", + "addnorth TPU Pro Matte 85A" + ] + ], "OFvdZ2bx": [ [ "QIDI", @@ -12507,6 +12781,13 @@ "Eolas Prints PLA High Speed" ] ], + "OFw4WD4T": [ + [ + "Polymaker", + "PETG-CF", + "Fiberon PETG-rCF08" + ] + ], "OFwJ0qu2": [ [ "DREMC", @@ -12556,6 +12837,13 @@ "re3D PC" ] ], + "OFwc74ck": [ + [ + "BETA", + "PLA", + "BETA PLA Matte" + ] + ], "OFwhLMs4": [ [ "Snapmaker", @@ -12661,6 +12949,13 @@ "PolyTerra PLA Marble" ] ], + "OFxqf79Q": [ + [ + "BETA", + "PETG", + "BETA PETG HF" + ] + ], "OFy02QHU": [ [ "Polymaker", @@ -12710,6 +13005,13 @@ "Arena PLA Sparkle" ] ], + "OFyJjkek": [ + [ + "addnorth", + "TPU", + "addnorth TPU Pro Matte 95A" + ] + ], "OFyLWVF3": [ [ "Generic", @@ -12724,6 +13026,13 @@ "Snapmaker Dual PLA Eco" ] ], + "OFyPTnSk": [ + [ + "BETA", + "PETG", + "BETA PETG Heat Color Change" + ] + ], "OFyQwdaM": [ [ "Volumic", @@ -12808,6 +13117,13 @@ "AliZ PLA" ] ], + "OFz1a1fy": [ + [ + "BETA", + "PETG", + "BETA PETG Metallic" + ] + ], "OFz5oHgf": [ [ "Generic", @@ -12850,6 +13166,20 @@ "Artillery PLA" ] ], + "OFzaq7Yg": [ + [ + "BETA", + "TPU", + "BETA TPU 98A" + ] + ], + "OFzk5oAo": [ + [ + "addnorth", + "ABS", + "addnorth ABS rABS" + ] + ], "OFzrUUxc": [ [ "DREMC", From 4aa0e1d60b6f32ea84a4cfebbf1cfa93f87988e5 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 4 Sep 2026 22:10:48 +0800 Subject: [PATCH 45/52] Translate filament ids at the printer boundary Orca content-addresses every system filament, Bambu's included, but a printer, its AMS and its vendor's cloud know only that vendor's own catalog ids. The printer agent now translates between the two: outbound MQTT and FTP traffic, the AMS mapping sent with a print job, and the ids written into a 3mf bound for the printer all leave in the printer's own ids, while status messages, loaded projects and SD-card prints arrive in Orca's. An id with no mapping passes through unchanged, and an agent whose printers already speak Orca's ids translates nothing at all. Bambu's map is generated from BambuStudio's own shipped bundle; a missing or unreadable file leaves every lookup an identity rather than taking the app down. The profile check validates the map's shape, and profile CI now runs on the paths that can change it. docs/HLSD/filament_id.md records the places the map deliberately does not reach. --- .github/workflows/check_profiles.yml | 4 + docs/HLSD/filament_id.md | 223 +++++++++++++++--- scripts/assign_filament_ids.py | 19 +- scripts/tests/test_filament_id.py | 55 +++++ scripts/update_bambu_filament_ids.py | 6 +- src/OrcaSlicer.cpp | 22 ++ src/slic3r/GUI/AMSDryControl.cpp | 15 +- src/slic3r/GUI/AMSMaterialsSetting.cpp | 10 +- src/slic3r/GUI/ColorDecomposeSupport.cpp | 44 +++- .../GUI/DeviceCore/DevFilaBlackList.cpp | 7 +- src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp | 15 +- src/slic3r/GUI/DeviceManager.cpp | 11 +- src/slic3r/GUI/Plater.cpp | 9 + src/slic3r/GUI/PresetComboBoxes.cpp | 9 +- src/slic3r/GUI/SelectMachine.cpp | 16 +- src/slic3r/Utils/BBLPrinterAgent.cpp | 117 ++++++++- src/slic3r/Utils/BBLPrinterAgent.hpp | 14 ++ src/slic3r/Utils/CalibUtils.cpp | 26 +- src/slic3r/Utils/IPrinterAgent.hpp | 10 + src/slic3r/Utils/NetworkAgent.cpp | 14 ++ src/slic3r/Utils/NetworkAgent.hpp | 2 + tests/slic3rutils/CMakeLists.txt | 1 + tests/slic3rutils/test_bambu_filament_ids.cpp | 81 +++++++ 23 files changed, 652 insertions(+), 78 deletions(-) create mode 100644 tests/slic3rutils/test_bambu_filament_ids.cpp diff --git a/.github/workflows/check_profiles.yml b/.github/workflows/check_profiles.yml index 0c0750c610..b855d09da7 100644 --- a/.github/workflows/check_profiles.yml +++ b/.github/workflows/check_profiles.yml @@ -9,6 +9,10 @@ on: - release/* paths: - 'resources/profiles/**' + # The extra JSON check also validates resources/printers/bambu_filament_ids.json, + # and lives in scripts/, so a PR touching only those must still run this workflow. + - 'resources/printers/**' + - 'scripts/**' - ".github/workflows/check_profiles.yml" workflow_dispatch: diff --git a/docs/HLSD/filament_id.md b/docs/HLSD/filament_id.md index 980d830d7d..4c1c1f7443 100644 --- a/docs/HLSD/filament_id.md +++ b/docs/HLSD/filament_id.md @@ -64,14 +64,15 @@ failing that, any compatible system preset, else the slot is skipped — every f selection surfaces a user-visible notice. Today only the Bambu AMS integration follows this pattern end to end — the device itself -reports the id, and the pipeline does all the matching. The other device integrations still -synthesize a preset id client-side in their agents (by type, brand, or color lookups against -the loaded presets) before the pipeline runs; they are intended to converge on the same -pattern, with the device-reported tray material id flowing through the shared matcher. +reports the id, `BBLPrinterAgent` translates it out of Bambu's catalog into ours, and the +pipeline does all the matching. The other device integrations still synthesize a preset id +client-side in their agents (by type, brand, or color lookups against the loaded presets) +before the pipeline runs; they are intended to converge on the same pattern, with the +device-reported tray material id flowing through the shared matcher. | Ecosystem | Where the tray id comes from today | | --- | --- | -| Bambu AMS | the device itself (RFID / user tray setting) — the `GF*` catalog | +| Bambu AMS | the device itself (RFID / user tray setting), in Bambu's own `GF*` catalog; `BBLPrinterAgent` rewrites it into our id before the matcher sees it (see [The Bambu catalog map](#the-bambu-catalog-map)) | | Qidi box | composed at runtime as `QD___` — vendor and type indices from the device's per-slot saved variables, the series digit inferred client-side from the printer model/name. No preset carries a `QD_*` value, so the slot currently resolves by filament type; mapping the composed id onto the family's minted id belongs in the agent | | Creality CFS | runtime brand/type scoring returns the winning preset's id | | Klipper (AFC / Happy Hare) | runtime lookup by filament type | @@ -205,20 +206,23 @@ python scripts/assign_filament_ids.py --check # 4. verify — the sam # 5. Commit the profile edits together with scripts/filament_id_snapshot.json. ``` -The default run is idempotent and never rewrites a valid existing id; it edits profile files -byte-preservingly (indentation, BOM, and line endings intact) and re-parses them to fail -loudly. `--mint "filament_vendor/filament_type/family_name"` prints the id a **new** mint of -that triple would get, without touching anything — note that for a triple whose id already -exists it prints the next *free* salt iteration, not the live id (asking for +The default run mints ids for id-less families and replaces any declaration that is not in +`OF` format; it never rewrites a valid `OF` id, so it is idempotent and a no-op once every +family has one. It edits profile files byte-preservingly (indentation, BOM, and line endings +intact) and re-parses them to fail loudly. +`--mint "filament_vendor/filament_type/family_name"` prints the id a **new** mint of that +triple would get, without touching anything — note that for a triple whose id already exists +it prints the next *free* salt iteration, not the live id (asking for `Polymaker/PLA/PolyLite PLA` today prints the salt-1 id, because `OF5CgdDq` is taken). Maintenance modes (`--remint` is also the step for identity fixes — see the FAQ; the rest are normally only used by id migrations): -- `--remint VENDOR` re-derives a vendor's declared ids from their triples. A declaration - already equal to a salt iteration of its own triple is conformant and left alone, so - deliberate salt splits survive; convergence onto an id another bundle already uses for the - *same* triple is legal by design — that is the point. +- `--remint VENDOR` re-derives a vendor's declared ids from their triples — any vendor, BBL + included, since no bundle is exempt from the mint rule. A declaration already equal to a + salt iteration of its own triple is conformant and left alone, so deliberate salt splits + survive; convergence onto an id another bundle already uses for the *same* triple is legal + by design — that is the point. - `--drop-redundant-ids VENDOR` deletes declarations that merely re-declare an inherited OrcaFilamentLibrary id. - `--profiles DIR` points the tooling at a different profile tree (default @@ -231,22 +235,26 @@ diff. ## Reserved namespaces — never mint or hand-write into -An **island** is a frozen id namespace exempt from the mint rule because an external catalog -or device contract owns it. +A **reserved namespace** is an id space no system profile may declare, because an external +catalog or a device protocol owns the values. None of them has an owning vendor: there is no +bundle — not even the one whose printers use the catalog — that may write one into a profile. | Space | Status | Rule | | --- | --- | --- | -| `GF*` | Bambu AMS/RFID catalog — the one remaining *island* | BBL vendor only; a claim by anyone else is refused unless the snapshot sanctions that exact claim (via `--allow-shared-catalog` — see the CI section) | +| `GF*` | Bambu AMS/RFID catalog | declarable by **nobody**, BBL included: Bambu's own ids live in the generated catalog map, never in a profile | | `QD_*` | Qidi device protocol | declarable by **nobody**, Qidi included: the box composes these ids at runtime and they are not preset ids | | `P` + 7 hex chars (case-insensitive), `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp`) | never appears in system profiles | | every already-shipped id | frozen in the snapshot (grandfathered) | frozen as-is; new claims need maintainer sign-off | The two device namespaces, in detail: -- **BBL (`GF*`).** Bambu's device/RFID/cloud catalog is external and opaque, so BBL - declarations are frozen as-is and never re-minted. BBL also carries several dozen - grandfathered legacy codes that are neither `GF*` nor `OF*` (the `BETA` family's `B*` ids, - plus `Generic SBS`'s legacy `BFLSBS99`) — frozen the same way, via the snapshot. +- **Bambu (`GF*`).** Bambu's device/RFID/cloud catalog is external and opaque, which is a + reason to keep it out of the profiles rather than to let one bundle own it. Every BBL family + mints an `OF` id from its triple like every other vendor's, and the correspondence to Bambu's + catalog ids lives in one generated file the app applies at the printer boundary — the next + section. Nothing under `resources/profiles/**` carries a `GF*` id today and the snapshot + grandfathers none, so a `GF*` id appearing anywhere in the tree is a mistake, whoever wrote + it. - **Qidi (`QD_*`).** `QD_*` is a device-*protocol* namespace, not a preset id space: the Qidi box path composes `QD___` ids at runtime (slot vendor and type indices reported by the device, the series digit inferred client-side from the printer @@ -256,6 +264,142 @@ The two device namespaces, in detail: protocol ids as preset ids — would put one product under five ids (`QIDI PLA Rapido` would be `QD_0_1_1` through `QD_4_1_1`), exactly the fragmentation the mint rule removes. +## The Bambu catalog map + +Bambu's printers, its AMS and its cloud know only Bambu's own catalog ids. Our profiles carry +minted `OF` ids like every other vendor's, so one generated file records the correspondence and +the app applies it **only where an id crosses to or from a Bambu printer**. + +**The file** is `resources/printers/bambu_filament_ids.json` — a header plus one row per +catalogued product, keyed by our id: + +```json +{ + "source": "https://github.com/bambulab/BambuStudio", + "bambustudio_commit": "66e405477", + "generated": "2026-09-04", + "filaments": { + "OFhuaUQB": { "bambu_id": "GFB00", "vendor": "Bambu Lab", "type": "ABS", "name": "Bambu ABS" } + } +} +``` + +It ships in `resources/printers/`, next to `filaments_blacklist.json` — deliberately not in +`resources/profiles/`, where the loader reads every top-level `.json` as a vendor index. It +holds 100 rows today, one per product BambuStudio ships, and the correspondence is +one-to-one in both directions. + +**It is generated, never hand-edited.** `python scripts/update_bambu_filament_ids.py` rebuilds +it from **BambuStudio's own shipped BBL bundle** — a sparse shallow clone of upstream `master`, +or `--bambustudio-dir `. Our BBL bundle is a fork of +Bambu's, tuned and extended independently, so it is not the source of truth for Bambu's ids. +A row's key is whatever id our tree already mints for that same +`(filament_vendor, filament_type, family)` triple; a product we do not ship gets a freshly +generated key and the row sits inert until some bundle claims that triple — `OFdyfQvU` / +`GFG03`, "Bambu PETG Matte", is such a row today. + +**Regenerate it in the same commit as every BBL profile sync**, and read the drift report it +prints. Two lines, both informational, neither blocking the write: + +```text +upstream ships 'Bambu PETG Matte' (Bambu Lab/PETG), we ship nothing with that identity +Orca BBL families with no row: 135 Orca-only product(s) +``` + +The first names each upstream product our BBL bundle has no same-identity family for — +sometimes a genuinely missing product, sometimes a name drift a follow-up rename would +converge. The second counts our own BBL families that matched no row: 135 of 234 today, of +which 109 send an `OF` id on the wire and 26 already rode `OF` ids inherited from the +OrcaFilamentLibrary. **135 is the number to expect at every regeneration** — 109 was the +one-off size of the transition and stopped being computable from the tree once the BBL bundle +was re-minted, so do not "fix" the report to print it. + +**Check 8** lives in `check_filament_ids`, so profile CI runs it alongside the other seven. It +holds the file to its contract: it parses, carries `source` / `bambustudio_commit` / +`generated`, keys only `OF`-format ids, maps each Bambu id at most once, and — for every row +whose key the tree actually claims — agrees with the tree on that id's `(vendor, type, name)` +triple. A row for a product we do not ship is skipped, not an error. The remedy it prints is +always the same: regenerate the map and commit the diff for review. + +### The runtime rule: swap on hit + +Outbound, our id with a row becomes Bambu's; inbound, Bambu's id with a row becomes ours. +Everything else is forwarded untouched — an `OF` id with no row, a Bambu id for a product we do +not ship, a `P`-hex user id, `"null"`, an empty string. Translation is confined to the +boundary: nothing between the boundaries ever holds a Bambu id. + +Translating one value is a capability of the printer agent: `IPrinterAgent` declares +`to_orca_filament_id` and `from_orca_filament_id` returning their argument, and `BBLPrinterAgent` +overrides them with Bambu's map, so an agent whose printers already speak our ids inherits the +identity default and translates nothing. `NetworkAgent` forwards both to the live agent, so the +comparison sites below reach them through `wxGetApp().getAgent()` and leave an id untranslated +while no agent is live. Whole documents are Bambu's business alone: +`BBLPrinterAgent::to_orca_payload` and `from_orca_payload` rewrite every string under +`tray_info_idx`, `filament_id` or `filamentId` at any depth; text that does not parse, or carries +none of those keys, comes back unchanged. The map is loaded once, lazily; a missing or malformed +file degrades to identity with a log line rather than failing. + +| Boundary | Where it translates | +| --- | --- | +| Everything the agent sends | `BBLPrinterAgent::send_message` and `send_message_to_printer`, plus `PrintParams::ams_mapping_info` in `dispatch_start` — the funnel all five `start_*` calls share | +| Everything the agent receives | `set_on_message_fn` and `set_on_local_message_fn` wrap their callback, so `MachineObject::parse_json` and everything downstream see our ids only | +| 3mf export | `Plater::export_3mf` writes Bambu's ids into `slice_info.config`, gated on `preset_bundle.is_bbl_vendor()` — the printer reads that file and knows only its own catalog, and no other vendor's export is affected. The CLI has its own writer in `OrcaSlicer.cpp`; it does the same, gated on the `printer_model` prefix that already decides `Print::is_BBL_printer()` for that run | +| Project ingest | `Plater::priv::load_files` reverse-maps the project's `filament_ids` before the bundle ingests them, so a project saved by an older Orca or by BambuStudio still resolves the same presets | +| Prints from the printer's SD card | `SelectMachineDialog::update_print_required_data` reverse-maps each plate's slice-info ids as it adopts the plates, so the AMS mapping dialog pairs them with trays | +| Bambu-specific comparisons | `CalibUtils.cpp`, `DeviceManager.cpp`, `DeviceCore/DevFilaSystem.cpp`, `DeviceCore/DevFilaBlackList.cpp`, `SelectMachine.cpp`, `AMSDryControl.cpp`, `AMSMaterialsSetting.cpp`, `PresetComboBoxes.cpp`, `ColorDecomposeSupport.cpp` | + +That last row is the rule to follow when a new Bambu-specific behaviour is added: **translate +the value you are about to compare, never the table you compare it against.** The shipped data +those sites read is Bambu's and stays verbatim — `white_fila_ids` in +`resources/printers/filaments_blacklist.json`, the calibration id lists in +`resources/printers/.json`, `fila_id` in +`resources/profiles/BBL/filament/filaments_color_codes.json`. + +`tests/slic3rutils/test_bambu_filament_ids.cpp` covers the lookups, the payload rewrite and the +Bambu-specific rules. `orcaslicer_discover_tests` registers a Catch2 tag as a CTest **label**, +not as part of the test name, so `-R` matches nothing here and the filter is `-L`: + +```bash +ctest --test-dir /tests/slic3rutils -L BambuFilamentIds +``` + +### Three places the map deliberately does not reach + +The map and its lookups live in the GUI library, which libslic3r cannot link against and which a +GUI-less build does not link at all. Three consequences are known and documented; none is worth +pulling the map down into libslic3r for. + +- **The support display type in `PrintConfig.cpp`.** `DynamicPrintConfig::get_filament_type` + picks `PLA-S` / `Sup.PLA` and `PA-S` / `Sup.PA` for a support filament by testing + `filament_id` against `GFS00` and `GFS01`, and otherwise falls back on `filament_type` — a + fallback that returns those same two pairs for `"PLA"` and `"PA"`. Bambu Support W inherits + `fdm_filament_pla` and Bambu Support G inherits `fdm_filament_pa`, so with their `OF` ids the + fallback produces exactly what the id branches produced. (The only config that ever carries a + singular `filament_id` key is the AMS tray config built in `Plater.cpp`, and that one never + reaches this function.) These two lines are the only mention of a Bambu id anywhere in + libslic3r, and they need no change. +- **Config imports.** `PresetBundle::import_presets` (File ▸ Import ▸ Import Configs, for + `.json` / `.zip` / `.orca_filament` / `.orca_printer` / `.orca_bundle`) and + `PresetBundle::load_config_file` (the CLI's `--load-settings` of a G-code file with an + embedded config) both parse inside libslic3r, out of the GUI's reach, so a Bambu id carried + in such a file lands on the imported preset untranslated. The effect is bounded: that preset + does not auto-match an AMS tray while the stale id is live, and the id does not survive + being saved — `Preset::save` writes a `filament_id` key only for a preset whose `inherits` is + empty, and on the next load an inheriting preset takes its parent's id. A known gap, and not + a regression: nothing forwarded a stale id before either. +- **A build configured without the GUI.** `target_link_libraries(OrcaSlicer libslic3r_gui)` sits + inside `if (SLIC3R_GUI)` in `src/CMakeLists.txt`, so the lookups are not linkable when the GUI + is off. The CLI's 3mf writer in `src/OrcaSlicer.cpp` therefore guards its translation with + `#ifdef SLIC3R_GUI`, and a 3mf that such a build slices for a Bambu printer carries our `OF` + ids in `slice_info.config` rather than Bambu's. Every shipped build enables the GUI, so this + reaches only a purpose-built GUI-less binary. + +One more thing worth recording before it is rediscovered: +`SyncAmsInfoDialog::update_print_required_data` is a structural twin of the SD-card function +above and carries no translation. It has no callers today and its plate list is only ever read +for `printer_model_id`, so it is not a live gap — but wiring it up without adding the reverse +map would silently reproduce the bug. + ## How CI enforces this Profile CI (`check_profiles.yml`) runs `check_filament_ids()` tree-wide via @@ -271,7 +415,8 @@ checks ratchet all new profiles to the clean rules. The checks, in brief: -- **Format** — every id is either in the snapshot, `OF` + 6 base62 chars, or BBL's. +- **Format** — every id occurring in the tree is `OF` + 6 base62 chars. No exceptions: not a + grandfathered snapshot entry, not BBL. - **Snapshot equality** — tree claims == snapshot claims **and** tree triples == snapshot triples, both directions: any `filament_vendor`/`filament_type`/family-name change surfaces as a snapshot diff. @@ -282,22 +427,34 @@ The checks, in brief: base name (a rename re-exposes the library preset, since alias shadowing is name-based), a non-empty `compatible_printers` (an empty one shadows nothing), and no own id key (structure rule 4). -- **Triple integrity** — every declarer outside the BBL island must resolve a non-empty - `filament_vendor` and `filament_type` (generics use `"Generic"`), and all declarers of one - family within a bundle must agree on the triple. -- **Reserved namespaces** — `GF*` outside BBL, `P<7-hex>` or `"null"` anywhere, unless that - exact claim is grandfathered in the snapshot; `QD_*` anywhere, with no exception. +- **Triple integrity** — every declarer must resolve a non-empty `filament_vendor` and + `filament_type` (generics use `"Generic"`), and all declarers of one family within a + bundle must agree on the triple. +- **Reserved namespaces** — `GF*`, `QD_*`, `P<7-hex>` or `"null"` claimed by any vendor, + BBL and Qidi included, unless that exact claim is grandfathered in the snapshot (none is + today). - **Structure** — no `filament_id` key on newly instantiated presets; no new declared-vs-inherited id drift; every instantiated system filament must resolve an effective id through its `inherits` chain (recall: an id-less one is a hard load error in C++ that discards the whole vendor bundle). +- **Bambu catalog map** — `resources/printers/bambu_filament_ids.json` parses, carries its + `source` / `bambustudio_commit` / `generated` header, keys only `OF`-format ids, maps each + Bambu id at most once, and agrees with the tree on the triple of every row whose key the + tree claims. See [The Bambu catalog map](#the-bambu-catalog-map); the remedy is always to + regenerate, never to hand-edit. -Sharing a **reserved-catalog** id with a new family or vendor (e.g. shipping a Bambu-cataloged -product under another vendor with its authentic `GF*` id) is refused by `--update-snapshot` -unless you pass `--allow-shared-catalog` — and it still lands in the snapshot diff for -maintainer review. Any other new sharing via a *declared* id is caught by the mint-conformance -check; sharing through inheritance carries no declaration to check and surfaces only as a new -claim in the snapshot diff — which is exactly why that diff is the gate. +Any new claim on a **reserved namespace** — a profile that declares a `GF*`, `QD_*` or +`P<7-hex>` id, whatever its vendor — is refused by `--update-snapshot` unless you pass +`--allow-shared-catalog`, and even then it lands in the snapshot diff for maintainer review. +There is no such claim in the tree today and adding one should be a last resort: for a +Bambu-cataloged product, the catalog map is where the correspondence belongs. Any other new +sharing via a *declared* id is caught by the mint-conformance check; sharing through +inheritance carries no declaration to check and surfaces only as a new claim in the snapshot +diff — which is exactly why that diff is the gate. + +`orca_extra_profile_check.py` separately holds every declared id to the AMS 8-character limit, +tree-wide and for every vendor alike, scoped to the presets a vendor's index actually +references (a file the index never loads cannot break AMS matching). Complementing the Python checks, CI also runs the C++ profile validator with `-f` (`check_filament_subtypes`): it loads the bundle exactly as the app does and flags any printer diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index 7ce907f816..d410242277 100755 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -729,6 +729,8 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, # -- 8. Bambu catalog map -------------------------------------------------- try: bambu_map = load_json(map_path) + if not isinstance(bambu_map, dict): + raise ValueError("top level is not a JSON object") except (OSError, ValueError) as e: print_error(f"Bambu catalog map {map_path} does not parse ({e}); {BAMBU_MAP_HINT}") errors += 1 @@ -737,7 +739,15 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, if not bambu_map.get(key): print_error(f'Bambu catalog map {map_path} is missing "{key}"; {BAMBU_MAP_HINT}') errors += 1 - rows = bambu_map.get("filaments", {}) + rows = bambu_map.get("filaments") + # An empty or absent section is not a well-formed map: it makes every runtime + # translation silently degrade to identity (BBLPrinterAgent logs nothing for it), + # and it is what a regeneration against the wrong --bambustudio-dir writes. + if not isinstance(rows, dict) or not rows: + print_error(f'Bambu catalog map {map_path} declares no "filaments" rows; ' + f"{BAMBU_MAP_HINT}") + errors += 1 + rows = {} bambu_id_owners = {} for fid, row in sorted(rows.items()): if not OF_ID_RE.match(fid): @@ -745,7 +755,12 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"{BAMBU_MAP_HINT}") errors += 1 bambu_id = row.get("bambu_id") - if bambu_id in bambu_id_owners: + if not bambu_id: + # An empty id would map the empty string to a real filament at runtime. + print_error(f'Bambu catalog map row "{fid}" declares no "bambu_id"; ' + f"{BAMBU_MAP_HINT}") + errors += 1 + elif bambu_id in bambu_id_owners: print_error( f'Bambu catalog map: Bambu id "{bambu_id}" is mapped by both ' f'"{bambu_id_owners[bambu_id]}" and "{fid}"; {BAMBU_MAP_HINT}') diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index 3d668d4fc3..b9291e9433 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -682,6 +682,13 @@ class TestCheck8(OfCleanTreeCase): ubfi.write_map(path, rows, "testcommit", "2026-09-04") return path + def _write_raw_map(self, payload): + """Write a map write_map() would never produce (hand-edited or mis-generated).""" + path = os.path.join(self.t.dir, "bambu_filament_ids.json") + with open(path, "w", encoding="utf-8", newline="\n") as f: + json.dump(payload, f, indent=2, ensure_ascii=False, sort_keys=True) + return path + def test_row_triple_must_match_tree(self): fid = afi.generate_filament_id("V", "PLA", "Foo") self.t.write_preset("VendorA", preset("Foo @base", filament_id=fid, @@ -712,6 +719,54 @@ class TestCheck8(OfCleanTreeCase): errors, out = self.t.check(map_path) self.assertEqual(errors, 0, out) + def test_non_object_top_level_is_a_clean_error(self): + # A hand-edited map that is a list (or any non-object) must report the map, + # not raise AttributeError out of the check. + map_path = self._write_raw_map([{"bambu_id": "GFZ00"}]) + errors, out = self.t.check(map_path) + self.assertGreater(errors, 0) + self.assertIn("does not parse", out) + self.assertIn("regenerate the map", out) + + def test_empty_filaments_section_is_an_error(self): + # What a regeneration against the wrong --bambustudio-dir writes: a well-formed + # header with zero rows. At runtime every translation silently becomes identity. + map_path = self._write_map({}) + errors, out = self.t.check(map_path) + self.assertGreater(errors, 0) + self.assertIn('no "filaments" rows', out) + + def test_absent_filaments_section_is_an_error(self): + map_path = self._write_raw_map({ + "source": "https://github.com/bambulab/BambuStudio", + "bambustudio_commit": "testcommit", + "generated": "2026-09-04", + }) + errors, out = self.t.check(map_path) + self.assertGreater(errors, 0) + self.assertIn('no "filaments" rows', out) + + def test_row_without_bambu_id_is_an_error(self): + # Two such rows used to collide on None and be reported as a duplicate id. + map_path = self._write_map({ + "OFaaaaaa": {"vendor": "V", "type": "PLA", "name": "Foo"}, + "OFbbbbbb": {"vendor": "V", "type": "PETG", "name": "Bar"}, + }) + errors, out = self.t.check(map_path) + self.assertGreater(errors, 0) + self.assertIn('"OFaaaaaa" declares no "bambu_id"', out) + self.assertIn('"OFbbbbbb" declares no "bambu_id"', out) + self.assertNotIn("mapped by both", out) + + def test_empty_bambu_id_is_an_error(self): + # "" would land in the runtime map and translate an empty tray id into a filament. + map_path = self._write_map({ + "OFaaaaaa": {"bambu_id": "", "vendor": "V", "type": "PLA", "name": "Foo"}, + }) + errors, out = self.t.check(map_path) + self.assertGreater(errors, 0) + self.assertIn('declares no "bambu_id"', out) + # --------------------------------------------------------------------------- # --update-snapshot diff --git a/scripts/update_bambu_filament_ids.py b/scripts/update_bambu_filament_ids.py index cd5e05e3bc..fc195a3f9c 100644 --- a/scripts/update_bambu_filament_ids.py +++ b/scripts/update_bambu_filament_ids.py @@ -8,9 +8,9 @@ products Bambu ships. The map is generated from BambuStudio's OWN shipped BBL bundle, never from Orca's: Orca's BBL bundle is a fork of Bambu's, tuned and extended independently, so it is not the source of truth for Bambu's catalog ids. -Nothing in OrcaSlicer consumes this map yet; it exists so a later change can -translate an id only where it crosses to or from a Bambu printer, without -hand-maintaining the correspondence. +src/slic3r/Utils/BBLPrinterAgent.cpp loads it at runtime and translates an id +only where it crosses to or from a Bambu printer, so the correspondence never +has to be hand-maintained. See docs/HLSD/filament_id.md. One row per BambuStudio filament PRODUCT: one commercial line = one "@base"-declared filament_id, shared by every per-printer/per-nozzle diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp index 33669abcf2..2e39f802cf 100644 --- a/src/OrcaSlicer.cpp +++ b/src/OrcaSlicer.cpp @@ -100,6 +100,10 @@ using namespace nlohmann; #ifdef SLIC3R_GUI #include "slic3r/GUI/GUI_Init.hpp" + // BBLPrinterAgent::from_orca_filament_id(); the map and its lookups live in libslic3r_gui, + // which only a SLIC3R_GUI build links (see target_link_libraries(OrcaSlicer libslic3r_gui) + // in CMakeLists). + #include "slic3r/Utils/BBLPrinterAgent.hpp" #endif /* SLIC3R_GUI */ using namespace Slic3r; @@ -6504,6 +6508,20 @@ int CLI::run(int argc, char **argv) std::string nozzle_diameter_str; if (nozzle_diameter_option) nozzle_diameter_str = nozzle_diameter_option->serialize(); +#ifdef SLIC3R_GUI + // A Bambu printer reads slice_info.config and knows only its own catalog ids. The GUI + // gates the same translation on PresetBundle::is_bbl_vendor(); the CLI has no + // PresetBundle, so reuse the printer_model prefix that already decides + // Print::is_BBL_printer() for this same run. + auto* printer_model_option = dynamic_cast(m_print_config.option("printer_model")); + const bool is_bbl_printer = printer_model_option && printer_model_option->value.compare(0, 9, "Bambu Lab") == 0; + // No wxApp on the CLI path, so there is no live agent to ask; the translator is stateless + // over a lazily loaded map, so one instance serves every plate and filament below. + // ORCA TODO: this assumes Bambu's is the only agent with a catalog of its own. Once another + // agent carries one, resolve the agent from the selected printer the way + // GUI_App::resolve_printer_agent_id does, rather than hard-coding BBLPrinterAgent here. + const BBLPrinterAgent bbl_agent; +#endif /* SLIC3R_GUI */ for (int i = 0; i < plate_data_list.size(); i++) { PlateData *plate_data = plate_data_list[i]; @@ -6520,6 +6538,10 @@ int CLI::run(int argc, char **argv) it->type = m_print_config.get_filament_type(display_filament_type, it->id); it->color = filament_color ? filament_color->get_at(it->id) : "#FFFFFF"; it->filament_id = filament_id?filament_id->get_at(it->id):""; +#ifdef SLIC3R_GUI + if (is_bbl_printer) + it->filament_id = bbl_agent.from_orca_filament_id(it->filament_id); +#endif /* SLIC3R_GUI */ } if (!plate_data->plate_thumbnail.is_valid()) { diff --git a/src/slic3r/GUI/AMSDryControl.cpp b/src/slic3r/GUI/AMSDryControl.cpp index a668a33c76..c191e24eac 100644 --- a/src/slic3r/GUI/AMSDryControl.cpp +++ b/src/slic3r/GUI/AMSDryControl.cpp @@ -1511,6 +1511,10 @@ void AMSDryCtrWin::update_filament_guide_info(DevAms* dev_ams) m_temperature_input->GetValue().ToLong(&input_temp); bool can_start = true; + // "GFA00" is Bambu's PLA id; GetFilamentDryingPreset is keyed by our OF ids. + auto* agent = wxGetApp().getAgent(); + const std::string pla_filament_id = agent ? agent->to_orca_filament_id("GFA00") : std::string("GFA00"); + int slot_count = 0, empty_count = 0; for (auto& tray_pair : dev_ams->GetTrays()) { if (!tray_pair.second) { @@ -1526,13 +1530,15 @@ void AMSDryCtrWin::update_filament_guide_info(DevAms* dev_ams) wxString filament_type = tray_pair.second->get_display_filament_type(); DevFilamentDryingPreset preset; if (filament_type.IsEmpty()) { - auto fallback_preset = DevUtilBackend::GetFilamentDryingPreset("GFA00"); + auto fallback_preset = DevUtilBackend::GetFilamentDryingPreset(pla_filament_id); + if (!fallback_preset) continue; // no PLA preset (e.g. the id map is missing): skip, don't throw preset = fallback_preset.value(); filament_type = "?"; } else if (preset_opt.has_value()) { preset = preset_opt.value(); } else { - auto fallback_preset = DevUtilBackend::GetFilamentDryingPreset("GFA00"); + auto fallback_preset = DevUtilBackend::GetFilamentDryingPreset(pla_filament_id); + if (!fallback_preset) continue; preset = fallback_preset.value(); } std::string icon_path = "dev_ams_dry_ctr_enable"; @@ -1683,9 +1689,10 @@ int AMSDryCtrWin::update_filament_list(DevAms* dev_ams, MachineObject* obj) // Select recommended drying temperature and default filament float min_dry_temp = std::numeric_limits::max(); - std::string default_filament_id = "GFA00"; + auto* agent = wxGetApp().getAgent(); + std::string default_filament_id = agent ? agent->to_orca_filament_id("GFA00") : std::string("GFA00"); // compared against m_tray_ids[i].filament_id (our OF ids) below bool has_ready = false; - const auto fallback_preset = DevUtilBackend::GetFilamentDryingPreset("GFA00"); + const auto fallback_preset = DevUtilBackend::GetFilamentDryingPreset(default_filament_id); for (const auto& tray_pair : dev_ams->GetTrays()) { if (!tray_pair.second || !tray_pair.second->is_tray_info_ready()) continue; has_ready = true; diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index ed532e91a8..1748617789 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -815,7 +815,10 @@ void AMSMaterialsSetting::set_color(wxColour color) fila_color.m_colors.insert(color); fila_color.EndSet(m_clr_picker->ctype); auto clr_query = GUI::wxGetApp().get_filament_color_code_query(); - m_clr_name->SetLabelText(clr_query->GetFilaColorName(ams_filament_id, fila_color)); + // ams_filament_id is our OF id; GetFilaColorName looks up filaments_color_codes.json, + // downloaded from Bambu and keyed by the printer's own ids, so translate for this lookup only. + auto* agent = GUI::wxGetApp().getAgent(); + m_clr_name->SetLabelText(clr_query->GetFilaColorName(agent ? agent->from_orca_filament_id(ams_filament_id) : ams_filament_id, fila_color)); } void AMSMaterialsSetting::set_empty_color(wxColour color) @@ -836,7 +839,10 @@ void AMSMaterialsSetting::set_colors(std::vector colors) for (const auto& clr : colors) { fila_color.m_colors.insert(clr); } fila_color.EndSet(m_clr_picker->ctype); auto clr_query = GUI::wxGetApp().get_filament_color_code_query(); - m_clr_name->SetLabelText(clr_query->GetFilaColorName(ams_filament_id, fila_color)); + // ams_filament_id is our OF id; GetFilaColorName looks up filaments_color_codes.json, + // downloaded from Bambu and keyed by the printer's own ids, so translate for this lookup only. + auto* agent = GUI::wxGetApp().getAgent(); + m_clr_name->SetLabelText(clr_query->GetFilaColorName(agent ? agent->from_orca_filament_id(ams_filament_id) : ams_filament_id, fila_color)); } } diff --git a/src/slic3r/GUI/ColorDecomposeSupport.cpp b/src/slic3r/GUI/ColorDecomposeSupport.cpp index e8fb4c9082..6621b97059 100644 --- a/src/slic3r/GUI/ColorDecomposeSupport.cpp +++ b/src/slic3r/GUI/ColorDecomposeSupport.cpp @@ -62,10 +62,16 @@ std::string decompose_basic_type_from_source(size_t source_config_idx, auto& project_config = wxGetApp().preset_bundle->project_config; if (auto* filament_id_opt = project_config.option("filament_id")) { if (source_config_idx < filament_id_opt->values.size()) { - const std::string& filament_id = filament_id_opt->values[source_config_idx]; - if (filament_id == kDecomposePetgFilamentId) + // Dead in practice: "filament_id" is not in PresetBundle's s_project_options, so this + // option() lookup (create=false) always returns null and the block never runs. Kept as + // found, with the translation the values would need: they would be our OF ids, and the + // two constants are the printer's own ids. + auto* agent = wxGetApp().getAgent(); + const std::string& orca_filament_id = filament_id_opt->values[source_config_idx]; + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(orca_filament_id) : orca_filament_id; + if (printer_filament_id == kDecomposePetgFilamentId) return kDecomposePetgBasicType; - if (filament_id == kDecomposePlaFilamentId) + if (printer_filament_id == kDecomposePlaFilamentId) return kDecomposePlaBasicType; } } @@ -82,9 +88,14 @@ std::string decompose_basic_type_from_source(size_t source_config_idx, std::string decompose_basic_filament_id(const std::string& basic_type) { - if (basic_type == kDecomposePetgBasicType) - return kDecomposePetgFilamentId; - return kDecomposePlaFilamentId; + // The result becomes DecomposeOfficialComponent::filament_id, which the rest of this file + // reads as one of our OF ids (translating back before it compares against the printer's + // ids), so translate on the way out; kDecompose*FilamentId itself stays the printer-side + // literal. The only place that would carry it further, project_config's "filament_id", is + // dead code: that key is not in PresetBundle's s_project_options. + const std::string printer_filament_id = basic_type == kDecomposePetgBasicType ? kDecomposePetgFilamentId : kDecomposePlaFilamentId; + auto* agent = wxGetApp().getAgent(); + return agent ? agent->to_orca_filament_id(printer_filament_id) : printer_filament_id; } void set_created_standard_component_metadata(size_t config_idx, const DecomposeOfficialComponent& component) @@ -98,8 +109,11 @@ void set_created_standard_component_metadata(size_t config_idx, const DecomposeO } } - const std::string type = component.filament_id == kDecomposePetgFilamentId ? kDecomposePetgShortType : - component.filament_id == kDecomposePlaFilamentId ? kDecomposePlaShortType : ""; + // component.filament_id is our OF id; the two constants are the printer's own ids. + auto* agent = wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(component.filament_id) : component.filament_id; + const std::string type = printer_filament_id == kDecomposePetgFilamentId ? kDecomposePetgShortType : + printer_filament_id == kDecomposePlaFilamentId ? kDecomposePlaShortType : ""; if (!type.empty()) { if (auto* type_opt = project_config.option("filament_type")) { while (type_opt->values.size() <= config_idx) @@ -151,7 +165,12 @@ DecomposeOfficialComponent lookup_decompose_official_component( continue; if (item.contains("fila_color") && item["fila_color"].is_array() && !item["fila_color"].empty()) result.color_hex = decompose_normalize_color_hex(item["fila_color"][0].get()); - result.filament_id = item.value("fila_id", result.filament_id); + // fila_id from this shipped, Bambu-keyed color table is a printer-side id; translate it so + // result.filament_id stays an OF id like the rest of this struct (the fallback default, + // result.filament_id, is already OF and passes through unchanged). + const std::string fila_id = item.value("fila_id", result.filament_id); + auto* agent = wxGetApp().getAgent(); + result.filament_id = agent ? agent->to_orca_filament_id(fila_id) : fila_id; return result; } } @@ -211,8 +230,11 @@ int find_existing_decompose_component( auto* type_opt = project_config.option("filament_type"); const PresetBundle& preset_bundle = *wxGetApp().preset_bundle; const size_t num_physical = physical_colors.size(); - const std::string expected_basic_type = component.filament_id == kDecomposePetgFilamentId ? kDecomposePetgBasicType : - component.filament_id == kDecomposePlaFilamentId ? kDecomposePlaBasicType : ""; + // component.filament_id is our OF id; the two constants are the printer's own ids. + auto* agent = wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(component.filament_id) : component.filament_id; + const std::string expected_basic_type = printer_filament_id == kDecomposePetgFilamentId ? kDecomposePetgBasicType : + printer_filament_id == kDecomposePlaFilamentId ? kDecomposePlaBasicType : ""; const std::string expected_short_type = expected_basic_type == kDecomposePetgBasicType ? kDecomposePetgShortType : expected_basic_type == kDecomposePlaBasicType ? kDecomposePlaShortType : ""; const std::string expected_preset_part = expected_basic_type.empty() ? "" : std::string(kDecomposeBambuPresetPrefix) + expected_basic_type; diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp index e75622720c..b59499d9d9 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp @@ -241,8 +241,11 @@ void check_filaments(const DevFilaBlacklist::CheckFilamentInfo& check_info, DevF std::set white_fila_ids = filament_item.contains("white_fila_ids") ? filament_item["white_fila_ids"].get>() : std::set(); if (!white_fila_ids.empty() && !check_info.fila_id.empty()) { - auto it = std::find_if(white_fila_ids.begin(), white_fila_ids.end(), [&check_info](const std::string& white_fila_id) { - return white_fila_id == check_info.fila_id; + // check_info.fila_id is our OF id; white_fila_ids in filaments_blacklist.json holds the printer's own. + auto* agent = Slic3r::GUI::wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(check_info.fila_id) : check_info.fila_id; + auto it = std::find_if(white_fila_ids.begin(), white_fila_ids.end(), [&printer_filament_id](const std::string& white_fila_id) { + return white_fila_id == printer_filament_id; }); if (it != white_fila_ids.end()) { continue; } } diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp index 806af9d5f0..e0a230969b 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp @@ -5,6 +5,7 @@ // TODO: remove this include #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/GUI_App.hpp" #include "DevUtil.h" #include "DevUtilBackend.h" @@ -95,7 +96,12 @@ std::string DevAmsTray::get_filament_type() if (m_fila_type == "Sup.ABS") { return "ABS-S"; } if (m_fila_type == "Support W") { return "PLA-S"; } if (m_fila_type == "Support G") { return "PA-S"; } - if (m_fila_type == "Support") { if (setting_id == "GFS00") { m_fila_type = "PLA-S"; } else if (setting_id == "GFS01") { m_fila_type = "PA-S"; } else { return "PLA-S"; } } + // setting_id is our OF id; GFS00/GFS01 are the printer's own support-filament ids. + if (m_fila_type == "Support") { + auto* agent = GUI::wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(setting_id) : setting_id; + if (printer_filament_id == "GFS00") { m_fila_type = "PLA-S"; } else if (printer_filament_id == "GFS01") { m_fila_type = "PA-S"; } else { return "PLA-S"; } + } return m_fila_type; } @@ -654,11 +660,14 @@ void DevFilaSystemParser::ParseV1_0(const json& jj, MachineObject* obj, DevFilaS curr_tray->setting_id = (*tray_it)["tray_info_idx"].get(); //std::string type = (*tray_it)["tray_type"].get(); std::string type = MachineObject::setting_id_to_type(curr_tray->setting_id, (*tray_it)["tray_type"].get()); - if (curr_tray->setting_id == "GFS00") + // curr_tray->setting_id is our OF id; GFS00/GFS01 are the printer's own support-filament ids. + auto* agent = GUI::wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(curr_tray->setting_id) : curr_tray->setting_id; + if (printer_filament_id == "GFS00") { curr_tray->m_fila_type = "PLA-S"; } - else if (curr_tray->setting_id == "GFS01") + else if (printer_filament_id == "GFS01") { curr_tray->m_fila_type = "PA-S"; } diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index b28e410557..782574c220 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -110,7 +110,9 @@ bool Slic3r::is_stringing_prone_filament(const std::string& filament_id, float n if (filament_id.empty()) return false; const auto* set = pick_stringing_set(nozzle_diameter); if (!set) return false; - return set->count(filament_id) > 0; + // filament_id is one of our content-addressed OF ids; the table above is keyed by the printer's own. + auto* agent = Slic3r::GUI::wxGetApp().getAgent(); + return set->count(agent ? agent->from_orca_filament_id(filament_id) : filament_id) > 0; } wxString Slic3r::get_stage_string(int stage) @@ -5048,10 +5050,13 @@ DevAmsTray MachineObject::parse_vt_tray(json vtray) vt_tray.setting_id = vtray["tray_info_idx"].get(); //std::string type = vtray["tray_type"].get(); std::string type = setting_id_to_type(vt_tray.setting_id, vtray["tray_type"].get()); - if (vt_tray.setting_id == "GFS00") { + // vt_tray.setting_id is our OF id (translated on the way in); the two support ids below are the printer's own. + auto* agent = GUI::wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(vt_tray.setting_id) : vt_tray.setting_id; + if (printer_filament_id == "GFS00") { vt_tray.m_fila_type = "PLA-S"; } - else if (vt_tray.setting_id == "GFS01") { + else if (printer_filament_id == "GFS01") { vt_tray.m_fila_type = "PA-S"; } else { diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 0347803dbc..ff10b26b6d 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -8823,6 +8823,11 @@ std::vector Plater::priv::load_files(const std::vector& input_ if (wipe_tower_y_opt) file_wipe_tower_y = *wipe_tower_y_opt; + if (auto* agent = wxGetApp().getAgent()) { + if (auto* ids = config.opt("filament_ids")) + for (std::string& id : ids->values) + id = agent->to_orca_filament_id(id); + } preset_bundle->load_config_model(filename.string(), std::move(config), file_version); ConfigOption* bed_type_opt = preset_bundle->project_config.option("curr_bed_type"); @@ -18669,6 +18674,8 @@ int Plater::export_3mf(const boost::filesystem::path& output_path, SaveStrategy nozzle_diameter_str = nozzle_diameter_option->serialize(); std::string printer_model_id = preset_bundle.printers.get_edited_preset().get_printer_type(&preset_bundle); + // The printer reads slice_info.config and knows only its own catalog ids. + auto* id_agent = preset_bundle.is_bbl_vendor() ? wxGetApp().getAgent() : nullptr; for (int i = 0; i < plate_data_list.size(); i++) { PlateData *plate_data = plate_data_list[i]; @@ -18678,6 +18685,8 @@ int Plater::export_3mf(const boost::filesystem::path& output_path, SaveStrategy std::string display_filament_type; it->type = cfg.get_filament_type(display_filament_type, it->id); it->filament_id = filament_id_opt ? filament_id_opt->get_at(it->id) : ""; + if (id_agent) + it->filament_id = id_agent->from_orca_filament_id(it->filament_id); it->color = filament_color ? filament_color->get_at(it->id) : "#FFFFFF"; // save filament info used in curr plate int index = p->partplate_list.get_curr_plate_index(); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 837f4ebe0c..ac419073d7 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -873,10 +873,15 @@ PlaterPresetComboBox::PlaterPresetComboBox(wxWindow *parent, Preset::Type preset auto fila_type = Preset::remove_suffix_modified(GetValue().ToUTF8().data()); bool is_official = boost::algorithm::starts_with(fila_type, "Bambu"); if (is_official) { - // Get filament_id from filament_presets + // Get filament_id from filament_presets. FilamentPickerDialog looks up + // filaments_color_codes.json, which is downloaded from Bambu and keyed by the + // printer's own ids, so translate our OF id (the "GFA00" fallback is already one). const std::string& preset_name = m_preset_bundle->filament_presets[m_filament_idx]; const Preset* selected_preset = m_collection->find_preset(preset_name); - wxString fila_id = selected_preset ? wxString::FromUTF8(selected_preset->filament_id) : "GFA00"; + auto* agent = wxGetApp().getAgent(); + wxString fila_id = "GFA00"; + if (selected_preset) + fila_id = wxString::FromUTF8(agent ? agent->from_orca_filament_id(selected_preset->filament_id) : selected_preset->filament_id); FilamentColor fila_color = get_cur_color_info(); // Show filament picker dialog diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 199de9236e..e70ba84225 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -3845,8 +3845,12 @@ int SelectMachineDialog::update_print_required_data(Slic3r::DynamicPrintConfig c m_required_data_config = config; m_required_data_model = model; //m_required_data_plate_data_list = plate_data_list; + auto* agent = wxGetApp().getAgent(); for (auto i = 0; i < plate_data_list.size(); i++) { if (!plate_data_list[i]->gcode_file.empty()) { + if (agent) + for (auto& info : plate_data_list[i]->slice_filaments_info) + info.filament_id = agent->to_orca_filament_id(info.filament_id); m_required_data_plate_data_list.push_back(plate_data_list[i]); } } @@ -5051,8 +5055,11 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_) const auto& warning_tpu_filaments = DevPrinterConfigUtil::get_value_from_config>(obj_->printer_type, "auto_on_cali_warning_tpu_filaments"); if (!warning_tpu_filaments.empty()) { + auto* agent = wxGetApp().getAgent(); for (const auto& fila : m_ams_mapping_result) { - if (std::find(warning_tpu_filaments.begin(), warning_tpu_filaments.end(), fila.filament_id) != warning_tpu_filaments.end()) { + // fila.filament_id is our OF id; the printer config list holds the printer's own. + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(fila.filament_id) : fila.filament_id; + if (std::find(warning_tpu_filaments.begin(), warning_tpu_filaments.end(), printer_filament_id) != warning_tpu_filaments.end()) { show_status(PrintDialogStatus::PrintStatusTPUUnsuggestCali, { _L("If 'Dynamic Flow Calibration' is set to Auto/On, the system will use the manual calibration value or the default value and skip the flow calibration process. You can perform a manual flow calibration for TPU filament on the 'Calibration' page.") }); break; @@ -5208,9 +5215,12 @@ bool SelectMachineDialog::can_support_pa_auto_cali() std::vector unsupport_auto_cali_filaments = DevPrinterConfigUtil::get_unsupport_auto_cali_filaments(obj->printer_type); if (!unsupport_auto_cali_filaments.empty()) { + auto* agent = wxGetApp().getAgent(); auto iter = std::find_if(m_filaments.begin(), m_filaments.end(), - [&unsupport_auto_cali_filaments](const FilamentInfo &item) { - auto iter = std::find(unsupport_auto_cali_filaments.begin(), unsupport_auto_cali_filaments.end(), item.filament_id); + [&unsupport_auto_cali_filaments, agent](const FilamentInfo &item) { + // item.filament_id is our OF id; the printer config list holds the printer's own. + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(item.filament_id) : item.filament_id; + auto iter = std::find(unsupport_auto_cali_filaments.begin(), unsupport_auto_cali_filaments.end(), printer_filament_id); return iter != unsupport_auto_cali_filaments.end(); }); diff --git a/src/slic3r/Utils/BBLPrinterAgent.cpp b/src/slic3r/Utils/BBLPrinterAgent.cpp index ef85e0a1ff..5e73edf84c 100644 --- a/src/slic3r/Utils/BBLPrinterAgent.cpp +++ b/src/slic3r/Utils/BBLPrinterAgent.cpp @@ -1,11 +1,121 @@ #include "BBLPrinterAgent.hpp" #include "BBLNetworkPlugin.hpp" #include "NetworkAgentFactory.hpp" +#include "libslic3r/Utils.hpp" #include +#include +#include +using json = nlohmann::json; + +#include namespace Slic3r { +namespace { + +// Bambu's own catalog ids for every filament this app ships, Bambu's own included, since Orca +// content-addresses those too. Keyed both ways so each of the four translation entry points +// below is a single lookup. Loaded once per process, on first use. A missing or malformed file +// logs once and leaves both maps empty, so every translation degrades to identity. Same shape +// as DevFilaBlacklist::load_filaments_blacklist_config. +struct BambuFilamentIdMap { std::unordered_map to_bambu, to_orca; }; + +const BambuFilamentIdMap& bambu_filament_id_map() +{ + static const BambuFilamentIdMap map = [] { + BambuFilamentIdMap m; + const std::string path = resources_dir() + "/printers/bambu_filament_ids.json"; + try { + boost::nowide::ifstream file(path); + if (!file.is_open()) { + BOOST_LOG_TRIVIAL(warning) << "Bambu filament id map not found, ids pass through untranslated: " << path; + return m; + } + json doc; + file >> doc; + for (const auto& [orca_filament_id, row] : doc.at("filaments").items()) { + const std::string bambu_id = row.at("bambu_id").get(); + m.to_bambu.emplace(orca_filament_id, bambu_id); + m.to_orca.emplace(bambu_id, orca_filament_id); + } + } catch (const std::exception& e) { + BOOST_LOG_TRIVIAL(error) << "Bambu filament id map unreadable, ids pass through untranslated: " << e.what(); + m = {}; + } + return m; + }(); + return map; +} + +// Rewrites every string under "tray_info_idx", "filament_id" or "filamentId", at any depth, in place. +void rewrite_filament_ids(json& j, const std::unordered_map& map) +{ + if (j.is_object()) { + for (auto& [key, value] : j.items()) { + if (value.is_string() && (key == "tray_info_idx" || key == "filament_id" || key == "filamentId")) { + auto it = map.find(value.get_ref()); + if (it != map.end()) + value = it->second; + } else + rewrite_filament_ids(value, map); + } + } else if (j.is_array()) + for (auto& element : j) + rewrite_filament_ids(element, map); +} + +// Text that does not parse as JSON, or that mentions none of the id keys, comes back byte-identical. +std::string rewrite_filament_ids(std::string text, const std::unordered_map& map) +{ + if (map.empty() || (text.find("tray_info_idx") == std::string::npos && text.find("filament_id") == std::string::npos && + text.find("filamentId") == std::string::npos)) + return text; // nothing to map, skip the parse (moved, not copied) + try { + json j = json::parse(text); + rewrite_filament_ids(j, map); + return j.dump(); + } catch (const std::exception&) { + return text; // not JSON: forward as received + } +} + +// Wraps an inbound message callback so every Bambu id it delivers arrives already translated. +// A null fn is a deregistration (see GUI_App.cpp's shutdown phase 1 and NetworkAgent::apply_printer_callbacks +// clearing callbacks with {}), and must stay null rather than become a live wrapper around an empty target. +OnMessageFn to_orca_messages(OnMessageFn fn) +{ + if (!fn) + return fn; + return [fn = std::move(fn)](std::string dev_id, std::string msg) { fn(std::move(dev_id), BBLPrinterAgent::to_orca_payload(std::move(msg))); }; +} + +} // namespace + +std::string BBLPrinterAgent::to_orca_filament_id(const std::string& printer_filament_id) const +{ + const auto& map = bambu_filament_id_map().to_orca; + auto it = map.find(printer_filament_id); + return it != map.end() ? it->second : printer_filament_id; +} + +std::string BBLPrinterAgent::from_orca_filament_id(const std::string& orca_filament_id) const +{ + const auto& map = bambu_filament_id_map().to_bambu; + auto it = map.find(orca_filament_id); + return it != map.end() ? it->second : orca_filament_id; +} + +std::string BBLPrinterAgent::to_orca_payload(std::string json_text) +{ + return rewrite_filament_ids(std::move(json_text), bambu_filament_id_map().to_orca); +} + +std::string BBLPrinterAgent::from_orca_payload(std::string json_text) +{ + return rewrite_filament_ids(std::move(json_text), bambu_filament_id_map().to_bambu); +} + BBLPrinterAgent::BBLPrinterAgent() = default; BBLPrinterAgent::~BBLPrinterAgent() = default; @@ -22,6 +132,7 @@ void BBLPrinterAgent::set_cloud_agent(std::shared_ptr cloud) int BBLPrinterAgent::send_message(std::string dev_id, std::string json_str, int qos, int flag) { + json_str = from_orca_payload(std::move(json_str)); auto& plugin = BBLNetworkPlugin::instance(); auto agent = plugin.get_agent(); auto func = plugin.get_send_message(); @@ -67,6 +178,7 @@ int BBLPrinterAgent::disconnect_printer() int BBLPrinterAgent::send_message_to_printer(std::string dev_id, std::string json_str, int qos, int flag) { + json_str = from_orca_payload(std::move(json_str)); auto& plugin = BBLNetworkPlugin::instance(); auto agent = plugin.get_agent(); auto func = plugin.get_send_message_to_printer(); @@ -321,6 +433,7 @@ int dispatch_start(CurrentFn func, PrintParams& params, const CallbackFns&... ca auto agent = plugin.get_agent(); if (!func || !agent) return -1; + params.ams_mapping_info = BBLPrinterAgent::from_orca_payload(std::move(params.ams_mapping_info)); switch (plugin.network_abi()) { case NetworkAbi::Legacy: return reinterpret_cast(func)(agent, BBLNetworkPlugin::as_legacy(params), callbacks...); @@ -408,7 +521,7 @@ int BBLPrinterAgent::set_on_message_fn(OnMessageFn fn) auto agent = plugin.get_agent(); auto func = plugin.get_set_on_message_fn(); if (func && agent) { - return func(agent, fn); + return func(agent, to_orca_messages(std::move(fn))); } return -1; } @@ -441,7 +554,7 @@ int BBLPrinterAgent::set_on_local_message_fn(OnMessageFn fn) auto agent = plugin.get_agent(); auto func = plugin.get_set_on_local_message_fn(); if (func && agent) { - return func(agent, fn); + return func(agent, to_orca_messages(std::move(fn))); } return -1; } diff --git a/src/slic3r/Utils/BBLPrinterAgent.hpp b/src/slic3r/Utils/BBLPrinterAgent.hpp index a8880bf6bf..83e21bb6d8 100644 --- a/src/slic3r/Utils/BBLPrinterAgent.hpp +++ b/src/slic3r/Utils/BBLPrinterAgent.hpp @@ -84,6 +84,20 @@ public: int set_queue_on_main_fn(QueueOnMainFn fn) override; FilamentSyncMode get_filament_sync_mode() const override; + // Bambu's own catalog ids. Orca content-addresses every system filament, Bambu's included; + // the printer, the AMS and Bambu's cloud know only Bambu's ids, so this agent translates at + // the boundary through resources/printers/bambu_filament_ids.json (generated by + // scripts/update_bambu_filament_ids.py). An id without a map row is returned as it is. + std::string to_orca_filament_id(const std::string& printer_filament_id) const override; + std::string from_orca_filament_id(const std::string& orca_filament_id) const override; + + // Rewrite every string under "tray_info_idx", "filament_id" or "filamentId", at any depth, + // in a JSON document (an MQTT payload or PrintParams::ams_mapping_info). Text that does not + // parse, or contains none of the keys, is returned unchanged. + // Taken by value: most outbound traffic carries no filament id and is moved straight back out. + static std::string to_orca_payload(std::string json_text); + static std::string from_orca_payload(std::string json_text); + private: std::shared_ptr m_cloud_agent; }; diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp index 473f62337f..499228d13c 100644 --- a/src/slic3r/Utils/CalibUtils.cpp +++ b/src/slic3r/Utils/CalibUtils.cpp @@ -62,22 +62,29 @@ std::vector not_support_auto_pa_cali_filaments = { void get_default_k_n_value(const std::string &filament_id, float &k, float &n) { - if (filament_id.compare("GFU01") == 0) { + // filament_id is our OF id; the literals below are the printer's own. An id the agent has + // no mapping for (e.g. a caller still on the old id) passes through unchanged. + auto* agent = wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(filament_id) : filament_id; + if (printer_filament_id.compare("GFU01") == 0) { /* TPU 95A */ k = 0.25; n = 1.0; - } else if (filament_id.compare("GFU03") == 0) { + } else if (printer_filament_id.compare("GFU03") == 0) { /* TPU 90A */ k = 0.35; n = 1.0; - } else if (filament_id.compare("GFU04") == 0) { + } else if (printer_filament_id.compare("GFU04") == 0) { /* TPU 85A */ k = 0.65; n = 1.0; - } else if (filament_id.compare("GFG00") == 0 || filament_id.compare("GFG01") == 0 || filament_id.compare("GFG60") == 0 || filament_id.compare("GFL06") == 0 || - filament_id.compare("GFL55") == 0 || filament_id.compare("GFG99") == 0 || filament_id.compare("GFG98") == 0 || filament_id.compare("GFG97") == 0 || - filament_id.compare("GFG50") == 0 || filament_id.compare("GFU02") == 0 || filament_id.compare("GFU98") == 0 || filament_id.compare("GFS00") == 0 || - filament_id.compare("GFS02") == 0) { + } else if (printer_filament_id.compare("GFG00") == 0 || printer_filament_id.compare("GFG01") == 0 || + printer_filament_id.compare("GFG60") == 0 || printer_filament_id.compare("GFL06") == 0 || + printer_filament_id.compare("GFL55") == 0 || printer_filament_id.compare("GFG99") == 0 || + printer_filament_id.compare("GFG98") == 0 || printer_filament_id.compare("GFG97") == 0 || + printer_filament_id.compare("GFG50") == 0 || printer_filament_id.compare("GFU02") == 0 || + printer_filament_id.compare("GFU98") == 0 || printer_filament_id.compare("GFS00") == 0 || + printer_filament_id.compare("GFS02") == 0) { /* 0.04 filaments */ k = 0.04; n = 1.0; @@ -1393,7 +1400,10 @@ void CalibUtils::calib_retraction(const CalibInfo &calib_info, wxString &error_m bool CalibUtils::is_support_auto_pa_cali(std::string filament_id) { - auto iter = std::find(not_support_auto_pa_cali_filaments.begin(), not_support_auto_pa_cali_filaments.end(), filament_id); + // filament_id is our OF id; not_support_auto_pa_cali_filaments holds the printer's own ids. + auto* agent = wxGetApp().getAgent(); + const std::string printer_filament_id = agent ? agent->from_orca_filament_id(filament_id) : filament_id; + auto iter = std::find(not_support_auto_pa_cali_filaments.begin(), not_support_auto_pa_cali_filaments.end(), printer_filament_id); if (iter != not_support_auto_pa_cali_filaments.end()) { return false; } diff --git a/src/slic3r/Utils/IPrinterAgent.hpp b/src/slic3r/Utils/IPrinterAgent.hpp index 0fa3616344..1f0d45dc1e 100644 --- a/src/slic3r/Utils/IPrinterAgent.hpp +++ b/src/slic3r/Utils/IPrinterAgent.hpp @@ -290,6 +290,16 @@ public: * Populates the MachineObject's DevFilaSystem with fetched filament data. */ virtual bool fetch_filament_info(std::string dev_id) { return false; } + + /** + * Translate one filament id across the printer boundary. + * + * Orca content-addresses every system filament; a printer, its AMS and its vendor cloud + * know only that vendor's own catalog ids. An agent whose printers already speak Orca's + * ids leaves them alone, and so does an id with no mapping. + */ + virtual std::string to_orca_filament_id(const std::string& printer_filament_id) const { return printer_filament_id; } + virtual std::string from_orca_filament_id(const std::string& orca_filament_id) const { return orca_filament_id; } }; } // namespace Slic3r diff --git a/src/slic3r/Utils/NetworkAgent.cpp b/src/slic3r/Utils/NetworkAgent.cpp index 0d77e5e660..b15e10c591 100644 --- a/src/slic3r/Utils/NetworkAgent.cpp +++ b/src/slic3r/Utils/NetworkAgent.cpp @@ -929,6 +929,20 @@ bool NetworkAgent::fetch_filament_info(std::string dev_id) return false; } +std::string NetworkAgent::to_orca_filament_id(const std::string& printer_filament_id) const +{ + if (m_printer_agent) + return m_printer_agent->to_orca_filament_id(printer_filament_id); + return printer_filament_id; +} + +std::string NetworkAgent::from_orca_filament_id(const std::string& orca_filament_id) const +{ + if (m_printer_agent) + return m_printer_agent->from_orca_filament_id(orca_filament_id); + return orca_filament_id; +} + int NetworkAgent::request_bind_ticket(std::string* ticket) { if (m_printer_agent) diff --git a/src/slic3r/Utils/NetworkAgent.hpp b/src/slic3r/Utils/NetworkAgent.hpp index d7032b7a20..76128073a4 100644 --- a/src/slic3r/Utils/NetworkAgent.hpp +++ b/src/slic3r/Utils/NetworkAgent.hpp @@ -165,6 +165,8 @@ public: int start_sdcard_print(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn); FilamentSyncMode get_filament_sync_mode() const; bool fetch_filament_info(std::string dev_id); + std::string to_orca_filament_id(const std::string& printer_filament_id) const; + std::string from_orca_filament_id(const std::string& orca_filament_id) const; int request_bind_ticket(std::string* ticket); int get_hms_snapshot(std::string dev_id, std::string file_name, std::function callback); diff --git a/tests/slic3rutils/CMakeLists.txt b/tests/slic3rutils/CMakeLists.txt index eca1af2b86..2ab78f56de 100644 --- a/tests/slic3rutils/CMakeLists.txt +++ b/tests/slic3rutils/CMakeLists.txt @@ -1,6 +1,7 @@ get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME) add_executable(${_TEST_NAME}_tests ${_TEST_NAME}_tests_main.cpp + test_bambu_filament_ids.cpp test_creality_cfs_match.cpp test_dev_mapping.cpp test_filament_bitmap_utils.cpp diff --git a/tests/slic3rutils/test_bambu_filament_ids.cpp b/tests/slic3rutils/test_bambu_filament_ids.cpp new file mode 100644 index 0000000000..5f6215d7ca --- /dev/null +++ b/tests/slic3rutils/test_bambu_filament_ids.cpp @@ -0,0 +1,81 @@ +#include +#include +#include +#include + +#include "libslic3r/Utils.hpp" +#include "slic3r/Utils/BBLPrinterAgent.hpp" +#include "slic3r/Utils/OrcaPrinterAgent.hpp" + +using json = nlohmann::json; +using namespace Slic3r; + +namespace { + +// Point resources_dir() at the repo's own tree for the lifetime of a test and restore it +// afterwards, mirroring ScopedResourcesDir (which only ever makes a throwaway directory). +// PROFILES_DIR is /resources/profiles; the map lives in /resources/printers. +struct ScopedRepoResourcesDir +{ + std::string previous{resources_dir()}; + + ScopedRepoResourcesDir() { set_resources_dir(boost::filesystem::path(PROFILES_DIR).parent_path().string()); } + ~ScopedRepoResourcesDir() { set_resources_dir(previous); } + + ScopedRepoResourcesDir(const ScopedRepoResourcesDir&) = delete; + ScopedRepoResourcesDir& operator=(const ScopedRepoResourcesDir&) = delete; +}; + +std::string orca_id_of(const std::string& bambu_id) +{ + boost::nowide::ifstream file(resources_dir() + "/printers/bambu_filament_ids.json"); + json doc; + file >> doc; + for (const auto& [orca_id, row] : doc["filaments"].items()) + if (row["bambu_id"] == bambu_id) + return orca_id; + FAIL("no map row for " << bambu_id); + return {}; +} + +} // namespace + +TEST_CASE("Bambu filament id map is one-to-one and leaves unmapped ids alone", "[BambuFilamentIds]") +{ + const ScopedRepoResourcesDir repo_resources; + const BBLPrinterAgent bbl; + const std::string abs = orca_id_of("GFB00"); // Bambu ABS + REQUIRE(abs.rfind("OF", 0) == 0); + CHECK(bbl.from_orca_filament_id(abs) == "GFB00"); + CHECK(bbl.to_orca_filament_id("GFB00") == abs); + CHECK(bbl.from_orca_filament_id("OFnotarow") == "OFnotarow"); + CHECK(bbl.to_orca_filament_id("GFZZ99") == "GFZZ99"); // Bambu id we do not ship + CHECK(bbl.to_orca_filament_id("P1234567") == "P1234567"); // user root + CHECK(bbl.from_orca_filament_id("") == ""); + + // An agent whose printers already speak our ids inherits IPrinterAgent's identity default. + const OrcaPrinterAgent other{""}; + CHECK(other.from_orca_filament_id(abs) == abs); + CHECK(other.to_orca_filament_id("GFB00") == "GFB00"); +} + +TEST_CASE("Payload rewrite covers nested trays, calibration lists and mapping info", "[BambuFilamentIds]") +{ + const ScopedRepoResourcesDir repo_resources; + const std::string abs = orca_id_of("GFB00"), pla = orca_id_of("GFA00"); + const std::string status = + R"({"print":{"ams":{"ams":[{"tray":[{"tray_info_idx":"GFB00"},{"tray_info_idx":"GFZZ99"}]}]},)" + R"("vt_tray":{"tray_info_idx":"GFA00"},"filaments":[{"filament_id":"GFA00","setting_id":"GFB00"}]}})"; + json inbound = json::parse(BBLPrinterAgent::to_orca_payload(status)); + CHECK(inbound["print"]["ams"]["ams"][0]["tray"][0]["tray_info_idx"] == abs); + CHECK(inbound["print"]["ams"]["ams"][0]["tray"][1]["tray_info_idx"] == "GFZZ99"); // no row: untouched + CHECK(inbound["print"]["vt_tray"]["tray_info_idx"] == pla); + CHECK(inbound["print"]["filaments"][0]["filament_id"] == pla); + CHECK(inbound["print"]["filaments"][0]["setting_id"] == "GFB00"); // not an id key: has a map row but must stay put + CHECK(json::parse(BBLPrinterAgent::from_orca_payload(inbound.dump())) == json::parse(status)); // round trip + + const std::string mapping = R"([{"ams":0,"filamentId":")" + abs + R"(","filamentType":"ABS"}])"; + CHECK(BBLPrinterAgent::from_orca_payload(mapping) == R"([{"ams":0,"filamentId":"GFB00","filamentType":"ABS"}])"); + CHECK(BBLPrinterAgent::from_orca_payload("not json") == "not json"); + CHECK(BBLPrinterAgent::from_orca_payload(R"({"print":{"command":"pushall"}})") == R"({"print":{"command":"pushall"}})"); +} From bf20b041e273f435649b1d6be969e20d41ba09dd Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 5 Sep 2026 23:07:49 +0800 Subject: [PATCH 46/52] Make a filament's id depend only on the filament itself MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A filament_id is now exactly what the preset's own filament_vendor, filament_type and filament name mint, wherever it inherits from. Inheriting settings no longer limits what a preset may claim, so the checks that policed inheritance are gone, and so are the four grandfather lists that held thousands of presets as permanent exceptions. The snapshot records sanctioned state rather than excuses: one entry per id, carrying the product it names beside the presets claiming it. Profiles that disagreed are corrected instead of excused. The Elegoo TPU and PAHT roots were named for a different product than all of their variants and become TPU 95A and PAHT-CF; Elegoo PET-CF gains the filament_type its variants already set; the Snapmaker breakaway support presets get an id of their own rather than riding the PVA chain; and a BBL preset name carrying a doubled space is fixed behind renamed_from. Their ids re-mint from the corrected identities. The tooling and the design note also drop the word "family", which invited reading a brand's Lite and Pro spools as one id. No change to slicing output — only filament_id values, three preset names, the inherits lines following those renames and the vendor indexes move. --- docs/HLSD/filament_id.md | 195 +- resources/profiles/BBL.json | 2 +- .../COEX/COEX NYLEX UNFILLED @BBL X1C.json | 3 +- resources/profiles/Elegoo.json | 8 +- ...T @base.json => Elegoo PAHT-CF @base.json} | 4 +- .../filament/BASE/Elegoo PET-CF @base.json | 7 +- .../BASE/Elegoo Rapid TPU 95A @base.json | 2 +- ...U @base.json => Elegoo TPU 95A @base.json} | 4 +- .../filament/EC/Elegoo PAHT-CF @EC.json | 2 +- .../filament/EC/Elegoo TPU 95A @EC.json | 2 +- .../filament/EC2/Elegoo PAHT-CF @EC2.json | 2 +- .../filament/EC2/Elegoo TPU 95A @EC2.json | 2 +- .../filament/ECC/Elegoo PAHT-CF @ECC.json | 2 +- .../filament/ECC/Elegoo TPU 95A @ECC.json | 2 +- .../filament/ECC2/Elegoo PAHT-CF @ECC2.json | 2 +- .../filament/ECC2/Elegoo TPU 95A @ECC2.json | 2 +- .../EN3SERIES/Elegoo TPU 95A @EN3 Series.json | 2 +- .../EN4SERIES/Elegoo TPU 95A @EN4 Series.json | 2 +- resources/profiles/OrcaFilamentLibrary.json | 8 +- .../Elegoo/Elegoo PAHT-CF @System.json | 2 +- ...T @base.json => Elegoo PAHT-CF @base.json} | 4 +- .../filament/Elegoo/Elegoo PET-CF @base.json | 7 +- .../Elegoo/Elegoo Rapid TPU 95A @base.json | 2 +- .../Elegoo/Elegoo TPU 95A @System.json | 2 +- ...U @base.json => Elegoo TPU 95A @base.json} | 4 +- ...akaway Support For PLA @U1 0.2 nozzle.json | 1 + ...akaway Support For PLA @U1 0.6 nozzle.json | 1 + ...akaway Support For PLA @U1 0.8 nozzle.json | 1 + ...apmaker Breakaway Support For PLA @U1.json | 1 + scripts/assign_filament_ids.py | 574 +- scripts/filament_id_snapshot.json | 21107 ++++++---------- scripts/tests/test_filament_id.py | 294 +- scripts/update_bambu_filament_ids.py | 47 +- 33 files changed, 8465 insertions(+), 13835 deletions(-) rename resources/profiles/Elegoo/filament/BASE/{Elegoo PAHT @base.json => Elegoo PAHT-CF @base.json} (94%) rename resources/profiles/Elegoo/filament/BASE/{Elegoo TPU @base.json => Elegoo TPU 95A @base.json} (85%) rename resources/profiles/OrcaFilamentLibrary/filament/Elegoo/{Elegoo PAHT @base.json => Elegoo PAHT-CF @base.json} (95%) rename resources/profiles/OrcaFilamentLibrary/filament/Elegoo/{Elegoo TPU @base.json => Elegoo TPU 95A @base.json} (89%) diff --git a/docs/HLSD/filament_id.md b/docs/HLSD/filament_id.md index 4c1c1f7443..eaf9de4a6c 100644 --- a/docs/HLSD/filament_id.md +++ b/docs/HLSD/filament_id.md @@ -1,19 +1,21 @@ # Filament IDs (`filament_id`) -`filament_id` identifies a **material family**: one commercial product line = one id, shared by -all of that material's per-printer / per-nozzle variants, in every profile bundle that ships it. +`filament_id` identifies one **filament product**: one named spool product = one id, shared by +all of that product's per-printer / per-nozzle variants, in every profile bundle that ships it. Devices use it to match a physical spool or tray to a filament preset. It is never per-color, per-printer, per-nozzle, or per-preset (per-preset identity is `setting_id`), and it is never per-bundle either — PolyLite PLA carries the same id whether the preset lives in the -OrcaFilamentLibrary (OFL), Qidi, or Snapmaker bundle. +OrcaFilamentLibrary (OFL), Qidi, or Snapmaker bundle. The granularity is the name on the spool, +not the brand behind it: `AAA PLA Lite` and `AAA PLA Pro` are two filaments with two ids, not +variants of one. **How it is generated:** an id is computed, never invented. `scripts/assign_filament_ids.py` mints it as a deterministic hash of the product's identity — the triple -`(filament_vendor, filament_type, family name)`, where the family name is the preset name +`(filament_vendor, filament_type, filament name)`, where the filament name is the preset name with its `@...` variant suffix stripped — producing an 8-character `OF*` code that is the same for that product in every bundle, in every PR, on every machine. For example, Polymaker's PolyLite PLA presets (`PolyLite PLA @base`, `PolyLite PLA@Q2-Series`, …) resolve -`filament_vendor` `Polymaker`, `filament_type` `PLA`, and family name `PolyLite PLA`; hashing +`filament_vendor` `Polymaker`, `filament_type` `PLA`, and filament name `PolyLite PLA`; hashing `filament_product/Polymaker/PLA/PolyLite PLA` yields `OF5CgdDq`, and that is the id the OrcaFilamentLibrary, OrcaArena, Qidi, and Snapmaker bundles all arrive at independently (derivation details in the Minting section). @@ -31,8 +33,8 @@ This page is the rule for authoring `filament_id` in system profiles (`resources/profiles/**`). CI enforces everything below; the short version is: > [!IMPORTANT] -> **Never write a `filament_id` value by hand.** New families get their id from -> `python scripts/assign_filament_ids.py`; existing families already have one — inherit it. +> **Never write a `filament_id` value by hand.** A new filament gets its id from +> `python scripts/assign_filament_ids.py`; one already in the tree has one — inherit it. ## The design, in two pieces @@ -47,7 +49,7 @@ the system is built to make them impossible: number, and no way to get it wrong by hand, because you never write it by hand. 2. **A sanctioned snapshot.** The complete id landscape derived from the tree must equal `scripts/filament_id_snapshot.json` exactly, so every change to ids, claims (which bundles - ship which id, and for which family), or product identity surfaces as a reviewable diff to + ship which id, and for which filament), or product identity surfaces as a reviewable diff to one file — the maintainer gate. ## Who consumes the id @@ -55,7 +57,7 @@ the system is built to make them impossible: The canonical consumer is tray-to-preset matching: a device reports a tray material id (`tray_info_idx`), and the shared matching pipeline (`PresetBundle::sync_ams_list` and friends) resolves it to a preset. The matcher is printer-scoped and first-match-wins: -scanning only compatible family roots — system roots plus user-made custom filaments, which +scanning only compatible root presets — system roots plus user-made custom filaments, which are user roots carrying their own `P*` ids; a preset derived from another resolves through its root and never matches directly — it picks the first one whose `filament_id` equals the tray's. On a miss it falls back by filament type: a system `Generic ` preset @@ -73,7 +75,7 @@ device-reported tray material id flowing through the shared matcher. | Ecosystem | Where the tray id comes from today | | --- | --- | | Bambu AMS | the device itself (RFID / user tray setting), in Bambu's own `GF*` catalog; `BBLPrinterAgent` rewrites it into our id before the matcher sees it (see [The Bambu catalog map](#the-bambu-catalog-map)) | -| Qidi box | composed at runtime as `QD___` — vendor and type indices from the device's per-slot saved variables, the series digit inferred client-side from the printer model/name. No preset carries a `QD_*` value, so the slot currently resolves by filament type; mapping the composed id onto the family's minted id belongs in the agent | +| Qidi box | composed at runtime as `QD___` — vendor and type indices from the device's per-slot saved variables, the series digit inferred client-side from the printer model/name. No preset carries a `QD_*` value, so the slot currently resolves by filament type; mapping the composed id onto the filament's minted id belongs in the agent | | Creality CFS | runtime brand/type scoring returns the winning preset's id | | Klipper (AFC / Happy Hare) | runtime lookup by filament type | | Snapmaker | runtime color/vendor/type match | @@ -115,45 +117,47 @@ Two more consumer-side facts worth knowing: > **Would a user consider this a different spool product than anything already in the tree?** Different polymer, different sub-brand (Basic / Matte / Silk / HF), fiber-filled sibling, or a -second selectable diameter → **new family, new id**. The same spool tuned for another printer -or nozzle → **join the existing family** (inherit its `@base`, write no id key). Tuning a -generic material → **join the OrcaFilamentLibrary family** (inherit `Generic X @System`, keep -the `Generic X` base name, write no id key). +second selectable diameter → **new filament, new id**. The same spool tuned for another printer +or nozzle → **join the existing filament** (keep its base name and inherit it; no id +key needed). Tuning a generic material → **join the OrcaFilamentLibrary filament** (inherit +`Generic X @System` and keep the `Generic X` base name; no id key needed). | Situation | id | | --- | --- | -| Per-printer / per-nozzle variant of an existing material | same id (inherit, never write the key) | +| Per-printer / per-nozzle variant of an existing material | same id (inherit it) | | Sub-brand or product line (PLA vs PLA Matte vs PLA Silk vs PLA HF) | new id each | | Color | never a new id | -| Second diameter of the same product (1.75 + 2.85) | sibling family, new id | +| Second diameter of the same product (1.75 + 2.85) | sibling filament, new id | | "High-speed" tuned for a *different printer model* | same id (it is a printer variant) | | "High-speed" selectable *alongside* the normal preset on one printer | new id (it is a product line) | ## Structure rules -1. **Only family roots carry the key.** Root presets (any preset *not* marked - `"instantiation": "true"`, typically ` @base` with `"instantiation": "false"`) - declare `filament_id`; instantiated variants inherit a root and never write the key. - A family may have several roots — Qidi's PolyLite PLA has four per-series roots - (`PolyLite PLA@Q2-Series`, `@Q2C-Series`, `@X-Max 4-Series`, `@X-Plus 5-Series`) — and all - of them must declare the *identical* id. This is the authoring rule for new work; a large - grandfathered tail of older presets breaks it in two ways — keys written on instantiated - presets (frozen in the snapshot's `instantiated_with_id` list) and keys that override the - id the preset would inherit from its family (frozen in `id_overrides`) — and CI ratchets - so no new preset joins either tail. -2. **The family name is the base name**: the preset name with everything from the first +1. **Every preset carries the id of its own product, wherever it gets it from.** The id is a + function of the preset's own triple (rule 5), and `inherits` carries settings, never + identity. So a preset may declare the key itself or inherit it from any ancestor — a + ` @base` root, a real (instantiated) preset of the same filament, an + OrcaFilamentLibrary preset — and CI checks one thing: the id it ends up with equals the + mint of *its* triple. The usual shape is one `@base` root (`"instantiation": "false"`) + declaring the key and the per-printer variants inheriting it; a filament may have several + roots — Qidi's PolyLite PLA has four per-series roots (`PolyLite PLA@Q2-Series`, + `@Q2C-Series`, `@X-Max 4-Series`, `@X-Plus 5-Series`) — which then all declare the identical + id. A branded filament that borrows a generic's settings (`Flashforge ABS Basic @FF C5` + inherits `Generic ABS @System`) declares its own id, because its triple is its own. +2. **The filament name is the base name**: the preset name with everything from the first (optionally space-preceded) `@` stripped. `MyBrand PLA @Orca 3D Fuse1` and `MyBrand PLA@HS` - both belong to family `MyBrand PLA`. -3. **Within a family, variants' `compatible_printers` are pairwise disjoint** — per printer, + are both the filament `MyBrand PLA`. +3. **Within one filament, variants' `compatible_printers` are pairwise disjoint** — per printer, at most one compatible instantiated preset per id, or AMS matching turns ambiguous. The C++ validator's `-f` check enforces this. 4. **Generics belong to OrcaFilamentLibrary.** A vendor tuning a generic material inherits `Generic X @System`, keeps the `Generic X` base name (that alias is what hides the library - preset on your printers), sets a non-empty `compatible_printers`, and writes no id key — - e.g. `Generic PLA @Sovol SV08 MAX` inherits `Generic PLA @System` and lists three Sovol - nozzles. A vendor-*branded* filament never rides a generic family id. + preset on your printers, and it is what makes its triple — and so its id — the library's) + and sets a non-empty `compatible_printers` — e.g. `Generic PLA @Sovol SV08 MAX` inherits + `Generic PLA @System` and lists three Sovol nozzles. Renaming such a preset makes it a + different product by rule 5, so it then needs its own id. 5. **Ids follow the product identity.** The id is a pure function of the product triple - `(filament_vendor, filament_type, family name)`, so correcting any of them re-mints the id + `(filament_vendor, filament_type, filament name)`, so correcting any of them re-mints the id **by design** (via `--remint `; the exact sequence is in the FAQ). Nothing forwards the old value, so anything outside the tree that stored it — a device tray, a calibration record, a saved project — falls back to matching by filament type until the user re-selects @@ -169,48 +173,48 @@ New ids are deterministic, computed exactly like the `setting_id` precedent FILAMENT_ID_NAMESPACE = uuid5(setting-id NAMESPACE, "filament_id") = c4d3ff49-4c32-5534-a3e3-00894157ab97 filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, - "filament_product///") ) + "filament_product///") ) ``` `base62_6` is the low 6 base62 digits (alphabet `0-9A-Za-z`) of the UUID taken as a big-endian integer, most-significant digit first; with the `OF` prefix the full id is 8 chars, within the -AMS length limit. The triple comes from the family root's *flattened* config: +AMS length limit. The triple comes from the root preset's *flattened* config: `` is the filament **manufacturer** (`"Polymaker"`, or `"Generic"` for generics — never the printer brand), -`` the material type, `` the root's base name; the two config +`` the material type, `` the root's base name; the two config values are inheritable list options and the first element counts. Content-addressing on that triple is what makes the whole system converge. The key contains no -bundle name, so the same product mints the same id in every bundle — hoisting a family into +bundle name, so the same product mints the same id in every bundle — moving a filament into OrcaFilamentLibrary never changes its id, and two vendors independently shipping the same product arrive at the same id without coordinating. `Polymaker/PLA/PolyLite PLA` mints `OF5CgdDq`, and that one id is declared by the OrcaFilamentLibrary, OrcaArena, Qidi, and Snapmaker bundles alike; the OFL generic `Generic/PLA/Generic PLA` mints `OFDSrzZ8`, claimed -by ten bundles — most by independent declarations converging on the same mint, the rest -purely through inheritance from the OFL family. +by 35 bundles — most by independent declarations converging on the same mint, the rest +purely through inheritance from the OFL preset. On the rare collision with an existing id, the minter salts the input (`…/1`, `…/2`, …) until free, and the result is frozen in the profile file. Salting is also used deliberately: a *salt split* keeps two presets of one product on distinct ids where a single id would be AMS-ambiguous on the same printer — the "selectable alongside" situation from the -table above, resolved without inventing a second family name. The tooling recognizes salt +table above, resolved without inventing a second filament name. The tooling recognizes salt iterations of a triple as conformant and preserves such splits across re-mints. -Workflow for a new family: +Workflow for a new filament: ```bash -# 1. Author the family with NO filament_id key anywhere. -python scripts/assign_filament_ids.py # 2. mint + insert ids into the family root(s) +# 1. Author the filament with NO filament_id key anywhere. +python scripts/assign_filament_ids.py # 2. mint + insert ids into the root preset(s) python scripts/assign_filament_ids.py --update-snapshot # 3. record the new claims in the snapshot python scripts/assign_filament_ids.py --check # 4. verify — the same checks CI runs # 5. Commit the profile edits together with scripts/filament_id_snapshot.json. ``` -The default run mints ids for id-less families and replaces any declaration that is not in +The default run mints ids for id-less filaments and replaces any declaration that is not in `OF` format; it never rewrites a valid `OF` id, so it is idempotent and a no-op once every -family has one. It edits profile files byte-preservingly (indentation, BOM, and line endings +filament has one. It edits profile files byte-preservingly (indentation, BOM, and line endings intact) and re-parses them to fail loudly. -`--mint "filament_vendor/filament_type/family_name"` prints the id a **new** mint of that +`--mint "filament_vendor/filament_type/filament_name"` prints the id a **new** mint of that triple would get, without touching anything — note that for a triple whose id already exists it prints the next *free* salt iteration, not the live id (asking for `Polymaker/PLA/PolyLite PLA` today prints the salt-1 id, because `OF5CgdDq` is taken). @@ -228,7 +232,7 @@ normally only used by id migrations): - `--profiles DIR` points the tooling at a different profile tree (default `resources/profiles`). -If you skip the tooling, CI fails and prints the remedy: the expected id for your family and +If you skip the tooling, CI fails and prints the remedy: the expected id for your filament and the instruction to run `python scripts/assign_filament_ids.py`; once the id is minted, the snapshot checks likewise point at `--update-snapshot` and tell you to commit the resulting diff. @@ -244,23 +248,21 @@ bundle — not even the one whose printers use the catalog — that may write on | `GF*` | Bambu AMS/RFID catalog | declarable by **nobody**, BBL included: Bambu's own ids live in the generated catalog map, never in a profile | | `QD_*` | Qidi device protocol | declarable by **nobody**, Qidi included: the box composes these ids at runtime and they are not preset ids | | `P` + 7 hex chars (case-insensitive), `"null"` | user-created custom filaments (`CreatePresetsDialog.cpp`) | never appears in system profiles | -| every already-shipped id | frozen in the snapshot (grandfathered) | frozen as-is; new claims need maintainer sign-off | The two device namespaces, in detail: - **Bambu (`GF*`).** Bambu's device/RFID/cloud catalog is external and opaque, which is a - reason to keep it out of the profiles rather than to let one bundle own it. Every BBL family + reason to keep it out of the profiles rather than to let one bundle own it. Every BBL filament mints an `OF` id from its triple like every other vendor's, and the correspondence to Bambu's catalog ids lives in one generated file the app applies at the printer boundary — the next - section. Nothing under `resources/profiles/**` carries a `GF*` id today and the snapshot - grandfathers none, so a `GF*` id appearing anywhere in the tree is a mistake, whoever wrote - it. + section. Nothing under `resources/profiles/**` carries a `GF*` id today and nothing can be + exempted, so a `GF*` id appearing anywhere in the tree is a mistake, whoever wrote it. - **Qidi (`QD_*`).** `QD_*` is a device-*protocol* namespace, not a preset id space: the Qidi box path composes `QD___` ids at runtime (slot vendor and type indices reported by the device, the series digit inferred client-side from the printer model/name). Qidi presets carry ordinary minted `OF*` ids (generics share the OFL ids), so a composed id matches no preset and the slot falls back to filament type; translating it to - the family's id belongs in `QidiPrinterAgent`. The alternative — treating per-series + the filament's id belongs in `QidiPrinterAgent`. The alternative — treating per-series protocol ids as preset ids — would put one product under five ids (`QIDI PLA Rapido` would be `QD_0_1_1` through `QD_4_1_1`), exactly the fragmentation the mint rule removes. @@ -294,7 +296,7 @@ it from **BambuStudio's own shipped BBL bundle** — a sparse shallow clone of u or `--bambustudio-dir `. Our BBL bundle is a fork of Bambu's, tuned and extended independently, so it is not the source of truth for Bambu's ids. A row's key is whatever id our tree already mints for that same -`(filament_vendor, filament_type, family)` triple; a product we do not ship gets a freshly +`(filament_vendor, filament_type, filament name)` triple; a product we do not ship gets a freshly generated key and the row sits inert until some bundle claims that triple — `OFdyfQvU` / `GFG03`, "Bambu PETG Matte", is such a row today. @@ -303,18 +305,18 @@ prints. Two lines, both informational, neither blocking the write: ```text upstream ships 'Bambu PETG Matte' (Bambu Lab/PETG), we ship nothing with that identity -Orca BBL families with no row: 135 Orca-only product(s) +Orca BBL filaments with no row: 135 Orca-only product(s) ``` -The first names each upstream product our BBL bundle has no same-identity family for — +The first names each upstream product our BBL bundle has no same-identity filament for — sometimes a genuinely missing product, sometimes a name drift a follow-up rename would -converge. The second counts our own BBL families that matched no row: 135 of 234 today, of +converge. The second counts our own BBL filaments that matched no row: 135 of 234 today, of which 109 send an `OF` id on the wire and 26 already rode `OF` ids inherited from the OrcaFilamentLibrary. **135 is the number to expect at every regeneration** — 109 was the one-off size of the transition and stopped being computable from the tree once the BBL bundle was re-minted, so do not "fix" the report to print it. -**Check 8** lives in `check_filament_ids`, so profile CI runs it alongside the other seven. It +**Check 6** lives in `check_filament_ids`, so profile CI runs it alongside the other five. It holds the file to its contract: it parses, carries `source` / `bambustudio_commit` / `generated`, keys only `OF`-format ids, maps each Bambu id at most once, and — for every row whose key the tree actually claims — agrees with the tree on that id's `(vendor, type, name)` @@ -408,49 +410,41 @@ Profile CI (`check_profiles.yml`) runs `check_filament_ids()` tree-wide via tree must equal the snapshot exactly, in both directions. Any change to the id landscape therefore surfaces as a diff to that file, and **that snapshot diff is what maintainers review and gate in a PR**. Never edit the snapshot by hand — `--update-snapshot` regenerates it -deterministically (running it twice changes nothing). Besides the live `ids` and `triples` -maps, the snapshot carries grandfather lists (`instantiated_with_id`, `id_overrides`, -`alias_exceptions`, `triple_exceptions`) that freeze pre-existing structure debt while the -checks ratchet all new profiles to the clean rules. +deterministically (running it twice changes nothing). The snapshot holds one map, `ids`: each +entry is the product the id is minted from (`filament_vendor`, `filament_type`, `name`) and the +`filaments` claiming it (`Vendor/Filament`), and it sanctions *state*, never exceptions: no check +consults it to excuse a preset from a rule, and there is no grandfather list of any kind. The checks, in brief: - **Format** — every id occurring in the tree is `OF` + 6 base62 chars. No exceptions: not a - grandfathered snapshot entry, not BBL. -- **Snapshot equality** — tree claims == snapshot claims **and** tree triples == snapshot - triples, both directions: any `filament_vendor`/`filament_type`/family-name change surfaces - as a snapshot diff. -- **Mint conformance** — a non-grandfathered `OF*` id must equal the mint (or a low salt - iteration) of its declarer's product triple; the error prints the expected id to paste into - the family root. -- **Alias hygiene** — a vendor preset riding an OFL family id must keep the library preset's - base name (a rename re-exposes the library preset, since alias shadowing is name-based), - a non-empty `compatible_printers` (an empty one shadows nothing), and no own id key - (structure rule 4). -- **Triple integrity** — every declarer must resolve a non-empty `filament_vendor` and - `filament_type` (generics use `"Generic"`), and all declarers of one family within a - bundle must agree on the triple. + snapshot entry, not BBL. +- **Snapshot equality** — tree claims == snapshot claims **and** each id's declared triple == + its snapshot entry, both directions: any `filament_vendor`/`filament_type`/name change + surfaces as a snapshot diff. +- **Identity** — the id is a function of the triple alone. A declared `OF*` id must equal the + mint (or a low salt iteration) of its declarer's own triple; the id an instantiated preset + *inherits* must equal the mint of *its* own triple, however it inherits it (a root, a real + filament, a library preset — structure rule 1); and every instantiated system filament must + resolve an effective id at all (recall: an id-less one is a hard load error in C++ that + discards the whole vendor bundle). The errors print the expected id. - **Reserved namespaces** — `GF*`, `QD_*`, `P<7-hex>` or `"null"` claimed by any vendor, - BBL and Qidi included, unless that exact claim is grandfathered in the snapshot (none is - today). -- **Structure** — no `filament_id` key on newly instantiated presets; no new - declared-vs-inherited id drift; every instantiated system filament must resolve an - effective id through its `inherits` chain (recall: an id-less one is a hard load error in - C++ that discards the whole vendor bundle). + BBL and Qidi included. +- **Triple integrity** — every declarer must resolve a non-empty `filament_vendor` and + `filament_type` (generics use `"Generic"`), and all declarers of one filament within a + bundle must agree on the triple. - **Bambu catalog map** — `resources/printers/bambu_filament_ids.json` parses, carries its `source` / `bambustudio_commit` / `generated` header, keys only `OF`-format ids, maps each Bambu id at most once, and agrees with the tree on the triple of every row whose key the tree claims. See [The Bambu catalog map](#the-bambu-catalog-map); the remedy is always to regenerate, never to hand-edit. -Any new claim on a **reserved namespace** — a profile that declares a `GF*`, `QD_*` or -`P<7-hex>` id, whatever its vendor — is refused by `--update-snapshot` unless you pass -`--allow-shared-catalog`, and even then it lands in the snapshot diff for maintainer review. -There is no such claim in the tree today and adding one should be a last resort: for a -Bambu-cataloged product, the catalog map is where the correspondence belongs. Any other new -sharing via a *declared* id is caught by the mint-conformance check; sharing through -inheritance carries no declaration to check and surfaces only as a new claim in the snapshot -diff — which is exactly why that diff is the gate. +A profile that declares a **reserved-namespace** id — `GF*`, `QD_*` or `P<7-hex>`, whatever +its vendor — cannot pass the format check, so `--update-snapshot` refuses to sanction it +rather than hide the mistake until CI. For a Bambu-cataloged product, the catalog map is where +the correspondence belongs. Any other new sharing via a *declared* id is caught by the identity +check; sharing through inheritance carries no declaration to check and surfaces only as a new +claim in the snapshot diff — which is exactly why that diff is the gate. `orca_extra_profile_check.py` separately holds every declared id to the AMS 8-character limit, tree-wide and for every vendor alike, scoped to the presets a vendor's index actually @@ -463,24 +457,27 @@ ambiguity check behind structure rule 3. ## FAQ -- **A new color of an existing product?** Never a new id — colors are not families. -- **A second diameter (1.75 mm and 2.85 mm) of the same product?** A sibling family with its +- **A new color of an existing product?** Never a new id — colors are not filaments. +- **A second diameter (1.75 mm and 2.85 mm) of the same product?** A sibling filament with its own id: two diameters are separately selectable spool products. -- **A high-speed tune of an existing material for another printer model?** Same family: - inherit the family's root, write no id key. +- **A high-speed tune of an existing material for another printer model?** Same filament: + keep the base name and inherit its root; no id key needed. - **A tuned generic ("our profile for Generic PLA")?** Inherit `Generic PLA @System`, keep the - `Generic PLA` base name, set `compatible_printers`, write no id key. -- **I need to fix a family's `filament_vendor` or `filament_type`.** Fix the config, run + `Generic PLA` base name, set `compatible_printers`; no id key needed. +- **A branded filament that borrows a generic's settings?** Fine — inherit `Generic X @System` + (or any real filament) for the settings and declare the id of your own filament; run + `python scripts/assign_filament_ids.py` to mint it. Inheritance never changes the id. +- **I need to fix a filament's `filament_vendor` or `filament_type`.** Fix the config, run `--remint ` then `--update-snapshot`, and commit the profile and snapshot diffs together. The id re-derives from the corrected identity, and nothing forwards the old value, so a tray or record still holding it falls back to matching by filament type. -- **I need to rename a family.** Rename the presets (adding `renamed_from`, which keeps the +- **I need to rename a filament.** Rename the presets (adding `renamed_from`, which keeps the preset *name* resolving), then `--remint `, then `--update-snapshot`. The id follows - the new family name; as with any identity fix, the old id is not forwarded. + the new filament name; as with any identity fix, the old id is not forwarded. - **Can I reuse a `QD_*` id for a Qidi profile?** No — nobody can. It is the device protocol's own id space: the box composes those values at runtime and no preset carries one. Author Qidi filaments like any other vendor's. -- **CI says my family needs an id.** Run `python scripts/assign_filament_ids.py`, then +- **CI says my filament needs an id.** Run `python scripts/assign_filament_ids.py`, then `--update-snapshot`, and commit both diffs. Do not type an id by hand. For general profile authoring, see the profile development guide on the diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 723a907f52..9641788cf7 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -9510,7 +9510,7 @@ "sub_path": "filament/COEX/COEX NYLEX PA6-CF @BBL X1C.json" }, { - "name": "COEX NYLEX UNFILLED @BBL X1C", + "name": "COEX NYLEX UNFILLED @BBL X1C", "sub_path": "filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json" }, { diff --git a/resources/profiles/BBL/filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json b/resources/profiles/BBL/filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json index 507a7050fb..082948c7ec 100644 --- a/resources/profiles/BBL/filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json +++ b/resources/profiles/BBL/filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json @@ -1,6 +1,7 @@ { "type": "filament", - "name": "COEX NYLEX UNFILLED @BBL X1C", + "name": "COEX NYLEX UNFILLED @BBL X1C", + "renamed_from": "COEX NYLEX UNFILLED @BBL X1C", "inherits": "COEX NYLEX UNFILLED @base", "from": "system", "setting_id": "CXPAUB21_01", diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json index c5412c53bd..f85e19bb76 100644 --- a/resources/profiles/Elegoo.json +++ b/resources/profiles/Elegoo.json @@ -1241,8 +1241,8 @@ "sub_path": "filament/BASE/Generic ASA @base.json" }, { - "name": "Elegoo TPU @base", - "sub_path": "filament/BASE/Elegoo TPU @base.json" + "name": "Elegoo TPU 95A @base", + "sub_path": "filament/BASE/Elegoo TPU 95A @base.json" }, { "name": "Elegoo PETG @base", @@ -1261,8 +1261,8 @@ "sub_path": "filament/BASE/Elegoo ABS @base.json" }, { - "name": "Elegoo PAHT @base", - "sub_path": "filament/BASE/Elegoo PAHT @base.json" + "name": "Elegoo PAHT-CF @base", + "sub_path": "filament/BASE/Elegoo PAHT-CF @base.json" }, { "name": "Elegoo PC @base", diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT-CF @base.json similarity index 94% rename from resources/profiles/Elegoo/filament/BASE/Elegoo PAHT @base.json rename to resources/profiles/Elegoo/filament/BASE/Elegoo PAHT-CF @base.json index a05ee2347c..95bc595f90 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PAHT-CF @base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Elegoo PAHT @base", + "name": "Elegoo PAHT-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OF0h7ERL", + "filament_id": "OF20kXr5", "instantiation": "false", "filament_density": [ "1.25" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json index c1b9e78897..5f9561f5a9 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo PET-CF @base.json @@ -3,6 +3,9 @@ "name": "Elegoo PET-CF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFV5tNw6", - "instantiation": "false" + "filament_id": "OFe98A1y", + "instantiation": "false", + "filament_type": [ + "PET-CF" + ] } diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json index 58cec037c3..3ffd591fdc 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo Rapid TPU 95A @base.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo Rapid TPU 95A @base", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "filament_id": "OF30Ftju", "instantiation": "false" diff --git a/resources/profiles/Elegoo/filament/BASE/Elegoo TPU @base.json b/resources/profiles/Elegoo/filament/BASE/Elegoo TPU 95A @base.json similarity index 85% rename from resources/profiles/Elegoo/filament/BASE/Elegoo TPU @base.json rename to resources/profiles/Elegoo/filament/BASE/Elegoo TPU 95A @base.json index 08bd3d93af..70cdc0faa0 100644 --- a/resources/profiles/Elegoo/filament/BASE/Elegoo TPU @base.json +++ b/resources/profiles/Elegoo/filament/BASE/Elegoo TPU 95A @base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Elegoo TPU @base", + "name": "Elegoo TPU 95A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OFmhJs5V", + "filament_id": "OFqHQNoZ", "instantiation": "false", "filament_max_volumetric_speed": [ "3.6" diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo PAHT-CF @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo PAHT-CF @EC.json index d1e05a1372..0b01b2feb3 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo PAHT-CF @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo PAHT-CF @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PAHT-CF @EC", - "inherits": "Elegoo PAHT @base", + "inherits": "Elegoo PAHT-CF @base", "from": "system", "setting_id": "ZRd4WPQrh8nC8n7G", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC/Elegoo TPU 95A @EC.json b/resources/profiles/Elegoo/filament/EC/Elegoo TPU 95A @EC.json index 6e9944b30c..ef850ee0d8 100644 --- a/resources/profiles/Elegoo/filament/EC/Elegoo TPU 95A @EC.json +++ b/resources/profiles/Elegoo/filament/EC/Elegoo TPU 95A @EC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo TPU 95A @EC", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "hqmWADQDYWBuniTB", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo PAHT-CF @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo PAHT-CF @EC2.json index 10d7202698..e1da626c9a 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo PAHT-CF @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo PAHT-CF @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PAHT-CF @EC2", - "inherits": "Elegoo PAHT @base", + "inherits": "Elegoo PAHT-CF @base", "from": "system", "setting_id": "miv95d8rXD4CAgjC", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EC2/Elegoo TPU 95A @EC2.json b/resources/profiles/Elegoo/filament/EC2/Elegoo TPU 95A @EC2.json index 1389221bce..255eaf6a1a 100644 --- a/resources/profiles/Elegoo/filament/EC2/Elegoo TPU 95A @EC2.json +++ b/resources/profiles/Elegoo/filament/EC2/Elegoo TPU 95A @EC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo TPU 95A @EC2", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "6LUQGjzmx0y5A6Qn", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo PAHT-CF @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo PAHT-CF @ECC.json index bf0363b0d7..de12de0612 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo PAHT-CF @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo PAHT-CF @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PAHT-CF @ECC", - "inherits": "Elegoo PAHT @base", + "inherits": "Elegoo PAHT-CF @base", "from": "system", "setting_id": "iDRlRpUzPNVYv0lY", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC/Elegoo TPU 95A @ECC.json b/resources/profiles/Elegoo/filament/ECC/Elegoo TPU 95A @ECC.json index 870f4dc8ac..7f707f2371 100644 --- a/resources/profiles/Elegoo/filament/ECC/Elegoo TPU 95A @ECC.json +++ b/resources/profiles/Elegoo/filament/ECC/Elegoo TPU 95A @ECC.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo TPU 95A @ECC", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "cOI05FCm8wrkqtDD", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo PAHT-CF @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo PAHT-CF @ECC2.json index 5c41f76588..7d52aface9 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo PAHT-CF @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo PAHT-CF @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PAHT-CF @ECC2", - "inherits": "Elegoo PAHT @base", + "inherits": "Elegoo PAHT-CF @base", "from": "system", "setting_id": "hmTwVvyCAIZI7rSY", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/ECC2/Elegoo TPU 95A @ECC2.json b/resources/profiles/Elegoo/filament/ECC2/Elegoo TPU 95A @ECC2.json index 86eccaff03..215b9beec9 100644 --- a/resources/profiles/Elegoo/filament/ECC2/Elegoo TPU 95A @ECC2.json +++ b/resources/profiles/Elegoo/filament/ECC2/Elegoo TPU 95A @ECC2.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo TPU 95A @ECC2", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "v0Qj3xMBkUGnxZPi", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo TPU 95A @EN3 Series.json b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo TPU 95A @EN3 Series.json index 864845cb2f..8d4c0d5976 100644 --- a/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo TPU 95A @EN3 Series.json +++ b/resources/profiles/Elegoo/filament/EN3SERIES/Elegoo TPU 95A @EN3 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo TPU 95A @EN3 Series", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "4W6ZheJxNPUPxe1s", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo TPU 95A @EN4 Series.json b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo TPU 95A @EN4 Series.json index 392812ff9a..60f5b55a19 100644 --- a/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo TPU 95A @EN4 Series.json +++ b/resources/profiles/Elegoo/filament/EN4SERIES/Elegoo TPU 95A @EN4 Series.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo TPU 95A @EN4 Series", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "6pp381J3ahRYYtFE", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index 2f9e6a7f02..c7b203d5f1 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -525,8 +525,8 @@ "sub_path": "filament/DREMC/DREMC PA6-CF @base.json" }, { - "name": "Elegoo PAHT @base", - "sub_path": "filament/Elegoo/Elegoo PAHT @base.json" + "name": "Elegoo PAHT-CF @base", + "sub_path": "filament/Elegoo/Elegoo PAHT-CF @base.json" }, { "name": "FILL3D PA @base", @@ -1169,8 +1169,8 @@ "sub_path": "filament/DREMC/DREMC TPU 95A @base.json" }, { - "name": "Elegoo TPU @base", - "sub_path": "filament/Elegoo/Elegoo TPU @base.json" + "name": "Elegoo TPU 95A @base", + "sub_path": "filament/Elegoo/Elegoo TPU 95A @base.json" }, { "name": "Eolas Prints TPU D60 UV Resistant @System", 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 7d22d28387..d07ac1dd64 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo PAHT-CF @System", - "inherits": "Elegoo PAHT @base", + "inherits": "Elegoo PAHT-CF @base", "from": "system", "setting_id": "S073oXCeOlTEqh6L", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @base.json similarity index 95% rename from resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @base.json index d85796e7b1..7c3abd1cdd 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Elegoo PAHT @base", + "name": "Elegoo PAHT-CF @base", "inherits": "fdm_filament_pa", "from": "system", - "filament_id": "OF0h7ERL", + "filament_id": "OF20kXr5", "instantiation": "false", "activate_air_filtration": [ "1" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json index c1b9e78897..5f9561f5a9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @base.json @@ -3,6 +3,9 @@ "name": "Elegoo PET-CF @base", "inherits": "Elegoo PETG @base", "from": "system", - "filament_id": "OFV5tNw6", - "instantiation": "false" + "filament_id": "OFe98A1y", + "instantiation": "false", + "filament_type": [ + "PET-CF" + ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json index 58cec037c3..3ffd591fdc 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @base.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo Rapid TPU 95A @base", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "filament_id": "OF30Ftju", "instantiation": "false" 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 fb4260fae0..020bb85945 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @System.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @System.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Elegoo TPU 95A @System", - "inherits": "Elegoo TPU @base", + "inherits": "Elegoo TPU 95A @base", "from": "system", "setting_id": "SLcn59fIZPDl2brJ", "instantiation": "true", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @base.json similarity index 89% rename from resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @base.json index e2fe95548a..4380ee77ce 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @base.json @@ -1,9 +1,9 @@ { "type": "filament", - "name": "Elegoo TPU @base", + "name": "Elegoo TPU 95A @base", "inherits": "fdm_filament_tpu", "from": "system", - "filament_id": "OFmhJs5V", + "filament_id": "OFqHQNoZ", "instantiation": "false", "filament_density": [ "1.21" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json index db331b0daa..19dc66df4e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Breakaway Support @base", "from": "system", "setting_id": "mJoaud6wulT4p8SA", + "filament_id": "OFnmp2pO", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json index 248c57f6d0..6f800f7b98 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Breakaway Support @base", "from": "system", "setting_id": "rKUUREJNhstIU0I2", + "filament_id": "OFnmp2pO", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.6 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json index 47cf80d076..c7a2b01351 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Breakaway Support @base", "from": "system", "setting_id": "hQ8jQ5GKQKGKuPew", + "filament_id": "OFnmp2pO", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.8 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json index 9e5d63a63c..eff74ae5ab 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json @@ -4,6 +4,7 @@ "inherits": "Snapmaker Breakaway Support @base", "from": "system", "setting_id": "5DqT3CYUgp1oJD1V", + "filament_id": "OFnmp2pO", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/scripts/assign_filament_ids.py b/scripts/assign_filament_ids.py index d410242277..e10dbe138e 100755 --- a/scripts/assign_filament_ids.py +++ b/scripts/assign_filament_ids.py @@ -4,24 +4,25 @@ Mint deterministic filament_id values for OrcaSlicer system filament products an validate the tree against the sanctioned-state snapshot. Policy (companion to assign_vendor_setting_ids.py; see docs/HLSD/filament_id.md): - * filament_id is a PRODUCT id: one commercial product line = one id, shared by - all of that material's per-printer/per-nozzle variants in every bundle. - OrcaFilamentLibrary (OFL) is the product catalog: a family's id is declared - once, on its family root (instantiation != "true"); vendor bundles carry - only specializations of OFL families — same base name, non-empty - compatible_printers, no filament_id key — which resolve the OFL id through - the loader's inherits/base-bundle walk. Products OFL does not carry mint - their id in the vendor bundle with the same rule; the key is - bundle-independent, so hoisting a family into OFL never changes its id. - * New ids are content-addressed by the product triple, resolved from the - declaring preset's flattened config (filament_vendor and filament_type are - inheritable list options — first element; family name = preset base name): + * filament_id is a PRODUCT id: one named spool product = one id, shared by all + of that product's per-printer/per-nozzle variants in every bundle. The + granularity is the name on the spool, not the brand: "AAA PLA Lite" and + "AAA PLA Pro" are two products with two ids, not variants of one. The + id is a pure function of the product triple (below), so WHERE a preset gets + it from is irrelevant: it may declare the key itself or inherit it from any + ancestor — a root preset, a real (instantiated) filament, an + OrcaFilamentLibrary (OFL) preset — as long as the id it ends up with is the + mint of its OWN triple. Inheritance carries settings, never identity; the + key is bundle-independent, so moving a filament into OFL never changes it. + * Ids are content-addressed by the product triple, resolved from the preset's + flattened config (filament_vendor and filament_type are inheritable list + options — first element; filament name = preset base name): filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, - "filament_product///") ) + "filament_product///") ) 8 chars total, which satisfies the AMS length limit. Nobody invents ids by hand; on the astronomically rare collision with an existing id the input is salted ("/1", "/2", ...) until free and the result is frozen in file. - Identity changes (a family rename, a filament_vendor/filament_type fix) + Identity changes (a filament rename, a filament_vendor/filament_type fix) change the id BY DESIGN. * Reserved id spaces that are never minted into or altered: - GF* Bambu AMS/RFID catalog: frozen, no preset of any @@ -33,11 +34,12 @@ Policy (companion to assign_vendor_setting_ids.py; see docs/HLSD/filament_id.md) preset may declare one - P + 7 hex chars (case-insensitive) and the literal "null" user-custom presets (CreatePresetsDialog.cpp) - - every already-shipped id, grandfathered via scripts/filament_id_snapshot.json - * scripts/filament_id_snapshot.json is the sanctioned-state snapshot (ids, - claims and declared triples): it must exactly equal the tree-derived state - at all times, so any id/claim/triple change shows up as a reviewable diff to - that file (the maintainer gate). + * scripts/filament_id_snapshot.json is the sanctioned-state snapshot: one + entry per id, carrying the product triple it is minted from and the + "Vendor/Filament" presets claiming it. It must exactly equal the tree-derived + state at all times, so any id/claim/triple change shows up as a reviewable + diff to that file (the maintainer gate). It sanctions state, never + exceptions: no check consults it to excuse a preset from the rules above. The effective-id resolution below is loader-faithful (PresetBundle.cpp load_vendor_configs_from_json): own filament_id key, else walk `inherits` within @@ -46,10 +48,10 @@ OFL it stays in OFL; a vendor chain that dead-ends id-less retries its direct parent in the OFL map. filament_vendor / filament_type resolve the same way. Run from anywhere: python3 scripts/assign_filament_ids.py - (default) mint + insert ids for id-less families, mint + replace + (default) mint + insert ids for id-less filaments, mint + replace non-OF-format declarations; idempotent, never rewrites a - valid OF-format id; a no-op once every family has one - --mint "Vendor/Type/Family" + valid OF-format id; a no-op once every filament has one + --mint "Vendor/Type/Filament" print the id that triple would mint; touches nothing --update-snapshot regenerate the snapshot from the tree --remint VENDOR re-derive VENDOR's declared ids from their triples and @@ -90,10 +92,10 @@ OF_ID_RE = re.compile(r"^OF[0-9A-Za-z]{6}$") # User-custom id space minted by CreatePresetsDialog.cpp ("P" + md5(name)[0:7]); # reserved case-insensitively, together with its "null" sentinel. USER_CUSTOM_ID_RE = re.compile(r"^P[0-9A-Fa-f]{7}$", re.IGNORECASE) -# Family name = preset base name: strip the first "@..." suffix. The space before +# Filament name = preset base name: strip the first "@..." suffix. The space before # "@" is optional because names like "Afinia PLA@HS" exist. BASE_NAME_RE = re.compile(r"\s?@.*$") -# Salt iterations accepted by the mint-conformance check (check 3). +# Salt iterations accepted by the identity check (check 3). MAX_CHECK_SALT = 8 UPDATE_HINT = 'run "python scripts/assign_filament_ids.py --update-snapshot" and commit the diff for maintainer review' @@ -130,19 +132,19 @@ def _utf8_console(): # --------------------------------------------------------------------------- def base_name(name): - """Family name of a preset: name with the first "@..." suffix stripped.""" + """Filament name of a preset: name with the first "@..." suffix stripped.""" return BASE_NAME_RE.sub("", name, count=1) -def generate_filament_id(filament_vendor, filament_type, family, salt=0): +def generate_filament_id(filament_vendor, filament_type, filament_name, salt=0): """Deterministic "OF" + 6-char base62 filament_id for a filament product. - input = "filament_product///" + input = "filament_product///" (+ "/" when salted); u = uuid5(FILAMENT_ID_NAMESPACE, input); the id tail is the low FILAMENT_ID_LENGTH base62 digits of int(u.bytes, "big"), most-significant first — the same derivation as generate_preset_setting_id. """ - key = f"filament_product/{filament_vendor}/{filament_type}/{family}" + key = f"filament_product/{filament_vendor}/{filament_type}/{filament_name}" if salt: key = f"{key}/{salt}" u = uuid.uuid5(FILAMENT_ID_NAMESPACE, key) @@ -154,14 +156,19 @@ def generate_filament_id(filament_vendor, filament_type, family, salt=0): return "OF" + "".join(reversed(digits)) -def mint_filament_id(filament_vendor, filament_type, family, taken): +def mint_filament_id(filament_vendor, filament_type, filament_name, taken): """Mint the product's id, salting past any id in `taken`.""" for salt in range(10000): - candidate = generate_filament_id(filament_vendor, filament_type, family, salt) + candidate = generate_filament_id(filament_vendor, filament_type, filament_name, salt) if candidate not in taken: return candidate raise RuntimeError( - f"could not mint a free filament_id for {filament_vendor}/{filament_type}/{family}") + f"could not mint a free filament_id for {filament_vendor}/{filament_type}/{filament_name}") + + +def mint_iterations(triple): + """The ids that count as the mint of `triple`: salt 0..MAX_CHECK_SALT.""" + return {generate_filament_id(*triple, salt=s) for s in range(MAX_CHECK_SALT + 1)} # --------------------------------------------------------------------------- @@ -234,7 +241,8 @@ def resolve_filament_id(name, filaments, ofl_filaments, seen=None, in_ofl=False, vendor is re-tried against the OFL map keyed by its direct parent name. skip_own ignores the first preset's own filament_id key (used to compute the - id its inherits chain would resolve WITHOUT the declaration — check 6b drift). + id its inherits chain would resolve WITHOUT the declaration — the + --drop-redundant-ids redundancy test). Returns (filament_id or None, source, ofl_entry) where source is one of "own"/"inherited"/"missing"/"dangling"/"cycle" and ofl_entry is the name of @@ -307,7 +315,7 @@ def resolve_filament_field(name, field, filaments, ofl_filaments, seen=None, in_ def resolve_triple(name, filaments, ofl_filaments): - """The preset's mint-key triple (filament_vendor, filament_type, family).""" + """The preset's mint-key triple (filament_vendor, filament_type, filament name).""" return (resolve_filament_field(name, "filament_vendor", filaments, ofl_filaments), resolve_filament_field(name, "filament_type", filaments, ofl_filaments), base_name(name)) @@ -317,7 +325,7 @@ def analyze_tree(profiles_dir): """Load every vendor bundle and derive the full filament_id state. Returns a dict with the tree-derived snapshot sections plus the working data - the checks and the assign pass need. All claims are "Vendor/Family" strings + the checks and the assign pass need. All claims are "Vendor/Filament" strings over INSTANTIATED system filaments, tree-wide including OFL and BBL. """ profiles_dir = str(profiles_dir) @@ -325,7 +333,6 @@ def analyze_tree(profiles_dir): ofl_filaments, ofl_errors = ( load_vendor_filaments(profiles_dir, OFL) if OFL in vendor_names else ({}, []) ) - ofl_declared = {r["filament_id"] for r in ofl_filaments.values() if r.get("filament_id")} vendors = {} read_errors = list(ofl_errors) @@ -336,51 +343,39 @@ def analyze_tree(profiles_dir): filaments, errs = load_vendor_filaments(profiles_dir, vendor) read_errors.extend(errs) for rec in filaments.values(): - eff, src, ofl_entry = resolve_filament_id(rec["name"], filaments, ofl_filaments) + eff, src, _entry = resolve_filament_id(rec["name"], filaments, ofl_filaments) rec["eff_filament_id"] = eff rec["id_source"] = src - rec["ofl_entry"] = ofl_entry vendors[vendor] = filaments - # id -> set of "Vendor/Family" claims over instantiated presets. Every id + # id -> set of "Vendor/Filament" claims over instantiated presets. Every id # occurring in the tree is a key; ids only ever DECLARED (e.g. on a root - # whose children all override them) keep an empty claim list, so that the - # snapshot exactly equals the tree-derived state and the format/retirement - # checks can grandfather them. + # none of whose descendants instantiate) keep an empty claim list, so that + # the snapshot exactly equals the tree-derived state. ids = {} vendor_ids = {} # vendor -> set of ids occurring there (declared or effective) declared_ids = {} # vendor -> set of ids DECLARED in that vendor's own files - instantiated_with_id = [] # "Vendor/PresetName" (own filament_id key on an instantiated preset) - overrides = [] # (vendor, name, declared, inherited, file) missing_effective = [] # (vendor, name, file) instantiated presets resolving no id - alias_candidates = [] # (vendor, rec, ofl_entry, own_key) presets riding an OFL family + inherited = [] # (vendor, rec, eff, triple) instantiated presets inheriting an OF id triples = {} # fid -> set of triples of its declarers declarer_triples = [] # (vendor, rec, fid, triple) per declarer - family_triples = {} # (vendor, family) -> {triple: [declarer names]} + filament_triples = {} # (vendor, filament_name) -> {triple: [declarers]} for vendor, filaments in vendors.items(): occurring = vendor_ids.setdefault(vendor, set()) for rec in filaments.values(): + triple = resolve_triple(rec["name"], filaments, ofl_filaments) + rec["triple"] = triple if rec.get("filament_id"): fid = rec["filament_id"] occurring.add(fid) declared_ids.setdefault(vendor, set()).add(fid) ids.setdefault(fid, set()) - triple = resolve_triple(rec["name"], filaments, ofl_filaments) - rec["triple"] = triple declarer_triples.append((vendor, rec, fid, triple)) triples.setdefault(fid, set()).add(triple) - family_triples.setdefault( + filament_triples.setdefault( (vendor, base_name(rec["name"])), {}).setdefault( triple, []).append(rec["name"]) - if rec.get("inherits"): - inherited, _src, skip_entry = resolve_filament_id( - rec["name"], filaments, ofl_filaments, skip_own=True) - if inherited and inherited != fid: - overrides.append((vendor, rec["name"], fid, inherited, rec["file"])) - if (vendor != OFL and skip_entry and inherited - and inherited in ofl_declared): - alias_candidates.append((vendor, rec, skip_entry, True)) if not rec["instantiation"]: continue eff = rec.get("eff_filament_id") @@ -389,47 +384,28 @@ def analyze_tree(profiles_dir): continue occurring.add(eff) ids.setdefault(eff, set()).add(f"{vendor}/{base_name(rec['name'])}") - if rec.get("filament_id"): - instantiated_with_id.append(f"{vendor}/{rec['name']}") - if vendor != OFL and rec["ofl_entry"] and eff in ofl_declared: - alias_candidates.append((vendor, rec, rec["ofl_entry"], False)) + if not rec.get("filament_id") and OF_ID_RE.match(eff): + inherited.append((vendor, rec, eff, triple)) - # Alias hygiene (check 4): a vendor preset that rides an OFL family (its id - # resolves through OFL) is matched to the OFL preset by ALIAS (base name); - # renaming it re-exposes the OFL preset and creates a live duplicate, empty - # compatible_printers cannot claim any printer, and declaring its own - # filament_id key forks the family off the catalog id. - alias_violations = [] # (vendor, name, ofl_entry, reason, file) - for vendor, rec, entry, own_key in alias_candidates: - expected = base_name(entry) - own_base = base_name(rec["name"]) - if own_key: - alias_violations.append(( - vendor, rec["name"], entry, - f'declares its own filament_id "{rec["filament_id"]}" — dropping the key ' - f"lets it resolve the OFL family's id through inherits", - rec["file"])) - elif own_base != expected: - alias_violations.append(( - vendor, rec["name"], entry, - f'base name "{own_base}" != "{expected}" — the rename re-exposes the ' - f"OFL preset on its printers (alias shadowing is name-based)", - rec["file"])) - elif not rec["compatible_printers"]: - alias_violations.append(( - vendor, rec["name"], entry, - "empty compatible_printers cannot shadow the OFL preset anywhere", - rec["file"])) + # Identity (check 3b): an inherited id must be the mint of the preset's + # OWN triple. A declared id is held to the same rule as a declarer (3a), + # and an id whose declarer already fails 3a is reported there once, not + # again under every preset inheriting it. + unminted = {fid for _v, _r, fid, triple in declarer_triples + if OF_ID_RE.match(fid) and fid not in mint_iterations(triple)} + id_mismatches = [ + (vendor, rec, eff, triple) for vendor, rec, eff, triple in inherited + if eff not in unminted and eff not in mint_iterations(triple)] - # Cross-bundle triple divergence (check 7, warning only): the same family + # Cross-bundle triple divergence (check 5, warning only): the same filament # name declared in several bundles with different triples cannot converge # on one id until the divergence is fixed. name_bundles = {} - for (vendor, family), tmap in family_triples.items(): - name_bundles.setdefault(family, {})[vendor] = frozenset(tmap) + for (vendor, filament_name), tmap in filament_triples.items(): + name_bundles.setdefault(filament_name, {})[vendor] = frozenset(tmap) cross_bundle_triples = [ - (family, {v: sorted(ts) for v, ts in per_vendor.items()}) - for family, per_vendor in sorted(name_bundles.items()) + (filament_name, {v: sorted(ts) for v, ts in per_vendor.items()}) + for filament_name, per_vendor in sorted(name_bundles.items()) if len(per_vendor) > 1 and len(set(per_vendor.values())) > 1 ] @@ -439,18 +415,12 @@ def analyze_tree(profiles_dir): "ids": {fid: sorted(claims) for fid, claims in ids.items()}, "vendor_ids": vendor_ids, "declared_ids": declared_ids, - "instantiated_with_id": sorted(instantiated_with_id), - "overrides": overrides, - "id_overrides": sorted(f"{v}/{n}" for v, n, _d, _i, _f in overrides), "missing_effective": sorted(missing_effective), - "alias_violations": alias_violations, - "alias_exceptions": sorted(f"{v}/{n}" for v, n, _e, _r, _f in alias_violations), + "id_mismatches": id_mismatches, "triples": {fid: sorted(list(t) for t in ts) for fid, ts in triples.items()}, "triple_sets": triples, "declarer_triples": declarer_triples, - "family_triples": family_triples, - "triple_exceptions": sorted( - f"{v}/{f}" for (v, f), tmap in family_triples.items() if len(tmap) > 1), + "filament_triples": filament_triples, "cross_bundle_triples": cross_bundle_triples, } @@ -460,14 +430,19 @@ def analyze_tree(profiles_dir): # --------------------------------------------------------------------------- def snapshot_from_analysis(analysis): - return { - "ids": {fid: sorted(claims) for fid, claims in analysis["ids"].items()}, - "instantiated_with_id": analysis["instantiated_with_id"], - "id_overrides": analysis["id_overrides"], - "alias_exceptions": analysis["alias_exceptions"], - "triples": analysis["triples"], - "triple_exceptions": analysis["triple_exceptions"], - } + """One entry per id, in id order: the product triple it is minted from and + the "Vendor/Filament" claims on it. Requires exactly one declared triple per + id (update_snapshot refuses any other state; check 3 rejects it anyway).""" + ids = {} + for fid, claims in sorted(analysis["ids"].items()): + [(vendor, ftype, filament_name)] = analysis["triples"][fid] + ids[fid] = {"filaments": sorted(claims), "name": filament_name, + "filament_type": ftype, "filament_vendor": vendor} + return {"ids": ids} + + +def snapshot_triple(entry): + return [entry["filament_vendor"], entry["filament_type"], entry["name"]] def load_snapshot(path): @@ -475,18 +450,15 @@ def load_snapshot(path): if not os.path.exists(path): return None data = load_json(path) - for key in ("ids", "triples"): - data.setdefault(key, {}) - for key in ("instantiated_with_id", "id_overrides", "alias_exceptions", - "triple_exceptions"): - data.setdefault(key, []) + data.setdefault("ids", {}) return data def write_snapshot(path, obj): - """Deterministic serialization: sorted keys, indent 1, LF, trailing newline.""" + """Deterministic serialization: snapshot_from_analysis order, indent 1, LF, + trailing newline.""" with open(path, "w", encoding="utf-8", newline="\n") as f: - json.dump(obj, f, indent=1, ensure_ascii=False, sort_keys=True) + json.dump(obj, f, indent=1, ensure_ascii=False) f.write("\n") @@ -526,29 +498,27 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, 1. Format: every id occurring in the tree (declared or effective) must match ^OF[0-9A-Za-z]{6}$. No exceptions: not the snapshot, not BBL. - 2. Snapshot equality, both directions: the tree-derived id->families multimap - AND the id->triples map of the declarers must equal the snapshot exactly - (the snapshot diff is the maintainer gate). - 3. Mint conformance: an OF-format declaration must equal the mint of the - declarer's triple or a salted iteration, unless that exact (id, triple) - pair is grandfathered in the snapshot. - 4. Alias hygiene: a vendor preset riding an OFL family must keep the OFL - base name, claim printers via non-empty compatible_printers, and declare - no filament_id key of its own. - 5. Reserved namespaces (GF*/QD_*/P-hex/"null", all ownerless) must not be - claimed by any vendor, except claims grandfathered in the snapshot. - 6. Structure ratchet: (a) no NEW instantiated preset carries its own - filament_id key; (b) no NEW declared-vs-inherited id drift; (c) every - instantiated filament resolves an effective id (a hard load error in C++). - 7. Triple integrity: (a) every declarer resolves non-empty filament_vendor - and filament_type (hard error, no grandfathering); (b) declarers of one - (bundle, family) resolve identical triples, unless grandfathered in - snapshot triple_exceptions; cross-bundle divergence on the same family - name is a warning only. - 8. Bambu catalog map: resources/printers/bambu_filament_ids.json must parse, + 2. Snapshot equality, both directions: every id in the tree, the filaments + claiming it and the triple its declarers resolve must equal the snapshot + entry exactly (the snapshot diff is the maintainer gate). + 3. Identity: the id is a function of the triple alone. (a) A declared id + must equal the mint of the declarer's own triple or a salted iteration; + (b) the id an instantiated preset inherits must equal the mint of ITS + own triple — how it inherits it (a root, a real filament, an OFL + preset) is irrelevant; (c) every instantiated filament resolves an + effective id at all (an id-less one is a hard load error in C++). + 4. Reserved namespaces (GF*/QD_*/P-hex/"null", all ownerless) must not be + claimed by any vendor. + 5. Triple integrity: (a) every declarer resolves non-empty filament_vendor + and filament_type; (b) declarers of one (bundle, filament) resolve + identical triples; cross-bundle divergence on the same filament name is a + warning only. + 6. Bambu catalog map: resources/printers/bambu_filament_ids.json must parse, carry source/bambustudio_commit/generated, key only OF-format ids, map each Bambu id at most once, and for every row whose key the tree claims, the tree's triple for that id must equal the row's (vendor, type, name). + + Nothing is grandfathered: the snapshot sanctions state, never exceptions. """ _utf8_console() errors = 0 @@ -571,24 +541,36 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, continue print_error( f'filament_id "{fid}" ({vendor}) is not a minted "OF" id; new ' - f'family ids must come from "python scripts/assign_filament_ids.py" ' + f'filament ids must come from "python scripts/assign_filament_ids.py" ' f'(see --mint)') errors += 1 # -- 2. snapshot equality (both directions) ----------------------------- + tree_triples = analysis["triples"] for fid in sorted(tree_ids): - if fid not in snap_ids: + entry = snap_ids.get(fid) + if entry is None: print_error( f'filament_id "{fid}" is not sanctioned by ' f"scripts/filament_id_snapshot.json; {UPDATE_HINT}") errors += 1 continue for claim in tree_ids[fid]: - if claim not in snap_ids[fid]: + if claim not in entry["filaments"]: print_error( f'filament_id "{fid}" claim "{claim}" is not sanctioned by ' f"scripts/filament_id_snapshot.json; {UPDATE_HINT}") errors += 1 + # Every tree id has at least one declarer; the snapshot records one + # triple per id, so a divergent declarer is a mismatch in both directions. + sanctioned = snapshot_triple(entry) + for t in tree_triples[fid]: + if t != sanctioned: + print_error( + f'filament_id "{fid}" triple "{"/".join(t)}" is not sanctioned by ' + f'scripts/filament_id_snapshot.json, which records ' + f'"{"/".join(sanctioned)}"; {UPDATE_HINT}') + errors += 1 for fid in sorted(snap_ids): if fid not in tree_ids: print_error( @@ -596,91 +578,31 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"{UPDATE_HINT}") errors += 1 continue - for claim in snap_ids[fid]: + for claim in snap_ids[fid]["filaments"]: if claim not in tree_ids[fid]: print_error( f'filament_id stability: snapshot claim "{claim}" of id "{fid}" ' f"vanished from the tree; {UPDATE_HINT}") errors += 1 - # ... and the declared triples, both directions. - snap_triples = snapshot["triples"] - tree_triples = analysis["triples"] - for fid in sorted(tree_triples): - for t in tree_triples[fid]: - if t not in snap_triples.get(fid, []): - print_error( - f'filament_id "{fid}" triple "{"/".join(t)}" is not sanctioned by ' - f"scripts/filament_id_snapshot.json; {UPDATE_HINT}") - errors += 1 - for fid in sorted(snap_triples): - for t in snap_triples[fid]: - if t not in tree_triples.get(fid, []): - print_error( - f'filament_id triple stability: snapshot triple "{"/".join(t)}" of ' - f'id "{fid}" vanished from the tree; {UPDATE_HINT}') - errors += 1 - # -- 3. mint conformance for OF-format declarations ---------------------- + # -- 3. identity: the id is a function of the triple alone --------------- for vendor, rec, fid, triple in sorted( analysis["declarer_triples"], key=lambda x: (x[0], x[1]["file"])): - if not OF_ID_RE.match(fid): - continue - if list(triple) in snap_triples.get(fid, []): - continue # grandfathered (id, triple) pair - minted = [generate_filament_id(*triple, salt=s) for s in range(MAX_CHECK_SALT + 1)] - if fid not in minted: - print_error( - f'filament_id "{fid}" declared by "{rec["name"]}" ({rec["file"]}) does ' - f'not match the mint of its triple "{"/".join(triple)}": expected ' - f'"{minted[0]}" (or a salted iteration); paste the expected id into the ' - f"family root (or, for an intentionally kept id, {UPDATE_HINT})") - errors += 1 - - # -- 4. alias hygiene for presets riding OFL families -------------------- - exceptions = set(snapshot["alias_exceptions"]) - for vendor, name, entry, reason, file in analysis["alias_violations"]: - if f"{vendor}/{name}" in exceptions: + if not OF_ID_RE.match(fid) or fid in mint_iterations(triple): continue print_error( - f'preset "{name}" ({file}) rides the OFL family "{entry}" but {reason}; ' - f"a vendor specialization keeps the OFL base name, sets non-empty " - f"compatible_printers and declares no filament_id key — or the family " - f"gets its own minted id") + f'filament_id "{fid}" declared by "{rec["name"]}" ({rec["file"]}) does ' + f'not match the mint of its triple "{"/".join(triple)}": expected ' + f'"{generate_filament_id(*triple)}" (or a salted iteration); paste the ' + f"expected id, or fix the triple and --remint the vendor") errors += 1 - - # -- 5. reserved namespaces ---------------------------------------------- - for fid in sorted(tree_ids): - is_reserved, owner = reserved_space_owner(fid) - if not is_reserved: - continue - for claim in tree_ids[fid]: - vendor = claim.split("/", 1)[0] - if vendor == owner: - continue - if claim in snap_ids.get(fid, []): - continue # grandfathered - space = reserved_space_desc(fid, owner) - print_error( - f'filament_id "{fid}" of "{claim}" is in a reserved id space ' - f"({space}) and must not be claimed by system presets of other vendors") - errors += 1 - - # -- 6. structure ratchet ------------------------------------------------- - grandfathered = set(snapshot["instantiated_with_id"]) - for key in analysis["instantiated_with_id"]: - if key not in grandfathered: - print_error( - f'instantiated preset "{key}" declares its own filament_id key; the key ' - f"belongs on the family root preset only (variants inherit it)") - errors += 1 - grandfathered = set(snapshot["id_overrides"]) - for vendor, name, declared, inherited, file in analysis["overrides"]: - if f"{vendor}/{name}" in grandfathered: - continue + for vendor, rec, eff, triple in sorted( + analysis["id_mismatches"], key=lambda x: (x[0], x[1]["file"])): print_error( - f'preset "{name}" ({file}) declares filament_id "{declared}" but its ' - f'inherits chain resolves "{inherited}"; a preset must not override its ' - f"family's id") + f'preset "{rec["name"]}" ({rec["file"]}) inherits filament_id "{eff}" but ' + f'its own triple "{"/".join(triple)}" mints "{generate_filament_id(*triple)}"; ' + f"a preset carries the id of its own product: inherit a preset of the " + f"same filament, or declare its own key") errors += 1 ofl_map = analysis["vendors"].get(OFL, {}) for vendor, name, file in analysis["missing_effective"]: @@ -689,11 +611,26 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, print_error( f'instantiated filament "{name}" ({file}) resolves no filament_id anywhere ' f"in its inherits chain — this is a hard load error in the C++ loader; " - f'run "python scripts/assign_filament_ids.py" (expected id for family ' + f'run "python scripts/assign_filament_ids.py" (expected id for filament ' f'"{vendor}/{base_name(name)}": "{expected}", salted if taken)') errors += 1 - # -- 7. triple integrity --------------------------------------------------- + # -- 4. reserved namespaces ---------------------------------------------- + for fid in sorted(tree_ids): + is_reserved, owner = reserved_space_owner(fid) + if not is_reserved: + continue + for claim in tree_ids[fid]: + vendor = claim.split("/", 1)[0] + if vendor == owner: + continue + space = reserved_space_desc(fid, owner) + print_error( + f'filament_id "{fid}" of "{claim}" is in a reserved id space ' + f"({space}) and must not be claimed by system presets of other vendors") + errors += 1 + + # -- 5. triple integrity --------------------------------------------------- for vendor, rec, fid, triple in sorted( analysis["declarer_triples"], key=lambda x: (x[0], x[1]["file"])): if triple[0] and triple[1]: @@ -706,27 +643,27 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f"resolves empty {missing}; the mint key needs both (generic materials " f'use filament_vendor "Generic")') errors += 1 - triple_exceptions = set(snapshot["triple_exceptions"]) - for (vendor, family), tmap in sorted(analysis["family_triples"].items()): - if len(tmap) < 2 or f"{vendor}/{family}" in triple_exceptions: + for (vendor, filament_name), tmap in sorted(analysis["filament_triples"].items()): + if len(tmap) < 2: continue detail = "; ".join( f'"{"/".join(t)}" ({", ".join(sorted(names))})' for t, names in sorted(tmap.items())) print_error( - f'family "{vendor}/{family}" declarers resolve divergent triples: {detail}; ' - f"declarers of one family must agree on (filament_vendor, filament_type)") + f'filament "{vendor}/{filament_name}" declarers resolve divergent triples: ' + f"{detail}; declarers of one filament must agree on " + f"(filament_vendor, filament_type)") errors += 1 - for family, per_vendor in analysis["cross_bundle_triples"]: + for filament_name, per_vendor in analysis["cross_bundle_triples"]: detail = "; ".join( f'{v}: {", ".join("/".join(t) for t in ts)}' for v, ts in sorted(per_vendor.items())) print_warning( - f'family name "{family}" resolves different triples across bundles ' + f'filament name "{filament_name}" resolves different triples across bundles ' f"({detail}); bundles of one product converge on one id only once " f"their triples agree") - # -- 8. Bambu catalog map -------------------------------------------------- + # -- 6. Bambu catalog map -------------------------------------------------- try: bambu_map = load_json(map_path) if not isinstance(bambu_map, dict): @@ -785,61 +722,52 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, # --update-snapshot # --------------------------------------------------------------------------- -def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, - allow_shared_catalog=False): +def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): """Regenerate the snapshot from the tree. - Refuses to sanction NEW reserved-namespace ids (or new claims on them) for - non-owner vendors unless --allow-shared-catalog is passed. Idempotent: a - second run over an unchanged tree changes nothing. Returns 0 on success. + Refuses to sanction a reserved-namespace id (or a claim on one) and an id + declared under more than one triple: neither can ever pass --check, so + writing it into the snapshot would only hide the mistake until CI. + Idempotent: a second run over an unchanged tree changes nothing. Returns 0 + on success. """ analysis = analyze_tree(profiles_dir) for msg in analysis["read_errors"]: print_error(msg) + + refusals = 0 + for vendor in sorted(analysis["vendor_ids"]): + for fid in sorted(analysis["vendor_ids"][vendor]): + is_reserved, owner = reserved_space_owner(fid) + if is_reserved and vendor != owner: + print_error( + f'refusing to sanction filament_id "{fid}" ({vendor}): reserved id ' + f"space, {reserved_space_desc(fid, owner)}") + refusals += 1 + for fid, ts in sorted(analysis["triples"].items()): + if len(ts) > 1: + print_error( + f'refusing to sanction filament_id "{fid}": declared under {len(ts)} ' + f'triples ({"; ".join("/".join(t) for t in ts)}); one id names one ' + f"product (check 3)") + refusals += 1 + if refusals: + return 1 + new_snap = snapshot_from_analysis(analysis) old_snap = load_snapshot(snapshot_path) old_ids = old_snap["ids"] if old_snap else {} - # Gate: new reserved-namespace ids / claims for non-owner vendors. - refusals = [] - for fid, claims in sorted(new_snap["ids"].items()): - is_reserved, owner = reserved_space_owner(fid) - if not is_reserved: - continue - for claim in claims: - if claim in old_ids.get(fid, []): - continue - vendor = claim.split("/", 1)[0] - if vendor == owner: - continue - refusals.append((fid, claim, owner)) - if not claims and fid not in old_ids: - # Declared-only new id: attribute it to its declaring vendor(s). - for vendor in sorted(analysis["vendor_ids"]): - if fid in analysis["vendor_ids"][vendor] and vendor != owner: - refusals.append((fid, f"{vendor}/(declared only)", owner)) - if refusals and not allow_shared_catalog: - for fid, claim, owner in refusals: - space = reserved_space_desc(fid, owner) - print_error( - f'refusing to sanction new claim "{claim}" on reserved-namespace id ' - f'"{fid}" ({space}); pass --allow-shared-catalog only for ' - f"maintainer-approved shared-catalog families") - return 1 - # Diff summary. added_ids = sorted(set(new_snap["ids"]) - set(old_ids)) removed_ids = sorted(set(old_ids) - set(new_snap["ids"])) added_claims = sum( - len(set(claims) - set(old_ids.get(fid, []))) - for fid, claims in new_snap["ids"].items()) + len(set(entry["filaments"]) - set(old_ids.get(fid, {}).get("filaments", []))) + for fid, entry in new_snap["ids"].items()) removed_claims = sum( - len(set(claims) - set(new_snap["ids"].get(fid, []))) - for fid, claims in old_ids.items()) - old_snap = old_snap or {"ids": {}, "instantiated_with_id": [], "id_overrides": [], - "alias_exceptions": [], "triples": {}, - "triple_exceptions": []} - changed = new_snap != old_snap + len(set(entry["filaments"]) - set(new_snap["ids"].get(fid, {}).get("filaments", []))) + for fid, entry in old_ids.items()) + changed = new_snap != (old_snap or {"ids": {}}) if changed: write_snapshot(snapshot_path, new_snap) @@ -847,11 +775,6 @@ def update_snapshot(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, print_info(f"snapshot ids : {len(new_snap['ids'])} (+{len(added_ids)} / -{len(removed_ids)})") print_info(f"claims added : {added_claims}") print_info(f"claims removed : {removed_claims}") - print_info(f"declared triples : {len(new_snap['triples'])}") - for section in ("instantiated_with_id", "id_overrides", "alias_exceptions", - "triple_exceptions"): - before, after = len(old_snap.get(section, [])), len(new_snap[section]) - print_info(f"{section:<18}: {after} ({after - before:+d})") if changed: print_success(f"snapshot written to {snapshot_path}") else: @@ -952,25 +875,26 @@ def remove_filament_id(path, old_id): # --------------------------------------------------------------------------- -# Default run: mint + insert ids for id-less families +# Default run: mint + insert ids for id-less filaments # --------------------------------------------------------------------------- def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): - """Mint + insert ids for id-less families; mint + replace non-OF-format + """Mint + insert ids for id-less filaments; mint + replace non-OF-format declarations. Never rewrites a valid (OF-format) existing id. - A family = (vendor, base name) group over instantiated filaments with no - effective id. The minted id is a pure function of the family's triple — - (filament_vendor, filament_type) resolved on the root(s), family name — and - is inserted into the family's root(s): the presets its members inherit that - carry no id, or the member itself when it has no vendor-side parent. + A filament = (vendor, base name) group over instantiated presets with no + effective id. The minted id is a pure function of the filament's triple — + (filament_vendor, filament_type) resolved on the root(s), filament name — + and is inserted into the filament's root(s): the id-less presets of the + SAME filament its members inherit, or the member itself otherwise (a parent + of another filament cannot carry this filament's id — check 3). A declaration whose value is not OF-format (e.g. a vendor bundle synced from an upstream source that ships its own catalog ids, such as BBL's GF*) - is treated the same as a missing family: a fresh id is minted for the + is treated the same as a missing filament: a fresh id is minted for the declarer's triple and the value is replaced in place (declarers that share one triple across several per-printer roots converge on the same id, same - as the multi-root families above). This is what makes a future BBL sync + as the multi-root filaments above). This is what makes a future BBL sync self-healing: upstream files arrive with GF ids, this pass replaces them, and the generated Bambu catalog map (keyed by the ids this mints) already knows the resulting rows. @@ -983,8 +907,8 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): print_error(msg) errors += 1 - # Group id-less instantiated presets into families. - families = {} # (vendor, family) -> [rec] + # Group id-less instantiated presets by filament. + filaments = {} # (vendor, filament_name) -> [rec] for vendor, name, _file in analysis["missing_effective"]: rec = analysis["vendors"][vendor][name] if rec["id_source"] in ("cycle", "dangling"): @@ -992,17 +916,17 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): f'({rec["id_source"]})') errors += 1 continue - families.setdefault((vendor, base_name(name)), []).append(rec) + filaments.setdefault((vendor, base_name(name)), []).append(rec) # Declarations whose value is not OF-format: treated as missing too (see - # docstring). Grouped by triple, not by (vendor, family), so declarers + # docstring). Grouped by triple, not by (vendor, filament), so declarers # that legitimately share one triple across several files converge on one # freshly minted id instead of each getting their own. non_of_declarers = [ (vendor, rec, fid, triple) for vendor, rec, fid, triple in analysis["declarer_triples"] if not OF_ID_RE.match(fid)] - if not families and not non_of_declarers: + if not filaments and not non_of_declarers: print_success("every instantiated filament already resolves an OF-format " "filament_id; nothing to do (0 files changed)") return 0, errors @@ -1013,46 +937,34 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): for occurring in analysis["vendor_ids"].values(): taken |= occurring - # Family root(s): the direct vendor-side parents of the members (id-less by - # construction), or the member itself when it has none. - roots = {} # (vendor, family) -> {preset name: rec} - root_claims = {} # (vendor, root name) -> set of families wanting to write it - for key, members in sorted(families.items()): - vendor = key[0] + # Root preset(s): the direct vendor-side parents of the members (id-less by + # construction) that belong to the same filament, or the member itself. + roots = {} # (vendor, filament_name) -> {preset name: rec} + for key, members in sorted(filaments.items()): + vendor, filament_name = key vendor_map = analysis["vendors"][vendor] - family_roots = {} + filament_roots = {} for rec in members: parent = rec.get("inherits") root = vendor_map.get(parent) if parent else None - if root is None or root.get("filament_id"): + if (root is None or root.get("filament_id") + or base_name(root["name"]) != filament_name): root = rec # root-less member carries the id itself - family_roots[root["name"]] = root - root_claims.setdefault((vendor, root["name"]), set()).add(key) - roots[key] = family_roots + filament_roots[root["name"]] = root + roots[key] = filament_roots ofl_map = analysis["vendors"].get(OFL, {}) files_changed = 0 - families_minted = 0 - for key, family_roots in sorted(roots.items()): - vendor, family = key - shared = [n for n in family_roots - if len(root_claims[(vendor, n)]) > 1] - if shared: - others = sorted({f"{v}/{f}" for n in shared - for (v, f) in root_claims[(vendor, n)] if (v, f) != key}) - print_error( - f'cannot mint for family "{vendor}/{family}": root(s) ' - f"{sorted(shared)} are shared with famil(ies) {others}; split the " - f"roots so each family has its own") - errors += 1 - continue + filaments_minted = 0 + for key, filament_roots in sorted(roots.items()): + vendor, filament_name = key vendor_map = analysis["vendors"][vendor] fields = {(resolve_filament_field(n, "filament_vendor", vendor_map, ofl_map), resolve_filament_field(n, "filament_type", vendor_map, ofl_map)) - for n in family_roots} + for n in filament_roots} if len(fields) > 1: print_error( - f'cannot mint for family "{vendor}/{family}": its roots resolve ' + f'cannot mint for filament "{vendor}/{filament_name}": its roots resolve ' f"divergent (filament_vendor, filament_type) pairs {sorted(fields)}; " f"align the fields first") errors += 1 @@ -1063,26 +975,27 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): k for k, v in (("filament_vendor", fvendor), ("filament_type", ftype)) if not v) print_error( - f'cannot mint for family "{vendor}/{family}": it resolves empty ' + f'cannot mint for filament "{vendor}/{filament_name}": it resolves empty ' f'{missing}; the mint key needs both (generic materials use ' f'filament_vendor "Generic")') errors += 1 continue - new_id = mint_filament_id(fvendor, ftype, family, taken) + new_id = mint_filament_id(fvendor, ftype, filament_name, taken) taken.add(new_id) - families_minted += 1 - for name in sorted(family_roots): - root = family_roots[name] + filaments_minted += 1 + for name in sorted(filament_roots): + root = filament_roots[name] write_filament_id(root["path"], new_id) files_changed += 1 - print_info(f'family "{vendor}/{family}": filament_id "{new_id}" -> {root["file"]}') + print_info(f'filament "{vendor}/{filament_name}": filament_id "{new_id}" ' + f'-> {root["file"]}') # Non-OF-format declarations: mint once per triple, rewrite every declarer # that shares it (see docstring). declarations_reminted = 0 assigned = {} # triple -> id chosen this run for vendor, rec, fid, triple in sorted(non_of_declarers, key=lambda x: (x[0], x[1]["file"])): - fvendor, ftype, family = triple + fvendor, ftype, filament_name = triple if not fvendor or not ftype: missing = " and ".join( k for k, v in (("filament_vendor", fvendor), @@ -1094,16 +1007,16 @@ def assign_missing_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH): errors += 1 continue if triple not in assigned: - assigned[triple] = mint_filament_id(fvendor, ftype, family, taken) + assigned[triple] = mint_filament_id(fvendor, ftype, filament_name, taken) taken.add(assigned[triple]) new_id = assigned[triple] rewrite_filament_id(rec["path"], fid, new_id) files_changed += 1 declarations_reminted += 1 - print_info(f'family "{vendor}/{family}": non-OF filament_id "{fid}" -> "{new_id}" ' - f'({rec["file"]})') + print_info(f'filament "{vendor}/{filament_name}": non-OF filament_id "{fid}" ' + f'-> "{new_id}" ({rec["file"]})') - print_info(f"families minted : {families_minted}") + print_info(f"filaments minted : {filaments_minted}") print_info(f"non-OF reminted : {declarations_reminted}") print_info(f"files changed : {files_changed}") if files_changed: @@ -1178,8 +1091,7 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR): # mint-conformant (check 3) — leave it. This keeps deliberate salt # splits (two presets of one product that must stay distinct for # per-printer AMS matching, validator -f) stable across re-mints. - if fid in {generate_filament_id(*rec["triple"], salt=s) - for s in range(MAX_CHECK_SALT + 1)}: + if fid in mint_iterations(rec["triple"]): continue want = want_id(rec["triple"]) if fid == want: @@ -1197,8 +1109,8 @@ def remint_vendors(vendor_list, profiles_dir=PROFILES_DIR): def drop_redundant_ids(vendor, profiles_dir=PROFILES_DIR): """Delete filament_id declarations in `vendor` that merely re-declare an OFL - family's id path: ignoring its own key, the preset's inherits chain enters - OFL and resolves an OFL-declared id, and the preset keeps the OFL family's + filament's id path: ignoring its own key, the preset's inherits chain enters + OFL and resolves an OFL-declared id, and the preset keeps the OFL filament's base name. Such a preset is a specialization and rides the OFL id (v3.2(b)). Never touches the snapshot. Returns (dropped, errors). """ @@ -1246,25 +1158,22 @@ def drop_redundant_ids(vendor, profiles_dir=PROFILES_DIR): def main(argv=None): _utf8_console() parser = argparse.ArgumentParser( - description="Mint deterministic filament_id values for id-less filament " - "families and validate the tree against the sanctioned snapshot.") - parser.add_argument("--mint", metavar='"Vendor/Type/Family"', + description="Mint deterministic filament_id values for id-less filaments " + "and validate the tree against the sanctioned snapshot.") + parser.add_argument("--mint", metavar='"Vendor/Type/Filament"', help="print the id the (filament_vendor, filament_type, " - "family name) triple would mint; touches nothing") + "filament name) triple would mint; touches nothing") parser.add_argument("--update-snapshot", action="store_true", help="regenerate scripts/filament_id_snapshot.json from " "the tree") parser.add_argument("--check", action="store_true", help="run the filament_id checks; exit nonzero on errors") - parser.add_argument("--allow-shared-catalog", action="store_true", - help="with --update-snapshot: allow sanctioning new claims " - "on reserved-namespace ids for non-owner vendors") parser.add_argument("--remint", metavar="VENDOR", action="append", help="re-derive VENDOR's declared filament_ids from their " "triples and rewrite mismatches in place; repeatable") parser.add_argument("--drop-redundant-ids", metavar="VENDOR", help="delete filament_id declarations in VENDOR that " - "re-declare the OFL family id they already resolve " + "re-declare the OFL filament id they already resolve " "through inherits") parser.add_argument("--profiles", default=PROFILES_DIR, help="profiles directory (default: resources/profiles)") @@ -1274,8 +1183,8 @@ def main(argv=None): if args.mint: parts = args.mint.split("/", 2) if len(parts) != 3 or not all(parts): - parser.error('--mint expects "filament_vendor/filament_type/family_name" ' - "with all three components non-empty (check 7 rejects empty " + parser.error('--mint expects "filament_vendor/filament_type/filament_name" ' + "with all three components non-empty (check 5 rejects empty " "vendor/type in the tree)") snapshot = load_snapshot(SNAPSHOT_PATH) or {"ids": {}} taken = set(snapshot["ids"]) @@ -1295,8 +1204,7 @@ def main(argv=None): return 1 if errors else 0 if args.update_snapshot: - return update_snapshot(args.profiles, SNAPSHOT_PATH, - allow_shared_catalog=args.allow_shared_catalog) + return update_snapshot(args.profiles, SNAPSHOT_PATH) if args.check: errors = check_filament_ids(args.profiles, SNAPSHOT_PATH) diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index cf4d13c987..9b0c64f473 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1,13212 +1,7903 @@ { - "alias_exceptions": [ - "BBL/COEX NYLEX UNFILLED @BBL X1C", - "Flashforge/Flashforge ABS Basic @FF C5", - "Flashforge/Flashforge ABS Basic @FF C5P", - "Flashforge/Flashforge ABS-GF @FF C5", - "Flashforge/Flashforge ABS-GF @FF C5P", - "Flashforge/Flashforge ASA Basic @FF C5", - "Flashforge/Flashforge ASA Basic @FF C5P", - "Flashforge/Flashforge ASA-CF @FF C5", - "Flashforge/Flashforge ASA-CF @FF C5P", - "Flashforge/Flashforge ASA-GF @FF C5", - "Flashforge/Flashforge ASA-GF @FF C5P", - "Flashforge/Flashforge HIPS @FF C5", - "Flashforge/Flashforge HIPS @FF C5P", - "Flashforge/Flashforge HS PETG @FF C5", - "Flashforge/Flashforge HS PETG @FF C5P", - "Flashforge/Flashforge HS PLA @FF C5", - "Flashforge/Flashforge HS PLA @FF C5P", - "Flashforge/Flashforge PA-CF @FF C5", - "Flashforge/Flashforge PA-CF @FF C5P", - "Flashforge/Flashforge PET-CF @FF C5", - "Flashforge/Flashforge PET-CF @FF C5P", - "Flashforge/Flashforge PETG Pro @FF C5", - "Flashforge/Flashforge PETG Pro @FF C5P", - "Flashforge/Flashforge PETG Transparent @FF C5", - "Flashforge/Flashforge PETG Transparent @FF C5P", - "Flashforge/Flashforge PETG-CF @FF C5", - "Flashforge/Flashforge PETG-CF @FF C5P", - "Flashforge/Flashforge PLA Basic @FF C5", - "Flashforge/Flashforge PLA Basic @FF C5P", - "Flashforge/Flashforge PLA Color Change @FF C5", - "Flashforge/Flashforge PLA Color Change @FF C5P", - "Flashforge/Flashforge PLA Galaxy @FF C5", - "Flashforge/Flashforge PLA Galaxy @FF C5P", - "Flashforge/Flashforge PLA Luminous @FF C5", - "Flashforge/Flashforge PLA Luminous @FF C5P", - "Flashforge/Flashforge PLA Matte @FF C5", - "Flashforge/Flashforge PLA Matte @FF C5P", - "Flashforge/Flashforge PLA Metal @FF C5", - "Flashforge/Flashforge PLA Metal @FF C5P", - "Flashforge/Flashforge PLA Pro @FF C5", - "Flashforge/Flashforge PLA Pro @FF C5P", - "Flashforge/Flashforge PLA Silk @FF C5", - "Flashforge/Flashforge PLA Silk @FF C5P", - "Flashforge/Flashforge PLA-CF @FF C5", - "Flashforge/Flashforge PLA-CF @FF C5P", - "Flashforge/Flashforge PPA-CF @FF C5", - "Flashforge/Flashforge PPA-CF @FF C5P", - "Flashforge/Flashforge PPS-CF @FF C5", - "Flashforge/Flashforge PPS-CF @FF C5P", - "Flashforge/Flashforge PVA @FF C5", - "Flashforge/Flashforge PVA @FF C5P", - "Flashforge/Flashforge TPU-64D @FF C5", - "Flashforge/Flashforge TPU-64D @FF C5P", - "Flashforge/Flashforge TPU-90A @FF C5", - "Flashforge/Flashforge TPU-90A @FF C5P", - "Flashforge/Flashforge TPU-95A @FF C5", - "Flashforge/Flashforge TPU-95A @FF C5P", - "Flashforge/FusRock PAHT-CF @FF C5", - "Flashforge/FusRock PAHT-CF @FF C5P", - "Flashforge/FusRock S-Multi @FF C5", - "Flashforge/FusRock S-Multi @FF C5P", - "Flashforge/FusRock S-PAHT @FF C5", - "Flashforge/FusRock S-PAHT @FF C5P", - "Flashforge/Generic TPU-64D @FF C5", - "Flashforge/Generic TPU-64D @FF C5P", - "Flashforge/Generic TPU-90A @FF C5", - "Flashforge/Generic TPU-90A @FF C5P", - "Flashforge/Generic TPU-95A @FF C5", - "Flashforge/Generic TPU-95A @FF C5P", - "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", - "Snapmaker/PolyTerra J1 PLA", - "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", - "Sovol/Generic PLA Silk @Sovol SV08 MAX", - "Sovol/Polymaker PETG @Sovol SV08 MAX", - "Sovol/SUNLU PETG @Sovol SV08 MAX", - "Sovol/Sovol Zero PETG HS Nozzle", - "Sovol/Sovol Zero PLA Basic HS Nozzle", - "Sovol/Sovol Zero PLA Silk HS Nozzle" - ], - "id_overrides": [ - "Anycubic/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Artillery/Artillery ABS", - "Artillery/Artillery ABS @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery ASA @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PA @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PC @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PET @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PETG", - "Artillery/Artillery PETG @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Basic", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Matte", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PLA Silk", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PLA Tough", - "Artillery/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PVA @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery TPU", - "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "BBL/addnorth ABS rABS", - "BBL/addnorth PA Adura", - "BBL/addnorth PA Adura FDA", - "BBL/addnorth PA-CF Adura X", - "BBL/addnorth PA6 Addlantis", - "BBL/addnorth PC BLend HT LCF", - "BBL/addnorth PETG Base", - "BBL/addnorth PETG ESD", - "BBL/addnorth PETG Economy", - "BBL/addnorth PETG Flame v0", - "BBL/addnorth PETG PRO Matte", - "BBL/addnorth PETG rPETG Matte", - "BBL/addnorth PETG-CF Rigid X", - "BBL/addnorth PLA E-PLA", - "BBL/addnorth PLA Economy", - "BBL/addnorth PLA HT-PLA PRO Matte", - "BBL/addnorth PLA Premium Silk", - "BBL/addnorth PLA Textura", - "BBL/addnorth PLA Wood", - "BBL/addnorth PLA X-PLA", - "BBL/addnorth PLA X-PLA High Speed", - "BBL/addnorth PLA rPLA RE-ADD", - "BBL/addnorth PLA-CF Carbon Fiber", - "BBL/addnorth PVDF Adamant S1", - "BBL/addnorth TPU EasyFlex", - "BBL/addnorth TPU Pro Matte 85A", - "BBL/addnorth TPU Pro Matte 95A", - "Chuanying/Generic HIPS @Chuanying", - "Chuanying/Generic PVA @Chuanying", - "Co Print/Generic ABS @CoPrint", - "Co Print/Generic PETG @CoPrint", - "Co Print/Generic TPU @CoPrint", - "Creality/Generic ASA-CF @Creality Hi-all", - "Creality/Generic PETG-CF @Creality Hi-all", - "Creality/Generic PLA High Speed @Creality Ender-3V3-all", - "Creality/Generic PLA High Speed @Creality Hi-all", - "Creality/Generic PLA High Speed @Creality K1-all", - "Creality/Generic PLA High Speed @Creality K2-all", - "Creality/Generic PLA Matte @Creality Ender-3V3-all", - "Creality/Generic PLA Matte @Creality Hi-all", - "Creality/Generic PLA Matte @Creality K1-all", - "Creality/Generic PLA Matte @Creality K2-all", - "Creality/Generic PLA Silk @Creality Ender-3V3-all", - "Creality/Generic PLA Silk @Creality Hi-all", - "Creality/Generic PLA Silk @Creality K1-all", - "Creality/Generic PLA Silk @Creality K2-all", - "Creality/Generic PLA Wood @Creality Hi-all", - "Cubicon/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon ABS-A100 @base", - "Cubicon/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon ABSk @base", - "Cubicon/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PC @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLA+ @base", - "Cubicon/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLAi21 @base", - "Elegoo/Elegoo ASA-CF @base", - "Elegoo/Elegoo PC-FR @base", - "Elegoo/Elegoo PET-CF @base", - "Elegoo/Elegoo PETG HF @base", - "Elegoo/Elegoo PETG PRO @base", - "Elegoo/Elegoo PETG Translucent @base", - "Elegoo/Elegoo PETG-CF @base", - "Elegoo/Elegoo PETG-GF @base", - "Elegoo/Elegoo PLA Basic @base", - "Elegoo/Elegoo PLA Galaxy @base", - "Elegoo/Elegoo PLA Glow @base", - "Elegoo/Elegoo PLA Marble @base", - "Elegoo/Elegoo PLA Matte @base", - "Elegoo/Elegoo PLA PRO @base", - "Elegoo/Elegoo PLA Silk @base", - "Elegoo/Elegoo PLA Sparkle @base", - "Elegoo/Elegoo PLA Translucent2 @base", - "Elegoo/Elegoo PLA Wood @base", - "Elegoo/Elegoo PLA+ @base", - "Elegoo/Elegoo PLA-CF @base", - "Elegoo/Elegoo Rapid PETG @base", - "Elegoo/Elegoo Rapid PLA+ @base", - "Elegoo/Elegoo Rapid TPU 95A @base", - "Elegoo/Generic ABS-CF @Elegoo Centauri", - "Elegoo/Generic ASA-CF @Elegoo Centauri", - "Elegoo/Generic PA6-CF @Elegoo", - "Elegoo/Generic PC-CF @Elegoo", - "Elegoo/Generic PET-CF @Elegoo Centauri", - "Elegoo/Generic PETG PRO @Elegoo", - "Elegoo/Generic PETG-CF @Elegoo Centauri", - "Elegoo/Generic PLA Matte @Elegoo", - "Flashforge/Flashforge ABS @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge ABS Basic", - "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF AD5X", - "Flashforge/Flashforge ABS Basic @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge ABS Basic @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge ABS Basic @FF C5", - "Flashforge/Flashforge ABS Basic @FF C5P", - "Flashforge/Flashforge ABS Basic @FF G4", - "Flashforge/Flashforge ABS Basic @FF G4 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 0.6 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 HF", - "Flashforge/Flashforge ABS Basic @FF G4P", - "Flashforge/Flashforge ABS Basic @FF G4P 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P 0.6 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P HF", - "Flashforge/Flashforge ABS-CF @FF G4", - "Flashforge/Flashforge ABS-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge ABS-CF @FF G4P", - "Flashforge/Flashforge ABS-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge ABS-GF @FF C5", - "Flashforge/Flashforge ABS-GF @FF C5P", - "Flashforge/Flashforge ASA @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge ASA Basic", - "Flashforge/Flashforge ASA Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF AD5X", - "Flashforge/Flashforge ASA Basic @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge ASA Basic @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge ASA Basic @FF C5", - "Flashforge/Flashforge ASA Basic @FF C5P", - "Flashforge/Flashforge ASA Basic @FF G4", - "Flashforge/Flashforge ASA Basic @FF G4 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 0.6 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 HF", - "Flashforge/Flashforge ASA Basic @FF G4P", - "Flashforge/Flashforge ASA Basic @FF G4P 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P 0.6 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P HF", - "Flashforge/Flashforge ASA-CF", - "Flashforge/Flashforge ASA-CF @FF C5", - "Flashforge/Flashforge ASA-CF @FF C5P", - "Flashforge/Flashforge ASA-CF @FF G4", - "Flashforge/Flashforge ASA-CF @FF G4P", - "Flashforge/Flashforge ASA-GF @FF C5", - "Flashforge/Flashforge ASA-GF @FF C5P", - "Flashforge/Flashforge HIPS @FF C5", - "Flashforge/Flashforge HIPS @FF C5P", - "Flashforge/Flashforge HIPS @FF G4", - "Flashforge/Flashforge HIPS @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4 0.6 nozzle", - "Flashforge/Flashforge HIPS @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4 HF", - "Flashforge/Flashforge HIPS @FF G4P", - "Flashforge/Flashforge HIPS @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4P 0.6 nozzle", - "Flashforge/Flashforge HIPS @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4P HF", - "Flashforge/Flashforge HS PETG", - "Flashforge/Flashforge HS PETG @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF AD5X", - "Flashforge/Flashforge HS PETG @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge HS PETG @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge HS PETG @FF C5", - "Flashforge/Flashforge HS PETG @FF C5P", - "Flashforge/Flashforge HS PETG @FF G4", - "Flashforge/Flashforge HS PETG @FF G4 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4 0.6 nozzle", - "Flashforge/Flashforge HS PETG @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4 HF", - "Flashforge/Flashforge HS PETG @FF G4P", - "Flashforge/Flashforge HS PETG @FF G4P 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4P 0.6 nozzle", - "Flashforge/Flashforge HS PETG @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4P HF", - "Flashforge/Flashforge HS PLA", - "Flashforge/Flashforge HS PLA @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF AD5X", - "Flashforge/Flashforge HS PLA @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge HS PLA @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge HS PLA @FF C5", - "Flashforge/Flashforge HS PLA @FF C5P", - "Flashforge/Flashforge HS PLA @FF G4", - "Flashforge/Flashforge HS PLA @FF G4 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4 0.6 nozzle", - "Flashforge/Flashforge HS PLA @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4 HF", - "Flashforge/Flashforge HS PLA @FF G4P", - "Flashforge/Flashforge HS PLA @FF G4P 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4P 0.6 nozzle", - "Flashforge/Flashforge HS PLA @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4P HF", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 HF", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P HF", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PA @FF G4", - "Flashforge/Flashforge PA @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PA @FF G4 HF", - "Flashforge/Flashforge PA @FF G4P", - "Flashforge/Flashforge PA @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PA @FF G4P HF", - "Flashforge/Flashforge PA-CF @FF C5", - "Flashforge/Flashforge PA-CF @FF C5P", - "Flashforge/Flashforge PA-CF @FF G4", - "Flashforge/Flashforge PA-CF @FF G4P", - "Flashforge/Flashforge PA12-CF", - "Flashforge/Flashforge PA6-CF", - "Flashforge/Flashforge PA66-CF", - "Flashforge/Flashforge PC @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PC @FF G4 0.6 nozzle", - "Flashforge/Flashforge PC @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PC @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PC @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PC @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PET-CF", - "Flashforge/Flashforge PET-CF @FF C5", - "Flashforge/Flashforge PET-CF @FF C5P", - "Flashforge/Flashforge PETG @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge PETG Basic", - "Flashforge/Flashforge PETG Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PETG Pro", - "Flashforge/Flashforge PETG Pro @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF AD5X", - "Flashforge/Flashforge PETG Pro @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PETG Pro @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PETG Pro @FF C5", - "Flashforge/Flashforge PETG Pro @FF C5P", - "Flashforge/Flashforge PETG Pro @FF G4", - "Flashforge/Flashforge PETG Pro @FF G4 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 0.6 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 HF", - "Flashforge/Flashforge PETG Pro @FF G4P", - "Flashforge/Flashforge PETG Pro @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P HF", - "Flashforge/Flashforge PETG Transparent", - "Flashforge/Flashforge PETG Transparent @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF AD5X", - "Flashforge/Flashforge PETG Transparent @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PETG Transparent @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PETG Transparent @FF C5", - "Flashforge/Flashforge PETG Transparent @FF C5P", - "Flashforge/Flashforge PETG Transparent @FF G4", - "Flashforge/Flashforge PETG Transparent @FF G4 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 0.6 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 HF", - "Flashforge/Flashforge PETG Transparent @FF G4P", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P HF", - "Flashforge/Flashforge PETG-CF", - "Flashforge/Flashforge PETG-CF @FF AD5X", - "Flashforge/Flashforge PETG-CF @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PETG-CF @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PETG-CF @FF C5", - "Flashforge/Flashforge PETG-CF @FF C5P", - "Flashforge/Flashforge PETG-CF @FF G4", - "Flashforge/Flashforge PETG-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge PETG-CF @FF G4P", - "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Basic", - "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF AD5X", - "Flashforge/Flashforge PLA Basic @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Basic @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Basic @FF C5", - "Flashforge/Flashforge PLA Basic @FF C5P", - "Flashforge/Flashforge PLA Basic @FF G4", - "Flashforge/Flashforge PLA Basic @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 HF", - "Flashforge/Flashforge PLA Basic @FF G4P", - "Flashforge/Flashforge PLA Basic @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P HF", - "Flashforge/Flashforge PLA Color Change", - "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF AD5X", - "Flashforge/Flashforge PLA Color Change @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Color Change @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Color Change @FF C5", - "Flashforge/Flashforge PLA Color Change @FF C5P", - "Flashforge/Flashforge PLA Color Change @FF G4", - "Flashforge/Flashforge PLA Color Change @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 HF", - "Flashforge/Flashforge PLA Color Change @FF G4P", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P HF", - "Flashforge/Flashforge PLA Galaxy", - "Flashforge/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF AD5X", - "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF C5", - "Flashforge/Flashforge PLA Galaxy @FF C5P", - "Flashforge/Flashforge PLA Galaxy @FF G4", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 HF", - "Flashforge/Flashforge PLA Galaxy @FF G4P", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P HF", - "Flashforge/Flashforge PLA Luminous", - "Flashforge/Flashforge PLA Luminous @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF AD5X", - "Flashforge/Flashforge PLA Luminous @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Luminous @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Luminous @FF C5", - "Flashforge/Flashforge PLA Luminous @FF C5P", - "Flashforge/Flashforge PLA Luminous @FF G4", - "Flashforge/Flashforge PLA Luminous @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4 HF", - "Flashforge/Flashforge PLA Luminous @FF G4P", - "Flashforge/Flashforge PLA Luminous @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4P HF", - "Flashforge/Flashforge PLA Matte", - "Flashforge/Flashforge PLA Matte @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF AD5X", - "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Matte @FF C5", - "Flashforge/Flashforge PLA Matte @FF C5P", - "Flashforge/Flashforge PLA Matte @FF G4", - "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 HF", - "Flashforge/Flashforge PLA Matte @FF G4P", - "Flashforge/Flashforge PLA Matte @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P HF", - "Flashforge/Flashforge PLA Metal", - "Flashforge/Flashforge PLA Metal @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF AD5X", - "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Metal @FF C5", - "Flashforge/Flashforge PLA Metal @FF C5P", - "Flashforge/Flashforge PLA Metal @FF G4", - "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 HF", - "Flashforge/Flashforge PLA Metal @FF G4P", - "Flashforge/Flashforge PLA Metal @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P HF", - "Flashforge/Flashforge PLA Pro", - "Flashforge/Flashforge PLA Pro @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF AD5X", - "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Pro @FF C5", - "Flashforge/Flashforge PLA Pro @FF C5P", - "Flashforge/Flashforge PLA Pro @FF G4", - "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 HF", - "Flashforge/Flashforge PLA Pro @FF G4P", - "Flashforge/Flashforge PLA Pro @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P HF", - "Flashforge/Flashforge PLA Silk", - "Flashforge/Flashforge PLA Silk @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF AD5X", - "Flashforge/Flashforge PLA Silk @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Silk @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Silk @FF C5", - "Flashforge/Flashforge PLA Silk @FF C5P", - "Flashforge/Flashforge PLA Silk @FF G4", - "Flashforge/Flashforge PLA Silk @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 HF", - "Flashforge/Flashforge PLA Silk @FF G4P", - "Flashforge/Flashforge PLA Silk @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P HF", - "Flashforge/Flashforge PLA Sparkle", - "Flashforge/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF AD5X", - "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4", - "Flashforge/Flashforge PLA Sparkle @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4 HF", - "Flashforge/Flashforge PLA Sparkle @FF G4P", - "Flashforge/Flashforge PLA Sparkle @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4P HF", - "Flashforge/Flashforge PLA-CF", - "Flashforge/Flashforge PLA-CF @FF AD5X", - "Flashforge/Flashforge PLA-CF @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA-CF @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA-CF @FF C5", - "Flashforge/Flashforge PLA-CF @FF C5P", - "Flashforge/Flashforge PLA-CF @FF G4", - "Flashforge/Flashforge PLA-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA-CF @FF G4P", - "Flashforge/Flashforge PLA-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", - "Flashforge/Flashforge PPA-CF", - "Flashforge/Flashforge PPA-CF @FF C5", - "Flashforge/Flashforge PPA-CF @FF C5P", - "Flashforge/Flashforge PPA-GF", - "Flashforge/Flashforge PPS @FF G4", - "Flashforge/Flashforge PPS @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PPS @FF G4 0.6 nozzle", - "Flashforge/Flashforge PPS @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PPS @FF G4P", - "Flashforge/Flashforge PPS @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PPS @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PPS @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PPS-CF", - "Flashforge/Flashforge PPS-CF @FF C5", - "Flashforge/Flashforge PPS-CF @FF C5P", - "Flashforge/Flashforge PPS-CF @FF G4", - "Flashforge/Flashforge PPS-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge PPS-CF @FF G4P", - "Flashforge/Flashforge PPS-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PVA @FF C5", - "Flashforge/Flashforge PVA @FF C5P", - "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge TPU 65D @FF G4 0.6 nozzle", - "Flashforge/Flashforge TPU 65D @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge TPU 65D @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge TPU 65D @FF G4P 0.6 nozzle", - "Flashforge/Flashforge TPU 65D @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge TPU 95A", - "Flashforge/Flashforge TPU 95A @FF AD5X", - "Flashforge/Flashforge TPU 95A @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge TPU 95A @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge TPU 95A @FF G4", - "Flashforge/Flashforge TPU 95A @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge TPU 95A @FF G4 0.6 nozzle", - "Flashforge/Flashforge TPU 95A @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge TPU 95A @FF G4P", - "Flashforge/Flashforge TPU 95A @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge TPU 95A @FF G4P 0.6 nozzle", - "Flashforge/Flashforge TPU 95A @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge TPU-64D @FF C5", - "Flashforge/Flashforge TPU-64D @FF C5P", - "Flashforge/Flashforge TPU-90A @FF C5", - "Flashforge/Flashforge TPU-90A @FF C5P", - "Flashforge/Flashforge TPU-95A @FF C5", - "Flashforge/Flashforge TPU-95A @FF C5P", - "Flashforge/FusRock NexPA-CF25", - "Flashforge/FusRock PAHT @FF G4 0.6 HF nozzle", - "Flashforge/FusRock PAHT @FF G4 0.6 nozzle", - "Flashforge/FusRock PAHT @FF G4 0.8 HF nozzle", - "Flashforge/FusRock PAHT @FF G4P 0.6 HF nozzle", - "Flashforge/FusRock PAHT @FF G4P 0.6 nozzle", - "Flashforge/FusRock PAHT @FF G4P 0.8 HF nozzle", - "Flashforge/FusRock PAHT-CF", - "Flashforge/FusRock PAHT-CF @FF C5", - "Flashforge/FusRock PAHT-CF @FF C5P", - "Flashforge/FusRock PAHT-CF @FF G4", - "Flashforge/FusRock PAHT-CF @FF G4P", - "Flashforge/FusRock PAHT-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock PAHT-GF", - "Flashforge/FusRock PET @FF G4P 0.8 HF nozzle", - "Flashforge/FusRock PET-CF", - "Flashforge/FusRock PET-CF @FF G4", - "Flashforge/FusRock PET-CF @FF G4P", - "Flashforge/FusRock PET-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock PET-GF", - "Flashforge/FusRock S-Multi", - "Flashforge/FusRock S-Multi @FF C5", - "Flashforge/FusRock S-Multi @FF C5P", - "Flashforge/FusRock S-Multi @G3U 0.6 Nozzle", - "Flashforge/FusRock S-PAHT", - "Flashforge/FusRock S-PAHT @FF C5", - "Flashforge/FusRock S-PAHT @FF C5P", - "Flashforge/FusRock S-PAHT @G3U 0.6 Nozzle", - "Flashforge/Generic ASA @Flashforge G3U", - "Flashforge/Generic HIPS @Flashforge", - "Flashforge/Generic HIPS @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic PET @FF G4", - "Flashforge/Generic PET @FF G4 0.6 HF nozzle", - "Flashforge/Generic PET @FF G4 0.6 nozzle", - "Flashforge/Generic PET @FF G4 0.8 HF nozzle", - "Flashforge/Generic PET @FF G4P", - "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", - "Flashforge/Generic PET @FF G4P 0.6 nozzle", - "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", - "Flashforge/Generic PETG-CF @Flashforge G3U", - "Flashforge/Generic PETG-CF @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic PETG-CF @Flashforge G3U 0.8 Nozzle", - "Flashforge/Generic PLA High Speed @Flashforge AD4", - "Flashforge/Generic PLA Silk @Flashforge AD4", - "Flashforge/Generic PLA-CF @Flashforge G3U", - "Flashforge/Generic PLA-CF @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic PLA-CF @Flashforge G3U 0.8 Nozzle", - "Flashforge/Generic PLA-SILK @FF AD5M 0.25 Nozzle", - "Flashforge/Generic PVA @Flashforge", - "Flashforge/Generic TPU 85A @FF AD5X", - "Flashforge/Generic TPU 85A @FF AD5X 0.6 nozzle", - "Flashforge/Generic TPU 85A @FF AD5X 0.8 nozzle", - "Flashforge/Generic TPU-64D @FF C5", - "Flashforge/Generic TPU-64D @FF C5P", - "Flashforge/Generic TPU-90A @FF C5", - "Flashforge/Generic TPU-90A @FF C5P", - "Flashforge/Generic TPU-95A @FF C5", - "Flashforge/Generic TPU-95A @FF C5P", - "Flashforge/Polymaker CoPA", - "Flashforge/Polymaker CoPA @FF G4 0.6 HF nozzle", - "Flashforge/Polymaker CoPA @FF G4 0.6 nozzle", - "Flashforge/Polymaker CoPA @FF G4 0.8 HF nozzle", - "Flashforge/Polymaker CoPA @FF G4P 0.6 HF nozzle", - "Flashforge/Polymaker CoPA @FF G4P 0.6 nozzle", - "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", - "Flashforge/Polymaker S1", - "OrcaFilamentLibrary/AliZ PETG-CF @base", - "OrcaFilamentLibrary/AliZ PETG-Metal @base", - "OrcaFilamentLibrary/Elegoo ASA-CF @base", - "OrcaFilamentLibrary/Elegoo PC-FR @base", - "OrcaFilamentLibrary/Elegoo PET-CF @base", - "OrcaFilamentLibrary/Elegoo PETG HF @base", - "OrcaFilamentLibrary/Elegoo PETG PRO @base", - "OrcaFilamentLibrary/Elegoo PETG Translucent @base", - "OrcaFilamentLibrary/Elegoo PETG-CF @base", - "OrcaFilamentLibrary/Elegoo PETG-GF @base", - "OrcaFilamentLibrary/Elegoo PLA Basic @base", - "OrcaFilamentLibrary/Elegoo PLA Galaxy @base", - "OrcaFilamentLibrary/Elegoo PLA Glow @base", - "OrcaFilamentLibrary/Elegoo PLA Marble @base", - "OrcaFilamentLibrary/Elegoo PLA Matte @base", - "OrcaFilamentLibrary/Elegoo PLA PRO @base", - "OrcaFilamentLibrary/Elegoo PLA Silk @base", - "OrcaFilamentLibrary/Elegoo PLA Sparkle @base", - "OrcaFilamentLibrary/Elegoo PLA Translucent2 @base", - "OrcaFilamentLibrary/Elegoo PLA Wood @base", - "OrcaFilamentLibrary/Elegoo PLA+ @base", - "OrcaFilamentLibrary/Elegoo PLA-CF @base", - "OrcaFilamentLibrary/Elegoo Rapid PETG @base", - "OrcaFilamentLibrary/Elegoo Rapid PLA+ @base", - "OrcaFilamentLibrary/Elegoo Rapid TPU 95A @base", - "OrcaFilamentLibrary/FilAr PETG Amarillo Lima", - "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante", - "OrcaFilamentLibrary/FilAr PETG Azul Boreal", - "OrcaFilamentLibrary/FilAr PETG Azul Francia", - "OrcaFilamentLibrary/FilAr PETG Azul Imperial", - "OrcaFilamentLibrary/FilAr PETG Blanco Antartida", - "OrcaFilamentLibrary/FilAr PETG Cian", - "OrcaFilamentLibrary/FilAr PETG Coral", - "OrcaFilamentLibrary/FilAr PETG Cristal", - "OrcaFilamentLibrary/FilAr PETG Gris Ceniza", - "OrcaFilamentLibrary/FilAr PETG Gris Plata", - "OrcaFilamentLibrary/FilAr PETG Magenta", - "OrcaFilamentLibrary/FilAr PETG Negro Azabache", - "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi", - "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio", - "OrcaFilamentLibrary/FilAr PLA Azul Francia", - "OrcaFilamentLibrary/FilAr PLA Blanco Antartida", - "OrcaFilamentLibrary/FilAr PLA Blanco Calido", - "OrcaFilamentLibrary/FilAr PLA Bronce", - "OrcaFilamentLibrary/FilAr PLA Cafe con Leche", - "OrcaFilamentLibrary/FilAr PLA Carpincho", - "OrcaFilamentLibrary/FilAr PLA Celeste Cielo", - "OrcaFilamentLibrary/FilAr PLA Cobre", - "OrcaFilamentLibrary/FilAr PLA Dorado", - "OrcaFilamentLibrary/FilAr PLA Gris Ceniza", - "OrcaFilamentLibrary/FilAr PLA Gris Pizarra", - "OrcaFilamentLibrary/FilAr PLA Gris Plata", - "OrcaFilamentLibrary/FilAr PLA Manteca", - "OrcaFilamentLibrary/FilAr PLA Marron Oxido", - "OrcaFilamentLibrary/FilAr PLA Naranja Tigre", - "OrcaFilamentLibrary/FilAr PLA Negro Azabache", - "OrcaFilamentLibrary/FilAr PLA Oro", - "OrcaFilamentLibrary/FilAr PLA Piel", - "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras", - "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto", - "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco", - "OrcaFilamentLibrary/FilAr PLA Tabaco", - "OrcaFilamentLibrary/FilAr PLA Titanio", - "OrcaFilamentLibrary/FilAr PLA Verde FilAr", - "OrcaFilamentLibrary/FilAr PLA Verde Manzana", - "OrcaFilamentLibrary/FilAr PLA Verde Oliva", - "OrcaFilamentLibrary/FilAr PLA Verde Pixel", - "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda", - "OrcaFilamentLibrary/FilAr PLA-mate Amarillo", - "OrcaFilamentLibrary/FilAr PLA-mate Azul", - "OrcaFilamentLibrary/FilAr PLA-mate Beige", - "OrcaFilamentLibrary/FilAr PLA-mate Blanco", - "OrcaFilamentLibrary/FilAr PLA-mate Bordo", - "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo", - "OrcaFilamentLibrary/FilAr PLA-mate Chocolate", - "OrcaFilamentLibrary/FilAr PLA-mate Gris", - "OrcaFilamentLibrary/FilAr PLA-mate Marron", - "OrcaFilamentLibrary/FilAr PLA-mate Naranja", - "OrcaFilamentLibrary/FilAr PLA-mate Negro", - "OrcaFilamentLibrary/FilAr PLA-mate Piel", - "OrcaFilamentLibrary/FilAr PLA-mate Rojo", - "OrcaFilamentLibrary/FilAr PLA-mate Rosa", - "OrcaFilamentLibrary/FilAr PLA-mate Uva", - "OrcaFilamentLibrary/FilAr PLA-mate Verde", - "OrcaFilamentLibrary/FilAr PLA-mate Violeta", - "OrcaFilamentLibrary/PolyLite Dual PLA @base", - "OrcaFilamentLibrary/PolyTerra Dual PLA @System", - "Prusa/Generic PLA Silk @Prusa MK4S", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ABS Rapido 0.2 nozzle", - "Qidi/QIDI ABS Rapido 0.6 nozzle", - "Qidi/QIDI ABS Rapido 0.8 nozzle", - "Qidi/QIDI PETG Tough 0.2 nozzle", - "Qidi/QIDI PETG Tough 0.6 nozzle", - "Qidi/QIDI PETG Tough 0.8 nozzle", - "Qidi/QIDI PLA Rapido 0.2 nozzle", - "Qidi/QIDI PLA Rapido 0.8 nozzle", - "Qidi/QIDI PLA-CF @0.6 nozzle", - "Qidi/QIDI PLA-CF @0.8 nozzle", - "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", - "Snapmaker/PolyLite Dual PLA @0.2 nozzle", - "Snapmaker/PolyLite J1 PLA", - "Snapmaker/PolyLite J1 PLA @0.2 nozzle", - "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", - "Snapmaker/PolyTerra J1 PLA", - "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", - "Snapmaker/Polymaker General PLA Family @U1", - "Snapmaker/Polymaker Silk PLA Family @U1", - "Snapmaker/Polymaker Tough PLA Family @U1", - "Snapmaker/Snapmaker ABS Benchy @U1", - "Snapmaker/Snapmaker Dual ABS Benchy", - "Snapmaker/Snapmaker Dual TPE", - "Snapmaker/Snapmaker Dual TPU High-Flow", - "Snapmaker/Snapmaker J1 ABS Benchy", - "Snapmaker/Snapmaker J1 TPE", - "Snapmaker/Snapmaker J1 TPU High-Flow", - "Snapmaker/Snapmaker PET @Dual", - "Snapmaker/Snapmaker PLA Full Spectrum @U1 0.4 nozzle", - "Snapmaker/Snapmaker PLA Matte @U1", - "Snapmaker/Snapmaker PLA Silk @U1", - "Snapmaker/Snapmaker PLA Silk @U1 0.2 nozzle", - "Snapmaker/Snapmaker PLA Silk @U1 0.6 nozzle", - "Snapmaker/Snapmaker PLA Silk @U1 0.8 nozzle", - "Snapmaker/Snapmaker TPE", - "Snapmaker/Snapmaker TPE @U1", - "Snapmaker/Snapmaker TPU High-Flow @U1", - "Sovol/Generic PLA Silk @Sovol SV08 MAX", - "Sovol/Polymaker PETG @Sovol SV08 MAX", - "Sovol/SUNLU PETG @Sovol SV08 MAX", - "Sovol/Sovol Zero PETG HS Nozzle", - "Sovol/Sovol Zero PLA Basic HS Nozzle", - "Sovol/Sovol Zero PLA Silk HS Nozzle", - "Wanhao France/YUMI PETG", - "Wanhao France/YUMI PLA Bowden", - "Wanhao France/YUMI PLA Direct Drive", - "Z-Bolt/Generic ABS HT @Z-Bolt Base" - ], "ids": { - "OF02UAVh": [ - "Creality/Soleyin Ultra PLA" - ], - "OF03RK6r": [ - "BBL/BETA PLA Metal" - ], - "OF0AquDh": [ - "Flashforge/FusRock S-Multi" - ], - "OF0EYBWQ": [ - "BBL/addnorth PETG Flame v0" - ], - "OF0FfcAG": [ - "Anycubic/Anycubic TPU for ACE" - ], - "OF0NgY1y": [ - "BBL/COEX NYLEX PA6-CF", - "OrcaFilamentLibrary/COEX NYLEX PA6-CF" - ], - "OF0R5Wc7": [ - "Artillery/Artillery PLA Tough" - ], - "OF0UJcb6": [ - "BBL/PolyLite PETG", - "OrcaFilamentLibrary/PolyLite PETG", - "Snapmaker/PolyLite PETG" - ], - "OF0VpkBM": [ - "Snapmaker/PolyLite PETG Translucent" - ], - "OF0Vtzaw": [ - "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" - ], - "OF0b7M1z": [ - "SeeMeCNC/SeeMeCNC PA-CF" - ], - "OF0c7mnL": [ - "InfiMech/InfiMech ABS" - ], - "OF0gGRWk": [ - "BBL/Panchroma PLA Glow", - "OrcaFilamentLibrary/Panchroma PLA Glow", - "Snapmaker/Panchroma PLA Glow" - ], - "OF0h7ERL": [ - "Elegoo/Elegoo PAHT-CF", - "OrcaFilamentLibrary/Elegoo PAHT-CF" - ], - "OF0kCNDK": [ - "BBL/Panchroma PLA Luminous", - "OrcaFilamentLibrary/Panchroma PLA Luminous", - "Snapmaker/Panchroma PLA Luminous" - ], - "OF0omtEb": [ - "Snapmaker/Fiberon ASA-CF08" - ], - "OF0pzFLc": [ - "BBL/COEX PLA+Silk", - "OrcaFilamentLibrary/COEX PLA+Silk" - ], - "OF0w7OpJ": [ - "Qidi/QIDI ABS Rapido 0.8 nozzle" - ], - "OF0wBGNx": [ - "BBL/Bambu ASA-CF", - "OrcaFilamentLibrary/Bambu ASA-CF" - ], - "OF0wz84w": [ - "Qidi/QIDI ABS Rapido 0.6 nozzle" - ], - "OF0yFLkY": [ - "Anycubic/Anycubic ASA" - ], - "OF112FvY": [ - "Anycubic/Generic PETG Basic" - ], - "OF1ID4N1": [ - "BBL/addnorth PA6 Addlantis" - ], - "OF1N1qMK": [ - "BBL/Panchroma PLA UV Shift", - "OrcaFilamentLibrary/Panchroma PLA UV Shift", - "Snapmaker/Panchroma PLA UV Shift" - ], - "OF1Pke8t": [ - "BBL/Overture Easy PLA", - "OrcaFilamentLibrary/Overture Easy PLA" - ], - "OF1UNk9P": [ - "BBL/Generic PP", - "Creality/Generic PP", - "OrcaFilamentLibrary/Generic PP", - "Tiertime/Generic PP" - ], - "OF1W7c76": [ - "Qidi/QIDI ASA-CF" - ], - "OF1d7c3A": [ - "Snapmaker/Snapmaker ASA" - ], - "OF1dpPrW": [ - "Qidi/Bambu PLA" - ], - "OF1hznGB": [ - "Elegoo/Elegoo PLA PRO", - "OrcaFilamentLibrary/Elegoo PLA PRO" - ], - "OF223rZv": [ - "Anycubic/Anycubic ABS" - ], - "OF2EB9Iz": [ - "Volumic/Volumic ASA Ultra" - ], - "OF2EK9F1": [ - "OrcaFilamentLibrary/FilAr PLA-mate Violeta" - ], - "OF2GCW1l": [ - "BBL/SUNLU PETG", - "Flashforge/SUNLU PETG", - "OrcaFilamentLibrary/SUNLU PETG", - "Sovol/SUNLU PETG" - ], - "OF2TQpOO": [ - "Qidi/QIDI PLA Silk" - ], - "OF2VFe4J": [ - "BBL/Bambu PAHT-CF", - "OrcaFilamentLibrary/Bambu PAHT-CF" - ], - "OF2Z1nT5": [ - "OrcaFilamentLibrary/FilAr PETG Azul Imperial" - ], - "OF2hfMcG": [ - "OrcaArena/Arena PLA-CF" - ], - "OF2pj5l5": [ - "BBL/Overture Super PLA+", - "OrcaFilamentLibrary/Overture Super PLA+" - ], - "OF2xccEe": [], - "OF30Ftju": [ - "Elegoo/Elegoo Rapid TPU 95A", - "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" - ], - "OF342jVN": [ - "BBL/Bambu PLA Tough+" - ], - "OF3F63OE": [ - "re3D/re3D PETG" - ], - "OF3IKafc": [ - "Qidi/QIDI PLA Rapido Matte" - ], - "OF3OMgrI": [ - "Creality/CR-Silk" - ], - "OF3PDEw3": [ - "BBL/BETA PLA High Speed" - ], - "OF3WQaKK": [ - "Creality/CR-PETG" - ], - "OF3dJf4E": [ - "Volumic/Volumic PLA Ultra (Performance)" - ], - "OF3fwO8b": [ - "FlyingBear/FlyingBear PLA Basic" - ], - "OF3kBrdA": [ - "Creality/eSUN PETG", - "OrcaFilamentLibrary/eSUN PETG" - ], - "OF3msXEa": [ - "Snapmaker/Snapmaker Dual PETG-CF" - ], - "OF3ydJTT": [ - "InfiMech/InfiMech PLA Hyper" - ], - "OF43Raws": [ - "Snapmaker/PolyTerra J1 PLA" - ], - "OF44ERDr": [ - "Snapmaker/Polymaker General PLA Family" - ], - "OF44VYzK": [ - "OrcaFilamentLibrary/FilAr PETG Azul Francia" - ], - "OF4APyxe": [ - "Creality/Hyper PAHT-CF" - ], - "OF4GM5qX": [ - "Ratrig/Generic ASA BigNozzle" - ], - "OF4KsW72": [], - "OF4Nhggz": [ - "Artillery/Artillery PLA Basic+" - ], - "OF4PKvem": [ - "BBL/BETA PLA Fluorescence" - ], - "OF4QZANi": [ - "BBL/BETA TPU Matte" - ], - "OF4RvVuU": [ - "BBL/Bambu PPS-CF" - ], - "OF4S3To3": [ - "Qidi/QIDI PETG Rapido" - ], - "OF4WB37S": [ - "Snapmaker/Snapmaker PETG" - ], - "OF4XTfoI": [ - "BBL/BETA PETG Marble" - ], - "OF4f8vVp": [ - "WonderMaker/WonderMaker PET-CF" - ], - "OF4iWKrE": [ - "Qidi/QIDI PETG-CF" - ], - "OF4nQ62r": [ - "Qidi/QIDI PLA Basic" - ], - "OF4ulo9Y": [ - "WonderMaker/WonderMaker PVA" - ], - "OF53eLVD": [ - "Blocks/Generic ASA-CF", - "Creality/Generic ASA-CF", - "Elegoo/Generic ASA-CF" - ], - "OF54B0S0": [ - "BBL/Bambu PPA-CF", - "OrcaFilamentLibrary/Bambu PPA-CF" - ], - "OF54SvEe": [ - "Prusa/Prusament PA-CF" - ], - "OF55jHAJ": [ - "Prusa/Generic ABS HF" - ], - "OF5B9sUc": [ - "BBL/Fiberon PA6-GF25" - ], - "OF5BN24W": [ - "Flashforge/Flashforge PPA-GF" - ], - "OF5BXhHF": [ - "BBL/BETA PLA High Temp" - ], - "OF5CgdDq": [ - "BBL/PolyLite PLA", - "OrcaArena/PolyLite PLA", - "OrcaFilamentLibrary/PolyLite PLA", - "Qidi/PolyLite PLA", - "Snapmaker/PolyLite PLA" - ], - "OF5LAnla": [ - "BBL/BETA PLA Gradient" - ], - "OF5NqBfC": [ - "Wanhao France/YUMI PETG" - ], - "OF5P4jgA": [ - "OrcaFilamentLibrary/FilAr PLA Dorado" - ], - "OF5PtjTp": [ - "Anycubic/Anycubic PLA Glow" - ], - "OF5SJ3jz": [ - "Flashforge/Flashforge ABS" - ], - "OF5YVJXH": [ - "Artillery/Artillery ASA" - ], - "OF5c6nq3": [ - "Flashforge/Generic TPU-64D" - ], - "OF5lGPup": [ - "WonderMaker/WonderMaker PETG Basic" - ], - "OF5nlfKY": [ - "OrcaFilamentLibrary/FilAr PLA Oro" - ], - "OF5oNRED": [ - "Eryone/Eryone PP" - ], - "OF5oXk4M": [ - "Anycubic/Polymaker PLA Pro", - "Snapmaker/Polymaker PLA Pro" - ], - "OF5rnhjh": [], - "OF5tX6va": [ - "Ratrig/Generic TPU BigNozzle" - ], - "OF5umxxT": [ - "BBL/PolyLite PLA Glow", - "Snapmaker/PolyLite PLA Glow" - ], - "OF5vgi2G": [ - "OrcaFilamentLibrary/FilAr PLA-mate Azul" - ], - "OF65InrS": [ - "Snapmaker/Snapmaker TPU" - ], - "OF66KUAN": [ - "Creality/PolySonic PLA" - ], - "OF6ATsCF": [ - "Snapmaker/Snapmaker Dual PLA-CF" - ], - "OF6H51Xx": [ - "Snapmaker/Polymaker PETG", - "Sovol/Polymaker PETG" - ], - "OF6Ll8lK": [ - "Elegoo/Elegoo PETG Translucent", - "OrcaFilamentLibrary/Elegoo PETG Translucent" - ], - "OF6MOPWx": [ - "Creality/Generic PET", - "Elegoo/Generic PET", - "Flashforge/Generic PET" - ], - "OF6TuVAg": [ - "Snapmaker/Snapmaker Breakaway Support For PLA", - "Snapmaker/Snapmaker J1 PVA" - ], - "OF6Yn69v": [ - "BBL/BETA TPU 90A" - ], - "OF6kj4jI": [ - "iQ/Fiberthree PACF Pro P2" - ], - "OF6qAuyi": [ - "Flashforge/Flashforge PLA Matte" - ], - "OF6qw3Wb": [ - "BBL/BETA PAHT-CF" - ], - "OF6rdQ6M": [ - "BBL/Generic PPS-CF", - "Creality/Generic PPS-CF", - "Tiertime/Generic PPS-CF" - ], - "OF70zbGS": [ - "Creality/Hyper L-W PLA" - ], - "OF71b7qO": [ - "BBL/addnorth PLA E-PLA" - ], - "OF72YYTd": [ - "Snapmaker/Snapmaker ABS" - ], - "OF74KeQR": [ - "BBL/Generic PHA", - "OrcaFilamentLibrary/Generic PHA", - "Tiertime/Generic PHA" - ], - "OF79Fbo6": [ - "Cubicon/Cubicon PC" - ], - "OF7H3VJM": [ - "OrcaFilamentLibrary/eSUN PLA-Marble" - ], - "OF7OqDp3": [ - "Tiertime/Tiertime PLA-CF" - ], - "OF7SliVn": [ - "Snapmaker/PolyLite J1 PLA" - ], - "OF7c9fln": [ - "Anycubic/Anycubic PLA Translucent" - ], - "OF7lOgYF": [ - "BBL/Generic PETG HF", - "OrcaFilamentLibrary/Generic PETG HF", - "Prusa/Generic PETG HF" - ], - "OF7lwj52": [ - "CoLiDo/CoLiDo PETG" - ], - "OF7nBAd3": [ - "Eryone/Eryone Silk PLA" - ], - "OF7pjCsO": [ - "Flashforge/FusRock PAHT" - ], - "OF7tt7DO": [ - "Cubicon/Cubicon PLA+" - ], - "OF8GnyFU": [ - "Creality/Hyper ABS" - ], - "OF8GtyKJ": [ - "Flashforge/Flashforge TPU-64D" - ], - "OF8Hx3Pi": [ - "Cubicon/Cubicon PETG" - ], - "OF8Jl6NT": [ - "Snapmaker/Snapmaker J1 PET" - ], - "OF8O09RG": [ - "Flashforge/Flashforge HS PLA Burnt Ti" - ], - "OF8QdQwS": [ - "BBL/BETA PLA Silk+" - ], - "OF8Tlg47": [ - "BBL/Generic PPA-GF", - "OrcaFilamentLibrary/Generic PPA-GF", - "Tiertime/Generic PPA-GF" - ], - "OF8aFWfQ": [ - "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" - ], - "OF8dCquh": [ - "Snapmaker/Snapmaker J1 ABS Benchy" - ], - "OF8eaY7j": [ - "Creality/Generic PA612-CF" - ], - "OF8jh0Lk": [ - "OrcaFilamentLibrary/FilAr PLA-mate Marron" - ], - "OF8kJys9": [ - "Eryone/Eryone PETG" - ], - "OF8tPByX": [ - "BBL/Generic PPA-CF", - "OrcaFilamentLibrary/Generic PPA-CF", - "Tiertime/Generic PPA-CF" - ], - "OF8wE5l7": [ - "Artillery/Artillery PETG Basic" - ], - "OF99UMPq": [ - "BBL/COEX ABS", - "OrcaFilamentLibrary/COEX ABS" - ], - "OF99vXPs": [], - "OF9EHUKK": [ - "Qidi/QIDI TPU-GF" - ], - "OF9HCdyQ": [ - "Afinia/Afinia PLA" - ], - "OF9OlTWH": [ - "BBL/Bambu PLA Marble", - "OrcaFilamentLibrary/Bambu PLA Marble" - ], - "OF9PELEb": [ - "Qidi/QIDI UltraPA-CF25" - ], - "OF9UJOGF": [ - "Anycubic/Anycubic PETG-CF" - ], - "OF9cAwMK": [ - "Flashforge/Flashforge PLA-CF" - ], - "OF9emAI9": [ - "Ratrig/RatRig PunkFil PETG" - ], - "OFA026vt": [ - "OrcaArena/Arena PA-CF" - ], - "OFAC7Wyu": [ - "Artillery/Artillery PLA Matte" - ], - "OFAIBCLJ": [ - "Elegoo/Generic ABS-CF" - ], - "OFAIrQXu": [ - "Creality/Creality Hyper PLA" - ], - "OFANFm4x": [ - "Qidi/QIDI PLA Rapido Metal" - ], - "OFAO9A7J": [ - "Sovol/Sovol Zero PLA Silk HS Nozzle" - ], - "OFAZllAN": [ - "Artillery/Artillery PLA-CF" - ], - "OFAc0Pr3": [ - "BBL/Fiberon PET-CF17" - ], - "OFAcJkl1": [ - "BBL/addnorth PETG-CF Rigid X" - ], - "OFAebKg8": [ - "Flashforge/Flashforge PLA Metal" - ], - "OFAnyRUI": [ - "BBL/Bambu Support For PLA", - "OrcaFilamentLibrary/Bambu Support For PLA" - ], - "OFAt6ec0": [ - "OrcaFilamentLibrary/FilAr PLA Marron Oxido" - ], - "OFB5SmWk": [ - "OrcaFilamentLibrary/Valment PLA Galaxy" - ], - "OFBBgw7B": [ - "WonderMaker/WonderMaker PLA Wood" - ], - "OFBJAdLw": [ - "LH/LHS PCTG" - ], - "OFBLktDy": [ - "Creality/Soleyin Basic PETG" - ], - "OFBSW57R": [ - "BBL/Bambu PLA Aero", - "OrcaFilamentLibrary/Bambu PLA Aero" - ], - "OFBUIlZ7": [ - "Elegoo/Elegoo PLA+", - "OrcaFilamentLibrary/Elegoo PLA+" - ], - "OFBlFMVp": [ - "Snapmaker/Snapmaker Dual PETG" - ], - "OFBoSWxb": [ - "BBL/PolyLite PLA Luminous", - "Snapmaker/PolyLite PLA Luminous" - ], - "OFBsbMMF": [ - "BBL/addnorth PA-CF Adura X" - ], - "OFBw6eEG": [ - "BBL/Overture Matte PLA", - "OrcaFilamentLibrary/Overture Matte PLA" - ], - "OFC1PzXz": [ - "Creality/Hyper Luminous" - ], - "OFC5f4Ay": [ - "RH3D/Generic PCCF" - ], - "OFC78WGQ": [ - "BBL/Panchroma PLA Starlight", - "OrcaFilamentLibrary/Panchroma PLA Starlight", - "Snapmaker/Panchroma PLA Starlight" - ], - "OFCD8qiU": [ - "BBL/Generic EVA", - "OrcaFilamentLibrary/Generic EVA", - "Tiertime/Generic EVA" - ], - "OFCIUsWh": [ - "BBL/Panchroma PLA Translucent", - "OrcaFilamentLibrary/Panchroma PLA Translucent", - "Snapmaker/Panchroma PLA Translucent" - ], - "OFCJpR7a": [ - "Creality/HP Ultra PLA" - ], - "OFCZsqXg": [ - "Creality/Hyper PLA" - ], - "OFCccVrQ": [ - "OrcaFilamentLibrary/PolyTerra Dual PLA", - "Snapmaker/PolyTerra Dual PLA" - ], - "OFCidU7j": [ - "OrcaFilamentLibrary/DREMC ABS-GF" - ], - "OFCjG251": [ - "OrcaFilamentLibrary/FilAr PLA-mate Verde" - ], - "OFCn83wF": [ - "Flashforge/FusRock S-PAHT" - ], - "OFCnywiC": [ - "Tiertime/Tiertime PET-CF" - ], - "OFCoRobU": [ - "OrcaFilamentLibrary/Elas ASA" - ], - "OFCp3Bgo": [ - "Anycubic/Anycubic PLA SE" - ], - "OFCuaCer": [ - "Volumic/Désactivé" - ], - "OFD21ije": [ - "Cubicon/Cubicon PA-CF" - ], - "OFD8loeT": [ - "re3D/re3D rPETG" - ], - "OFD9taow": [ - "FlyingBear/FlyingBear PLA Hyper" - ], - "OFDETOM6": [ - "Creality/eSUN PLA-Matte", - "OrcaFilamentLibrary/eSUN PLA-Matte" - ], - "OFDGigEI": [ - "BBL/Bambu PLA Dynamic", - "OrcaFilamentLibrary/Bambu PLA Dynamic" - ], - "OFDIrhbu": [ - "Qidi/QIDI PC/ABS-FR" - ], - "OFDJU6R3": [ - "Afinia/Afinia TPU" - ], - "OFDKIKyw": [ - "Snapmaker/Snapmaker Dual PVA" - ], - "OFDKgoqx": [ - "Flashforge/Flashforge PLA" - ], - "OFDRpXLZ": [ - "FlyingBear/Other PETG", - "InfiMech/Other PETG" - ], - "OFDSrzZ8": [ - "Anker/Generic PLA", - "Anycubic/Generic PLA", - "Artillery/Generic PLA", - "BBL/Generic PLA", - "Blocks/Generic PLA", - "CONSTRUCT3D/Generic PLA", - "Chuanying/Generic PLA", - "Co Print/Generic PLA", - "CoLiDo/Generic PLA", - "Comgrow/Generic PLA", - "Creality/Generic PLA", - "Custom/Generic PLA", - "DeltaMaker/Generic PLA", - "Dremel/Generic PLA", - "Elegoo/Generic PLA", - "FLSun/Generic PLA", - "Flashforge/Generic PLA", - "FlyingBear/Generic PLA", - "Ginger Additive/Generic PLA", - "InfiMech/Generic PLA", - "LONGER/Generic PLA", - "Lulzbot/Generic PLA", - "OrcaArena/Generic PLA", - "OrcaFilamentLibrary/Generic PLA", - "Peopoly/Generic PLA", - "Phrozen/Generic PLA", - "Prusa/Generic PLA", - "Qidi/Generic PLA", - "RH3D/Generic PLA", - "Ratrig/Generic PLA", - "SecKit/Generic PLA", - "Sovol/Generic PLA", - "Tiertime/Generic PLA", - "Vzbot/Generic PLA", - "Z-Bolt/Generic PLA" - ], - "OFDdEaoL": [ - "re3D/re3D PLA" - ], - "OFDe8uyM": [ - "OrcaFilamentLibrary/Valment PLA" - ], - "OFDgQaca": [ - "FlyingBear/FlyingBear PETG" - ], - "OFDpW3J8": [ - "OrcaFilamentLibrary/FILL3D PLA Basic" - ], - "OFDtop41": [ - "Creality/Generic Support for PA" - ], - "OFDu1qE7": [ - "Flashforge/FusRock PET-CF" - ], - "OFDvXujf": [ - "Anker/Generic PVA", - "Anycubic/Generic PVA", - "BBL/Generic PVA", - "Blocks/Generic PVA", - "Chuanying/Generic PVA", - "Creality/Generic PVA", - "Custom/Generic PVA", - "FLSun/Generic PVA", - "Flashforge/Generic PVA", - "OrcaArena/Generic PVA", - "OrcaFilamentLibrary/Generic PVA", - "Prusa/Generic PVA", - "Qidi/Generic PVA", - "Ratrig/Generic PVA", - "SecKit/Generic PVA", - "Tiertime/Generic PVA", - "Vzbot/Generic PVA" - ], - "OFDvqJ6n": [ - "OrcaFilamentLibrary/Overture ABS Basic" - ], - "OFDwBwO5": [ - "Prusa/Generic PVA HF" - ], - "OFDxfPgH": [ - "BBL/Bambu PLA Sparkle", - "OrcaFilamentLibrary/Bambu PLA Sparkle" - ], - "OFDxxTpW": [ - "Flashforge/Flashforge HS PETG" - ], - "OFE0NFRh": [ - "BBL/COEX TPU 60A", - "OrcaFilamentLibrary/COEX TPU 60A" - ], - "OFEGNJD4": [ - "BBL/Bambu PLA Silk", - "OrcaFilamentLibrary/Bambu PLA Silk" - ], - "OFEOnBj6": [ - "Snapmaker/Snapmaker PLA Lite" - ], - "OFEWYR89": [ - "Anker/Generic PLA+", - "Qidi/Generic PLA+" - ], - "OFEZ449N": [ - "OrcaFilamentLibrary/FilAr PLA-mate Uva" - ], - "OFEZpel7": [ - "Volumic/PPS Carbone (Performance)" - ], - "OFEabreg": [ - "Anycubic/Fiberon PA6-CF20", - "BBL/Fiberon PA6-CF20", - "Snapmaker/Fiberon PA6-CF20" - ], - "OFEbIx49": [ - "WonderMaker/WonderMaker PLA Marble" - ], - "OFEhuUNq": [], - "OFEj7sca": [ - "Cubicon/Cubicon PC" - ], - "OFEjbwqG": [ - "BBL/PolyTerra PLA+", - "Snapmaker/PolyTerra PLA+" - ], - "OFEkPBwx": [ - "BBL/Bambu PLA Glow", - "OrcaFilamentLibrary/Bambu PLA Glow" - ], - "OFEmsric": [ - "Snapmaker/Snapmaker PA-CF" - ], - "OFEnbt6D": [ - "Peopoly/Peopoly Lancer PLA-C" - ], - "OFEswT5W": [ - "BBL/Bambu PLA-CF", - "OrcaFilamentLibrary/Bambu PLA-CF" - ], - "OFEvEfw5": [ - "Flashforge/Flashforge PA" - ], - "OFEwRwmL": [ - "Cubicon/Cubicon PLA" - ], - "OFF3cuzT": [ - "Creality/Generic TPU 64D" - ], - "OFF5o7b2": [ - "BBL/BETA PLA Youth" - ], - "OFF9OKoY": [ - "BBL/PolyLite PLA Pro", - "OrcaFilamentLibrary/PolyLite PLA Pro", - "Snapmaker/PolyLite PLA Pro" - ], - "OFF9cgY5": [ - "Snapmaker/Snapmaker PLA Matte" - ], - "OFFAWVf0": [ - "Qidi/QIDI PC-ABS-FR" - ], - "OFFFg2Pf": [ - "Flashforge/Flashforge ASA Basic" - ], - "OFFNYwWR": [ - "BBL/Bambu PA-CF", - "OrcaFilamentLibrary/Bambu PA-CF" - ], - "OFFP4ORR": [ - "Creality/Creality Hyper ABS" - ], - "OFFX1DRD": [ - "FlyingBear/FlyingBear PC" - ], - "OFFZ458u": [ - "Snapmaker/Fiberon PA612-ESD" - ], - "OFFbQscs": [ - "Creality/eSUN PETG-Basic" - ], - "OFFbSnCD": [ - "BBL/Bambu PLA Translucent" - ], - "OFFfJ09N": [ - "BBL/BETA PETG Glow" - ], - "OFFkCLBl": [ - "BBL/Panchroma PLA Galaxy", - "OrcaFilamentLibrary/Panchroma PLA Galaxy", - "Snapmaker/Panchroma PLA Galaxy" - ], - "OFFvzqcd": [ - "BBL/Bambu PETG Basic", - "OrcaFilamentLibrary/Bambu PETG Basic" - ], - "OFFwJWea": [ - "Anycubic/Anycubic PLA Silk" - ], - "OFG0kOKX": [ - "Volumic/Volumic PETG Ultra" - ], - "OFG2RkhN": [ - "Creality/CR-TPU" - ], - "OFG4do34": [ - "Qidi/Qidi ASA-Aero" - ], - "OFGJ1nxs": [ - "FlyingBear/Other PLA", - "InfiMech/Other PLA" - ], - "OFGVwfK0": [ - "OrcaFilamentLibrary/FilAr PLA-mate Gris" - ], - "OFGVxj2A": [ - "BBL/BETA PLA Wood" - ], - "OFGc9l16": [ - "BBL/BETA PLA Glow" - ], - "OFGcLA5R": [ - "OrcaFilamentLibrary/FilAr PLA-mate Beige" - ], - "OFGcMkEB": [ - "Creality/HP-TPU" - ], - "OFGdP6Na": [ - "Volumic/Volumic PVA" - ], - "OFGkyftV": [ - "BBL/Overture Silk PLA", - "OrcaFilamentLibrary/Overture Silk PLA" - ], - "OFGwT5Av": [ - "Creality/Creality Hyper PLA-CF" - ], - "OFGwZmgS": [ - "Creality/CR-ABS" - ], - "OFGxC8gB": [ - "Creality/CR-Wood" - ], - "OFGxuI0n": [ - "Flashforge/Flashforge PA-CF" - ], - "OFH2nN08": [ - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" - ], - "OFH57ibH": [ - "Snapmaker/Polymaker Silk PLA Family" - ], - "OFH7b12v": [ - "Creality/Generic PAHT-CF" - ], - "OFHAccHz": [ - "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" - ], - "OFHHwrd1": [ - "BBL/addnorth PETG Base" - ], - "OFHWSM21": [ - "BBL/Fiberon PET-CF", - "OrcaFilamentLibrary/Fiberon PET-CF" - ], - "OFHa48An": [ - "BBL/Bambu PET-CF", - "OrcaFilamentLibrary/Bambu PET-CF" - ], - "OFHaYaB1": [ - "Creality/eSUN PET-Basic" - ], - "OFHf2lKK": [ - "FlyingBear/FlyingBear TPU Basic" - ], - "OFHfzQXo": [ - "OrcaFilamentLibrary/Eolas Prints PLA Transition" - ], - "OFHknN4v": [ - "Anycubic/Polymaker PLA Pro Metallic", - "Snapmaker/Polymaker PLA Pro Metallic" - ], - "OFHmPYRy": [ - "BBL/SUNLU PLA+ 2.0", - "Flashforge/SUNLU PLA+ 2.0", - "OrcaFilamentLibrary/SUNLU PLA+ 2.0" - ], - "OFI2MKy7": [ - "BBL/BETA PEBA 90A" - ], - "OFI6WZpn": [ - "OrcaArena/Arena Support W" - ], - "OFIBXa0k": [ - "OrcaFilamentLibrary/FilAr PLA-mate Rojo" - ], - "OFIBbYO5": [ - "BBL/Bambu TPU for AMS" - ], - "OFIE3vOf": [ - "Anycubic/Anycubic PLA Matte" - ], - "OFIK2H3G": [ - "Flashforge/Flashforge HS PLA" - ], - "OFIKZxPF": [ - "Creality/Generic PLA Wood" - ], - "OFIPjqHt": [ - "OrcaArena/Arena Support G" - ], - "OFIRUqWi": [ - "Creality/eSUN PLA-Silk" - ], - "OFIVWJPm": [ - "InfiMech/InfiMech TPU" - ], - "OFIWMSGX": [ - "Qidi/HATCHBOX PETG" - ], - "OFIZMQwM": [ - "LH/LHS TPU" - ], - "OFIamQnD": [ - "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" - ], - "OFIegjmD": [ - "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" - ], - "OFIfnzxC": [ - "BBL/Bambu Support For PLA/PETG", - "OrcaFilamentLibrary/Bambu Support For PLA/PETG" - ], - "OFIgbDHq": [ - "Anycubic/Anycubic PLA Luminous" - ], - "OFIxOuOu": [ - "BBL/PolyLite PLA Starlight", - "Snapmaker/PolyLite PLA Starlight" - ], - "OFJ3F2jm": [ - "Flashforge/Flashforge PLA Basic" - ], - "OFJ3HRsR": [ - "OrcaArena/Arena ABS" - ], - "OFJHBEGD": [], - "OFJJ0Ar3": [ - "Flashforge/Flashforge PLA Galaxy" - ], - "OFJNeELv": [ - "OrcaFilamentLibrary/FILL3D PA" - ], - "OFJOFnOZ": [ - "BBL/AliZ PETG-CF", - "OrcaFilamentLibrary/AliZ PETG-CF" - ], - "OFJQDUk3": [ - "OrcaFilamentLibrary/FilAr PETG Cristal" - ], - "OFJS560n": [], - "OFJWKoYG": [ - "iQ/Material4Print ABS Natur P1" - ], - "OFJYpVAQ": [ - "Flashforge/Generic TPU-90A" - ], - "OFJgijky": [ - "BBL/PolyLite CosPLA", - "Snapmaker/PolyLite CosPLA" - ], - "OFJhT2fd": [ - "Snapmaker/Snapmaker Dual ABS" - ], - "OFJnEaCp": [ - "BBL/BETA PLA Transparent" - ], - "OFJrvXth": [ - "Snapmaker/Snapmaker ABS Benchy" - ], - "OFJs1ToM": [ - "BBL/COEX NYLEX UNFILLED " - ], - "OFJu1XwK": [ - "OrcaFilamentLibrary/NIT PETG" - ], - "OFJxSqO4": [ - "Wanhao France/YUMI PLA Direct Drive" - ], - "OFK7830e": [ - "BBL/BETA TPU 95A" - ], - "OFK8XHPn": [ - "Qidi/Overture ABS" - ], - "OFKIQO2W": [ - "Qidi/QIDI PLA Rapido" - ], - "OFKKajh6": [ - "OrcaFilamentLibrary/FilAr PLA Gris Plata" - ], - "OFKTGKJU": [ - "Flashforge/FusRock PET" - ], - "OFKTSiYF": [ - "OrcaFilamentLibrary/FilAr PLA Blanco Calido" - ], - "OFKUEXPA": [ - "Snapmaker/Snapmaker Dual ASA" - ], - "OFKW5hEW": [ - "Flashforge/FusRock PAHT-CF" - ], - "OFKWWgyp": [ - "OrcaFilamentLibrary/FilAr PLA Carpincho" - ], - "OFKYBAWe": [ - "BBL/BETA PLA Marble" - ], - "OFKZ9skj": [ - "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" - ], - "OFKbdiiJ": [ - "Creality/PolySonic PLA Pro" - ], - "OFKfJTwL": [ - "Qidi/QIDI PET-CF" - ], - "OFKgmsqE": [ - "Qidi/QIDI PAHT-CF" - ], - "OFKhMPeX": [ - "BBL/Bambu PC", - "OrcaFilamentLibrary/Bambu PC" - ], - "OFKiSMWR": [ - "BBL/Panchroma PLA Marble", - "OrcaFilamentLibrary/Panchroma PLA Marble", - "Snapmaker/Panchroma PLA Marble" - ], - "OFKyNkQz": [ - "BBL/BETA PETG UV Color Change" - ], - "OFL9aRjN": [ - "Snapmaker/Snapmaker PETG HF" - ], - "OFLAXKqP": [ - "WonderMaker/WonderMaker TPU 95A" - ], - "OFLC1oRH": [ - "Flashforge/Flashforge PPA-CF" - ], - "OFLJ8S6I": [ - "BBL/SUNLU Wood PLA", - "Flashforge/SUNLU Wood PLA", - "OrcaFilamentLibrary/SUNLU Wood PLA" - ], - "OFLNgV3C": [], - "OFLOf6Sc": [ - "Tiertime/Tiertime TPU 95A" - ], - "OFLPAxz3": [ - "Anker/Generic ASA", - "Anycubic/Generic ASA", - "Artillery/Generic ASA", - "BBL/Generic ASA", - "Blocks/Generic ASA", - "Chuanying/Generic ASA", - "Creality/Generic ASA", - "Custom/Generic ASA", - "Elegoo/Generic ASA", - "FLSun/Generic ASA", - "Flashforge/Generic ASA", - "OrcaArena/Generic ASA", - "OrcaFilamentLibrary/Generic ASA", - "Prusa/Generic ASA", - "Qidi/Generic ASA", - "RH3D/Generic ASA", - "Ratrig/Generic ASA", - "SecKit/Generic ASA", - "Tiertime/Generic ASA", - "Vzbot/Generic ASA" - ], - "OFLTYJW0": [ - "Snapmaker/Snapmaker PLA Translucent" - ], - "OFLXvuMr": [ - "Elegoo/Elegoo Rapid PETG", - "OrcaFilamentLibrary/Elegoo Rapid PETG" - ], - "OFLYDngx": [ - "Qidi/Bambu PETG" - ], - "OFLakOUI": [ - "Anker/Generic PC", - "Anycubic/Generic PC", - "BBL/Generic PC", - "Blocks/Generic PC", - "Creality/Generic PC", - "Custom/Generic PC", - "Elegoo/Generic PC", - "FLSun/Generic PC", - "FlyingBear/Generic PC", - "InfiMech/Generic PC", - "OrcaArena/Generic PC", - "OrcaFilamentLibrary/Generic PC", - "Prusa/Generic PC", - "Qidi/Generic PC", - "Ratrig/Generic PC", - "SecKit/Generic PC", - "Sovol/Generic PC", - "Tiertime/Generic PC", - "Vzbot/Generic PC" - ], - "OFLbXwoL": [ - "Artillery/Artillery PLA Silk" - ], - "OFLbdkrE": [ - "Snapmaker/Snapmaker J1 PLA Eco" - ], - "OFLcd093": [ - "Elegoo/Elegoo PETG", - "OrcaFilamentLibrary/Elegoo PETG" - ], - "OFLfywkp": [ - "Afinia/Afinia ABS+" - ], - "OFLgwqp2": [ - "Creality/Hyper PETG-GF" - ], - "OFLjDYxH": [ - "BBL/addnorth PLA X-PLA High Speed" - ], - "OFLqgSuX": [ - "BBL/BETA PLA-CF" - ], - "OFLzx3J4": [ - "Creality/Hyper Marble" - ], - "OFM0xjBG": [ - "Creality/CR-PLA Matte" - ], - "OFM4iJlv": [ - "Creality/Generic PA12-CF" - ], - "OFM91vZs": [ - "BBL/Overture ASA", - "OrcaFilamentLibrary/Overture ASA" - ], - "OFMDHOcT": [ - "Qidi/QIDI TPU-Aero" - ], - "OFMK5gVo": [ - "WonderMaker/WonderMaker PLA Basic" - ], - "OFML2aVd": [ - "Anycubic/Anycubic TPU 95A" - ], - "OFMSvS8z": [ - "Artillery/Artillery PA" - ], - "OFMTK0UC": [ - "BBL/Bambu Support For PA/PET", - "OrcaFilamentLibrary/Bambu Support For PA/PET" - ], - "OFMUWNkp": [ - "BBL/SUNLU PLA+", - "Flashforge/SUNLU PLA+", - "OrcaFilamentLibrary/SUNLU PLA+" - ], - "OFMZvH0z": [ - "BBL/Overture Rock PLA", - "OrcaFilamentLibrary/Overture Rock PLA" - ], - "OFMjtqTC": [ - "BBL/Bambu PLA Wood", - "OrcaFilamentLibrary/Bambu PLA Wood" - ], - "OFMkAW6r": [ - "Flashforge/Flashforge PLA Color Change" - ], - "OFMpxamb": [ - "Flashforge/Flashforge PETG" - ], - "OFMsDGbs": [ - "Anycubic/Anycubic TPU" - ], - "OFMuXBmO": [ - "OrcaFilamentLibrary/Elas PLA Basic" - ], - "OFMzRg65": [ - "BBL/BETA PLA PRO" - ], - "OFN8QBhu": [ - "BBL/addnorth PLA Wood" - ], - "OFN9fefN": [ - "Cubicon/Cubicon ABS-A100" - ], - "OFNBlAPT": [ - "OrcaArena/Arena PETG Basic" - ], - "OFNGTH3w": [ - "Tiertime/Tiertime PLA" - ], - "OFNQKF0M": [ - "Tiertime/Tiertime ABS" - ], - "OFNSYu5h": [ - "Volumic/Volumic PP Ultra (Performance)" - ], - "OFNU9YIW": [ - "OrcaFilamentLibrary/FilAr PETG Azul Boreal" - ], - "OFNemJM6": [ - "OrcaFilamentLibrary/FilAr PLA Cobre" - ], - "OFNjku08": [ - "CONSTRUCT3D/Generic High Flow PETG" - ], - "OFNk8AvA": [ - "BBL/BETA PETG Gradient" - ], - "OFNk8bxk": [ - "BBL/Bambu PA6-GF", - "OrcaFilamentLibrary/Bambu PA6-GF" - ], - "OFNstOna": [ - "Eryone/Eryone PETG-CF" - ], - "OFNvBIL0": [ - "Creality/Hyper PPA-CF" - ], - "OFO1GEq6": [ - "BBL/Panchroma PLA Neon", - "OrcaFilamentLibrary/Panchroma PLA Neon", - "Snapmaker/Panchroma PLA Neon" - ], - "OFO5djrM": [ - "Chuanying/Generic PETG-CF10", - "Flashforge/Generic PETG-CF10" - ], - "OFO6GMJ3": [ - "BBL/addnorth TPU EasyFlex" - ], - "OFOABq7t": [ - "BBL/AliZ PETG-Metal", - "OrcaFilamentLibrary/AliZ PETG-Metal" - ], - "OFOAdMCB": [ - "OrcaArena/Arena PLA Metal" - ], - "OFOHOf2F": [ - "Creality/eSUN PLA-HS" - ], - "OFOJPAAS": [ - "iQ/VXL90 TiQ2 P2" - ], - "OFOPU1xv": [ - "Snapmaker/Snapmaker PLA Full Spectrum" - ], - "OFOQCfVa": [ - "BBL/addnorth PLA Premium Silk" - ], - "OFObG16Q": [ - "InfiMech/InfiMech PLA Basic" - ], - "OFObyktP": [ - "Tiertime/Tiertime PETG" - ], - "OFOiJfLM": [ - "OrcaFilamentLibrary/FILL3D PETG CF" - ], - "OFOnSNt3": [ - "Artillery/Artillery PETG-CF" - ], - "OFOsHDnB": [ - "Elegoo/Elegoo PETG PRO", - "OrcaFilamentLibrary/Elegoo PETG PRO" - ], - "OFOuEEvv": [ - "Qidi/QIDI ABS Rapido 0.2 nozzle" - ], - "OFOvv91M": [ - "BBL/PolyLite ABS", - "OrcaFilamentLibrary/PolyLite ABS", - "Qidi/PolyLite ABS" - ], - "OFOwQuZM": [ - "Snapmaker/Snapmaker PETG-CF" - ], - "OFOzwywz": [ - "Eryone/Eryone ABS" - ], - "OFP26zNb": [ - "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" - ], - "OFPHLnoe": [ - "Creality/HP-ASA" - ], - "OFPWPlSC": [ - "OrcaFilamentLibrary/FILL3D PP" - ], - "OFPYDWgC": [ - "Peopoly/Peopoly Lancer PET-CF" - ], - "OFPbyOSk": [ - "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" - ], - "OFPc4zVY": [ - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" - ], - "OFPkCJKE": [ - "BBL/Panchroma PLA Satin", - "Creality/Panchroma PLA Satin", - "OrcaFilamentLibrary/Panchroma PLA Satin", - "Snapmaker/Panchroma PLA Satin" - ], - "OFPklMI1": [ - "BBL/Generic PE", - "OrcaFilamentLibrary/Generic PE", - "Tiertime/Generic PE" - ], - "OFPoyiFs": [ - "BBL/Polymaker HT-PLA", - "OrcaFilamentLibrary/Polymaker HT-PLA", - "Snapmaker/Polymaker HT-PLA" - ], - "OFPqX3x2": [ - "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" - ], - "OFQ1KzO8": [ - "Snapmaker/Snapmaker J1 PLA Silk" - ], - "OFQ1zgm3": [ - "Eryone/Eryone ABS-CF" - ], - "OFQ3e56w": [ - "BBL/Bambu PLA Galaxy", - "OrcaFilamentLibrary/Bambu PLA Galaxy" - ], - "OFQ40XeN": [ - "Qidi/QIDI PETG Tough" - ], - "OFQ5TxZ2": [ - "BBL/addnorth PVDF Adamant S1" - ], - "OFQEGL7z": [ - "FlyingBear/FlyingBear PA-CF" - ], - "OFQGvU2G": [ - "OrcaArena/Arena TPU 95A" - ], - "OFQHiNJs": [ - "BBL/Bambu Support G", - "OrcaFilamentLibrary/Bambu Support G" - ], - "OFQLcbps": [ - "Anker/Generic PA-CF", - "Anycubic/Generic PA-CF", - "BBL/Generic PA-CF", - "Blocks/Generic PA-CF", - "Creality/Generic PA-CF", - "Custom/Generic PA-CF", - "FLSun/Generic PA-CF", - "FlyingBear/Generic PA-CF", - "InfiMech/Generic PA-CF", - "OrcaArena/Generic PA-CF", - "OrcaFilamentLibrary/Generic PA-CF", - "Prusa/Generic PA-CF", - "Qidi/Generic PA-CF", - "Ratrig/Generic PA-CF", - "SecKit/Generic PA-CF", - "Tiertime/Generic PA-CF", - "Vzbot/Generic PA-CF" - ], - "OFQMTRc8": [ - "Snapmaker/Snapmaker J1 PETG" - ], - "OFQMsFfF": [ - "Qidi/QIDI ABS-GF10" - ], - "OFQWIKbV": [ - "OrcaFilamentLibrary/FilAr PLA Titanio" - ], - "OFQYaiGg": [ - "Snapmaker/Snapmaker PET" - ], - "OFQbjX3s": [ - "OrcaFilamentLibrary/FILL3D PETG" - ], - "OFQdaVZS": [ - "Creality/Generic PET-CF", - "Elegoo/Generic PET-CF" - ], - "OFQe7sAx": [ - "Anycubic/Anycubic PA6-CF" - ], - "OFQyyO0l": [ - "Flashforge/Polymaker CoPA" - ], - "OFR0gODA": [ - "SeeMeCNC/SeeMeCNC ABS" - ], - "OFR1XLMN": [ - "Qidi/QIDI TPU 95A-HF" - ], - "OFRFhdqy": [ - "BBL/addnorth PLA Textura" - ], - "OFRJ325z": [ - "LH/LHS PETG" - ], - "OFRhBryT": [ - "Cubicon/Cubicon PLAi21" - ], - "OFRhCTUg": [ - "Anycubic/Anycubic PET-CF" - ], - "OFRiFnfQ": [ - "OrcaFilamentLibrary/Eolas Prints PETG Transition" - ], - "OFRiYgMK": [ - "BBL/Panchroma PLA Celestial", - "OrcaFilamentLibrary/Panchroma PLA Celestial", - "Snapmaker/Panchroma PLA Celestial" - ], - "OFRkjhxK": [ - "Volumic/Volumic PVA-BVOH (Performance)" - ], - "OFRmGKVX": [ - "Cubicon/Cubicon PLA+" - ], - "OFRooa0F": [ - "Snapmaker/Snapmaker Dual PA-CF" - ], - "OFRpAZ1P": [ - "DeltaMaker/DeltaMaker Brand PLA" - ], - "OFRyOsZj": [ - "re3D/re3D PLA" - ], - "OFRzR5mi": [ - "OrcaFilamentLibrary/eSUN ePLA-LW" - ], - "OFS2tn6G": [ - "BBL/Fiberon PA612-CF", - "OrcaFilamentLibrary/Fiberon PA612-CF" - ], - "OFS4jbj3": [ - "Eryone/Eryone PA" - ], - "OFS8lTQt": [ - "BBL/Panchroma PLA Silk", - "OrcaFilamentLibrary/Panchroma PLA Silk", - "Snapmaker/Panchroma PLA Silk" - ], - "OFSDfduA": [ - "Flashforge/Flashforge TPU 65D" - ], - "OFSa39yP": [ - "Snapmaker/Snapmaker J1 PLA" - ], - "OFSbGfsz": [ - "OrcaArena/Arena PLA Basic" - ], - "OFSfm8iP": [ - "BBL/BETA PLA Heat Color Change" - ], - "OFSiCZP3": [ - "BBL/BETA PETG-GF" - ], - "OFSqIcJC": [ - "Flashforge/Flashforge TPU 95A" - ], - "OFSw6Mor": [ - "BBL/addnorth PA Adura FDA" - ], - "OFSwbBWS": [], - "OFT2jon4": [ - "Qidi/QIDI ABS Rapido" - ], - "OFTGHyNC": [ - "OrcaFilamentLibrary/Bambu PLA Impact" - ], - "OFTHDCqA": [ - "BBL/Bambu PLA Pure" - ], - "OFTOPcx0": [ - "OrcaFilamentLibrary/Eolas Prints TPU Transition" - ], - "OFTRZ8Y4": [ - "BBL/Bambu PETG-CF", - "OrcaFilamentLibrary/Bambu PETG-CF" - ], - "OFTSXxzE": [ - "Flashforge/Flashforge PPS-CF" - ], - "OFTXduCM": [ - "Creality/eSUN ABS+" - ], - "OFTcE0nA": [ - "OrcaFilamentLibrary/eSUN PLA-Basic" - ], - "OFTdauIq": [ - "Volumic/Volumic PCTG Ultra (Performance)" - ], - "OFTkj6DR": [ - "Anycubic/Anycubic PVA" - ], - "OFTlRzpe": [ - "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" - ], - "OFTnWzBs": [ - "Creality/Hyper PLA-CF" - ], - "OFTs8peJ": [ - "Snapmaker/Snapmaker Dual TPE" - ], - "OFTsHNQi": [ - "Qidi/QIDI ASA" - ], - "OFU1zPxE": [ - "Elegoo/Elegoo PLA Galaxy", - "OrcaFilamentLibrary/Elegoo PLA Galaxy" - ], - "OFU3QXL7": [ - "re3D/re3D PC" - ], - "OFU5JPDy": [ - "BBL/addnorth PETG PRO Matte" - ], - "OFU7CKZt": [ - "Volumic/Volumic ASA Ultra (Performance)" - ], - "OFUF7oA4": [ - "Creality/Hyper PC" - ], - "OFUH1aee": [ - "Volumic/Volumic FLEX93 Ultra (Performance)" - ], - "OFUIfGoh": [ - "Snapmaker/Snapmaker Dual PET" - ], - "OFUYCqtB": [ - "InfiMech/InfiMech PLA" - ], - "OFUaHEO9": [ - "Anycubic/Anycubic PEBA 95A" - ], - "OFUanySo": [ - "BBL/Bambu PLA Silk+", - "OrcaFilamentLibrary/Bambu PLA Silk+" - ], - "OFUmS5z5": [ - "Creality/eSUN ASA+" - ], - "OFUtiVRn": [ - "BBL/addnorth PETG ESD" - ], - "OFUyDDNv": [ - "Elegoo/Elegoo PC", - "OrcaFilamentLibrary/Elegoo PC" - ], - "OFV5Q7j2": [ - "Snapmaker/Snapmaker J1 TPE" - ], - "OFV5c8hG": [ - "Flashforge/Flashforge PLA Sparkle" - ], - "OFV5tNw6": [ - "Elegoo/Elegoo PET-CF", - "OrcaFilamentLibrary/Elegoo PET-CF" - ], - "OFV5wEMe": [ - "Afinia/Afinia ABS" - ], - "OFV8Mxqx": [], - "OFVBlUFH": [], - "OFVCkX5w": [ - "BBL/Bambu TPU 95A", - "OrcaFilamentLibrary/Bambu TPU 95A" - ], - "OFVDWuxl": [ - "BBL/addnorth PLA HT-PLA PRO Matte" - ], - "OFVHMFJX": [ - "Qidi/QIDI PETG Tough 0.2 nozzle" - ], - "OFVptRxp": [ - "BBL/COEX TPE 30D", - "OrcaFilamentLibrary/COEX TPE 30D" - ], - "OFVtIasg": [ - "Eryone/Eryone ASA" - ], - "OFW29a9R": [ - "BBL/PolyTerra PLA", - "OrcaArena/PolyTerra PLA", - "OrcaFilamentLibrary/PolyTerra PLA", - "Snapmaker/PolyTerra PLA" - ], - "OFW5FqkL": [ - "Qidi/QIDI PLA Rapido Silk" - ], - "OFW8M3CY": [ - "BBL/BETA PLA Chameleon" - ], - "OFW8lqnb": [ - "Snapmaker/Snapmaker PETG Translucent" - ], - "OFWDe7YH": [ - "Qidi/QIDI UltraPA" - ], - "OFWK0Y9A": [ - "BBL/addnorth PA Adura" - ], - "OFWRITFw": [ - "Prusa/Prusament rPLA" - ], - "OFWTAEjH": [ - "Snapmaker/Snapmaker TPE" - ], - "OFWTRJ1K": [ - "OrcaFilamentLibrary/FilAr PLA Bronce" - ], - "OFWXCbVF": [ - "Flashforge/Flashforge PC" - ], - "OFWYtgCa": [ - "Elegoo/Elegoo PLA Wood", - "OrcaFilamentLibrary/Elegoo PLA Wood" - ], - "OFWa0NiB": [ - "Volumic/Volumic NYLON Ultra" - ], - "OFWao3Ic": [ - "Creality/Ender-PLA" - ], - "OFWbdGsC": [ - "Anker/Generic PLA-CF", - "Anycubic/Generic PLA-CF", - "Artillery/Generic PLA-CF", - "BBL/Generic PLA-CF", - "Blocks/Generic PLA-CF", - "Creality/Generic PLA-CF", - "Custom/Generic PLA-CF", - "FLSun/Generic PLA-CF", - "Flashforge/Generic PLA-CF", - "OrcaArena/Generic PLA-CF", - "OrcaFilamentLibrary/Generic PLA-CF", - "Prusa/Generic PLA-CF", - "Qidi/Generic PLA-CF", - "Ratrig/Generic PLA-CF", - "SecKit/Generic PLA-CF", - "Tiertime/Generic PLA-CF", - "Vzbot/Generic PLA-CF" - ], - "OFWgFOjn": [ - "Snapmaker/Snapmaker PLA Silk" - ], - "OFWwF7K7": [ - "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" - ], - "OFX0etlv": [ - "re3D/re3D PETG" - ], - "OFX0ycRQ": [ - "BBL/Fiberon PA12-CF", - "OrcaFilamentLibrary/Fiberon PA12-CF" - ], - "OFX2zcrM": [ - "Chuanying/Generic PLA-CF10", - "Flashforge/Generic PLA-CF10" - ], - "OFXCBZTA": [ - "OrcaFilamentLibrary/Eolas Prints ABS" - ], - "OFXIbw5D": [ - "BBL/Bambu PLA Matte", - "OrcaFilamentLibrary/Bambu PLA Matte" - ], - "OFXJ9iom": [ - "iQ/Grauts HPP4GF25 P1" - ], - "OFXSvqOX": [ - "Snapmaker/Snapmaker TPU 95A HF" - ], - "OFXTPuqV": [ - "OrcaFilamentLibrary/Elas PETG Basic" - ], - "OFXW4CDh": [ - "Ratrig/Generic PCTG BigNozzle" - ], - "OFXi59OX": [ - "Afinia/Afinia Value ABS" - ], - "OFXiArjA": [ - "Flashforge/Flashforge PETG Pro" - ], - "OFXk1emJ": [ - "Artillery/Artillery PLA Basic" - ], - "OFXkm8q1": [ - "BBL/Generic PP-CF", - "Creality/Generic PP-CF", - "OrcaFilamentLibrary/Generic PP-CF", - "Tiertime/Generic PP-CF" - ], - "OFXmv5p0": [ - "Creality/Generic Speed PLA" - ], - "OFXn3Vd9": [ - "Qidi/QIDI Support For PAHT" - ], - "OFXnToSX": [ - "Creality/Hyper Stardust" - ], - "OFXuGxvQ": [ - "Volumic/Volumic PLA Ultra" - ], - "OFXz7Mwx": [ - "Elegoo/Elegoo PLA Silk", - "OrcaFilamentLibrary/Elegoo PLA Silk" - ], - "OFXzQ4yL": [ - "BBL/Bambu ASA-Aero", - "OrcaFilamentLibrary/Bambu ASA-Aero" - ], - "OFY0F5qA": [ - "Volumic/Volumic PETG Ultra carbone (Performance)" - ], - "OFY3AB7j": [ - "Snapmaker/Snapmaker J1 PLA Matte" - ], - "OFY7jxcS": [ - "Snapmaker/Snapmaker TPU 90A" - ], - "OFY9muEs": [ - "Anker/Generic ABS", - "Anycubic/Generic ABS", - "Artillery/Generic ABS", - "BBL/Generic ABS", - "Blocks/Generic ABS", - "Chuanying/Generic ABS", - "Co Print/Generic ABS", - "CoLiDo/Generic ABS", - "Comgrow/Generic ABS", - "Creality/Generic ABS", - "Custom/Generic ABS", - "Elegoo/Generic ABS", - "FLSun/Generic ABS", - "Flashforge/Generic ABS", - "FlyingBear/Generic ABS", - "InfiMech/Generic ABS", - "Lulzbot/Generic ABS", - "OrcaArena/Generic ABS", - "OrcaFilamentLibrary/Generic ABS", - "Peopoly/Generic ABS", - "Prusa/Generic ABS", - "Qidi/Generic ABS", - "RH3D/Generic ABS", - "Ratrig/Generic ABS", - "SecKit/Generic ABS", - "Sovol/Generic ABS", - "Tiertime/Generic ABS", - "Vzbot/Generic ABS", - "Z-Bolt/Generic ABS" - ], - "OFYE7YZw": [ - "Qidi/Tinmorry PETG-ECO" - ], - "OFYEtXuk": [ - "Snapmaker/Snapmaker J1 PA-CF" - ], - "OFYGbPHX": [ - "OrcaFilamentLibrary/PolyLite Dual PLA", - "Snapmaker/PolyLite Dual PLA" - ], - "OFYGrfHY": [ - "BBL/BETA PETG Fluorescence" - ], - "OFYPdQJh": [ - "Anker/Generic PETG", - "Anycubic/Generic PETG", - "Artillery/Generic PETG", - "BBL/Generic PETG", - "Blocks/Generic PETG", - "CONSTRUCT3D/Generic PETG", - "Chuanying/Generic PETG", - "Co Print/Generic PETG", - "CoLiDo/Generic PETG", - "Comgrow/Generic PETG", - "Creality/Generic PETG", - "Custom/Generic PETG", - "DeltaMaker/Generic PETG", - "Elegoo/Generic PETG", - "FLSun/Generic PETG", - "Flashforge/Generic PETG", - "FlyingBear/Generic PETG", - "Ginger Additive/Generic PETG", - "InfiMech/Generic PETG", - "LONGER/Generic PETG", - "Lulzbot/Generic PETG", - "OrcaArena/Generic PETG", - "OrcaFilamentLibrary/Generic PETG", - "Peopoly/Generic PETG", - "Prusa/Generic PETG", - "Qidi/Generic PETG", - "RH3D/Generic PETG", - "Ratrig/Generic PETG", - "SecKit/Generic PETG", - "Sovol/Generic PETG", - "Tiertime/Generic PETG", - "Vzbot/Generic PETG", - "Z-Bolt/Generic PETG" - ], - "OFYTIMbj": [ - "Flashforge/Flashforge ABS-CF" - ], - "OFYYeMyQ": [ - "Flashforge/Flashforge PETG Basic" - ], - "OFYd5uS3": [], - "OFYezc6s": [ - "FlyingBear/FlyingBear TPU" - ], - "OFYuowge": [ - "FlyingBear/Other ABS", - "InfiMech/Other ABS" - ], - "OFZ0mR5b": [ - "Anycubic/Anycubic PLA-CF" - ], - "OFZ2LuAi": [ - "Wanhao France/YUMI PLA Bowden" - ], - "OFZ3K2cL": [ - "Qidi/QIDI PA6-CF" - ], - "OFZ4QbfK": [ - "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" - ], - "OFZGrQTU": [ - "BBL/addnorth PETG Economy" - ], - "OFZJft47": [ - "BBL/addnorth PLA Economy" - ], - "OFZLtWYs": [ - "Qidi/QIDI ABS-GF25" - ], - "OFZOuWrO": [ - "Qidi/QIDI PPS-CF" - ], - "OFZivHGL": [ - "Snapmaker/Snapmaker Dual PLA" - ], - "OFZqZMuv": [ - "BBL/BETA ASA" - ], - "OFZr862X": [ - "Creality/Generic PLA HF", - "Prusa/Generic PLA HF" - ], - "OFZtOQtl": [ - "Flashforge/Flashforge PA6-CF" - ], - "OFZtkHRq": [ - "Anycubic/Anycubic PC" - ], - "OFaDOaNt": [ - "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" - ], - "OFaDsTE0": [ - "Flashforge/Polymaker S1" - ], - "OFaEesXQ": [ - "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" - ], - "OFaEuvNF": [ - "Anycubic/Anycubic PAHT-CF" - ], - "OFaHjk1V": [ - "Volumic/Volumic PC" - ], - "OFaP2SsH": [ - "LH/LHS ASA" - ], - "OFaQMgRH": [ - "BBL/Bambu PLA Tough", - "OrcaFilamentLibrary/Bambu PLA Tough" - ], - "OFaRjiIm": [ - "SeeMeCNC/SeeMeCNC PETG-CF" - ], - "OFaYz8iE": [ - "OrcaFilamentLibrary/Elas PLA Pro" - ], - "OFaaddbQ": [ - "Flashforge/Flashforge PVA" - ], - "OFaeIx7W": [ - "iQ/Polymaker PETG Polymax black P1" - ], - "OFafO6VM": [ - "Elegoo/Generic PC-CF" - ], - "OFafocjw": [ - "Cubicon/Cubicon ABS" - ], - "OFausr3F": [ - "OrcaFilamentLibrary/FilAr PLA-mate Rosa" - ], - "OFb5EEM3": [ - "Artillery/Artillery PET" - ], - "OFbP8zEO": [ - "OrcaFilamentLibrary/Eolas Prints PLA Silk" - ], - "OFbPuPKY": [ - "Prusa/Generic FLEX" - ], - "OFbSChKb": [ - "SeeMeCNC/SeeMeCNC PLA" - ], - "OFbSZBOi": [ - "InfiMech/InfiMech TPU Basic" - ], - "OFbh7HcA": [ - "Eryone/Eryone PP-CF" - ], - "OFc3xdm9": [ - "BBL/Overture PLA", - "OrcaFilamentLibrary/Overture PLA", - "Qidi/Overture PLA" - ], - "OFc87pL3": [ - "OrcaArena/Arena PET-CF" - ], - "OFcBJQcC": [ - "Snapmaker/Snapmaker Dual TPU High-Flow" - ], - "OFcBl0nJ": [ - "BBL/Fiberon PA612-CF15" - ], - "OFcJDtTx": [ - "Artillery/Artillery TPU" - ], - "OFcKtw8W": [ - "Volumic/PA6 CF20 (Performance)" - ], - "OFcVLpNA": [ - "Flashforge/FusRock PAHT-GF" - ], - "OFcfQk4h": [ - "BBL/Overture Air PLA", - "OrcaFilamentLibrary/Overture Air PLA" - ], - "OFcnWTJB": [ - "BBL/BETA PLA Glitter" - ], - "OFcogyWl": [ - "WonderMaker/WonderMaker PLA Metal" - ], - "OFcpa50Z": [ - "BBL/addnorth PLA-CF Carbon Fiber" - ], - "OFctg8r1": [ - "CoLiDo/CoLiDo PLA+" - ], - "OFcvKkrs": [ - "BBL/Overture TPU", - "OrcaFilamentLibrary/Overture TPU" - ], - "OFcytyoA": [ - "BBL/Fiberon PETG-ESD", - "OrcaFilamentLibrary/Fiberon PETG-ESD", - "Snapmaker/Fiberon PETG-ESD" - ], - "OFd0Fv0k": [ - "BBL/Generic PE-CF", - "OrcaFilamentLibrary/Generic PE-CF", - "Tiertime/Generic PE-CF" - ], - "OFd2vX0G": [ - "BBL/COEX PLA PRIME", - "OrcaFilamentLibrary/COEX PLA PRIME" - ], - "OFd4zw5l": [ - "BBL/AliZ PA-CF", - "OrcaFilamentLibrary/AliZ PA-CF" - ], - "OFdD5Wbu": [ - "Snapmaker/Snapmaker J1 PLA-CF" - ], - "OFdI4zMo": [], - "OFdXVjGZ": [ - "Tiertime/Tiertime PC" - ], - "OFdb8YNz": [ - "OrcaFilamentLibrary/FilAr PLA Verde Manzana" - ], - "OFdd8ZqJ": [ - "Snapmaker/Snapmaker PLA Wood" - ], - "OFdkWDiy": [ - "Cubicon/Cubicon PLAi21" - ], - "OFdqkWtz": [ - "Flashforge/Flashforge PLA Luminous" - ], - "OFdrYBmI": [ - "Tiertime/Tiertime ASA" - ], - "OFdtPd9h": [ - "Qidi/QIDI PETG-GF" - ], - "OFdzlrhi": [ - "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" - ], - "OFe61n6v": [ - "Ratrig/RatRig PunkFil PETG CF" - ], - "OFe8tuNb": [ - "Tiertime/Tiertime PA6-CF" - ], - "OFe8yBMG": [ - "Qidi/QIDI PETG Tough 0.6 nozzle" - ], - "OFeAxvEt": [ - "Snapmaker/Snapmaker Dual ABS Benchy" - ], - "OFeCJqxx": [ - "Qidi/QIDI ABS Rapido Metal" - ], - "OFeF4UNh": [ - "BBL/BETA PLA Silk" - ], - "OFeIyhUx": [ - "Anycubic/Anycubic PC-CF" - ], - "OFeTATC7": [ - "Snapmaker/Snapmaker J1 Breakaway" - ], - "OFeVzkSU": [ - "Snapmaker/Fiberon PPS-GF20" - ], - "OFeelsSM": [ - "Qidi/HATCHBOX PLA" - ], - "OFelDBgv": [ - "Snapmaker/Polymaker PLA" - ], - "OFepU7Tl": [ - "WonderMaker/WonderMaker PLA Matte" - ], - "OFesA6rF": [ - "Anker/Generic PLA Silk", - "BBL/Generic PLA Silk", - "Creality/Generic PLA Silk", - "FLSun/Generic PLA Silk", - "Flashforge/Generic PLA Silk", - "OrcaArena/Generic PLA Silk", - "OrcaFilamentLibrary/Generic PLA Silk", - "Prusa/Generic PLA Silk", - "Qidi/Generic PLA Silk", - "Sovol/Generic PLA Silk", - "Tiertime/Generic PLA Silk" - ], - "OFexaZU2": [ - "OrcaFilamentLibrary/FilAr PLA Manteca" - ], - "OFf0MkD5": [ - "Qidi/QIDI PETG Translucent" - ], - "OFf52D4e": [ - "Snapmaker/Snapmaker PLA-CF" - ], - "OFf5awy4": [ - "OrcaFilamentLibrary/Eolas Prints PLA Matte" - ], - "OFf6ZEvu": [ - "InfiMech/InfiMech PC" - ], - "OFf6mfQO": [ - "BBL/Bambu Support for ABS", - "OrcaFilamentLibrary/Bambu Support for ABS" - ], - "OFf6ynfH": [ - "FlyingBear/FlyingBear PETG Basic" - ], - "OFfBpSRI": [ - "BBL/Bambu ASA", - "OrcaFilamentLibrary/Bambu ASA" - ], - "OFfD87Gy": [ - "Snapmaker/Snapmaker PLA Glow" - ], - "OFfHGM1D": [ - "re3D/re3D rPP" - ], - "OFfJSCzm": [ - "OrcaFilamentLibrary/FDplast PETG" - ], - "OFfSqS4R": [ - "Creality/ENDER FAST PLA" - ], - "OFfYHK5z": [ - "Qidi/Polymaker PLA-HT" - ], - "OFfZcoKr": [ - "OrcaFilamentLibrary/FilAr PLA-mate Piel" - ], - "OFfb10SK": [ - "Artillery/Artillery PC" - ], - "OFfmHUkQ": [ - "Snapmaker/Snapmaker Dual Breakaway" - ], - "OFfmZrI3": [ - "OrcaFilamentLibrary/FDplast TPU" - ], - "OFfnXFie": [ - "BBL/COEX TPE 40D", - "OrcaFilamentLibrary/COEX TPE 40D" - ], - "OFfq5YXA": [ - "OrcaFilamentLibrary/Valment PLA-CF" - ], - "OFfr4XNO": [ - "BBL/COEX TPE 60D", - "OrcaFilamentLibrary/COEX TPE 60D" - ], - "OFfr6JDF": [ - "Qidi/QIDI PETG Tough 0.8 nozzle" - ], - "OFfuhviw": [ - "Elegoo/Elegoo PLA Marble", - "OrcaFilamentLibrary/Elegoo PLA Marble" - ], - "OFfuih8e": [ - "Creality/Creality Silk PLA" - ], - "OFg3cWVt": [ - "Snapmaker/Snapmaker Dual PLA Metal" - ], - "OFg57Nmc": [ - "BBL/Bambu PC FR", - "OrcaFilamentLibrary/Bambu PC FR" - ], - "OFg8hMzT": [ - "OrcaFilamentLibrary/FILL3D PPCF" - ], - "OFg8ndtj": [ - "Anker/Generic PA", - "Anycubic/Generic PA", - "BBL/Generic PA", - "Blocks/Generic PA", - "Creality/Generic PA", - "Custom/Generic PA", - "Elegoo/Generic PA", - "FLSun/Generic PA", - "OrcaArena/Generic PA", - "OrcaFilamentLibrary/Generic PA", - "Prusa/Generic PA", - "Qidi/Generic PA", - "Ratrig/Generic PA", - "SecKit/Generic PA", - "Tiertime/Generic PA", - "Vzbot/Generic PA", - "Z-Bolt/Generic PA" - ], - "OFgHh8ly": [ - "Afinia/Afinia Value PLA" - ], - "OFgMWJ8T": [ - "OrcaFilamentLibrary/FilAr PLA Negro Azabache" - ], - "OFgSbX7E": [ - "Volumic/Volumic PC (Performance)" - ], - "OFgVQkqW": [ - "Cubicon/Cubicon ABSk" - ], - "OFgXgt98": [ - "Artillery/Artillery ABS" - ], - "OFgbpcy9": [ - "Anker/Generic TPU", - "Anycubic/Generic TPU", - "Artillery/Generic TPU", - "BBL/Generic TPU", - "Blocks/Generic TPU", - "Chuanying/Generic TPU", - "Co Print/Generic TPU", - "CoLiDo/Generic TPU", - "Creality/Generic TPU", - "Custom/Generic TPU", - "DeltaMaker/Generic TPU", - "FLSun/Generic TPU", - "Flashforge/Generic TPU", - "FlyingBear/Generic TPU", - "InfiMech/Generic TPU", - "OrcaArena/Generic TPU", - "OrcaFilamentLibrary/Generic TPU", - "Prusa/Generic TPU", - "Qidi/Generic TPU", - "RH3D/Generic TPU", - "Ratrig/Generic TPU", - "SecKit/Generic TPU", - "Sovol/Generic TPU", - "Tiertime/Generic TPU", - "Vzbot/Generic TPU" - ], - "OFgdaBOt": [ - "Snapmaker/Polymaker Tough PLA Family" - ], - "OFgeM7nD": [ - "Flashforge/Flashforge PA12-CF" - ], - "OFgjgN35": [ - "Flashforge/Flashforge PLA Silk" - ], - "OFglhKLM": [ - "Qidi/QIDI PLA Rapido 0.8 nozzle" - ], - "OFgpLTMR": [ - "OrcaFilamentLibrary/FilAr PETG Gris Plata" - ], - "OFgpQwkk": [ - "Creality/CR-PLA Fluo" - ], - "OFgptDSf": [ - "OrcaArena/Arena PLA Matte" - ], - "OFgyPlwU": [ - "Snapmaker/Snapmaker TPU High-Flow" - ], - "OFh7mvPO": [ - "Prusa/Prusament PVB" - ], - "OFh9u9c0": [ - "Creality/Generic PA6-GF" - ], - "OFhASRWj": [ - "BBL/Panchroma PLA Temp Shift", - "OrcaFilamentLibrary/Panchroma PLA Temp Shift", - "Snapmaker/Panchroma PLA Temp Shift" - ], - "OFhMO9Kh": [ - "OrcaFilamentLibrary/GreenGate3D PETG" - ], - "OFhN09f0": [ - "BBL/addnorth PC BLend HT LCF" - ], - "OFhO5aEJ": [ - "Ratrig/RatRig PunkFil ABS" - ], - "OFhQf8ou": [ - "Snapmaker/Snapmaker PLA-CF" - ], - "OFhQfUQY": [ - "BBL/Generic SBS", - "OrcaFilamentLibrary/Generic SBS", - "Tiertime/Generic SBS" - ], - "OFhTPf6L": [ - "Creality/Generic PA6-CF", - "Elegoo/Generic PA6-CF" - ], - "OFhUjPA5": [ - "Eryone/Eryone TPU" - ], - "OFhWc5Bv": [ - "OrcaFilamentLibrary/NIT ABS" - ], - "OFhWhL1i": [ - "OrcaFilamentLibrary/Eolas Prints PETG" - ], - "OFhWrAuP": [ - "Qidi/QIDI PLA-CF" - ], - "OFhbolij": [ - "Creality/eSUN PLA-Lite" - ], - "OFhcYzR8": [ - "Elegoo/Elegoo PLA Sparkle", - "OrcaFilamentLibrary/Elegoo PLA Sparkle" - ], - "OFhfd722": [ - "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A" - ], - "OFhiJE7Y": [ - "Qidi/QIDI PEBA 95A" - ], - "OFhkN0a7": [ - "Creality/Hyper PA612-CF" - ], - "OFhlCNqq": [ - "BBL/COEX PLA", - "OrcaFilamentLibrary/COEX PLA" - ], - "OFhmxnYw": [ - "Snapmaker/Snapmaker PLA Basic" - ], - "OFhuaUQB": [ - "BBL/Bambu ABS", - "OrcaFilamentLibrary/Bambu ABS", - "Qidi/Bambu ABS" - ], - "OFhwiZ50": [ - "Qidi/QIDI PLA Rapido 0.2 nozzle" - ], - "OFhx4uOG": [ - "Qidi/QIDI PET-GF" - ], - "OFi5RSve": [ - "Creality/eSUN PLA-LW" - ], - "OFi6PfUM": [ - "Chuanying/Generic PLA-Silk", - "Creality/Generic PLA-Silk", - "Flashforge/Generic PLA-Silk" - ], - "OFi90KlM": [ - "Volumic/Volumic NYLON Ultra (Performance)" - ], - "OFiDpM1B": [ - "OrcaFilamentLibrary/FilAr PLA-mate Bordo" - ], - "OFiEz2XI": [ - "Cubicon/Cubicon PA-CF" - ], - "OFiWaoqD": [ - "OrcaFilamentLibrary/DREMC PPA-CF" - ], - "OFibWuBd": [ - "Flashforge/Flashforge ABS Basic" - ], - "OFilAA3b": [ - "Eryone/Eryone PLA-CF" - ], - "OFilD4bP": [ - "FlyingBear/FlyingBear PLA" - ], - "OFilnglt": [ - "Artillery/Artillery PETG" - ], - "OFin64Qg": [ - "Creality/Generic Support for PLA" - ], - "OFitS8al": [ - "BBL/PolyLite PLA Neon", - "Snapmaker/PolyLite PLA Neon" - ], - "OFiwEbze": [ - "Volumic/PETG ESD (Performance)" - ], - "OFj3bTjw": [ - "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" - ], - "OFj64R5U": [ - "Peopoly/Peopoly Lancer ABS-GF" - ], - "OFjD3YTW": [ - "Qidi/Qidi PC-ABS-FR" - ], - "OFjHrAX0": [ - "WonderMaker/WonderMaker ABS" - ], - "OFjLAYgO": [ - "Anycubic/Anycubic PEBA" - ], - "OFjPXrXO": [ - "Elegoo/Elegoo PLA Glow", - "OrcaFilamentLibrary/Elegoo PLA Glow" - ], - "OFjT9PkZ": [ - "OrcaFilamentLibrary/FilAr PLA Tabaco" - ], - "OFjUGUIK": [ - "iQ/Fiberthree PACF Pro P1" - ], - "OFjUXn67": [ - "BBL/BETA ABS" - ], - "OFjVOWfJ": [ - "Anycubic/Anycubic PLA High Speed" - ], - "OFjXrKFO": [ - "OrcaArena/Arena PLA Impact" - ], - "OFjb0wos": [ - "BBL/Panchroma PLA Metallic", - "OrcaFilamentLibrary/Panchroma PLA Metallic", - "Snapmaker/Panchroma PLA Metallic" - ], - "OFjcwUEm": [ - "Cubicon/Cubicon PLA" - ], - "OFjiXpyf": [ - "Qidi/Generic TPU 95A", - "TwoTrees/Generic TPU 95A" - ], - "OFjkdnyN": [ - "Snapmaker/Snapmaker Dual TPU" - ], - "OFjoAe0R": [ - "Qidi/Qidi PLA-CF" - ], - "OFjogeYN": [ - "BBL/BETA PETG Glitter" - ], - "OFjorDcx": [ - "OrcaFilamentLibrary/FDplast ABS" - ], - "OFjt8dDO": [ - "Flashforge/FusRock NexPA-CF25" - ], - "OFjt9en1": [ - "OrcaFilamentLibrary/Generic CoPE" - ], - "OFjz0a3m": [ - "Prusa/Prusament PC-CF" - ], - "OFk8t9mz": [ - "BBL/Fiberon PETG-rCF", - "OrcaFilamentLibrary/Fiberon PETG-rCF" - ], - "OFkAltI8": [ - "FlyingBear/Other PA-CF", - "InfiMech/Other PA-CF" - ], - "OFkGp50Y": [ - "Volumic/Volumic UNIVERSAL Ultra (Performance)" - ], - "OFkGvN4d": [ - "OrcaFilamentLibrary/FilAr PLA Verde Pixel" - ], - "OFkHbjUv": [ - "BBL/BETA PLA Metallic" - ], - "OFkOviHk": [ - "BBL/Fiberon PA6-CF", - "OrcaFilamentLibrary/Fiberon PA6-CF" - ], - "OFkR8E2c": [ - "Prusa/Prusament PETG" - ], - "OFkf1HHw": [ - "Flashforge/Generic PLA-SILK" - ], - "OFkhhUS0": [ - "Elegoo/Elegoo Rapid PLA+", - "OrcaFilamentLibrary/Elegoo Rapid PLA+" - ], - "OFklJcWK": [ - "FlyingBear/Other PLA Hyper", - "InfiMech/Other PLA Hyper" - ], - "OFknl9Iz": [ - "BBL/Bambu ABS-GF", - "OrcaFilamentLibrary/Bambu ABS-GF" - ], - "OFkoLUtR": [ - "OrcaFilamentLibrary/FilAr PLA Verde Oliva" - ], - "OFkq7rPy": [ - "Eryone/Eryone PA-GF" - ], - "OFks6esg": [ - "Creality/EN-PLA+" - ], - "OFkx5MEe": [ - "Artillery/Artillery PVA" - ], - "OFkzr35f": [ - "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" - ], - "OFlBoEfL": [ - "Snapmaker/Snapmaker J1 TPU High-Flow" - ], - "OFlIsW6f": [ - "Snapmaker/Snapmaker Dual PLA Matte" - ], - "OFlN6DL1": [ - "Qidi/QIDI PA-Ultra" - ], - "OFlP3KWq": [ - "Elegoo/Elegoo PETG HF", - "OrcaFilamentLibrary/Elegoo PETG HF" - ], - "OFlSNkhc": [ - "OrcaFilamentLibrary/Eolas Prints ASA" - ], - "OFlfuj2k": [ - "BBL/Bambu TPU 85A" - ], - "OFlgMgNM": [ - "Flashforge/Flashforge PPS" - ], - "OFllmFhT": [ - "Elegoo/Generic PETG PRO" - ], - "OFlmxlDG": [ - "BBL/BETA HIPS" - ], - "OFln72PT": [ - "Elegoo/Elegoo PLA-CF", - "OrcaFilamentLibrary/Elegoo PLA-CF" - ], - "OFlsTpJG": [ - "Elegoo/Elegoo PC-FR", - "OrcaFilamentLibrary/Elegoo PC-FR" - ], - "OFlufQpZ": [ - "Snapmaker/Snapmaker PLA" - ], - "OFlwmqrC": [ - "BBL/Polymaker HT-PLA-GF", - "OrcaFilamentLibrary/Polymaker HT-PLA-GF", - "Snapmaker/Polymaker HT-PLA-GF" - ], - "OFm06H6V": [ - "Elegoo/Elegoo PLA Basic", - "OrcaFilamentLibrary/Elegoo PLA Basic" - ], - "OFm4SivL": [ - "Flashforge/Flashforge PLA Pro" - ], - "OFm4ysMO": [ - "FlyingBear/FlyingBear ABS" - ], - "OFm70lLt": [ - "CoLiDo/CoLiDo PLA" - ], - "OFm8rqoY": [ - "re3D/re3D rPP" - ], - "OFmCOW2Y": [ - "re3D/re3D rPETG" - ], - "OFmFwUWM": [ - "Prusa/Prusament ASA" - ], - "OFmJAd3A": [ - "OrcaFilamentLibrary/FDplast HIPS" - ], - "OFmKU2Ha": [ - "Eryone/Eryone PLA" - ], - "OFmN2lvw": [ - "BBL/Generic TPU for AMS" - ], - "OFmY0l6t": [ - "Creality/Generic PLA Matte", - "Elegoo/Generic PLA Matte", - "OrcaFilamentLibrary/Generic PLA Matte" - ], - "OFma5TXH": [ - "Qidi/QIDI ABS Odorless" - ], - "OFmaeU4a": [ - "OrcaFilamentLibrary/FilAr PLA-mate Naranja" - ], - "OFmfizbq": [ - "OrcaArena/Arena PLA Silk" - ], - "OFmhJs5V": [ - "Elegoo/Elegoo TPU 95A", - "OrcaFilamentLibrary/Elegoo TPU 95A" - ], - "OFmjN2bc": [ - "Anycubic/Anycubic PLA" - ], - "OFmn9NZL": [ - "BBL/FusRock ABS-GF", - "OrcaFilamentLibrary/FusRock ABS-GF" - ], - "OFmpMwxS": [ - "BBL/Generic PLA High Speed", - "Creality/Generic PLA High Speed", - "FLSun/Generic PLA High Speed", - "Flashforge/Generic PLA High Speed", - "OrcaFilamentLibrary/Generic PLA High Speed", - "Qidi/Generic PLA High Speed", - "Tiertime/Generic PLA High Speed" - ], - "OFmt513L": [ - "BBL/BETA PETG Transparent" - ], - "OFmveLWz": [ - "Elegoo/Elegoo PETG-GF", - "OrcaFilamentLibrary/Elegoo PETG-GF" - ], - "OFn1QaY3": [ - "Elegoo/Elegoo PLA Translucent2", - "OrcaFilamentLibrary/Elegoo PLA Translucent2" - ], - "OFn2GlhY": [ - "Creality/Hyper PA6-CF" - ], - "OFn6WpN7": [ - "Qidi/QIDI PA12-CF" - ], - "OFnBvPhb": [ - "BBL/addnorth PLA rPLA RE-ADD" - ], - "OFnHc3D6": [ - "Creality/eSUN PLA-CF" - ], - "OFnO4wnf": [ - "Prusa/Prusament PLA" - ], - "OFnSeLHk": [ - "CoLiDo/CoLiDo PLA Silk" - ], - "OFnT7Qpb": [ - "Prusa/Generic TPU HF" - ], - "OFnXrkhA": [ - "InfiMech/InfiMech PA-CF" - ], - "OFnXwW8l": [ - "Snapmaker/PolyLite PLA Pro Metallic" - ], - "OFnYVFk2": [ - "OrcaFilamentLibrary/FilAr PLA Azul Francia" - ], - "OFncpm7O": [ - "WonderMaker/WonderMaker PLA Silk" - ], - "OFneOFWe": [ - "CoLiDo/CoLiDo ABS" - ], - "OFnejEt4": [ - "OrcaFilamentLibrary/FilAr PETG Cian" - ], - "OFnfxTvi": [ - "BBL/Bambu PLA Lite" - ], - "OFngcE81": [ - "LH/LHS TPU Foamy 78A" - ], - "OFniMuTN": [ - "BBL/Bambu PA6-CF", - "OrcaFilamentLibrary/Bambu PA6-CF" - ], - "OFnmp6rt": [ - "Anycubic/Anycubic PLA+" - ], - "OFnpX8uh": [ - "BBL/BETA PETG Matte" - ], - "OFnyHfcv": [ - "Ratrig/Generic ABS BigNozzle" - ], - "OFo15hcT": [ - "Qidi/QIDI PAHT-GF" - ], - "OFo2UF2C": [ - "BBL/Generic BVOH", - "Creality/Generic BVOH", - "Flashforge/Generic BVOH", - "OrcaFilamentLibrary/Generic BVOH", - "Tiertime/Generic BVOH" - ], - "OFo6n2pB": [ - "Anycubic/Anycubic PETG" - ], - "OFoBTKmn": [ - "Cubicon/Cubicon PETG" - ], - "OFoSknDB": [ - "OrcaFilamentLibrary/FILL3D PLA Turbo" - ], - "OFoYSJKi": [ - "Anker/Generic PETG-CF", - "BBL/Generic PETG-CF", - "Creality/Generic PETG-CF", - "Elegoo/Generic PETG-CF", - "Flashforge/Generic PETG-CF", - "OrcaArena/Generic PETG-CF", - "OrcaFilamentLibrary/Generic PETG-CF", - "Qidi/Generic PETG-CF", - "Tiertime/Generic PETG-CF" - ], - "OFobDOW5": [ - "Elegoo/Elegoo ASA", - "OrcaFilamentLibrary/Elegoo ASA" - ], - "OFocyw69": [ - "BBL/AliZ PETG", - "OrcaFilamentLibrary/AliZ PETG" - ], - "OFoiVqVM": [ - "BBL/Bambu PLA Basic", - "OrcaFilamentLibrary/Bambu PLA Basic" - ], - "OFojbdhR": [ - "Flashforge/Flashforge ABS-GF" - ], - "OForhBi4": [ - "Cubicon/Cubicon ABSk" - ], - "OFovEIbw": [ - "BBL/Bambu PETG HF", - "OrcaFilamentLibrary/Bambu PETG HF" - ], - "OFp4ETDP": [ - "Creality/CR-PLA" - ], - "OFp57RRC": [ - "Qidi/QIDI PPS-GF" - ], - "OFp9wdmf": [ - "Eryone/Eryone PA-CF" - ], - "OFpBlrvY": [ - "OrcaFilamentLibrary/Valment PLA Silk" - ], - "OFpDo5Ix": [ - "Cubicon/Cubicon ABS" - ], - "OFpPGSKG": [ - "BBL/SUNLU Silk PLA+", - "Flashforge/SUNLU Silk PLA+", - "OrcaFilamentLibrary/SUNLU Silk PLA+" - ], - "OFpPJSHE": [ - "Peopoly/Peopoly Lancer PETG-C" - ], - "OFpW4gdi": [ - "BBL/SUNLU PLA Matte", - "Flashforge/SUNLU PLA Matte", - "OrcaFilamentLibrary/SUNLU PLA Matte" - ], - "OFpdjFI3": [ - "BBL/BETA PLA UV Color Change" - ], - "OFpu74Qe": [ - "Snapmaker/Snapmaker PLA Eco" - ], - "OFpumhCM": [ - "Volumic/Volumic UNIVERSAL Ultra" - ], - "OFq0TY7C": [ - "Flashforge/Flashforge ASA-CF" - ], - "OFq8gfS4": [ - "OrcaFilamentLibrary/FilAr PETG Negro Azabache" - ], - "OFq9svOz": [ - "BBL/Generic PPS", - "Creality/Generic PPS", - "Tiertime/Generic PPS" - ], - "OFqFRiLb": [ - "Ratrig/Generic PLA BigNozzle" - ], - "OFqGRZyH": [ - "BBL/Numakers PLA+", - "OrcaFilamentLibrary/Numakers PLA+" - ], - "OFqINlYj": [ - "BBL/eSUN PLA+", - "Creality/eSUN PLA+", - "OrcaFilamentLibrary/eSUN PLA+" - ], - "OFqTwtXM": [ - "BBL/addnorth PETG rPETG Matte" - ], - "OFqcL5UF": [ - "Qidi/QIDI Support For PET/PA" - ], - "OFqtx549": [ - "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" - ], - "OFqw2PQA": [ - "BBL/Panchroma CoPE", - "OrcaFilamentLibrary/Panchroma CoPE", - "Snapmaker/Panchroma CoPE" - ], - "OFrFBEfd": [ - "OrcaFilamentLibrary/Eolas Prints PLA Neon" - ], - "OFrGJ4tR": [ - "Anycubic/Anycubic PLA Slik" - ], - "OFrKLeE3": [ - "BBL/Bambu PLA Metal", - "OrcaFilamentLibrary/Bambu PLA Metal" - ], - "OFrLiqiM": [ - "InfiMech/InfiMech PETG" - ], - "OFrM4hdm": [ - "Creality/CR-PLA Carbon" - ], - "OFrOh600": [ - "BBL/Panchroma PLA Matte", - "Creality/Panchroma PLA Matte", - "OrcaFilamentLibrary/Panchroma PLA Matte", - "Snapmaker/Panchroma PLA Matte" - ], - "OFrZDhVt": [ - "Flashforge/Flashforge ASA-GF" - ], - "OFrdZ0cK": [ - "Creality/eSUN PETG+HS" - ], - "OFrjacXf": [ - "Flashforge/Flashforge PET-CF" - ], - "OFrqMlGt": [ - "BBL/BETA PETG" - ], - "OFrr67nG": [ - "OrcaArena/Arena PC" - ], - "OFryjl35": [ - "Elegoo/Elegoo ASA-CF", - "OrcaFilamentLibrary/Elegoo ASA-CF" - ], - "OFsB2lxm": [ - "Elegoo/Elegoo PLA Matte", - "OrcaFilamentLibrary/Elegoo PLA Matte" - ], - "OFsD974q": [ - "Volumic/Volumic PETG Ultra (Performance)" - ], - "OFsDXRpS": [ - "OrcaFilamentLibrary/FilAr PLA Piel" - ], - "OFsFo7ms": [ - "Volumic/Volumic PP Ultra" - ], - "OFsFon5l": [ - "BBL/Generic HIPS", - "Chuanying/Generic HIPS", - "Creality/Generic HIPS", - "Flashforge/Generic HIPS", - "OrcaFilamentLibrary/Generic HIPS", - "Tiertime/Generic HIPS" - ], - "OFsHSVZc": [ - "BBL/Bambu Support W", - "OrcaFilamentLibrary/Bambu Support W" - ], - "OFsP8PKH": [ - "Z-Bolt/Generic ABS HT" - ], - "OFsRDvTM": [ - "Anycubic/Panchroma PLA", - "BBL/Panchroma PLA", - "OrcaFilamentLibrary/Panchroma PLA", - "Snapmaker/Panchroma PLA" - ], - "OFsXQXbs": [ - "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" - ], - "OFsijjtH": [ - "BBL/Generic PP-GF", - "OrcaFilamentLibrary/Generic PP-GF", - "Tiertime/Generic PP-GF" - ], - "OFsoykbm": [ - "OrcaFilamentLibrary/DREMC PA6-CF" - ], - "OFt0JbR7": [ - "Snapmaker/Snapmaker J1 PLA Metal" - ], - "OFt3HtlG": [ - "Qidi/QIDI ABS-GF" - ], - "OFt6e0US": [ - "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" - ], - "OFt7SngH": [ - "Snapmaker/Snapmaker J1 ASA" - ], - "OFtFtiS0": [ - "Snapmaker/Polymaker PETG Galaxy" - ], - "OFtGC1ye": [ - "Artillery/Artillery PA-CF" - ], - "OFtKeKa9": [ - "OrcaArena/Arena PLA Tough" - ], - "OFtOPlK6": [ - "OrcaArena/Arena PAHT-CF" - ], - "OFtOoWIj": [], - "OFtRn8X8": [ - "OrcaFilamentLibrary/FDplast SBS" - ], - "OFtdVZpV": [ - "BBL/addnorth PLA X-PLA" - ], - "OFtefokm": [ - "OrcaFilamentLibrary/FilAr PLA-mate Blanco" - ], - "OFtkLO6q": [ - "BBL/Bambu TPU 90A" - ], - "OFtndTHe": [ - "BBL/BETA PETG-CF" - ], - "OFtpXCCv": [ - "BBL/COEX ASA PRIME", - "OrcaFilamentLibrary/COEX ASA PRIME" - ], - "OFtr8eZw": [ - "OrcaFilamentLibrary/FDplast PLA" - ], - "OFtudokz": [ - "OrcaFilamentLibrary/Eolas Prints PLA Premium" - ], - "OFtybfNX": [ - "Snapmaker/Snapmaker PLA Metal" - ], - "OFu08yGN": [ - "Volumic/Volumic PETG Ultra carbone" - ], - "OFu0fjPJ": [ - "LH/LHS PC CF" - ], - "OFu1E4ur": [ - "Qidi/QIDI ASA-Aero" - ], - "OFu1evlr": [ - "BBL/Generic PCTG", - "Creality/Generic PCTG", - "OrcaFilamentLibrary/Generic PCTG", - "Ratrig/Generic PCTG", - "Tiertime/Generic PCTG" - ], - "OFuFEtKX": [ - "Flashforge/Flashforge PETG-CF" - ], - "OFuJ49uH": [ - "Qidi/QIDI PETG Basic" - ], - "OFuO0cAP": [ - "OrcaArena/Arena PETG-CF" - ], - "OFuUuIhR": [ - "Elegoo/Elegoo PETG-CF", - "OrcaFilamentLibrary/Elegoo PETG-CF" - ], - "OFuV79ru": [ - "Flashforge/Flashforge PA66-CF" - ], - "OFuWCQXN": [ - "BBL/COEX ABS PRIME", - "OrcaFilamentLibrary/COEX ABS PRIME" - ], - "OFuehn62": [ - "OrcaArena/Arena PLA Marble" - ], - "OFufTAK9": [ - "OrcaFilamentLibrary/FilAr PLA-mate Negro" - ], - "OFughwKn": [ - "Qidi/QIDI PLA Matte Basic" - ], - "OFujZSdh": [ - "Creality/Hyper PETG" - ], - "OFulOdT2": [ - "Flashforge/Generic TPU 85A" - ], - "OFurdQxc": [ - "OrcaFilamentLibrary/FilAr PETG Magenta" - ], - "OFusbWjj": [ - "Creality/Hyper PETG-CF" - ], - "OFuvOt0r": [ - "BBL/BETA PLA Basic" - ], - "OFuxH0Uz": [ - "Volumic/Volumic FLEX93 Ultra" - ], - "OFvD0Qqt": [ - "Ratrig/Generic PETG BigNozzle" - ], - "OFvDbkFq": [ - "Prusa/Prusament PC Blend" - ], - "OFvKUnLh": [ - "BBL/Bambu TPU 95A HF", - "OrcaFilamentLibrary/Bambu TPU 95A HF" - ], - "OFvLppPU": [ - "Creality/CR-Nylon" - ], - "OFvPPMxL": [ - "OrcaFilamentLibrary/FilAr PLA Verde FilAr" - ], - "OFvTVZc3": [ - "BBL/COEX PETG", - "OrcaFilamentLibrary/COEX PETG" - ], - "OFvVy7yo": [ - "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant" - ], - "OFvaLVML": [ - "Flashforge/Flashforge HIPS" - ], - "OFvcIGee": [ - "BBL/addnorth TPU Pro Matte 85A" - ], - "OFvdZ2bx": [ - "Qidi/QIDI WOOD Rapido" - ], - "OFvgE0Zh": [ - "Elegoo/Elegoo PLA", - "OrcaFilamentLibrary/Elegoo PLA" - ], - "OFvmwTZE": [ - "Snapmaker/Snapmaker TPU 95A" - ], - "OFvrXuV7": [ - "BBL/PolyLite ASA", - "OrcaFilamentLibrary/PolyLite ASA" - ], - "OFvxIS9g": [ - "BBL/Fiberon PA12-CF10", - "Snapmaker/Fiberon PA12-CF10" - ], - "OFvxghTE": [ - "Chuanying/Generic HS PLA", - "Flashforge/Generic HS PLA", - "TwoTrees/Generic HS PLA" - ], - "OFvyB0Bz": [ - "BBL/PolyLite PLA Galaxy", - "Snapmaker/PolyLite PLA Galaxy" - ], - "OFvzvwCu": [ - "OrcaFilamentLibrary/Eolas Prints PLA High Speed" - ], - "OFw4WD4T": [ - "BBL/Fiberon PETG-rCF08" - ], - "OFwJ0qu2": [], - "OFwLBAGf": [ - "Qidi/HATCHBOX ABS" - ], - "OFwPrlCM": [ - "BBL/Bambu PETG Translucent", - "OrcaFilamentLibrary/Bambu PETG Translucent" - ], - "OFwRJ4g0": [ - "OrcaFilamentLibrary/NIT PLA" - ], - "OFwVVKEV": [ - "FlyingBear/Other TPU", - "InfiMech/Other TPU" - ], - "OFwaYjL6": [ - "BBL/Fiberon PA6-GF", - "OrcaFilamentLibrary/Fiberon PA6-GF" - ], - "OFwbsgWj": [ - "re3D/re3D PC" - ], - "OFwc74ck": [ - "BBL/BETA PLA Matte" - ], - "OFwhLMs4": [ - "Snapmaker/Snapmaker PLA SnapSpeed" - ], - "OFwjMiKL": [ - "Flashforge/Flashforge PETG Transparent" - ], - "OFwlZ7gH": [ - "Flashforge/Flashforge TPU-90A" - ], - "OFwu7IAG": [ - "BBL/COEX PCTG PRIME", - "OrcaFilamentLibrary/COEX PCTG PRIME" - ], - "OFwwAQnA": [ - "Prusa/Generic PC HF" - ], - "OFwyt1xt": [ - "Eryone/Eryone ASA-CF" - ], - "OFx0WlzS": [ - "Flashforge/Flashforge TPU-95A" - ], - "OFx8Lmsd": [ - "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" - ], - "OFxA1p01": [ - "BBL/Overture PLA Pro", - "OrcaFilamentLibrary/Overture PLA Pro" - ], - "OFxDHUX8": [ - "SeeMeCNC/SeeMeCNC PETG" - ], - "OFxJRuVF": [ - "Anycubic/Anycubic PC-GF" - ], - "OFxOHhZw": [ - "Elegoo/Elegoo ABS", - "OrcaFilamentLibrary/Elegoo ABS" - ], - "OFxUwUeW": [ - "BBL/SUNLU PLA Marble", - "Flashforge/SUNLU PLA Marble", - "OrcaFilamentLibrary/SUNLU PLA Marble" - ], - "OFxYB4Sw": [ - "Snapmaker/Snapmaker J1 PETG-CF" - ], - "OFxe4rXr": [ - "BBL/PolyTerra PLA Marble", - "Snapmaker/PolyTerra PLA Marble" - ], - "OFxqf79Q": [ - "BBL/BETA PETG HF" - ], - "OFy02QHU": [ - "BBL/PolyLite PLA Translucent", - "Snapmaker/PolyLite PLA Translucent" - ], - "OFy14TRA": [ - "Snapmaker/Snapmaker J1 ABS" - ], - "OFy3sW6j": [ - "WonderMaker/WonderMaker ASA" - ], - "OFy48TOp": [ - "Flashforge/Generic TPU-95A" - ], - "OFy8tYJE": [ - "Cubicon/Cubicon ABS-A100" - ], - "OFyFyLIp": [ - "SeeMeCNC/SeeMeCNC TPU" - ], - "OFyHgT60": [ - "OrcaArena/Arena PLA Sparkle" - ], - "OFyJjkek": [ - "BBL/addnorth TPU Pro Matte 95A" - ], - "OFyLWVF3": [ - "Creality/Generic PETG-GF" - ], - "OFyPG8v2": [ - "Snapmaker/Snapmaker Dual PLA Eco" - ], - "OFyPTnSk": [ - "BBL/BETA PETG Heat Color Change" - ], - "OFyQwdaM": [ - "Volumic/Volumic ABS Ultra (Performance)" - ], - "OFyRCIMh": [ - "FlyingBear/Other PC", - "InfiMech/Other PC" - ], - "OFyUJI3q": [ - "Volumic/Volumic ABS Ultra" - ], - "OFybzvQN": [ - "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" - ], - "OFyhjiNs": [ - "Snapmaker/Snapmaker PVA" - ], - "OFyj3m13": [ - "Snapmaker/Snapmaker Dual PLA Silk" - ], - "OFymnal9": [ - "Sovol/Sovol Zero PETG HS Nozzle" - ], - "OFyoBZdm": [ - "LH/LHS PLA" - ], - "OFyreocX": [ - "Tiertime/Tiertime PVA" - ], - "OFyrnlUn": [ - "Snapmaker/Snapmaker J1 TPU" - ], - "OFysxCep": [ - "OrcaFilamentLibrary/FilAr PETG Coral" - ], - "OFyxayW4": [ - "BBL/AliZ PLA", - "OrcaFilamentLibrary/AliZ PLA" - ], - "OFz1a1fy": [ - "BBL/BETA PETG Metallic" - ], - "OFz5oHgf": [ - "MagicMaker/Generic PEEK" - ], - "OFzAWsca": [ - "Qidi/Qidi TPU 95A-HF" - ], - "OFzB4uOs": [ - "Sovol/Sovol Zero PLA Basic HS Nozzle" - ], - "OFzRtFM9": [ - "Prusa/Generic ASA HF" - ], - "OFzS7zt4": [ - "Anycubic/Anycubic PA" - ], - "OFzY7N3Z": [ - "Artillery/Artillery PLA" - ], - "OFzaq7Yg": [ - "BBL/BETA TPU 98A" - ], - "OFzk5oAo": [ - "BBL/addnorth ABS rABS" - ], - "OFzrUUxc": [], - "OFztQ7rO": [ - "LH/LHS ABS" - ], - "OFzwA5Z9": [ - "Flashforge/FusRock PET-GF" - ], - "OFzyIxba": [ - "BBL/Bambu PVA", - "OrcaFilamentLibrary/Bambu PVA" - ] - }, - "instantiated_with_id": [ - "Afinia/Afinia ABS+@HS", - "Afinia/Afinia ABS@HS", - "Afinia/Afinia PLA@HS", - "Afinia/Afinia TPU@HS", - "Afinia/Afinia Value ABS@HS", - "Afinia/Afinia Value PLA@HS", - "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic ABS @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic ASA @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PA6-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PAHT-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PC-GF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PEBA 95A @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PEBA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PEBA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PEBA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PET-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PETG @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PETG-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Neo 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Plus 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 2 Pro 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.2 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra Neo 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.25 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Glow @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA High Speed @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Luminous @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Matte @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA SE @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA Silk @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA Slik @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA Translucent @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PLA+ @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PLA-CF @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PVA @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic PVA @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic PVA @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic PVA @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic TPU 95A @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic TPU 95A @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Anycubic TPU @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Anycubic TPU @Anycubic Kobra 3 Max 0.6 nozzle", - "Anycubic/Anycubic TPU @Anycubic Kobra 3 Max 0.8 nozzle", - "Anycubic/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle", - "Anycubic/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.6 nozzle", - "Anycubic/Anycubic TPU for ACE @Anycubic Kobra S1 Max 0.8 nozzle", - "Anycubic/Anycubic TPU for ACE @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Fiberon PA6-CF20 @Anycubic Kobra S1", - "Anycubic/Generic ABS @Anycubic", - "Anycubic/Generic ABS @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Generic ASA @Anycubic", - "Anycubic/Generic PA @Anycubic", - "Anycubic/Generic PA-CF @Anycubic", - "Anycubic/Generic PC @Anycubic", - "Anycubic/Generic PETG @Anycubic", - "Anycubic/Generic PETG @Anycubic Kobra S1 Max 0.4 nozzle", - "Anycubic/Generic PETG @Anycubic Kobra X 0.4 nozzle", - "Anycubic/Generic PETG Basic @Anycubic Kobra 3 Max 0.4 nozzle", - "Anycubic/Generic PLA @Anycubic", - "Anycubic/Generic PLA-CF @Anycubic", - "Anycubic/Generic PVA @Anycubic", - "Anycubic/Generic TPU @Anycubic", - "Anycubic/Generic TPU @Anycubic Kobra 3 0.4 nozzle", - "Anycubic/Panchroma PLA @Anycubic Kobra S1", - "Anycubic/Polymaker PLA Pro @Anycubic Kobra S1", - "Anycubic/Polymaker PLA Pro Metallic @Anycubic Kobra S1", - "Artillery/Artillery ABS", - "Artillery/Artillery ABS @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery ABS @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery ABS @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery ABS @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery ASA @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery ASA @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery ASA @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery ASA @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PA @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PA-CF @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PC @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PET @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PET @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PET @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PET @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PETG", - "Artillery/Artillery PETG @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PETG @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PETG @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PETG @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PETG Basic @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PETG-CF @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PLA @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PLA @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PLA Basic", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PLA Basic @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PLA Basic+ @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Matte", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PLA Matte @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PLA Silk", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PLA Silk @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery PLA Tough", - "Artillery/Artillery PLA-CF @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PVA @Artillery M1 Pro 0.2 nozzle", - "Artillery/Artillery PVA @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery PVA @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery PVA @Artillery M1 Pro 0.8 nozzle", - "Artillery/Artillery TPU", - "Artillery/Artillery TPU @Artillery M1 Pro 0.4 nozzle", - "Artillery/Artillery TPU @Artillery M1 Pro 0.6 nozzle", - "Artillery/Artillery TPU @Artillery M1 Pro 0.8 nozzle", - "Artillery/Generic ABS @Artillery", - "Artillery/Generic ASA @Artillery", - "Artillery/Generic PETG @Artillery", - "Artillery/Generic PLA @Artillery", - "Artillery/Generic PLA-CF @Artillery", - "Artillery/Generic TPU @Artillery", - "BBL/Generic SBS", - "BBL/addnorth ABS rABS", - "BBL/addnorth PA Adura", - "BBL/addnorth PA Adura FDA", - "BBL/addnorth PA-CF Adura X", - "BBL/addnorth PA6 Addlantis", - "BBL/addnorth PC BLend HT LCF", - "BBL/addnorth PETG Base", - "BBL/addnorth PETG ESD", - "BBL/addnorth PETG Economy", - "BBL/addnorth PETG Flame v0", - "BBL/addnorth PETG PRO Matte", - "BBL/addnorth PETG rPETG Matte", - "BBL/addnorth PETG-CF Rigid X", - "BBL/addnorth PLA E-PLA", - "BBL/addnorth PLA Economy", - "BBL/addnorth PLA HT-PLA PRO Matte", - "BBL/addnorth PLA Premium Silk", - "BBL/addnorth PLA Textura", - "BBL/addnorth PLA Wood", - "BBL/addnorth PLA X-PLA", - "BBL/addnorth PLA X-PLA High Speed", - "BBL/addnorth PLA rPLA RE-ADD", - "BBL/addnorth PLA-CF Carbon Fiber", - "BBL/addnorth PVDF Adamant S1", - "BBL/addnorth TPU EasyFlex", - "BBL/addnorth TPU Pro Matte 85A", - "BBL/addnorth TPU Pro Matte 95A", - "Blocks/Generic ABS @Blocks", - "Blocks/Generic ASA @Blocks", - "Blocks/Generic ASA-CF @Blocks", - "Blocks/Generic PA @Blocks", - "Blocks/Generic PA-CF @Blocks", - "Blocks/Generic PC @Blocks", - "Blocks/Generic PETG @Blocks", - "Blocks/Generic PLA @Blocks", - "Blocks/Generic PLA-CF @Blocks", - "Blocks/Generic PVA @Blocks", - "Blocks/Generic TPU @Blocks", - "CONSTRUCT3D/Generic High Flow PETG @C1", - "CONSTRUCT3D/Generic PETG @C1", - "CONSTRUCT3D/Generic PLA @C1", - "Chuanying/Generic ABS @Chuanying", - "Chuanying/Generic ASA @Chuanying", - "Chuanying/Generic HIPS @Chuanying", - "Chuanying/Generic HS PLA @Chuanying", - "Chuanying/Generic PETG @Chuanying", - "Chuanying/Generic PETG-CF10 @Chuanying", - "Chuanying/Generic PLA @Chuanying", - "Chuanying/Generic PLA-CF10 @Chuanying", - "Chuanying/Generic PLA-Silk @Chuanying", - "Chuanying/Generic PVA @Chuanying", - "Chuanying/Generic TPU @Chuanying", - "Co Print/Generic ABS @CoPrint", - "Co Print/Generic PETG @CoPrint", - "Co Print/Generic PLA @CoPrint", - "Co Print/Generic TPU @CoPrint", - "CoLiDo/CoLiDo ABS @CoLiDo SR1", - "CoLiDo/CoLiDo PETG @CoLiDo SR1", - "CoLiDo/CoLiDo PLA @CoLiDo SR1", - "CoLiDo/CoLiDo PLA Silk @CoLiDo SR1", - "CoLiDo/CoLiDo PLA+ @CoLiDo DIY 4.0 V2", - "CoLiDo/Generic ABS @CoLiDo DIY 4.0", - "CoLiDo/Generic ABS @CoLiDo X16", - "CoLiDo/Generic PETG @CoLiDo DIY 4.0", - "CoLiDo/Generic PETG @CoLiDo X16", - "CoLiDo/Generic PLA @CoLiDo DIY 4.0", - "CoLiDo/Generic PLA @CoLiDo X16", - "CoLiDo/Generic TPU @CoLiDo DIY 4.0", - "CoLiDo/Generic TPU @CoLiDo X16", - "Comgrow/Generic ABS @Comgrow", - "Comgrow/Generic PETG @Comgrow", - "Comgrow/Generic PLA @Comgrow", - "Creality/CR-ABS @Ender-3 V4-all", - "Creality/CR-ABS @Hi-all", - "Creality/CR-ABS @K1 Max_CFS-C-all", - "Creality/CR-ABS @K1 SE-all", - "Creality/CR-ABS @K1 SE_CFS-C-all", - "Creality/CR-ABS @K1C-all", - "Creality/CR-ABS @K1C_CFS-C-all", - "Creality/CR-ABS @K1_CFS-C-all", - "Creality/CR-ABS @K2 Plus-all", - "Creality/CR-ABS @K2 Pro-all", - "Creality/CR-ABS @K2 SE-all", - "Creality/CR-ABS @K2-all", - "Creality/CR-Nylon @K1 Max_CFS-C-all", - "Creality/CR-Nylon @K1C-all", - "Creality/CR-Nylon @K1C_CFS-C-all", - "Creality/CR-Nylon @K1_CFS-C-all", - "Creality/CR-Nylon @K2 Plus-all", - "Creality/CR-PETG @Ender-3 V4-all", - "Creality/CR-PETG @Hi-all", - "Creality/CR-PETG @K1 Max_CFS-C-all", - "Creality/CR-PETG @K1 SE-all", - "Creality/CR-PETG @K1 SE_CFS-C-all", - "Creality/CR-PETG @K1C-all", - "Creality/CR-PETG @K1C_CFS-C-all", - "Creality/CR-PETG @K1_CFS-C-all", - "Creality/CR-PETG @K2 Plus-all", - "Creality/CR-PETG @K2 Pro-all", - "Creality/CR-PETG @K2 SE-all", - "Creality/CR-PETG @K2-all", - "Creality/CR-PETG @SPARKX i7-all", - "Creality/CR-PLA @Ender-3 V4-all", - "Creality/CR-PLA @Hi-all", - "Creality/CR-PLA @K1 Max_CFS-C-all", - "Creality/CR-PLA @K1 SE-all", - "Creality/CR-PLA @K1 SE_CFS-C-all", - "Creality/CR-PLA @K1C-all", - "Creality/CR-PLA @K1C_CFS-C-all", - "Creality/CR-PLA @K1_CFS-C-all", - "Creality/CR-PLA @K2 Plus-all", - "Creality/CR-PLA @K2 Pro-all", - "Creality/CR-PLA @K2 SE-all", - "Creality/CR-PLA @K2-all", - "Creality/CR-PLA @SPARKX i7-all", - "Creality/CR-PLA Carbon @K1 Max_CFS-C-all", - "Creality/CR-PLA Carbon @K1C-all", - "Creality/CR-PLA Carbon @K1C_CFS-C-all", - "Creality/CR-PLA Carbon @K1_CFS-C-all", - "Creality/CR-PLA Carbon @K2 Plus-all", - "Creality/CR-PLA Fluo @K1 Max_CFS-C-all", - "Creality/CR-PLA Fluo @K1C-all", - "Creality/CR-PLA Fluo @K1C_CFS-C-all", - "Creality/CR-PLA Fluo @K1_CFS-C-all", - "Creality/CR-PLA Fluo @K2 Plus-all", - "Creality/CR-PLA Fluo @K2 Pro-all", - "Creality/CR-PLA Fluo @K2-all", - "Creality/CR-PLA Fluo @SPARKX i7-all", - "Creality/CR-PLA Matte @Ender-3 V4-all", - "Creality/CR-PLA Matte @K1 Max_CFS-C-all", - "Creality/CR-PLA Matte @K1C-all", - "Creality/CR-PLA Matte @K1C_CFS-C-all", - "Creality/CR-PLA Matte @K1_CFS-C-all", - "Creality/CR-PLA Matte @K2 Plus-all", - "Creality/CR-PLA Matte @K2 Pro-all", - "Creality/CR-PLA Matte @K2-all", - "Creality/CR-PLA Matte @SPARKX i7-all", - "Creality/CR-Silk @Ender-3 V4-all", - "Creality/CR-Silk @Hi-all", - "Creality/CR-Silk @K1 Max_CFS-C-all", - "Creality/CR-Silk @K1 SE-all", - "Creality/CR-Silk @K1 SE_CFS-C-all", - "Creality/CR-Silk @K1C-all", - "Creality/CR-Silk @K1C_CFS-C-all", - "Creality/CR-Silk @K1_CFS-C-all", - "Creality/CR-Silk @K2 Plus-all", - "Creality/CR-Silk @K2 Pro-all", - "Creality/CR-Silk @K2 SE-all", - "Creality/CR-Silk @K2-all", - "Creality/CR-Silk @SPARKX i7-all", - "Creality/CR-TPU @K1 Max_CFS-C-all", - "Creality/CR-TPU @K1C-all", - "Creality/CR-TPU @K1C_CFS-C-all", - "Creality/CR-TPU @K1_CFS-C-all", - "Creality/CR-TPU @K2 Plus-all", - "Creality/CR-TPU @K2 Pro-all", - "Creality/CR-TPU @K2-all", - "Creality/CR-TPU @SPARKX i7-all", - "Creality/CR-Wood @K1 Max_CFS-C-all", - "Creality/CR-Wood @K1C-all", - "Creality/CR-Wood @K1C_CFS-C-all", - "Creality/CR-Wood @K1_CFS-C-all", - "Creality/CR-Wood @K2 Plus-all", - "Creality/Creality Hyper ABS @Ender-5Max-all", - "Creality/Creality Hyper PLA @Ender-5Max-all", - "Creality/Creality Hyper PLA-CF @Ender-5Max-all", - "Creality/Creality Silk PLA @Ender-5Max-all", - "Creality/EN-PLA+ @K1 Max_CFS-C-all", - "Creality/EN-PLA+ @K1C-all", - "Creality/EN-PLA+ @K1C_CFS-C-all", - "Creality/EN-PLA+ @K1_CFS-C-all", - "Creality/EN-PLA+ @K2 Plus-all", - "Creality/EN-PLA+ @K2 Pro-all", - "Creality/EN-PLA+ @K2-all", - "Creality/EN-PLA+ @SPARKX i7-all", - "Creality/ENDER FAST PLA @Hi-all", - "Creality/ENDER FAST PLA @K2 Plus-all", - "Creality/ENDER FAST PLA @K2 Pro-all", - "Creality/ENDER FAST PLA @K2-all", - "Creality/ENDER FAST PLA @SPARKX i7-all", - "Creality/Ender-PLA @Ender-3 V4-all", - "Creality/Ender-PLA @Hi-all", - "Creality/Ender-PLA @K1 Max_CFS-C-all", - "Creality/Ender-PLA @K1C-all", - "Creality/Ender-PLA @K1C_CFS-C-all", - "Creality/Ender-PLA @K1_CFS-C-all", - "Creality/Ender-PLA @K2 Plus-all", - "Creality/Ender-PLA @K2 Pro-all", - "Creality/Ender-PLA @K2-all", - "Creality/Ender-PLA @SPARKX i7-all", - "Creality/Generic ABS @Creality", - "Creality/Generic ABS @Creality Ender-5Max-all", - "Creality/Generic ABS @Ender-3 V4-all", - "Creality/Generic ABS @Hi-all", - "Creality/Generic ABS @K1 Max_CFS-C-all", - "Creality/Generic ABS @K1 SE-all", - "Creality/Generic ABS @K1 SE_CFS-C-all", - "Creality/Generic ABS @K1C-all", - "Creality/Generic ABS @K1C_CFS-C-all", - "Creality/Generic ABS @K1_CFS-C-all", - "Creality/Generic ABS @K2 Plus-all", - "Creality/Generic ABS @K2 Pro-all", - "Creality/Generic ABS @K2 SE-all", - "Creality/Generic ABS @K2-all", - "Creality/Generic ASA @Creality", - "Creality/Generic ASA @Creality Ender-5Max-all", - "Creality/Generic ASA @K1 Max_CFS-C-all", - "Creality/Generic ASA @K1 SE-all", - "Creality/Generic ASA @K1 SE_CFS-C-all", - "Creality/Generic ASA @K1C-all", - "Creality/Generic ASA @K1C_CFS-C-all", - "Creality/Generic ASA @K1_CFS-C-all", - "Creality/Generic ASA @K2 Plus-all", - "Creality/Generic ASA @K2 Pro-all", - "Creality/Generic ASA @K2 SE-all", - "Creality/Generic ASA @K2-all", - "Creality/Generic ASA-CF @Creality Hi-all", - "Creality/Generic ASA-CF @K2 Plus-all", - "Creality/Generic BVOH @Hi-all", - "Creality/Generic BVOH @K1 Max_CFS-C-all", - "Creality/Generic BVOH @K1C-all", - "Creality/Generic BVOH @K1C_CFS-C-all", - "Creality/Generic BVOH @K1_CFS-C-all", - "Creality/Generic BVOH @K2 Plus-all", - "Creality/Generic BVOH @K2 Pro-all", - "Creality/Generic BVOH @K2-all", - "Creality/Generic HIPS @K1 Max_CFS-C-all", - "Creality/Generic HIPS @K1C-all", - "Creality/Generic HIPS @K1C_CFS-C-all", - "Creality/Generic HIPS @K1_CFS-C-all", - "Creality/Generic HIPS @K2 Plus-all", - "Creality/Generic PA @Creality Ender-5Max-all", - "Creality/Generic PA @K1 Max_CFS-C-all", - "Creality/Generic PA @K1C-all", - "Creality/Generic PA @K1C_CFS-C-all", - "Creality/Generic PA @K1_CFS-C-all", - "Creality/Generic PA @K2 Plus-all", - "Creality/Generic PA @K2 Pro-all", - "Creality/Generic PA @K2-all", - "Creality/Generic PA-CF @Creality", - "Creality/Generic PA-CF @K1 Max_CFS-C-all", - "Creality/Generic PA-CF @K1C-all", - "Creality/Generic PA-CF @K1C_CFS-C-all", - "Creality/Generic PA-CF @K1_CFS-C-all", - "Creality/Generic PA-CF @K2 Plus-all", - "Creality/Generic PA12-CF @K2 Plus-all", - "Creality/Generic PA6-CF @K1 Max_CFS-C-all", - "Creality/Generic PA6-CF @K1C-all", - "Creality/Generic PA6-CF @K1C_CFS-C-all", - "Creality/Generic PA6-CF @K1_CFS-C-all", - "Creality/Generic PA6-CF @K2 Plus-all", - "Creality/Generic PA6-CF @K2 Pro-all", - "Creality/Generic PA6-GF @K2 Plus-all", - "Creality/Generic PA612-CF @K2 Plus-all", - "Creality/Generic PA612-CF @K2 Pro-all", - "Creality/Generic PAHT-CF @K1 Max_CFS-C-all", - "Creality/Generic PAHT-CF @K1C-all", - "Creality/Generic PAHT-CF @K1C_CFS-C-all", - "Creality/Generic PAHT-CF @K1_CFS-C-all", - "Creality/Generic PAHT-CF @K2 Plus-all", - "Creality/Generic PAHT-CF @K2 Pro-all", - "Creality/Generic PAHT-CF @K2-all", - "Creality/Generic PC @K1 Max_CFS-C-all", - "Creality/Generic PC @K1C-all", - "Creality/Generic PC @K1C_CFS-C-all", - "Creality/Generic PC @K1_CFS-C-all", - "Creality/Generic PC @K2 Plus-all", - "Creality/Generic PC @K2 Pro-all", - "Creality/Generic PCTG @K2 Plus-all", - "Creality/Generic PET @K1 Max_CFS-C-all", - "Creality/Generic PET @K1C-all", - "Creality/Generic PET @K1C_CFS-C-all", - "Creality/Generic PET @K1_CFS-C-all", - "Creality/Generic PET @K2 Plus-all", - "Creality/Generic PET @K2 Pro-all", - "Creality/Generic PET @K2-all", - "Creality/Generic PET-CF @K1 Max_CFS-C-all", - "Creality/Generic PET-CF @K1C-all", - "Creality/Generic PET-CF @K1C_CFS-C-all", - "Creality/Generic PET-CF @K1_CFS-C-all", - "Creality/Generic PET-CF @K2 Plus-all", - "Creality/Generic PET-CF @K2 Pro-all", - "Creality/Generic PETG @Creality", - "Creality/Generic PETG @Creality Ender-5Max-all", - "Creality/Generic PETG @Ender-3 V4-all", - "Creality/Generic PETG @Hi-all", - "Creality/Generic PETG @K1 Max_CFS-C-all", - "Creality/Generic PETG @K1 SE-all", - "Creality/Generic PETG @K1 SE_CFS-C-all", - "Creality/Generic PETG @K1C-all", - "Creality/Generic PETG @K1C_CFS-C-all", - "Creality/Generic PETG @K1_CFS-C-all", - "Creality/Generic PETG @K2 Plus-all", - "Creality/Generic PETG @K2 Pro-all", - "Creality/Generic PETG @K2 SE-all", - "Creality/Generic PETG @K2-all", - "Creality/Generic PETG @SPARKX i7-all", - "Creality/Generic PETG-CF @Creality Hi-all", - "Creality/Generic PETG-CF @K1 Max_CFS-C-all", - "Creality/Generic PETG-CF @K1C-all", - "Creality/Generic PETG-CF @K1C_CFS-C-all", - "Creality/Generic PETG-CF @K1_CFS-C-all", - "Creality/Generic PETG-CF @K2 Plus-all", - "Creality/Generic PETG-CF @K2 Pro-all", - "Creality/Generic PETG-CF @K2-all", - "Creality/Generic PETG-CF @SPARKX i7-all", - "Creality/Generic PETG-GF @K2 Plus-all", - "Creality/Generic PETG-GF @K2 Pro-all", - "Creality/Generic PETG-GF @K2-all", - "Creality/Generic PLA @Creality", - "Creality/Generic PLA @Creality Ender-5Max-all", - "Creality/Generic PLA @Ender-3 V4-all", - "Creality/Generic PLA @Hi-all", - "Creality/Generic PLA @K1 Max_CFS-C-all", - "Creality/Generic PLA @K1 SE-all", - "Creality/Generic PLA @K1 SE_CFS-C-all", - "Creality/Generic PLA @K1C-all", - "Creality/Generic PLA @K1C_CFS-C-all", - "Creality/Generic PLA @K1_CFS-C-all", - "Creality/Generic PLA @K2 Plus-all", - "Creality/Generic PLA @K2 Pro-all", - "Creality/Generic PLA @K2 SE-all", - "Creality/Generic PLA @K2-all", - "Creality/Generic PLA @SPARKX i7-all", - "Creality/Generic PLA HF @Creality", - "Creality/Generic PLA High Speed @Creality Ender-3V3-all", - "Creality/Generic PLA High Speed @Creality Hi-all", - "Creality/Generic PLA High Speed @Creality K1-all", - "Creality/Generic PLA High Speed @Creality K2-all", - "Creality/Generic PLA Matte @Creality Ender-3V3-all", - "Creality/Generic PLA Matte @Creality Hi-all", - "Creality/Generic PLA Matte @Creality K1-all", - "Creality/Generic PLA Matte @Creality K2-all", - "Creality/Generic PLA Silk @Creality Ender-3V3-all", - "Creality/Generic PLA Silk @Creality Hi-all", - "Creality/Generic PLA Silk @Creality K1-all", - "Creality/Generic PLA Silk @Creality K2-all", - "Creality/Generic PLA Wood @Creality Hi-all", - "Creality/Generic PLA-CF @Creality", - "Creality/Generic PLA-CF @Ender-3 V4-all", - "Creality/Generic PLA-CF @K1 Max_CFS-C-all", - "Creality/Generic PLA-CF @K1 SE-all", - "Creality/Generic PLA-CF @K1 SE_CFS-C-all", - "Creality/Generic PLA-CF @K1C-all", - "Creality/Generic PLA-CF @K1C_CFS-C-all", - "Creality/Generic PLA-CF @K1_CFS-C-all", - "Creality/Generic PLA-CF @K2 Plus-all", - "Creality/Generic PLA-CF @K2 Pro-all", - "Creality/Generic PLA-CF @K2 SE-all", - "Creality/Generic PLA-CF @K2-all", - "Creality/Generic PLA-CF @SPARKX i7-all", - "Creality/Generic PLA-Silk @Ender-3 V4-all", - "Creality/Generic PLA-Silk @Hi-all", - "Creality/Generic PLA-Silk @K1 Max_CFS-C-all", - "Creality/Generic PLA-Silk @K1 SE-all", - "Creality/Generic PLA-Silk @K1 SE_CFS-C-all", - "Creality/Generic PLA-Silk @K1C-all", - "Creality/Generic PLA-Silk @K1C_CFS-C-all", - "Creality/Generic PLA-Silk @K1_CFS-C-all", - "Creality/Generic PLA-Silk @K2 Plus-all", - "Creality/Generic PLA-Silk @K2 Pro-all", - "Creality/Generic PLA-Silk @K2 SE-all", - "Creality/Generic PLA-Silk @K2-all", - "Creality/Generic PLA-Silk @SPARKX i7-all", - "Creality/Generic PP @K1 Max_CFS-C-all", - "Creality/Generic PP @K1C-all", - "Creality/Generic PP @K1C_CFS-C-all", - "Creality/Generic PP @K1_CFS-C-all", - "Creality/Generic PP @K2 Plus-all", - "Creality/Generic PP @K2 Pro-all", - "Creality/Generic PP @K2-all", - "Creality/Generic PP-CF @K2 Plus-all", - "Creality/Generic PPS @K1 Max_CFS-C-all", - "Creality/Generic PPS @K1C-all", - "Creality/Generic PPS @K1C_CFS-C-all", - "Creality/Generic PPS @K1_CFS-C-all", - "Creality/Generic PPS @K2 Plus-all", - "Creality/Generic PPS-CF @K1 Max_CFS-C-all", - "Creality/Generic PPS-CF @K1C-all", - "Creality/Generic PPS-CF @K1C_CFS-C-all", - "Creality/Generic PPS-CF @K1_CFS-C-all", - "Creality/Generic PPS-CF @K2 Plus-all", - "Creality/Generic PVA @Hi-all", - "Creality/Generic PVA @K1 Max_CFS-C-all", - "Creality/Generic PVA @K1C-all", - "Creality/Generic PVA @K1C_CFS-C-all", - "Creality/Generic PVA @K1_CFS-C-all", - "Creality/Generic PVA @K2 Plus-all", - "Creality/Generic PVA @K2 Pro-all", - "Creality/Generic PVA @K2-all", - "Creality/Generic Speed PLA @Creality HF", - "Creality/Generic Support for PA @K2 Plus-all", - "Creality/Generic Support for PLA @K2 Plus-all", - "Creality/Generic TPU 64D @K2 Plus-all", - "Creality/Generic TPU 64D @SPARKX i7-all", - "Creality/Generic TPU @Creality", - "Creality/Generic TPU @Creality Ender-5Max-all", - "Creality/Generic TPU @Ender-3 V4-all", - "Creality/Generic TPU @K1 Max_CFS-C-all", - "Creality/Generic TPU @K1 SE-all", - "Creality/Generic TPU @K1 SE_CFS-C-all", - "Creality/Generic TPU @K1C-all", - "Creality/Generic TPU @K1C_CFS-C-all", - "Creality/Generic TPU @K1_CFS-C-all", - "Creality/Generic TPU @K2 Plus-all", - "Creality/Generic TPU @K2 Pro-all", - "Creality/Generic TPU @K2 SE-all", - "Creality/Generic TPU @K2-all", - "Creality/Generic TPU @SPARKX i7-all", - "Creality/HP Ultra PLA @K1 Max_CFS-C-all", - "Creality/HP Ultra PLA @K1C-all", - "Creality/HP Ultra PLA @K1C_CFS-C-all", - "Creality/HP Ultra PLA @K1_CFS-C-all", - "Creality/HP Ultra PLA @K2 Plus-all", - "Creality/HP-ASA @K1 Max_CFS-C-all", - "Creality/HP-ASA @K1C-all", - "Creality/HP-ASA @K1C_CFS-C-all", - "Creality/HP-ASA @K1_CFS-C-all", - "Creality/HP-ASA @K2 Plus-all", - "Creality/HP-ASA @K2 Pro-all", - "Creality/HP-ASA @K2 SE-all", - "Creality/HP-ASA @K2-all", - "Creality/HP-TPU @Ender-3 V4-all", - "Creality/HP-TPU @Hi-all", - "Creality/HP-TPU @K1 Max_CFS-C-all", - "Creality/HP-TPU @K1 SE-all", - "Creality/HP-TPU @K1 SE_CFS-C-all", - "Creality/HP-TPU @K1C-all", - "Creality/HP-TPU @K1C_CFS-C-all", - "Creality/HP-TPU @K1_CFS-C-all", - "Creality/HP-TPU @K2 Plus-all", - "Creality/HP-TPU @K2 Pro-all", - "Creality/HP-TPU @K2 SE-all", - "Creality/HP-TPU @K2-all", - "Creality/HP-TPU @SPARKX i7-all", - "Creality/Hyper ABS @Ender-3 V4-all", - "Creality/Hyper ABS @Hi-all", - "Creality/Hyper ABS @K1 Max_CFS-C-all", - "Creality/Hyper ABS @K1 SE-all", - "Creality/Hyper ABS @K1 SE_CFS-C-all", - "Creality/Hyper ABS @K1C-all", - "Creality/Hyper ABS @K1C_CFS-C-all", - "Creality/Hyper ABS @K1_CFS-C-all", - "Creality/Hyper ABS @K2 Plus-all", - "Creality/Hyper ABS @K2 Pro-all", - "Creality/Hyper ABS @K2 SE-all", - "Creality/Hyper ABS @K2-all", - "Creality/Hyper L-W PLA @Hi-all", - "Creality/Hyper L-W PLA @K1 Max_CFS-C-all", - "Creality/Hyper L-W PLA @K1 SE-all", - "Creality/Hyper L-W PLA @K1 SE_CFS-C-all", - "Creality/Hyper L-W PLA @K1C-all", - "Creality/Hyper L-W PLA @K1C_CFS-C-all", - "Creality/Hyper L-W PLA @K1_CFS-C-all", - "Creality/Hyper L-W PLA @K2 Plus-all", - "Creality/Hyper L-W PLA @K2 Pro-all", - "Creality/Hyper L-W PLA @K2-all", - "Creality/Hyper Luminous @Hi-all", - "Creality/Hyper Luminous @K1C-all", - "Creality/Hyper Luminous @K2 Plus-all", - "Creality/Hyper Luminous @K2 Pro-all", - "Creality/Hyper Luminous @K2-all", - "Creality/Hyper Luminous @SPARKX i7-all", - "Creality/Hyper Marble @Hi-all", - "Creality/Hyper Marble @K1 Max_CFS-C-all", - "Creality/Hyper Marble @K1C-all", - "Creality/Hyper Marble @K1C_CFS-C-all", - "Creality/Hyper Marble @K1_CFS-C-all", - "Creality/Hyper Marble @K2 Plus-all", - "Creality/Hyper Marble @K2 Pro-all", - "Creality/Hyper Marble @K2 SE-all", - "Creality/Hyper Marble @K2-all", - "Creality/Hyper Marble @SPARKX i7-all", - "Creality/Hyper PA6-CF @K2 Plus-all", - "Creality/Hyper PA6-CF @K2 Pro-all", - "Creality/Hyper PA612-CF @K2 Plus-all", - "Creality/Hyper PA612-CF @K2 Pro-all", - "Creality/Hyper PAHT-CF @K1 Max_CFS-C-all", - "Creality/Hyper PAHT-CF @K1C-all", - "Creality/Hyper PAHT-CF @K1C_CFS-C-all", - "Creality/Hyper PAHT-CF @K1_CFS-C-all", - "Creality/Hyper PAHT-CF @K2 Plus-all", - "Creality/Hyper PAHT-CF @K2 Pro-all", - "Creality/Hyper PAHT-CF @K2-all", - "Creality/Hyper PC @K2 Plus-all", - "Creality/Hyper PC @K2 Pro-all", - "Creality/Hyper PETG @Ender-3 V4-all", - "Creality/Hyper PETG @Hi-all", - "Creality/Hyper PETG @K1 Max_CFS-C-all", - "Creality/Hyper PETG @K1 SE-all", - "Creality/Hyper PETG @K1 SE_CFS-C-all", - "Creality/Hyper PETG @K1C-all", - "Creality/Hyper PETG @K1C_CFS-C-all", - "Creality/Hyper PETG @K1_CFS-C-all", - "Creality/Hyper PETG @K2 Plus-all", - "Creality/Hyper PETG @K2 Pro-all", - "Creality/Hyper PETG @K2 SE-all", - "Creality/Hyper PETG @K2-all", - "Creality/Hyper PETG @SPARKX i7-all", - "Creality/Hyper PETG-CF @K1 Max_CFS-C-all", - "Creality/Hyper PETG-CF @K1C-all", - "Creality/Hyper PETG-CF @K1C_CFS-C-all", - "Creality/Hyper PETG-CF @K1_CFS-C-all", - "Creality/Hyper PETG-CF @K2 Plus-all", - "Creality/Hyper PETG-CF @K2 Pro-all", - "Creality/Hyper PETG-CF @K2-all", - "Creality/Hyper PETG-CF @SPARKX i7-all", - "Creality/Hyper PETG-GF @K1C-all", - "Creality/Hyper PETG-GF @K2 Plus-all", - "Creality/Hyper PETG-GF @K2 Pro-all", - "Creality/Hyper PETG-GF @K2-all", - "Creality/Hyper PLA @Ender-3 V4-all", - "Creality/Hyper PLA @Hi-all", - "Creality/Hyper PLA @K1 Max_CFS-C-all", - "Creality/Hyper PLA @K1 SE-all", - "Creality/Hyper PLA @K1 SE_CFS-C-all", - "Creality/Hyper PLA @K1C-all", - "Creality/Hyper PLA @K1C_CFS-C-all", - "Creality/Hyper PLA @K1_CFS-C-all", - "Creality/Hyper PLA @K2 Plus-all", - "Creality/Hyper PLA @K2 Pro-all", - "Creality/Hyper PLA @K2 SE-all", - "Creality/Hyper PLA @K2-all", - "Creality/Hyper PLA @SPARKX i7-all", - "Creality/Hyper PLA-CF @Ender-3 V4-all", - "Creality/Hyper PLA-CF @Hi-all", - "Creality/Hyper PLA-CF @K1 Max_CFS-C-all", - "Creality/Hyper PLA-CF @K1 SE-all", - "Creality/Hyper PLA-CF @K1 SE_CFS-C-all", - "Creality/Hyper PLA-CF @K1C-all", - "Creality/Hyper PLA-CF @K1C_CFS-C-all", - "Creality/Hyper PLA-CF @K1_CFS-C-all", - "Creality/Hyper PLA-CF @K2 Plus-all", - "Creality/Hyper PLA-CF @K2 Pro-all", - "Creality/Hyper PLA-CF @K2 SE-all", - "Creality/Hyper PLA-CF @K2-all", - "Creality/Hyper PLA-CF @SPARKX i7-all", - "Creality/Hyper PPA-CF @K2 Plus-all", - "Creality/Hyper PPA-CF @K2 Pro-all", - "Creality/Hyper Stardust @Hi-all", - "Creality/Hyper Stardust @K1 Max_CFS-C-all", - "Creality/Hyper Stardust @K1C-all", - "Creality/Hyper Stardust @K1C_CFS-C-all", - "Creality/Hyper Stardust @K1_CFS-C-all", - "Creality/Hyper Stardust @K2 Plus-all", - "Creality/Hyper Stardust @K2 Pro-all", - "Creality/Hyper Stardust @K2 SE-all", - "Creality/Hyper Stardust @K2-all", - "Creality/Hyper Stardust @SPARKX i7-all", - "Creality/Panchroma PLA Matte @K2 Plus-all", - "Creality/Panchroma PLA Satin @K2 Plus-all", - "Creality/PolySonic PLA @K2 Plus-all", - "Creality/PolySonic PLA Pro @K2 Plus-all", - "Creality/Soleyin Basic PETG @Hi-all", - "Creality/Soleyin Basic PETG @K1C-all", - "Creality/Soleyin Basic PETG @K2 Plus-all", - "Creality/Soleyin Basic PETG @K2 Pro-all", - "Creality/Soleyin Basic PETG @K2-all", - "Creality/Soleyin Basic PETG @SPARKX i7-all", - "Creality/Soleyin Ultra PLA @Ender-3 V4-all", - "Creality/Soleyin Ultra PLA @Hi-all", - "Creality/Soleyin Ultra PLA @K1 Max_CFS-C-all", - "Creality/Soleyin Ultra PLA @K1C-all", - "Creality/Soleyin Ultra PLA @K1C_CFS-C-all", - "Creality/Soleyin Ultra PLA @K1_CFS-C-all", - "Creality/Soleyin Ultra PLA @K2 Plus-all", - "Creality/Soleyin Ultra PLA @K2 Pro-all", - "Creality/Soleyin Ultra PLA @K2 SE-all", - "Creality/Soleyin Ultra PLA @K2-all", - "Creality/Soleyin Ultra PLA @SPARKX i7-all", - "Creality/eSUN ABS+ @K2 Plus-all", - "Creality/eSUN ASA+ @K2 Plus-all", - "Creality/eSUN PET-Basic @K2 Plus-all", - "Creality/eSUN PETG @K2 Plus-all", - "Creality/eSUN PETG+HS @K2 Plus-all", - "Creality/eSUN PETG-Basic @K2 Plus-all", - "Creality/eSUN PLA+ @K2 Plus-all", - "Creality/eSUN PLA-CF @K2 Plus-all", - "Creality/eSUN PLA-HS @K2 Plus-all", - "Creality/eSUN PLA-LW @K2 Plus-all", - "Creality/eSUN PLA-Lite @K2 Plus-all", - "Creality/eSUN PLA-Matte @K2 Plus-all", - "Creality/eSUN PLA-Silk @K2 Plus-all", - "Cubicon/Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon ABS @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon ABS @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon ABS @base", - "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon ABS-A100 @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon ABS-A100 @base", - "Cubicon/Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon ABSk @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon ABSk @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon ABSk @base", - "Cubicon/Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PA-CF @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PA-CF @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PA-CF @base", - "Cubicon/Cubicon PC @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PC @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PC @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PC @base", - "Cubicon/Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PETG @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PETG @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PETG @base", - "Cubicon/Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLA @base", - "Cubicon/Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PLA+ @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PLA+ @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLA+ @base", - "Cubicon/Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle", - "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Mini 0.4 nozzle", - "Cubicon/Cubicon PLAi21 @Cubicon xCeler-Plus 0.4 nozzle", - "Cubicon/Cubicon PLAi21 @base", - "DeltaMaker/DeltaMaker Brand PLA", - "DeltaMaker/Generic PETG @DeltaMaker", - "DeltaMaker/Generic PLA @DeltaMaker", - "DeltaMaker/Generic TPU @DeltaMaker", - "Dremel/Generic PLA @Dremel 3D20 all", - "Dremel/Generic PLA @Dremel 3D40 all", - "Dremel/Generic PLA @Dremel 3D45 all", - "Elegoo/Generic ABS-CF @Elegoo Centauri", - "Elegoo/Generic ASA-CF @Elegoo Centauri", - "Elegoo/Generic PA6-CF @Elegoo", - "Elegoo/Generic PC-CF @Elegoo", - "Elegoo/Generic PET-CF @Elegoo Centauri", - "Elegoo/Generic PETG PRO @Elegoo", - "Elegoo/Generic PETG-CF @Elegoo Centauri", - "Elegoo/Generic PLA Matte @Elegoo", - "Eryone/Eryone ABS", - "Eryone/Eryone ABS-CF", - "Eryone/Eryone ASA", - "Eryone/Eryone ASA-CF", - "Eryone/Eryone PA", - "Eryone/Eryone PA-CF", - "Eryone/Eryone PA-GF", - "Eryone/Eryone PETG", - "Eryone/Eryone PETG-CF", - "Eryone/Eryone PLA", - "Eryone/Eryone PLA-CF", - "Eryone/Eryone PP", - "Eryone/Eryone PP-CF", - "Eryone/Eryone Silk PLA", - "Eryone/Eryone TPU", - "FLSun/Generic ABS @FLSun", - "FLSun/Generic ASA @FLSun", - "FLSun/Generic PA @FLSun", - "FLSun/Generic PA-CF @FLSun", - "FLSun/Generic PC @FLSun", - "FLSun/Generic PETG @FLSun", - "FLSun/Generic PLA @FLSun", - "FLSun/Generic PLA @FLSun S1", - "FLSun/Generic PLA @FLSun T1", - "FLSun/Generic PLA-CF @FLSun", - "FLSun/Generic PVA @FLSun", - "FLSun/Generic TPU @FLSun", - "Flashforge/Flashforge ABS", - "Flashforge/Flashforge ABS Basic", - "Flashforge/Flashforge ABS Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF AD5X", - "Flashforge/Flashforge ABS Basic @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge ABS Basic @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge ABS Basic @FF C5", - "Flashforge/Flashforge ABS Basic @FF C5P", - "Flashforge/Flashforge ABS Basic @FF G4", - "Flashforge/Flashforge ABS Basic @FF G4 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 0.6 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4 HF", - "Flashforge/Flashforge ABS Basic @FF G4P", - "Flashforge/Flashforge ABS Basic @FF G4P 0.25 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P 0.6 nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge ABS Basic @FF G4P HF", - "Flashforge/Flashforge ABS-CF @FF G4", - "Flashforge/Flashforge ABS-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge ABS-CF @FF G4P", - "Flashforge/Flashforge ABS-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge ABS-GF @FF C5", - "Flashforge/Flashforge ABS-GF @FF C5P", - "Flashforge/Flashforge ASA Basic", - "Flashforge/Flashforge ASA Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF AD5X", - "Flashforge/Flashforge ASA Basic @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge ASA Basic @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge ASA Basic @FF C5", - "Flashforge/Flashforge ASA Basic @FF C5P", - "Flashforge/Flashforge ASA Basic @FF G4", - "Flashforge/Flashforge ASA Basic @FF G4 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 0.6 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4 HF", - "Flashforge/Flashforge ASA Basic @FF G4P", - "Flashforge/Flashforge ASA Basic @FF G4P 0.25 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P 0.6 nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge ASA Basic @FF G4P HF", - "Flashforge/Flashforge ASA-CF", - "Flashforge/Flashforge ASA-CF @FF C5", - "Flashforge/Flashforge ASA-CF @FF C5P", - "Flashforge/Flashforge ASA-CF @FF G4", - "Flashforge/Flashforge ASA-CF @FF G4P", - "Flashforge/Flashforge ASA-GF @FF C5", - "Flashforge/Flashforge ASA-GF @FF C5P", - "Flashforge/Flashforge HIPS @FF C5", - "Flashforge/Flashforge HIPS @FF C5P", - "Flashforge/Flashforge HIPS @FF G4", - "Flashforge/Flashforge HIPS @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4 0.6 nozzle", - "Flashforge/Flashforge HIPS @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4 HF", - "Flashforge/Flashforge HIPS @FF G4P", - "Flashforge/Flashforge HIPS @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4P 0.6 nozzle", - "Flashforge/Flashforge HIPS @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge HIPS @FF G4P HF", - "Flashforge/Flashforge HS PETG", - "Flashforge/Flashforge HS PETG @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF AD5X", - "Flashforge/Flashforge HS PETG @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge HS PETG @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge HS PETG @FF C5", - "Flashforge/Flashforge HS PETG @FF C5P", - "Flashforge/Flashforge HS PETG @FF G4", - "Flashforge/Flashforge HS PETG @FF G4 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4 0.6 nozzle", - "Flashforge/Flashforge HS PETG @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4 HF", - "Flashforge/Flashforge HS PETG @FF G4P", - "Flashforge/Flashforge HS PETG @FF G4P 0.25 nozzle", - "Flashforge/Flashforge HS PETG @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4P 0.6 nozzle", - "Flashforge/Flashforge HS PETG @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge HS PETG @FF G4P HF", - "Flashforge/Flashforge HS PLA", - "Flashforge/Flashforge HS PLA @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF AD5X", - "Flashforge/Flashforge HS PLA @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge HS PLA @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge HS PLA @FF C5", - "Flashforge/Flashforge HS PLA @FF C5P", - "Flashforge/Flashforge HS PLA @FF G4", - "Flashforge/Flashforge HS PLA @FF G4 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4 0.6 nozzle", - "Flashforge/Flashforge HS PLA @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4 HF", - "Flashforge/Flashforge HS PLA @FF G4P", - "Flashforge/Flashforge HS PLA @FF G4P 0.25 nozzle", - "Flashforge/Flashforge HS PLA @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4P 0.6 nozzle", - "Flashforge/Flashforge HS PLA @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge HS PLA @FF G4P HF", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4 HF", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti @FF G4P HF", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.6 nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4 0.8 HF nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.6 nozzle", - "Flashforge/Flashforge HS PLA Burnt Ti@FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PA @FF G4", - "Flashforge/Flashforge PA @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PA @FF G4 HF", - "Flashforge/Flashforge PA @FF G4P", - "Flashforge/Flashforge PA @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PA @FF G4P HF", - "Flashforge/Flashforge PA-CF @FF C5", - "Flashforge/Flashforge PA-CF @FF C5P", - "Flashforge/Flashforge PA-CF @FF G4", - "Flashforge/Flashforge PA-CF @FF G4P", - "Flashforge/Flashforge PA12-CF", - "Flashforge/Flashforge PA6-CF", - "Flashforge/Flashforge PA66-CF", - "Flashforge/Flashforge PC @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PC @FF G4 0.6 nozzle", - "Flashforge/Flashforge PC @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PC @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PC @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PC @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PET-CF", - "Flashforge/Flashforge PET-CF @FF C5", - "Flashforge/Flashforge PET-CF @FF C5P", - "Flashforge/Flashforge PETG", - "Flashforge/Flashforge PETG Basic", - "Flashforge/Flashforge PETG Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PETG Pro", - "Flashforge/Flashforge PETG Pro @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF AD5X", - "Flashforge/Flashforge PETG Pro @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PETG Pro @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PETG Pro @FF C5", - "Flashforge/Flashforge PETG Pro @FF C5P", - "Flashforge/Flashforge PETG Pro @FF G4", - "Flashforge/Flashforge PETG Pro @FF G4 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 0.6 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4 HF", - "Flashforge/Flashforge PETG Pro @FF G4P", - "Flashforge/Flashforge PETG Pro @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PETG Pro @FF G4P HF", - "Flashforge/Flashforge PETG Transparent", - "Flashforge/Flashforge PETG Transparent @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF AD5X", - "Flashforge/Flashforge PETG Transparent @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PETG Transparent @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PETG Transparent @FF C5", - "Flashforge/Flashforge PETG Transparent @FF C5P", - "Flashforge/Flashforge PETG Transparent @FF G4", - "Flashforge/Flashforge PETG Transparent @FF G4 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 0.6 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4 HF", - "Flashforge/Flashforge PETG Transparent @FF G4P", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PETG Transparent @FF G4P HF", - "Flashforge/Flashforge PETG-CF", - "Flashforge/Flashforge PETG-CF @FF AD5X", - "Flashforge/Flashforge PETG-CF @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PETG-CF @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PETG-CF @FF C5", - "Flashforge/Flashforge PETG-CF @FF C5P", - "Flashforge/Flashforge PETG-CF @FF G4", - "Flashforge/Flashforge PETG-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge PETG-CF @FF G4P", - "Flashforge/Flashforge PETG-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA", - "Flashforge/Flashforge PLA Basic", - "Flashforge/Flashforge PLA Basic @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF AD5X", - "Flashforge/Flashforge PLA Basic @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Basic @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Basic @FF C5", - "Flashforge/Flashforge PLA Basic @FF C5P", - "Flashforge/Flashforge PLA Basic @FF G4", - "Flashforge/Flashforge PLA Basic @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4 HF", - "Flashforge/Flashforge PLA Basic @FF G4P", - "Flashforge/Flashforge PLA Basic @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Basic @FF G4P HF", - "Flashforge/Flashforge PLA Color Change", - "Flashforge/Flashforge PLA Color Change @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF AD5X", - "Flashforge/Flashforge PLA Color Change @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Color Change @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Color Change @FF C5", - "Flashforge/Flashforge PLA Color Change @FF C5P", - "Flashforge/Flashforge PLA Color Change @FF G4", - "Flashforge/Flashforge PLA Color Change @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4 HF", - "Flashforge/Flashforge PLA Color Change @FF G4P", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Color Change @FF G4P HF", - "Flashforge/Flashforge PLA Galaxy", - "Flashforge/Flashforge PLA Galaxy @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF AD5X", - "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF C5", - "Flashforge/Flashforge PLA Galaxy @FF C5P", - "Flashforge/Flashforge PLA Galaxy @FF G4", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4 HF", - "Flashforge/Flashforge PLA Galaxy @FF G4P", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Galaxy @FF G4P HF", - "Flashforge/Flashforge PLA Luminous", - "Flashforge/Flashforge PLA Luminous @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF AD5X", - "Flashforge/Flashforge PLA Luminous @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Luminous @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Luminous @FF C5", - "Flashforge/Flashforge PLA Luminous @FF C5P", - "Flashforge/Flashforge PLA Luminous @FF G4", - "Flashforge/Flashforge PLA Luminous @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4 HF", - "Flashforge/Flashforge PLA Luminous @FF G4P", - "Flashforge/Flashforge PLA Luminous @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Luminous @FF G4P HF", - "Flashforge/Flashforge PLA Matte", - "Flashforge/Flashforge PLA Matte @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF AD5X", - "Flashforge/Flashforge PLA Matte @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Matte @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Matte @FF C5", - "Flashforge/Flashforge PLA Matte @FF C5P", - "Flashforge/Flashforge PLA Matte @FF G4", - "Flashforge/Flashforge PLA Matte @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4 HF", - "Flashforge/Flashforge PLA Matte @FF G4P", - "Flashforge/Flashforge PLA Matte @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Matte @FF G4P HF", - "Flashforge/Flashforge PLA Metal", - "Flashforge/Flashforge PLA Metal @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF AD5X", - "Flashforge/Flashforge PLA Metal @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Metal @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Metal @FF C5", - "Flashforge/Flashforge PLA Metal @FF C5P", - "Flashforge/Flashforge PLA Metal @FF G4", - "Flashforge/Flashforge PLA Metal @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4 HF", - "Flashforge/Flashforge PLA Metal @FF G4P", - "Flashforge/Flashforge PLA Metal @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Metal @FF G4P HF", - "Flashforge/Flashforge PLA Pro", - "Flashforge/Flashforge PLA Pro @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF AD5X", - "Flashforge/Flashforge PLA Pro @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Pro @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Pro @FF C5", - "Flashforge/Flashforge PLA Pro @FF C5P", - "Flashforge/Flashforge PLA Pro @FF G4", - "Flashforge/Flashforge PLA Pro @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4 HF", - "Flashforge/Flashforge PLA Pro @FF G4P", - "Flashforge/Flashforge PLA Pro @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Pro @FF G4P HF", - "Flashforge/Flashforge PLA Silk", - "Flashforge/Flashforge PLA Silk @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF AD5X", - "Flashforge/Flashforge PLA Silk @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Silk @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Silk @FF C5", - "Flashforge/Flashforge PLA Silk @FF C5P", - "Flashforge/Flashforge PLA Silk @FF G4", - "Flashforge/Flashforge PLA Silk @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4 HF", - "Flashforge/Flashforge PLA Silk @FF G4P", - "Flashforge/Flashforge PLA Silk @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PLA Silk @FF G4P HF", - "Flashforge/Flashforge PLA Sparkle", - "Flashforge/Flashforge PLA Sparkle @FF AD5M 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF AD5X", - "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4", - "Flashforge/Flashforge PLA Sparkle @FF G4 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4 HF", - "Flashforge/Flashforge PLA Sparkle @FF G4P", - "Flashforge/Flashforge PLA Sparkle @FF G4P 0.25 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PLA Sparkle @FF G4P HF", - "Flashforge/Flashforge PLA-CF", - "Flashforge/Flashforge PLA-CF @FF AD5X", - "Flashforge/Flashforge PLA-CF @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge PLA-CF @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge PLA-CF @FF C5", - "Flashforge/Flashforge PLA-CF @FF C5P", - "Flashforge/Flashforge PLA-CF @FF G4", - "Flashforge/Flashforge PLA-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge PLA-CF @FF G4P", - "Flashforge/Flashforge PLA-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PPA-CF", - "Flashforge/Flashforge PPA-CF @FF C5", - "Flashforge/Flashforge PPA-CF @FF C5P", - "Flashforge/Flashforge PPA-GF", - "Flashforge/Flashforge PPS @FF G4", - "Flashforge/Flashforge PPS @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge PPS @FF G4 0.6 nozzle", - "Flashforge/Flashforge PPS @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge PPS @FF G4P", - "Flashforge/Flashforge PPS @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge PPS @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PPS @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge PPS-CF", - "Flashforge/Flashforge PPS-CF @FF C5", - "Flashforge/Flashforge PPS-CF @FF C5P", - "Flashforge/Flashforge PPS-CF @FF G4", - "Flashforge/Flashforge PPS-CF @FF G4 0.6 nozzle", - "Flashforge/Flashforge PPS-CF @FF G4P", - "Flashforge/Flashforge PPS-CF @FF G4P 0.6 nozzle", - "Flashforge/Flashforge PVA @FF C5", - "Flashforge/Flashforge PVA @FF C5P", - "Flashforge/Flashforge TPU 65D @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge TPU 65D @FF G4 0.6 nozzle", - "Flashforge/Flashforge TPU 65D @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge TPU 65D @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge TPU 65D @FF G4P 0.6 nozzle", - "Flashforge/Flashforge TPU 65D @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge TPU 95A", - "Flashforge/Flashforge TPU 95A @FF AD5X", - "Flashforge/Flashforge TPU 95A @FF AD5X 0.6 nozzle", - "Flashforge/Flashforge TPU 95A @FF AD5X 0.8 nozzle", - "Flashforge/Flashforge TPU 95A @FF G4", - "Flashforge/Flashforge TPU 95A @FF G4 0.6 HF nozzle", - "Flashforge/Flashforge TPU 95A @FF G4 0.6 nozzle", - "Flashforge/Flashforge TPU 95A @FF G4 0.8 HF nozzle", - "Flashforge/Flashforge TPU 95A @FF G4P", - "Flashforge/Flashforge TPU 95A @FF G4P 0.6 HF nozzle", - "Flashforge/Flashforge TPU 95A @FF G4P 0.6 nozzle", - "Flashforge/Flashforge TPU 95A @FF G4P 0.8 HF nozzle", - "Flashforge/Flashforge TPU-64D @FF C5", - "Flashforge/Flashforge TPU-64D @FF C5P", - "Flashforge/Flashforge TPU-90A @FF C5", - "Flashforge/Flashforge TPU-90A @FF C5P", - "Flashforge/Flashforge TPU-95A @FF C5", - "Flashforge/Flashforge TPU-95A @FF C5P", - "Flashforge/FusRock NexPA-CF25", - "Flashforge/FusRock PAHT @FF G4 0.6 HF nozzle", - "Flashforge/FusRock PAHT @FF G4 0.6 nozzle", - "Flashforge/FusRock PAHT @FF G4 0.8 HF nozzle", - "Flashforge/FusRock PAHT @FF G4P 0.6 HF nozzle", - "Flashforge/FusRock PAHT @FF G4P 0.6 nozzle", - "Flashforge/FusRock PAHT @FF G4P 0.8 HF nozzle", - "Flashforge/FusRock PAHT-CF", - "Flashforge/FusRock PAHT-CF @FF C5", - "Flashforge/FusRock PAHT-CF @FF C5P", - "Flashforge/FusRock PAHT-CF @FF G4", - "Flashforge/FusRock PAHT-CF @FF G4 0.6 nozzle", - "Flashforge/FusRock PAHT-CF @FF G4P", - "Flashforge/FusRock PAHT-CF @FF G4P 0.6 nozzle", - "Flashforge/FusRock PAHT-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock PAHT-GF", - "Flashforge/FusRock PET @FF G4P 0.8 HF nozzle", - "Flashforge/FusRock PET-CF", - "Flashforge/FusRock PET-CF @FF G4", - "Flashforge/FusRock PET-CF @FF G4 0.6 nozzle", - "Flashforge/FusRock PET-CF @FF G4P", - "Flashforge/FusRock PET-CF @FF G4P 0.6 nozzle", - "Flashforge/FusRock PET-CF @G3U 0.6 Nozzle", - "Flashforge/FusRock PET-GF", - "Flashforge/FusRock S-Multi", - "Flashforge/FusRock S-Multi @FF C5", - "Flashforge/FusRock S-Multi @FF C5P", - "Flashforge/FusRock S-Multi @G3U 0.6 Nozzle", - "Flashforge/FusRock S-PAHT", - "Flashforge/FusRock S-PAHT @FF C5", - "Flashforge/FusRock S-PAHT @FF C5P", - "Flashforge/FusRock S-PAHT @G3U 0.6 Nozzle", - "Flashforge/Generic ABS @FF AD5M 0.25 Nozzle", - "Flashforge/Generic ABS @Flashforge", - "Flashforge/Generic ABS @Flashforge AD4", - "Flashforge/Generic ABS @Flashforge G3U", - "Flashforge/Generic ABS @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic ASA @FF AD5M 0.25 Nozzle", - "Flashforge/Generic ASA @Flashforge", - "Flashforge/Generic ASA @Flashforge AD4", - "Flashforge/Generic ASA @Flashforge G3U", - "Flashforge/Generic ASA @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic HIPS @Flashforge", - "Flashforge/Generic HIPS @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic HS PLA @FF AD5M 0.25 Nozzle", - "Flashforge/Generic HS PLA @Flashforge", - "Flashforge/Generic PET @FF G4", - "Flashforge/Generic PET @FF G4 0.6 HF nozzle", - "Flashforge/Generic PET @FF G4 0.6 nozzle", - "Flashforge/Generic PET @FF G4 0.8 HF nozzle", - "Flashforge/Generic PET @FF G4P", - "Flashforge/Generic PET @FF G4P 0.6 HF nozzle", - "Flashforge/Generic PET @FF G4P 0.6 nozzle", - "Flashforge/Generic PET @FF G4P 0.8 HF nozzle", - "Flashforge/Generic PETG @FF AD5M 0.25 Nozzle", - "Flashforge/Generic PETG @Flashforge", - "Flashforge/Generic PETG @Flashforge AD4", - "Flashforge/Generic PETG @Flashforge Artemis", - "Flashforge/Generic PETG @Flashforge G3U", - "Flashforge/Generic PETG @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic PETG @Flashforge G3U 0.8 Nozzle", - "Flashforge/Generic PETG-CF @Flashforge G3U", - "Flashforge/Generic PETG-CF @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic PETG-CF @Flashforge G3U 0.8 Nozzle", - "Flashforge/Generic PETG-CF10 @Flashforge", - "Flashforge/Generic PETG-CF10 @Flashforge AD4", - "Flashforge/Generic PLA @Flashforge", - "Flashforge/Generic PLA @Flashforge AD4", - "Flashforge/Generic PLA @Flashforge G3U", - "Flashforge/Generic PLA High Speed @Flashforge AD4", - "Flashforge/Generic PLA Silk @Flashforge AD4", - "Flashforge/Generic PLA-CF @Flashforge G3U", - "Flashforge/Generic PLA-CF @Flashforge G3U 0.6 Nozzle", - "Flashforge/Generic PLA-CF @Flashforge G3U 0.8 Nozzle", - "Flashforge/Generic PLA-CF10 @Flashforge", - "Flashforge/Generic PLA-CF10 @Flashforge AD4", - "Flashforge/Generic PLA-SILK @FF AD5M 0.25 Nozzle", - "Flashforge/Generic PLA-Silk @Flashforge", - "Flashforge/Generic PVA @Flashforge", - "Flashforge/Generic TPU 85A @FF AD5X", - "Flashforge/Generic TPU 85A @FF AD5X 0.6 nozzle", - "Flashforge/Generic TPU 85A @FF AD5X 0.8 nozzle", - "Flashforge/Generic TPU @Flashforge", - "Flashforge/Generic TPU @Flashforge AD4", - "Flashforge/Generic TPU-64D @FF C5", - "Flashforge/Generic TPU-64D @FF C5P", - "Flashforge/Generic TPU-90A @FF C5", - "Flashforge/Generic TPU-90A @FF C5P", - "Flashforge/Generic TPU-95A @FF C5", - "Flashforge/Generic TPU-95A @FF C5P", - "Flashforge/Polymaker CoPA", - "Flashforge/Polymaker CoPA @FF G4 0.6 HF nozzle", - "Flashforge/Polymaker CoPA @FF G4 0.6 nozzle", - "Flashforge/Polymaker CoPA @FF G4 0.8 HF nozzle", - "Flashforge/Polymaker CoPA @FF G4P 0.6 HF nozzle", - "Flashforge/Polymaker CoPA @FF G4P 0.6 nozzle", - "Flashforge/Polymaker CoPA @FF G4P 0.8 HF nozzle", - "Flashforge/Polymaker S1", - "FlyingBear/FlyingBear ABS @Ghost7", - "FlyingBear/FlyingBear ABS @S1", - "FlyingBear/FlyingBear PA-CF @Ghost7", - "FlyingBear/FlyingBear PA-CF @S1", - "FlyingBear/FlyingBear PC @Ghost7", - "FlyingBear/FlyingBear PC @S1", - "FlyingBear/FlyingBear PETG @S1", - "FlyingBear/FlyingBear PETG Basic @Ghost7", - "FlyingBear/FlyingBear PLA @S1", - "FlyingBear/FlyingBear PLA Basic @Ghost7", - "FlyingBear/FlyingBear PLA Hyper", - "FlyingBear/FlyingBear PLA Hyper @Ghost7", - "FlyingBear/FlyingBear PLA Hyper @S1", - "FlyingBear/FlyingBear TPU @S1", - "FlyingBear/FlyingBear TPU Basic @Ghost7", - "FlyingBear/Generic ABS @FlyingBear", - "FlyingBear/Generic PA-CF @FlyingBear", - "FlyingBear/Generic PC @FlyingBear", - "FlyingBear/Generic PETG @FlyingBear", - "FlyingBear/Generic PLA @FlyingBear", - "FlyingBear/Generic TPU @FlyingBear", - "FlyingBear/Other ABS @S1", - "FlyingBear/Other PA-CF @S1", - "FlyingBear/Other PC @S1", - "FlyingBear/Other PETG @S1", - "FlyingBear/Other PLA @S1", - "FlyingBear/Other PLA Hyper @S1", - "FlyingBear/Other TPU @S1", - "Ginger Additive/Generic PETG @Ginger", - "Ginger Additive/Generic PLA @Ginger", - "InfiMech/Generic ABS @InfiMech", - "InfiMech/Generic PA-CF @InfiMech", - "InfiMech/Generic PC @InfiMech", - "InfiMech/Generic PETG @InfiMech", - "InfiMech/Generic PLA @InfiMech", - "InfiMech/Generic TPU @InfiMech", - "InfiMech/InfiMech ABS @EX", - "InfiMech/InfiMech ABS @EX+APS", - "InfiMech/InfiMech ABS @HSN", - "InfiMech/InfiMech PA-CF @EX", - "InfiMech/InfiMech PA-CF @EX+APS", - "InfiMech/InfiMech PA-CF @HSN", - "InfiMech/InfiMech PC @EX", - "InfiMech/InfiMech PC @EX+APS", - "InfiMech/InfiMech PC @HSN", - "InfiMech/InfiMech PETG @EX", - "InfiMech/InfiMech PETG @EX+APS", - "InfiMech/InfiMech PETG @HSN", - "InfiMech/InfiMech PLA @HSN", - "InfiMech/InfiMech PLA Basic @EX", - "InfiMech/InfiMech PLA Basic @EX+APS", - "InfiMech/InfiMech PLA Hyper", - "InfiMech/InfiMech PLA Hyper @EX", - "InfiMech/InfiMech PLA Hyper @EX+APS", - "InfiMech/InfiMech PLA Hyper @HSN", - "InfiMech/InfiMech TPU @HSN", - "InfiMech/InfiMech TPU Basic @EX", - "InfiMech/InfiMech TPU Basic @EX+APS", - "InfiMech/Other ABS", - "InfiMech/Other ABS @HSN", - "InfiMech/Other PA-CF", - "InfiMech/Other PA-CF @HSN", - "InfiMech/Other PC", - "InfiMech/Other PC @HSN", - "InfiMech/Other PETG", - "InfiMech/Other PETG @HSN", - "InfiMech/Other PLA", - "InfiMech/Other PLA @HSN", - "InfiMech/Other PLA Hyper", - "InfiMech/Other PLA Hyper @HSN", - "InfiMech/Other TPU", - "InfiMech/Other TPU @HSN", - "LH/LHS ABS", - "LH/LHS ASA", - "LH/LHS PC CF", - "LH/LHS PCTG", - "LH/LHS PETG", - "LH/LHS PLA", - "LH/LHS TPU", - "LH/LHS TPU Foamy 78A", - "LONGER/Generic PETG @LONGER LK10", - "LONGER/Generic PETG @LONGER LK10 Plus", - "LONGER/Generic PLA @LONGER LK10", - "LONGER/Generic PLA @LONGER LK10 Plus", - "MagicMaker/Generic PEEK @MM", - "OrcaArena/Generic PA @OrcaArena", - "OrcaArena/Generic PA-CF @OrcaArena", - "OrcaArena/Generic TPU @OrcaArena", - "OrcaFilamentLibrary/Eolas Prints ABS @System", - "OrcaFilamentLibrary/Eolas Prints ASA @System", - "OrcaFilamentLibrary/Eolas Prints PETG @System", - "OrcaFilamentLibrary/Eolas Prints PETG Transition @System", - "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant @System", - "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial @System", - "OrcaFilamentLibrary/Eolas Prints PLA High Speed @System", - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850 @System", - "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870 @System", - "OrcaFilamentLibrary/Eolas Prints PLA Matte @System", - "OrcaFilamentLibrary/Eolas Prints PLA Neon @System", - "OrcaFilamentLibrary/Eolas Prints PLA Premium @System", - "OrcaFilamentLibrary/Eolas Prints PLA Silk @System", - "OrcaFilamentLibrary/Eolas Prints PLA Transition @System", - "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant @System", - "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A @System", - "OrcaFilamentLibrary/Eolas Prints TPU Flex D53 @System", - "OrcaFilamentLibrary/Eolas Prints TPU Transition @System", - "OrcaFilamentLibrary/FilAr PETG Amarillo Lima", - "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante", - "OrcaFilamentLibrary/FilAr PETG Azul Boreal", - "OrcaFilamentLibrary/FilAr PETG Azul Francia", - "OrcaFilamentLibrary/FilAr PETG Azul Imperial", - "OrcaFilamentLibrary/FilAr PETG Blanco Antartida", - "OrcaFilamentLibrary/FilAr PETG Cian", - "OrcaFilamentLibrary/FilAr PETG Coral", - "OrcaFilamentLibrary/FilAr PETG Cristal", - "OrcaFilamentLibrary/FilAr PETG Gris Ceniza", - "OrcaFilamentLibrary/FilAr PETG Gris Plata", - "OrcaFilamentLibrary/FilAr PETG Magenta", - "OrcaFilamentLibrary/FilAr PETG Negro Azabache", - "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi", - "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio", - "OrcaFilamentLibrary/FilAr PLA Azul Francia", - "OrcaFilamentLibrary/FilAr PLA Blanco Antartida", - "OrcaFilamentLibrary/FilAr PLA Blanco Calido", - "OrcaFilamentLibrary/FilAr PLA Bronce", - "OrcaFilamentLibrary/FilAr PLA Cafe con Leche", - "OrcaFilamentLibrary/FilAr PLA Carpincho", - "OrcaFilamentLibrary/FilAr PLA Celeste Cielo", - "OrcaFilamentLibrary/FilAr PLA Cobre", - "OrcaFilamentLibrary/FilAr PLA Dorado", - "OrcaFilamentLibrary/FilAr PLA Gris Ceniza", - "OrcaFilamentLibrary/FilAr PLA Gris Pizarra", - "OrcaFilamentLibrary/FilAr PLA Gris Plata", - "OrcaFilamentLibrary/FilAr PLA Manteca", - "OrcaFilamentLibrary/FilAr PLA Marron Oxido", - "OrcaFilamentLibrary/FilAr PLA Naranja Tigre", - "OrcaFilamentLibrary/FilAr PLA Negro Azabache", - "OrcaFilamentLibrary/FilAr PLA Oro", - "OrcaFilamentLibrary/FilAr PLA Piel", - "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras", - "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto", - "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco", - "OrcaFilamentLibrary/FilAr PLA Tabaco", - "OrcaFilamentLibrary/FilAr PLA Titanio", - "OrcaFilamentLibrary/FilAr PLA Verde FilAr", - "OrcaFilamentLibrary/FilAr PLA Verde Manzana", - "OrcaFilamentLibrary/FilAr PLA Verde Oliva", - "OrcaFilamentLibrary/FilAr PLA Verde Pixel", - "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda", - "OrcaFilamentLibrary/FilAr PLA-mate Amarillo", - "OrcaFilamentLibrary/FilAr PLA-mate Azul", - "OrcaFilamentLibrary/FilAr PLA-mate Beige", - "OrcaFilamentLibrary/FilAr PLA-mate Blanco", - "OrcaFilamentLibrary/FilAr PLA-mate Bordo", - "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo", - "OrcaFilamentLibrary/FilAr PLA-mate Chocolate", - "OrcaFilamentLibrary/FilAr PLA-mate Gris", - "OrcaFilamentLibrary/FilAr PLA-mate Marron", - "OrcaFilamentLibrary/FilAr PLA-mate Naranja", - "OrcaFilamentLibrary/FilAr PLA-mate Negro", - "OrcaFilamentLibrary/FilAr PLA-mate Piel", - "OrcaFilamentLibrary/FilAr PLA-mate Rojo", - "OrcaFilamentLibrary/FilAr PLA-mate Rosa", - "OrcaFilamentLibrary/FilAr PLA-mate Uva", - "OrcaFilamentLibrary/FilAr PLA-mate Verde", - "OrcaFilamentLibrary/FilAr PLA-mate Violeta", - "OrcaFilamentLibrary/Generic ABS @System", - "OrcaFilamentLibrary/Generic ASA @System", - "OrcaFilamentLibrary/Generic BVOH @System", - "OrcaFilamentLibrary/Generic CoPE @System", - "OrcaFilamentLibrary/Generic EVA @System", - "OrcaFilamentLibrary/Generic HIPS @System", - "OrcaFilamentLibrary/Generic PA @System", - "OrcaFilamentLibrary/Generic PA-CF @System", - "OrcaFilamentLibrary/Generic PC @System", - "OrcaFilamentLibrary/Generic PCTG @System", - "OrcaFilamentLibrary/Generic PE @System", - "OrcaFilamentLibrary/Generic PETG @System", - "OrcaFilamentLibrary/Generic PHA @System", - "OrcaFilamentLibrary/Generic PLA @System", - "OrcaFilamentLibrary/Generic PLA High Speed @System", - "OrcaFilamentLibrary/Generic PLA Silk @System", - "OrcaFilamentLibrary/Generic PLA-CF @System", - "OrcaFilamentLibrary/Generic PP @System", - "OrcaFilamentLibrary/Generic PPA-CF @System", - "OrcaFilamentLibrary/Generic PPA-GF @System", - "OrcaFilamentLibrary/Generic PVA @System", - "OrcaFilamentLibrary/Generic SBS @System", - "OrcaFilamentLibrary/Generic TPU @System", - "OrcaFilamentLibrary/PolyLite PLA @System", - "OrcaFilamentLibrary/PolyTerra Dual PLA @System", - "OrcaFilamentLibrary/eSUN ePLA-LW @System", - "Peopoly/Generic ABS @Peopoly", - "Peopoly/Generic PETG @Peopoly", - "Peopoly/Generic PLA @Peopoly", - "Peopoly/Peopoly Lancer ABS-GF", - "Peopoly/Peopoly Lancer PET-CF", - "Peopoly/Peopoly Lancer PETG-C", - "Peopoly/Peopoly Lancer PLA-C", - "Prusa/Generic ABS @Prusa CORE One", - "Prusa/Generic ABS @Prusa CORE One 0.6", - "Prusa/Generic ABS @Prusa CORE One 0.8", - "Prusa/Generic ABS @Prusa CORE One HF 0.4", - "Prusa/Generic ABS @Prusa CORE One HF 0.5", - "Prusa/Generic ABS @Prusa CORE One HF 0.6", - "Prusa/Generic ABS @Prusa CORE One HF 0.8", - "Prusa/Generic ABS @Prusa MK3.5", - "Prusa/Generic ABS @Prusa MK3.5 0.25", - "Prusa/Generic ABS @Prusa MK3.5 0.6", - "Prusa/Generic ABS @Prusa MK3.5 0.8", - "Prusa/Generic ABS @Prusa MK4S", - "Prusa/Generic ABS @Prusa MK4S 0.6", - "Prusa/Generic ABS @Prusa MK4S 0.8", - "Prusa/Generic ABS @Prusa MK4S HF0.4", - "Prusa/Generic ABS @Prusa MK4S HF0.5", - "Prusa/Generic ABS @Prusa MK4S HF0.6", - "Prusa/Generic ABS @Prusa MK4S HF0.8", - "Prusa/Generic ABS HF @Prusa MK3.5", - "Prusa/Generic ABS HF @Prusa MK3.5 0.6", - "Prusa/Generic ABS HF @Prusa MK3.5 0.8", - "Prusa/Generic ASA @Prusa", - "Prusa/Generic ASA @Prusa CORE One", - "Prusa/Generic ASA @Prusa CORE One 0.6", - "Prusa/Generic ASA @Prusa CORE One 0.8", - "Prusa/Generic ASA @Prusa CORE One HF 0.4", - "Prusa/Generic ASA @Prusa CORE One HF 0.5", - "Prusa/Generic ASA @Prusa CORE One HF 0.6", - "Prusa/Generic ASA @Prusa CORE One HF 0.8", - "Prusa/Generic ASA @Prusa MINIIS", - "Prusa/Generic ASA @Prusa MINIIS 0.25", - "Prusa/Generic ASA @Prusa MINIIS 0.6", - "Prusa/Generic ASA @Prusa MINIIS 0.8", - "Prusa/Generic ASA @Prusa MK3.5", - "Prusa/Generic ASA @Prusa MK3.5 0.25", - "Prusa/Generic ASA @Prusa MK3.5 0.6", - "Prusa/Generic ASA @Prusa MK3.5 0.8", - "Prusa/Generic ASA @Prusa MK4", - "Prusa/Generic ASA @Prusa MK4S", - "Prusa/Generic ASA @Prusa MK4S 0.6", - "Prusa/Generic ASA @Prusa MK4S 0.8", - "Prusa/Generic ASA @Prusa MK4S HF0.4", - "Prusa/Generic ASA @Prusa MK4S HF0.5", - "Prusa/Generic ASA @Prusa MK4S HF0.6", - "Prusa/Generic ASA @Prusa MK4S HF0.8", - "Prusa/Generic ASA HF @Prusa MK3.5", - "Prusa/Generic ASA HF @Prusa MK3.5 0.6", - "Prusa/Generic ASA HF @Prusa MK3.5 0.8", - "Prusa/Generic FLEX @Prusa XL", - "Prusa/Generic FLEX @Prusa XL 5T", - "Prusa/Generic PA @Prusa MK3.5", - "Prusa/Generic PA @Prusa MK3.5 0.25", - "Prusa/Generic PA @Prusa MK3.5 0.6", - "Prusa/Generic PA @Prusa MK3.5 0.8", - "Prusa/Generic PA-CF @Prusa MK3.5", - "Prusa/Generic PA-CF @Prusa MK3.5 0.25", - "Prusa/Generic PA-CF @Prusa MK3.5 0.6", - "Prusa/Generic PA-CF @Prusa MK3.5 0.8", - "Prusa/Generic PC @Prusa", - "Prusa/Generic PC @Prusa MINIIS", - "Prusa/Generic PC @Prusa MINIIS 0.25", - "Prusa/Generic PC @Prusa MINIIS 0.6", - "Prusa/Generic PC @Prusa MINIIS 0.8", - "Prusa/Generic PC @Prusa MK3.5", - "Prusa/Generic PC @Prusa MK3.5 0.25", - "Prusa/Generic PC @Prusa MK3.5 0.6", - "Prusa/Generic PC @Prusa MK3.5 0.8", - "Prusa/Generic PC HF @Prusa MK3.5", - "Prusa/Generic PC HF @Prusa MK3.5 0.6", - "Prusa/Generic PC HF @Prusa MK3.5 0.8", - "Prusa/Generic PETG @Prusa CORE One", - "Prusa/Generic PETG @Prusa CORE One 0.6", - "Prusa/Generic PETG @Prusa CORE One 0.8", - "Prusa/Generic PETG @Prusa CORE One HF 0.4", - "Prusa/Generic PETG @Prusa CORE One HF 0.5", - "Prusa/Generic PETG @Prusa CORE One HF 0.6", - "Prusa/Generic PETG @Prusa CORE One HF 0.8", - "Prusa/Generic PETG @Prusa MK3.5", - "Prusa/Generic PETG @Prusa MK3.5 0.25", - "Prusa/Generic PETG @Prusa MK3.5 0.6", - "Prusa/Generic PETG @Prusa MK3.5 0.8", - "Prusa/Generic PETG @Prusa MK4S", - "Prusa/Generic PETG @Prusa MK4S 0.6", - "Prusa/Generic PETG @Prusa MK4S 0.8", - "Prusa/Generic PETG @Prusa MK4S HF0.4", - "Prusa/Generic PETG @Prusa MK4S HF0.5", - "Prusa/Generic PETG @Prusa MK4S HF0.6", - "Prusa/Generic PETG @Prusa MK4S HF0.8", - "Prusa/Generic PETG HF @Prusa MK3.5", - "Prusa/Generic PETG HF @Prusa MK3.5 0.6", - "Prusa/Generic PETG HF @Prusa MK3.5 0.8", - "Prusa/Generic PLA @Prusa CORE One", - "Prusa/Generic PLA @Prusa CORE One 0.6", - "Prusa/Generic PLA @Prusa CORE One 0.8", - "Prusa/Generic PLA @Prusa CORE One HF 0.4", - "Prusa/Generic PLA @Prusa CORE One HF 0.5", - "Prusa/Generic PLA @Prusa CORE One HF 0.6", - "Prusa/Generic PLA @Prusa CORE One HF 0.8", - "Prusa/Generic PLA @Prusa MK3.5", - "Prusa/Generic PLA @Prusa MK3.5 0.25", - "Prusa/Generic PLA @Prusa MK3.5 0.6", - "Prusa/Generic PLA @Prusa MK3.5 0.8", - "Prusa/Generic PLA @Prusa MK4S", - "Prusa/Generic PLA @Prusa MK4S 0.6", - "Prusa/Generic PLA @Prusa MK4S 0.8", - "Prusa/Generic PLA @Prusa MK4S HF0.4", - "Prusa/Generic PLA @Prusa MK4S HF0.5", - "Prusa/Generic PLA @Prusa MK4S HF0.6", - "Prusa/Generic PLA @Prusa MK4S HF0.8", - "Prusa/Generic PLA HF @Prusa MK3.5", - "Prusa/Generic PLA HF @Prusa MK3.5 0.6", - "Prusa/Generic PLA HF @Prusa MK3.5 0.8", - "Prusa/Generic PLA Silk @Prusa CORE One", - "Prusa/Generic PLA Silk @Prusa CORE One 0.6", - "Prusa/Generic PLA Silk @Prusa CORE One 0.8", - "Prusa/Generic PLA Silk @Prusa MK4S", - "Prusa/Generic PLA Silk @Prusa MK4S 0.6", - "Prusa/Generic PLA Silk @Prusa MK4S 0.8", - "Prusa/Generic PLA-CF @Prusa MK3.5", - "Prusa/Generic PLA-CF @Prusa MK3.5 0.25", - "Prusa/Generic PLA-CF @Prusa MK3.5 0.6", - "Prusa/Generic PLA-CF @Prusa MK3.5 0.8", - "Prusa/Generic PVA @Prusa MK3.5", - "Prusa/Generic PVA @Prusa MK3.5 0.25", - "Prusa/Generic PVA @Prusa MK3.5 0.6", - "Prusa/Generic PVA @Prusa MK3.5 0.8", - "Prusa/Generic PVA HF @Prusa MK3.5", - "Prusa/Generic PVA HF @Prusa MK3.5 0.6", - "Prusa/Generic PVA HF @Prusa MK3.5 0.8", - "Prusa/Generic TPU @Prusa CORE One", - "Prusa/Generic TPU @Prusa CORE One 0.6", - "Prusa/Generic TPU @Prusa CORE One 0.8", - "Prusa/Generic TPU @Prusa MK3.5", - "Prusa/Generic TPU @Prusa MK4S", - "Prusa/Generic TPU @Prusa MK4S 0.6", - "Prusa/Generic TPU @Prusa MK4S 0.8", - "Prusa/Generic TPU HF @Prusa MK3.5", - "Prusa/Prusament ASA @CORE One", - "Prusa/Prusament ASA @CORE One 0.6", - "Prusa/Prusament ASA @CORE One 0.8", - "Prusa/Prusament ASA @CORE One HF 0.4", - "Prusa/Prusament ASA @CORE One HF 0.5", - "Prusa/Prusament ASA @CORE One HF 0.6", - "Prusa/Prusament ASA @CORE One HF 0.8", - "Prusa/Prusament ASA @XL", - "Prusa/Prusament ASA @XL 5T", - "Prusa/Prusament PA-CF @CORE One", - "Prusa/Prusament PA-CF @CORE One 0.6", - "Prusa/Prusament PA-CF @CORE One 0.8", - "Prusa/Prusament PA-CF @XL", - "Prusa/Prusament PA-CF @XL 5T", - "Prusa/Prusament PC Blend @CORE One", - "Prusa/Prusament PC Blend @CORE One 0.6", - "Prusa/Prusament PC Blend @CORE One 0.8", - "Prusa/Prusament PC Blend @CORE One HF 0.4", - "Prusa/Prusament PC Blend @CORE One HF 0.5", - "Prusa/Prusament PC Blend @CORE One HF 0.6", - "Prusa/Prusament PC Blend @CORE One HF 0.8", - "Prusa/Prusament PC Blend @XL", - "Prusa/Prusament PC Blend @XL 5T", - "Prusa/Prusament PC-CF @CORE One", - "Prusa/Prusament PC-CF @CORE One 0.6", - "Prusa/Prusament PC-CF @CORE One 0.8", - "Prusa/Prusament PC-CF @XL", - "Prusa/Prusament PC-CF @XL 5T", - "Prusa/Prusament PETG @CORE One", - "Prusa/Prusament PETG @CORE One 0.6", - "Prusa/Prusament PETG @CORE One 0.8", - "Prusa/Prusament PETG @CORE One HF 0.4", - "Prusa/Prusament PETG @CORE One HF 0.5", - "Prusa/Prusament PETG @CORE One HF 0.6", - "Prusa/Prusament PETG @CORE One HF 0.8", - "Prusa/Prusament PLA @CORE One", - "Prusa/Prusament PLA @CORE One 0.6", - "Prusa/Prusament PLA @CORE One 0.8", - "Prusa/Prusament PLA @CORE One HF 0.4", - "Prusa/Prusament PLA @CORE One HF 0.5", - "Prusa/Prusament PLA @CORE One HF 0.6", - "Prusa/Prusament PLA @CORE One HF 0.8", - "Prusa/Prusament PVB @CORE One", - "Prusa/Prusament PVB @CORE One 0.6", - "Prusa/Prusament PVB @CORE One 0.8", - "Prusa/Prusament PVB @XL", - "Prusa/Prusament PVB @XL 5T", - "Prusa/Prusament rPLA @CORE One", - "Prusa/Prusament rPLA @CORE One 0.6", - "Prusa/Prusament rPLA @CORE One 0.8", - "Qidi/Bambu ABS", - "Qidi/Bambu ABS @0.2 nozzle", - "Qidi/Bambu ABS @0.6 nozzle", - "Qidi/Bambu ABS @0.8 nozzle", - "Qidi/Bambu ABS @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Bambu ABS @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Bambu ABS @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Bambu ABS @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Bambu ABS @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Bambu ABS @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Bambu ABS @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Bambu ABS @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Bambu PETG", - "Qidi/Bambu PETG @0.2 nozzle", - "Qidi/Bambu PETG @0.6 nozzle", - "Qidi/Bambu PETG @0.8 nozzle", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Bambu PETG @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Bambu PETG @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Bambu PLA", - "Qidi/Bambu PLA @0.2 nozzle", - "Qidi/Bambu PLA @0.6 nozzle", - "Qidi/Bambu PLA @0.8 nozzle", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Bambu PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Bambu PLA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic ABS @Qidi", - "Qidi/Generic ABS @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Generic ABS @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic ABS @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Generic ABS @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Generic ABS @Qidi X-Max 3 0.2 nozzle", - "Qidi/Generic ABS @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Generic ABS @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic ABS @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic ABS @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic ABS @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic ABS @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Generic ASA @Qidi", - "Qidi/Generic ASA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Generic ASA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic ASA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Generic ASA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Generic ASA @Qidi X-Max 3 0.2 nozzle", - "Qidi/Generic ASA @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Generic ASA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic ASA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic ASA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic ASA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic ASA @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Generic PA @Qidi", - "Qidi/Generic PA-CF @Qidi", - "Qidi/Generic PC @Qidi", - "Qidi/Generic PC @Qidi 0.2 nozzle", - "Qidi/Generic PC @Qidi 0.8 nozzle", - "Qidi/Generic PC @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Generic PC @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic PC @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Generic PC @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Generic PC @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic PC @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic PC @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic PC @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic PETG @Qidi", - "Qidi/Generic PETG @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Generic PETG @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic PETG @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Generic PETG @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Generic PETG @Qidi X-Max 3 0.2 nozzle", - "Qidi/Generic PETG @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Generic PETG @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic PETG @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic PETG @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic PETG @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic PETG @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Generic PETG-CF @Qidi", - "Qidi/Generic PLA @Qidi", - "Qidi/Generic PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Generic PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Generic PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Generic PLA @Qidi X-Max 3 0.2 nozzle", - "Qidi/Generic PLA @Qidi X-Max 3 0.6 nozzle", - "Qidi/Generic PLA @Qidi X-Max 3 0.8 nozzle", - "Qidi/Generic PLA @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Generic PLA @Qidi X-Plus 3 0.6 nozzle", - "Qidi/Generic PLA @Qidi X-Plus 3 0.8 nozzle", - "Qidi/Generic PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic PLA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic PLA @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Generic PLA @Qidi X-Smart 3 0.6 nozzle", - "Qidi/Generic PLA @Qidi X-Smart 3 0.8 nozzle", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic PLA High Speed @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic PLA Silk @Qidi", - "Qidi/Generic PLA Silk @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic PLA+ @Qidi", - "Qidi/Generic PLA+ @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Generic PLA+ @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic PLA+ @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Generic PLA+ @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Generic PLA+ @Qidi X-Max 3 0.2 nozzle", - "Qidi/Generic PLA+ @Qidi X-Max 3 0.6 nozzle", - "Qidi/Generic PLA+ @Qidi X-Max 3 0.8 nozzle", - "Qidi/Generic PLA+ @Qidi X-Plus 3 0.2 nozzle", - "Qidi/Generic PLA+ @Qidi X-Plus 3 0.6 nozzle", - "Qidi/Generic PLA+ @Qidi X-Plus 3 0.8 nozzle", - "Qidi/Generic PLA+ @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Generic PLA+ @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Generic PLA+ @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Generic PLA+ @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic PLA+ @Qidi X-Smart 3 0.2 nozzle", - "Qidi/Generic PLA+ @Qidi X-Smart 3 0.6 nozzle", - "Qidi/Generic PLA+ @Qidi X-Smart 3 0.8 nozzle", - "Qidi/Generic PLA-CF @Qidi", - "Qidi/Generic PVA @Qidi", - "Qidi/Generic TPU 95A @Qidi", - "Qidi/Generic TPU 95A @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Generic TPU 95A @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Generic TPU @Qidi", - "Qidi/Generic TPU @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Generic TPU @Qidi X-Plus 4 0.4 nozzle", - "Qidi/HATCHBOX ABS @Qidi", - "Qidi/HATCHBOX ABS @Qidi 0.2 nozzle", - "Qidi/HATCHBOX ABS @Qidi 0.6 nozzle", - "Qidi/HATCHBOX ABS @Qidi 0.8 nozzle", - "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.2 nozzle", - "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.4 nozzle", - "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.6 nozzle", - "Qidi/HATCHBOX ABS @Qidi Q1 Pro 0.8 nozzle", - "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.2 nozzle", - "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.4 nozzle", - "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.6 nozzle", - "Qidi/HATCHBOX ABS @Qidi X-Plus 4 0.8 nozzle", - "Qidi/HATCHBOX PETG @0.2 nozzle", - "Qidi/HATCHBOX PETG @0.6 nozzle", - "Qidi/HATCHBOX PETG @0.8 nozzle", - "Qidi/HATCHBOX PETG @Qidi", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.2 nozzle", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.4 nozzle", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.6 nozzle", - "Qidi/HATCHBOX PETG @Qidi Q1 Pro 0.8 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.2 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.4 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.6 nozzle", - "Qidi/HATCHBOX PETG @Qidi X-Plus 4 0.8 nozzle", - "Qidi/HATCHBOX PLA @0.2 nozzle", - "Qidi/HATCHBOX PLA @0.6 nozzle", - "Qidi/HATCHBOX PLA @0.8 nozzle", - "Qidi/HATCHBOX PLA @Qidi", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/HATCHBOX PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/HATCHBOX PLA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Overture ABS @Qidi", - "Qidi/Overture ABS @Qidi 0.2 nozzle", - "Qidi/Overture ABS @Qidi 0.6 nozzle", - "Qidi/Overture ABS @Qidi 0.8 nozzle", - "Qidi/Overture ABS @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Overture ABS @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Overture ABS @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Overture ABS @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Overture ABS @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Overture ABS @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Overture ABS @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Overture ABS @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Overture PLA @Qidi", - "Qidi/Overture PLA @Qidi 0.2 nozzle", - "Qidi/Overture PLA @Qidi 0.6 nozzle", - "Qidi/Overture PLA @Qidi 0.8 nozzle", - "Qidi/Overture PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/Overture PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Overture PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Overture PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Overture PLA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/PolyLite ABS @Qidi", - "Qidi/PolyLite ABS @Qidi 0.2 nozzle", - "Qidi/PolyLite ABS @Qidi 0.6 nozzle", - "Qidi/PolyLite ABS @Qidi 0.8 nozzle", - "Qidi/PolyLite ABS @Qidi Q1 Pro 0.2 nozzle", - "Qidi/PolyLite ABS @Qidi Q1 Pro 0.4 nozzle", - "Qidi/PolyLite ABS @Qidi Q1 Pro 0.6 nozzle", - "Qidi/PolyLite ABS @Qidi Q1 Pro 0.8 nozzle", - "Qidi/PolyLite ABS @Qidi X-Plus 4 0.2 nozzle", - "Qidi/PolyLite ABS @Qidi X-Plus 4 0.4 nozzle", - "Qidi/PolyLite ABS @Qidi X-Plus 4 0.6 nozzle", - "Qidi/PolyLite ABS @Qidi X-Plus 4 0.8 nozzle", - "Qidi/PolyLite PLA @Qidi", - "Qidi/PolyLite PLA @Qidi 0.2 nozzle", - "Qidi/PolyLite PLA @Qidi 0.6 nozzle", - "Qidi/PolyLite PLA @Qidi 0.8 nozzle", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/PolyLite PLA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/PolyLite PLA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ABS Odorless", - "Qidi/QIDI ABS Odorless @0.2 nozzle", - "Qidi/QIDI ABS Odorless @0.6 nozzle", - "Qidi/QIDI ABS Odorless @0.8 nozzle", - "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI ABS Odorless @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ABS Rapido", - "Qidi/QIDI ABS Rapido 0.2 nozzle", - "Qidi/QIDI ABS Rapido 0.6 nozzle", - "Qidi/QIDI ABS Rapido 0.8 nozzle", - "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI ABS Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ABS Rapido Metal", - "Qidi/QIDI ABS Rapido Metal @0.2 nozzle", - "Qidi/QIDI ABS Rapido Metal @0.6 nozzle", - "Qidi/QIDI ABS Rapido Metal @0.8 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI ABS Rapido Metal @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ABS-GF", - "Qidi/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ABS-GF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI ABS-GF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI ABS-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ABS-GF10", - "Qidi/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ABS-GF10 @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI ABS-GF10 @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI ABS-GF10 @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ABS-GF25", - "Qidi/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ABS-GF25 @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI ABS-GF25 @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI ABS-GF25 @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ASA", - "Qidi/QIDI ASA @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI ASA @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ASA @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ASA @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ASA @Qidi X-Max 3 0.2 nozzle", - "Qidi/QIDI ASA @Qidi X-Plus 3 0.2 nozzle", - "Qidi/QIDI ASA @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI ASA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI ASA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI ASA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI ASA @Qidi X-Smart 3 0.2 nozzle", - "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Max 3 0.8 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Plus 3 0.8 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.4 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.6 nozzle", - "Qidi/QIDI ASA-CF @Qidi X-Smart 3 0.8 nozzle", - "Qidi/QIDI PA-Ultra", - "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PA-Ultra @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PA12-CF", - "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PA12-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PA12-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PAHT-CF", - "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PAHT-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PAHT-GF", - "Qidi/QIDI PAHT-GF @0.6 nozzle", - "Qidi/QIDI PAHT-GF @0.8 nozzle", - "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PAHT-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PAHT-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PEBA 95A", - "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PEBA 95A @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PET-CF", - "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PET-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PET-GF", - "Qidi/QIDI PET-GF @0.6 nozzle", - "Qidi/QIDI PET-GF @0.8 nozzle", - "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PET-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PET-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Basic", - "Qidi/QIDI PETG Basic @0.2 nozzle", - "Qidi/QIDI PETG Basic @0.6 nozzle", - "Qidi/QIDI PETG Basic @0.8 nozzle", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Basic @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Rapido", - "Qidi/QIDI PETG Rapido @0.2 nozzle", - "Qidi/QIDI PETG Rapido @0.6 nozzle", - "Qidi/QIDI PETG Rapido @0.8 nozzle", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Rapido @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Tough", - "Qidi/QIDI PETG Tough 0.2 nozzle", - "Qidi/QIDI PETG Tough 0.6 nozzle", - "Qidi/QIDI PETG Tough 0.8 nozzle", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Tough @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG Translucent", - "Qidi/QIDI PETG Translucent @0.2 nozzle", - "Qidi/QIDI PETG Translucent @0.6 nozzle", - "Qidi/QIDI PETG Translucent @0.8 nozzle", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG Translucent @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG Translucent @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG-CF", - "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PETG-GF", - "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PETG-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PETG-GF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Basic", - "Qidi/QIDI PLA Basic @0.2 nozzle", - "Qidi/QIDI PLA Basic @0.6 nozzle", - "Qidi/QIDI PLA Basic @0.8 nozzle", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Basic @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Matte Basic", - "Qidi/QIDI PLA Matte Basic @0.2 nozzle", - "Qidi/QIDI PLA Matte Basic @0.6 nozzle", - "Qidi/QIDI PLA Matte Basic @0.8 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Matte Basic @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido", - "Qidi/QIDI PLA Rapido 0.2 nozzle", - "Qidi/QIDI PLA Rapido 0.8 nozzle", - "Qidi/QIDI PLA Rapido @0.6 nozzle", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Matte", - "Qidi/QIDI PLA Rapido Matte @0.2 nozzle", - "Qidi/QIDI PLA Rapido Matte @0.6 nozzle", - "Qidi/QIDI PLA Rapido Matte @0.8 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Rapido Matte @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Metal", - "Qidi/QIDI PLA Rapido Metal @0.2 nozzle", - "Qidi/QIDI PLA Rapido Metal @0.6 nozzle", - "Qidi/QIDI PLA Rapido Metal @0.8 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.2 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.2 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA Rapido Metal @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PLA Rapido Silk", - "Qidi/QIDI PLA Rapido Silk @0.6 nozzle", - "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA Rapido Silk @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA Rapido Silk @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA-CF @0.6 nozzle", - "Qidi/QIDI PLA-CF @0.8 nozzle", - "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PLA-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PPS-CF", - "Qidi/QIDI PPS-CF @0.6 nozzle", - "Qidi/QIDI PPS-CF @0.8 nozzle", - "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PPS-CF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI PPS-CF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI PPS-GF", - "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI PPS-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI Support For PAHT", - "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI Support For PAHT @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI Support For PET/PA", - "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI Support For PET/PA @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI TPU-Aero", - "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI TPU-Aero @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI TPU-Aero @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI TPU-GF", - "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI TPU-GF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI UltraPA-CF25", - "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI UltraPA-CF25 @Qidi X-Plus 4 0.8 nozzle", - "Qidi/QIDI WOOD Rapido", - "Qidi/QIDI WOOD Rapido @0.6 nozzle", - "Qidi/QIDI WOOD Rapido @0.8 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.4 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.6 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi Q1 Pro 0.8 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.4 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.6 nozzle", - "Qidi/QIDI WOOD Rapido @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi ASA-Aero", - "Qidi/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi ASA-Aero @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi PC-ABS-FR", - "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.6 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.6 nozzle", - "Qidi/Qidi PC-ABS-FR @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Qidi PLA-CF", - "Qidi/Qidi TPU 95A-HF", - "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", - "Qidi/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle", - "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.4 nozzle", - "Qidi/Qidi TPU 95A-HF @Qidi X-Plus 4 0.8 nozzle", - "Qidi/Tinmorry PETG-ECO", - "RH3D/Generic ABS @E3NG v1.2S", - "RH3D/Generic ASA @E3NG v1.2S", - "RH3D/Generic PCCF @E3NG v1.2S", - "RH3D/Generic PETG @E3NG v1.2S", - "RH3D/Generic PLA @E3NG v1.2S", - "RH3D/Generic TPU @E3NG v1.2S", - "Ratrig/Generic ABS @RatRig", - "Ratrig/Generic ABS BigNozzle @RatRig", - "Ratrig/Generic ASA @RatRig", - "Ratrig/Generic ASA BigNozzle @RatRig", - "Ratrig/Generic PA @RatRig", - "Ratrig/Generic PA-CF @RatRig", - "Ratrig/Generic PC @RatRig", - "Ratrig/Generic PCTG @RatRig", - "Ratrig/Generic PCTG BigNozzle @RatRig", - "Ratrig/Generic PETG @RatRig", - "Ratrig/Generic PETG BigNozzle @RatRig", - "Ratrig/Generic PLA @RatRig", - "Ratrig/Generic PLA BigNozzle @RatRig", - "Ratrig/Generic PLA-CF @RatRig", - "Ratrig/Generic PVA @RatRig", - "Ratrig/Generic TPU @RatRig", - "Ratrig/Generic TPU BigNozzle @RatRig", - "Ratrig/RatRig PunkFil ABS", - "Ratrig/RatRig PunkFil PETG", - "Ratrig/RatRig PunkFil PETG CF", - "SecKit/Generic ABS @SecKit", - "SecKit/Generic ASA @SecKit", - "SecKit/Generic PA @SecKit", - "SecKit/Generic PA-CF @SecKit", - "SecKit/Generic PC @SecKit", - "SecKit/Generic PETG @SecKit", - "SecKit/Generic PLA @SecKit", - "SecKit/Generic PLA-CF @SecKit", - "SecKit/Generic PVA @SecKit", - "SecKit/Generic TPU @SecKit", - "SeeMeCNC/SeeMeCNC ABS", - "SeeMeCNC/SeeMeCNC PA-CF", - "SeeMeCNC/SeeMeCNC PETG", - "SeeMeCNC/SeeMeCNC PETG-CF", - "SeeMeCNC/SeeMeCNC PLA", - "SeeMeCNC/SeeMeCNC TPU", - "Snapmaker/PolyLite Dual PLA @0.2 nozzle", - "Snapmaker/PolyLite J1 PLA", - "Snapmaker/PolyLite J1 PLA @0.2 nozzle", - "Snapmaker/PolyTerra Dual PLA @0.2 nozzle", - "Snapmaker/PolyTerra J1 PLA", - "Snapmaker/PolyTerra J1 PLA @0.2 nozzle", - "Snapmaker/Polymaker General PLA Family @U1", - "Snapmaker/Polymaker Silk PLA Family @U1", - "Snapmaker/Polymaker Tough PLA Family @U1", - "Snapmaker/Snapmaker ABS Benchy @U1", - "Snapmaker/Snapmaker Dual ABS Benchy", - "Snapmaker/Snapmaker Dual TPE", - "Snapmaker/Snapmaker Dual TPU High-Flow", - "Snapmaker/Snapmaker J1 ABS Benchy", - "Snapmaker/Snapmaker J1 TPE", - "Snapmaker/Snapmaker J1 TPU High-Flow", - "Snapmaker/Snapmaker PET @Dual", - "Snapmaker/Snapmaker PLA Full Spectrum @U1 0.4 nozzle", - "Snapmaker/Snapmaker PLA Matte @U1", - "Snapmaker/Snapmaker PLA Silk @U1", - "Snapmaker/Snapmaker PLA Silk @U1 0.2 nozzle", - "Snapmaker/Snapmaker PLA Silk @U1 0.6 nozzle", - "Snapmaker/Snapmaker PLA Silk @U1 0.8 nozzle", - "Snapmaker/Snapmaker PLA Wood @U1 0.4 nozzle", - "Snapmaker/Snapmaker PLA Wood @U1 0.6 nozzle", - "Snapmaker/Snapmaker PLA Wood @U1 0.8 nozzle", - "Snapmaker/Snapmaker PLA-CF @U1 0.4 nozzle", - "Snapmaker/Snapmaker PLA-CF @U1 0.6 nozzle", - "Snapmaker/Snapmaker PLA-CF @U1 0.8 nozzle", - "Snapmaker/Snapmaker TPE", - "Snapmaker/Snapmaker TPE @U1", - "Snapmaker/Snapmaker TPU 90A @U1", - "Snapmaker/Snapmaker TPU 90A @U1 0.6 nozzle", - "Snapmaker/Snapmaker TPU 90A @U1 0.8 nozzle", - "Snapmaker/Snapmaker TPU 95A HF @U1", - "Snapmaker/Snapmaker TPU 95A HF @U1 0.6 nozzle", - "Snapmaker/Snapmaker TPU 95A HF @U1 0.8 nozzle", - "Snapmaker/Snapmaker TPU High-Flow @U1", - "Sovol/Generic PLA Silk @Sovol SV08 MAX", - "Sovol/Polymaker PETG @Sovol SV08 MAX", - "Sovol/SUNLU PETG @Sovol SV08 MAX", - "Sovol/Sovol Zero PETG HS Nozzle", - "Sovol/Sovol Zero PLA Basic HS Nozzle", - "Sovol/Sovol Zero PLA Silk HS Nozzle", - "Tiertime/Generic ABS @Tiertime", - "Tiertime/Generic ABS @Tiertime 300HS", - "Tiertime/Generic ASA @Tiertime", - "Tiertime/Generic ASA @Tiertime 300HS", - "Tiertime/Generic BVOH @Tiertime", - "Tiertime/Generic BVOH @Tiertime 300HS", - "Tiertime/Generic EVA @Tiertime", - "Tiertime/Generic EVA @Tiertime 300HS", - "Tiertime/Generic HIPS @Tiertime", - "Tiertime/Generic HIPS @Tiertime 300HS", - "Tiertime/Generic PA @Tiertime", - "Tiertime/Generic PA @Tiertime 300HS", - "Tiertime/Generic PA-CF @Tiertime", - "Tiertime/Generic PA-CF @Tiertime 300HS", - "Tiertime/Generic PC @Tiertime", - "Tiertime/Generic PC @Tiertime 300HS", - "Tiertime/Generic PCTG @Tiertime", - "Tiertime/Generic PCTG @Tiertime 300HS", - "Tiertime/Generic PE @Tiertime", - "Tiertime/Generic PE @Tiertime 300HS", - "Tiertime/Generic PE-CF @Tiertime", - "Tiertime/Generic PE-CF @Tiertime 300HS", - "Tiertime/Generic PETG @Tiertime", - "Tiertime/Generic PETG @Tiertime 300HS", - "Tiertime/Generic PETG-CF @Tiertime", - "Tiertime/Generic PETG-CF @Tiertime 300HS", - "Tiertime/Generic PHA @Tiertime", - "Tiertime/Generic PHA @Tiertime 300HS", - "Tiertime/Generic PLA @Tiertime", - "Tiertime/Generic PLA @Tiertime 300HS", - "Tiertime/Generic PLA High Speed @Tiertime", - "Tiertime/Generic PLA High Speed @Tiertime 300HS", - "Tiertime/Generic PLA Silk @Tiertime", - "Tiertime/Generic PLA Silk @Tiertime 300HS", - "Tiertime/Generic PLA-CF @Tiertime", - "Tiertime/Generic PLA-CF @Tiertime 300HS", - "Tiertime/Generic PP @Tiertime", - "Tiertime/Generic PP @Tiertime 300HS", - "Tiertime/Generic PP-CF @Tiertime", - "Tiertime/Generic PP-CF @Tiertime 300HS", - "Tiertime/Generic PP-GF @Tiertime", - "Tiertime/Generic PP-GF @Tiertime 300HS", - "Tiertime/Generic PPA-CF @Tiertime", - "Tiertime/Generic PPA-CF @Tiertime 300HS", - "Tiertime/Generic PPA-GF @Tiertime", - "Tiertime/Generic PPA-GF @Tiertime 300HS", - "Tiertime/Generic PPS @Tiertime", - "Tiertime/Generic PPS @Tiertime 300HS", - "Tiertime/Generic PPS-CF @Tiertime", - "Tiertime/Generic PPS-CF @Tiertime 300HS", - "Tiertime/Generic PVA @Tiertime", - "Tiertime/Generic PVA @Tiertime 300HS", - "Tiertime/Generic SBS @Tiertime", - "Tiertime/Generic SBS @Tiertime 300HS", - "Tiertime/Generic TPU @Tiertime", - "Tiertime/Generic TPU @Tiertime 300HS", - "Tiertime/Tiertime ABS", - "Tiertime/Tiertime ABS@300HS", - "Tiertime/Tiertime ASA", - "Tiertime/Tiertime ASA@300HS", - "Tiertime/Tiertime PA6-CF", - "Tiertime/Tiertime PA6-CF@300HS", - "Tiertime/Tiertime PC", - "Tiertime/Tiertime PC@300HS", - "Tiertime/Tiertime PET-CF", - "Tiertime/Tiertime PET-CF@300HS", - "Tiertime/Tiertime PETG", - "Tiertime/Tiertime PETG@300HS", - "Tiertime/Tiertime PLA", - "Tiertime/Tiertime PLA-CF", - "Tiertime/Tiertime PLA-CF@300HS", - "Tiertime/Tiertime PLA@300HS", - "Tiertime/Tiertime PVA", - "Tiertime/Tiertime PVA@300HS", - "Tiertime/Tiertime TPU 95A", - "Tiertime/Tiertime TPU 95A@300HS", - "TwoTrees/Generic HS PLA @TwoTrees SK1", - "TwoTrees/Generic TPU 95A @TwoTrees SK1", - "Volumic/Désactivé", - "Volumic/PA6 CF20 (Performance)", - "Volumic/PETG ESD (Performance)", - "Volumic/PPS Carbone (Performance)", - "Volumic/Volumic ABS Ultra", - "Volumic/Volumic ABS Ultra (Performance)", - "Volumic/Volumic ASA Ultra", - "Volumic/Volumic ASA Ultra (Performance)", - "Volumic/Volumic FLEX93 Ultra", - "Volumic/Volumic FLEX93 Ultra (Performance)", - "Volumic/Volumic NYLON Ultra", - "Volumic/Volumic NYLON Ultra (Performance)", - "Volumic/Volumic PC", - "Volumic/Volumic PC (Performance)", - "Volumic/Volumic PCTG Ultra (Performance)", - "Volumic/Volumic PETG Ultra", - "Volumic/Volumic PETG Ultra (Performance)", - "Volumic/Volumic PETG Ultra carbone", - "Volumic/Volumic PETG Ultra carbone (Performance)", - "Volumic/Volumic PLA Ultra", - "Volumic/Volumic PLA Ultra (Performance)", - "Volumic/Volumic PP Ultra", - "Volumic/Volumic PP Ultra (Performance)", - "Volumic/Volumic PVA", - "Volumic/Volumic PVA-BVOH (Performance)", - "Volumic/Volumic UNIVERSAL Ultra", - "Volumic/Volumic UNIVERSAL Ultra (Performance)", - "Vzbot/Generic ABS @Vzbot", - "Vzbot/Generic ASA @Vzbot", - "Vzbot/Generic PA @Vzbot", - "Vzbot/Generic PA-CF @Vzbot", - "Vzbot/Generic PC @Vzbot", - "Vzbot/Generic PETG @Vzbot", - "Vzbot/Generic PLA @Vzbot", - "Vzbot/Generic PLA-CF @Vzbot", - "Vzbot/Generic PVA @Vzbot", - "Vzbot/Generic TPU @Vzbot", - "Wanhao France/YUMI PETG", - "Wanhao France/YUMI PLA Bowden", - "Wanhao France/YUMI PLA Direct Drive", - "WonderMaker/WonderMaker ABS", - "WonderMaker/WonderMaker ASA", - "WonderMaker/WonderMaker PET-CF", - "WonderMaker/WonderMaker PETG Basic", - "WonderMaker/WonderMaker PLA Basic", - "WonderMaker/WonderMaker PLA Marble", - "WonderMaker/WonderMaker PLA Matte", - "WonderMaker/WonderMaker PLA Metal", - "WonderMaker/WonderMaker PLA Silk", - "WonderMaker/WonderMaker PLA Wood", - "WonderMaker/WonderMaker PVA", - "WonderMaker/WonderMaker TPU 95A", - "Z-Bolt/Generic ABS @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic ABS @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic ABS @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic ABS HT @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic ABS HT @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic ABS HT @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PA @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic PA @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic PA @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PETG @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic PETG @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic PETG @Z-Bolt 0.8 nozzle", - "Z-Bolt/Generic PLA @Z-Bolt 0.4 nozzle", - "Z-Bolt/Generic PLA @Z-Bolt 0.6 nozzle", - "Z-Bolt/Generic PLA @Z-Bolt 0.8 nozzle", - "iQ/Fiberthree PACF Pro P1 @iQ TiQ2 0.4 Nozzle", - "iQ/Fiberthree PACF Pro P2 @iQ TiQ2 0.4 Nozzle", - "iQ/Grauts HPP4GF25 P1 @iQ TiQ2 0.4 Nozzle", - "iQ/Material4Print ABS Natur P1 @iQ TiQ8 0.4 Nozzle", - "iQ/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle", - "iQ/VXL90 TiQ2 P2 @iQ TiQ2 0.4 Nozzle", - "re3D/re3D PC", - "re3D/re3D PC @0.4 nozzle", - "re3D/re3D PC @0.8 nozzle", - "re3D/re3D PETG", - "re3D/re3D PETG @0.4 nozzle", - "re3D/re3D PETG @0.8 nozzle", - "re3D/re3D PLA", - "re3D/re3D PLA @0.4 nozzle", - "re3D/re3D PLA @0.8 nozzle", - "re3D/re3D rPETG", - "re3D/re3D rPETG @0.8 nozzle", - "re3D/re3D rPETG @1.75 nozzle", - "re3D/re3D rPP", - "re3D/re3D rPP @0.8 nozzle", - "re3D/re3D rPP @1.75 nozzle" - ], - "triple_exceptions": [], - "triples": { - "OF02UAVh": [ - [ - "Creality", - "PLA", - "Soleyin Ultra PLA" - ] - ], - "OF03RK6r": [ - [ - "BETA", - "PLA", - "BETA PLA Metal" - ] - ], - "OF0AquDh": [ - [ - "FusRock", - "PA", - "FusRock S-Multi" - ] - ], - "OF0EYBWQ": [ - [ - "addnorth", - "PETG", - "addnorth PETG Flame v0" - ] - ], - "OF0FfcAG": [ - [ - "Anycubic", - "TPU", - "Anycubic TPU for ACE" - ] - ], - "OF0NgY1y": [ - [ - "COEX 3D", - "PA-CF", - "COEX NYLEX PA6-CF" - ] - ], - "OF0R5Wc7": [ - [ - "Artillery", - "PLA Tough", - "Artillery PLA Tough" - ] - ], - "OF0UJcb6": [ - [ - "Polymaker", - "PETG", - "PolyLite PETG" - ] - ], - "OF0VpkBM": [ - [ - "Polymaker", - "PETG", - "PolyLite PETG Translucent" - ] - ], - "OF0Vtzaw": [ - [ - "FilAr", - "PETG", - "FilAr PETG Amarillo Radiante" - ] - ], - "OF0b7M1z": [ - [ - "SeeMeCNC", - "PA-CF", - "SeeMeCNC PA-CF" - ] - ], - "OF0c7mnL": [ - [ - "InfiMech", - "ABS", - "InfiMech ABS" - ] - ], - "OF0gGRWk": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Glow" - ] - ], - "OF0h7ERL": [ - [ - "Elegoo", - "PA", - "Elegoo PAHT" - ] - ], - "OF0kCNDK": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Luminous" - ] - ], - "OF0omtEb": [ - [ - "Polymaker", - "ASA", - "Fiberon ASA-CF08" - ] - ], - "OF0pzFLc": [ - [ - "COEX 3D", - "PLA", - "COEX PLA+Silk" - ] - ], - "OF0w7OpJ": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido 0.8 nozzle" - ] - ], - "OF0wBGNx": [ - [ - "Bambu Lab", - "ASA-CF", - "Bambu ASA-CF" - ] - ], - "OF0wz84w": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido 0.6 nozzle" - ] - ], - "OF0yFLkY": [ - [ - "Anycubic", - "ASA", - "Anycubic ASA" - ] - ], - "OF112FvY": [ - [ - "Generic", - "PETG", - "Generic PETG Basic" - ] - ], - "OF1ID4N1": [ - [ - "addnorth", - "PA6", - "addnorth PA6 Addlantis" - ] - ], - "OF1N1qMK": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA UV Shift" - ] - ], - "OF1Pke8t": [ - [ - "Overture", - "PLA", - "Overture Easy PLA" - ] - ], - "OF1UNk9P": [ - [ - "Generic", - "PP", - "Generic PP" - ] - ], - "OF1W7c76": [ - [ - "QIDI", - "ASA-CF", - "QIDI ASA-CF" - ] - ], - "OF1d7c3A": [ - [ - "Snapmaker", - "ASA", - "Snapmaker ASA" - ] - ], - "OF1dpPrW": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA" - ] - ], - "OF1hznGB": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA PRO" - ] - ], - "OF223rZv": [ - [ - "Anycubic", - "ABS", - "Anycubic ABS" - ] - ], - "OF2EB9Iz": [ - [ - "Volumic", - "ASA", - "Volumic ASA Ultra" - ] - ], - "OF2EK9F1": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Violeta" - ] - ], - "OF2GCW1l": [ - [ - "SUNLU", - "PETG", - "SUNLU PETG" - ] - ], - "OF2TQpOO": [ - [ - "QIDI", - "PLA", - "QIDI PLA Silk" - ] - ], - "OF2VFe4J": [ - [ - "Bambu Lab", - "PA-CF", - "Bambu PAHT-CF" - ] - ], - "OF2Z1nT5": [ - [ - "FilAr", - "PETG", - "FilAr PETG Azul Imperial" - ] - ], - "OF2hfMcG": [ - [ - "Orca Arena", - "PLA-CF", - "Arena PLA-CF" - ] - ], - "OF2pj5l5": [ - [ - "Overture", - "PLA", - "Overture Super PLA+" - ] - ], - "OF2xccEe": [ - [ - "DREMC", - "ASA", - "DREMC ASA GF" - ] - ], - "OF30Ftju": [ - [ - "Elegoo", - "TPU", - "Elegoo Rapid TPU 95A" - ] - ], - "OF342jVN": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Tough+" - ] - ], - "OF3F63OE": [ - [ - "re3D", - "PETG", - "re3D PETG" - ] - ], - "OF3IKafc": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Matte" - ] - ], - "OF3OMgrI": [ - [ - "Creality", - "PLA", - "CR-Silk" - ] - ], - "OF3PDEw3": [ - [ - "BETA", - "PLA", - "BETA PLA High Speed" - ] - ], - "OF3WQaKK": [ - [ - "Creality", - "PETG", - "CR-PETG" - ] - ], - "OF3dJf4E": [ - [ - "Volumic", - "PLA", - "Volumic PLA Ultra (Performance)" - ] - ], - "OF3fwO8b": [ - [ - "FlyingBear", - "PLA", - "FlyingBear PLA Basic" - ] - ], - "OF3kBrdA": [ - [ - "eSUN", - "PETG", - "eSUN PETG" - ] - ], - "OF3msXEa": [ - [ - "Snapmaker", - "PETG-CF", - "Snapmaker Dual PETG-CF" - ] - ], - "OF3ydJTT": [ - [ - "InfiMech", - "PLA", - "InfiMech PLA Hyper" - ] - ], - "OF43Raws": [ - [ - "Polymaker", - "PLA", - "PolyTerra J1 PLA" - ] - ], - "OF44ERDr": [ - [ - "Polymaker", - "PLA", - "Polymaker General PLA Family" - ] - ], - "OF44VYzK": [ - [ - "FilAr", - "PETG", - "FilAr PETG Azul Francia" - ] - ], - "OF4APyxe": [ - [ - "Creality", - "PA-CF", - "Hyper PAHT-CF" - ] - ], - "OF4GM5qX": [ - [ - "Generic", - "ASA", - "Generic ASA BigNozzle" - ] - ], - "OF4KsW72": [ - [ - "FilAr", - "PLA", - "FilAr PLA" - ] - ], - "OF4Nhggz": [ - [ - "Artillery", - "PLA Basic+", - "Artillery PLA Basic+" - ] - ], - "OF4PKvem": [ - [ - "BETA", - "PLA", - "BETA PLA Fluorescence" - ] - ], - "OF4QZANi": [ - [ - "BETA", - "TPU", - "BETA TPU Matte" - ] - ], - "OF4RvVuU": [ - [ - "Bambu Lab", - "PPS-CF", - "Bambu PPS-CF" - ] - ], - "OF4S3To3": [ - [ - "QIDI", - "PETG", - "QIDI PETG Rapido" - ] - ], - "OF4WB37S": [ - [ - "Snapmaker", - "PETG", - "Snapmaker PETG" - ] - ], - "OF4XTfoI": [ - [ - "BETA", - "PETG", - "BETA PETG Marble" - ] - ], - "OF4f8vVp": [ - [ - "WonderMaker", - "PET-CF", - "WonderMaker PET-CF" - ] - ], - "OF4iWKrE": [ - [ - "QIDI", - "PETG-CF", - "QIDI PETG-CF" - ] - ], - "OF4nQ62r": [ - [ - "QIDI", - "PLA", - "QIDI PLA Basic" - ] - ], - "OF4ulo9Y": [ - [ - "WonderMaker", - "PVA", - "WonderMaker PVA" - ] - ], - "OF53eLVD": [ - [ - "Generic", - "ASA-CF", - "Generic ASA-CF" - ] - ], - "OF54B0S0": [ - [ - "Bambu Lab", - "PPA-CF", - "Bambu PPA-CF" - ] - ], - "OF54SvEe": [ - [ - "Prusa Polymers", - "PA11-CF", - "Prusament PA-CF" - ] - ], - "OF55jHAJ": [ - [ - "Generic", - "ABS", - "Generic ABS HF" - ] - ], - "OF5B9sUc": [ - [ - "Polymaker", - "PA-GF", - "Fiberon PA6-GF25" - ] - ], - "OF5BN24W": [ - [ - "Flashforge", - "PPA-GF", - "Flashforge PPA-GF" - ] - ], - "OF5BXhHF": [ - [ - "BETA", - "PLA", - "BETA PLA High Temp" - ] - ], - "OF5CgdDq": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA" - ] - ], - "OF5LAnla": [ - [ - "BETA", - "PLA", - "BETA PLA Gradient" - ] - ], - "OF5NqBfC": [ - [ - "Yumi", - "PETG", - "YUMI PETG" - ] - ], - "OF5P4jgA": [ - [ - "FilAr", - "PLA", - "FilAr PLA Dorado" - ] - ], - "OF5PtjTp": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Glow" - ] - ], - "OF5SJ3jz": [ - [ - "Flashforge", - "ABS", - "Flashforge ABS" - ] - ], - "OF5YVJXH": [ - [ - "Artillery", - "ASA", - "Artillery ASA" - ] - ], - "OF5c6nq3": [ - [ - "Generic", - "TPU-64D", - "Generic TPU-64D" - ] - ], - "OF5lGPup": [ - [ - "WonderMaker", - "PETG", - "WonderMaker PETG Basic" - ] - ], - "OF5nlfKY": [ - [ - "FilAr", - "PLA", - "FilAr PLA Oro" - ] - ], - "OF5oNRED": [ - [ - "Eryone", - "PP", - "Eryone PP" - ] - ], - "OF5oXk4M": [ - [ - "Polymaker", - "PLA", - "Polymaker PLA Pro" - ] - ], - "OF5rnhjh": [ - [ - "FilAr", - "PETG", - "FilAr PETG" - ] - ], - "OF5tX6va": [ - [ - "Generic", - "TPU", - "Generic TPU BigNozzle" - ] - ], - "OF5umxxT": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Glow" - ] - ], - "OF5vgi2G": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Azul" - ] - ], - "OF65InrS": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU" - ] - ], - "OF66KUAN": [ - [ - "Polymaker", - "PLA", - "PolySonic PLA" - ] - ], - "OF6ATsCF": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker Dual PLA-CF" - ] - ], - "OF6H51Xx": [ - [ - "Polymaker", - "PETG", - "Polymaker PETG" - ] - ], - "OF6Ll8lK": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG Translucent" - ] - ], - "OF6MOPWx": [ - [ - "Generic", - "PET", - "Generic PET" - ] - ], - "OF6TuVAg": [ - [ - "Snapmaker", - "PVA", - "Snapmaker J1 PVA" - ] - ], - "OF6Yn69v": [ - [ - "BETA", - "TPU", - "BETA TPU 90A" - ] - ], - "OF6kj4jI": [ - [ - "iQ Materials", - "PACF Pro", - "Fiberthree PACF Pro P2" - ] - ], - "OF6qAuyi": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Matte" - ] - ], - "OF6qw3Wb": [ - [ - "BETA", - "PA-CF", - "BETA PAHT-CF" - ] - ], - "OF6rdQ6M": [ - [ - "Generic", - "PPS-CF", - "Generic PPS-CF" - ] - ], - "OF70zbGS": [ - [ - "Creality", - "PLA", - "Hyper L-W PLA" - ] - ], - "OF71b7qO": [ - [ - "addnorth", - "PLA", - "addnorth PLA E-PLA" - ] - ], - "OF72YYTd": [ - [ - "Snapmaker", - "ABS", - "Snapmaker ABS" - ] - ], - "OF74KeQR": [ - [ - "Generic", - "PHA", - "Generic PHA" - ] - ], - "OF79Fbo6": [ - [ - "Cubicon", - "PC", - "Cubicon PC" - ] - ], - "OF7H3VJM": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Marble" - ] - ], - "OF7OqDp3": [ - [ - "Tiertime", - "PLA-CF", - "Tiertime PLA-CF" - ] - ], - "OF7SliVn": [ - [ - "Polymaker", - "PLA", - "PolyLite J1 PLA" - ] - ], - "OF7c9fln": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Translucent" - ] - ], - "OF7lOgYF": [ - [ - "Generic", - "PETG", - "Generic PETG HF" - ] - ], - "OF7lwj52": [ - [ - "CoLiDo", - "PETG", - "CoLiDo PETG" - ] - ], - "OF7nBAd3": [ - [ - "Eryone", - "PLA Silk", - "Eryone Silk PLA" - ] - ], - "OF7pjCsO": [ - [ - "FusRock", - "PAHT", - "FusRock PAHT" - ] - ], - "OF7tt7DO": [ - [ - "Cubicon", - "PLA", - "Cubicon PLA+" - ] - ], - "OF8GnyFU": [ - [ - "Creality", - "ABS", - "Hyper ABS" - ] - ], - "OF8GtyKJ": [ - [ - "Flashforge", - "TPU-64D", - "Flashforge TPU-64D" - ] - ], - "OF8Hx3Pi": [ - [ - "Cubicon", - "PETG", - "Cubicon PETG" - ] - ], - "OF8Jl6NT": [ - [ - "Snapmaker", - "PET", - "Snapmaker J1 PET" - ] - ], - "OF8O09RG": [ - [ - "Flashforge", - "PLA", - "Flashforge HS PLA Burnt Ti" - ] - ], - "OF8QdQwS": [ - [ - "BETA", - "PLA", - "BETA PLA Silk+" - ] - ], - "OF8Tlg47": [ - [ - "Generic", - "PPA-GF", - "Generic PPA-GF" - ] - ], - "OF8aFWfQ": [ - [ - "FilAr", - "PLA", - "FilAr PLA Amarillo Lirio" - ] - ], - "OF8dCquh": [ - [ - "Snapmaker", - "ABS", - "Snapmaker J1 ABS Benchy" - ] - ], - "OF8eaY7j": [ - [ - "Generic", - "PA-CF", - "Generic PA612-CF" - ] - ], - "OF8jh0Lk": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Marron" - ] - ], - "OF8kJys9": [ - [ - "Eryone", - "PETG", - "Eryone PETG" - ] - ], - "OF8tPByX": [ - [ - "Generic", - "PPA-CF", - "Generic PPA-CF" - ] - ], - "OF8wE5l7": [ - [ - "Artillery", - "PETG Basic", - "Artillery PETG Basic" - ] - ], - "OF99UMPq": [ - [ - "COEX 3D", - "ABS", - "COEX ABS" - ] - ], - "OF99vXPs": [ - [ - "DREMC", - "ABS", - "DREMC ABS+" - ] - ], - "OF9EHUKK": [ - [ - "QIDI", - "TPU-GF", - "QIDI TPU-GF" - ] - ], - "OF9HCdyQ": [ - [ - "Afinia", - "PLA", - "Afinia PLA" - ] - ], - "OF9OlTWH": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Marble" - ] - ], - "OF9PELEb": [ - [ - "QIDI", - "UltraPA-CF25", - "QIDI UltraPA-CF25" - ] - ], - "OF9UJOGF": [ - [ - "Anycubic", - "PETG-CF", - "Anycubic PETG-CF" - ] - ], - "OF9cAwMK": [ - [ - "Flashforge", - "PLA-CF", - "Flashforge PLA-CF" - ] - ], - "OF9emAI9": [ - [ - "RatRig", - "PETG", - "RatRig PunkFil PETG" - ] - ], - "OFA026vt": [ - [ - "Orca Arena", - "PA-CF", - "Arena PA-CF" - ] - ], - "OFAC7Wyu": [ - [ - "Artillery", - "PLA Matte", - "Artillery PLA Matte" - ] - ], - "OFAIBCLJ": [ - [ - "Generic", - "ABS-CF", - "Generic ABS-CF" - ] - ], - "OFAIrQXu": [ - [ - "Creality", - "PLA", - "Creality Hyper PLA" - ] - ], - "OFANFm4x": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Metal" - ] - ], - "OFAO9A7J": [ - [ - "Generic", - "PLA", - "Sovol Zero PLA Silk HS Nozzle" - ] - ], - "OFAZllAN": [ - [ - "Artillery", - "PLA-CF", - "Artillery PLA-CF" - ] - ], - "OFAc0Pr3": [ - [ - "Polymaker", - "PET-CF", - "Fiberon PET-CF17" - ] - ], - "OFAcJkl1": [ - [ - "addnorth", - "PETG-CF", - "addnorth PETG-CF Rigid X" - ] - ], - "OFAebKg8": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Metal" - ] - ], - "OFAnyRUI": [ - [ - "Bambu Lab", - "PLA", - "Bambu Support For PLA" - ] - ], - "OFAt6ec0": [ - [ - "FilAr", - "PLA", - "FilAr PLA Marron Oxido" - ] - ], - "OFB5SmWk": [ - [ - "Valment", - "PLA", - "Valment PLA Galaxy" - ] - ], - "OFBBgw7B": [ - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Wood" - ] - ], - "OFBJAdLw": [ - [ - "LH Stinger", - "PCTG", - "LHS PCTG" - ] - ], - "OFBLktDy": [ - [ - "Creality", - "PETG", - "Soleyin Basic PETG" - ] - ], - "OFBSW57R": [ - [ - "Bambu Lab", - "PLA-AERO", - "Bambu PLA Aero" - ] - ], - "OFBUIlZ7": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA+" - ] - ], - "OFBlFMVp": [ - [ - "Snapmaker", - "PETG", - "Snapmaker Dual PETG" - ] - ], - "OFBoSWxb": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Luminous" - ] - ], - "OFBsbMMF": [ - [ - "addnorth", - "PA-CF", - "addnorth PA-CF Adura X" - ] - ], - "OFBw6eEG": [ - [ - "Overture", - "PLA", - "Overture Matte PLA" - ] - ], - "OFC1PzXz": [ - [ - "Creality", - "PLA", - "Hyper Luminous" - ] - ], - "OFC5f4Ay": [ - [ - "Generic", - "PC-CF", - "Generic PCCF" - ] - ], - "OFC78WGQ": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Starlight" - ] - ], - "OFCD8qiU": [ - [ - "Generic", - "EVA", - "Generic EVA" - ] - ], - "OFCIUsWh": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Translucent" - ] - ], - "OFCJpR7a": [ - [ - "Creality", - "PLA", - "HP Ultra PLA" - ] - ], - "OFCZsqXg": [ - [ - "Creality", - "PLA", - "Hyper PLA" - ] - ], - "OFCccVrQ": [ - [ - "Polymaker", - "PLA", - "PolyTerra Dual PLA" - ] - ], - "OFCidU7j": [ - [ - "DREMC", - "ABS-GF", - "DREMC ABS-GF" - ] - ], - "OFCjG251": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Verde" - ] - ], - "OFCn83wF": [ - [ - "FusRock", - "PAHT", - "FusRock S-PAHT" - ] - ], - "OFCnywiC": [ - [ - "Tiertime", - "PET-CF", - "Tiertime PET-CF" - ] - ], - "OFCoRobU": [ - [ - "Elas", - "ASA", - "Elas ASA" - ] - ], - "OFCp3Bgo": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA SE" - ] - ], - "OFCuaCer": [ - [ - "Volumic", - "PLA", - "Désactivé" - ] - ], - "OFD21ije": [ - [ - "Cubicon", - "PA", - "Cubicon PA-CF" - ] - ], - "OFD8loeT": [ - [ - "re3D", - "PETG", - "re3D rPETG" - ] - ], - "OFD9taow": [ - [ - "FlyingBear", - "PLA", - "FlyingBear PLA Hyper" - ] - ], - "OFDETOM6": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Matte" - ] - ], - "OFDGigEI": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Dynamic" - ] - ], - "OFDIrhbu": [ - [ - "QIDI", - "PC-ABS-FR", - "QIDI PC/ABS-FR" - ] - ], - "OFDJU6R3": [ - [ - "Afinia", - "TPU", - "Afinia TPU" - ] - ], - "OFDKIKyw": [ - [ - "Snapmaker", - "PVA", - "Snapmaker Dual PVA" - ] - ], - "OFDKgoqx": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA" - ] - ], - "OFDRpXLZ": [ - [ - "Other", - "PETG", - "Other PETG" - ] - ], - "OFDSrzZ8": [ - [ - "Generic", - "PLA", - "Generic PLA" - ] - ], - "OFDdEaoL": [ - [ - "re3D", - "PLA", - "re3D PLA" - ] - ], - "OFDe8uyM": [ - [ - "Valment", - "PLA", - "Valment PLA" - ] - ], - "OFDgQaca": [ - [ - "FlyingBear", - "PETG", - "FlyingBear PETG" - ] - ], - "OFDpW3J8": [ - [ - "FILL3D", - "PLA", - "FILL3D PLA Basic" - ] - ], - "OFDtop41": [ - [ - "Generic", - "PA", - "Generic Support for PA" - ] - ], - "OFDu1qE7": [ - [ - "FusRock", - "PET-CF", - "FusRock PET-CF" - ] - ], - "OFDvXujf": [ - [ - "Generic", - "PVA", - "Generic PVA" - ] - ], - "OFDvqJ6n": [ - [ - "Overture", - "ABS", - "Overture ABS Basic" - ] - ], - "OFDwBwO5": [ - [ - "Generic", - "PVA", - "Generic PVA HF" - ] - ], - "OFDxfPgH": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Sparkle" - ] - ], - "OFDxxTpW": [ - [ - "Flashforge", - "PETG", - "Flashforge HS PETG" - ] - ], - "OFE0NFRh": [ - [ - "COEX 3D", - "TPU", - "COEX TPU 60A" - ] - ], - "OFEGNJD4": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Silk" - ] - ], - "OFEOnBj6": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Lite" - ] - ], - "OFEWYR89": [ - [ - "Generic", - "PLA", - "Generic PLA+" - ] - ], - "OFEZ449N": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Uva" - ] - ], - "OFEZpel7": [ - [ - "Volumic", - "PPS-CF", - "PPS Carbone (Performance)" - ] - ], - "OFEabreg": [ - [ - "Polymaker", - "PA6-CF", - "Fiberon PA6-CF20" - ] - ], - "OFEbIx49": [ - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Marble" - ] - ], - "OFEhuUNq": [ - [ - "DREMC", - "PA-CF", - "DREMC PA12-CF" - ] - ], - "OFEj7sca": [ - [ - "Cubicon", - "PC", - "Cubicon PC" - ] - ], - "OFEjbwqG": [ - [ - "Polymaker", - "PLA", - "PolyTerra PLA+" - ] - ], - "OFEkPBwx": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Glow" - ] - ], - "OFEmsric": [ - [ - "Snapmaker", - "PA-CF", - "Snapmaker PA-CF" - ] - ], - "OFEnbt6D": [ - [ - "Peopoly", - "PLA", - "Peopoly Lancer PLA-C" - ] - ], - "OFEswT5W": [ - [ - "Bambu Lab", - "PLA-CF", - "Bambu PLA-CF" - ] - ], - "OFEvEfw5": [ - [ - "Flashforge", - "PA", - "Flashforge PA" - ] - ], - "OFEwRwmL": [ - [ - "Cubicon", - "PLA", - "Cubicon PLA" - ] - ], - "OFF3cuzT": [ - [ - "Generic", - "TPU", - "Generic TPU 64D" - ] - ], - "OFF5o7b2": [ - [ - "BETA", - "PLA", - "BETA PLA Youth" - ] - ], - "OFF9OKoY": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Pro" - ] - ], - "OFF9cgY5": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Matte" - ] - ], - "OFFAWVf0": [ - [ - "QIDI", - "PC-ABS-FR", - "QIDI PC-ABS-FR" - ] - ], - "OFFFg2Pf": [ - [ - "Flashforge", - "ASA", - "Flashforge ASA Basic" - ] - ], - "OFFNYwWR": [ - [ - "Bambu Lab", - "PA-CF", - "Bambu PA-CF" - ] - ], - "OFFP4ORR": [ - [ - "Creality", - "ABS", - "Creality Hyper ABS" - ] - ], - "OFFX1DRD": [ - [ - "FlyingBear", - "PC", - "FlyingBear PC" - ] - ], - "OFFZ458u": [ - [ - "Polymaker", - "PA-CF", - "Fiberon PA612-ESD" - ] - ], - "OFFbQscs": [ - [ - "eSUN", - "PETG", - "eSUN PETG-Basic" - ] - ], - "OFFbSnCD": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Translucent" - ] - ], - "OFFfJ09N": [ - [ - "BETA", - "PETG", - "BETA PETG Glow" - ] - ], - "OFFkCLBl": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Galaxy" - ] - ], - "OFFvzqcd": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG Basic" - ] - ], - "OFFwJWea": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Silk" - ] - ], - "OFG0kOKX": [ - [ - "Volumic", - "PETG", - "Volumic PETG Ultra" - ] - ], - "OFG2RkhN": [ - [ - "Creality", - "TPU", - "CR-TPU" - ] - ], - "OFG4do34": [ - [ - "QIDI", - "ASA-AERO", - "Qidi ASA-Aero" - ] - ], - "OFGJ1nxs": [ - [ - "Other", - "PLA", - "Other PLA" - ] - ], - "OFGVwfK0": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Gris" - ] - ], - "OFGVxj2A": [ - [ - "BETA", - "PLA", - "BETA PLA Wood" - ] - ], - "OFGc9l16": [ - [ - "BETA", - "PLA", - "BETA PLA Glow" - ] - ], - "OFGcLA5R": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Beige" - ] - ], - "OFGcMkEB": [ - [ - "Creality", - "TPU", - "HP-TPU" - ] - ], - "OFGdP6Na": [ - [ - "Volumic", - "PVA", - "Volumic PVA" - ] - ], - "OFGkyftV": [ - [ - "Overture", - "PLA", - "Overture Silk PLA" - ] - ], - "OFGwT5Av": [ - [ - "Creality", - "PLA-CF", - "Creality Hyper PLA-CF" - ] - ], - "OFGwZmgS": [ - [ - "Creality", - "ABS", - "CR-ABS" - ] - ], - "OFGxC8gB": [ - [ - "Creality", - "PLA", - "CR-Wood" - ] - ], - "OFGxuI0n": [ - [ - "Flashforge", - "PA-CF", - "Flashforge PA-CF" - ] - ], - "OFH2nN08": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA INGEO 850" - ] - ], - "OFH57ibH": [ - [ - "Polymaker", - "PLA", - "Polymaker Silk PLA Family" - ] - ], - "OFH7b12v": [ - [ - "Generic", - "PA-CF", - "Generic PAHT-CF" - ] - ], - "OFHAccHz": [ - [ - "FilAr", - "PLA", - "FilAr PLA Blanco Antartida" - ] - ], - "OFHHwrd1": [ - [ - "addnorth", - "PETG", - "addnorth PETG Base" - ] - ], - "OFHWSM21": [ - [ - "Polymaker", - "PET-CF", - "Fiberon PET-CF" - ] - ], - "OFHa48An": [ - [ - "Bambu Lab", - "PET-CF", - "Bambu PET-CF" - ] - ], - "OFHaYaB1": [ - [ - "eSUN", - "PET", - "eSUN PET-Basic" - ] - ], - "OFHf2lKK": [ - [ - "FlyingBear", - "TPU", - "FlyingBear TPU Basic" - ] - ], - "OFHfzQXo": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Transition" - ] - ], - "OFHknN4v": [ - [ - "Polymaker", - "PLA", - "Polymaker PLA Pro Metallic" - ] - ], - "OFHmPYRy": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA+ 2.0" - ] - ], - "OFI2MKy7": [ - [ - "BETA", - "TPU", - "BETA PEBA 90A" - ] - ], - "OFI6WZpn": [ - [ - "Orca Arena", - "PLA", - "Arena Support W" - ] - ], - "OFIBXa0k": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Rojo" - ] - ], - "OFIBbYO5": [ - [ - "Bambu Lab", - "TPU-AMS", - "Bambu TPU for AMS" - ] - ], - "OFIE3vOf": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Matte" - ] - ], - "OFIK2H3G": [ - [ - "Flashforge", - "PLA", - "Flashforge HS PLA" - ] - ], - "OFIKZxPF": [ - [ - "Generic", - "PLA", - "Generic PLA Wood" - ] - ], - "OFIPjqHt": [ - [ - "Orca Arena", - "PA", - "Arena Support G" - ] - ], - "OFIRUqWi": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Silk" - ] - ], - "OFIVWJPm": [ - [ - "InfiMech", - "TPU", - "InfiMech TPU" - ] - ], - "OFIWMSGX": [ - [ - "HATCHBOX", - "PETG", - "HATCHBOX PETG" - ] - ], - "OFIZMQwM": [ - [ - "LH Stinger", - "TPU", - "LHS TPU" - ] - ], - "OFIamQnD": [ - [ - "FilAr", - "PLA", - "FilAr PLA Gris Ceniza" - ] - ], - "OFIegjmD": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU Flex D53" - ] - ], - "OFIfnzxC": [ - [ - "Bambu Lab", - "PLA", - "Bambu Support For PLA/PETG" - ] - ], - "OFIgbDHq": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Luminous" - ] - ], - "OFIxOuOu": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Starlight" - ] - ], - "OFJ3F2jm": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Basic" - ] - ], - "OFJ3HRsR": [ - [ - "Orca Arena", - "ABS", - "Arena ABS" - ] - ], - "OFJHBEGD": [ - [ - "DREMC", - "PLA", - "DREMC PLA+ HS" - ] - ], - "OFJJ0Ar3": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Galaxy" - ] - ], - "OFJNeELv": [ - [ - "FILL3D", - "PA", - "FILL3D PA" - ] - ], - "OFJOFnOZ": [ - [ - "Aliz", - "PETG-CF", - "AliZ PETG-CF" - ] - ], - "OFJQDUk3": [ - [ - "FilAr", - "PETG", - "FilAr PETG Cristal" - ] - ], - "OFJS560n": [ - [ - "Flashforge", - "ASA", - "Flashforge ASA" - ] - ], - "OFJWKoYG": [ - [ - "iQ Materials", - "ABS Material4Print Natur", - "Material4Print ABS Natur P1" - ] - ], - "OFJYpVAQ": [ - [ - "Generic", - "TPU-90A", - "Generic TPU-90A" - ] - ], - "OFJgijky": [ - [ - "Polymaker", - "PLA", - "PolyLite CosPLA" - ] - ], - "OFJhT2fd": [ - [ - "Snapmaker", - "ABS", - "Snapmaker Dual ABS" - ] - ], - "OFJnEaCp": [ - [ - "BETA", - "PLA", - "BETA PLA Transparent" - ] - ], - "OFJrvXth": [ - [ - "Snapmaker", - "ABS", - "Snapmaker ABS Benchy" - ] - ], - "OFJs1ToM": [ - [ - "COEX 3D", - "PA", - "COEX NYLEX UNFILLED" - ] - ], - "OFJu1XwK": [ - [ - "NIT", - "PETG", - "NIT PETG" - ] - ], - "OFJxSqO4": [ - [ - "Yumi", - "PLA", - "YUMI PLA Direct Drive" - ] - ], - "OFK7830e": [ - [ - "BETA", - "TPU", - "BETA TPU 95A" - ] - ], - "OFK8XHPn": [ - [ - "Overture", - "ABS", - "Overture ABS" - ] - ], - "OFKIQO2W": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido" - ] - ], - "OFKKajh6": [ - [ - "FilAr", - "PLA", - "FilAr PLA Gris Plata" - ] - ], - "OFKTGKJU": [ - [ - "FusRock", - "PET", - "FusRock PET" - ] - ], - "OFKTSiYF": [ - [ - "FilAr", - "PLA", - "FilAr PLA Blanco Calido" - ] - ], - "OFKUEXPA": [ - [ - "Snapmaker", - "ASA", - "Snapmaker Dual ASA" - ] - ], - "OFKW5hEW": [ - [ - "FusRock", - "PAHT-CF", - "FusRock PAHT-CF" - ] - ], - "OFKWWgyp": [ - [ - "FilAr", - "PLA", - "FilAr PLA Carpincho" - ] - ], - "OFKYBAWe": [ - [ - "BETA", - "PLA", - "BETA PLA Marble" - ] - ], - "OFKZ9skj": [ - [ - "FilAr", - "PLA", - "FilAr PLA Naranja Tigre" - ] - ], - "OFKbdiiJ": [ - [ - "Polymaker", - "PLA", - "PolySonic PLA Pro" - ] - ], - "OFKfJTwL": [ - [ - "QIDI", - "PET-CF", - "QIDI PET-CF" - ] - ], - "OFKgmsqE": [ - [ - "QIDI", - "PAHT-CF", - "QIDI PAHT-CF" - ] - ], - "OFKhMPeX": [ - [ - "Bambu Lab", - "PC", - "Bambu PC" - ] - ], - "OFKiSMWR": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Marble" - ] - ], - "OFKyNkQz": [ - [ - "BETA", - "PETG", - "BETA PETG UV Color Change" - ] - ], - "OFL9aRjN": [ - [ - "Snapmaker", - "PETG", - "Snapmaker PETG HF" - ] - ], - "OFLAXKqP": [ - [ - "WonderMaker", - "TPU", - "WonderMaker TPU 95A" - ] - ], - "OFLC1oRH": [ - [ - "Flashforge", - "PPA-CF", - "Flashforge PPA-CF" - ] - ], - "OFLJ8S6I": [ - [ - "SUNLU", - "PLA", - "SUNLU Wood PLA" - ] - ], - "OFLNgV3C": [ - [ - "DREMC", - "ASA", - "DREMC ASA" - ] - ], - "OFLOf6Sc": [ - [ - "Tiertime", - "TPU", - "Tiertime TPU 95A" - ] - ], - "OFLPAxz3": [ - [ - "Generic", - "ASA", - "Generic ASA" - ] - ], - "OFLTYJW0": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Translucent" - ] - ], - "OFLXvuMr": [ - [ - "Elegoo", - "PETG", - "Elegoo Rapid PETG" - ] - ], - "OFLYDngx": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG" - ] - ], - "OFLakOUI": [ - [ - "Generic", - "PC", - "Generic PC" - ] - ], - "OFLbXwoL": [ - [ - "Artillery", - "PLA Silk", - "Artillery PLA Silk" - ] - ], - "OFLbdkrE": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Eco" - ] - ], - "OFLcd093": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG" - ] - ], - "OFLfywkp": [ - [ - "Afinia", - "ABS", - "Afinia ABS+" - ] - ], - "OFLgwqp2": [ - [ - "Creality", - "PETG-GF", - "Hyper PETG-GF" - ] - ], - "OFLjDYxH": [ - [ - "addnorth", - "PLA", - "addnorth PLA X-PLA High Speed" - ] - ], - "OFLqgSuX": [ - [ - "BETA", - "PLA-CF", - "BETA PLA-CF" - ] - ], - "OFLzx3J4": [ - [ - "Creality", - "PLA", - "Hyper Marble" - ] - ], - "OFM0xjBG": [ - [ - "Creality", - "PLA", - "CR-PLA Matte" - ] - ], - "OFM4iJlv": [ - [ - "Generic", - "PA-CF", - "Generic PA12-CF" - ] - ], - "OFM91vZs": [ - [ - "Overture", - "ASA", - "Overture ASA" - ] - ], - "OFMDHOcT": [ - [ - "QIDI", - "TPU-AERO", - "QIDI TPU-Aero" - ] - ], - "OFMK5gVo": [ - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Basic" - ] - ], - "OFML2aVd": [ - [ - "Anycubic", - "TPU", - "Anycubic TPU 95A" - ] - ], - "OFMSvS8z": [ - [ - "Artillery", - "PA", - "Artillery PA" - ] - ], - "OFMTK0UC": [ - [ - "Bambu Lab", - "PA", - "Bambu Support For PA/PET" - ] - ], - "OFMUWNkp": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA+" - ] - ], - "OFMZvH0z": [ - [ - "Overture", - "PLA", - "Overture Rock PLA" - ] - ], - "OFMjtqTC": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Wood" - ] - ], - "OFMkAW6r": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Color Change" - ] - ], - "OFMpxamb": [ - [ - "Flashforge", - "PETG", - "Flashforge PETG" - ] - ], - "OFMsDGbs": [ - [ - "Anycubic", - "TPU", - "Anycubic TPU" - ] - ], - "OFMuXBmO": [ - [ - "Elas", - "PLA", - "Elas PLA Basic" - ] - ], - "OFMzRg65": [ - [ - "BETA", - "PLA", - "BETA PLA PRO" - ] - ], - "OFN8QBhu": [ - [ - "addnorth", - "PLA", - "addnorth PLA Wood" - ] - ], - "OFN9fefN": [ - [ - "Cubicon", - "ABS", - "Cubicon ABS-A100" - ] - ], - "OFNBlAPT": [ - [ - "Orca Arena", - "PETG", - "Arena PETG Basic" - ] - ], - "OFNGTH3w": [ - [ - "Tiertime", - "PLA", - "Tiertime PLA" - ] - ], - "OFNQKF0M": [ - [ - "Tiertime", - "ABS", - "Tiertime ABS" - ] - ], - "OFNSYu5h": [ - [ - "Volumic", - "PP", - "Volumic PP Ultra (Performance)" - ] - ], - "OFNU9YIW": [ - [ - "FilAr", - "PETG", - "FilAr PETG Azul Boreal" - ] - ], - "OFNemJM6": [ - [ - "FilAr", - "PLA", - "FilAr PLA Cobre" - ] - ], - "OFNjku08": [ - [ - "Generic", - "PETG", - "Generic High Flow PETG" - ] - ], - "OFNk8AvA": [ - [ - "BETA", - "PETG", - "BETA PETG Gradient" - ] - ], - "OFNk8bxk": [ - [ - "Bambu Lab", - "PA-GF", - "Bambu PA6-GF" - ] - ], - "OFNstOna": [ - [ - "Eryone", - "PETG-CF", - "Eryone PETG-CF" - ] - ], - "OFNvBIL0": [ - [ - "Creality", - "PA-CF", - "Hyper PPA-CF" - ] - ], - "OFO1GEq6": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Neon" - ] - ], - "OFO5djrM": [ - [ - "Generic", - "PETG-CF", - "Generic PETG-CF10" - ] - ], - "OFO6GMJ3": [ - [ - "addnorth", - "TPU", - "addnorth TPU EasyFlex" - ] - ], - "OFOABq7t": [ - [ - "Aliz", - "PETG", - "AliZ PETG-Metal" - ] - ], - "OFOAdMCB": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Metal" - ] - ], - "OFOHOf2F": [ - [ - "eSUN", - "PLA", - "eSUN PLA-HS" - ] - ], - "OFOJPAAS": [ - [ - "iQ Materials", - "VXL90 Xioneer", - "VXL90 TiQ2 P2" - ] - ], - "OFOPU1xv": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Full Spectrum" - ] - ], - "OFOQCfVa": [ - [ - "addnorth", - "PLA", - "addnorth PLA Premium Silk" - ] - ], - "OFObG16Q": [ - [ - "InfiMech", - "PLA", - "InfiMech PLA Basic" - ] - ], - "OFObyktP": [ - [ - "Tiertime", - "PETG", - "Tiertime PETG" - ] - ], - "OFOiJfLM": [ - [ - "FILL3D", - "PETG-CF", - "FILL3D PETG CF" - ] - ], - "OFOnSNt3": [ - [ - "Artillery", - "PETG-CF", - "Artillery PETG-CF" - ] - ], - "OFOsHDnB": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG PRO" - ] - ], - "OFOuEEvv": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido 0.2 nozzle" - ] - ], - "OFOvv91M": [ - [ - "Polymaker", - "ABS", - "PolyLite ABS" - ] - ], - "OFOwQuZM": [ - [ - "Snapmaker", - "PETG-CF", - "Snapmaker PETG-CF" - ] - ], - "OFOzwywz": [ - [ - "Eryone", - "ABS", - "Eryone ABS" - ] - ], - "OFP26zNb": [ - [ - "FilAr", - "PLA", - "FilAr PLA Violeta Jacaranda" - ] - ], - "OFPHLnoe": [ - [ - "Creality", - "ASA", - "HP-ASA" - ] - ], - "OFPWPlSC": [ - [ - "FILL3D", - "PP", - "FILL3D PP" - ] - ], - "OFPYDWgC": [ - [ - "Peopoly", - "PET-CF", - "Peopoly Lancer PET-CF" - ] - ], - "OFPbyOSk": [ - [ - "FilAr", - "PETG", - "FilAr PETG Rojo Carmesi" - ] - ], - "OFPc4zVY": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA INGEO 870" - ] - ], - "OFPkCJKE": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Satin" - ] - ], - "OFPklMI1": [ - [ - "Generic", - "PE", - "Generic PE" - ] - ], - "OFPoyiFs": [ - [ - "Polymaker", - "PLA", - "Polymaker HT-PLA" - ] - ], - "OFPqX3x2": [ - [ - "FilAr", - "PLA", - "FilAr PLA Rosa Amaranto" - ] - ], - "OFQ1KzO8": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Silk" - ] - ], - "OFQ1zgm3": [ - [ - "Eryone", - "ABS-CF", - "Eryone ABS-CF" - ] - ], - "OFQ3e56w": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Galaxy" - ] - ], - "OFQ40XeN": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough" - ] - ], - "OFQ5TxZ2": [ - [ - "addnorth", - "PA", - "addnorth PVDF Adamant S1" - ] - ], - "OFQEGL7z": [ - [ - "FlyingBear", - "PA-CF", - "FlyingBear PA-CF" - ] - ], - "OFQGvU2G": [ - [ - "Orca Arena", - "TPU", - "Arena TPU 95A" - ] - ], - "OFQHiNJs": [ - [ - "Bambu Lab", - "PA", - "Bambu Support G" - ] - ], - "OFQLcbps": [ - [ - "Generic", - "PA-CF", - "Generic PA-CF" - ] - ], - "OFQMTRc8": [ - [ - "Snapmaker", - "PETG", - "Snapmaker J1 PETG" - ] - ], - "OFQMsFfF": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF10" - ] - ], - "OFQWIKbV": [ - [ - "FilAr", - "PLA", - "FilAr PLA Titanio" - ] - ], - "OFQYaiGg": [ - [ - "Snapmaker", - "PET", - "Snapmaker PET" - ] - ], - "OFQbjX3s": [ - [ - "FILL3D", - "PETG", - "FILL3D PETG" - ] - ], - "OFQdaVZS": [ - [ - "Generic", - "PET-CF", - "Generic PET-CF" - ] - ], - "OFQe7sAx": [ - [ - "Anycubic", - "PA6-CF", - "Anycubic PA6-CF" - ] - ], - "OFQyyO0l": [ - [ - "Polymaker", - "PA", - "Polymaker CoPA" - ] - ], - "OFR0gODA": [ - [ - "SeeMeCNC", - "ABS", - "SeeMeCNC ABS" - ] - ], - "OFR1XLMN": [ - [ - "QIDI", - "TPU", - "QIDI TPU 95A-HF" - ] - ], - "OFRFhdqy": [ - [ - "addnorth", - "PLA", - "addnorth PLA Textura" - ] - ], - "OFRJ325z": [ - [ - "LH Stinger", - "PETG", - "LHS PETG" - ] - ], - "OFRhBryT": [ - [ - "Cubicon", - "PLA", - "Cubicon PLAi21" - ] - ], - "OFRhCTUg": [ - [ - "Anycubic", - "PET-CF", - "Anycubic PET-CF" - ] - ], - "OFRiFnfQ": [ - [ - "Eolas Prints", - "PETG", - "Eolas Prints PETG Transition" - ] - ], - "OFRiYgMK": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Celestial" - ] - ], - "OFRkjhxK": [ - [ - "Volumic", - "PVA", - "Volumic PVA-BVOH (Performance)" - ] - ], - "OFRmGKVX": [ - [ - "Cubicon", - "PLA", - "Cubicon PLA+" - ] - ], - "OFRooa0F": [ - [ - "Snapmaker", - "PA-CF", - "Snapmaker Dual PA-CF" - ] - ], - "OFRpAZ1P": [ - [ - "DeltaMaker", - "PLA", - "DeltaMaker Brand PLA" - ] - ], - "OFRyOsZj": [ - [ - "re3D", - "PLA", - "re3D PLA" - ] - ], - "OFRzR5mi": [ - [ - "eSUN", - "PLA-AERO", - "eSUN ePLA-LW" - ] - ], - "OFS2tn6G": [ - [ - "Polymaker", - "PA", - "Fiberon PA612-CF" - ] - ], - "OFS4jbj3": [ - [ - "Eryone", - "PA", - "Eryone PA" - ] - ], - "OFS8lTQt": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Silk" - ] - ], - "OFSDfduA": [ - [ - "Flashforge", - "TPU", - "Flashforge TPU 65D" - ] - ], - "OFSa39yP": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA" - ] - ], - "OFSbGfsz": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Basic" - ] - ], - "OFSfm8iP": [ - [ - "BETA", - "PLA", - "BETA PLA Heat Color Change" - ] - ], - "OFSiCZP3": [ - [ - "BETA", - "PETG-CF", - "BETA PETG-GF" - ] - ], - "OFSqIcJC": [ - [ - "Flashforge", - "TPU", - "Flashforge TPU 95A" - ] - ], - "OFSw6Mor": [ - [ - "addnorth", - "PA", - "addnorth PA Adura FDA" - ] - ], - "OFSwbBWS": [ - [ - "DREMC", - "PLA", - "DREMC PLA+" - ] - ], - "OFT2jon4": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido" - ] - ], - "OFTGHyNC": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Impact" - ] - ], - "OFTHDCqA": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Pure" - ] - ], - "OFTOPcx0": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU Transition" - ] - ], - "OFTRZ8Y4": [ - [ - "Bambu Lab", - "PETG-CF", - "Bambu PETG-CF" - ] - ], - "OFTSXxzE": [ - [ - "Flashforge", - "PPS-CF", - "Flashforge PPS-CF" - ] - ], - "OFTXduCM": [ - [ - "eSUN", - "ABS", - "eSUN ABS+" - ] - ], - "OFTcE0nA": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Basic" - ] - ], - "OFTdauIq": [ - [ - "Volumic", - "PETG", - "Volumic PCTG Ultra (Performance)" - ] - ], - "OFTkj6DR": [ - [ - "Anycubic", - "PVA", - "Anycubic PVA" - ] - ], - "OFTlRzpe": [ - [ - "FilAr", - "PLA", - "FilAr PLA Gris Pizarra" - ] - ], - "OFTnWzBs": [ - [ - "Creality", - "PLA-CF", - "Hyper PLA-CF" - ] - ], - "OFTs8peJ": [ - [ - "Snapmaker", - "TPU", - "Snapmaker Dual TPE" - ] - ], - "OFTsHNQi": [ - [ - "QIDI", - "ASA", - "QIDI ASA" - ] - ], - "OFU1zPxE": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Galaxy" - ] - ], - "OFU3QXL7": [ - [ - "re3D", - "PC", - "re3D PC" - ] - ], - "OFU5JPDy": [ - [ - "addnorth", - "PETG", - "addnorth PETG PRO Matte" - ] - ], - "OFU7CKZt": [ - [ - "Volumic", - "ASA", - "Volumic ASA Ultra (Performance)" - ] - ], - "OFUF7oA4": [ - [ - "Creality", - "PC", - "Hyper PC" - ] - ], - "OFUH1aee": [ - [ - "Volumic", - "TPU", - "Volumic FLEX93 Ultra (Performance)" - ] - ], - "OFUIfGoh": [ - [ - "Snapmaker", - "PET", - "Snapmaker Dual PET" - ] - ], - "OFUYCqtB": [ - [ - "InfiMech", - "PLA", - "InfiMech PLA" - ] - ], - "OFUaHEO9": [ - [ - "Anycubic", - "PEBA", - "Anycubic PEBA 95A" - ] - ], - "OFUanySo": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Silk+" - ] - ], - "OFUmS5z5": [ - [ - "eSUN", - "ASA", - "eSUN ASA+" - ] - ], - "OFUtiVRn": [ - [ - "addnorth", - "PETG", - "addnorth PETG ESD" - ] - ], - "OFUyDDNv": [ - [ - "Elegoo", - "PC", - "Elegoo PC" - ] - ], - "OFV5Q7j2": [ - [ - "Snapmaker", - "TPU", - "Snapmaker J1 TPE" - ] - ], - "OFV5c8hG": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Sparkle" - ] - ], - "OFV5tNw6": [ - [ - "Elegoo", - "PETG", - "Elegoo PET-CF" - ] - ], - "OFV5wEMe": [ - [ - "Afinia", - "ABS", - "Afinia ABS" - ] - ], - "OFV8Mxqx": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA-SILK" - ] - ], - "OFVBlUFH": [ - [ - "DREMC", - "PETG", - "DREMC PETG" - ] - ], - "OFVCkX5w": [ - [ - "Bambu Lab", - "TPU", - "Bambu TPU 95A" - ] - ], - "OFVDWuxl": [ - [ - "addnorth", - "PLA", - "addnorth PLA HT-PLA PRO Matte" - ] - ], - "OFVHMFJX": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough 0.2 nozzle" - ] - ], - "OFVptRxp": [ - [ - "COEX 3D", - "TPU", - "COEX TPE 30D" - ] - ], - "OFVtIasg": [ - [ - "Eryone", - "ASA", - "Eryone ASA" - ] - ], - "OFW29a9R": [ - [ - "Polymaker", - "PLA", - "PolyTerra PLA" - ] - ], - "OFW5FqkL": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido Silk" - ] - ], - "OFW8M3CY": [ - [ - "BETA", - "PLA", - "BETA PLA Chameleon" - ] - ], - "OFW8lqnb": [ - [ - "Snapmaker", - "PETG", - "Snapmaker PETG Translucent" - ] - ], - "OFWDe7YH": [ - [ - "QIDI", - "UltraPA", - "QIDI UltraPA" - ] - ], - "OFWK0Y9A": [ - [ - "addnorth", - "PA", - "addnorth PA Adura" - ] - ], - "OFWRITFw": [ - [ - "Prusa Polymers", - "PLA", - "Prusament rPLA" - ] - ], - "OFWTAEjH": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPE" - ] - ], - "OFWTRJ1K": [ - [ - "FilAr", - "PLA", - "FilAr PLA Bronce" - ] - ], - "OFWXCbVF": [ - [ - "Flashforge", - "PC", - "Flashforge PC" - ] - ], - "OFWYtgCa": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Wood" - ] - ], - "OFWa0NiB": [ - [ - "Volumic", - "PA", - "Volumic NYLON Ultra" - ] - ], - "OFWao3Ic": [ - [ - "Creality", - "PLA", - "Ender-PLA" - ] - ], - "OFWbdGsC": [ - [ - "Generic", - "PLA-CF", - "Generic PLA-CF" - ] - ], - "OFWgFOjn": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Silk" - ] - ], - "OFWwF7K7": [ - [ - "FilAr", - "PLA", - "FilAr PLA Cafe con Leche" - ] - ], - "OFX0etlv": [ - [ - "re3D", - "PETG", - "re3D PETG" - ] - ], - "OFX0ycRQ": [ - [ - "Polymaker", - "PA-CF", - "Fiberon PA12-CF" - ] - ], - "OFX2zcrM": [ - [ - "Generic", - "PLA-CF", - "Generic PLA-CF10" - ] - ], - "OFXCBZTA": [ - [ - "Eolas Prints", - "ABS", - "Eolas Prints ABS" - ] - ], - "OFXIbw5D": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Matte" - ] - ], - "OFXJ9iom": [ - [ - "iQ Materials", - "HPP4GF25", - "Grauts HPP4GF25 P1" - ] - ], - "OFXSvqOX": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU 95A HF" - ] - ], - "OFXTPuqV": [ - [ - "Elas", - "PETG", - "Elas PETG Basic" - ] - ], - "OFXW4CDh": [ - [ - "Generic", - "PCTG", - "Generic PCTG BigNozzle" - ] - ], - "OFXi59OX": [ - [ - "Afinia", - "ABS", - "Afinia Value ABS" - ] - ], - "OFXiArjA": [ - [ - "Flashforge", - "PETG", - "Flashforge PETG Pro" - ] - ], - "OFXk1emJ": [ - [ - "Artillery", - "PLA Basic", - "Artillery PLA Basic" - ] - ], - "OFXkm8q1": [ - [ - "Generic", - "PP-CF", - "Generic PP-CF" - ] - ], - "OFXmv5p0": [ - [ - "Generic", - "PLA", - "Generic Speed PLA" - ] - ], - "OFXn3Vd9": [ - [ - "QIDI", - "PAHT-S", - "QIDI Support For PAHT" - ] - ], - "OFXnToSX": [ - [ - "Creality", - "PLA", - "Hyper Stardust" - ] - ], - "OFXuGxvQ": [ - [ - "Volumic", - "PLA", - "Volumic PLA Ultra" - ] - ], - "OFXz7Mwx": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Silk" - ] - ], - "OFXzQ4yL": [ - [ - "Bambu Lab", - "ASA-AERO", - "Bambu ASA-Aero" - ] - ], - "OFY0F5qA": [ - [ - "Volumic", - "PETG", - "Volumic PETG Ultra carbone (Performance)" - ] - ], - "OFY3AB7j": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Matte" - ] - ], - "OFY7jxcS": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU 90A" - ] - ], - "OFY9muEs": [ - [ - "Generic", - "ABS", - "Generic ABS" - ] - ], - "OFYE7YZw": [ - [ - "Tinmorry", - "PETG", - "Tinmorry PETG-ECO" - ] - ], - "OFYEtXuk": [ - [ - "Snapmaker", - "PA-CF", - "Snapmaker J1 PA-CF" - ] - ], - "OFYGbPHX": [ - [ - "Polymaker", - "PLA", - "PolyLite Dual PLA" - ] - ], - "OFYGrfHY": [ - [ - "BETA", - "PETG", - "BETA PETG Fluorescence" - ] - ], - "OFYPdQJh": [ - [ - "Generic", - "PETG", - "Generic PETG" - ] - ], - "OFYTIMbj": [ - [ - "Flashforge", - "ABS-CF", - "Flashforge ABS-CF" - ] - ], - "OFYYeMyQ": [ - [ - "Flashforge", - "PETG", - "Flashforge PETG Basic" - ] - ], - "OFYd5uS3": [ - [ - "DREMC", - "TPU", - "DREMC TPU 95A" - ] - ], - "OFYezc6s": [ - [ - "FlyingBear", - "TPU", - "FlyingBear TPU" - ] - ], - "OFYuowge": [ - [ - "Other", - "ABS", - "Other ABS" - ] - ], - "OFZ0mR5b": [ - [ - "Anycubic", - "PLA-CF", - "Anycubic PLA-CF" - ] - ], - "OFZ2LuAi": [ - [ - "Yumi", - "PLA", - "YUMI PLA Bowden" - ] - ], - "OFZ3K2cL": [ - [ - "QIDI", - "PA6-CF", - "QIDI PA6-CF" - ] - ], - "OFZ4QbfK": [ - [ - "FilAr", - "PLA", - "FilAr PLA Rosa Flamenco" - ] - ], - "OFZGrQTU": [ - [ - "addnorth", - "PETG", - "addnorth PETG Economy" - ] - ], - "OFZJft47": [ - [ - "addnorth", - "PLA", - "addnorth PLA Economy" - ] - ], - "OFZLtWYs": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF25" - ] - ], - "OFZOuWrO": [ - [ - "QIDI", - "PPS-CF", - "QIDI PPS-CF" - ] - ], - "OFZivHGL": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA" - ] - ], - "OFZqZMuv": [ - [ - "BETA", - "ASA", - "BETA ASA" - ] - ], - "OFZr862X": [ - [ - "Generic", - "PLA", - "Generic PLA HF" - ] - ], - "OFZtOQtl": [ - [ - "Flashforge", - "PA6-CF", - "Flashforge PA6-CF" - ] - ], - "OFZtkHRq": [ - [ - "Anycubic", - "PC", - "Anycubic PC" - ] - ], - "OFaDOaNt": [ - [ - "FilAr", - "PLA", - "FilAr PLA Celeste Cielo" - ] - ], - "OFaDsTE0": [ - [ - "Polymaker", - "PA", - "Polymaker S1" - ] - ], - "OFaEesXQ": [ - [ - "FilAr", - "PLA", - "FilAr PLA Rojo de Carreras" - ] - ], - "OFaEuvNF": [ - [ - "Anycubic", - "PAHT-CF", - "Anycubic PAHT-CF" - ] - ], - "OFaHjk1V": [ - [ - "Volumic", - "PC", - "Volumic PC" - ] - ], - "OFaP2SsH": [ - [ - "LH Stinger", - "ASA", - "LHS ASA" - ] - ], - "OFaQMgRH": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Tough" - ] - ], - "OFaRjiIm": [ - [ - "SeeMeCNC", - "PETG-CF", - "SeeMeCNC PETG-CF" - ] - ], - "OFaYz8iE": [ - [ - "Elas", - "PLA", - "Elas PLA Pro" - ] - ], - "OFaaddbQ": [ - [ - "Flashforge", - "PVA", - "Flashforge PVA" - ] - ], - "OFaeIx7W": [ - [ - "iQ Materials", - "PETG Polymax", - "Polymaker PETG Polymax black P1" - ] - ], - "OFafO6VM": [ - [ - "Generic", - "PC-CF", - "Generic PC-CF" - ] - ], - "OFafocjw": [ - [ - "Cubicon", - "ABS", - "Cubicon ABS" - ] - ], - "OFausr3F": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Rosa" - ] - ], - "OFb5EEM3": [ - [ - "Artillery", - "PET", - "Artillery PET" - ] - ], - "OFbP8zEO": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Silk" - ] - ], - "OFbPuPKY": [ - [ - "Generic", - "FLEX", - "Generic FLEX" - ] - ], - "OFbSChKb": [ - [ - "SeeMeCNC", - "PLA", - "SeeMeCNC PLA" - ] - ], - "OFbSZBOi": [ - [ - "InfiMech", - "TPU", - "InfiMech TPU Basic" - ] - ], - "OFbh7HcA": [ - [ - "Eryone", - "PP-CF", - "Eryone PP-CF" - ] - ], - "OFc3xdm9": [ - [ - "Overture", - "PLA", - "Overture PLA" - ] - ], - "OFc87pL3": [ - [ - "Orca Arena", - "PET-CF", - "Arena PET-CF" - ] - ], - "OFcBJQcC": [ - [ - "Snapmaker", - "TPU", - "Snapmaker Dual TPU High-Flow" - ] - ], - "OFcBl0nJ": [ - [ - "Polymaker", - "PA-CF", - "Fiberon PA612-CF15" - ] - ], - "OFcJDtTx": [ - [ - "Artillery", - "TPU", - "Artillery TPU" - ] - ], - "OFcKtw8W": [ - [ - "Volumic", - "PA6-CF", - "PA6 CF20 (Performance)" - ] - ], - "OFcVLpNA": [ - [ - "FusRock", - "PAHT-GF", - "FusRock PAHT-GF" - ] - ], - "OFcfQk4h": [ - [ - "Overture", - "PLA", - "Overture Air PLA" - ] - ], - "OFcnWTJB": [ - [ - "BETA", - "PLA", - "BETA PLA Glitter" - ] - ], - "OFcogyWl": [ - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Metal" - ] - ], - "OFcpa50Z": [ - [ - "addnorth", - "PLA-CF", - "addnorth PLA-CF Carbon Fiber" - ] - ], - "OFctg8r1": [ - [ - "CoLiDo", - "PLA", - "CoLiDo PLA+" - ] - ], - "OFcvKkrs": [ - [ - "Overture", - "TPU", - "Overture TPU" - ] - ], - "OFcytyoA": [ - [ - "Polymaker", - "PETG", - "Fiberon PETG-ESD" - ] - ], - "OFd0Fv0k": [ - [ - "Generic", - "PE-CF", - "Generic PE-CF" - ] - ], - "OFd2vX0G": [ - [ - "COEX 3D", - "PLA", - "COEX PLA PRIME" - ] - ], - "OFd4zw5l": [ - [ - "Aliz", - "PA-CF", - "AliZ PA-CF" - ] - ], - "OFdD5Wbu": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker J1 PLA-CF" - ] - ], - "OFdI4zMo": [ - [ - "DREMC", - "ASA", - "DREMC ASA CF" - ] - ], - "OFdXVjGZ": [ - [ - "Tiertime", - "PC", - "Tiertime PC" - ] - ], - "OFdb8YNz": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde Manzana" - ] - ], - "OFdd8ZqJ": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Wood" - ] - ], - "OFdkWDiy": [ - [ - "Cubicon", - "PLA", - "Cubicon PLAi21" - ] - ], - "OFdqkWtz": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Luminous" - ] - ], - "OFdrYBmI": [ - [ - "Tiertime", - "ASA", - "Tiertime ASA" - ] - ], - "OFdtPd9h": [ - [ - "QIDI", - "PETG-GF", - "QIDI PETG-GF" - ] - ], - "OFdzlrhi": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Chocolate" - ] - ], - "OFe61n6v": [ - [ - "RatRig", - "PETG-CF10", - "RatRig PunkFil PETG CF" - ] - ], - "OFe8tuNb": [ - [ - "Tiertime", - "PA6-CF", - "Tiertime PA6-CF" - ] - ], - "OFe8yBMG": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough 0.6 nozzle" - ] - ], - "OFeAxvEt": [ - [ - "Snapmaker", - "ABS", - "Snapmaker Dual ABS Benchy" - ] - ], - "OFeCJqxx": [ - [ - "QIDI", - "ABS", - "QIDI ABS Rapido Metal" - ] - ], - "OFeF4UNh": [ - [ - "BETA", - "PLA", - "BETA PLA Silk" - ] - ], - "OFeIyhUx": [ - [ - "Anycubic", - "PC-CF", - "Anycubic PC-CF" - ] - ], - "OFeTATC7": [ - [ - "Snapmaker", - "Breakaway Support", - "Snapmaker J1 Breakaway" - ] - ], - "OFeVzkSU": [ - [ - "Polymaker", - "ABS", - "Fiberon PPS-GF20" - ] - ], - "OFeelsSM": [ - [ - "HATCHBOX", - "PLA", - "HATCHBOX PLA" - ] - ], - "OFelDBgv": [ - [ - "Polymaker", - "PLA", - "Polymaker PLA" - ] - ], - "OFepU7Tl": [ - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Matte" - ] - ], - "OFesA6rF": [ - [ - "Generic", - "PLA", - "Generic PLA Silk" - ] - ], - "OFexaZU2": [ - [ - "FilAr", - "PLA", - "FilAr PLA Manteca" - ] - ], - "OFf0MkD5": [ - [ - "QIDI", - "PETG", - "QIDI PETG Translucent" - ] - ], - "OFf52D4e": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker PLA-CF" - ] - ], - "OFf5awy4": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Matte" - ] - ], - "OFf6ZEvu": [ - [ - "InfiMech", - "PC", - "InfiMech PC" - ] - ], - "OFf6mfQO": [ - [ - "Bambu Lab", - "ABS", - "Bambu Support for ABS" - ] - ], - "OFf6ynfH": [ - [ - "FlyingBear", - "PETG Basic", - "FlyingBear PETG Basic" - ] - ], - "OFfBpSRI": [ - [ - "Bambu Lab", - "ASA", - "Bambu ASA" - ] - ], - "OFfD87Gy": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Glow" - ] - ], - "OFfHGM1D": [ - [ - "re3D", - "PP", - "re3D rPP" - ] - ], - "OFfJSCzm": [ - [ - "FDplast", - "PETG", - "FDplast PETG" - ] - ], - "OFfSqS4R": [ - [ - "Creality", - "PLA", - "ENDER FAST PLA" - ] - ], - "OFfYHK5z": [ - [ - "Polymaker", - "PLA", - "Polymaker PLA-HT" - ] - ], - "OFfZcoKr": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Piel" - ] - ], - "OFfb10SK": [ - [ - "Artillery", - "PC", - "Artillery PC" - ] - ], - "OFfmHUkQ": [ - [ - "Snapmaker", - "Breakaway Support", - "Snapmaker Dual Breakaway" - ] - ], - "OFfmZrI3": [ - [ - "FDplast", - "TPU", - "FDplast TPU" - ] - ], - "OFfnXFie": [ - [ - "COEX 3D", - "TPU", - "COEX TPE 40D" - ] - ], - "OFfq5YXA": [ - [ - "Valment", - "PLA-CF", - "Valment PLA-CF" - ] - ], - "OFfr4XNO": [ - [ - "COEX 3D", - "TPU", - "COEX TPE 60D" - ] - ], - "OFfr6JDF": [ - [ - "QIDI", - "PETG", - "QIDI PETG Tough 0.8 nozzle" - ] - ], - "OFfuhviw": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Marble" - ] - ], - "OFfuih8e": [ - [ - "Creality", - "PLA", - "Creality Silk PLA" - ] - ], - "OFg3cWVt": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Metal" - ] - ], - "OFg57Nmc": [ - [ - "Bambu Lab", - "PC", - "Bambu PC FR" - ] - ], - "OFg8hMzT": [ - [ - "FILL3D", - "PP", - "FILL3D PPCF" - ] - ], - "OFg8ndtj": [ - [ - "Generic", - "PA", - "Generic PA" - ] - ], - "OFgHh8ly": [ - [ - "Afinia", - "PLA", - "Afinia Value PLA" - ] - ], - "OFgMWJ8T": [ - [ - "FilAr", - "PLA", - "FilAr PLA Negro Azabache" - ] - ], - "OFgSbX7E": [ - [ - "Volumic", - "PC", - "Volumic PC (Performance)" - ] - ], - "OFgVQkqW": [ - [ - "Cubicon", - "ABS", - "Cubicon ABSk" - ] - ], - "OFgXgt98": [ - [ - "Artillery", - "ABS", - "Artillery ABS" - ] - ], - "OFgbpcy9": [ - [ - "Generic", - "TPU", - "Generic TPU" - ] - ], - "OFgdaBOt": [ - [ - "Polymaker", - "PLA", - "Polymaker Tough PLA Family" - ] - ], - "OFgeM7nD": [ - [ - "Flashforge", - "PA-CF", - "Flashforge PA12-CF" - ] - ], - "OFgjgN35": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Silk" - ] - ], - "OFglhKLM": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido 0.8 nozzle" - ] - ], - "OFgpLTMR": [ - [ - "FilAr", - "PETG", - "FilAr PETG Gris Plata" - ] - ], - "OFgpQwkk": [ - [ - "Creality", - "PLA", - "CR-PLA Fluo" - ] - ], - "OFgptDSf": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Matte" - ] - ], - "OFgyPlwU": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU High-Flow" - ] - ], - "OFh7mvPO": [ - [ - "Prusa Polymers", - "PVB", - "Prusament PVB" - ] - ], - "OFh9u9c0": [ - [ - "Generic", - "PA-GF", - "Generic PA6-GF" - ] - ], - "OFhASRWj": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Temp Shift" - ] - ], - "OFhMO9Kh": [ - [ - "GreenGate3D", - "PETG", - "GreenGate3D PETG" - ] - ], - "OFhN09f0": [ - [ - "addnorth", - "PC", - "addnorth PC BLend HT LCF" - ] - ], - "OFhO5aEJ": [ - [ - "RatRig", - "ABS", - "RatRig PunkFil ABS" - ] - ], - "OFhQf8ou": [ - [ - "Snapmaker", - "PLA-CF", - "Snapmaker PLA-CF" - ] - ], - "OFhQfUQY": [ - [ - "Generic", - "SBS", - "Generic SBS" - ] - ], - "OFhTPf6L": [ - [ - "Generic", - "PA6-CF", - "Generic PA6-CF" - ] - ], - "OFhUjPA5": [ - [ - "Eryone", - "TPU", - "Eryone TPU" - ] - ], - "OFhWc5Bv": [ - [ - "NIT", - "ABS", - "NIT ABS" - ] - ], - "OFhWhL1i": [ - [ - "Eolas Prints", - "PETG", - "Eolas Prints PETG" - ] - ], - "OFhWrAuP": [ - [ - "QIDI", - "PLA-CF", - "QIDI PLA-CF" - ] - ], - "OFhbolij": [ - [ - "eSUN", - "PLA", - "eSUN PLA-Lite" - ] - ], - "OFhcYzR8": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Sparkle" - ] - ], - "OFhfd722": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU Flex 93A" - ] - ], - "OFhiJE7Y": [ - [ - "QIDI", - "PEBA", - "QIDI PEBA 95A" - ] - ], - "OFhkN0a7": [ - [ - "Creality", - "PA-CF", - "Hyper PA612-CF" - ] - ], - "OFhlCNqq": [ - [ - "COEX 3D", - "PLA", - "COEX PLA" - ] - ], - "OFhmxnYw": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Basic" - ] - ], - "OFhuaUQB": [ - [ - "Bambu Lab", - "ABS", - "Bambu ABS" - ] - ], - "OFhwiZ50": [ - [ - "QIDI", - "PLA", - "QIDI PLA Rapido 0.2 nozzle" - ] - ], - "OFhx4uOG": [ - [ - "QIDI", - "PET-GF", - "QIDI PET-GF" - ] - ], - "OFi5RSve": [ - [ - "eSUN", - "PLA", - "eSUN PLA-LW" - ] - ], - "OFi6PfUM": [ - [ - "Generic", - "PLA", - "Generic PLA-Silk" - ] - ], - "OFi90KlM": [ - [ - "Volumic", - "PA", - "Volumic NYLON Ultra (Performance)" - ] - ], - "OFiDpM1B": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Bordo" - ] - ], - "OFiEz2XI": [ - [ - "Cubicon", - "PA", - "Cubicon PA-CF" - ] - ], - "OFiWaoqD": [ - [ - "DREMC", - "PPA-CF", - "DREMC PPA-CF" - ] - ], - "OFibWuBd": [ - [ - "Flashforge", - "ABS", - "Flashforge ABS Basic" - ] - ], - "OFilAA3b": [ - [ - "Eryone", - "PLA-CF", - "Eryone PLA-CF" - ] - ], - "OFilD4bP": [ - [ - "FlyingBear", - "PLA", - "FlyingBear PLA" - ] - ], - "OFilnglt": [ - [ - "Artillery", - "PETG", - "Artillery PETG" - ] - ], - "OFin64Qg": [ - [ - "Generic", - "PLA", - "Generic Support for PLA" - ] - ], - "OFitS8al": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Neon" - ] - ], - "OFiwEbze": [ - [ - "Volumic", - "PETG-ESD", - "PETG ESD (Performance)" - ] - ], - "OFj3bTjw": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Amarillo" - ] - ], - "OFj64R5U": [ - [ - "Peopoly", - "ABS", - "Peopoly Lancer ABS-GF" - ] - ], - "OFjD3YTW": [ - [ - "QIDI", - "PC-ABS-FR", - "Qidi PC-ABS-FR" - ] - ], - "OFjHrAX0": [ - [ - "WonderMaker", - "ABS", - "WonderMaker ABS" - ] - ], - "OFjLAYgO": [ - [ - "Anycubic", - "PEBA", - "Anycubic PEBA" - ] - ], - "OFjPXrXO": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Glow" - ] - ], - "OFjT9PkZ": [ - [ - "FilAr", - "PLA", - "FilAr PLA Tabaco" - ] - ], - "OFjUGUIK": [ - [ - "iQ Materials", - "PACF Pro", - "Fiberthree PACF Pro P1" - ] - ], - "OFjUXn67": [ - [ - "BETA", - "ABS", - "BETA ABS" - ] - ], - "OFjVOWfJ": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA High Speed" - ] - ], - "OFjXrKFO": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Impact" - ] - ], - "OFjb0wos": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Metallic" - ] - ], - "OFjcwUEm": [ - [ - "Cubicon", - "PLA", - "Cubicon PLA" - ] - ], - "OFjiXpyf": [ - [ - "Generic", - "TPU", - "Generic TPU 95A" - ] - ], - "OFjkdnyN": [ - [ - "Snapmaker", - "TPU", - "Snapmaker Dual TPU" - ] - ], - "OFjoAe0R": [ - [ - "QIDI", - "PLA-CF", - "Qidi PLA-CF" - ] - ], - "OFjogeYN": [ - [ - "BETA", - "PETG", - "BETA PETG Glitter" - ] - ], - "OFjorDcx": [ - [ - "FDplast", - "ABS", - "FDplast ABS" - ] - ], - "OFjt8dDO": [ - [ - "FusRock", - "PA-CF", - "FusRock NexPA-CF25" - ] - ], - "OFjt9en1": [ - [ - "Generic", - "CoPE", - "Generic CoPE" - ] - ], - "OFjz0a3m": [ - [ - "Prusa Polymers", - "PC-CF", - "Prusament PC-CF" - ] - ], - "OFk8t9mz": [ - [ - "Polymaker", - "PETG-CF", - "Fiberon PETG-rCF" - ] - ], - "OFkAltI8": [ - [ - "Other", - "PA-CF", - "Other PA-CF" - ] - ], - "OFkGp50Y": [ - [ - "Volumic", - "UNIV", - "Volumic UNIVERSAL Ultra (Performance)" - ] - ], - "OFkGvN4d": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde Pixel" - ] - ], - "OFkHbjUv": [ - [ - "BETA", - "PLA", - "BETA PLA Metallic" - ] - ], - "OFkOviHk": [ - [ - "Polymaker", - "PA6-CF", - "Fiberon PA6-CF" - ] - ], - "OFkR8E2c": [ - [ - "Prusa Polymers", - "PETG", - "Prusament PETG" - ] - ], - "OFkf1HHw": [ - [ - "Generic", - "PLA", - "Generic PLA-SILK" - ] - ], - "OFkhhUS0": [ - [ - "Elegoo", - "PLA", - "Elegoo Rapid PLA+" - ] - ], - "OFklJcWK": [ - [ - "Other", - "PLA", - "Other PLA Hyper" - ] - ], - "OFknl9Iz": [ - [ - "Bambu Lab", - "ABS-GF", - "Bambu ABS-GF" - ] - ], - "OFkoLUtR": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde Oliva" - ] - ], - "OFkq7rPy": [ - [ - "Eryone", - "PA-GF", - "Eryone PA-GF" - ] - ], - "OFks6esg": [ - [ - "Creality", - "PLA", - "EN-PLA+" - ] - ], - "OFkx5MEe": [ - [ - "Artillery", - "PVA", - "Artillery PVA" - ] - ], - "OFkzr35f": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Antibacterial" - ] - ], - "OFlBoEfL": [ - [ - "Snapmaker", - "TPU", - "Snapmaker J1 TPU High-Flow" - ] - ], - "OFlIsW6f": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Matte" - ] - ], - "OFlN6DL1": [ - [ - "QIDI", - "UltraPA", - "QIDI PA-Ultra" - ] - ], - "OFlP3KWq": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG HF" - ] - ], - "OFlSNkhc": [ - [ - "Eolas Prints", - "ASA", - "Eolas Prints ASA" - ] - ], - "OFlfuj2k": [ - [ - "Bambu Lab", - "TPU", - "Bambu TPU 85A" - ] - ], - "OFlgMgNM": [ - [ - "Flashforge", - "PPS", - "Flashforge PPS" - ] - ], - "OFllmFhT": [ - [ - "Generic", - "PETG", - "Generic PETG PRO" - ] - ], - "OFlmxlDG": [ - [ - "BETA", - "HIPS", - "BETA HIPS" - ] - ], - "OFln72PT": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA-CF" - ] - ], - "OFlsTpJG": [ - [ - "Elegoo", - "PC", - "Elegoo PC-FR" - ] - ], - "OFlufQpZ": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA" - ] - ], - "OFlwmqrC": [ - [ - "Polymaker", - "PLA", - "Polymaker HT-PLA-GF" - ] - ], - "OFm06H6V": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Basic" - ] - ], - "OFm4SivL": [ - [ - "Flashforge", - "PLA", - "Flashforge PLA Pro" - ] - ], - "OFm4ysMO": [ - [ - "FlyingBear", - "ABS", - "FlyingBear ABS" - ] - ], - "OFm70lLt": [ - [ - "CoLiDo", - "PLA", - "CoLiDo PLA" - ] - ], - "OFm8rqoY": [ - [ - "re3D", - "PP", - "re3D rPP" - ] - ], - "OFmCOW2Y": [ - [ - "re3D", - "PETG", - "re3D rPETG" - ] - ], - "OFmFwUWM": [ - [ - "Prusa Polymers", - "ASA", - "Prusament ASA" - ] - ], - "OFmJAd3A": [ - [ - "FDplast", - "HIPS", - "FDplast HIPS" - ] - ], - "OFmKU2Ha": [ - [ - "Eryone", - "PLA", - "Eryone PLA" - ] - ], - "OFmN2lvw": [ - [ - "Generic", - "TPU-AMS", - "Generic TPU for AMS" - ] - ], - "OFmY0l6t": [ - [ - "Generic", - "PLA", - "Generic PLA Matte" - ] - ], - "OFma5TXH": [ - [ - "QIDI", - "ABS", - "QIDI ABS Odorless" - ] - ], - "OFmaeU4a": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Naranja" - ] - ], - "OFmfizbq": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Silk" - ] - ], - "OFmhJs5V": [ - [ - "Elegoo", - "TPU", - "Elegoo TPU" - ] - ], - "OFmjN2bc": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA" - ] - ], - "OFmn9NZL": [ - [ - "FusRock", - "ABS-GF", - "FusRock ABS-GF" - ] - ], - "OFmpMwxS": [ - [ - "Generic", - "PLA", - "Generic PLA High Speed" - ] - ], - "OFmt513L": [ - [ - "BETA", - "PETG", - "BETA PETG Transparent" - ] - ], - "OFmveLWz": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG-GF" - ] - ], - "OFn1QaY3": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Translucent2" - ] - ], - "OFn2GlhY": [ - [ - "Creality", - "PA-CF", - "Hyper PA6-CF" - ] - ], - "OFn6WpN7": [ - [ - "QIDI", - "PA12-CF", - "QIDI PA12-CF" - ] - ], - "OFnBvPhb": [ - [ - "addnorth", - "PLA", - "addnorth PLA rPLA RE-ADD" - ] - ], - "OFnHc3D6": [ - [ - "eSUN", - "PLA-CF", - "eSUN PLA-CF" - ] - ], - "OFnO4wnf": [ - [ - "Prusa Polymers", - "PLA", - "Prusament PLA" - ] - ], - "OFnSeLHk": [ - [ - "CoLiDo", - "PLA", - "CoLiDo PLA Silk" - ] - ], - "OFnT7Qpb": [ - [ - "Generic", - "TPU", - "Generic TPU HF" - ] - ], - "OFnXrkhA": [ - [ - "InfiMech", - "PA-CF", - "InfiMech PA-CF" - ] - ], - "OFnXwW8l": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Pro Metallic" - ] - ], - "OFnYVFk2": [ - [ - "FilAr", - "PLA", - "FilAr PLA Azul Francia" - ] - ], - "OFncpm7O": [ - [ - "WonderMaker", - "PLA", - "WonderMaker PLA Silk" - ] - ], - "OFneOFWe": [ - [ - "CoLiDo", - "ABS", - "CoLiDo ABS" - ] - ], - "OFnejEt4": [ - [ - "FilAr", - "PETG", - "FilAr PETG Cian" - ] - ], - "OFnfxTvi": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Lite" - ] - ], - "OFngcE81": [ - [ - "LH Stinger", - "TPU", - "LHS TPU Foamy 78A" - ] - ], - "OFniMuTN": [ - [ - "Bambu Lab", - "PA6-CF", - "Bambu PA6-CF" - ] - ], - "OFnmp6rt": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA+" - ] - ], - "OFnpX8uh": [ - [ - "BETA", - "PETG", - "BETA PETG Matte" - ] - ], - "OFnyHfcv": [ - [ - "Generic", - "ABS", - "Generic ABS BigNozzle" - ] - ], - "OFo15hcT": [ - [ - "QIDI", - "PAHT-GF", - "QIDI PAHT-GF" - ] - ], - "OFo2UF2C": [ - [ - "Generic", - "BVOH", - "Generic BVOH" - ] - ], - "OFo6n2pB": [ - [ - "Anycubic", - "PETG", - "Anycubic PETG" - ] - ], - "OFoBTKmn": [ - [ - "Cubicon", - "PETG", - "Cubicon PETG" - ] - ], - "OFoSknDB": [ - [ - "FILL3D", - "PLA", - "FILL3D PLA Turbo" - ] - ], - "OFoYSJKi": [ - [ - "Generic", - "PETG-CF", - "Generic PETG-CF" - ] - ], - "OFobDOW5": [ - [ - "Elegoo", - "ASA", - "Elegoo ASA" - ] - ], - "OFocyw69": [ - [ - "Aliz", - "PETG", - "AliZ PETG" - ] - ], - "OFoiVqVM": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Basic" - ] - ], - "OFojbdhR": [ - [ - "Flashforge", - "ABS-GF", - "Flashforge ABS-GF" - ] - ], - "OForhBi4": [ - [ - "Cubicon", - "ABS", - "Cubicon ABSk" - ] - ], - "OFovEIbw": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG HF" - ] - ], - "OFp4ETDP": [ - [ - "Creality", - "PLA", - "CR-PLA" - ] - ], - "OFp57RRC": [ - [ - "QIDI", - "PPS-GF", - "QIDI PPS-GF" - ] - ], - "OFp9wdmf": [ - [ - "Eryone", - "PA-CF", - "Eryone PA-CF" - ] - ], - "OFpBlrvY": [ - [ - "Valment", - "PLA", - "Valment PLA Silk" - ] - ], - "OFpDo5Ix": [ - [ - "Cubicon", - "ABS", - "Cubicon ABS" - ] - ], - "OFpPGSKG": [ - [ - "SUNLU", - "PLA", - "SUNLU Silk PLA+" - ] - ], - "OFpPJSHE": [ - [ - "Peopoly", - "PETG", - "Peopoly Lancer PETG-C" - ] - ], - "OFpW4gdi": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA Matte" - ] - ], - "OFpdjFI3": [ - [ - "BETA", - "PLA", - "BETA PLA UV Color Change" - ] - ], - "OFpu74Qe": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Eco" - ] - ], - "OFpumhCM": [ - [ - "Volumic", - "UNIV", - "Volumic UNIVERSAL Ultra" - ] - ], - "OFq0TY7C": [ - [ - "Flashforge", - "ASA-CF", - "Flashforge ASA-CF" - ] - ], - "OFq8gfS4": [ - [ - "FilAr", - "PETG", - "FilAr PETG Negro Azabache" - ] - ], - "OFq9svOz": [ - [ - "Generic", - "PPS", - "Generic PPS" - ] - ], - "OFqFRiLb": [ - [ - "Generic", - "PLA", - "Generic PLA BigNozzle" - ] - ], - "OFqGRZyH": [ - [ - "Numakers", - "PLA", - "Numakers PLA+" - ] - ], - "OFqINlYj": [ - [ - "eSUN", - "PLA", - "eSUN PLA+" - ] - ], - "OFqTwtXM": [ - [ - "addnorth", - "PETG", - "addnorth PETG rPETG Matte" - ] - ], - "OFqcL5UF": [ - [ - "QIDI", - "PA-S", - "QIDI Support For PET/PA" - ] - ], - "OFqtx549": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Celeste Cielo" - ] - ], - "OFqw2PQA": [ - [ - "Polymaker", - "PLA", - "Panchroma CoPE" - ] - ], - "OFrFBEfd": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Neon" - ] - ], - "OFrGJ4tR": [ - [ - "Anycubic", - "PLA", - "Anycubic PLA Slik" - ] - ], - "OFrKLeE3": [ - [ - "Bambu Lab", - "PLA", - "Bambu PLA Metal" - ] - ], - "OFrLiqiM": [ - [ - "InfiMech", - "PETG", - "InfiMech PETG" - ] - ], - "OFrM4hdm": [ - [ - "Creality", - "PLA-CF", - "CR-PLA Carbon" - ] - ], - "OFrOh600": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA Matte" - ] - ], - "OFrZDhVt": [ - [ - "Flashforge", - "ASA-GF", - "Flashforge ASA-GF" - ] - ], - "OFrdZ0cK": [ - [ - "eSUN", - "PETG", - "eSUN PETG+HS" - ] - ], - "OFrjacXf": [ - [ - "Flashforge", - "PET-CF", - "Flashforge PET-CF" - ] - ], - "OFrqMlGt": [ - [ - "BETA", - "PETG", - "BETA PETG" - ] - ], - "OFrr67nG": [ - [ - "Orca Arena", - "PC", - "Arena PC" - ] - ], - "OFryjl35": [ - [ - "Elegoo", - "ASA", - "Elegoo ASA-CF" - ] - ], - "OFsB2lxm": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA Matte" - ] - ], - "OFsD974q": [ - [ - "Volumic", - "PETG", - "Volumic PETG Ultra (Performance)" - ] - ], - "OFsDXRpS": [ - [ - "FilAr", - "PLA", - "FilAr PLA Piel" - ] - ], - "OFsFo7ms": [ - [ - "Volumic", - "PP", - "Volumic PP Ultra" - ] - ], - "OFsFon5l": [ - [ - "Generic", - "HIPS", - "Generic HIPS" - ] - ], - "OFsHSVZc": [ - [ - "Bambu Lab", - "PLA", - "Bambu Support W" - ] - ], - "OFsP8PKH": [ - [ - "Generic", - "ABS", - "Generic ABS HT" - ] - ], - "OFsRDvTM": [ - [ - "Polymaker", - "PLA", - "Panchroma PLA" - ] - ], - "OFsXQXbs": [ - [ - "FilAr", - "PETG", - "FilAr PETG Blanco Antartida" - ] - ], - "OFsijjtH": [ - [ - "Generic", - "PP-GF", - "Generic PP-GF" - ] - ], - "OFsoykbm": [ - [ - "DREMC", - "PA6-CF", - "DREMC PA6-CF" - ] - ], - "OFt0JbR7": [ - [ - "Snapmaker", - "PLA", - "Snapmaker J1 PLA Metal" - ] - ], - "OFt3HtlG": [ - [ - "QIDI", - "ABS-GF", - "QIDI ABS-GF" - ] - ], - "OFt6e0US": [ - [ - "FilAr", - "PETG", - "FilAr PETG Amarillo Lima" - ] - ], - "OFt7SngH": [ - [ - "Snapmaker", - "ASA", - "Snapmaker J1 ASA" - ] - ], - "OFtFtiS0": [ - [ - "Polymaker", - "PETG", - "Polymaker PETG Galaxy" - ] - ], - "OFtGC1ye": [ - [ - "Artillery", - "PA-CF", - "Artillery PA-CF" - ] - ], - "OFtKeKa9": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Tough" - ] - ], - "OFtOPlK6": [ - [ - "Orca Arena", - "PA-CF", - "Arena PAHT-CF" - ] - ], - "OFtOoWIj": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate" - ] - ], - "OFtRn8X8": [ - [ - "FDplast", - "SBS", - "FDplast SBS" - ] - ], - "OFtdVZpV": [ - [ - "addnorth", - "PLA", - "addnorth PLA X-PLA" - ] - ], - "OFtefokm": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Blanco" - ] - ], - "OFtkLO6q": [ - [ - "Bambu Lab", - "TPU", - "Bambu TPU 90A" - ] - ], - "OFtndTHe": [ - [ - "BETA", - "PETG-CF", - "BETA PETG-CF" - ] - ], - "OFtpXCCv": [ - [ - "COEX 3D", - "ASA", - "COEX ASA PRIME" - ] - ], - "OFtr8eZw": [ - [ - "FDplast", - "PLA", - "FDplast PLA" - ] - ], - "OFtudokz": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA Premium" - ] - ], - "OFtybfNX": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA Metal" - ] - ], - "OFu08yGN": [ - [ - "Volumic", - "PETG", - "Volumic PETG Ultra carbone" - ] - ], - "OFu0fjPJ": [ - [ - "LH Stinger", - "PC", - "LHS PC CF" - ] - ], - "OFu1E4ur": [ - [ - "QIDI", - "ASA-AERO", - "QIDI ASA-Aero" - ] - ], - "OFu1evlr": [ - [ - "Generic", - "PCTG", - "Generic PCTG" - ] - ], - "OFuFEtKX": [ - [ - "Flashforge", - "PETG-CF", - "Flashforge PETG-CF" - ] - ], - "OFuJ49uH": [ - [ - "QIDI", - "PETG", - "QIDI PETG Basic" - ] - ], - "OFuO0cAP": [ - [ - "Orca Arena", - "PETG-CF", - "Arena PETG-CF" - ] - ], - "OFuUuIhR": [ - [ - "Elegoo", - "PETG", - "Elegoo PETG-CF" - ] - ], - "OFuV79ru": [ - [ - "Flashforge", - "PA-CF", - "Flashforge PA66-CF" - ] - ], - "OFuWCQXN": [ - [ - "COEX 3D", - "ABS", - "COEX ABS PRIME" - ] - ], - "OFuehn62": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Marble" - ] - ], - "OFufTAK9": [ - [ - "FilAr", - "PLA", - "FilAr PLA-mate Negro" - ] - ], - "OFughwKn": [ - [ - "QIDI", - "PLA", - "QIDI PLA Matte Basic" - ] - ], - "OFujZSdh": [ - [ - "Creality", - "PETG", - "Hyper PETG" - ] - ], - "OFulOdT2": [ - [ - "Generic", - "TPU", - "Generic TPU 85A" - ] - ], - "OFurdQxc": [ - [ - "FilAr", - "PETG", - "FilAr PETG Magenta" - ] - ], - "OFusbWjj": [ - [ - "Creality", - "PETG-CF", - "Hyper PETG-CF" - ] - ], - "OFuvOt0r": [ - [ - "BETA", - "PLA", - "BETA PLA Basic" - ] - ], - "OFuxH0Uz": [ - [ - "Volumic", - "TPU", - "Volumic FLEX93 Ultra" - ] - ], - "OFvD0Qqt": [ - [ - "Generic", - "PETG", - "Generic PETG BigNozzle" - ] - ], - "OFvDbkFq": [ - [ - "Prusa Polymers", - "PC", - "Prusament PC Blend" - ] - ], - "OFvKUnLh": [ - [ - "Bambu Lab", - "TPU", - "Bambu TPU 95A HF" - ] - ], - "OFvLppPU": [ - [ - "Creality", - "PA", - "CR-Nylon" - ] - ], - "OFvPPMxL": [ - [ - "FilAr", - "PLA", - "FilAr PLA Verde FilAr" - ] - ], - "OFvTVZc3": [ - [ - "COEX 3D", - "PETG", - "COEX PETG" - ] - ], - "OFvVy7yo": [ - [ - "Eolas Prints", - "TPU", - "Eolas Prints TPU D60 UV Resistant" - ] - ], - "OFvaLVML": [ - [ - "Flashforge", - "HIPS", - "Flashforge HIPS" - ] - ], - "OFvcIGee": [ - [ - "addnorth", - "TPU", - "addnorth TPU Pro Matte 85A" - ] - ], - "OFvdZ2bx": [ - [ - "QIDI", - "PLA", - "QIDI WOOD Rapido" - ] - ], - "OFvgE0Zh": [ - [ - "Elegoo", - "PLA", - "Elegoo PLA" - ] - ], - "OFvmwTZE": [ - [ - "Snapmaker", - "TPU", - "Snapmaker TPU 95A" - ] - ], - "OFvrXuV7": [ - [ - "Polymaker", - "ASA", - "PolyLite ASA" - ] - ], - "OFvxIS9g": [ - [ - "Polymaker", - "PA-CF", - "Fiberon PA12-CF10" - ] - ], - "OFvxghTE": [ - [ - "Generic", - "PLA", - "Generic HS PLA" - ] - ], - "OFvyB0Bz": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Galaxy" - ] - ], - "OFvzvwCu": [ - [ - "Eolas Prints", - "PLA", - "Eolas Prints PLA High Speed" - ] - ], - "OFw4WD4T": [ - [ - "Polymaker", - "PETG-CF", - "Fiberon PETG-rCF08" - ] - ], - "OFwJ0qu2": [ - [ - "DREMC", - "PET-CF", - "DREMC PET-CF" - ] - ], - "OFwLBAGf": [ - [ - "HATCHBOX", - "ABS", - "HATCHBOX ABS" - ] - ], - "OFwPrlCM": [ - [ - "Bambu Lab", - "PETG", - "Bambu PETG Translucent" - ] - ], - "OFwRJ4g0": [ - [ - "NIT", - "PLA", - "NIT PLA" - ] - ], - "OFwVVKEV": [ - [ - "Other", - "TPU", - "Other TPU" - ] - ], - "OFwaYjL6": [ - [ - "Polymaker", - "PA-GF", - "Fiberon PA6-GF" - ] - ], - "OFwbsgWj": [ - [ - "re3D", - "PC", - "re3D PC" - ] - ], - "OFwc74ck": [ - [ - "BETA", - "PLA", - "BETA PLA Matte" - ] - ], - "OFwhLMs4": [ - [ - "Snapmaker", - "PLA", - "Snapmaker PLA SnapSpeed" - ] - ], - "OFwjMiKL": [ - [ - "Flashforge", - "PETG", - "Flashforge PETG Transparent" - ] - ], - "OFwlZ7gH": [ - [ - "Flashforge", - "TPU-90A", - "Flashforge TPU-90A" - ] - ], - "OFwu7IAG": [ - [ - "COEX 3D", - "PCTG", - "COEX PCTG PRIME" - ] - ], - "OFwwAQnA": [ - [ - "Generic", - "PC", - "Generic PC HF" - ] - ], - "OFwyt1xt": [ - [ - "Eryone", - "ASA-CF", - "Eryone ASA-CF" - ] - ], - "OFx0WlzS": [ - [ - "Flashforge", - "TPU-95A", - "Flashforge TPU-95A" - ] - ], - "OFx8Lmsd": [ - [ - "Eolas Prints", - "PETG", - "Eolas Prints PETG UV Resistant" - ] - ], - "OFxA1p01": [ - [ - "Overture", - "PLA", - "Overture PLA Pro" - ] - ], - "OFxDHUX8": [ - [ - "SeeMeCNC", - "PETG", - "SeeMeCNC PETG" - ] - ], - "OFxJRuVF": [ - [ - "Anycubic", - "PC-GF", - "Anycubic PC-GF" - ] - ], - "OFxOHhZw": [ - [ - "Elegoo", - "ABS", - "Elegoo ABS" - ] - ], - "OFxUwUeW": [ - [ - "SUNLU", - "PLA", - "SUNLU PLA Marble" - ] - ], - "OFxYB4Sw": [ - [ - "Snapmaker", - "PETG-CF", - "Snapmaker J1 PETG-CF" - ] - ], - "OFxe4rXr": [ - [ - "Polymaker", - "PLA", - "PolyTerra PLA Marble" - ] - ], - "OFxqf79Q": [ - [ - "BETA", - "PETG", - "BETA PETG HF" - ] - ], - "OFy02QHU": [ - [ - "Polymaker", - "PLA", - "PolyLite PLA Translucent" - ] - ], - "OFy14TRA": [ - [ - "Snapmaker", - "ABS", - "Snapmaker J1 ABS" - ] - ], - "OFy3sW6j": [ - [ - "WonderMaker", - "ASA", - "WonderMaker ASA" - ] - ], - "OFy48TOp": [ - [ - "Generic", - "TPU-95A", - "Generic TPU-95A" - ] - ], - "OFy8tYJE": [ - [ - "Cubicon", - "ABS", - "Cubicon ABS-A100" - ] - ], - "OFyFyLIp": [ - [ - "SeeMeCNC", - "TPU", - "SeeMeCNC TPU" - ] - ], - "OFyHgT60": [ - [ - "Orca Arena", - "PLA", - "Arena PLA Sparkle" - ] - ], - "OFyJjkek": [ - [ - "addnorth", - "TPU", - "addnorth TPU Pro Matte 95A" - ] - ], - "OFyLWVF3": [ - [ - "Generic", - "PETG-GF", - "Generic PETG-GF" - ] - ], - "OFyPG8v2": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Eco" - ] - ], - "OFyPTnSk": [ - [ - "BETA", - "PETG", - "BETA PETG Heat Color Change" - ] - ], - "OFyQwdaM": [ - [ - "Volumic", - "ABS", - "Volumic ABS Ultra (Performance)" - ] - ], - "OFyRCIMh": [ - [ - "Other", - "PC", - "Other PC" - ] - ], - "OFyUJI3q": [ - [ - "Volumic", - "ABS", - "Volumic ABS Ultra" - ] - ], - "OFybzvQN": [ - [ - "FilAr", - "PETG", - "FilAr PETG Gris Ceniza" - ] - ], - "OFyhjiNs": [ - [ - "Snapmaker", - "PVA", - "Snapmaker PVA" - ] - ], - "OFyj3m13": [ - [ - "Snapmaker", - "PLA", - "Snapmaker Dual PLA Silk" - ] - ], - "OFymnal9": [ - [ - "Generic", - "PETG", - "Sovol Zero PETG HS Nozzle" - ] - ], - "OFyoBZdm": [ - [ - "LH Stinger", - "PLA", - "LHS PLA" - ] - ], - "OFyreocX": [ - [ - "Tiertime", - "PVA", - "Tiertime PVA" - ] - ], - "OFyrnlUn": [ - [ - "Snapmaker", - "TPU", - "Snapmaker J1 TPU" - ] - ], - "OFysxCep": [ - [ - "FilAr", - "PETG", - "FilAr PETG Coral" - ] - ], - "OFyxayW4": [ - [ - "Aliz", - "PLA", - "AliZ PLA" - ] - ], - "OFz1a1fy": [ - [ - "BETA", - "PETG", - "BETA PETG Metallic" - ] - ], - "OFz5oHgf": [ - [ - "Generic", - "PEEK", - "Generic PEEK" - ] - ], - "OFzAWsca": [ - [ - "QIDI", - "TPU", - "Qidi TPU 95A-HF" - ] - ], - "OFzB4uOs": [ - [ - "Generic", - "PLA", - "Sovol Zero PLA Basic HS Nozzle" - ] - ], - "OFzRtFM9": [ - [ - "Generic", - "ASA", - "Generic ASA HF" - ] - ], - "OFzS7zt4": [ - [ - "Anycubic", - "PA", - "Anycubic PA" - ] - ], - "OFzY7N3Z": [ - [ - "Artillery", - "PLA", - "Artillery PLA" - ] - ], - "OFzaq7Yg": [ - [ - "BETA", - "TPU", - "BETA TPU 98A" - ] - ], - "OFzk5oAo": [ - [ - "addnorth", - "ABS", - "addnorth ABS rABS" - ] - ], - "OFzrUUxc": [ - [ - "DREMC", - "ABS", - "DREMC ABS" - ] - ], - "OFztQ7rO": [ - [ - "LH Stinger", - "ASA", - "LHS ABS" - ] - ], - "OFzwA5Z9": [ - [ - "FusRock", - "PET-GF", - "FusRock PET-GF" - ] - ], - "OFzyIxba": [ - [ - "Bambu Lab", - "PVA", - "Bambu PVA" - ] - ] + "OF02UAVh": { + "filaments": [ + "Creality/Soleyin Ultra PLA" + ], + "name": "Soleyin Ultra PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OF03RK6r": { + "filaments": [ + "BBL/BETA PLA Metal" + ], + "name": "BETA PLA Metal", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OF0AquDh": { + "filaments": [ + "Flashforge/FusRock S-Multi" + ], + "name": "FusRock S-Multi", + "filament_type": "PA", + "filament_vendor": "FusRock" + }, + "OF0EYBWQ": { + "filaments": [ + "BBL/addnorth PETG Flame v0" + ], + "name": "addnorth PETG Flame v0", + "filament_type": "PETG", + "filament_vendor": "addnorth" + }, + "OF0FfcAG": { + "filaments": [ + "Anycubic/Anycubic TPU for ACE" + ], + "name": "Anycubic TPU for ACE", + "filament_type": "TPU", + "filament_vendor": "Anycubic" + }, + "OF0NgY1y": { + "filaments": [ + "BBL/COEX NYLEX PA6-CF", + "OrcaFilamentLibrary/COEX NYLEX PA6-CF" + ], + "name": "COEX NYLEX PA6-CF", + "filament_type": "PA-CF", + "filament_vendor": "COEX 3D" + }, + "OF0R5Wc7": { + "filaments": [ + "Artillery/Artillery PLA Tough" + ], + "name": "Artillery PLA Tough", + "filament_type": "PLA Tough", + "filament_vendor": "Artillery" + }, + "OF0UJcb6": { + "filaments": [ + "BBL/PolyLite PETG", + "OrcaFilamentLibrary/PolyLite PETG", + "Snapmaker/PolyLite PETG" + ], + "name": "PolyLite PETG", + "filament_type": "PETG", + "filament_vendor": "Polymaker" + }, + "OF0VpkBM": { + "filaments": [ + "Snapmaker/PolyLite PETG Translucent" + ], + "name": "PolyLite PETG Translucent", + "filament_type": "PETG", + "filament_vendor": "Polymaker" + }, + "OF0Vtzaw": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Radiante" + ], + "name": "FilAr PETG Amarillo Radiante", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OF0b7M1z": { + "filaments": [ + "SeeMeCNC/SeeMeCNC PA-CF" + ], + "name": "SeeMeCNC PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "SeeMeCNC" + }, + "OF0c7mnL": { + "filaments": [ + "InfiMech/InfiMech ABS" + ], + "name": "InfiMech ABS", + "filament_type": "ABS", + "filament_vendor": "InfiMech" + }, + "OF0gGRWk": { + "filaments": [ + "BBL/Panchroma PLA Glow", + "OrcaFilamentLibrary/Panchroma PLA Glow", + "Snapmaker/Panchroma PLA Glow" + ], + "name": "Panchroma PLA Glow", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF0kCNDK": { + "filaments": [ + "BBL/Panchroma PLA Luminous", + "OrcaFilamentLibrary/Panchroma PLA Luminous", + "Snapmaker/Panchroma PLA Luminous" + ], + "name": "Panchroma PLA Luminous", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF0omtEb": { + "filaments": [ + "Snapmaker/Fiberon ASA-CF08" + ], + "name": "Fiberon ASA-CF08", + "filament_type": "ASA", + "filament_vendor": "Polymaker" + }, + "OF0pzFLc": { + "filaments": [ + "BBL/COEX PLA+Silk", + "OrcaFilamentLibrary/COEX PLA+Silk" + ], + "name": "COEX PLA+Silk", + "filament_type": "PLA", + "filament_vendor": "COEX 3D" + }, + "OF0w7OpJ": { + "filaments": [ + "Qidi/QIDI ABS Rapido 0.8 nozzle" + ], + "name": "QIDI ABS Rapido 0.8 nozzle", + "filament_type": "ABS", + "filament_vendor": "QIDI" + }, + "OF0wBGNx": { + "filaments": [ + "BBL/Bambu ASA-CF", + "OrcaFilamentLibrary/Bambu ASA-CF" + ], + "name": "Bambu ASA-CF", + "filament_type": "ASA-CF", + "filament_vendor": "Bambu Lab" + }, + "OF0wz84w": { + "filaments": [ + "Qidi/QIDI ABS Rapido 0.6 nozzle" + ], + "name": "QIDI ABS Rapido 0.6 nozzle", + "filament_type": "ABS", + "filament_vendor": "QIDI" + }, + "OF0yFLkY": { + "filaments": [ + "Anycubic/Anycubic ASA" + ], + "name": "Anycubic ASA", + "filament_type": "ASA", + "filament_vendor": "Anycubic" + }, + "OF112FvY": { + "filaments": [ + "Anycubic/Generic PETG Basic" + ], + "name": "Generic PETG Basic", + "filament_type": "PETG", + "filament_vendor": "Generic" + }, + "OF1ID4N1": { + "filaments": [ + "BBL/addnorth PA6 Addlantis" + ], + "name": "addnorth PA6 Addlantis", + "filament_type": "PA6", + "filament_vendor": "addnorth" + }, + "OF1N1qMK": { + "filaments": [ + "BBL/Panchroma PLA UV Shift", + "OrcaFilamentLibrary/Panchroma PLA UV Shift", + "Snapmaker/Panchroma PLA UV Shift" + ], + "name": "Panchroma PLA UV Shift", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF1Pke8t": { + "filaments": [ + "BBL/Overture Easy PLA", + "OrcaFilamentLibrary/Overture Easy PLA" + ], + "name": "Overture Easy PLA", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OF1UNk9P": { + "filaments": [ + "BBL/Generic PP", + "Creality/Generic PP", + "OrcaFilamentLibrary/Generic PP", + "Tiertime/Generic PP" + ], + "name": "Generic PP", + "filament_type": "PP", + "filament_vendor": "Generic" + }, + "OF1W7c76": { + "filaments": [ + "Qidi/QIDI ASA-CF" + ], + "name": "QIDI ASA-CF", + "filament_type": "ASA-CF", + "filament_vendor": "QIDI" + }, + "OF1d7c3A": { + "filaments": [ + "Snapmaker/Snapmaker ASA" + ], + "name": "Snapmaker ASA", + "filament_type": "ASA", + "filament_vendor": "Snapmaker" + }, + "OF1dpPrW": { + "filaments": [ + "Qidi/Bambu PLA" + ], + "name": "Bambu PLA", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OF1hznGB": { + "filaments": [ + "Elegoo/Elegoo PLA PRO", + "OrcaFilamentLibrary/Elegoo PLA PRO" + ], + "name": "Elegoo PLA PRO", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OF20kXr5": { + "filaments": [ + "Elegoo/Elegoo PAHT-CF", + "OrcaFilamentLibrary/Elegoo PAHT-CF" + ], + "name": "Elegoo PAHT-CF", + "filament_type": "PA", + "filament_vendor": "Elegoo" + }, + "OF223rZv": { + "filaments": [ + "Anycubic/Anycubic ABS" + ], + "name": "Anycubic ABS", + "filament_type": "ABS", + "filament_vendor": "Anycubic" + }, + "OF2EB9Iz": { + "filaments": [ + "Volumic/Volumic ASA Ultra" + ], + "name": "Volumic ASA Ultra", + "filament_type": "ASA", + "filament_vendor": "Volumic" + }, + "OF2EK9F1": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Violeta" + ], + "name": "FilAr PLA-mate Violeta", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OF2GCW1l": { + "filaments": [ + "BBL/SUNLU PETG", + "Flashforge/SUNLU PETG", + "OrcaFilamentLibrary/SUNLU PETG", + "Sovol/SUNLU PETG" + ], + "name": "SUNLU PETG", + "filament_type": "PETG", + "filament_vendor": "SUNLU" + }, + "OF2TQpOO": { + "filaments": [ + "Qidi/QIDI PLA Silk" + ], + "name": "QIDI PLA Silk", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OF2VFe4J": { + "filaments": [ + "BBL/Bambu PAHT-CF", + "OrcaFilamentLibrary/Bambu PAHT-CF" + ], + "name": "Bambu PAHT-CF", + "filament_type": "PA-CF", + "filament_vendor": "Bambu Lab" + }, + "OF2Z1nT5": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Azul Imperial" + ], + "name": "FilAr PETG Azul Imperial", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OF2hfMcG": { + "filaments": [ + "OrcaArena/Arena PLA-CF" + ], + "name": "Arena PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Orca Arena" + }, + "OF2pj5l5": { + "filaments": [ + "BBL/Overture Super PLA+", + "OrcaFilamentLibrary/Overture Super PLA+" + ], + "name": "Overture Super PLA+", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OF2xccEe": { + "filaments": [], + "name": "DREMC ASA GF", + "filament_type": "ASA", + "filament_vendor": "DREMC" + }, + "OF30Ftju": { + "filaments": [ + "Elegoo/Elegoo Rapid TPU 95A", + "OrcaFilamentLibrary/Elegoo Rapid TPU 95A" + ], + "name": "Elegoo Rapid TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Elegoo" + }, + "OF342jVN": { + "filaments": [ + "BBL/Bambu PLA Tough+" + ], + "name": "Bambu PLA Tough+", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OF3F63OE": { + "filaments": [ + "re3D/re3D PETG" + ], + "name": "re3D PETG", + "filament_type": "PETG", + "filament_vendor": "re3D" + }, + "OF3IKafc": { + "filaments": [ + "Qidi/QIDI PLA Rapido Matte" + ], + "name": "QIDI PLA Rapido Matte", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OF3OMgrI": { + "filaments": [ + "Creality/CR-Silk" + ], + "name": "CR-Silk", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OF3PDEw3": { + "filaments": [ + "BBL/BETA PLA High Speed" + ], + "name": "BETA PLA High Speed", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OF3WQaKK": { + "filaments": [ + "Creality/CR-PETG" + ], + "name": "CR-PETG", + "filament_type": "PETG", + "filament_vendor": "Creality" + }, + "OF3dJf4E": { + "filaments": [ + "Volumic/Volumic PLA Ultra (Performance)" + ], + "name": "Volumic PLA Ultra (Performance)", + "filament_type": "PLA", + "filament_vendor": "Volumic" + }, + "OF3fwO8b": { + "filaments": [ + "FlyingBear/FlyingBear PLA Basic" + ], + "name": "FlyingBear PLA Basic", + "filament_type": "PLA", + "filament_vendor": "FlyingBear" + }, + "OF3kBrdA": { + "filaments": [ + "Creality/eSUN PETG", + "OrcaFilamentLibrary/eSUN PETG" + ], + "name": "eSUN PETG", + "filament_type": "PETG", + "filament_vendor": "eSUN" + }, + "OF3msXEa": { + "filaments": [ + "Snapmaker/Snapmaker Dual PETG-CF" + ], + "name": "Snapmaker Dual PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Snapmaker" + }, + "OF3ydJTT": { + "filaments": [ + "InfiMech/InfiMech PLA Hyper" + ], + "name": "InfiMech PLA Hyper", + "filament_type": "PLA", + "filament_vendor": "InfiMech" + }, + "OF43Raws": { + "filaments": [ + "Snapmaker/PolyTerra J1 PLA" + ], + "name": "PolyTerra J1 PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF44ERDr": { + "filaments": [ + "Snapmaker/Polymaker General PLA Family" + ], + "name": "Polymaker General PLA Family", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF44VYzK": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Azul Francia" + ], + "name": "FilAr PETG Azul Francia", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OF4APyxe": { + "filaments": [ + "Creality/Hyper PAHT-CF" + ], + "name": "Hyper PAHT-CF", + "filament_type": "PA-CF", + "filament_vendor": "Creality" + }, + "OF4GM5qX": { + "filaments": [ + "Ratrig/Generic ASA BigNozzle" + ], + "name": "Generic ASA BigNozzle", + "filament_type": "ASA", + "filament_vendor": "Generic" + }, + "OF4KsW72": { + "filaments": [], + "name": "FilAr PLA", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OF4Nhggz": { + "filaments": [ + "Artillery/Artillery PLA Basic+" + ], + "name": "Artillery PLA Basic+", + "filament_type": "PLA Basic+", + "filament_vendor": "Artillery" + }, + "OF4PKvem": { + "filaments": [ + "BBL/BETA PLA Fluorescence" + ], + "name": "BETA PLA Fluorescence", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OF4QZANi": { + "filaments": [ + "BBL/BETA TPU Matte" + ], + "name": "BETA TPU Matte", + "filament_type": "TPU", + "filament_vendor": "BETA" + }, + "OF4RvVuU": { + "filaments": [ + "BBL/Bambu PPS-CF" + ], + "name": "Bambu PPS-CF", + "filament_type": "PPS-CF", + "filament_vendor": "Bambu Lab" + }, + "OF4S3To3": { + "filaments": [ + "Qidi/QIDI PETG Rapido" + ], + "name": "QIDI PETG Rapido", + "filament_type": "PETG", + "filament_vendor": "QIDI" + }, + "OF4WB37S": { + "filaments": [ + "Snapmaker/Snapmaker PETG" + ], + "name": "Snapmaker PETG", + "filament_type": "PETG", + "filament_vendor": "Snapmaker" + }, + "OF4XTfoI": { + "filaments": [ + "BBL/BETA PETG Marble" + ], + "name": "BETA PETG Marble", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OF4f8vVp": { + "filaments": [ + "WonderMaker/WonderMaker PET-CF" + ], + "name": "WonderMaker PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "WonderMaker" + }, + "OF4iWKrE": { + "filaments": [ + "Qidi/QIDI PETG-CF" + ], + "name": "QIDI PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "QIDI" + }, + "OF4nQ62r": { + "filaments": [ + "Qidi/QIDI PLA Basic" + ], + "name": "QIDI PLA Basic", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OF4ulo9Y": { + "filaments": [ + "WonderMaker/WonderMaker PVA" + ], + "name": "WonderMaker PVA", + "filament_type": "PVA", + "filament_vendor": "WonderMaker" + }, + "OF53eLVD": { + "filaments": [ + "Blocks/Generic ASA-CF", + "Creality/Generic ASA-CF", + "Elegoo/Generic ASA-CF" + ], + "name": "Generic ASA-CF", + "filament_type": "ASA-CF", + "filament_vendor": "Generic" + }, + "OF54B0S0": { + "filaments": [ + "BBL/Bambu PPA-CF", + "OrcaFilamentLibrary/Bambu PPA-CF" + ], + "name": "Bambu PPA-CF", + "filament_type": "PPA-CF", + "filament_vendor": "Bambu Lab" + }, + "OF54SvEe": { + "filaments": [ + "Prusa/Prusament PA-CF" + ], + "name": "Prusament PA-CF", + "filament_type": "PA11-CF", + "filament_vendor": "Prusa Polymers" + }, + "OF55jHAJ": { + "filaments": [ + "Prusa/Generic ABS HF" + ], + "name": "Generic ABS HF", + "filament_type": "ABS", + "filament_vendor": "Generic" + }, + "OF5B9sUc": { + "filaments": [ + "BBL/Fiberon PA6-GF25" + ], + "name": "Fiberon PA6-GF25", + "filament_type": "PA-GF", + "filament_vendor": "Polymaker" + }, + "OF5BN24W": { + "filaments": [ + "Flashforge/Flashforge PPA-GF" + ], + "name": "Flashforge PPA-GF", + "filament_type": "PPA-GF", + "filament_vendor": "Flashforge" + }, + "OF5BXhHF": { + "filaments": [ + "BBL/BETA PLA High Temp" + ], + "name": "BETA PLA High Temp", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OF5CgdDq": { + "filaments": [ + "BBL/PolyLite PLA", + "OrcaArena/PolyLite PLA", + "OrcaFilamentLibrary/PolyLite PLA", + "Qidi/PolyLite PLA", + "Snapmaker/PolyLite PLA" + ], + "name": "PolyLite PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF5LAnla": { + "filaments": [ + "BBL/BETA PLA Gradient" + ], + "name": "BETA PLA Gradient", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OF5NqBfC": { + "filaments": [ + "Wanhao France/YUMI PETG" + ], + "name": "YUMI PETG", + "filament_type": "PETG", + "filament_vendor": "Yumi" + }, + "OF5P4jgA": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Dorado" + ], + "name": "FilAr PLA Dorado", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OF5PtjTp": { + "filaments": [ + "Anycubic/Anycubic PLA Glow" + ], + "name": "Anycubic PLA Glow", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OF5SJ3jz": { + "filaments": [ + "Flashforge/Flashforge ABS" + ], + "name": "Flashforge ABS", + "filament_type": "ABS", + "filament_vendor": "Flashforge" + }, + "OF5YVJXH": { + "filaments": [ + "Artillery/Artillery ASA" + ], + "name": "Artillery ASA", + "filament_type": "ASA", + "filament_vendor": "Artillery" + }, + "OF5c6nq3": { + "filaments": [ + "Flashforge/Generic TPU-64D" + ], + "name": "Generic TPU-64D", + "filament_type": "TPU-64D", + "filament_vendor": "Generic" + }, + "OF5lGPup": { + "filaments": [ + "WonderMaker/WonderMaker PETG Basic" + ], + "name": "WonderMaker PETG Basic", + "filament_type": "PETG", + "filament_vendor": "WonderMaker" + }, + "OF5nlfKY": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Oro" + ], + "name": "FilAr PLA Oro", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OF5oNRED": { + "filaments": [ + "Eryone/Eryone PP" + ], + "name": "Eryone PP", + "filament_type": "PP", + "filament_vendor": "Eryone" + }, + "OF5oXk4M": { + "filaments": [ + "Anycubic/Polymaker PLA Pro", + "Snapmaker/Polymaker PLA Pro" + ], + "name": "Polymaker PLA Pro", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF5rnhjh": { + "filaments": [], + "name": "FilAr PETG", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OF5tX6va": { + "filaments": [ + "Ratrig/Generic TPU BigNozzle" + ], + "name": "Generic TPU BigNozzle", + "filament_type": "TPU", + "filament_vendor": "Generic" + }, + "OF5umxxT": { + "filaments": [ + "BBL/PolyLite PLA Glow", + "Snapmaker/PolyLite PLA Glow" + ], + "name": "PolyLite PLA Glow", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF5vgi2G": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Azul" + ], + "name": "FilAr PLA-mate Azul", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OF65InrS": { + "filaments": [ + "Snapmaker/Snapmaker TPU" + ], + "name": "Snapmaker TPU", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OF66KUAN": { + "filaments": [ + "Creality/PolySonic PLA" + ], + "name": "PolySonic PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF6ATsCF": { + "filaments": [ + "Snapmaker/Snapmaker Dual PLA-CF" + ], + "name": "Snapmaker Dual PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Snapmaker" + }, + "OF6H51Xx": { + "filaments": [ + "Snapmaker/Polymaker PETG", + "Sovol/Polymaker PETG" + ], + "name": "Polymaker PETG", + "filament_type": "PETG", + "filament_vendor": "Polymaker" + }, + "OF6Ll8lK": { + "filaments": [ + "Elegoo/Elegoo PETG Translucent", + "OrcaFilamentLibrary/Elegoo PETG Translucent" + ], + "name": "Elegoo PETG Translucent", + "filament_type": "PETG", + "filament_vendor": "Elegoo" + }, + "OF6MOPWx": { + "filaments": [ + "Creality/Generic PET", + "Elegoo/Generic PET", + "Flashforge/Generic PET" + ], + "name": "Generic PET", + "filament_type": "PET", + "filament_vendor": "Generic" + }, + "OF6TuVAg": { + "filaments": [ + "Snapmaker/Snapmaker J1 PVA" + ], + "name": "Snapmaker J1 PVA", + "filament_type": "PVA", + "filament_vendor": "Snapmaker" + }, + "OF6Yn69v": { + "filaments": [ + "BBL/BETA TPU 90A" + ], + "name": "BETA TPU 90A", + "filament_type": "TPU", + "filament_vendor": "BETA" + }, + "OF6kj4jI": { + "filaments": [ + "iQ/Fiberthree PACF Pro P2" + ], + "name": "Fiberthree PACF Pro P2", + "filament_type": "PACF Pro", + "filament_vendor": "iQ Materials" + }, + "OF6qAuyi": { + "filaments": [ + "Flashforge/Flashforge PLA Matte" + ], + "name": "Flashforge PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OF6qw3Wb": { + "filaments": [ + "BBL/BETA PAHT-CF" + ], + "name": "BETA PAHT-CF", + "filament_type": "PA-CF", + "filament_vendor": "BETA" + }, + "OF6rdQ6M": { + "filaments": [ + "BBL/Generic PPS-CF", + "Creality/Generic PPS-CF", + "Tiertime/Generic PPS-CF" + ], + "name": "Generic PPS-CF", + "filament_type": "PPS-CF", + "filament_vendor": "Generic" + }, + "OF70zbGS": { + "filaments": [ + "Creality/Hyper L-W PLA" + ], + "name": "Hyper L-W PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OF71b7qO": { + "filaments": [ + "BBL/addnorth PLA E-PLA" + ], + "name": "addnorth PLA E-PLA", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OF72YYTd": { + "filaments": [ + "Snapmaker/Snapmaker ABS" + ], + "name": "Snapmaker ABS", + "filament_type": "ABS", + "filament_vendor": "Snapmaker" + }, + "OF74KeQR": { + "filaments": [ + "BBL/Generic PHA", + "OrcaFilamentLibrary/Generic PHA", + "Tiertime/Generic PHA" + ], + "name": "Generic PHA", + "filament_type": "PHA", + "filament_vendor": "Generic" + }, + "OF79Fbo6": { + "filaments": [ + "Cubicon/Cubicon PC" + ], + "name": "Cubicon PC", + "filament_type": "PC", + "filament_vendor": "Cubicon" + }, + "OF7H3VJM": { + "filaments": [ + "OrcaFilamentLibrary/eSUN PLA-Marble" + ], + "name": "eSUN PLA-Marble", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OF7OqDp3": { + "filaments": [ + "Tiertime/Tiertime PLA-CF" + ], + "name": "Tiertime PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Tiertime" + }, + "OF7SliVn": { + "filaments": [ + "Snapmaker/PolyLite J1 PLA" + ], + "name": "PolyLite J1 PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OF7c9fln": { + "filaments": [ + "Anycubic/Anycubic PLA Translucent" + ], + "name": "Anycubic PLA Translucent", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OF7lOgYF": { + "filaments": [ + "BBL/Generic PETG HF", + "OrcaFilamentLibrary/Generic PETG HF", + "Prusa/Generic PETG HF" + ], + "name": "Generic PETG HF", + "filament_type": "PETG", + "filament_vendor": "Generic" + }, + "OF7lwj52": { + "filaments": [ + "CoLiDo/CoLiDo PETG" + ], + "name": "CoLiDo PETG", + "filament_type": "PETG", + "filament_vendor": "CoLiDo" + }, + "OF7nBAd3": { + "filaments": [ + "Eryone/Eryone Silk PLA" + ], + "name": "Eryone Silk PLA", + "filament_type": "PLA Silk", + "filament_vendor": "Eryone" + }, + "OF7pjCsO": { + "filaments": [ + "Flashforge/FusRock PAHT" + ], + "name": "FusRock PAHT", + "filament_type": "PAHT", + "filament_vendor": "FusRock" + }, + "OF7tt7DO": { + "filaments": [ + "Cubicon/Cubicon PLA+" + ], + "name": "Cubicon PLA+", + "filament_type": "PLA", + "filament_vendor": "Cubicon" + }, + "OF8GnyFU": { + "filaments": [ + "Creality/Hyper ABS" + ], + "name": "Hyper ABS", + "filament_type": "ABS", + "filament_vendor": "Creality" + }, + "OF8GtyKJ": { + "filaments": [ + "Flashforge/Flashforge TPU-64D" + ], + "name": "Flashforge TPU-64D", + "filament_type": "TPU-64D", + "filament_vendor": "Flashforge" + }, + "OF8Hx3Pi": { + "filaments": [ + "Cubicon/Cubicon PETG" + ], + "name": "Cubicon PETG", + "filament_type": "PETG", + "filament_vendor": "Cubicon" + }, + "OF8Jl6NT": { + "filaments": [ + "Snapmaker/Snapmaker J1 PET" + ], + "name": "Snapmaker J1 PET", + "filament_type": "PET", + "filament_vendor": "Snapmaker" + }, + "OF8O09RG": { + "filaments": [ + "Flashforge/Flashforge HS PLA Burnt Ti" + ], + "name": "Flashforge HS PLA Burnt Ti", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OF8QdQwS": { + "filaments": [ + "BBL/BETA PLA Silk+" + ], + "name": "BETA PLA Silk+", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OF8Tlg47": { + "filaments": [ + "BBL/Generic PPA-GF", + "OrcaFilamentLibrary/Generic PPA-GF", + "Tiertime/Generic PPA-GF" + ], + "name": "Generic PPA-GF", + "filament_type": "PPA-GF", + "filament_vendor": "Generic" + }, + "OF8aFWfQ": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Amarillo Lirio" + ], + "name": "FilAr PLA Amarillo Lirio", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OF8dCquh": { + "filaments": [ + "Snapmaker/Snapmaker J1 ABS Benchy" + ], + "name": "Snapmaker J1 ABS Benchy", + "filament_type": "ABS", + "filament_vendor": "Snapmaker" + }, + "OF8eaY7j": { + "filaments": [ + "Creality/Generic PA612-CF" + ], + "name": "Generic PA612-CF", + "filament_type": "PA-CF", + "filament_vendor": "Generic" + }, + "OF8jh0Lk": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Marron" + ], + "name": "FilAr PLA-mate Marron", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OF8kJys9": { + "filaments": [ + "Eryone/Eryone PETG" + ], + "name": "Eryone PETG", + "filament_type": "PETG", + "filament_vendor": "Eryone" + }, + "OF8tPByX": { + "filaments": [ + "BBL/Generic PPA-CF", + "OrcaFilamentLibrary/Generic PPA-CF", + "Tiertime/Generic PPA-CF" + ], + "name": "Generic PPA-CF", + "filament_type": "PPA-CF", + "filament_vendor": "Generic" + }, + "OF8wE5l7": { + "filaments": [ + "Artillery/Artillery PETG Basic" + ], + "name": "Artillery PETG Basic", + "filament_type": "PETG Basic", + "filament_vendor": "Artillery" + }, + "OF99UMPq": { + "filaments": [ + "BBL/COEX ABS", + "OrcaFilamentLibrary/COEX ABS" + ], + "name": "COEX ABS", + "filament_type": "ABS", + "filament_vendor": "COEX 3D" + }, + "OF99vXPs": { + "filaments": [], + "name": "DREMC ABS+", + "filament_type": "ABS", + "filament_vendor": "DREMC" + }, + "OF9EHUKK": { + "filaments": [ + "Qidi/QIDI TPU-GF" + ], + "name": "QIDI TPU-GF", + "filament_type": "TPU-GF", + "filament_vendor": "QIDI" + }, + "OF9HCdyQ": { + "filaments": [ + "Afinia/Afinia PLA" + ], + "name": "Afinia PLA", + "filament_type": "PLA", + "filament_vendor": "Afinia" + }, + "OF9OlTWH": { + "filaments": [ + "BBL/Bambu PLA Marble", + "OrcaFilamentLibrary/Bambu PLA Marble" + ], + "name": "Bambu PLA Marble", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OF9PELEb": { + "filaments": [ + "Qidi/QIDI UltraPA-CF25" + ], + "name": "QIDI UltraPA-CF25", + "filament_type": "UltraPA-CF25", + "filament_vendor": "QIDI" + }, + "OF9UJOGF": { + "filaments": [ + "Anycubic/Anycubic PETG-CF" + ], + "name": "Anycubic PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Anycubic" + }, + "OF9cAwMK": { + "filaments": [ + "Flashforge/Flashforge PLA-CF" + ], + "name": "Flashforge PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Flashforge" + }, + "OF9emAI9": { + "filaments": [ + "Ratrig/RatRig PunkFil PETG" + ], + "name": "RatRig PunkFil PETG", + "filament_type": "PETG", + "filament_vendor": "RatRig" + }, + "OFA026vt": { + "filaments": [ + "OrcaArena/Arena PA-CF" + ], + "name": "Arena PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Orca Arena" + }, + "OFAC7Wyu": { + "filaments": [ + "Artillery/Artillery PLA Matte" + ], + "name": "Artillery PLA Matte", + "filament_type": "PLA Matte", + "filament_vendor": "Artillery" + }, + "OFAIBCLJ": { + "filaments": [ + "Elegoo/Generic ABS-CF" + ], + "name": "Generic ABS-CF", + "filament_type": "ABS-CF", + "filament_vendor": "Generic" + }, + "OFAIrQXu": { + "filaments": [ + "Creality/Creality Hyper PLA" + ], + "name": "Creality Hyper PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFANFm4x": { + "filaments": [ + "Qidi/QIDI PLA Rapido Metal" + ], + "name": "QIDI PLA Rapido Metal", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OFAO9A7J": { + "filaments": [ + "Sovol/Sovol Zero PLA Silk HS Nozzle" + ], + "name": "Sovol Zero PLA Silk HS Nozzle", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFAZllAN": { + "filaments": [ + "Artillery/Artillery PLA-CF" + ], + "name": "Artillery PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Artillery" + }, + "OFAc0Pr3": { + "filaments": [ + "BBL/Fiberon PET-CF17" + ], + "name": "Fiberon PET-CF17", + "filament_type": "PET-CF", + "filament_vendor": "Polymaker" + }, + "OFAcJkl1": { + "filaments": [ + "BBL/addnorth PETG-CF Rigid X" + ], + "name": "addnorth PETG-CF Rigid X", + "filament_type": "PETG-CF", + "filament_vendor": "addnorth" + }, + "OFAebKg8": { + "filaments": [ + "Flashforge/Flashforge PLA Metal" + ], + "name": "Flashforge PLA Metal", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFAnyRUI": { + "filaments": [ + "BBL/Bambu Support For PLA", + "OrcaFilamentLibrary/Bambu Support For PLA" + ], + "name": "Bambu Support For PLA", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFAt6ec0": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Marron Oxido" + ], + "name": "FilAr PLA Marron Oxido", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFB5SmWk": { + "filaments": [ + "OrcaFilamentLibrary/Valment PLA Galaxy" + ], + "name": "Valment PLA Galaxy", + "filament_type": "PLA", + "filament_vendor": "Valment" + }, + "OFBBgw7B": { + "filaments": [ + "WonderMaker/WonderMaker PLA Wood" + ], + "name": "WonderMaker PLA Wood", + "filament_type": "PLA", + "filament_vendor": "WonderMaker" + }, + "OFBJAdLw": { + "filaments": [ + "LH/LHS PCTG" + ], + "name": "LHS PCTG", + "filament_type": "PCTG", + "filament_vendor": "LH Stinger" + }, + "OFBLktDy": { + "filaments": [ + "Creality/Soleyin Basic PETG" + ], + "name": "Soleyin Basic PETG", + "filament_type": "PETG", + "filament_vendor": "Creality" + }, + "OFBSW57R": { + "filaments": [ + "BBL/Bambu PLA Aero", + "OrcaFilamentLibrary/Bambu PLA Aero" + ], + "name": "Bambu PLA Aero", + "filament_type": "PLA-AERO", + "filament_vendor": "Bambu Lab" + }, + "OFBUIlZ7": { + "filaments": [ + "Elegoo/Elegoo PLA+", + "OrcaFilamentLibrary/Elegoo PLA+" + ], + "name": "Elegoo PLA+", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFBlFMVp": { + "filaments": [ + "Snapmaker/Snapmaker Dual PETG" + ], + "name": "Snapmaker Dual PETG", + "filament_type": "PETG", + "filament_vendor": "Snapmaker" + }, + "OFBoSWxb": { + "filaments": [ + "BBL/PolyLite PLA Luminous", + "Snapmaker/PolyLite PLA Luminous" + ], + "name": "PolyLite PLA Luminous", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFBsbMMF": { + "filaments": [ + "BBL/addnorth PA-CF Adura X" + ], + "name": "addnorth PA-CF Adura X", + "filament_type": "PA-CF", + "filament_vendor": "addnorth" + }, + "OFBw6eEG": { + "filaments": [ + "BBL/Overture Matte PLA", + "OrcaFilamentLibrary/Overture Matte PLA" + ], + "name": "Overture Matte PLA", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OFC1PzXz": { + "filaments": [ + "Creality/Hyper Luminous" + ], + "name": "Hyper Luminous", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFC5f4Ay": { + "filaments": [ + "RH3D/Generic PCCF" + ], + "name": "Generic PCCF", + "filament_type": "PC-CF", + "filament_vendor": "Generic" + }, + "OFC78WGQ": { + "filaments": [ + "BBL/Panchroma PLA Starlight", + "OrcaFilamentLibrary/Panchroma PLA Starlight", + "Snapmaker/Panchroma PLA Starlight" + ], + "name": "Panchroma PLA Starlight", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFCD8qiU": { + "filaments": [ + "BBL/Generic EVA", + "OrcaFilamentLibrary/Generic EVA", + "Tiertime/Generic EVA" + ], + "name": "Generic EVA", + "filament_type": "EVA", + "filament_vendor": "Generic" + }, + "OFCIUsWh": { + "filaments": [ + "BBL/Panchroma PLA Translucent", + "OrcaFilamentLibrary/Panchroma PLA Translucent", + "Snapmaker/Panchroma PLA Translucent" + ], + "name": "Panchroma PLA Translucent", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFCJpR7a": { + "filaments": [ + "Creality/HP Ultra PLA" + ], + "name": "HP Ultra PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFCZsqXg": { + "filaments": [ + "Creality/Hyper PLA" + ], + "name": "Hyper PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFCccVrQ": { + "filaments": [ + "OrcaFilamentLibrary/PolyTerra Dual PLA", + "Snapmaker/PolyTerra Dual PLA" + ], + "name": "PolyTerra Dual PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFCidU7j": { + "filaments": [ + "OrcaFilamentLibrary/DREMC ABS-GF" + ], + "name": "DREMC ABS-GF", + "filament_type": "ABS-GF", + "filament_vendor": "DREMC" + }, + "OFCjG251": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Verde" + ], + "name": "FilAr PLA-mate Verde", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFCn83wF": { + "filaments": [ + "Flashforge/FusRock S-PAHT" + ], + "name": "FusRock S-PAHT", + "filament_type": "PAHT", + "filament_vendor": "FusRock" + }, + "OFCnywiC": { + "filaments": [ + "Tiertime/Tiertime PET-CF" + ], + "name": "Tiertime PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Tiertime" + }, + "OFCoRobU": { + "filaments": [ + "OrcaFilamentLibrary/Elas ASA" + ], + "name": "Elas ASA", + "filament_type": "ASA", + "filament_vendor": "Elas" + }, + "OFCp3Bgo": { + "filaments": [ + "Anycubic/Anycubic PLA SE" + ], + "name": "Anycubic PLA SE", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFCuaCer": { + "filaments": [ + "Volumic/Désactivé" + ], + "name": "Désactivé", + "filament_type": "PLA", + "filament_vendor": "Volumic" + }, + "OFD21ije": { + "filaments": [ + "Cubicon/Cubicon PA-CF" + ], + "name": "Cubicon PA-CF", + "filament_type": "PA", + "filament_vendor": "Cubicon" + }, + "OFD8loeT": { + "filaments": [ + "re3D/re3D rPETG" + ], + "name": "re3D rPETG", + "filament_type": "PETG", + "filament_vendor": "re3D" + }, + "OFD9taow": { + "filaments": [ + "FlyingBear/FlyingBear PLA Hyper" + ], + "name": "FlyingBear PLA Hyper", + "filament_type": "PLA", + "filament_vendor": "FlyingBear" + }, + "OFDETOM6": { + "filaments": [ + "Creality/eSUN PLA-Matte", + "OrcaFilamentLibrary/eSUN PLA-Matte" + ], + "name": "eSUN PLA-Matte", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OFDGigEI": { + "filaments": [ + "BBL/Bambu PLA Dynamic", + "OrcaFilamentLibrary/Bambu PLA Dynamic" + ], + "name": "Bambu PLA Dynamic", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFDIrhbu": { + "filaments": [ + "Qidi/QIDI PC/ABS-FR" + ], + "name": "QIDI PC/ABS-FR", + "filament_type": "PC-ABS-FR", + "filament_vendor": "QIDI" + }, + "OFDJU6R3": { + "filaments": [ + "Afinia/Afinia TPU" + ], + "name": "Afinia TPU", + "filament_type": "TPU", + "filament_vendor": "Afinia" + }, + "OFDKIKyw": { + "filaments": [ + "Snapmaker/Snapmaker Dual PVA" + ], + "name": "Snapmaker Dual PVA", + "filament_type": "PVA", + "filament_vendor": "Snapmaker" + }, + "OFDKgoqx": { + "filaments": [ + "Flashforge/Flashforge PLA" + ], + "name": "Flashforge PLA", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFDRpXLZ": { + "filaments": [ + "FlyingBear/Other PETG", + "InfiMech/Other PETG" + ], + "name": "Other PETG", + "filament_type": "PETG", + "filament_vendor": "Other" + }, + "OFDSrzZ8": { + "filaments": [ + "Anker/Generic PLA", + "Anycubic/Generic PLA", + "Artillery/Generic PLA", + "BBL/Generic PLA", + "Blocks/Generic PLA", + "CONSTRUCT3D/Generic PLA", + "Chuanying/Generic PLA", + "Co Print/Generic PLA", + "CoLiDo/Generic PLA", + "Comgrow/Generic PLA", + "Creality/Generic PLA", + "Custom/Generic PLA", + "DeltaMaker/Generic PLA", + "Dremel/Generic PLA", + "Elegoo/Generic PLA", + "FLSun/Generic PLA", + "Flashforge/Generic PLA", + "FlyingBear/Generic PLA", + "Ginger Additive/Generic PLA", + "InfiMech/Generic PLA", + "LONGER/Generic PLA", + "Lulzbot/Generic PLA", + "OrcaArena/Generic PLA", + "OrcaFilamentLibrary/Generic PLA", + "Peopoly/Generic PLA", + "Phrozen/Generic PLA", + "Prusa/Generic PLA", + "Qidi/Generic PLA", + "RH3D/Generic PLA", + "Ratrig/Generic PLA", + "SecKit/Generic PLA", + "Sovol/Generic PLA", + "Tiertime/Generic PLA", + "Vzbot/Generic PLA", + "Z-Bolt/Generic PLA" + ], + "name": "Generic PLA", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFDdEaoL": { + "filaments": [ + "re3D/re3D PLA" + ], + "name": "re3D PLA", + "filament_type": "PLA", + "filament_vendor": "re3D" + }, + "OFDe8uyM": { + "filaments": [ + "OrcaFilamentLibrary/Valment PLA" + ], + "name": "Valment PLA", + "filament_type": "PLA", + "filament_vendor": "Valment" + }, + "OFDgQaca": { + "filaments": [ + "FlyingBear/FlyingBear PETG" + ], + "name": "FlyingBear PETG", + "filament_type": "PETG", + "filament_vendor": "FlyingBear" + }, + "OFDpW3J8": { + "filaments": [ + "OrcaFilamentLibrary/FILL3D PLA Basic" + ], + "name": "FILL3D PLA Basic", + "filament_type": "PLA", + "filament_vendor": "FILL3D" + }, + "OFDtop41": { + "filaments": [ + "Creality/Generic Support for PA" + ], + "name": "Generic Support for PA", + "filament_type": "PA", + "filament_vendor": "Generic" + }, + "OFDu1qE7": { + "filaments": [ + "Flashforge/FusRock PET-CF" + ], + "name": "FusRock PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "FusRock" + }, + "OFDvXujf": { + "filaments": [ + "Anker/Generic PVA", + "Anycubic/Generic PVA", + "BBL/Generic PVA", + "Blocks/Generic PVA", + "Chuanying/Generic PVA", + "Creality/Generic PVA", + "Custom/Generic PVA", + "FLSun/Generic PVA", + "Flashforge/Generic PVA", + "OrcaArena/Generic PVA", + "OrcaFilamentLibrary/Generic PVA", + "Prusa/Generic PVA", + "Qidi/Generic PVA", + "Ratrig/Generic PVA", + "SecKit/Generic PVA", + "Tiertime/Generic PVA", + "Vzbot/Generic PVA" + ], + "name": "Generic PVA", + "filament_type": "PVA", + "filament_vendor": "Generic" + }, + "OFDvqJ6n": { + "filaments": [ + "OrcaFilamentLibrary/Overture ABS Basic" + ], + "name": "Overture ABS Basic", + "filament_type": "ABS", + "filament_vendor": "Overture" + }, + "OFDwBwO5": { + "filaments": [ + "Prusa/Generic PVA HF" + ], + "name": "Generic PVA HF", + "filament_type": "PVA", + "filament_vendor": "Generic" + }, + "OFDxfPgH": { + "filaments": [ + "BBL/Bambu PLA Sparkle", + "OrcaFilamentLibrary/Bambu PLA Sparkle" + ], + "name": "Bambu PLA Sparkle", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFDxxTpW": { + "filaments": [ + "Flashforge/Flashforge HS PETG" + ], + "name": "Flashforge HS PETG", + "filament_type": "PETG", + "filament_vendor": "Flashforge" + }, + "OFE0NFRh": { + "filaments": [ + "BBL/COEX TPU 60A", + "OrcaFilamentLibrary/COEX TPU 60A" + ], + "name": "COEX TPU 60A", + "filament_type": "TPU", + "filament_vendor": "COEX 3D" + }, + "OFEGNJD4": { + "filaments": [ + "BBL/Bambu PLA Silk", + "OrcaFilamentLibrary/Bambu PLA Silk" + ], + "name": "Bambu PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFEOnBj6": { + "filaments": [ + "Snapmaker/Snapmaker PLA Lite" + ], + "name": "Snapmaker PLA Lite", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFEWYR89": { + "filaments": [ + "Anker/Generic PLA+", + "Qidi/Generic PLA+" + ], + "name": "Generic PLA+", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFEZ449N": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Uva" + ], + "name": "FilAr PLA-mate Uva", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFEZpel7": { + "filaments": [ + "Volumic/PPS Carbone (Performance)" + ], + "name": "PPS Carbone (Performance)", + "filament_type": "PPS-CF", + "filament_vendor": "Volumic" + }, + "OFEabreg": { + "filaments": [ + "Anycubic/Fiberon PA6-CF20", + "BBL/Fiberon PA6-CF20", + "Snapmaker/Fiberon PA6-CF20" + ], + "name": "Fiberon PA6-CF20", + "filament_type": "PA6-CF", + "filament_vendor": "Polymaker" + }, + "OFEbIx49": { + "filaments": [ + "WonderMaker/WonderMaker PLA Marble" + ], + "name": "WonderMaker PLA Marble", + "filament_type": "PLA", + "filament_vendor": "WonderMaker" + }, + "OFEhuUNq": { + "filaments": [], + "name": "DREMC PA12-CF", + "filament_type": "PA-CF", + "filament_vendor": "DREMC" + }, + "OFEj7sca": { + "filaments": [ + "Cubicon/Cubicon PC" + ], + "name": "Cubicon PC", + "filament_type": "PC", + "filament_vendor": "Cubicon" + }, + "OFEjbwqG": { + "filaments": [ + "BBL/PolyTerra PLA+", + "Snapmaker/PolyTerra PLA+" + ], + "name": "PolyTerra PLA+", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFEkPBwx": { + "filaments": [ + "BBL/Bambu PLA Glow", + "OrcaFilamentLibrary/Bambu PLA Glow" + ], + "name": "Bambu PLA Glow", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFEmsric": { + "filaments": [ + "Snapmaker/Snapmaker PA-CF" + ], + "name": "Snapmaker PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Snapmaker" + }, + "OFEnbt6D": { + "filaments": [ + "Peopoly/Peopoly Lancer PLA-C" + ], + "name": "Peopoly Lancer PLA-C", + "filament_type": "PLA", + "filament_vendor": "Peopoly" + }, + "OFEswT5W": { + "filaments": [ + "BBL/Bambu PLA-CF", + "OrcaFilamentLibrary/Bambu PLA-CF" + ], + "name": "Bambu PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Bambu Lab" + }, + "OFEvEfw5": { + "filaments": [ + "Flashforge/Flashforge PA" + ], + "name": "Flashforge PA", + "filament_type": "PA", + "filament_vendor": "Flashforge" + }, + "OFEwRwmL": { + "filaments": [ + "Cubicon/Cubicon PLA" + ], + "name": "Cubicon PLA", + "filament_type": "PLA", + "filament_vendor": "Cubicon" + }, + "OFF3cuzT": { + "filaments": [ + "Creality/Generic TPU 64D" + ], + "name": "Generic TPU 64D", + "filament_type": "TPU", + "filament_vendor": "Generic" + }, + "OFF5o7b2": { + "filaments": [ + "BBL/BETA PLA Youth" + ], + "name": "BETA PLA Youth", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFF9OKoY": { + "filaments": [ + "BBL/PolyLite PLA Pro", + "OrcaFilamentLibrary/PolyLite PLA Pro", + "Snapmaker/PolyLite PLA Pro" + ], + "name": "PolyLite PLA Pro", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFF9cgY5": { + "filaments": [ + "Snapmaker/Snapmaker PLA Matte" + ], + "name": "Snapmaker PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFFAWVf0": { + "filaments": [ + "Qidi/QIDI PC-ABS-FR" + ], + "name": "QIDI PC-ABS-FR", + "filament_type": "PC-ABS-FR", + "filament_vendor": "QIDI" + }, + "OFFFg2Pf": { + "filaments": [ + "Flashforge/Flashforge ASA Basic" + ], + "name": "Flashforge ASA Basic", + "filament_type": "ASA", + "filament_vendor": "Flashforge" + }, + "OFFNYwWR": { + "filaments": [ + "BBL/Bambu PA-CF", + "OrcaFilamentLibrary/Bambu PA-CF" + ], + "name": "Bambu PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Bambu Lab" + }, + "OFFP4ORR": { + "filaments": [ + "Creality/Creality Hyper ABS" + ], + "name": "Creality Hyper ABS", + "filament_type": "ABS", + "filament_vendor": "Creality" + }, + "OFFX1DRD": { + "filaments": [ + "FlyingBear/FlyingBear PC" + ], + "name": "FlyingBear PC", + "filament_type": "PC", + "filament_vendor": "FlyingBear" + }, + "OFFZ458u": { + "filaments": [ + "Snapmaker/Fiberon PA612-ESD" + ], + "name": "Fiberon PA612-ESD", + "filament_type": "PA-CF", + "filament_vendor": "Polymaker" + }, + "OFFbQscs": { + "filaments": [ + "Creality/eSUN PETG-Basic" + ], + "name": "eSUN PETG-Basic", + "filament_type": "PETG", + "filament_vendor": "eSUN" + }, + "OFFbSnCD": { + "filaments": [ + "BBL/Bambu PLA Translucent" + ], + "name": "Bambu PLA Translucent", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFFfJ09N": { + "filaments": [ + "BBL/BETA PETG Glow" + ], + "name": "BETA PETG Glow", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFFkCLBl": { + "filaments": [ + "BBL/Panchroma PLA Galaxy", + "OrcaFilamentLibrary/Panchroma PLA Galaxy", + "Snapmaker/Panchroma PLA Galaxy" + ], + "name": "Panchroma PLA Galaxy", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFFvzqcd": { + "filaments": [ + "BBL/Bambu PETG Basic", + "OrcaFilamentLibrary/Bambu PETG Basic" + ], + "name": "Bambu PETG Basic", + "filament_type": "PETG", + "filament_vendor": "Bambu Lab" + }, + "OFFwJWea": { + "filaments": [ + "Anycubic/Anycubic PLA Silk" + ], + "name": "Anycubic PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFG0kOKX": { + "filaments": [ + "Volumic/Volumic PETG Ultra" + ], + "name": "Volumic PETG Ultra", + "filament_type": "PETG", + "filament_vendor": "Volumic" + }, + "OFG2RkhN": { + "filaments": [ + "Creality/CR-TPU" + ], + "name": "CR-TPU", + "filament_type": "TPU", + "filament_vendor": "Creality" + }, + "OFG4do34": { + "filaments": [ + "Qidi/Qidi ASA-Aero" + ], + "name": "Qidi ASA-Aero", + "filament_type": "ASA-AERO", + "filament_vendor": "QIDI" + }, + "OFGJ1nxs": { + "filaments": [ + "FlyingBear/Other PLA", + "InfiMech/Other PLA" + ], + "name": "Other PLA", + "filament_type": "PLA", + "filament_vendor": "Other" + }, + "OFGVwfK0": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Gris" + ], + "name": "FilAr PLA-mate Gris", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFGVxj2A": { + "filaments": [ + "BBL/BETA PLA Wood" + ], + "name": "BETA PLA Wood", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFGc9l16": { + "filaments": [ + "BBL/BETA PLA Glow" + ], + "name": "BETA PLA Glow", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFGcLA5R": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Beige" + ], + "name": "FilAr PLA-mate Beige", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFGcMkEB": { + "filaments": [ + "Creality/HP-TPU" + ], + "name": "HP-TPU", + "filament_type": "TPU", + "filament_vendor": "Creality" + }, + "OFGdP6Na": { + "filaments": [ + "Volumic/Volumic PVA" + ], + "name": "Volumic PVA", + "filament_type": "PVA", + "filament_vendor": "Volumic" + }, + "OFGkyftV": { + "filaments": [ + "BBL/Overture Silk PLA", + "OrcaFilamentLibrary/Overture Silk PLA" + ], + "name": "Overture Silk PLA", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OFGwT5Av": { + "filaments": [ + "Creality/Creality Hyper PLA-CF" + ], + "name": "Creality Hyper PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Creality" + }, + "OFGwZmgS": { + "filaments": [ + "Creality/CR-ABS" + ], + "name": "CR-ABS", + "filament_type": "ABS", + "filament_vendor": "Creality" + }, + "OFGxC8gB": { + "filaments": [ + "Creality/CR-Wood" + ], + "name": "CR-Wood", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFGxuI0n": { + "filaments": [ + "Flashforge/Flashforge PA-CF" + ], + "name": "Flashforge PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Flashforge" + }, + "OFH2nN08": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 850" + ], + "name": "Eolas Prints PLA INGEO 850", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFH57ibH": { + "filaments": [ + "Snapmaker/Polymaker Silk PLA Family" + ], + "name": "Polymaker Silk PLA Family", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFH7b12v": { + "filaments": [ + "Creality/Generic PAHT-CF" + ], + "name": "Generic PAHT-CF", + "filament_type": "PA-CF", + "filament_vendor": "Generic" + }, + "OFHAccHz": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Antartida" + ], + "name": "FilAr PLA Blanco Antartida", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFHHwrd1": { + "filaments": [ + "BBL/addnorth PETG Base" + ], + "name": "addnorth PETG Base", + "filament_type": "PETG", + "filament_vendor": "addnorth" + }, + "OFHWSM21": { + "filaments": [ + "BBL/Fiberon PET-CF", + "OrcaFilamentLibrary/Fiberon PET-CF" + ], + "name": "Fiberon PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Polymaker" + }, + "OFHa48An": { + "filaments": [ + "BBL/Bambu PET-CF", + "OrcaFilamentLibrary/Bambu PET-CF" + ], + "name": "Bambu PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Bambu Lab" + }, + "OFHaYaB1": { + "filaments": [ + "Creality/eSUN PET-Basic" + ], + "name": "eSUN PET-Basic", + "filament_type": "PET", + "filament_vendor": "eSUN" + }, + "OFHf2lKK": { + "filaments": [ + "FlyingBear/FlyingBear TPU Basic" + ], + "name": "FlyingBear TPU Basic", + "filament_type": "TPU", + "filament_vendor": "FlyingBear" + }, + "OFHfzQXo": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA Transition" + ], + "name": "Eolas Prints PLA Transition", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFHknN4v": { + "filaments": [ + "Anycubic/Polymaker PLA Pro Metallic", + "Snapmaker/Polymaker PLA Pro Metallic" + ], + "name": "Polymaker PLA Pro Metallic", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFHmPYRy": { + "filaments": [ + "BBL/SUNLU PLA+ 2.0", + "Flashforge/SUNLU PLA+ 2.0", + "OrcaFilamentLibrary/SUNLU PLA+ 2.0" + ], + "name": "SUNLU PLA+ 2.0", + "filament_type": "PLA", + "filament_vendor": "SUNLU" + }, + "OFI2MKy7": { + "filaments": [ + "BBL/BETA PEBA 90A" + ], + "name": "BETA PEBA 90A", + "filament_type": "TPU", + "filament_vendor": "BETA" + }, + "OFI6WZpn": { + "filaments": [ + "OrcaArena/Arena Support W" + ], + "name": "Arena Support W", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFIBXa0k": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rojo" + ], + "name": "FilAr PLA-mate Rojo", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFIBbYO5": { + "filaments": [ + "BBL/Bambu TPU for AMS" + ], + "name": "Bambu TPU for AMS", + "filament_type": "TPU-AMS", + "filament_vendor": "Bambu Lab" + }, + "OFIE3vOf": { + "filaments": [ + "Anycubic/Anycubic PLA Matte" + ], + "name": "Anycubic PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFIK2H3G": { + "filaments": [ + "Flashforge/Flashforge HS PLA" + ], + "name": "Flashforge HS PLA", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFIKZxPF": { + "filaments": [ + "Creality/Generic PLA Wood" + ], + "name": "Generic PLA Wood", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFIPjqHt": { + "filaments": [ + "OrcaArena/Arena Support G" + ], + "name": "Arena Support G", + "filament_type": "PA", + "filament_vendor": "Orca Arena" + }, + "OFIRUqWi": { + "filaments": [ + "Creality/eSUN PLA-Silk" + ], + "name": "eSUN PLA-Silk", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OFIVWJPm": { + "filaments": [ + "InfiMech/InfiMech TPU" + ], + "name": "InfiMech TPU", + "filament_type": "TPU", + "filament_vendor": "InfiMech" + }, + "OFIWMSGX": { + "filaments": [ + "Qidi/HATCHBOX PETG" + ], + "name": "HATCHBOX PETG", + "filament_type": "PETG", + "filament_vendor": "HATCHBOX" + }, + "OFIZMQwM": { + "filaments": [ + "LH/LHS TPU" + ], + "name": "LHS TPU", + "filament_type": "TPU", + "filament_vendor": "LH Stinger" + }, + "OFIamQnD": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Gris Ceniza" + ], + "name": "FilAr PLA Gris Ceniza", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFIegjmD": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints TPU Flex D53" + ], + "name": "Eolas Prints TPU Flex D53", + "filament_type": "TPU", + "filament_vendor": "Eolas Prints" + }, + "OFIfnzxC": { + "filaments": [ + "BBL/Bambu Support For PLA/PETG", + "OrcaFilamentLibrary/Bambu Support For PLA/PETG" + ], + "name": "Bambu Support For PLA/PETG", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFIgbDHq": { + "filaments": [ + "Anycubic/Anycubic PLA Luminous" + ], + "name": "Anycubic PLA Luminous", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFIxOuOu": { + "filaments": [ + "BBL/PolyLite PLA Starlight", + "Snapmaker/PolyLite PLA Starlight" + ], + "name": "PolyLite PLA Starlight", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFJ3F2jm": { + "filaments": [ + "Flashforge/Flashforge PLA Basic" + ], + "name": "Flashforge PLA Basic", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFJ3HRsR": { + "filaments": [ + "OrcaArena/Arena ABS" + ], + "name": "Arena ABS", + "filament_type": "ABS", + "filament_vendor": "Orca Arena" + }, + "OFJHBEGD": { + "filaments": [], + "name": "DREMC PLA+ HS", + "filament_type": "PLA", + "filament_vendor": "DREMC" + }, + "OFJJ0Ar3": { + "filaments": [ + "Flashforge/Flashforge PLA Galaxy" + ], + "name": "Flashforge PLA Galaxy", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFJNeELv": { + "filaments": [ + "OrcaFilamentLibrary/FILL3D PA" + ], + "name": "FILL3D PA", + "filament_type": "PA", + "filament_vendor": "FILL3D" + }, + "OFJOFnOZ": { + "filaments": [ + "BBL/AliZ PETG-CF", + "OrcaFilamentLibrary/AliZ PETG-CF" + ], + "name": "AliZ PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Aliz" + }, + "OFJQDUk3": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Cristal" + ], + "name": "FilAr PETG Cristal", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFJS560n": { + "filaments": [], + "name": "Flashforge ASA", + "filament_type": "ASA", + "filament_vendor": "Flashforge" + }, + "OFJWKoYG": { + "filaments": [ + "iQ/Material4Print ABS Natur P1" + ], + "name": "Material4Print ABS Natur P1", + "filament_type": "ABS Material4Print Natur", + "filament_vendor": "iQ Materials" + }, + "OFJYpVAQ": { + "filaments": [ + "Flashforge/Generic TPU-90A" + ], + "name": "Generic TPU-90A", + "filament_type": "TPU-90A", + "filament_vendor": "Generic" + }, + "OFJgijky": { + "filaments": [ + "BBL/PolyLite CosPLA", + "Snapmaker/PolyLite CosPLA" + ], + "name": "PolyLite CosPLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFJhT2fd": { + "filaments": [ + "Snapmaker/Snapmaker Dual ABS" + ], + "name": "Snapmaker Dual ABS", + "filament_type": "ABS", + "filament_vendor": "Snapmaker" + }, + "OFJnEaCp": { + "filaments": [ + "BBL/BETA PLA Transparent" + ], + "name": "BETA PLA Transparent", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFJrvXth": { + "filaments": [ + "Snapmaker/Snapmaker ABS Benchy" + ], + "name": "Snapmaker ABS Benchy", + "filament_type": "ABS", + "filament_vendor": "Snapmaker" + }, + "OFJs1ToM": { + "filaments": [ + "BBL/COEX NYLEX UNFILLED" + ], + "name": "COEX NYLEX UNFILLED", + "filament_type": "PA", + "filament_vendor": "COEX 3D" + }, + "OFJu1XwK": { + "filaments": [ + "OrcaFilamentLibrary/NIT PETG" + ], + "name": "NIT PETG", + "filament_type": "PETG", + "filament_vendor": "NIT" + }, + "OFJxSqO4": { + "filaments": [ + "Wanhao France/YUMI PLA Direct Drive" + ], + "name": "YUMI PLA Direct Drive", + "filament_type": "PLA", + "filament_vendor": "Yumi" + }, + "OFK7830e": { + "filaments": [ + "BBL/BETA TPU 95A" + ], + "name": "BETA TPU 95A", + "filament_type": "TPU", + "filament_vendor": "BETA" + }, + "OFK8XHPn": { + "filaments": [ + "Qidi/Overture ABS" + ], + "name": "Overture ABS", + "filament_type": "ABS", + "filament_vendor": "Overture" + }, + "OFKIQO2W": { + "filaments": [ + "Qidi/QIDI PLA Rapido" + ], + "name": "QIDI PLA Rapido", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OFKKajh6": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Gris Plata" + ], + "name": "FilAr PLA Gris Plata", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFKTGKJU": { + "filaments": [ + "Flashforge/FusRock PET" + ], + "name": "FusRock PET", + "filament_type": "PET", + "filament_vendor": "FusRock" + }, + "OFKTSiYF": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Blanco Calido" + ], + "name": "FilAr PLA Blanco Calido", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFKUEXPA": { + "filaments": [ + "Snapmaker/Snapmaker Dual ASA" + ], + "name": "Snapmaker Dual ASA", + "filament_type": "ASA", + "filament_vendor": "Snapmaker" + }, + "OFKW5hEW": { + "filaments": [ + "Flashforge/FusRock PAHT-CF" + ], + "name": "FusRock PAHT-CF", + "filament_type": "PAHT-CF", + "filament_vendor": "FusRock" + }, + "OFKWWgyp": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Carpincho" + ], + "name": "FilAr PLA Carpincho", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFKYBAWe": { + "filaments": [ + "BBL/BETA PLA Marble" + ], + "name": "BETA PLA Marble", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFKZ9skj": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Naranja Tigre" + ], + "name": "FilAr PLA Naranja Tigre", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFKbdiiJ": { + "filaments": [ + "Creality/PolySonic PLA Pro" + ], + "name": "PolySonic PLA Pro", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFKfJTwL": { + "filaments": [ + "Qidi/QIDI PET-CF" + ], + "name": "QIDI PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "QIDI" + }, + "OFKgmsqE": { + "filaments": [ + "Qidi/QIDI PAHT-CF" + ], + "name": "QIDI PAHT-CF", + "filament_type": "PAHT-CF", + "filament_vendor": "QIDI" + }, + "OFKhMPeX": { + "filaments": [ + "BBL/Bambu PC", + "OrcaFilamentLibrary/Bambu PC" + ], + "name": "Bambu PC", + "filament_type": "PC", + "filament_vendor": "Bambu Lab" + }, + "OFKiSMWR": { + "filaments": [ + "BBL/Panchroma PLA Marble", + "OrcaFilamentLibrary/Panchroma PLA Marble", + "Snapmaker/Panchroma PLA Marble" + ], + "name": "Panchroma PLA Marble", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFKyNkQz": { + "filaments": [ + "BBL/BETA PETG UV Color Change" + ], + "name": "BETA PETG UV Color Change", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFL9aRjN": { + "filaments": [ + "Snapmaker/Snapmaker PETG HF" + ], + "name": "Snapmaker PETG HF", + "filament_type": "PETG", + "filament_vendor": "Snapmaker" + }, + "OFLAXKqP": { + "filaments": [ + "WonderMaker/WonderMaker TPU 95A" + ], + "name": "WonderMaker TPU 95A", + "filament_type": "TPU", + "filament_vendor": "WonderMaker" + }, + "OFLC1oRH": { + "filaments": [ + "Flashforge/Flashforge PPA-CF" + ], + "name": "Flashforge PPA-CF", + "filament_type": "PPA-CF", + "filament_vendor": "Flashforge" + }, + "OFLJ8S6I": { + "filaments": [ + "BBL/SUNLU Wood PLA", + "Flashforge/SUNLU Wood PLA", + "OrcaFilamentLibrary/SUNLU Wood PLA" + ], + "name": "SUNLU Wood PLA", + "filament_type": "PLA", + "filament_vendor": "SUNLU" + }, + "OFLNgV3C": { + "filaments": [], + "name": "DREMC ASA", + "filament_type": "ASA", + "filament_vendor": "DREMC" + }, + "OFLOf6Sc": { + "filaments": [ + "Tiertime/Tiertime TPU 95A" + ], + "name": "Tiertime TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Tiertime" + }, + "OFLPAxz3": { + "filaments": [ + "Anker/Generic ASA", + "Anycubic/Generic ASA", + "Artillery/Generic ASA", + "BBL/Generic ASA", + "Blocks/Generic ASA", + "Chuanying/Generic ASA", + "Creality/Generic ASA", + "Custom/Generic ASA", + "Elegoo/Generic ASA", + "FLSun/Generic ASA", + "Flashforge/Generic ASA", + "OrcaArena/Generic ASA", + "OrcaFilamentLibrary/Generic ASA", + "Prusa/Generic ASA", + "Qidi/Generic ASA", + "RH3D/Generic ASA", + "Ratrig/Generic ASA", + "SecKit/Generic ASA", + "Tiertime/Generic ASA", + "Vzbot/Generic ASA" + ], + "name": "Generic ASA", + "filament_type": "ASA", + "filament_vendor": "Generic" + }, + "OFLTYJW0": { + "filaments": [ + "Snapmaker/Snapmaker PLA Translucent" + ], + "name": "Snapmaker PLA Translucent", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFLXvuMr": { + "filaments": [ + "Elegoo/Elegoo Rapid PETG", + "OrcaFilamentLibrary/Elegoo Rapid PETG" + ], + "name": "Elegoo Rapid PETG", + "filament_type": "PETG", + "filament_vendor": "Elegoo" + }, + "OFLYDngx": { + "filaments": [ + "Qidi/Bambu PETG" + ], + "name": "Bambu PETG", + "filament_type": "PETG", + "filament_vendor": "Bambu Lab" + }, + "OFLakOUI": { + "filaments": [ + "Anker/Generic PC", + "Anycubic/Generic PC", + "BBL/Generic PC", + "Blocks/Generic PC", + "Creality/Generic PC", + "Custom/Generic PC", + "Elegoo/Generic PC", + "FLSun/Generic PC", + "FlyingBear/Generic PC", + "InfiMech/Generic PC", + "OrcaArena/Generic PC", + "OrcaFilamentLibrary/Generic PC", + "Prusa/Generic PC", + "Qidi/Generic PC", + "Ratrig/Generic PC", + "SecKit/Generic PC", + "Sovol/Generic PC", + "Tiertime/Generic PC", + "Vzbot/Generic PC" + ], + "name": "Generic PC", + "filament_type": "PC", + "filament_vendor": "Generic" + }, + "OFLbXwoL": { + "filaments": [ + "Artillery/Artillery PLA Silk" + ], + "name": "Artillery PLA Silk", + "filament_type": "PLA Silk", + "filament_vendor": "Artillery" + }, + "OFLbdkrE": { + "filaments": [ + "Snapmaker/Snapmaker J1 PLA Eco" + ], + "name": "Snapmaker J1 PLA Eco", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFLcd093": { + "filaments": [ + "Elegoo/Elegoo PETG", + "OrcaFilamentLibrary/Elegoo PETG" + ], + "name": "Elegoo PETG", + "filament_type": "PETG", + "filament_vendor": "Elegoo" + }, + "OFLfywkp": { + "filaments": [ + "Afinia/Afinia ABS+" + ], + "name": "Afinia ABS+", + "filament_type": "ABS", + "filament_vendor": "Afinia" + }, + "OFLgwqp2": { + "filaments": [ + "Creality/Hyper PETG-GF" + ], + "name": "Hyper PETG-GF", + "filament_type": "PETG-GF", + "filament_vendor": "Creality" + }, + "OFLjDYxH": { + "filaments": [ + "BBL/addnorth PLA X-PLA High Speed" + ], + "name": "addnorth PLA X-PLA High Speed", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFLqgSuX": { + "filaments": [ + "BBL/BETA PLA-CF" + ], + "name": "BETA PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "BETA" + }, + "OFLzx3J4": { + "filaments": [ + "Creality/Hyper Marble" + ], + "name": "Hyper Marble", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFM0xjBG": { + "filaments": [ + "Creality/CR-PLA Matte" + ], + "name": "CR-PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFM4iJlv": { + "filaments": [ + "Creality/Generic PA12-CF" + ], + "name": "Generic PA12-CF", + "filament_type": "PA-CF", + "filament_vendor": "Generic" + }, + "OFM91vZs": { + "filaments": [ + "BBL/Overture ASA", + "OrcaFilamentLibrary/Overture ASA" + ], + "name": "Overture ASA", + "filament_type": "ASA", + "filament_vendor": "Overture" + }, + "OFMDHOcT": { + "filaments": [ + "Qidi/QIDI TPU-Aero" + ], + "name": "QIDI TPU-Aero", + "filament_type": "TPU-AERO", + "filament_vendor": "QIDI" + }, + "OFMK5gVo": { + "filaments": [ + "WonderMaker/WonderMaker PLA Basic" + ], + "name": "WonderMaker PLA Basic", + "filament_type": "PLA", + "filament_vendor": "WonderMaker" + }, + "OFML2aVd": { + "filaments": [ + "Anycubic/Anycubic TPU 95A" + ], + "name": "Anycubic TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Anycubic" + }, + "OFMSvS8z": { + "filaments": [ + "Artillery/Artillery PA" + ], + "name": "Artillery PA", + "filament_type": "PA", + "filament_vendor": "Artillery" + }, + "OFMTK0UC": { + "filaments": [ + "BBL/Bambu Support For PA/PET", + "OrcaFilamentLibrary/Bambu Support For PA/PET" + ], + "name": "Bambu Support For PA/PET", + "filament_type": "PA", + "filament_vendor": "Bambu Lab" + }, + "OFMUWNkp": { + "filaments": [ + "BBL/SUNLU PLA+", + "Flashforge/SUNLU PLA+", + "OrcaFilamentLibrary/SUNLU PLA+" + ], + "name": "SUNLU PLA+", + "filament_type": "PLA", + "filament_vendor": "SUNLU" + }, + "OFMZvH0z": { + "filaments": [ + "BBL/Overture Rock PLA", + "OrcaFilamentLibrary/Overture Rock PLA" + ], + "name": "Overture Rock PLA", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OFMjtqTC": { + "filaments": [ + "BBL/Bambu PLA Wood", + "OrcaFilamentLibrary/Bambu PLA Wood" + ], + "name": "Bambu PLA Wood", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFMkAW6r": { + "filaments": [ + "Flashforge/Flashforge PLA Color Change" + ], + "name": "Flashforge PLA Color Change", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFMpxamb": { + "filaments": [ + "Flashforge/Flashforge PETG" + ], + "name": "Flashforge PETG", + "filament_type": "PETG", + "filament_vendor": "Flashforge" + }, + "OFMsDGbs": { + "filaments": [ + "Anycubic/Anycubic TPU" + ], + "name": "Anycubic TPU", + "filament_type": "TPU", + "filament_vendor": "Anycubic" + }, + "OFMuXBmO": { + "filaments": [ + "OrcaFilamentLibrary/Elas PLA Basic" + ], + "name": "Elas PLA Basic", + "filament_type": "PLA", + "filament_vendor": "Elas" + }, + "OFMzRg65": { + "filaments": [ + "BBL/BETA PLA PRO" + ], + "name": "BETA PLA PRO", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFN8QBhu": { + "filaments": [ + "BBL/addnorth PLA Wood" + ], + "name": "addnorth PLA Wood", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFN9fefN": { + "filaments": [ + "Cubicon/Cubicon ABS-A100" + ], + "name": "Cubicon ABS-A100", + "filament_type": "ABS", + "filament_vendor": "Cubicon" + }, + "OFNBlAPT": { + "filaments": [ + "OrcaArena/Arena PETG Basic" + ], + "name": "Arena PETG Basic", + "filament_type": "PETG", + "filament_vendor": "Orca Arena" + }, + "OFNGTH3w": { + "filaments": [ + "Tiertime/Tiertime PLA" + ], + "name": "Tiertime PLA", + "filament_type": "PLA", + "filament_vendor": "Tiertime" + }, + "OFNQKF0M": { + "filaments": [ + "Tiertime/Tiertime ABS" + ], + "name": "Tiertime ABS", + "filament_type": "ABS", + "filament_vendor": "Tiertime" + }, + "OFNSYu5h": { + "filaments": [ + "Volumic/Volumic PP Ultra (Performance)" + ], + "name": "Volumic PP Ultra (Performance)", + "filament_type": "PP", + "filament_vendor": "Volumic" + }, + "OFNU9YIW": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Azul Boreal" + ], + "name": "FilAr PETG Azul Boreal", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFNemJM6": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Cobre" + ], + "name": "FilAr PLA Cobre", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFNjku08": { + "filaments": [ + "CONSTRUCT3D/Generic High Flow PETG" + ], + "name": "Generic High Flow PETG", + "filament_type": "PETG", + "filament_vendor": "Generic" + }, + "OFNk8AvA": { + "filaments": [ + "BBL/BETA PETG Gradient" + ], + "name": "BETA PETG Gradient", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFNk8bxk": { + "filaments": [ + "BBL/Bambu PA6-GF", + "OrcaFilamentLibrary/Bambu PA6-GF" + ], + "name": "Bambu PA6-GF", + "filament_type": "PA-GF", + "filament_vendor": "Bambu Lab" + }, + "OFNstOna": { + "filaments": [ + "Eryone/Eryone PETG-CF" + ], + "name": "Eryone PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Eryone" + }, + "OFNvBIL0": { + "filaments": [ + "Creality/Hyper PPA-CF" + ], + "name": "Hyper PPA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Creality" + }, + "OFO1GEq6": { + "filaments": [ + "BBL/Panchroma PLA Neon", + "OrcaFilamentLibrary/Panchroma PLA Neon", + "Snapmaker/Panchroma PLA Neon" + ], + "name": "Panchroma PLA Neon", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFO5djrM": { + "filaments": [ + "Chuanying/Generic PETG-CF10", + "Flashforge/Generic PETG-CF10" + ], + "name": "Generic PETG-CF10", + "filament_type": "PETG-CF", + "filament_vendor": "Generic" + }, + "OFO6GMJ3": { + "filaments": [ + "BBL/addnorth TPU EasyFlex" + ], + "name": "addnorth TPU EasyFlex", + "filament_type": "TPU", + "filament_vendor": "addnorth" + }, + "OFOABq7t": { + "filaments": [ + "BBL/AliZ PETG-Metal", + "OrcaFilamentLibrary/AliZ PETG-Metal" + ], + "name": "AliZ PETG-Metal", + "filament_type": "PETG", + "filament_vendor": "Aliz" + }, + "OFOAdMCB": { + "filaments": [ + "OrcaArena/Arena PLA Metal" + ], + "name": "Arena PLA Metal", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFOHOf2F": { + "filaments": [ + "Creality/eSUN PLA-HS" + ], + "name": "eSUN PLA-HS", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OFOJPAAS": { + "filaments": [ + "iQ/VXL90 TiQ2 P2" + ], + "name": "VXL90 TiQ2 P2", + "filament_type": "VXL90 Xioneer", + "filament_vendor": "iQ Materials" + }, + "OFOPU1xv": { + "filaments": [ + "Snapmaker/Snapmaker PLA Full Spectrum" + ], + "name": "Snapmaker PLA Full Spectrum", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFOQCfVa": { + "filaments": [ + "BBL/addnorth PLA Premium Silk" + ], + "name": "addnorth PLA Premium Silk", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFObG16Q": { + "filaments": [ + "InfiMech/InfiMech PLA Basic" + ], + "name": "InfiMech PLA Basic", + "filament_type": "PLA", + "filament_vendor": "InfiMech" + }, + "OFObyktP": { + "filaments": [ + "Tiertime/Tiertime PETG" + ], + "name": "Tiertime PETG", + "filament_type": "PETG", + "filament_vendor": "Tiertime" + }, + "OFOiJfLM": { + "filaments": [ + "OrcaFilamentLibrary/FILL3D PETG CF" + ], + "name": "FILL3D PETG CF", + "filament_type": "PETG-CF", + "filament_vendor": "FILL3D" + }, + "OFOnSNt3": { + "filaments": [ + "Artillery/Artillery PETG-CF" + ], + "name": "Artillery PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Artillery" + }, + "OFOsHDnB": { + "filaments": [ + "Elegoo/Elegoo PETG PRO", + "OrcaFilamentLibrary/Elegoo PETG PRO" + ], + "name": "Elegoo PETG PRO", + "filament_type": "PETG", + "filament_vendor": "Elegoo" + }, + "OFOuEEvv": { + "filaments": [ + "Qidi/QIDI ABS Rapido 0.2 nozzle" + ], + "name": "QIDI ABS Rapido 0.2 nozzle", + "filament_type": "ABS", + "filament_vendor": "QIDI" + }, + "OFOvv91M": { + "filaments": [ + "BBL/PolyLite ABS", + "OrcaFilamentLibrary/PolyLite ABS", + "Qidi/PolyLite ABS" + ], + "name": "PolyLite ABS", + "filament_type": "ABS", + "filament_vendor": "Polymaker" + }, + "OFOwQuZM": { + "filaments": [ + "Snapmaker/Snapmaker PETG-CF" + ], + "name": "Snapmaker PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Snapmaker" + }, + "OFOzwywz": { + "filaments": [ + "Eryone/Eryone ABS" + ], + "name": "Eryone ABS", + "filament_type": "ABS", + "filament_vendor": "Eryone" + }, + "OFP26zNb": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Violeta Jacaranda" + ], + "name": "FilAr PLA Violeta Jacaranda", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFPHLnoe": { + "filaments": [ + "Creality/HP-ASA" + ], + "name": "HP-ASA", + "filament_type": "ASA", + "filament_vendor": "Creality" + }, + "OFPWPlSC": { + "filaments": [ + "OrcaFilamentLibrary/FILL3D PP" + ], + "name": "FILL3D PP", + "filament_type": "PP", + "filament_vendor": "FILL3D" + }, + "OFPYDWgC": { + "filaments": [ + "Peopoly/Peopoly Lancer PET-CF" + ], + "name": "Peopoly Lancer PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Peopoly" + }, + "OFPbyOSk": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Rojo Carmesi" + ], + "name": "FilAr PETG Rojo Carmesi", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFPc4zVY": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA INGEO 870" + ], + "name": "Eolas Prints PLA INGEO 870", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFPkCJKE": { + "filaments": [ + "BBL/Panchroma PLA Satin", + "Creality/Panchroma PLA Satin", + "OrcaFilamentLibrary/Panchroma PLA Satin", + "Snapmaker/Panchroma PLA Satin" + ], + "name": "Panchroma PLA Satin", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFPklMI1": { + "filaments": [ + "BBL/Generic PE", + "OrcaFilamentLibrary/Generic PE", + "Tiertime/Generic PE" + ], + "name": "Generic PE", + "filament_type": "PE", + "filament_vendor": "Generic" + }, + "OFPoyiFs": { + "filaments": [ + "BBL/Polymaker HT-PLA", + "OrcaFilamentLibrary/Polymaker HT-PLA", + "Snapmaker/Polymaker HT-PLA" + ], + "name": "Polymaker HT-PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFPqX3x2": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Amaranto" + ], + "name": "FilAr PLA Rosa Amaranto", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFQ1KzO8": { + "filaments": [ + "Snapmaker/Snapmaker J1 PLA Silk" + ], + "name": "Snapmaker J1 PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFQ1zgm3": { + "filaments": [ + "Eryone/Eryone ABS-CF" + ], + "name": "Eryone ABS-CF", + "filament_type": "ABS-CF", + "filament_vendor": "Eryone" + }, + "OFQ3e56w": { + "filaments": [ + "BBL/Bambu PLA Galaxy", + "OrcaFilamentLibrary/Bambu PLA Galaxy" + ], + "name": "Bambu PLA Galaxy", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFQ40XeN": { + "filaments": [ + "Qidi/QIDI PETG Tough" + ], + "name": "QIDI PETG Tough", + "filament_type": "PETG", + "filament_vendor": "QIDI" + }, + "OFQ5TxZ2": { + "filaments": [ + "BBL/addnorth PVDF Adamant S1" + ], + "name": "addnorth PVDF Adamant S1", + "filament_type": "PA", + "filament_vendor": "addnorth" + }, + "OFQEGL7z": { + "filaments": [ + "FlyingBear/FlyingBear PA-CF" + ], + "name": "FlyingBear PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "FlyingBear" + }, + "OFQGvU2G": { + "filaments": [ + "OrcaArena/Arena TPU 95A" + ], + "name": "Arena TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Orca Arena" + }, + "OFQHiNJs": { + "filaments": [ + "BBL/Bambu Support G", + "OrcaFilamentLibrary/Bambu Support G" + ], + "name": "Bambu Support G", + "filament_type": "PA", + "filament_vendor": "Bambu Lab" + }, + "OFQLcbps": { + "filaments": [ + "Anker/Generic PA-CF", + "Anycubic/Generic PA-CF", + "BBL/Generic PA-CF", + "Blocks/Generic PA-CF", + "Creality/Generic PA-CF", + "Custom/Generic PA-CF", + "FLSun/Generic PA-CF", + "FlyingBear/Generic PA-CF", + "InfiMech/Generic PA-CF", + "OrcaArena/Generic PA-CF", + "OrcaFilamentLibrary/Generic PA-CF", + "Prusa/Generic PA-CF", + "Qidi/Generic PA-CF", + "Ratrig/Generic PA-CF", + "SecKit/Generic PA-CF", + "Tiertime/Generic PA-CF", + "Vzbot/Generic PA-CF" + ], + "name": "Generic PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Generic" + }, + "OFQMTRc8": { + "filaments": [ + "Snapmaker/Snapmaker J1 PETG" + ], + "name": "Snapmaker J1 PETG", + "filament_type": "PETG", + "filament_vendor": "Snapmaker" + }, + "OFQMsFfF": { + "filaments": [ + "Qidi/QIDI ABS-GF10" + ], + "name": "QIDI ABS-GF10", + "filament_type": "ABS-GF", + "filament_vendor": "QIDI" + }, + "OFQWIKbV": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Titanio" + ], + "name": "FilAr PLA Titanio", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFQYaiGg": { + "filaments": [ + "Snapmaker/Snapmaker PET" + ], + "name": "Snapmaker PET", + "filament_type": "PET", + "filament_vendor": "Snapmaker" + }, + "OFQbjX3s": { + "filaments": [ + "OrcaFilamentLibrary/FILL3D PETG" + ], + "name": "FILL3D PETG", + "filament_type": "PETG", + "filament_vendor": "FILL3D" + }, + "OFQdaVZS": { + "filaments": [ + "Creality/Generic PET-CF", + "Elegoo/Generic PET-CF" + ], + "name": "Generic PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Generic" + }, + "OFQe7sAx": { + "filaments": [ + "Anycubic/Anycubic PA6-CF" + ], + "name": "Anycubic PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "Anycubic" + }, + "OFQyyO0l": { + "filaments": [ + "Flashforge/Polymaker CoPA" + ], + "name": "Polymaker CoPA", + "filament_type": "PA", + "filament_vendor": "Polymaker" + }, + "OFR0gODA": { + "filaments": [ + "SeeMeCNC/SeeMeCNC ABS" + ], + "name": "SeeMeCNC ABS", + "filament_type": "ABS", + "filament_vendor": "SeeMeCNC" + }, + "OFR1XLMN": { + "filaments": [ + "Qidi/QIDI TPU 95A-HF" + ], + "name": "QIDI TPU 95A-HF", + "filament_type": "TPU", + "filament_vendor": "QIDI" + }, + "OFRFhdqy": { + "filaments": [ + "BBL/addnorth PLA Textura" + ], + "name": "addnorth PLA Textura", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFRJ325z": { + "filaments": [ + "LH/LHS PETG" + ], + "name": "LHS PETG", + "filament_type": "PETG", + "filament_vendor": "LH Stinger" + }, + "OFRhBryT": { + "filaments": [ + "Cubicon/Cubicon PLAi21" + ], + "name": "Cubicon PLAi21", + "filament_type": "PLA", + "filament_vendor": "Cubicon" + }, + "OFRhCTUg": { + "filaments": [ + "Anycubic/Anycubic PET-CF" + ], + "name": "Anycubic PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Anycubic" + }, + "OFRiFnfQ": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PETG Transition" + ], + "name": "Eolas Prints PETG Transition", + "filament_type": "PETG", + "filament_vendor": "Eolas Prints" + }, + "OFRiYgMK": { + "filaments": [ + "BBL/Panchroma PLA Celestial", + "OrcaFilamentLibrary/Panchroma PLA Celestial", + "Snapmaker/Panchroma PLA Celestial" + ], + "name": "Panchroma PLA Celestial", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFRkjhxK": { + "filaments": [ + "Volumic/Volumic PVA-BVOH (Performance)" + ], + "name": "Volumic PVA-BVOH (Performance)", + "filament_type": "PVA", + "filament_vendor": "Volumic" + }, + "OFRmGKVX": { + "filaments": [ + "Cubicon/Cubicon PLA+" + ], + "name": "Cubicon PLA+", + "filament_type": "PLA", + "filament_vendor": "Cubicon" + }, + "OFRooa0F": { + "filaments": [ + "Snapmaker/Snapmaker Dual PA-CF" + ], + "name": "Snapmaker Dual PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Snapmaker" + }, + "OFRpAZ1P": { + "filaments": [ + "DeltaMaker/DeltaMaker Brand PLA" + ], + "name": "DeltaMaker Brand PLA", + "filament_type": "PLA", + "filament_vendor": "DeltaMaker" + }, + "OFRyOsZj": { + "filaments": [ + "re3D/re3D PLA" + ], + "name": "re3D PLA", + "filament_type": "PLA", + "filament_vendor": "re3D" + }, + "OFRzR5mi": { + "filaments": [ + "OrcaFilamentLibrary/eSUN ePLA-LW" + ], + "name": "eSUN ePLA-LW", + "filament_type": "PLA-AERO", + "filament_vendor": "eSUN" + }, + "OFS2tn6G": { + "filaments": [ + "BBL/Fiberon PA612-CF", + "OrcaFilamentLibrary/Fiberon PA612-CF" + ], + "name": "Fiberon PA612-CF", + "filament_type": "PA", + "filament_vendor": "Polymaker" + }, + "OFS4jbj3": { + "filaments": [ + "Eryone/Eryone PA" + ], + "name": "Eryone PA", + "filament_type": "PA", + "filament_vendor": "Eryone" + }, + "OFS8lTQt": { + "filaments": [ + "BBL/Panchroma PLA Silk", + "OrcaFilamentLibrary/Panchroma PLA Silk", + "Snapmaker/Panchroma PLA Silk" + ], + "name": "Panchroma PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFSDfduA": { + "filaments": [ + "Flashforge/Flashforge TPU 65D" + ], + "name": "Flashforge TPU 65D", + "filament_type": "TPU", + "filament_vendor": "Flashforge" + }, + "OFSa39yP": { + "filaments": [ + "Snapmaker/Snapmaker J1 PLA" + ], + "name": "Snapmaker J1 PLA", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFSbGfsz": { + "filaments": [ + "OrcaArena/Arena PLA Basic" + ], + "name": "Arena PLA Basic", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFSfm8iP": { + "filaments": [ + "BBL/BETA PLA Heat Color Change" + ], + "name": "BETA PLA Heat Color Change", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFSiCZP3": { + "filaments": [ + "BBL/BETA PETG-GF" + ], + "name": "BETA PETG-GF", + "filament_type": "PETG-CF", + "filament_vendor": "BETA" + }, + "OFSqIcJC": { + "filaments": [ + "Flashforge/Flashforge TPU 95A" + ], + "name": "Flashforge TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Flashforge" + }, + "OFSw6Mor": { + "filaments": [ + "BBL/addnorth PA Adura FDA" + ], + "name": "addnorth PA Adura FDA", + "filament_type": "PA", + "filament_vendor": "addnorth" + }, + "OFSwbBWS": { + "filaments": [], + "name": "DREMC PLA+", + "filament_type": "PLA", + "filament_vendor": "DREMC" + }, + "OFT2jon4": { + "filaments": [ + "Qidi/QIDI ABS Rapido" + ], + "name": "QIDI ABS Rapido", + "filament_type": "ABS", + "filament_vendor": "QIDI" + }, + "OFTGHyNC": { + "filaments": [ + "OrcaFilamentLibrary/Bambu PLA Impact" + ], + "name": "Bambu PLA Impact", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFTHDCqA": { + "filaments": [ + "BBL/Bambu PLA Pure" + ], + "name": "Bambu PLA Pure", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFTOPcx0": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints TPU Transition" + ], + "name": "Eolas Prints TPU Transition", + "filament_type": "TPU", + "filament_vendor": "Eolas Prints" + }, + "OFTRZ8Y4": { + "filaments": [ + "BBL/Bambu PETG-CF", + "OrcaFilamentLibrary/Bambu PETG-CF" + ], + "name": "Bambu PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Bambu Lab" + }, + "OFTSXxzE": { + "filaments": [ + "Flashforge/Flashforge PPS-CF" + ], + "name": "Flashforge PPS-CF", + "filament_type": "PPS-CF", + "filament_vendor": "Flashforge" + }, + "OFTXduCM": { + "filaments": [ + "Creality/eSUN ABS+" + ], + "name": "eSUN ABS+", + "filament_type": "ABS", + "filament_vendor": "eSUN" + }, + "OFTcE0nA": { + "filaments": [ + "OrcaFilamentLibrary/eSUN PLA-Basic" + ], + "name": "eSUN PLA-Basic", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OFTdauIq": { + "filaments": [ + "Volumic/Volumic PCTG Ultra (Performance)" + ], + "name": "Volumic PCTG Ultra (Performance)", + "filament_type": "PETG", + "filament_vendor": "Volumic" + }, + "OFTkj6DR": { + "filaments": [ + "Anycubic/Anycubic PVA" + ], + "name": "Anycubic PVA", + "filament_type": "PVA", + "filament_vendor": "Anycubic" + }, + "OFTlRzpe": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Gris Pizarra" + ], + "name": "FilAr PLA Gris Pizarra", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFTnWzBs": { + "filaments": [ + "Creality/Hyper PLA-CF" + ], + "name": "Hyper PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Creality" + }, + "OFTs8peJ": { + "filaments": [ + "Snapmaker/Snapmaker Dual TPE" + ], + "name": "Snapmaker Dual TPE", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFTsHNQi": { + "filaments": [ + "Qidi/QIDI ASA" + ], + "name": "QIDI ASA", + "filament_type": "ASA", + "filament_vendor": "QIDI" + }, + "OFU1zPxE": { + "filaments": [ + "Elegoo/Elegoo PLA Galaxy", + "OrcaFilamentLibrary/Elegoo PLA Galaxy" + ], + "name": "Elegoo PLA Galaxy", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFU3QXL7": { + "filaments": [ + "re3D/re3D PC" + ], + "name": "re3D PC", + "filament_type": "PC", + "filament_vendor": "re3D" + }, + "OFU5JPDy": { + "filaments": [ + "BBL/addnorth PETG PRO Matte" + ], + "name": "addnorth PETG PRO Matte", + "filament_type": "PETG", + "filament_vendor": "addnorth" + }, + "OFU7CKZt": { + "filaments": [ + "Volumic/Volumic ASA Ultra (Performance)" + ], + "name": "Volumic ASA Ultra (Performance)", + "filament_type": "ASA", + "filament_vendor": "Volumic" + }, + "OFUF7oA4": { + "filaments": [ + "Creality/Hyper PC" + ], + "name": "Hyper PC", + "filament_type": "PC", + "filament_vendor": "Creality" + }, + "OFUH1aee": { + "filaments": [ + "Volumic/Volumic FLEX93 Ultra (Performance)" + ], + "name": "Volumic FLEX93 Ultra (Performance)", + "filament_type": "TPU", + "filament_vendor": "Volumic" + }, + "OFUIfGoh": { + "filaments": [ + "Snapmaker/Snapmaker Dual PET" + ], + "name": "Snapmaker Dual PET", + "filament_type": "PET", + "filament_vendor": "Snapmaker" + }, + "OFUYCqtB": { + "filaments": [ + "InfiMech/InfiMech PLA" + ], + "name": "InfiMech PLA", + "filament_type": "PLA", + "filament_vendor": "InfiMech" + }, + "OFUaHEO9": { + "filaments": [ + "Anycubic/Anycubic PEBA 95A" + ], + "name": "Anycubic PEBA 95A", + "filament_type": "PEBA", + "filament_vendor": "Anycubic" + }, + "OFUanySo": { + "filaments": [ + "BBL/Bambu PLA Silk+", + "OrcaFilamentLibrary/Bambu PLA Silk+" + ], + "name": "Bambu PLA Silk+", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFUmS5z5": { + "filaments": [ + "Creality/eSUN ASA+" + ], + "name": "eSUN ASA+", + "filament_type": "ASA", + "filament_vendor": "eSUN" + }, + "OFUtiVRn": { + "filaments": [ + "BBL/addnorth PETG ESD" + ], + "name": "addnorth PETG ESD", + "filament_type": "PETG", + "filament_vendor": "addnorth" + }, + "OFUyDDNv": { + "filaments": [ + "Elegoo/Elegoo PC", + "OrcaFilamentLibrary/Elegoo PC" + ], + "name": "Elegoo PC", + "filament_type": "PC", + "filament_vendor": "Elegoo" + }, + "OFV5Q7j2": { + "filaments": [ + "Snapmaker/Snapmaker J1 TPE" + ], + "name": "Snapmaker J1 TPE", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFV5c8hG": { + "filaments": [ + "Flashforge/Flashforge PLA Sparkle" + ], + "name": "Flashforge PLA Sparkle", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFV5wEMe": { + "filaments": [ + "Afinia/Afinia ABS" + ], + "name": "Afinia ABS", + "filament_type": "ABS", + "filament_vendor": "Afinia" + }, + "OFV8Mxqx": { + "filaments": [], + "name": "Flashforge PLA-SILK", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFVBlUFH": { + "filaments": [], + "name": "DREMC PETG", + "filament_type": "PETG", + "filament_vendor": "DREMC" + }, + "OFVCkX5w": { + "filaments": [ + "BBL/Bambu TPU 95A", + "OrcaFilamentLibrary/Bambu TPU 95A" + ], + "name": "Bambu TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Bambu Lab" + }, + "OFVDWuxl": { + "filaments": [ + "BBL/addnorth PLA HT-PLA PRO Matte" + ], + "name": "addnorth PLA HT-PLA PRO Matte", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFVHMFJX": { + "filaments": [ + "Qidi/QIDI PETG Tough 0.2 nozzle" + ], + "name": "QIDI PETG Tough 0.2 nozzle", + "filament_type": "PETG", + "filament_vendor": "QIDI" + }, + "OFVptRxp": { + "filaments": [ + "BBL/COEX TPE 30D", + "OrcaFilamentLibrary/COEX TPE 30D" + ], + "name": "COEX TPE 30D", + "filament_type": "TPU", + "filament_vendor": "COEX 3D" + }, + "OFVtIasg": { + "filaments": [ + "Eryone/Eryone ASA" + ], + "name": "Eryone ASA", + "filament_type": "ASA", + "filament_vendor": "Eryone" + }, + "OFW29a9R": { + "filaments": [ + "BBL/PolyTerra PLA", + "OrcaArena/PolyTerra PLA", + "OrcaFilamentLibrary/PolyTerra PLA", + "Snapmaker/PolyTerra PLA" + ], + "name": "PolyTerra PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFW5FqkL": { + "filaments": [ + "Qidi/QIDI PLA Rapido Silk" + ], + "name": "QIDI PLA Rapido Silk", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OFW8M3CY": { + "filaments": [ + "BBL/BETA PLA Chameleon" + ], + "name": "BETA PLA Chameleon", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFW8lqnb": { + "filaments": [ + "Snapmaker/Snapmaker PETG Translucent" + ], + "name": "Snapmaker PETG Translucent", + "filament_type": "PETG", + "filament_vendor": "Snapmaker" + }, + "OFWDe7YH": { + "filaments": [ + "Qidi/QIDI UltraPA" + ], + "name": "QIDI UltraPA", + "filament_type": "UltraPA", + "filament_vendor": "QIDI" + }, + "OFWK0Y9A": { + "filaments": [ + "BBL/addnorth PA Adura" + ], + "name": "addnorth PA Adura", + "filament_type": "PA", + "filament_vendor": "addnorth" + }, + "OFWRITFw": { + "filaments": [ + "Prusa/Prusament rPLA" + ], + "name": "Prusament rPLA", + "filament_type": "PLA", + "filament_vendor": "Prusa Polymers" + }, + "OFWTAEjH": { + "filaments": [ + "Snapmaker/Snapmaker TPE" + ], + "name": "Snapmaker TPE", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFWTRJ1K": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Bronce" + ], + "name": "FilAr PLA Bronce", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFWXCbVF": { + "filaments": [ + "Flashforge/Flashforge PC" + ], + "name": "Flashforge PC", + "filament_type": "PC", + "filament_vendor": "Flashforge" + }, + "OFWYtgCa": { + "filaments": [ + "Elegoo/Elegoo PLA Wood", + "OrcaFilamentLibrary/Elegoo PLA Wood" + ], + "name": "Elegoo PLA Wood", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFWa0NiB": { + "filaments": [ + "Volumic/Volumic NYLON Ultra" + ], + "name": "Volumic NYLON Ultra", + "filament_type": "PA", + "filament_vendor": "Volumic" + }, + "OFWao3Ic": { + "filaments": [ + "Creality/Ender-PLA" + ], + "name": "Ender-PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFWbdGsC": { + "filaments": [ + "Anker/Generic PLA-CF", + "Anycubic/Generic PLA-CF", + "Artillery/Generic PLA-CF", + "BBL/Generic PLA-CF", + "Blocks/Generic PLA-CF", + "Creality/Generic PLA-CF", + "Custom/Generic PLA-CF", + "FLSun/Generic PLA-CF", + "Flashforge/Generic PLA-CF", + "OrcaArena/Generic PLA-CF", + "OrcaFilamentLibrary/Generic PLA-CF", + "Prusa/Generic PLA-CF", + "Qidi/Generic PLA-CF", + "Ratrig/Generic PLA-CF", + "SecKit/Generic PLA-CF", + "Tiertime/Generic PLA-CF", + "Vzbot/Generic PLA-CF" + ], + "name": "Generic PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Generic" + }, + "OFWgFOjn": { + "filaments": [ + "Snapmaker/Snapmaker PLA Silk" + ], + "name": "Snapmaker PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFWwF7K7": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Cafe con Leche" + ], + "name": "FilAr PLA Cafe con Leche", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFX0etlv": { + "filaments": [ + "re3D/re3D PETG" + ], + "name": "re3D PETG", + "filament_type": "PETG", + "filament_vendor": "re3D" + }, + "OFX0ycRQ": { + "filaments": [ + "BBL/Fiberon PA12-CF", + "OrcaFilamentLibrary/Fiberon PA12-CF" + ], + "name": "Fiberon PA12-CF", + "filament_type": "PA-CF", + "filament_vendor": "Polymaker" + }, + "OFX2zcrM": { + "filaments": [ + "Chuanying/Generic PLA-CF10", + "Flashforge/Generic PLA-CF10" + ], + "name": "Generic PLA-CF10", + "filament_type": "PLA-CF", + "filament_vendor": "Generic" + }, + "OFXCBZTA": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints ABS" + ], + "name": "Eolas Prints ABS", + "filament_type": "ABS", + "filament_vendor": "Eolas Prints" + }, + "OFXIbw5D": { + "filaments": [ + "BBL/Bambu PLA Matte", + "OrcaFilamentLibrary/Bambu PLA Matte" + ], + "name": "Bambu PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFXJ9iom": { + "filaments": [ + "iQ/Grauts HPP4GF25 P1" + ], + "name": "Grauts HPP4GF25 P1", + "filament_type": "HPP4GF25", + "filament_vendor": "iQ Materials" + }, + "OFXSvqOX": { + "filaments": [ + "Snapmaker/Snapmaker TPU 95A HF" + ], + "name": "Snapmaker TPU 95A HF", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFXTPuqV": { + "filaments": [ + "OrcaFilamentLibrary/Elas PETG Basic" + ], + "name": "Elas PETG Basic", + "filament_type": "PETG", + "filament_vendor": "Elas" + }, + "OFXW4CDh": { + "filaments": [ + "Ratrig/Generic PCTG BigNozzle" + ], + "name": "Generic PCTG BigNozzle", + "filament_type": "PCTG", + "filament_vendor": "Generic" + }, + "OFXi59OX": { + "filaments": [ + "Afinia/Afinia Value ABS" + ], + "name": "Afinia Value ABS", + "filament_type": "ABS", + "filament_vendor": "Afinia" + }, + "OFXiArjA": { + "filaments": [ + "Flashforge/Flashforge PETG Pro" + ], + "name": "Flashforge PETG Pro", + "filament_type": "PETG", + "filament_vendor": "Flashforge" + }, + "OFXk1emJ": { + "filaments": [ + "Artillery/Artillery PLA Basic" + ], + "name": "Artillery PLA Basic", + "filament_type": "PLA Basic", + "filament_vendor": "Artillery" + }, + "OFXkm8q1": { + "filaments": [ + "BBL/Generic PP-CF", + "Creality/Generic PP-CF", + "OrcaFilamentLibrary/Generic PP-CF", + "Tiertime/Generic PP-CF" + ], + "name": "Generic PP-CF", + "filament_type": "PP-CF", + "filament_vendor": "Generic" + }, + "OFXmv5p0": { + "filaments": [ + "Creality/Generic Speed PLA" + ], + "name": "Generic Speed PLA", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFXn3Vd9": { + "filaments": [ + "Qidi/QIDI Support For PAHT" + ], + "name": "QIDI Support For PAHT", + "filament_type": "PAHT-S", + "filament_vendor": "QIDI" + }, + "OFXnToSX": { + "filaments": [ + "Creality/Hyper Stardust" + ], + "name": "Hyper Stardust", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFXuGxvQ": { + "filaments": [ + "Volumic/Volumic PLA Ultra" + ], + "name": "Volumic PLA Ultra", + "filament_type": "PLA", + "filament_vendor": "Volumic" + }, + "OFXz7Mwx": { + "filaments": [ + "Elegoo/Elegoo PLA Silk", + "OrcaFilamentLibrary/Elegoo PLA Silk" + ], + "name": "Elegoo PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFXzQ4yL": { + "filaments": [ + "BBL/Bambu ASA-Aero", + "OrcaFilamentLibrary/Bambu ASA-Aero" + ], + "name": "Bambu ASA-Aero", + "filament_type": "ASA-AERO", + "filament_vendor": "Bambu Lab" + }, + "OFY0F5qA": { + "filaments": [ + "Volumic/Volumic PETG Ultra carbone (Performance)" + ], + "name": "Volumic PETG Ultra carbone (Performance)", + "filament_type": "PETG", + "filament_vendor": "Volumic" + }, + "OFY3AB7j": { + "filaments": [ + "Snapmaker/Snapmaker J1 PLA Matte" + ], + "name": "Snapmaker J1 PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFY7jxcS": { + "filaments": [ + "Snapmaker/Snapmaker TPU 90A" + ], + "name": "Snapmaker TPU 90A", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFY9muEs": { + "filaments": [ + "Anker/Generic ABS", + "Anycubic/Generic ABS", + "Artillery/Generic ABS", + "BBL/Generic ABS", + "Blocks/Generic ABS", + "Chuanying/Generic ABS", + "Co Print/Generic ABS", + "CoLiDo/Generic ABS", + "Comgrow/Generic ABS", + "Creality/Generic ABS", + "Custom/Generic ABS", + "Elegoo/Generic ABS", + "FLSun/Generic ABS", + "Flashforge/Generic ABS", + "FlyingBear/Generic ABS", + "InfiMech/Generic ABS", + "Lulzbot/Generic ABS", + "OrcaArena/Generic ABS", + "OrcaFilamentLibrary/Generic ABS", + "Peopoly/Generic ABS", + "Prusa/Generic ABS", + "Qidi/Generic ABS", + "RH3D/Generic ABS", + "Ratrig/Generic ABS", + "SecKit/Generic ABS", + "Sovol/Generic ABS", + "Tiertime/Generic ABS", + "Vzbot/Generic ABS", + "Z-Bolt/Generic ABS" + ], + "name": "Generic ABS", + "filament_type": "ABS", + "filament_vendor": "Generic" + }, + "OFYE7YZw": { + "filaments": [ + "Qidi/Tinmorry PETG-ECO" + ], + "name": "Tinmorry PETG-ECO", + "filament_type": "PETG", + "filament_vendor": "Tinmorry" + }, + "OFYEtXuk": { + "filaments": [ + "Snapmaker/Snapmaker J1 PA-CF" + ], + "name": "Snapmaker J1 PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Snapmaker" + }, + "OFYGbPHX": { + "filaments": [ + "OrcaFilamentLibrary/PolyLite Dual PLA", + "Snapmaker/PolyLite Dual PLA" + ], + "name": "PolyLite Dual PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFYGrfHY": { + "filaments": [ + "BBL/BETA PETG Fluorescence" + ], + "name": "BETA PETG Fluorescence", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFYPdQJh": { + "filaments": [ + "Anker/Generic PETG", + "Anycubic/Generic PETG", + "Artillery/Generic PETG", + "BBL/Generic PETG", + "Blocks/Generic PETG", + "CONSTRUCT3D/Generic PETG", + "Chuanying/Generic PETG", + "Co Print/Generic PETG", + "CoLiDo/Generic PETG", + "Comgrow/Generic PETG", + "Creality/Generic PETG", + "Custom/Generic PETG", + "DeltaMaker/Generic PETG", + "Elegoo/Generic PETG", + "FLSun/Generic PETG", + "Flashforge/Generic PETG", + "FlyingBear/Generic PETG", + "Ginger Additive/Generic PETG", + "InfiMech/Generic PETG", + "LONGER/Generic PETG", + "Lulzbot/Generic PETG", + "OrcaArena/Generic PETG", + "OrcaFilamentLibrary/Generic PETG", + "Peopoly/Generic PETG", + "Prusa/Generic PETG", + "Qidi/Generic PETG", + "RH3D/Generic PETG", + "Ratrig/Generic PETG", + "SecKit/Generic PETG", + "Sovol/Generic PETG", + "Tiertime/Generic PETG", + "Vzbot/Generic PETG", + "Z-Bolt/Generic PETG" + ], + "name": "Generic PETG", + "filament_type": "PETG", + "filament_vendor": "Generic" + }, + "OFYTIMbj": { + "filaments": [ + "Flashforge/Flashforge ABS-CF" + ], + "name": "Flashforge ABS-CF", + "filament_type": "ABS-CF", + "filament_vendor": "Flashforge" + }, + "OFYYeMyQ": { + "filaments": [ + "Flashforge/Flashforge PETG Basic" + ], + "name": "Flashforge PETG Basic", + "filament_type": "PETG", + "filament_vendor": "Flashforge" + }, + "OFYd5uS3": { + "filaments": [], + "name": "DREMC TPU 95A", + "filament_type": "TPU", + "filament_vendor": "DREMC" + }, + "OFYezc6s": { + "filaments": [ + "FlyingBear/FlyingBear TPU" + ], + "name": "FlyingBear TPU", + "filament_type": "TPU", + "filament_vendor": "FlyingBear" + }, + "OFYuowge": { + "filaments": [ + "FlyingBear/Other ABS", + "InfiMech/Other ABS" + ], + "name": "Other ABS", + "filament_type": "ABS", + "filament_vendor": "Other" + }, + "OFZ0mR5b": { + "filaments": [ + "Anycubic/Anycubic PLA-CF" + ], + "name": "Anycubic PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Anycubic" + }, + "OFZ2LuAi": { + "filaments": [ + "Wanhao France/YUMI PLA Bowden" + ], + "name": "YUMI PLA Bowden", + "filament_type": "PLA", + "filament_vendor": "Yumi" + }, + "OFZ3K2cL": { + "filaments": [ + "Qidi/QIDI PA6-CF" + ], + "name": "QIDI PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "QIDI" + }, + "OFZ4QbfK": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Rosa Flamenco" + ], + "name": "FilAr PLA Rosa Flamenco", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFZGrQTU": { + "filaments": [ + "BBL/addnorth PETG Economy" + ], + "name": "addnorth PETG Economy", + "filament_type": "PETG", + "filament_vendor": "addnorth" + }, + "OFZJft47": { + "filaments": [ + "BBL/addnorth PLA Economy" + ], + "name": "addnorth PLA Economy", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFZLtWYs": { + "filaments": [ + "Qidi/QIDI ABS-GF25" + ], + "name": "QIDI ABS-GF25", + "filament_type": "ABS-GF", + "filament_vendor": "QIDI" + }, + "OFZOuWrO": { + "filaments": [ + "Qidi/QIDI PPS-CF" + ], + "name": "QIDI PPS-CF", + "filament_type": "PPS-CF", + "filament_vendor": "QIDI" + }, + "OFZivHGL": { + "filaments": [ + "Snapmaker/Snapmaker Dual PLA" + ], + "name": "Snapmaker Dual PLA", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFZqZMuv": { + "filaments": [ + "BBL/BETA ASA" + ], + "name": "BETA ASA", + "filament_type": "ASA", + "filament_vendor": "BETA" + }, + "OFZr862X": { + "filaments": [ + "Creality/Generic PLA HF", + "Prusa/Generic PLA HF" + ], + "name": "Generic PLA HF", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFZtOQtl": { + "filaments": [ + "Flashforge/Flashforge PA6-CF" + ], + "name": "Flashforge PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "Flashforge" + }, + "OFZtkHRq": { + "filaments": [ + "Anycubic/Anycubic PC" + ], + "name": "Anycubic PC", + "filament_type": "PC", + "filament_vendor": "Anycubic" + }, + "OFaDOaNt": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Celeste Cielo" + ], + "name": "FilAr PLA Celeste Cielo", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFaDsTE0": { + "filaments": [ + "Flashforge/Polymaker S1" + ], + "name": "Polymaker S1", + "filament_type": "PA", + "filament_vendor": "Polymaker" + }, + "OFaEesXQ": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Rojo de Carreras" + ], + "name": "FilAr PLA Rojo de Carreras", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFaEuvNF": { + "filaments": [ + "Anycubic/Anycubic PAHT-CF" + ], + "name": "Anycubic PAHT-CF", + "filament_type": "PAHT-CF", + "filament_vendor": "Anycubic" + }, + "OFaHjk1V": { + "filaments": [ + "Volumic/Volumic PC" + ], + "name": "Volumic PC", + "filament_type": "PC", + "filament_vendor": "Volumic" + }, + "OFaP2SsH": { + "filaments": [ + "LH/LHS ASA" + ], + "name": "LHS ASA", + "filament_type": "ASA", + "filament_vendor": "LH Stinger" + }, + "OFaQMgRH": { + "filaments": [ + "BBL/Bambu PLA Tough", + "OrcaFilamentLibrary/Bambu PLA Tough" + ], + "name": "Bambu PLA Tough", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFaRjiIm": { + "filaments": [ + "SeeMeCNC/SeeMeCNC PETG-CF" + ], + "name": "SeeMeCNC PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "SeeMeCNC" + }, + "OFaYz8iE": { + "filaments": [ + "OrcaFilamentLibrary/Elas PLA Pro" + ], + "name": "Elas PLA Pro", + "filament_type": "PLA", + "filament_vendor": "Elas" + }, + "OFaaddbQ": { + "filaments": [ + "Flashforge/Flashforge PVA" + ], + "name": "Flashforge PVA", + "filament_type": "PVA", + "filament_vendor": "Flashforge" + }, + "OFaeIx7W": { + "filaments": [ + "iQ/Polymaker PETG Polymax black P1" + ], + "name": "Polymaker PETG Polymax black P1", + "filament_type": "PETG Polymax", + "filament_vendor": "iQ Materials" + }, + "OFafO6VM": { + "filaments": [ + "Elegoo/Generic PC-CF" + ], + "name": "Generic PC-CF", + "filament_type": "PC-CF", + "filament_vendor": "Generic" + }, + "OFafocjw": { + "filaments": [ + "Cubicon/Cubicon ABS" + ], + "name": "Cubicon ABS", + "filament_type": "ABS", + "filament_vendor": "Cubicon" + }, + "OFausr3F": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Rosa" + ], + "name": "FilAr PLA-mate Rosa", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFb5EEM3": { + "filaments": [ + "Artillery/Artillery PET" + ], + "name": "Artillery PET", + "filament_type": "PET", + "filament_vendor": "Artillery" + }, + "OFbP8zEO": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA Silk" + ], + "name": "Eolas Prints PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFbPuPKY": { + "filaments": [ + "Prusa/Generic FLEX" + ], + "name": "Generic FLEX", + "filament_type": "FLEX", + "filament_vendor": "Generic" + }, + "OFbSChKb": { + "filaments": [ + "SeeMeCNC/SeeMeCNC PLA" + ], + "name": "SeeMeCNC PLA", + "filament_type": "PLA", + "filament_vendor": "SeeMeCNC" + }, + "OFbSZBOi": { + "filaments": [ + "InfiMech/InfiMech TPU Basic" + ], + "name": "InfiMech TPU Basic", + "filament_type": "TPU", + "filament_vendor": "InfiMech" + }, + "OFbh7HcA": { + "filaments": [ + "Eryone/Eryone PP-CF" + ], + "name": "Eryone PP-CF", + "filament_type": "PP-CF", + "filament_vendor": "Eryone" + }, + "OFc3xdm9": { + "filaments": [ + "BBL/Overture PLA", + "OrcaFilamentLibrary/Overture PLA", + "Qidi/Overture PLA" + ], + "name": "Overture PLA", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OFc87pL3": { + "filaments": [ + "OrcaArena/Arena PET-CF" + ], + "name": "Arena PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Orca Arena" + }, + "OFcBJQcC": { + "filaments": [ + "Snapmaker/Snapmaker Dual TPU High-Flow" + ], + "name": "Snapmaker Dual TPU High-Flow", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFcBl0nJ": { + "filaments": [ + "BBL/Fiberon PA612-CF15" + ], + "name": "Fiberon PA612-CF15", + "filament_type": "PA-CF", + "filament_vendor": "Polymaker" + }, + "OFcJDtTx": { + "filaments": [ + "Artillery/Artillery TPU" + ], + "name": "Artillery TPU", + "filament_type": "TPU", + "filament_vendor": "Artillery" + }, + "OFcKtw8W": { + "filaments": [ + "Volumic/PA6 CF20 (Performance)" + ], + "name": "PA6 CF20 (Performance)", + "filament_type": "PA6-CF", + "filament_vendor": "Volumic" + }, + "OFcVLpNA": { + "filaments": [ + "Flashforge/FusRock PAHT-GF" + ], + "name": "FusRock PAHT-GF", + "filament_type": "PAHT-GF", + "filament_vendor": "FusRock" + }, + "OFcfQk4h": { + "filaments": [ + "BBL/Overture Air PLA", + "OrcaFilamentLibrary/Overture Air PLA" + ], + "name": "Overture Air PLA", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OFcnWTJB": { + "filaments": [ + "BBL/BETA PLA Glitter" + ], + "name": "BETA PLA Glitter", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFcogyWl": { + "filaments": [ + "WonderMaker/WonderMaker PLA Metal" + ], + "name": "WonderMaker PLA Metal", + "filament_type": "PLA", + "filament_vendor": "WonderMaker" + }, + "OFcpa50Z": { + "filaments": [ + "BBL/addnorth PLA-CF Carbon Fiber" + ], + "name": "addnorth PLA-CF Carbon Fiber", + "filament_type": "PLA-CF", + "filament_vendor": "addnorth" + }, + "OFctg8r1": { + "filaments": [ + "CoLiDo/CoLiDo PLA+" + ], + "name": "CoLiDo PLA+", + "filament_type": "PLA", + "filament_vendor": "CoLiDo" + }, + "OFcvKkrs": { + "filaments": [ + "BBL/Overture TPU", + "OrcaFilamentLibrary/Overture TPU" + ], + "name": "Overture TPU", + "filament_type": "TPU", + "filament_vendor": "Overture" + }, + "OFcytyoA": { + "filaments": [ + "BBL/Fiberon PETG-ESD", + "OrcaFilamentLibrary/Fiberon PETG-ESD", + "Snapmaker/Fiberon PETG-ESD" + ], + "name": "Fiberon PETG-ESD", + "filament_type": "PETG", + "filament_vendor": "Polymaker" + }, + "OFd0Fv0k": { + "filaments": [ + "BBL/Generic PE-CF", + "OrcaFilamentLibrary/Generic PE-CF", + "Tiertime/Generic PE-CF" + ], + "name": "Generic PE-CF", + "filament_type": "PE-CF", + "filament_vendor": "Generic" + }, + "OFd2vX0G": { + "filaments": [ + "BBL/COEX PLA PRIME", + "OrcaFilamentLibrary/COEX PLA PRIME" + ], + "name": "COEX PLA PRIME", + "filament_type": "PLA", + "filament_vendor": "COEX 3D" + }, + "OFd4zw5l": { + "filaments": [ + "BBL/AliZ PA-CF", + "OrcaFilamentLibrary/AliZ PA-CF" + ], + "name": "AliZ PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Aliz" + }, + "OFdD5Wbu": { + "filaments": [ + "Snapmaker/Snapmaker J1 PLA-CF" + ], + "name": "Snapmaker J1 PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Snapmaker" + }, + "OFdI4zMo": { + "filaments": [], + "name": "DREMC ASA CF", + "filament_type": "ASA", + "filament_vendor": "DREMC" + }, + "OFdXVjGZ": { + "filaments": [ + "Tiertime/Tiertime PC" + ], + "name": "Tiertime PC", + "filament_type": "PC", + "filament_vendor": "Tiertime" + }, + "OFdb8YNz": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Verde Manzana" + ], + "name": "FilAr PLA Verde Manzana", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFdd8ZqJ": { + "filaments": [ + "Snapmaker/Snapmaker PLA Wood" + ], + "name": "Snapmaker PLA Wood", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFdkWDiy": { + "filaments": [ + "Cubicon/Cubicon PLAi21" + ], + "name": "Cubicon PLAi21", + "filament_type": "PLA", + "filament_vendor": "Cubicon" + }, + "OFdqkWtz": { + "filaments": [ + "Flashforge/Flashforge PLA Luminous" + ], + "name": "Flashforge PLA Luminous", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFdrYBmI": { + "filaments": [ + "Tiertime/Tiertime ASA" + ], + "name": "Tiertime ASA", + "filament_type": "ASA", + "filament_vendor": "Tiertime" + }, + "OFdtPd9h": { + "filaments": [ + "Qidi/QIDI PETG-GF" + ], + "name": "QIDI PETG-GF", + "filament_type": "PETG-GF", + "filament_vendor": "QIDI" + }, + "OFdzlrhi": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Chocolate" + ], + "name": "FilAr PLA-mate Chocolate", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFe61n6v": { + "filaments": [ + "Ratrig/RatRig PunkFil PETG CF" + ], + "name": "RatRig PunkFil PETG CF", + "filament_type": "PETG-CF10", + "filament_vendor": "RatRig" + }, + "OFe8tuNb": { + "filaments": [ + "Tiertime/Tiertime PA6-CF" + ], + "name": "Tiertime PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "Tiertime" + }, + "OFe8yBMG": { + "filaments": [ + "Qidi/QIDI PETG Tough 0.6 nozzle" + ], + "name": "QIDI PETG Tough 0.6 nozzle", + "filament_type": "PETG", + "filament_vendor": "QIDI" + }, + "OFe98A1y": { + "filaments": [ + "Elegoo/Elegoo PET-CF", + "OrcaFilamentLibrary/Elegoo PET-CF" + ], + "name": "Elegoo PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Elegoo" + }, + "OFeAxvEt": { + "filaments": [ + "Snapmaker/Snapmaker Dual ABS Benchy" + ], + "name": "Snapmaker Dual ABS Benchy", + "filament_type": "ABS", + "filament_vendor": "Snapmaker" + }, + "OFeCJqxx": { + "filaments": [ + "Qidi/QIDI ABS Rapido Metal" + ], + "name": "QIDI ABS Rapido Metal", + "filament_type": "ABS", + "filament_vendor": "QIDI" + }, + "OFeF4UNh": { + "filaments": [ + "BBL/BETA PLA Silk" + ], + "name": "BETA PLA Silk", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFeIyhUx": { + "filaments": [ + "Anycubic/Anycubic PC-CF" + ], + "name": "Anycubic PC-CF", + "filament_type": "PC-CF", + "filament_vendor": "Anycubic" + }, + "OFeTATC7": { + "filaments": [ + "Snapmaker/Snapmaker J1 Breakaway" + ], + "name": "Snapmaker J1 Breakaway", + "filament_type": "Breakaway Support", + "filament_vendor": "Snapmaker" + }, + "OFeVzkSU": { + "filaments": [ + "Snapmaker/Fiberon PPS-GF20" + ], + "name": "Fiberon PPS-GF20", + "filament_type": "ABS", + "filament_vendor": "Polymaker" + }, + "OFeelsSM": { + "filaments": [ + "Qidi/HATCHBOX PLA" + ], + "name": "HATCHBOX PLA", + "filament_type": "PLA", + "filament_vendor": "HATCHBOX" + }, + "OFelDBgv": { + "filaments": [ + "Snapmaker/Polymaker PLA" + ], + "name": "Polymaker PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFepU7Tl": { + "filaments": [ + "WonderMaker/WonderMaker PLA Matte" + ], + "name": "WonderMaker PLA Matte", + "filament_type": "PLA", + "filament_vendor": "WonderMaker" + }, + "OFesA6rF": { + "filaments": [ + "Anker/Generic PLA Silk", + "BBL/Generic PLA Silk", + "Creality/Generic PLA Silk", + "FLSun/Generic PLA Silk", + "Flashforge/Generic PLA Silk", + "OrcaArena/Generic PLA Silk", + "OrcaFilamentLibrary/Generic PLA Silk", + "Prusa/Generic PLA Silk", + "Qidi/Generic PLA Silk", + "Sovol/Generic PLA Silk", + "Tiertime/Generic PLA Silk" + ], + "name": "Generic PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFexaZU2": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Manteca" + ], + "name": "FilAr PLA Manteca", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFf0MkD5": { + "filaments": [ + "Qidi/QIDI PETG Translucent" + ], + "name": "QIDI PETG Translucent", + "filament_type": "PETG", + "filament_vendor": "QIDI" + }, + "OFf52D4e": { + "filaments": [ + "Snapmaker/Snapmaker PLA-CF" + ], + "name": "Snapmaker PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Snapmaker" + }, + "OFf5awy4": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA Matte" + ], + "name": "Eolas Prints PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFf6ZEvu": { + "filaments": [ + "InfiMech/InfiMech PC" + ], + "name": "InfiMech PC", + "filament_type": "PC", + "filament_vendor": "InfiMech" + }, + "OFf6mfQO": { + "filaments": [ + "BBL/Bambu Support for ABS", + "OrcaFilamentLibrary/Bambu Support for ABS" + ], + "name": "Bambu Support for ABS", + "filament_type": "ABS", + "filament_vendor": "Bambu Lab" + }, + "OFf6ynfH": { + "filaments": [ + "FlyingBear/FlyingBear PETG Basic" + ], + "name": "FlyingBear PETG Basic", + "filament_type": "PETG Basic", + "filament_vendor": "FlyingBear" + }, + "OFfBpSRI": { + "filaments": [ + "BBL/Bambu ASA", + "OrcaFilamentLibrary/Bambu ASA" + ], + "name": "Bambu ASA", + "filament_type": "ASA", + "filament_vendor": "Bambu Lab" + }, + "OFfD87Gy": { + "filaments": [ + "Snapmaker/Snapmaker PLA Glow" + ], + "name": "Snapmaker PLA Glow", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFfHGM1D": { + "filaments": [ + "re3D/re3D rPP" + ], + "name": "re3D rPP", + "filament_type": "PP", + "filament_vendor": "re3D" + }, + "OFfJSCzm": { + "filaments": [ + "OrcaFilamentLibrary/FDplast PETG" + ], + "name": "FDplast PETG", + "filament_type": "PETG", + "filament_vendor": "FDplast" + }, + "OFfSqS4R": { + "filaments": [ + "Creality/ENDER FAST PLA" + ], + "name": "ENDER FAST PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFfYHK5z": { + "filaments": [ + "Qidi/Polymaker PLA-HT" + ], + "name": "Polymaker PLA-HT", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFfZcoKr": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Piel" + ], + "name": "FilAr PLA-mate Piel", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFfb10SK": { + "filaments": [ + "Artillery/Artillery PC" + ], + "name": "Artillery PC", + "filament_type": "PC", + "filament_vendor": "Artillery" + }, + "OFfmHUkQ": { + "filaments": [ + "Snapmaker/Snapmaker Dual Breakaway" + ], + "name": "Snapmaker Dual Breakaway", + "filament_type": "Breakaway Support", + "filament_vendor": "Snapmaker" + }, + "OFfmZrI3": { + "filaments": [ + "OrcaFilamentLibrary/FDplast TPU" + ], + "name": "FDplast TPU", + "filament_type": "TPU", + "filament_vendor": "FDplast" + }, + "OFfnXFie": { + "filaments": [ + "BBL/COEX TPE 40D", + "OrcaFilamentLibrary/COEX TPE 40D" + ], + "name": "COEX TPE 40D", + "filament_type": "TPU", + "filament_vendor": "COEX 3D" + }, + "OFfq5YXA": { + "filaments": [ + "OrcaFilamentLibrary/Valment PLA-CF" + ], + "name": "Valment PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Valment" + }, + "OFfr4XNO": { + "filaments": [ + "BBL/COEX TPE 60D", + "OrcaFilamentLibrary/COEX TPE 60D" + ], + "name": "COEX TPE 60D", + "filament_type": "TPU", + "filament_vendor": "COEX 3D" + }, + "OFfr6JDF": { + "filaments": [ + "Qidi/QIDI PETG Tough 0.8 nozzle" + ], + "name": "QIDI PETG Tough 0.8 nozzle", + "filament_type": "PETG", + "filament_vendor": "QIDI" + }, + "OFfuhviw": { + "filaments": [ + "Elegoo/Elegoo PLA Marble", + "OrcaFilamentLibrary/Elegoo PLA Marble" + ], + "name": "Elegoo PLA Marble", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFfuih8e": { + "filaments": [ + "Creality/Creality Silk PLA" + ], + "name": "Creality Silk PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFg3cWVt": { + "filaments": [ + "Snapmaker/Snapmaker Dual PLA Metal" + ], + "name": "Snapmaker Dual PLA Metal", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFg57Nmc": { + "filaments": [ + "BBL/Bambu PC FR", + "OrcaFilamentLibrary/Bambu PC FR" + ], + "name": "Bambu PC FR", + "filament_type": "PC", + "filament_vendor": "Bambu Lab" + }, + "OFg8hMzT": { + "filaments": [ + "OrcaFilamentLibrary/FILL3D PPCF" + ], + "name": "FILL3D PPCF", + "filament_type": "PP", + "filament_vendor": "FILL3D" + }, + "OFg8ndtj": { + "filaments": [ + "Anker/Generic PA", + "Anycubic/Generic PA", + "BBL/Generic PA", + "Blocks/Generic PA", + "Creality/Generic PA", + "Custom/Generic PA", + "Elegoo/Generic PA", + "FLSun/Generic PA", + "OrcaArena/Generic PA", + "OrcaFilamentLibrary/Generic PA", + "Prusa/Generic PA", + "Qidi/Generic PA", + "Ratrig/Generic PA", + "SecKit/Generic PA", + "Tiertime/Generic PA", + "Vzbot/Generic PA", + "Z-Bolt/Generic PA" + ], + "name": "Generic PA", + "filament_type": "PA", + "filament_vendor": "Generic" + }, + "OFgHh8ly": { + "filaments": [ + "Afinia/Afinia Value PLA" + ], + "name": "Afinia Value PLA", + "filament_type": "PLA", + "filament_vendor": "Afinia" + }, + "OFgMWJ8T": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Negro Azabache" + ], + "name": "FilAr PLA Negro Azabache", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFgSbX7E": { + "filaments": [ + "Volumic/Volumic PC (Performance)" + ], + "name": "Volumic PC (Performance)", + "filament_type": "PC", + "filament_vendor": "Volumic" + }, + "OFgVQkqW": { + "filaments": [ + "Cubicon/Cubicon ABSk" + ], + "name": "Cubicon ABSk", + "filament_type": "ABS", + "filament_vendor": "Cubicon" + }, + "OFgXgt98": { + "filaments": [ + "Artillery/Artillery ABS" + ], + "name": "Artillery ABS", + "filament_type": "ABS", + "filament_vendor": "Artillery" + }, + "OFgbpcy9": { + "filaments": [ + "Anker/Generic TPU", + "Anycubic/Generic TPU", + "Artillery/Generic TPU", + "BBL/Generic TPU", + "Blocks/Generic TPU", + "Chuanying/Generic TPU", + "Co Print/Generic TPU", + "CoLiDo/Generic TPU", + "Creality/Generic TPU", + "Custom/Generic TPU", + "DeltaMaker/Generic TPU", + "FLSun/Generic TPU", + "Flashforge/Generic TPU", + "FlyingBear/Generic TPU", + "InfiMech/Generic TPU", + "OrcaArena/Generic TPU", + "OrcaFilamentLibrary/Generic TPU", + "Prusa/Generic TPU", + "Qidi/Generic TPU", + "RH3D/Generic TPU", + "Ratrig/Generic TPU", + "SecKit/Generic TPU", + "Sovol/Generic TPU", + "Tiertime/Generic TPU", + "Vzbot/Generic TPU" + ], + "name": "Generic TPU", + "filament_type": "TPU", + "filament_vendor": "Generic" + }, + "OFgdaBOt": { + "filaments": [ + "Snapmaker/Polymaker Tough PLA Family" + ], + "name": "Polymaker Tough PLA Family", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFgeM7nD": { + "filaments": [ + "Flashforge/Flashforge PA12-CF" + ], + "name": "Flashforge PA12-CF", + "filament_type": "PA-CF", + "filament_vendor": "Flashforge" + }, + "OFgjgN35": { + "filaments": [ + "Flashforge/Flashforge PLA Silk" + ], + "name": "Flashforge PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFglhKLM": { + "filaments": [ + "Qidi/QIDI PLA Rapido 0.8 nozzle" + ], + "name": "QIDI PLA Rapido 0.8 nozzle", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OFgpLTMR": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Gris Plata" + ], + "name": "FilAr PETG Gris Plata", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFgpQwkk": { + "filaments": [ + "Creality/CR-PLA Fluo" + ], + "name": "CR-PLA Fluo", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFgptDSf": { + "filaments": [ + "OrcaArena/Arena PLA Matte" + ], + "name": "Arena PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFgyPlwU": { + "filaments": [ + "Snapmaker/Snapmaker TPU High-Flow" + ], + "name": "Snapmaker TPU High-Flow", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFh7mvPO": { + "filaments": [ + "Prusa/Prusament PVB" + ], + "name": "Prusament PVB", + "filament_type": "PVB", + "filament_vendor": "Prusa Polymers" + }, + "OFh9u9c0": { + "filaments": [ + "Creality/Generic PA6-GF" + ], + "name": "Generic PA6-GF", + "filament_type": "PA-GF", + "filament_vendor": "Generic" + }, + "OFhASRWj": { + "filaments": [ + "BBL/Panchroma PLA Temp Shift", + "OrcaFilamentLibrary/Panchroma PLA Temp Shift", + "Snapmaker/Panchroma PLA Temp Shift" + ], + "name": "Panchroma PLA Temp Shift", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFhMO9Kh": { + "filaments": [ + "OrcaFilamentLibrary/GreenGate3D PETG" + ], + "name": "GreenGate3D PETG", + "filament_type": "PETG", + "filament_vendor": "GreenGate3D" + }, + "OFhN09f0": { + "filaments": [ + "BBL/addnorth PC BLend HT LCF" + ], + "name": "addnorth PC BLend HT LCF", + "filament_type": "PC", + "filament_vendor": "addnorth" + }, + "OFhO5aEJ": { + "filaments": [ + "Ratrig/RatRig PunkFil ABS" + ], + "name": "RatRig PunkFil ABS", + "filament_type": "ABS", + "filament_vendor": "RatRig" + }, + "OFhQf8ou": { + "filaments": [ + "Snapmaker/Snapmaker PLA-CF" + ], + "name": "Snapmaker PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Snapmaker" + }, + "OFhQfUQY": { + "filaments": [ + "BBL/Generic SBS", + "OrcaFilamentLibrary/Generic SBS", + "Tiertime/Generic SBS" + ], + "name": "Generic SBS", + "filament_type": "SBS", + "filament_vendor": "Generic" + }, + "OFhTPf6L": { + "filaments": [ + "Creality/Generic PA6-CF", + "Elegoo/Generic PA6-CF" + ], + "name": "Generic PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "Generic" + }, + "OFhUjPA5": { + "filaments": [ + "Eryone/Eryone TPU" + ], + "name": "Eryone TPU", + "filament_type": "TPU", + "filament_vendor": "Eryone" + }, + "OFhWc5Bv": { + "filaments": [ + "OrcaFilamentLibrary/NIT ABS" + ], + "name": "NIT ABS", + "filament_type": "ABS", + "filament_vendor": "NIT" + }, + "OFhWhL1i": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PETG" + ], + "name": "Eolas Prints PETG", + "filament_type": "PETG", + "filament_vendor": "Eolas Prints" + }, + "OFhWrAuP": { + "filaments": [ + "Qidi/QIDI PLA-CF" + ], + "name": "QIDI PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "QIDI" + }, + "OFhbolij": { + "filaments": [ + "Creality/eSUN PLA-Lite" + ], + "name": "eSUN PLA-Lite", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OFhcYzR8": { + "filaments": [ + "Elegoo/Elegoo PLA Sparkle", + "OrcaFilamentLibrary/Elegoo PLA Sparkle" + ], + "name": "Elegoo PLA Sparkle", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFhfd722": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints TPU Flex 93A" + ], + "name": "Eolas Prints TPU Flex 93A", + "filament_type": "TPU", + "filament_vendor": "Eolas Prints" + }, + "OFhiJE7Y": { + "filaments": [ + "Qidi/QIDI PEBA 95A" + ], + "name": "QIDI PEBA 95A", + "filament_type": "PEBA", + "filament_vendor": "QIDI" + }, + "OFhkN0a7": { + "filaments": [ + "Creality/Hyper PA612-CF" + ], + "name": "Hyper PA612-CF", + "filament_type": "PA-CF", + "filament_vendor": "Creality" + }, + "OFhlCNqq": { + "filaments": [ + "BBL/COEX PLA", + "OrcaFilamentLibrary/COEX PLA" + ], + "name": "COEX PLA", + "filament_type": "PLA", + "filament_vendor": "COEX 3D" + }, + "OFhmxnYw": { + "filaments": [ + "Snapmaker/Snapmaker PLA Basic" + ], + "name": "Snapmaker PLA Basic", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFhuaUQB": { + "filaments": [ + "BBL/Bambu ABS", + "OrcaFilamentLibrary/Bambu ABS", + "Qidi/Bambu ABS" + ], + "name": "Bambu ABS", + "filament_type": "ABS", + "filament_vendor": "Bambu Lab" + }, + "OFhwiZ50": { + "filaments": [ + "Qidi/QIDI PLA Rapido 0.2 nozzle" + ], + "name": "QIDI PLA Rapido 0.2 nozzle", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OFhx4uOG": { + "filaments": [ + "Qidi/QIDI PET-GF" + ], + "name": "QIDI PET-GF", + "filament_type": "PET-GF", + "filament_vendor": "QIDI" + }, + "OFi5RSve": { + "filaments": [ + "Creality/eSUN PLA-LW" + ], + "name": "eSUN PLA-LW", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OFi6PfUM": { + "filaments": [ + "Chuanying/Generic PLA-Silk", + "Creality/Generic PLA-Silk", + "Flashforge/Generic PLA-Silk" + ], + "name": "Generic PLA-Silk", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFi90KlM": { + "filaments": [ + "Volumic/Volumic NYLON Ultra (Performance)" + ], + "name": "Volumic NYLON Ultra (Performance)", + "filament_type": "PA", + "filament_vendor": "Volumic" + }, + "OFiDpM1B": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Bordo" + ], + "name": "FilAr PLA-mate Bordo", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFiEz2XI": { + "filaments": [ + "Cubicon/Cubicon PA-CF" + ], + "name": "Cubicon PA-CF", + "filament_type": "PA", + "filament_vendor": "Cubicon" + }, + "OFiWaoqD": { + "filaments": [ + "OrcaFilamentLibrary/DREMC PPA-CF" + ], + "name": "DREMC PPA-CF", + "filament_type": "PPA-CF", + "filament_vendor": "DREMC" + }, + "OFibWuBd": { + "filaments": [ + "Flashforge/Flashforge ABS Basic" + ], + "name": "Flashforge ABS Basic", + "filament_type": "ABS", + "filament_vendor": "Flashforge" + }, + "OFilAA3b": { + "filaments": [ + "Eryone/Eryone PLA-CF" + ], + "name": "Eryone PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "Eryone" + }, + "OFilD4bP": { + "filaments": [ + "FlyingBear/FlyingBear PLA" + ], + "name": "FlyingBear PLA", + "filament_type": "PLA", + "filament_vendor": "FlyingBear" + }, + "OFilnglt": { + "filaments": [ + "Artillery/Artillery PETG" + ], + "name": "Artillery PETG", + "filament_type": "PETG", + "filament_vendor": "Artillery" + }, + "OFin64Qg": { + "filaments": [ + "Creality/Generic Support for PLA" + ], + "name": "Generic Support for PLA", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFitS8al": { + "filaments": [ + "BBL/PolyLite PLA Neon", + "Snapmaker/PolyLite PLA Neon" + ], + "name": "PolyLite PLA Neon", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFiwEbze": { + "filaments": [ + "Volumic/PETG ESD (Performance)" + ], + "name": "PETG ESD (Performance)", + "filament_type": "PETG-ESD", + "filament_vendor": "Volumic" + }, + "OFj3bTjw": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Amarillo" + ], + "name": "FilAr PLA-mate Amarillo", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFj64R5U": { + "filaments": [ + "Peopoly/Peopoly Lancer ABS-GF" + ], + "name": "Peopoly Lancer ABS-GF", + "filament_type": "ABS", + "filament_vendor": "Peopoly" + }, + "OFjD3YTW": { + "filaments": [ + "Qidi/Qidi PC-ABS-FR" + ], + "name": "Qidi PC-ABS-FR", + "filament_type": "PC-ABS-FR", + "filament_vendor": "QIDI" + }, + "OFjHrAX0": { + "filaments": [ + "WonderMaker/WonderMaker ABS" + ], + "name": "WonderMaker ABS", + "filament_type": "ABS", + "filament_vendor": "WonderMaker" + }, + "OFjLAYgO": { + "filaments": [ + "Anycubic/Anycubic PEBA" + ], + "name": "Anycubic PEBA", + "filament_type": "PEBA", + "filament_vendor": "Anycubic" + }, + "OFjPXrXO": { + "filaments": [ + "Elegoo/Elegoo PLA Glow", + "OrcaFilamentLibrary/Elegoo PLA Glow" + ], + "name": "Elegoo PLA Glow", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFjT9PkZ": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Tabaco" + ], + "name": "FilAr PLA Tabaco", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFjUGUIK": { + "filaments": [ + "iQ/Fiberthree PACF Pro P1" + ], + "name": "Fiberthree PACF Pro P1", + "filament_type": "PACF Pro", + "filament_vendor": "iQ Materials" + }, + "OFjUXn67": { + "filaments": [ + "BBL/BETA ABS" + ], + "name": "BETA ABS", + "filament_type": "ABS", + "filament_vendor": "BETA" + }, + "OFjVOWfJ": { + "filaments": [ + "Anycubic/Anycubic PLA High Speed" + ], + "name": "Anycubic PLA High Speed", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFjXrKFO": { + "filaments": [ + "OrcaArena/Arena PLA Impact" + ], + "name": "Arena PLA Impact", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFjb0wos": { + "filaments": [ + "BBL/Panchroma PLA Metallic", + "OrcaFilamentLibrary/Panchroma PLA Metallic", + "Snapmaker/Panchroma PLA Metallic" + ], + "name": "Panchroma PLA Metallic", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFjcwUEm": { + "filaments": [ + "Cubicon/Cubicon PLA" + ], + "name": "Cubicon PLA", + "filament_type": "PLA", + "filament_vendor": "Cubicon" + }, + "OFjiXpyf": { + "filaments": [ + "Qidi/Generic TPU 95A", + "TwoTrees/Generic TPU 95A" + ], + "name": "Generic TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Generic" + }, + "OFjkdnyN": { + "filaments": [ + "Snapmaker/Snapmaker Dual TPU" + ], + "name": "Snapmaker Dual TPU", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFjoAe0R": { + "filaments": [ + "Qidi/Qidi PLA-CF" + ], + "name": "Qidi PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "QIDI" + }, + "OFjogeYN": { + "filaments": [ + "BBL/BETA PETG Glitter" + ], + "name": "BETA PETG Glitter", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFjorDcx": { + "filaments": [ + "OrcaFilamentLibrary/FDplast ABS" + ], + "name": "FDplast ABS", + "filament_type": "ABS", + "filament_vendor": "FDplast" + }, + "OFjt8dDO": { + "filaments": [ + "Flashforge/FusRock NexPA-CF25" + ], + "name": "FusRock NexPA-CF25", + "filament_type": "PA-CF", + "filament_vendor": "FusRock" + }, + "OFjt9en1": { + "filaments": [ + "OrcaFilamentLibrary/Generic CoPE" + ], + "name": "Generic CoPE", + "filament_type": "CoPE", + "filament_vendor": "Generic" + }, + "OFjz0a3m": { + "filaments": [ + "Prusa/Prusament PC-CF" + ], + "name": "Prusament PC-CF", + "filament_type": "PC-CF", + "filament_vendor": "Prusa Polymers" + }, + "OFk8t9mz": { + "filaments": [ + "BBL/Fiberon PETG-rCF", + "OrcaFilamentLibrary/Fiberon PETG-rCF" + ], + "name": "Fiberon PETG-rCF", + "filament_type": "PETG-CF", + "filament_vendor": "Polymaker" + }, + "OFkAltI8": { + "filaments": [ + "FlyingBear/Other PA-CF", + "InfiMech/Other PA-CF" + ], + "name": "Other PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Other" + }, + "OFkGp50Y": { + "filaments": [ + "Volumic/Volumic UNIVERSAL Ultra (Performance)" + ], + "name": "Volumic UNIVERSAL Ultra (Performance)", + "filament_type": "UNIV", + "filament_vendor": "Volumic" + }, + "OFkGvN4d": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Verde Pixel" + ], + "name": "FilAr PLA Verde Pixel", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFkHbjUv": { + "filaments": [ + "BBL/BETA PLA Metallic" + ], + "name": "BETA PLA Metallic", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFkOviHk": { + "filaments": [ + "BBL/Fiberon PA6-CF", + "OrcaFilamentLibrary/Fiberon PA6-CF" + ], + "name": "Fiberon PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "Polymaker" + }, + "OFkR8E2c": { + "filaments": [ + "Prusa/Prusament PETG" + ], + "name": "Prusament PETG", + "filament_type": "PETG", + "filament_vendor": "Prusa Polymers" + }, + "OFkf1HHw": { + "filaments": [ + "Flashforge/Generic PLA-SILK" + ], + "name": "Generic PLA-SILK", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFkhhUS0": { + "filaments": [ + "Elegoo/Elegoo Rapid PLA+", + "OrcaFilamentLibrary/Elegoo Rapid PLA+" + ], + "name": "Elegoo Rapid PLA+", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFklJcWK": { + "filaments": [ + "FlyingBear/Other PLA Hyper", + "InfiMech/Other PLA Hyper" + ], + "name": "Other PLA Hyper", + "filament_type": "PLA", + "filament_vendor": "Other" + }, + "OFknl9Iz": { + "filaments": [ + "BBL/Bambu ABS-GF", + "OrcaFilamentLibrary/Bambu ABS-GF" + ], + "name": "Bambu ABS-GF", + "filament_type": "ABS-GF", + "filament_vendor": "Bambu Lab" + }, + "OFkoLUtR": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Verde Oliva" + ], + "name": "FilAr PLA Verde Oliva", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFkq7rPy": { + "filaments": [ + "Eryone/Eryone PA-GF" + ], + "name": "Eryone PA-GF", + "filament_type": "PA-GF", + "filament_vendor": "Eryone" + }, + "OFks6esg": { + "filaments": [ + "Creality/EN-PLA+" + ], + "name": "EN-PLA+", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFkx5MEe": { + "filaments": [ + "Artillery/Artillery PVA" + ], + "name": "Artillery PVA", + "filament_type": "PVA", + "filament_vendor": "Artillery" + }, + "OFkzr35f": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA Antibacterial" + ], + "name": "Eolas Prints PLA Antibacterial", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFlBoEfL": { + "filaments": [ + "Snapmaker/Snapmaker J1 TPU High-Flow" + ], + "name": "Snapmaker J1 TPU High-Flow", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFlIsW6f": { + "filaments": [ + "Snapmaker/Snapmaker Dual PLA Matte" + ], + "name": "Snapmaker Dual PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFlN6DL1": { + "filaments": [ + "Qidi/QIDI PA-Ultra" + ], + "name": "QIDI PA-Ultra", + "filament_type": "UltraPA", + "filament_vendor": "QIDI" + }, + "OFlP3KWq": { + "filaments": [ + "Elegoo/Elegoo PETG HF", + "OrcaFilamentLibrary/Elegoo PETG HF" + ], + "name": "Elegoo PETG HF", + "filament_type": "PETG", + "filament_vendor": "Elegoo" + }, + "OFlSNkhc": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints ASA" + ], + "name": "Eolas Prints ASA", + "filament_type": "ASA", + "filament_vendor": "Eolas Prints" + }, + "OFlfuj2k": { + "filaments": [ + "BBL/Bambu TPU 85A" + ], + "name": "Bambu TPU 85A", + "filament_type": "TPU", + "filament_vendor": "Bambu Lab" + }, + "OFlgMgNM": { + "filaments": [ + "Flashforge/Flashforge PPS" + ], + "name": "Flashforge PPS", + "filament_type": "PPS", + "filament_vendor": "Flashforge" + }, + "OFllmFhT": { + "filaments": [ + "Elegoo/Generic PETG PRO" + ], + "name": "Generic PETG PRO", + "filament_type": "PETG", + "filament_vendor": "Generic" + }, + "OFlmxlDG": { + "filaments": [ + "BBL/BETA HIPS" + ], + "name": "BETA HIPS", + "filament_type": "HIPS", + "filament_vendor": "BETA" + }, + "OFln72PT": { + "filaments": [ + "Elegoo/Elegoo PLA-CF", + "OrcaFilamentLibrary/Elegoo PLA-CF" + ], + "name": "Elegoo PLA-CF", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFlsTpJG": { + "filaments": [ + "Elegoo/Elegoo PC-FR", + "OrcaFilamentLibrary/Elegoo PC-FR" + ], + "name": "Elegoo PC-FR", + "filament_type": "PC", + "filament_vendor": "Elegoo" + }, + "OFlufQpZ": { + "filaments": [ + "Snapmaker/Snapmaker PLA" + ], + "name": "Snapmaker PLA", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFlwmqrC": { + "filaments": [ + "BBL/Polymaker HT-PLA-GF", + "OrcaFilamentLibrary/Polymaker HT-PLA-GF", + "Snapmaker/Polymaker HT-PLA-GF" + ], + "name": "Polymaker HT-PLA-GF", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFm06H6V": { + "filaments": [ + "Elegoo/Elegoo PLA Basic", + "OrcaFilamentLibrary/Elegoo PLA Basic" + ], + "name": "Elegoo PLA Basic", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFm4SivL": { + "filaments": [ + "Flashforge/Flashforge PLA Pro" + ], + "name": "Flashforge PLA Pro", + "filament_type": "PLA", + "filament_vendor": "Flashforge" + }, + "OFm4ysMO": { + "filaments": [ + "FlyingBear/FlyingBear ABS" + ], + "name": "FlyingBear ABS", + "filament_type": "ABS", + "filament_vendor": "FlyingBear" + }, + "OFm70lLt": { + "filaments": [ + "CoLiDo/CoLiDo PLA" + ], + "name": "CoLiDo PLA", + "filament_type": "PLA", + "filament_vendor": "CoLiDo" + }, + "OFm8rqoY": { + "filaments": [ + "re3D/re3D rPP" + ], + "name": "re3D rPP", + "filament_type": "PP", + "filament_vendor": "re3D" + }, + "OFmCOW2Y": { + "filaments": [ + "re3D/re3D rPETG" + ], + "name": "re3D rPETG", + "filament_type": "PETG", + "filament_vendor": "re3D" + }, + "OFmFwUWM": { + "filaments": [ + "Prusa/Prusament ASA" + ], + "name": "Prusament ASA", + "filament_type": "ASA", + "filament_vendor": "Prusa Polymers" + }, + "OFmJAd3A": { + "filaments": [ + "OrcaFilamentLibrary/FDplast HIPS" + ], + "name": "FDplast HIPS", + "filament_type": "HIPS", + "filament_vendor": "FDplast" + }, + "OFmKU2Ha": { + "filaments": [ + "Eryone/Eryone PLA" + ], + "name": "Eryone PLA", + "filament_type": "PLA", + "filament_vendor": "Eryone" + }, + "OFmN2lvw": { + "filaments": [ + "BBL/Generic TPU for AMS" + ], + "name": "Generic TPU for AMS", + "filament_type": "TPU-AMS", + "filament_vendor": "Generic" + }, + "OFmY0l6t": { + "filaments": [ + "Creality/Generic PLA Matte", + "Elegoo/Generic PLA Matte", + "OrcaFilamentLibrary/Generic PLA Matte" + ], + "name": "Generic PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFma5TXH": { + "filaments": [ + "Qidi/QIDI ABS Odorless" + ], + "name": "QIDI ABS Odorless", + "filament_type": "ABS", + "filament_vendor": "QIDI" + }, + "OFmaeU4a": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Naranja" + ], + "name": "FilAr PLA-mate Naranja", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFmfizbq": { + "filaments": [ + "OrcaArena/Arena PLA Silk" + ], + "name": "Arena PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFmjN2bc": { + "filaments": [ + "Anycubic/Anycubic PLA" + ], + "name": "Anycubic PLA", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFmn9NZL": { + "filaments": [ + "BBL/FusRock ABS-GF", + "OrcaFilamentLibrary/FusRock ABS-GF" + ], + "name": "FusRock ABS-GF", + "filament_type": "ABS-GF", + "filament_vendor": "FusRock" + }, + "OFmpMwxS": { + "filaments": [ + "BBL/Generic PLA High Speed", + "Creality/Generic PLA High Speed", + "FLSun/Generic PLA High Speed", + "Flashforge/Generic PLA High Speed", + "OrcaFilamentLibrary/Generic PLA High Speed", + "Qidi/Generic PLA High Speed", + "Tiertime/Generic PLA High Speed" + ], + "name": "Generic PLA High Speed", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFmt513L": { + "filaments": [ + "BBL/BETA PETG Transparent" + ], + "name": "BETA PETG Transparent", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFmveLWz": { + "filaments": [ + "Elegoo/Elegoo PETG-GF", + "OrcaFilamentLibrary/Elegoo PETG-GF" + ], + "name": "Elegoo PETG-GF", + "filament_type": "PETG", + "filament_vendor": "Elegoo" + }, + "OFn1QaY3": { + "filaments": [ + "Elegoo/Elegoo PLA Translucent2", + "OrcaFilamentLibrary/Elegoo PLA Translucent2" + ], + "name": "Elegoo PLA Translucent2", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFn2GlhY": { + "filaments": [ + "Creality/Hyper PA6-CF" + ], + "name": "Hyper PA6-CF", + "filament_type": "PA-CF", + "filament_vendor": "Creality" + }, + "OFn6WpN7": { + "filaments": [ + "Qidi/QIDI PA12-CF" + ], + "name": "QIDI PA12-CF", + "filament_type": "PA12-CF", + "filament_vendor": "QIDI" + }, + "OFnBvPhb": { + "filaments": [ + "BBL/addnorth PLA rPLA RE-ADD" + ], + "name": "addnorth PLA rPLA RE-ADD", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFnHc3D6": { + "filaments": [ + "Creality/eSUN PLA-CF" + ], + "name": "eSUN PLA-CF", + "filament_type": "PLA-CF", + "filament_vendor": "eSUN" + }, + "OFnO4wnf": { + "filaments": [ + "Prusa/Prusament PLA" + ], + "name": "Prusament PLA", + "filament_type": "PLA", + "filament_vendor": "Prusa Polymers" + }, + "OFnSeLHk": { + "filaments": [ + "CoLiDo/CoLiDo PLA Silk" + ], + "name": "CoLiDo PLA Silk", + "filament_type": "PLA", + "filament_vendor": "CoLiDo" + }, + "OFnT7Qpb": { + "filaments": [ + "Prusa/Generic TPU HF" + ], + "name": "Generic TPU HF", + "filament_type": "TPU", + "filament_vendor": "Generic" + }, + "OFnXrkhA": { + "filaments": [ + "InfiMech/InfiMech PA-CF" + ], + "name": "InfiMech PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "InfiMech" + }, + "OFnXwW8l": { + "filaments": [ + "Snapmaker/PolyLite PLA Pro Metallic" + ], + "name": "PolyLite PLA Pro Metallic", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFnYVFk2": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Azul Francia" + ], + "name": "FilAr PLA Azul Francia", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFncpm7O": { + "filaments": [ + "WonderMaker/WonderMaker PLA Silk" + ], + "name": "WonderMaker PLA Silk", + "filament_type": "PLA", + "filament_vendor": "WonderMaker" + }, + "OFneOFWe": { + "filaments": [ + "CoLiDo/CoLiDo ABS" + ], + "name": "CoLiDo ABS", + "filament_type": "ABS", + "filament_vendor": "CoLiDo" + }, + "OFnejEt4": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Cian" + ], + "name": "FilAr PETG Cian", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFnfxTvi": { + "filaments": [ + "BBL/Bambu PLA Lite" + ], + "name": "Bambu PLA Lite", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFngcE81": { + "filaments": [ + "LH/LHS TPU Foamy 78A" + ], + "name": "LHS TPU Foamy 78A", + "filament_type": "TPU", + "filament_vendor": "LH Stinger" + }, + "OFniMuTN": { + "filaments": [ + "BBL/Bambu PA6-CF", + "OrcaFilamentLibrary/Bambu PA6-CF" + ], + "name": "Bambu PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "Bambu Lab" + }, + "OFnmp2pO": { + "filaments": [ + "Snapmaker/Snapmaker Breakaway Support For PLA" + ], + "name": "Snapmaker Breakaway Support For PLA", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFnmp6rt": { + "filaments": [ + "Anycubic/Anycubic PLA+" + ], + "name": "Anycubic PLA+", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFnpX8uh": { + "filaments": [ + "BBL/BETA PETG Matte" + ], + "name": "BETA PETG Matte", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFnyHfcv": { + "filaments": [ + "Ratrig/Generic ABS BigNozzle" + ], + "name": "Generic ABS BigNozzle", + "filament_type": "ABS", + "filament_vendor": "Generic" + }, + "OFo15hcT": { + "filaments": [ + "Qidi/QIDI PAHT-GF" + ], + "name": "QIDI PAHT-GF", + "filament_type": "PAHT-GF", + "filament_vendor": "QIDI" + }, + "OFo2UF2C": { + "filaments": [ + "BBL/Generic BVOH", + "Creality/Generic BVOH", + "Flashforge/Generic BVOH", + "OrcaFilamentLibrary/Generic BVOH", + "Tiertime/Generic BVOH" + ], + "name": "Generic BVOH", + "filament_type": "BVOH", + "filament_vendor": "Generic" + }, + "OFo6n2pB": { + "filaments": [ + "Anycubic/Anycubic PETG" + ], + "name": "Anycubic PETG", + "filament_type": "PETG", + "filament_vendor": "Anycubic" + }, + "OFoBTKmn": { + "filaments": [ + "Cubicon/Cubicon PETG" + ], + "name": "Cubicon PETG", + "filament_type": "PETG", + "filament_vendor": "Cubicon" + }, + "OFoSknDB": { + "filaments": [ + "OrcaFilamentLibrary/FILL3D PLA Turbo" + ], + "name": "FILL3D PLA Turbo", + "filament_type": "PLA", + "filament_vendor": "FILL3D" + }, + "OFoYSJKi": { + "filaments": [ + "Anker/Generic PETG-CF", + "BBL/Generic PETG-CF", + "Creality/Generic PETG-CF", + "Elegoo/Generic PETG-CF", + "Flashforge/Generic PETG-CF", + "OrcaArena/Generic PETG-CF", + "OrcaFilamentLibrary/Generic PETG-CF", + "Qidi/Generic PETG-CF", + "Tiertime/Generic PETG-CF" + ], + "name": "Generic PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Generic" + }, + "OFobDOW5": { + "filaments": [ + "Elegoo/Elegoo ASA", + "OrcaFilamentLibrary/Elegoo ASA" + ], + "name": "Elegoo ASA", + "filament_type": "ASA", + "filament_vendor": "Elegoo" + }, + "OFocyw69": { + "filaments": [ + "BBL/AliZ PETG", + "OrcaFilamentLibrary/AliZ PETG" + ], + "name": "AliZ PETG", + "filament_type": "PETG", + "filament_vendor": "Aliz" + }, + "OFoiVqVM": { + "filaments": [ + "BBL/Bambu PLA Basic", + "OrcaFilamentLibrary/Bambu PLA Basic" + ], + "name": "Bambu PLA Basic", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFojbdhR": { + "filaments": [ + "Flashforge/Flashforge ABS-GF" + ], + "name": "Flashforge ABS-GF", + "filament_type": "ABS-GF", + "filament_vendor": "Flashforge" + }, + "OForhBi4": { + "filaments": [ + "Cubicon/Cubicon ABSk" + ], + "name": "Cubicon ABSk", + "filament_type": "ABS", + "filament_vendor": "Cubicon" + }, + "OFovEIbw": { + "filaments": [ + "BBL/Bambu PETG HF", + "OrcaFilamentLibrary/Bambu PETG HF" + ], + "name": "Bambu PETG HF", + "filament_type": "PETG", + "filament_vendor": "Bambu Lab" + }, + "OFp4ETDP": { + "filaments": [ + "Creality/CR-PLA" + ], + "name": "CR-PLA", + "filament_type": "PLA", + "filament_vendor": "Creality" + }, + "OFp57RRC": { + "filaments": [ + "Qidi/QIDI PPS-GF" + ], + "name": "QIDI PPS-GF", + "filament_type": "PPS-GF", + "filament_vendor": "QIDI" + }, + "OFp9wdmf": { + "filaments": [ + "Eryone/Eryone PA-CF" + ], + "name": "Eryone PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Eryone" + }, + "OFpBlrvY": { + "filaments": [ + "OrcaFilamentLibrary/Valment PLA Silk" + ], + "name": "Valment PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Valment" + }, + "OFpDo5Ix": { + "filaments": [ + "Cubicon/Cubicon ABS" + ], + "name": "Cubicon ABS", + "filament_type": "ABS", + "filament_vendor": "Cubicon" + }, + "OFpPGSKG": { + "filaments": [ + "BBL/SUNLU Silk PLA+", + "Flashforge/SUNLU Silk PLA+", + "OrcaFilamentLibrary/SUNLU Silk PLA+" + ], + "name": "SUNLU Silk PLA+", + "filament_type": "PLA", + "filament_vendor": "SUNLU" + }, + "OFpPJSHE": { + "filaments": [ + "Peopoly/Peopoly Lancer PETG-C" + ], + "name": "Peopoly Lancer PETG-C", + "filament_type": "PETG", + "filament_vendor": "Peopoly" + }, + "OFpW4gdi": { + "filaments": [ + "BBL/SUNLU PLA Matte", + "Flashforge/SUNLU PLA Matte", + "OrcaFilamentLibrary/SUNLU PLA Matte" + ], + "name": "SUNLU PLA Matte", + "filament_type": "PLA", + "filament_vendor": "SUNLU" + }, + "OFpdjFI3": { + "filaments": [ + "BBL/BETA PLA UV Color Change" + ], + "name": "BETA PLA UV Color Change", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFpu74Qe": { + "filaments": [ + "Snapmaker/Snapmaker PLA Eco" + ], + "name": "Snapmaker PLA Eco", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFpumhCM": { + "filaments": [ + "Volumic/Volumic UNIVERSAL Ultra" + ], + "name": "Volumic UNIVERSAL Ultra", + "filament_type": "UNIV", + "filament_vendor": "Volumic" + }, + "OFq0TY7C": { + "filaments": [ + "Flashforge/Flashforge ASA-CF" + ], + "name": "Flashforge ASA-CF", + "filament_type": "ASA-CF", + "filament_vendor": "Flashforge" + }, + "OFq8gfS4": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Negro Azabache" + ], + "name": "FilAr PETG Negro Azabache", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFq9svOz": { + "filaments": [ + "BBL/Generic PPS", + "Creality/Generic PPS", + "Tiertime/Generic PPS" + ], + "name": "Generic PPS", + "filament_type": "PPS", + "filament_vendor": "Generic" + }, + "OFqFRiLb": { + "filaments": [ + "Ratrig/Generic PLA BigNozzle" + ], + "name": "Generic PLA BigNozzle", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFqGRZyH": { + "filaments": [ + "BBL/Numakers PLA+", + "OrcaFilamentLibrary/Numakers PLA+" + ], + "name": "Numakers PLA+", + "filament_type": "PLA", + "filament_vendor": "Numakers" + }, + "OFqHQNoZ": { + "filaments": [ + "Elegoo/Elegoo TPU 95A", + "OrcaFilamentLibrary/Elegoo TPU 95A" + ], + "name": "Elegoo TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Elegoo" + }, + "OFqINlYj": { + "filaments": [ + "BBL/eSUN PLA+", + "Creality/eSUN PLA+", + "OrcaFilamentLibrary/eSUN PLA+" + ], + "name": "eSUN PLA+", + "filament_type": "PLA", + "filament_vendor": "eSUN" + }, + "OFqTwtXM": { + "filaments": [ + "BBL/addnorth PETG rPETG Matte" + ], + "name": "addnorth PETG rPETG Matte", + "filament_type": "PETG", + "filament_vendor": "addnorth" + }, + "OFqcL5UF": { + "filaments": [ + "Qidi/QIDI Support For PET/PA" + ], + "name": "QIDI Support For PET/PA", + "filament_type": "PA-S", + "filament_vendor": "QIDI" + }, + "OFqtx549": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Celeste Cielo" + ], + "name": "FilAr PLA-mate Celeste Cielo", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFqw2PQA": { + "filaments": [ + "BBL/Panchroma CoPE", + "OrcaFilamentLibrary/Panchroma CoPE", + "Snapmaker/Panchroma CoPE" + ], + "name": "Panchroma CoPE", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFrFBEfd": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA Neon" + ], + "name": "Eolas Prints PLA Neon", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFrGJ4tR": { + "filaments": [ + "Anycubic/Anycubic PLA Slik" + ], + "name": "Anycubic PLA Slik", + "filament_type": "PLA", + "filament_vendor": "Anycubic" + }, + "OFrKLeE3": { + "filaments": [ + "BBL/Bambu PLA Metal", + "OrcaFilamentLibrary/Bambu PLA Metal" + ], + "name": "Bambu PLA Metal", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFrLiqiM": { + "filaments": [ + "InfiMech/InfiMech PETG" + ], + "name": "InfiMech PETG", + "filament_type": "PETG", + "filament_vendor": "InfiMech" + }, + "OFrM4hdm": { + "filaments": [ + "Creality/CR-PLA Carbon" + ], + "name": "CR-PLA Carbon", + "filament_type": "PLA-CF", + "filament_vendor": "Creality" + }, + "OFrOh600": { + "filaments": [ + "BBL/Panchroma PLA Matte", + "Creality/Panchroma PLA Matte", + "OrcaFilamentLibrary/Panchroma PLA Matte", + "Snapmaker/Panchroma PLA Matte" + ], + "name": "Panchroma PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFrZDhVt": { + "filaments": [ + "Flashforge/Flashforge ASA-GF" + ], + "name": "Flashforge ASA-GF", + "filament_type": "ASA-GF", + "filament_vendor": "Flashforge" + }, + "OFrdZ0cK": { + "filaments": [ + "Creality/eSUN PETG+HS" + ], + "name": "eSUN PETG+HS", + "filament_type": "PETG", + "filament_vendor": "eSUN" + }, + "OFrjacXf": { + "filaments": [ + "Flashforge/Flashforge PET-CF" + ], + "name": "Flashforge PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "Flashforge" + }, + "OFrqMlGt": { + "filaments": [ + "BBL/BETA PETG" + ], + "name": "BETA PETG", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFrr67nG": { + "filaments": [ + "OrcaArena/Arena PC" + ], + "name": "Arena PC", + "filament_type": "PC", + "filament_vendor": "Orca Arena" + }, + "OFryjl35": { + "filaments": [ + "Elegoo/Elegoo ASA-CF", + "OrcaFilamentLibrary/Elegoo ASA-CF" + ], + "name": "Elegoo ASA-CF", + "filament_type": "ASA", + "filament_vendor": "Elegoo" + }, + "OFsB2lxm": { + "filaments": [ + "Elegoo/Elegoo PLA Matte", + "OrcaFilamentLibrary/Elegoo PLA Matte" + ], + "name": "Elegoo PLA Matte", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFsD974q": { + "filaments": [ + "Volumic/Volumic PETG Ultra (Performance)" + ], + "name": "Volumic PETG Ultra (Performance)", + "filament_type": "PETG", + "filament_vendor": "Volumic" + }, + "OFsDXRpS": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Piel" + ], + "name": "FilAr PLA Piel", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFsFo7ms": { + "filaments": [ + "Volumic/Volumic PP Ultra" + ], + "name": "Volumic PP Ultra", + "filament_type": "PP", + "filament_vendor": "Volumic" + }, + "OFsFon5l": { + "filaments": [ + "BBL/Generic HIPS", + "Chuanying/Generic HIPS", + "Creality/Generic HIPS", + "Flashforge/Generic HIPS", + "OrcaFilamentLibrary/Generic HIPS", + "Tiertime/Generic HIPS" + ], + "name": "Generic HIPS", + "filament_type": "HIPS", + "filament_vendor": "Generic" + }, + "OFsHSVZc": { + "filaments": [ + "BBL/Bambu Support W", + "OrcaFilamentLibrary/Bambu Support W" + ], + "name": "Bambu Support W", + "filament_type": "PLA", + "filament_vendor": "Bambu Lab" + }, + "OFsP8PKH": { + "filaments": [ + "Z-Bolt/Generic ABS HT" + ], + "name": "Generic ABS HT", + "filament_type": "ABS", + "filament_vendor": "Generic" + }, + "OFsRDvTM": { + "filaments": [ + "Anycubic/Panchroma PLA", + "BBL/Panchroma PLA", + "OrcaFilamentLibrary/Panchroma PLA", + "Snapmaker/Panchroma PLA" + ], + "name": "Panchroma PLA", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFsXQXbs": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Blanco Antartida" + ], + "name": "FilAr PETG Blanco Antartida", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFsijjtH": { + "filaments": [ + "BBL/Generic PP-GF", + "OrcaFilamentLibrary/Generic PP-GF", + "Tiertime/Generic PP-GF" + ], + "name": "Generic PP-GF", + "filament_type": "PP-GF", + "filament_vendor": "Generic" + }, + "OFsoykbm": { + "filaments": [ + "OrcaFilamentLibrary/DREMC PA6-CF" + ], + "name": "DREMC PA6-CF", + "filament_type": "PA6-CF", + "filament_vendor": "DREMC" + }, + "OFt0JbR7": { + "filaments": [ + "Snapmaker/Snapmaker J1 PLA Metal" + ], + "name": "Snapmaker J1 PLA Metal", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFt3HtlG": { + "filaments": [ + "Qidi/QIDI ABS-GF" + ], + "name": "QIDI ABS-GF", + "filament_type": "ABS-GF", + "filament_vendor": "QIDI" + }, + "OFt6e0US": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Amarillo Lima" + ], + "name": "FilAr PETG Amarillo Lima", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFt7SngH": { + "filaments": [ + "Snapmaker/Snapmaker J1 ASA" + ], + "name": "Snapmaker J1 ASA", + "filament_type": "ASA", + "filament_vendor": "Snapmaker" + }, + "OFtFtiS0": { + "filaments": [ + "Snapmaker/Polymaker PETG Galaxy" + ], + "name": "Polymaker PETG Galaxy", + "filament_type": "PETG", + "filament_vendor": "Polymaker" + }, + "OFtGC1ye": { + "filaments": [ + "Artillery/Artillery PA-CF" + ], + "name": "Artillery PA-CF", + "filament_type": "PA-CF", + "filament_vendor": "Artillery" + }, + "OFtKeKa9": { + "filaments": [ + "OrcaArena/Arena PLA Tough" + ], + "name": "Arena PLA Tough", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFtOPlK6": { + "filaments": [ + "OrcaArena/Arena PAHT-CF" + ], + "name": "Arena PAHT-CF", + "filament_type": "PA-CF", + "filament_vendor": "Orca Arena" + }, + "OFtOoWIj": { + "filaments": [], + "name": "FilAr PLA-mate", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFtRn8X8": { + "filaments": [ + "OrcaFilamentLibrary/FDplast SBS" + ], + "name": "FDplast SBS", + "filament_type": "SBS", + "filament_vendor": "FDplast" + }, + "OFtdVZpV": { + "filaments": [ + "BBL/addnorth PLA X-PLA" + ], + "name": "addnorth PLA X-PLA", + "filament_type": "PLA", + "filament_vendor": "addnorth" + }, + "OFtefokm": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Blanco" + ], + "name": "FilAr PLA-mate Blanco", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFtkLO6q": { + "filaments": [ + "BBL/Bambu TPU 90A" + ], + "name": "Bambu TPU 90A", + "filament_type": "TPU", + "filament_vendor": "Bambu Lab" + }, + "OFtndTHe": { + "filaments": [ + "BBL/BETA PETG-CF" + ], + "name": "BETA PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "BETA" + }, + "OFtpXCCv": { + "filaments": [ + "BBL/COEX ASA PRIME", + "OrcaFilamentLibrary/COEX ASA PRIME" + ], + "name": "COEX ASA PRIME", + "filament_type": "ASA", + "filament_vendor": "COEX 3D" + }, + "OFtr8eZw": { + "filaments": [ + "OrcaFilamentLibrary/FDplast PLA" + ], + "name": "FDplast PLA", + "filament_type": "PLA", + "filament_vendor": "FDplast" + }, + "OFtudokz": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA Premium" + ], + "name": "Eolas Prints PLA Premium", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFtybfNX": { + "filaments": [ + "Snapmaker/Snapmaker PLA Metal" + ], + "name": "Snapmaker PLA Metal", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFu08yGN": { + "filaments": [ + "Volumic/Volumic PETG Ultra carbone" + ], + "name": "Volumic PETG Ultra carbone", + "filament_type": "PETG", + "filament_vendor": "Volumic" + }, + "OFu0fjPJ": { + "filaments": [ + "LH/LHS PC CF" + ], + "name": "LHS PC CF", + "filament_type": "PC", + "filament_vendor": "LH Stinger" + }, + "OFu1E4ur": { + "filaments": [ + "Qidi/QIDI ASA-Aero" + ], + "name": "QIDI ASA-Aero", + "filament_type": "ASA-AERO", + "filament_vendor": "QIDI" + }, + "OFu1evlr": { + "filaments": [ + "BBL/Generic PCTG", + "Creality/Generic PCTG", + "OrcaFilamentLibrary/Generic PCTG", + "Ratrig/Generic PCTG", + "Tiertime/Generic PCTG" + ], + "name": "Generic PCTG", + "filament_type": "PCTG", + "filament_vendor": "Generic" + }, + "OFuFEtKX": { + "filaments": [ + "Flashforge/Flashforge PETG-CF" + ], + "name": "Flashforge PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Flashforge" + }, + "OFuJ49uH": { + "filaments": [ + "Qidi/QIDI PETG Basic" + ], + "name": "QIDI PETG Basic", + "filament_type": "PETG", + "filament_vendor": "QIDI" + }, + "OFuO0cAP": { + "filaments": [ + "OrcaArena/Arena PETG-CF" + ], + "name": "Arena PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Orca Arena" + }, + "OFuUuIhR": { + "filaments": [ + "Elegoo/Elegoo PETG-CF", + "OrcaFilamentLibrary/Elegoo PETG-CF" + ], + "name": "Elegoo PETG-CF", + "filament_type": "PETG", + "filament_vendor": "Elegoo" + }, + "OFuV79ru": { + "filaments": [ + "Flashforge/Flashforge PA66-CF" + ], + "name": "Flashforge PA66-CF", + "filament_type": "PA-CF", + "filament_vendor": "Flashforge" + }, + "OFuWCQXN": { + "filaments": [ + "BBL/COEX ABS PRIME", + "OrcaFilamentLibrary/COEX ABS PRIME" + ], + "name": "COEX ABS PRIME", + "filament_type": "ABS", + "filament_vendor": "COEX 3D" + }, + "OFuehn62": { + "filaments": [ + "OrcaArena/Arena PLA Marble" + ], + "name": "Arena PLA Marble", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFufTAK9": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA-mate Negro" + ], + "name": "FilAr PLA-mate Negro", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFughwKn": { + "filaments": [ + "Qidi/QIDI PLA Matte Basic" + ], + "name": "QIDI PLA Matte Basic", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OFujZSdh": { + "filaments": [ + "Creality/Hyper PETG" + ], + "name": "Hyper PETG", + "filament_type": "PETG", + "filament_vendor": "Creality" + }, + "OFulOdT2": { + "filaments": [ + "Flashforge/Generic TPU 85A" + ], + "name": "Generic TPU 85A", + "filament_type": "TPU", + "filament_vendor": "Generic" + }, + "OFurdQxc": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Magenta" + ], + "name": "FilAr PETG Magenta", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFusbWjj": { + "filaments": [ + "Creality/Hyper PETG-CF" + ], + "name": "Hyper PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Creality" + }, + "OFuvOt0r": { + "filaments": [ + "BBL/BETA PLA Basic" + ], + "name": "BETA PLA Basic", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFuxH0Uz": { + "filaments": [ + "Volumic/Volumic FLEX93 Ultra" + ], + "name": "Volumic FLEX93 Ultra", + "filament_type": "TPU", + "filament_vendor": "Volumic" + }, + "OFvD0Qqt": { + "filaments": [ + "Ratrig/Generic PETG BigNozzle" + ], + "name": "Generic PETG BigNozzle", + "filament_type": "PETG", + "filament_vendor": "Generic" + }, + "OFvDbkFq": { + "filaments": [ + "Prusa/Prusament PC Blend" + ], + "name": "Prusament PC Blend", + "filament_type": "PC", + "filament_vendor": "Prusa Polymers" + }, + "OFvKUnLh": { + "filaments": [ + "BBL/Bambu TPU 95A HF", + "OrcaFilamentLibrary/Bambu TPU 95A HF" + ], + "name": "Bambu TPU 95A HF", + "filament_type": "TPU", + "filament_vendor": "Bambu Lab" + }, + "OFvLppPU": { + "filaments": [ + "Creality/CR-Nylon" + ], + "name": "CR-Nylon", + "filament_type": "PA", + "filament_vendor": "Creality" + }, + "OFvPPMxL": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PLA Verde FilAr" + ], + "name": "FilAr PLA Verde FilAr", + "filament_type": "PLA", + "filament_vendor": "FilAr" + }, + "OFvTVZc3": { + "filaments": [ + "BBL/COEX PETG", + "OrcaFilamentLibrary/COEX PETG" + ], + "name": "COEX PETG", + "filament_type": "PETG", + "filament_vendor": "COEX 3D" + }, + "OFvVy7yo": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints TPU D60 UV Resistant" + ], + "name": "Eolas Prints TPU D60 UV Resistant", + "filament_type": "TPU", + "filament_vendor": "Eolas Prints" + }, + "OFvaLVML": { + "filaments": [ + "Flashforge/Flashforge HIPS" + ], + "name": "Flashforge HIPS", + "filament_type": "HIPS", + "filament_vendor": "Flashforge" + }, + "OFvcIGee": { + "filaments": [ + "BBL/addnorth TPU Pro Matte 85A" + ], + "name": "addnorth TPU Pro Matte 85A", + "filament_type": "TPU", + "filament_vendor": "addnorth" + }, + "OFvdZ2bx": { + "filaments": [ + "Qidi/QIDI WOOD Rapido" + ], + "name": "QIDI WOOD Rapido", + "filament_type": "PLA", + "filament_vendor": "QIDI" + }, + "OFvgE0Zh": { + "filaments": [ + "Elegoo/Elegoo PLA", + "OrcaFilamentLibrary/Elegoo PLA" + ], + "name": "Elegoo PLA", + "filament_type": "PLA", + "filament_vendor": "Elegoo" + }, + "OFvmwTZE": { + "filaments": [ + "Snapmaker/Snapmaker TPU 95A" + ], + "name": "Snapmaker TPU 95A", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFvrXuV7": { + "filaments": [ + "BBL/PolyLite ASA", + "OrcaFilamentLibrary/PolyLite ASA" + ], + "name": "PolyLite ASA", + "filament_type": "ASA", + "filament_vendor": "Polymaker" + }, + "OFvxIS9g": { + "filaments": [ + "BBL/Fiberon PA12-CF10", + "Snapmaker/Fiberon PA12-CF10" + ], + "name": "Fiberon PA12-CF10", + "filament_type": "PA-CF", + "filament_vendor": "Polymaker" + }, + "OFvxghTE": { + "filaments": [ + "Chuanying/Generic HS PLA", + "Flashforge/Generic HS PLA", + "TwoTrees/Generic HS PLA" + ], + "name": "Generic HS PLA", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFvyB0Bz": { + "filaments": [ + "BBL/PolyLite PLA Galaxy", + "Snapmaker/PolyLite PLA Galaxy" + ], + "name": "PolyLite PLA Galaxy", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFvzvwCu": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PLA High Speed" + ], + "name": "Eolas Prints PLA High Speed", + "filament_type": "PLA", + "filament_vendor": "Eolas Prints" + }, + "OFw4WD4T": { + "filaments": [ + "BBL/Fiberon PETG-rCF08" + ], + "name": "Fiberon PETG-rCF08", + "filament_type": "PETG-CF", + "filament_vendor": "Polymaker" + }, + "OFwJ0qu2": { + "filaments": [], + "name": "DREMC PET-CF", + "filament_type": "PET-CF", + "filament_vendor": "DREMC" + }, + "OFwLBAGf": { + "filaments": [ + "Qidi/HATCHBOX ABS" + ], + "name": "HATCHBOX ABS", + "filament_type": "ABS", + "filament_vendor": "HATCHBOX" + }, + "OFwPrlCM": { + "filaments": [ + "BBL/Bambu PETG Translucent", + "OrcaFilamentLibrary/Bambu PETG Translucent" + ], + "name": "Bambu PETG Translucent", + "filament_type": "PETG", + "filament_vendor": "Bambu Lab" + }, + "OFwRJ4g0": { + "filaments": [ + "OrcaFilamentLibrary/NIT PLA" + ], + "name": "NIT PLA", + "filament_type": "PLA", + "filament_vendor": "NIT" + }, + "OFwVVKEV": { + "filaments": [ + "FlyingBear/Other TPU", + "InfiMech/Other TPU" + ], + "name": "Other TPU", + "filament_type": "TPU", + "filament_vendor": "Other" + }, + "OFwaYjL6": { + "filaments": [ + "BBL/Fiberon PA6-GF", + "OrcaFilamentLibrary/Fiberon PA6-GF" + ], + "name": "Fiberon PA6-GF", + "filament_type": "PA-GF", + "filament_vendor": "Polymaker" + }, + "OFwbsgWj": { + "filaments": [ + "re3D/re3D PC" + ], + "name": "re3D PC", + "filament_type": "PC", + "filament_vendor": "re3D" + }, + "OFwc74ck": { + "filaments": [ + "BBL/BETA PLA Matte" + ], + "name": "BETA PLA Matte", + "filament_type": "PLA", + "filament_vendor": "BETA" + }, + "OFwhLMs4": { + "filaments": [ + "Snapmaker/Snapmaker PLA SnapSpeed" + ], + "name": "Snapmaker PLA SnapSpeed", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFwjMiKL": { + "filaments": [ + "Flashforge/Flashforge PETG Transparent" + ], + "name": "Flashforge PETG Transparent", + "filament_type": "PETG", + "filament_vendor": "Flashforge" + }, + "OFwlZ7gH": { + "filaments": [ + "Flashforge/Flashforge TPU-90A" + ], + "name": "Flashforge TPU-90A", + "filament_type": "TPU-90A", + "filament_vendor": "Flashforge" + }, + "OFwu7IAG": { + "filaments": [ + "BBL/COEX PCTG PRIME", + "OrcaFilamentLibrary/COEX PCTG PRIME" + ], + "name": "COEX PCTG PRIME", + "filament_type": "PCTG", + "filament_vendor": "COEX 3D" + }, + "OFwwAQnA": { + "filaments": [ + "Prusa/Generic PC HF" + ], + "name": "Generic PC HF", + "filament_type": "PC", + "filament_vendor": "Generic" + }, + "OFwyt1xt": { + "filaments": [ + "Eryone/Eryone ASA-CF" + ], + "name": "Eryone ASA-CF", + "filament_type": "ASA-CF", + "filament_vendor": "Eryone" + }, + "OFx0WlzS": { + "filaments": [ + "Flashforge/Flashforge TPU-95A" + ], + "name": "Flashforge TPU-95A", + "filament_type": "TPU-95A", + "filament_vendor": "Flashforge" + }, + "OFx8Lmsd": { + "filaments": [ + "OrcaFilamentLibrary/Eolas Prints PETG UV Resistant" + ], + "name": "Eolas Prints PETG UV Resistant", + "filament_type": "PETG", + "filament_vendor": "Eolas Prints" + }, + "OFxA1p01": { + "filaments": [ + "BBL/Overture PLA Pro", + "OrcaFilamentLibrary/Overture PLA Pro" + ], + "name": "Overture PLA Pro", + "filament_type": "PLA", + "filament_vendor": "Overture" + }, + "OFxDHUX8": { + "filaments": [ + "SeeMeCNC/SeeMeCNC PETG" + ], + "name": "SeeMeCNC PETG", + "filament_type": "PETG", + "filament_vendor": "SeeMeCNC" + }, + "OFxJRuVF": { + "filaments": [ + "Anycubic/Anycubic PC-GF" + ], + "name": "Anycubic PC-GF", + "filament_type": "PC-GF", + "filament_vendor": "Anycubic" + }, + "OFxOHhZw": { + "filaments": [ + "Elegoo/Elegoo ABS", + "OrcaFilamentLibrary/Elegoo ABS" + ], + "name": "Elegoo ABS", + "filament_type": "ABS", + "filament_vendor": "Elegoo" + }, + "OFxUwUeW": { + "filaments": [ + "BBL/SUNLU PLA Marble", + "Flashforge/SUNLU PLA Marble", + "OrcaFilamentLibrary/SUNLU PLA Marble" + ], + "name": "SUNLU PLA Marble", + "filament_type": "PLA", + "filament_vendor": "SUNLU" + }, + "OFxYB4Sw": { + "filaments": [ + "Snapmaker/Snapmaker J1 PETG-CF" + ], + "name": "Snapmaker J1 PETG-CF", + "filament_type": "PETG-CF", + "filament_vendor": "Snapmaker" + }, + "OFxe4rXr": { + "filaments": [ + "BBL/PolyTerra PLA Marble", + "Snapmaker/PolyTerra PLA Marble" + ], + "name": "PolyTerra PLA Marble", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFxqf79Q": { + "filaments": [ + "BBL/BETA PETG HF" + ], + "name": "BETA PETG HF", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFy02QHU": { + "filaments": [ + "BBL/PolyLite PLA Translucent", + "Snapmaker/PolyLite PLA Translucent" + ], + "name": "PolyLite PLA Translucent", + "filament_type": "PLA", + "filament_vendor": "Polymaker" + }, + "OFy14TRA": { + "filaments": [ + "Snapmaker/Snapmaker J1 ABS" + ], + "name": "Snapmaker J1 ABS", + "filament_type": "ABS", + "filament_vendor": "Snapmaker" + }, + "OFy3sW6j": { + "filaments": [ + "WonderMaker/WonderMaker ASA" + ], + "name": "WonderMaker ASA", + "filament_type": "ASA", + "filament_vendor": "WonderMaker" + }, + "OFy48TOp": { + "filaments": [ + "Flashforge/Generic TPU-95A" + ], + "name": "Generic TPU-95A", + "filament_type": "TPU-95A", + "filament_vendor": "Generic" + }, + "OFy8tYJE": { + "filaments": [ + "Cubicon/Cubicon ABS-A100" + ], + "name": "Cubicon ABS-A100", + "filament_type": "ABS", + "filament_vendor": "Cubicon" + }, + "OFyFyLIp": { + "filaments": [ + "SeeMeCNC/SeeMeCNC TPU" + ], + "name": "SeeMeCNC TPU", + "filament_type": "TPU", + "filament_vendor": "SeeMeCNC" + }, + "OFyHgT60": { + "filaments": [ + "OrcaArena/Arena PLA Sparkle" + ], + "name": "Arena PLA Sparkle", + "filament_type": "PLA", + "filament_vendor": "Orca Arena" + }, + "OFyJjkek": { + "filaments": [ + "BBL/addnorth TPU Pro Matte 95A" + ], + "name": "addnorth TPU Pro Matte 95A", + "filament_type": "TPU", + "filament_vendor": "addnorth" + }, + "OFyLWVF3": { + "filaments": [ + "Creality/Generic PETG-GF" + ], + "name": "Generic PETG-GF", + "filament_type": "PETG-GF", + "filament_vendor": "Generic" + }, + "OFyPG8v2": { + "filaments": [ + "Snapmaker/Snapmaker Dual PLA Eco" + ], + "name": "Snapmaker Dual PLA Eco", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFyPTnSk": { + "filaments": [ + "BBL/BETA PETG Heat Color Change" + ], + "name": "BETA PETG Heat Color Change", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFyQwdaM": { + "filaments": [ + "Volumic/Volumic ABS Ultra (Performance)" + ], + "name": "Volumic ABS Ultra (Performance)", + "filament_type": "ABS", + "filament_vendor": "Volumic" + }, + "OFyRCIMh": { + "filaments": [ + "FlyingBear/Other PC", + "InfiMech/Other PC" + ], + "name": "Other PC", + "filament_type": "PC", + "filament_vendor": "Other" + }, + "OFyUJI3q": { + "filaments": [ + "Volumic/Volumic ABS Ultra" + ], + "name": "Volumic ABS Ultra", + "filament_type": "ABS", + "filament_vendor": "Volumic" + }, + "OFybzvQN": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Gris Ceniza" + ], + "name": "FilAr PETG Gris Ceniza", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFyhjiNs": { + "filaments": [ + "Snapmaker/Snapmaker PVA" + ], + "name": "Snapmaker PVA", + "filament_type": "PVA", + "filament_vendor": "Snapmaker" + }, + "OFyj3m13": { + "filaments": [ + "Snapmaker/Snapmaker Dual PLA Silk" + ], + "name": "Snapmaker Dual PLA Silk", + "filament_type": "PLA", + "filament_vendor": "Snapmaker" + }, + "OFymnal9": { + "filaments": [ + "Sovol/Sovol Zero PETG HS Nozzle" + ], + "name": "Sovol Zero PETG HS Nozzle", + "filament_type": "PETG", + "filament_vendor": "Generic" + }, + "OFyoBZdm": { + "filaments": [ + "LH/LHS PLA" + ], + "name": "LHS PLA", + "filament_type": "PLA", + "filament_vendor": "LH Stinger" + }, + "OFyreocX": { + "filaments": [ + "Tiertime/Tiertime PVA" + ], + "name": "Tiertime PVA", + "filament_type": "PVA", + "filament_vendor": "Tiertime" + }, + "OFyrnlUn": { + "filaments": [ + "Snapmaker/Snapmaker J1 TPU" + ], + "name": "Snapmaker J1 TPU", + "filament_type": "TPU", + "filament_vendor": "Snapmaker" + }, + "OFysxCep": { + "filaments": [ + "OrcaFilamentLibrary/FilAr PETG Coral" + ], + "name": "FilAr PETG Coral", + "filament_type": "PETG", + "filament_vendor": "FilAr" + }, + "OFyxayW4": { + "filaments": [ + "BBL/AliZ PLA", + "OrcaFilamentLibrary/AliZ PLA" + ], + "name": "AliZ PLA", + "filament_type": "PLA", + "filament_vendor": "Aliz" + }, + "OFz1a1fy": { + "filaments": [ + "BBL/BETA PETG Metallic" + ], + "name": "BETA PETG Metallic", + "filament_type": "PETG", + "filament_vendor": "BETA" + }, + "OFz5oHgf": { + "filaments": [ + "MagicMaker/Generic PEEK" + ], + "name": "Generic PEEK", + "filament_type": "PEEK", + "filament_vendor": "Generic" + }, + "OFzAWsca": { + "filaments": [ + "Qidi/Qidi TPU 95A-HF" + ], + "name": "Qidi TPU 95A-HF", + "filament_type": "TPU", + "filament_vendor": "QIDI" + }, + "OFzB4uOs": { + "filaments": [ + "Sovol/Sovol Zero PLA Basic HS Nozzle" + ], + "name": "Sovol Zero PLA Basic HS Nozzle", + "filament_type": "PLA", + "filament_vendor": "Generic" + }, + "OFzRtFM9": { + "filaments": [ + "Prusa/Generic ASA HF" + ], + "name": "Generic ASA HF", + "filament_type": "ASA", + "filament_vendor": "Generic" + }, + "OFzS7zt4": { + "filaments": [ + "Anycubic/Anycubic PA" + ], + "name": "Anycubic PA", + "filament_type": "PA", + "filament_vendor": "Anycubic" + }, + "OFzY7N3Z": { + "filaments": [ + "Artillery/Artillery PLA" + ], + "name": "Artillery PLA", + "filament_type": "PLA", + "filament_vendor": "Artillery" + }, + "OFzaq7Yg": { + "filaments": [ + "BBL/BETA TPU 98A" + ], + "name": "BETA TPU 98A", + "filament_type": "TPU", + "filament_vendor": "BETA" + }, + "OFzk5oAo": { + "filaments": [ + "BBL/addnorth ABS rABS" + ], + "name": "addnorth ABS rABS", + "filament_type": "ABS", + "filament_vendor": "addnorth" + }, + "OFzrUUxc": { + "filaments": [], + "name": "DREMC ABS", + "filament_type": "ABS", + "filament_vendor": "DREMC" + }, + "OFztQ7rO": { + "filaments": [ + "LH/LHS ABS" + ], + "name": "LHS ABS", + "filament_type": "ASA", + "filament_vendor": "LH Stinger" + }, + "OFzwA5Z9": { + "filaments": [ + "Flashforge/FusRock PET-GF" + ], + "name": "FusRock PET-GF", + "filament_type": "PET-GF", + "filament_vendor": "FusRock" + }, + "OFzyIxba": { + "filaments": [ + "BBL/Bambu PVA", + "OrcaFilamentLibrary/Bambu PVA" + ], + "name": "Bambu PVA", + "filament_type": "PVA", + "filament_vendor": "Bambu Lab" + } } } diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index b9291e9433..37c7d16772 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -111,11 +111,10 @@ class SyntheticTree: # -- pipeline wrappers --------------------------------------------------- - def update_snapshot(self, allow_shared_catalog=False): + def update_snapshot(self): buf = io.StringIO() with contextlib.redirect_stdout(buf): - rc = afi.update_snapshot(self.profiles, self.snapshot, - allow_shared_catalog=allow_shared_catalog) + rc = afi.update_snapshot(self.profiles, self.snapshot) return rc, buf.getvalue() def check(self, map_path=None): @@ -144,19 +143,18 @@ class SyntheticTree: return dropped, errors, buf.getvalue() def make_clean_tree(apla_id="AX01", generic_id="OGFL99"): - """Baseline tree: OFL base+generic, a vendor family, a clean tuned generic. + """Baseline tree: OFL base+generic, a vendor filament, a clean tuned generic. - apla_id/generic_id default to arbitrary non-OF placeholders (grandfathered - into the snapshot below) since most tests only need "already assigned, - don't touch". TestAssign passes real OF-format ids instead: assign_missing_ids - now treats a non-OF declaration as missing and remints it, so a non-OF - baseline would no longer be a no-op there. + apla_id/generic_id default to arbitrary non-OF placeholders (sanctioned by + the snapshot below) since most tests only need "already assigned, don't + touch" and never run the checks. TestAssign and the check tests pass real + OF-format ids instead (OfCleanTreeCase). """ t = SyntheticTree() t.add_vendor(OFL, [ - preset("fdm_pla", filament_id=generic_id, instantiation=False, + preset("Generic PLA @base", filament_id=generic_id, instantiation=False, filament_vendor="Generic", filament_type="PLA"), - preset("Generic PLA @System", inherits="fdm_pla", + preset("Generic PLA @System", inherits="Generic PLA @base", compatible_printers=[]), ]) t.add_vendor("VendorA", [ @@ -180,7 +178,7 @@ class SyntheticTreeCase(unittest.TestCase): class OfCleanTreeCase(unittest.TestCase): - """Like SyntheticTreeCase, but the baseline family/generic already carry + """Like SyntheticTreeCase, but the baseline filament/generic already carry real OF-format ids (check 1 now rejects "AX01"/"OGFL99" unconditionally, with no snapshot exemption), so an otherwise-untouched tree still passes check_filament_ids. Tests that specifically need a non-OF baseline to @@ -190,7 +188,7 @@ class OfCleanTreeCase(unittest.TestCase): def setUp(self): self.t = make_clean_tree( apla_id=afi.generate_filament_id("AVendor", "PLA", "APLA"), - generic_id=afi.generate_filament_id("Generic", "PLA", "fdm_pla")) + generic_id=afi.generate_filament_id("Generic", "PLA", "Generic PLA")) self.addCleanup(self.t.cleanup) @@ -206,7 +204,7 @@ class TestMint(unittest.TestCase): def test_known_vector(self): # Hardcoded, independently computed vectors: freeze prefix, input string - # layout ("filament_product///") and base62 tail. + # layout ("filament_product///") and base62 tail. self.assertEqual(afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA"), "OF5CgdDq") self.assertEqual(afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA", @@ -247,7 +245,7 @@ class TestMint(unittest.TestCase): class TestBaseName(unittest.TestCase): - def test_family_derivation(self): + def test_filament_name_derivation(self): cases = [ ("X @base", "X"), ("Afinia PLA@HS", "Afinia PLA"), @@ -256,8 +254,8 @@ class TestBaseName(unittest.TestCase): ("A @B @C", "A"), # first @ wins ("Filár PLA 拓竹 @0.4 nozzle", "Filár PLA 拓竹"), ] - for name, family in cases: - self.assertEqual(afi.base_name(name), family, msg=name) + for name, filament_name in cases: + self.assertEqual(afi.base_name(name), filament_name, msg=name) # --------------------------------------------------------------------------- @@ -465,7 +463,17 @@ class TestChecks(OfCleanTreeCase): errors, out = self.t.check() self.assertGreater(errors, 0) self.assertIn('triple "AVendor/PETG/APLA" is not sanctioned', out) - self.assertIn('triple stability: snapshot triple "AVendor/PLA/APLA"', out) + self.assertIn('which records "AVendor/PLA/APLA"', out) + # Sanctioning the new triple is not enough: the old id is no longer its + # mint (check 3, nothing grandfathered) — the identity fix is a re-mint, + # reported once on the root, not again under the variant inheriting it. + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + self.assertIn("does not match the mint of its triple", out) + _changed, errors, out = self.t.remint(["VendorA"]) + self.assertEqual(errors, 0, out) rc, _out = self.t.update_snapshot() self.assertEqual(rc, 0) errors, out = self.t.check() @@ -492,8 +500,8 @@ class TestChecks(OfCleanTreeCase): _errors, out = self.t.check() # check 2 still wants a snapshot update self.assertNotIn("does not match the mint", out) - def test_check3_grandfathered_id_triple_pair(self): - # A non-conforming (id, triple) pair sanctioned by the snapshot passes. + def test_check3_no_grandfathering_of_a_wrong_declaration(self): + # Sanctioning the tree does not excuse a declaration from its mint. self.t.write_preset("VendorA", preset("CNEW @base", filament_id="OFZZZZZZ", instantiation=False, filament_vendor="CV", filament_type="PLA")) @@ -502,66 +510,72 @@ class TestChecks(OfCleanTreeCase): rc, _out = self.t.update_snapshot() self.assertEqual(rc, 0) errors, out = self.t.check() - self.assertEqual(errors, 0, out) + self.assertEqual(errors, 1, out) + self.assertIn("does not match the mint of its triple", out) - def test_check4_renamed_tuned_generic(self): + def test_check3_inherited_id_must_be_the_mint_of_own_triple(self): + # A preset of another filament inheriting APLA's root takes APLA's id, + # which is not the mint of ITS triple (AVendor/PLA/Tuned PLA). + self.t.write_preset("VendorA", preset("Tuned PLA @P1", inherits="APLA @base", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn('"Tuned PLA @P1" (VendorA/filament/Tuned PLA @P1.json) inherits ' + 'filament_id "%s"' % afi.generate_filament_id("AVendor", "PLA", "APLA"), + out) + self.assertIn('mints "%s"' % afi.generate_filament_id("AVendor", "PLA", "Tuned PLA"), + out) + # ... and sanctioning the tree does not excuse it either. + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 1, out) + + def test_check3_renamed_tuned_generic_is_an_identity_error(self): + # Riding the OFL generic under another base name: same rule, same error. self.t.write_preset("VendorA", preset("Tuned PLA @P1", inherits="Generic PLA @System", compatible_printers=["P1"])) errors, out = self.t.check() self.assertGreater(errors, 0) - self.assertIn("rename re-exposes the OFL preset", out) self.assertIn("Tuned PLA @P1", out) + self.assertIn("inherits filament_id", out) - def test_check4_empty_compatible_printers(self): - self.t.write_preset("VendorA", preset("Generic PLA @P2", - inherits="Generic PLA @System", - compatible_printers=[])) - errors, out = self.t.check() - self.assertGreater(errors, 0) - self.assertIn("cannot shadow the OFL preset", out) - - def test_check4_own_id_key_on_ofl_rider(self): - # A vendor root that declares its own id while inheriting an OFL family - # forks the family off the catalog id. - self.t.write_preset("VendorA", preset("GPLA @base", filament_id="AX77", - instantiation=False, - inherits="Generic PLA @System")) - self.t.write_preset("VendorA", preset("GPLA @P1", inherits="GPLA @base", - compatible_printers=["P1"])) - errors, out = self.t.check() - self.assertGreater(errors, 0) - self.assertIn('declares its own filament_id "AX77"', out) - - def test_check4_applies_to_non_generic_ofl_families(self): - fid = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA") - self.t.write_preset(OFL, preset("poly_pla_base", filament_id=fid, - instantiation=False, - filament_vendor="Polymaker", - filament_type="PLA")) - self.t.write_preset(OFL, preset("PolyLite PLA @System", - inherits="poly_pla_base", - compatible_printers=[])) - rc, _out = self.t.update_snapshot() - self.assertEqual(rc, 0) - self.t.write_preset("VendorA", preset("PolyX PLA @P1", - inherits="PolyLite PLA @System", - compatible_printers=["P1"])) - errors, out = self.t.check() - self.assertGreater(errors, 0) - self.assertIn("rename re-exposes the OFL preset", out) - self.assertIn("PolyX PLA @P1", out) - - def test_check4_exception_is_grandfathered(self): - self.t.write_preset("VendorA", preset("Tuned PLA @P1", + def test_check3_own_key_on_an_instantiated_preset_is_fine(self): + # Where the id comes from is irrelevant: a variant may carry the key. + apla_id = afi.generate_filament_id("AVendor", "PLA", "APLA") + self.t.write_preset("VendorA", preset("APLA @P1", filament_id=apla_id, + inherits="APLA @base", + compatible_printers=["P1 0.4 nozzle"]), + register=False) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + + def test_check3_inheriting_a_real_filament_of_another_product_is_fine(self): + # A branded product may inherit the OFL generic (an instantiated + # preset) for its settings; it declares its own triple's id. + fid = afi.generate_filament_id("BV", "PLA", "Branded PLA") + self.t.write_preset("VendorA", preset("Branded PLA @P1", filament_id=fid, inherits="Generic PLA @System", + filament_vendor="BV", compatible_printers=["P1"])) rc, _out = self.t.update_snapshot() self.assertEqual(rc, 0) errors, out = self.t.check() self.assertEqual(errors, 0, out) + # With a wrong key it is a plain mint mismatch: the parent plays no + # part in the verdict. + drifted = afi.generate_filament_id("AVendor", "PLA", "APLA") + self.t.write_preset("VendorA", preset("Branded PLA @P1", filament_id=drifted, + inherits="Generic PLA @System", + filament_vendor="BV", + compatible_printers=["P1"]), + register=False) + errors, out = self.t.check() + self.assertGreater(errors, 0) + self.assertIn("does not match the mint of its triple", out) - def test_check5_reserved_namespace_claims(self): + def test_check4_reserved_namespace_claims(self): for fid, marker in [("GFX99", "Bambu AMS/RFID catalog"), ("QD_X_PLA", "composed by the device"), ("P1a2b3c4", "user-custom"), @@ -579,31 +593,7 @@ class TestChecks(OfCleanTreeCase): self.assertIn("reserved id space", out) self.assertIn(marker, out) - def test_check6a_instantiated_preset_with_own_key(self): - # Same value the child would already resolve through inherits: this - # isolates check 6a (own key present) from check 6b (value drift). - apla_id = afi.generate_filament_id("AVendor", "PLA", "APLA") - self.t.write_preset("VendorA", preset("APLA @P1", filament_id=apla_id, - inherits="APLA @base", - compatible_printers=["P1 0.4 nozzle"]), - register=False) - errors, out = self.t.check() - self.assertGreater(errors, 0) - self.assertIn("declares its own filament_id key", out) - - def test_check6b_declared_vs_inherited_drift(self): - apla_id = afi.generate_filament_id("AVendor", "PLA", "APLA") - drifted = afi.generate_filament_id("AVendor", "PLA", "APLA", salt=1) - self.t.write_preset("VendorA", preset("APLA @P1", filament_id=drifted, - inherits="APLA @base", - compatible_printers=["P1 0.4 nozzle"]), - register=False) - errors, out = self.t.check() - self.assertGreater(errors, 0) - self.assertIn(f'declares filament_id "{drifted}" but its inherits chain resolves ' - f'"{apla_id}"', out) - - def test_check6c_unresolvable_instantiated_filament(self): + def test_check3c_unresolvable_instantiated_filament(self): self.t.write_preset("VendorA", preset("DNEW @P1", compatible_printers=["P1"])) errors, out = self.t.check() self.assertGreater(errors, 0) @@ -617,8 +607,8 @@ class TestChecks(OfCleanTreeCase): self.assertIn("snapshot not found", out) -class TestCheck7(OfCleanTreeCase): - def test_7a_empty_vendor_is_hard_error(self): +class TestCheck5(OfCleanTreeCase): + def test_5a_empty_vendor_is_hard_error(self): fid = afi.generate_filament_id("", "PLA", "NVPLA") self.t.write_preset("VendorA", preset("NVPLA @base", filament_id=fid, instantiation=False, @@ -629,14 +619,14 @@ class TestCheck7(OfCleanTreeCase): self.assertGreater(errors, 0) self.assertIn("resolves empty filament_vendor", out) self.assertIn('filament_vendor "Generic"', out) - # No grandfathering: sanctioning the tree does not silence check 8a. + # No grandfathering: sanctioning the tree does not silence check 5a. rc, _out = self.t.update_snapshot() self.assertEqual(rc, 0) errors, out = self.t.check() self.assertEqual(errors, 1, out) self.assertIn("resolves empty filament_vendor", out) - def test_7b_divergent_family_triples(self): + def test_5b_divergent_filament_triples(self): id1 = afi.generate_filament_id("MV", "PLA", "MPLA") id2 = afi.generate_filament_id("MV", "PETG", "MPLA") self.t.write_preset("VendorA", preset("MPLA @base1", filament_id=id1, @@ -652,14 +642,14 @@ class TestCheck7(OfCleanTreeCase): self.assertIn("divergent triples", out) self.assertIn("MV/PLA/MPLA", out) self.assertIn("MV/PETG/MPLA", out) - # ... until --update-snapshot grandfathers the family in triple_exceptions. + # No grandfathering: sanctioning the tree does not silence check 5b. rc, _out = self.t.update_snapshot() self.assertEqual(rc, 0) - self.assertIn("VendorA/MPLA", load_json_file(self.t.snapshot)["triple_exceptions"]) errors, out = self.t.check() - self.assertEqual(errors, 0, out) + self.assertEqual(errors, 1, out) + self.assertIn("divergent triples", out) - def test_7_cross_bundle_divergence_is_warning_only(self): + def test_5_cross_bundle_divergence_is_warning_only(self): fid = afi.generate_filament_id("BV", "PETG", "APLA") self.t.add_vendor("VendorB", [ preset("APLA @base", filament_id=fid, instantiation=False, @@ -676,7 +666,7 @@ class TestCheck7(OfCleanTreeCase): self.assertIn('"APLA"', out) -class TestCheck8(OfCleanTreeCase): +class TestCheck6(OfCleanTreeCase): def _write_map(self, rows): path = os.path.join(self.t.dir, "bambu_filament_ids.json") ubfi.write_map(path, rows, "testcommit", "2026-09-04") @@ -784,15 +774,36 @@ class TestUpdateSnapshot(SyntheticTreeCase): self.assertTrue(first.endswith(b"\n")) self.assertNotIn(b"\r", first) snap = json.loads(first.decode("utf-8")) + self.assertEqual(list(snap), ["ids"]) # state only, no exception lists self.assertEqual(list(snap["ids"]), sorted(snap["ids"])) - self.assertEqual(snap["ids"]["AX01"], ["VendorA/APLA"]) - self.assertEqual(snap["ids"]["OGFL99"], - ["OrcaFilamentLibrary/Generic PLA", "VendorA/Generic PLA"]) - self.assertEqual(snap["triples"]["AX01"], [["AVendor", "PLA", "APLA"]]) - self.assertEqual(snap["triples"]["OGFL99"], [["Generic", "PLA", "fdm_pla"]]) - self.assertEqual(snap["triple_exceptions"], []) + self.assertEqual(snap["ids"]["AX01"], { + "filaments": ["VendorA/APLA"], "name": "APLA", + "filament_type": "PLA", "filament_vendor": "AVendor"}) + self.assertEqual(snap["ids"]["OGFL99"], { + "filaments": ["OrcaFilamentLibrary/Generic PLA", "VendorA/Generic PLA"], + "name": "Generic PLA", "filament_type": "PLA", "filament_vendor": "Generic"}) + # Key order is part of the on-disk format. + self.assertEqual(list(snap["ids"]["AX01"]), + ["filaments", "name", "filament_type", "filament_vendor"]) - def test_refuses_new_reserved_namespace_claims(self): + def test_refuses_an_id_declared_under_two_triples(self): + # VendorB re-declares APLA's id for a different product: one id, two + # triples. No single entry can describe it, and check 3 rejects it anyway. + self.t.add_vendor("VendorB", [ + preset("BPLA @base", filament_id="AX01", instantiation=False, + filament_vendor="BVendor", filament_type="PLA"), + preset("BPLA @P1", inherits="BPLA @base", compatible_printers=["P1"]), + ]) + with open(self.t.snapshot, "rb") as f: + before = f.read() + rc, out = self.t.update_snapshot() + self.assertEqual(rc, 1) + self.assertIn('refusing to sanction filament_id "AX01": declared under 2 triples ' + '(AVendor/PLA/APLA; BVendor/PLA/BPLA)', out) + with open(self.t.snapshot, "rb") as f: + self.assertEqual(f.read(), before) # nothing written on refusal + + def test_refuses_reserved_namespace_ids(self): self.t.write_preset("VendorA", preset("CNEW @base", filament_id="GFX99", instantiation=False, filament_vendor="CV", @@ -806,10 +817,6 @@ class TestUpdateSnapshot(SyntheticTreeCase): self.assertIn("refusing to sanction", out) with open(self.t.snapshot, "rb") as f: self.assertEqual(f.read(), before) # nothing written on refusal - rc, _out = self.t.update_snapshot(allow_shared_catalog=True) - self.assertEqual(rc, 0) - snap = load_json_file(self.t.snapshot) - self.assertEqual(snap["ids"]["GFX99"], ["VendorA/CNEW"]) # --------------------------------------------------------------------------- @@ -822,7 +829,7 @@ class TestAssign(OfCleanTreeCase): self.assertEqual((changed, errors), (0, 0)) self.assertIn("nothing to do (0 files changed)", out) - def test_mints_into_family_root_and_rootless_member(self): + def test_mints_into_filament_root_and_rootless_member(self): self.t.write_preset("VendorA", preset("FNEW @base", instantiation=False, filament_vendor="FV", filament_type="PLA")) @@ -850,7 +857,7 @@ class TestAssign(OfCleanTreeCase): self.assertEqual((changed, errors), (0, 0)) self.assertIn("nothing to do", out) - def test_refuses_family_with_incomplete_triple(self): + def test_refuses_filament_with_incomplete_triple(self): self.t.write_preset("VendorA", preset("ENEW @base", instantiation=False)) self.t.write_preset("VendorA", preset("ENEW @P1", inherits="ENEW @base", compatible_printers=["P1"])) @@ -860,7 +867,7 @@ class TestAssign(OfCleanTreeCase): self.assertIn("resolves empty filament_vendor and filament_type", out) self.assertIn("mint key needs both", out) - def test_refuses_family_with_divergent_root_fields(self): + def test_refuses_filament_with_divergent_root_fields(self): self.t.write_preset("VendorA", preset("HNEW @base1", instantiation=False, filament_vendor="HV", filament_type="PLA")) @@ -876,7 +883,10 @@ class TestAssign(OfCleanTreeCase): self.assertGreater(errors, 0) self.assertIn("divergent (filament_vendor, filament_type)", out) - def test_shared_root_between_families_is_refused(self): + def test_parent_of_another_filament_never_receives_the_key(self): + # Members whose id-less parent belongs to another filament (here one + # parent shared by two filaments) carry the key themselves: the + # parent's own triple would mint a different id (check 3). self.t.write_preset("VendorA", preset("shared_base", instantiation=False, filament_vendor="SV", filament_type="PLA")) @@ -885,14 +895,24 @@ class TestAssign(OfCleanTreeCase): self.t.write_preset("VendorA", preset("INEW @P1", inherits="shared_base", compatible_printers=["P1"])) changed, errors, out = self.t.assign() - self.assertEqual(changed, 0) - self.assertGreater(errors, 0) - self.assertIn("shared with famil", out) + self.assertEqual(errors, 0, out) + self.assertEqual(changed, 2) + for filament_name in ("HNEW", "INEW"): + member = load_json_file(self.t.preset_path("VendorA", f"{filament_name} @P1")) + self.assertEqual(member["filament_id"], + afi.generate_filament_id("SV", "PLA", filament_name)) + parent = load_json_file(self.t.preset_path("VendorA", "shared_base")) + self.assertNotIn("filament_id", parent) + # ... and the tree they leave behind passes the identity check. + rc, _out = self.t.update_snapshot() + self.assertEqual(rc, 0) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) def test_non_of_declaration_is_treated_as_missing(self): # A declaration that isn't OF-format (e.g. a vendor bundle synced from # an upstream catalog, like BBL's GF ids) is reminted like a missing - # family, not left alone. + # filament, not left alone. self.t.write_preset("VendorA", preset("Synced PLA @base", filament_id="GFZZ00", instantiation=False, filament_vendor="ZV", filament_type="PLA")) @@ -913,7 +933,7 @@ class TestAssign(OfCleanTreeCase): changed, errors, _out = self.t.assign() self.assertEqual((changed, errors), (0, 0)) - def test_non_of_multi_root_family_converges_on_one_id(self): + def test_non_of_multi_root_filament_converges_on_one_id(self): # Two per-printer roots of one product (same triple), both carrying # the SAME non-OF id — the shape a synced vendor bundle ships (e.g. # BambuStudio's own per-printer @base files). They must converge on @@ -1068,7 +1088,7 @@ class TestRemint(SyntheticTreeCase): root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) self.assertEqual(root["filament_id"], want) # OFL was not part of the run - ofl_root = load_json_file(self.t.preset_path(OFL, "fdm_pla")) + ofl_root = load_json_file(self.t.preset_path(OFL, "Generic PLA @base")) self.assertEqual(ofl_root["filament_id"], "OGFL99") # idempotent: a second run over the same vendor rewrites nothing changed, errors, _out = self.t.remint(["VendorA"]) @@ -1170,7 +1190,7 @@ class TestDropRedundantIds(SyntheticTreeCase): self.assertNotIn("filament_id", gone) kept = load_json_file(self.t.preset_path("VendorA", "Tuned PLA @P3")) self.assertEqual(kept["filament_id"], "OGFL99") - # vendor-rooted families are untouched + # vendor-rooted filaments are untouched root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) self.assertEqual(root["filament_id"], "AX01") @@ -1196,7 +1216,7 @@ class TestMintCli(unittest.TestCase): def test_requires_exactly_three_parts(self): with self.assertRaises(SystemExit), \ contextlib.redirect_stderr(io.StringIO()): - afi.main(["--mint", "Vendor/Family"]) + afi.main(["--mint", "Vendor/Filament"]) # --------------------------------------------------------------------------- @@ -1222,7 +1242,7 @@ class TestRealTree(unittest.TestCase): class TestReviewFixes(OfCleanTreeCase): def test_check3_skips_of_id_inherited_from_other_vendor(self): - # An OFL family carries its own minted OF id and a vendor tunes it + # An OFL filament carries its own minted OF id and a vendor tunes it # correctly (same base name, non-empty printers). The new claim must # trip only the snapshot gate, never mint conformance. fid = afi.generate_filament_id("Generic", "PLA", "Generic PLA Matte") @@ -1248,7 +1268,7 @@ class TestReviewFixes(OfCleanTreeCase): errors, out = self.t.check() self.assertEqual(errors, 0, out) - def test_check6c_prints_expected_mint(self): + def test_check3c_prints_expected_mint(self): self.t.write_preset("VendorA", preset("Orphan PLA @P1", compatible_printers=["P1 0.4 nozzle"], filament_vendor="OV", @@ -1263,24 +1283,24 @@ class TestReviewFixes(OfCleanTreeCase): # --------------------------------------------------------------------------- class TestBambuMap(unittest.TestCase): - def _bs_tree(self, families): - # families: list of (family, bambu_id, vendor, type); builds a minimal BBL bundle - # with an @base per family carrying the id and one instantiated child. + def _bs_tree(self, filaments): + # filaments: list of (name, bambu_id, vendor, type); builds a minimal BBL + # bundle with an @base per filament carrying the id and one instantiated child. t = SyntheticTree() self.addCleanup(t.cleanup) presets = [] - for family, bambu_id, vendor, ftype in families: - presets.append(preset(f"{family} @base", filament_id=bambu_id, + for filament_name, bambu_id, vendor, ftype in filaments: + presets.append(preset(f"{filament_name} @base", filament_id=bambu_id, instantiation=False, filament_vendor=vendor, filament_type=ftype)) - presets.append(preset(f"{family} @P1", inherits=f"{family} @base", + presets.append(preset(f"{filament_name} @P1", inherits=f"{filament_name} @base", compatible_printers=["P1 0.4 nozzle"])) t.add_vendor("BBL", presets) filaments, errors = afi.load_vendor_filaments(t.profiles, "BBL") self.assertEqual(errors, []) return filaments - def test_one_row_per_family(self): + def test_one_row_per_filament(self): rows = ubfi.derive_rows(self._bs_tree([("Bambu ABS", "GFB00", "Bambu Lab", "ABS")]), {}) self.assertEqual(rows, {afi.generate_filament_id("Bambu Lab", "ABS", "Bambu ABS"): {"bambu_id": "GFB00", "vendor": "Bambu Lab", "type": "ABS", "name": "Bambu ABS"}}) @@ -1308,13 +1328,13 @@ class TestOrcaTriplesFromAnalysis(unittest.TestCase): t.add_vendor("VendorA", [ # Same triple declared under two different ids on purpose: mirrors # a real, sanctioned case (Cubicon's xCeler line keeps its own id - # per printer instead of inheriting the family's @base id). + # per printer instead of inheriting the filament's @base id). # Ambiguous, but must stay harmless unless something needs it. preset("Ambig PLA @base", filament_id="OF111111", instantiation=False, filament_vendor="V", filament_type="PLA"), preset("Ambig PLA @P1", filament_id="OF222222", inherits="Ambig PLA @base", compatible_printers=["P1"]), - # An unambiguous family elsewhere in the same tree. + # An unambiguous filament elsewhere in the same tree. preset("Needed PLA @base", filament_id="OF333333", instantiation=False, filament_vendor="V2", filament_type="PLA"), preset("Needed PLA @P1", inherits="Needed PLA @base", @@ -1375,9 +1395,9 @@ class TestDriftReport(unittest.TestCase): compatible_printers=["P1"]), ]) rows = { - # matches the BBL bundle's "Match PLA" family: no drift either way + # matches the BBL bundle's "Match PLA" filament: no drift either way "OFmatch01": {"bambu_id": "GFX01", "vendor": "V", "type": "PLA", "name": "Match PLA"}, - # no family of this identity in the BBL bundle above + # no filament of this identity in the BBL bundle above "OFghost01": {"bambu_id": "GFX02", "vendor": "V", "type": "PLA", "name": "Upstream Only PLA"}, } orca_analysis = afi.analyze_tree(t.profiles) @@ -1386,8 +1406,8 @@ class TestDriftReport(unittest.TestCase): report = "\n".join(lines) self.assertIn("Upstream Only PLA", report) - self.assertIn("Orca BBL families with no row: 1", report) - self.assertNotIn("Match PLA", report) # the matched family is not drift + self.assertIn("Orca BBL filaments with no row: 1", report) + self.assertNotIn("Match PLA", report) # the matched filament is not drift if __name__ == "__main__": diff --git a/scripts/update_bambu_filament_ids.py b/scripts/update_bambu_filament_ids.py index fc195a3f9c..7a4a67d2a3 100644 --- a/scripts/update_bambu_filament_ids.py +++ b/scripts/update_bambu_filament_ids.py @@ -12,11 +12,11 @@ src/slic3r/Utils/BBLPrinterAgent.cpp loads it at runtime and translates an id only where it crosses to or from a Bambu printer, so the correspondence never has to be hand-maintained. See docs/HLSD/filament_id.md. -One row per BambuStudio filament PRODUCT: one commercial line = one +One row per BambuStudio filament PRODUCT: one named spool product = one "@base"-declared filament_id, shared by every per-printer/per-nozzle instantiation of it (BambuStudio follows the same one-product-one-id shape Orca's own filament_id policy does). A row's key reuses whatever OF id Orca -already ships for that same (filament_vendor, filament_type, family) triple; +already ships for that same (filament_vendor, filament_type, filament) triple; a triple Orca does not ship anywhere yet gets a freshly generated one. Map format: @@ -38,9 +38,9 @@ Run from anywhere: python3 scripts/update_bambu_filament_ids.py --ref REF clone this BambuStudio ref instead of master --output PATH write here instead of resources/printers/bambu_filament_ids.json -After writing, an informational drift report is printed: BambuStudio families +After writing, an informational drift report is printed: BambuStudio filaments Orca ships nothing with the same identity for, and a count of Orca's own BBL -families that matched no BambuStudio row. Neither blocks the write; both are +filaments that matched no BambuStudio row. Neither blocks the write; both are for a human to read. """ @@ -78,32 +78,34 @@ BAMBUSTUDIO_REPO = "https://github.com/bambulab/BambuStudio" # --------------------------------------------------------------------------- def derive_rows(bs_filaments, orca_triples): - """orca_triples: {(vendor, type, family): orca_id} built from analyze_tree()["triples"].""" - by_family = {} # family -> (bambu_id, triple) + """orca_triples: {(vendor, type, name): orca_id} from analyze_tree()["triples"].""" + by_filament = {} # filament_name -> (bambu_id, triple) for rec in bs_filaments.values(): if not rec["instantiation"]: continue bambu_id, _src, _entry = resolve_filament_id(rec["name"], bs_filaments, {}) if not bambu_id: continue - family = base_name(rec["name"]) + filament_name = base_name(rec["name"]) triple = resolve_triple(rec["name"], bs_filaments, {}) - prev = by_family.setdefault(family, (bambu_id, triple)) + prev = by_filament.setdefault(filament_name, (bambu_id, triple)) if prev != (bambu_id, triple): - raise SystemExit(f"BambuStudio family {family!r} is not one product: {prev} vs {(bambu_id, triple)}") + raise SystemExit(f"BambuStudio filament {filament_name!r} is not one " + f"product: {prev} vs {(bambu_id, triple)}") rows, seen = {}, {} - for family, (bambu_id, triple) in sorted(by_family.items()): + for filament_name, (bambu_id, triple) in sorted(by_filament.items()): if bambu_id in seen: - raise SystemExit(f"Bambu id {bambu_id} is shared by {seen[bambu_id]!r} and {family!r}") - seen[bambu_id] = family + raise SystemExit(f"Bambu id {bambu_id} is shared by " + f"{seen[bambu_id]!r} and {filament_name!r}") + seen[bambu_id] = filament_name orca_id = orca_triples.get(triple) or generate_filament_id(*triple) # reuse a salted id if we ship one rows[orca_id] = {"bambu_id": bambu_id, "vendor": triple[0], "type": triple[1], "name": triple[2]} return rows def orca_triples_from_analysis(orca_analysis, needed_triples): - """{(vendor, type, family): orca_id}, inverted from analyze_tree()["triples"] - (id -> [[vendor, type, family], ...]) and restricted to `needed_triples` + """{(vendor, type, name): orca_id}, inverted from analyze_tree()["triples"] + (id -> [[vendor, type, name], ...]) and restricted to `needed_triples` (the triples BambuStudio's own bundle ships, i.e. the only ones derive_rows will ever look up). @@ -118,7 +120,7 @@ def orca_triples_from_analysis(orca_analysis, needed_triples): Restricting the scan to needed_triples matters for that check: elsewhere in the tree one triple legitimately resolves two different ids on purpose (e.g. Cubicon's xCeler line declares its own id per printer instead of - inheriting its family's, sanctioned in scripts/filament_id_snapshot.json) + inheriting its root's, sanctioned in scripts/filament_id_snapshot.json) and that pre-existing, Bambu-unrelated divergence must not block a map that never reads it. """ @@ -150,9 +152,9 @@ def drift_report(rows, orca_analysis): independently, so only the (vendor, type, name) identity is comparable). Returns print-ready lines: one per BambuStudio row triple with no - same-triple family in Orca's BBL bundle (upstream ships it, we ship + same-triple filament in Orca's BBL bundle (upstream ships it, we ship nothing with that identity there — sometimes a genuinely missing product, - sometimes a renamed one), then a count of Orca's own BBL families that + sometimes a renamed one), then a count of Orca's own BBL filaments that matched no BambuStudio row (Orca-only products, e.g. a name-drifted duplicate of one already counted in the first list). """ @@ -160,19 +162,20 @@ def drift_report(rows, orca_analysis): bbl_filaments = orca_analysis["vendors"].get("BBL", {}) ofl_filaments = orca_analysis["vendors"].get(OFL, {}) - orca_families = {} + orca_filaments = {} for rec in bbl_filaments.values(): if not rec["instantiation"]: continue triple = resolve_triple(rec["name"], bbl_filaments, ofl_filaments) - orca_families.setdefault(base_name(rec["name"]), triple) + orca_filaments.setdefault(base_name(rec["name"]), triple) lines = [] - for triple in sorted(row_triples - set(orca_families.values())): + for triple in sorted(row_triples - set(orca_filaments.values())): lines.append(f'upstream ships {triple[2]!r} ({triple[0]}/{triple[1]}), ' "we ship nothing with that identity") - orca_only = [family for family, triple in orca_families.items() if triple not in row_triples] - lines.append(f"Orca BBL families with no row: {len(orca_only)} Orca-only product(s)") + orca_only = [name for name, triple in orca_filaments.items() + if triple not in row_triples] + lines.append(f"Orca BBL filaments with no row: {len(orca_only)} Orca-only product(s)") return lines From 3500a1e588fb3618ec1393f094310f181709d4ee Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 7 Sep 2026 10:46:59 +0800 Subject: [PATCH 47/52] unify id generation scripts --- .github/pull_request_template.md | 2 +- docs/HLSD/filament_id.md | 86 +- scripts/assign_vendor_setting_ids.py | 258 ----- scripts/orca_extra_profile_check.py | 20 +- ...assign_filament_ids.py => orca_id_tool.py} | 1009 +++++++++++------ scripts/tests/test_filament_id.py | 696 ++++++++++-- scripts/tests/test_setting_id.py | 902 +++++++++++++++ scripts/update_bambu_filament_ids.py | 4 +- src/libslic3r/Preset.cpp | 2 +- src/libslic3r/Preset.hpp | 4 +- src/libslic3r/PresetBundle.cpp | 4 +- tests/libslic3r/test_preset_setting_id.cpp | 6 +- 12 files changed, 2230 insertions(+), 763 deletions(-) delete mode 100644 scripts/assign_vendor_setting_ids.py rename scripts/{assign_filament_ids.py => orca_id_tool.py} (54%) create mode 100644 scripts/tests/test_setting_id.py diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8b82f51730..cf9799df19 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -20,7 +20,7 @@ > Please describe the tests that you have conducted to verify the changes made in this PR. --> -- [ ] New filament/material profiles: I wrote **no** `filament_id` key by hand — I ran `python scripts/assign_filament_ids.py` and `--update-snapshot` and committed both diffs (see `doc/developer-reference/filament_id.md`) +- [ ] New filament/material profiles: I wrote **no** `filament_id` key by hand — I ran `python scripts/orca_id_tool.py --generate` and `--update-snapshot` and committed both diffs (see [docs/HLSD/filament_id.md](docs/HLSD/filament_id.md)) -- [ ] New filament/material profiles: I wrote **no** `filament_id` key by hand — I ran `python scripts/orca_id_tool.py --generate` and `--update-snapshot` and committed both diffs (see [docs/HLSD/filament_id.md](docs/HLSD/filament_id.md)) - diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h index 36354cebbf..51fb744f72 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h @@ -58,7 +58,7 @@ public: std::string id; std::string tag_uid; // tag_uid - std::string setting_id; // tray_info_idx + std::string setting_id; // tray_info_idx, map to the filament_id std::string filament_setting_id; // setting_id std::string m_fila_type; std::string sub_brands; From 6943b6ddc3de741d2997fe0f49ef47e6dafb2923 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 7 Sep 2026 15:45:29 +0800 Subject: [PATCH 49/52] Make Cubicon's "@base" filament presets true base profiles Cubicon's nine "@base" presets were the only instantiated ones of the 196 "@base" filament presets in the library; the other 187 are instantiation:false. Being selectable, and claiming xCeler-I and xCeler-Plus, they put two presets of one product on those two printers - which is what forced the nine filament_id salt splits: one product deliberately kept on two ids so AMS matching stayed unambiguous. Flip them to instantiation:false and drop the compatible_printers, setting_id and filament_settings_id that a base has no use for, matching what the other 150 bases carry. The three "@Cubicon xCeler-{I,Mini,Plus} 0.4 nozzle" variants keep one printer each, so every printer still sees exactly one preset per product and they converge on its single id; the nine salted ids retire. A base is not added to the preset collection, so user presets that inherited the selectable "@base" - the v2.3.2-v2.4.2 fixtures have one per material - would lose their parent. renamed_from on the xCeler-I variant, the first model the base ever claimed, redirects them; a preset built on "@base" while printing on an xCeler-Plus narrows to the xCeler-I. The six default_materials / default_filament_profile fields named "Cubicon PLA @Cubicon xCeler-", dropping the " 0.4 nozzle" the presets actually carry, so none of them ever resolved; each model now names its own variant. Claude-Session: https://claude.ai/code/session_01Q3zm9HuyskkSb4hynviV99 --- resources/profiles/Cubicon.json | 2 +- ...icon ABS @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon ABS @base.json | 12 +--- ...ABS-A100 @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../filament/Cubicon ABS-A100 @base.json | 12 +--- ...con ABSk @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon ABSk @base.json | 12 +--- ...on PA-CF @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PA-CF @base.json | 12 +--- ...bicon PC @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PC @base.json | 12 +--- ...con PETG @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PETG @base.json | 12 +--- ...icon PLA @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PLA @base.json | 12 +--- ...con PLA+ @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../Cubicon/filament/Cubicon PLA+ @base.json | 12 +--- ...n PLAi21 @Cubicon xCeler-I 0.4 nozzle.json | 1 + .../filament/Cubicon PLAi21 @base.json | 12 +--- .../machine/Cubicon xCeler-I 0.4 nozzle.json | 2 +- .../Cubicon/machine/Cubicon xCeler-I.json | 2 +- .../Cubicon xCeler-Mini 0.4 nozzle.json | 2 +- .../Cubicon/machine/Cubicon xCeler-Mini.json | 2 +- .../Cubicon xCeler-Plus 0.4 nozzle.json | 2 +- .../Cubicon/machine/Cubicon xCeler-Plus.json | 2 +- scripts/filament_id_snapshot.json | 72 ------------------- 26 files changed, 34 insertions(+), 169 deletions(-) diff --git a/resources/profiles/Cubicon.json b/resources/profiles/Cubicon.json index 1fca49355c..ffb363c807 100644 --- a/resources/profiles/Cubicon.json +++ b/resources/profiles/Cubicon.json @@ -1,6 +1,6 @@ { "name": "Cubicon", - "version": "02.04.00.03", + "version": "02.04.00.04", "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 52deadf521..93949a7c80 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon ABS @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABS @base", + "renamed_from": "Cubicon ABS @base", "setting_id": "VJEyK87ZYvHmamB9", "filament_id": "OFpDo5Ix", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json index 998588dbac..31efe73b11 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS @base.json @@ -2,17 +2,9 @@ "type": "filament", "name": "Cubicon ABS @base", "inherits": "fdm_filament_abs", - "setting_id": "aZRVIlDze62Bbw81", - "filament_id": "OFafocjw", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OFpDo5Ix", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "Cubicon ABS @base" - ], "filament_vendor": [ "Cubicon" ], 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 cc34341ceb..2788688e1b 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABS-A100 @base", + "renamed_from": "Cubicon ABS-A100 @base", "setting_id": "OfiOryklf7FDVCz8", "filament_id": "OFy8tYJE", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json index a943b60a8b..5c64ed0fa5 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABS-A100 @base.json @@ -2,17 +2,9 @@ "type": "filament", "name": "Cubicon ABS-A100 @base", "inherits": "Cubicon ABS @base", - "setting_id": "vGIT4KZvqojIh2up", - "filament_id": "OFN9fefN", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OFy8tYJE", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "Cubicon ABS-A100 @base" - ], "filament_type": [ "ABS" ], 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 0deea7e69f..cdb6324af1 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon ABSk @base", + "renamed_from": "Cubicon ABSk @base", "setting_id": "TXcodZkab4fofnEn", "filament_id": "OForhBi4", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json index a042ecbea3..46a8f2d48c 100644 --- a/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon ABSk @base.json @@ -2,17 +2,9 @@ "type": "filament", "name": "Cubicon ABSk @base", "inherits": "Cubicon ABS @base", - "setting_id": "UbOUO0K3Y2iRPBtf", - "filament_id": "OFgVQkqW", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OForhBi4", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "Cubicon ABSk @base" - ], "filament_type": [ "ABS" ], 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 c8e56eaa13..09a5d917f4 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PA-CF @base", + "renamed_from": "Cubicon PA-CF @base", "setting_id": "nupuIJggdc1EKDqG", "filament_id": "OFiEz2XI", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json index daf2b62754..b9ac6cf4c9 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PA-CF @base.json @@ -2,17 +2,9 @@ "type": "filament", "name": "Cubicon PA-CF @base", "inherits": "fdm_filament_pa", - "setting_id": "55cJDyCoEudfOePY", - "filament_id": "OFD21ije", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OFiEz2XI", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "Cubicon PA-CF @base" - ], "filament_type": [ "PA" ], 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 d115a6da70..e37f5f063c 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon PC @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PC @base", + "renamed_from": "Cubicon PC @base", "setting_id": "c0sUPS0SRYUNjEpB", "filament_id": "OFEj7sca", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon PC @base.json b/resources/profiles/Cubicon/filament/Cubicon PC @base.json index 83e3afb15b..001434a2b1 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PC @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PC @base.json @@ -2,17 +2,9 @@ "type": "filament", "name": "Cubicon PC @base", "inherits": "fdm_filament_pc", - "setting_id": "Mzg6jfwb2nqfGkdV", - "filament_id": "OF79Fbo6", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OFEj7sca", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "Cubicon PC @base" - ], "filament_type": [ "PC" ], 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 001b4ecf54..db9a90c42d 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon PETG @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PETG @base", + "renamed_from": "Cubicon PETG @base", "setting_id": "dsX01tCkd2Usk104", "filament_id": "OFoBTKmn", "instantiation": "true", diff --git a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json index cf4ac7a4af..61fc5c647a 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PETG @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PETG @base.json @@ -2,17 +2,9 @@ "type": "filament", "name": "Cubicon PETG @base", "inherits": "fdm_filament_pet", - "setting_id": "bGfz4phwIdqSz0Hx", - "filament_id": "OF8Hx3Pi", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OFoBTKmn", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "Cubicon PETG @base" - ], "filament_type": [ "PETG" ], 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 5110547028..3b3c9b1d4c 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon PLA @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PLA @base", + "renamed_from": "Cubicon PLA @base", "from": "system", "setting_id": "xXJgHAeNf1JdCitr", "filament_id": "OFEwRwmL", diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json index 7dd06c3498..53df18afc5 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA @base.json @@ -3,17 +3,9 @@ "name": "Cubicon PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "setting_id": "ypwdJAu0NlEsWpf4", - "filament_id": "OFjcwUEm", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OFEwRwmL", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "CBC_MTC_0" - ], "filament_type": [ "PLA" ], 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 3acad023d0..3674c61e3f 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PLA+ @base", + "renamed_from": "Cubicon PLA+ @base", "from": "system", "setting_id": "fNR2Bw3e4TGcWhq0", "filament_id": "OF7tt7DO", diff --git a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json index 5b98d6fcf8..5e7c8dc10b 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLA+ @base.json @@ -2,19 +2,11 @@ "type": "filament", "name": "Cubicon PLA+ @base", "inherits": "Cubicon PLA @base", - "setting_id": "ETnuhiOZRh1jxrVk", - "filament_id": "OFRmGKVX", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OF7tt7DO", + "instantiation": "false", "default_filament_colour": [ "" ], - "filament_settings_id": [ - "Cubicon PLA+ @base" - ], "filament_type": [ "PLA" ], 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 865d1af0c3..74bff5f995 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 @@ -2,6 +2,7 @@ "type": "filament", "name": "Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle", "inherits": "Cubicon PLAi21 @base", + "renamed_from": "Cubicon PLAi21 @base", "from": "system", "setting_id": "vcLVF3cglagBfVAF", "filament_id": "OFRhBryT", diff --git a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json index 7c851e2a34..39b5b31430 100644 --- a/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json +++ b/resources/profiles/Cubicon/filament/Cubicon PLAi21 @base.json @@ -2,17 +2,9 @@ "type": "filament", "name": "Cubicon PLAi21 @base", "inherits": "Cubicon PLA @base", - "setting_id": "mnwC7ijXXV72lBOt", - "filament_id": "OFdkWDiy", - "instantiation": "true", - "compatible_printers": [ - "Cubicon xCeler-I 0.4 nozzle", - "Cubicon xCeler-Plus 0.4 nozzle" - ], + "filament_id": "OFRhBryT", + "instantiation": "false", "default_filament_colour": "", - "filament_settings_id": [ - "Cubicon PLAi21 @base" - ], "filament_type": [ "PLA" ], diff --git a/resources/profiles/Cubicon/machine/Cubicon xCeler-I 0.4 nozzle.json b/resources/profiles/Cubicon/machine/Cubicon xCeler-I 0.4 nozzle.json index 140b31986c..2844a543a4 100644 --- a/resources/profiles/Cubicon/machine/Cubicon xCeler-I 0.4 nozzle.json +++ b/resources/profiles/Cubicon/machine/Cubicon xCeler-I 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Cubicon PLA @Cubicon xCeler-I" + "Cubicon PLA @Cubicon xCeler-I 0.4 nozzle" ], "default_print_profile": "cubicon default @base", "deretraction_speed": [ diff --git a/resources/profiles/Cubicon/machine/Cubicon xCeler-I.json b/resources/profiles/Cubicon/machine/Cubicon xCeler-I.json index 0377e94716..64d00c37c4 100644 --- a/resources/profiles/Cubicon/machine/Cubicon xCeler-I.json +++ b/resources/profiles/Cubicon/machine/Cubicon xCeler-I.json @@ -6,5 +6,5 @@ "bed_texture": "Cubicon xCeler-I_bed_texture.svg", "family": "Cubicon", "machine_tech": "FFF", - "default_materials": "Cubicon PLA @Cubicon xCeler-I" + "default_materials": "Cubicon PLA @Cubicon xCeler-I 0.4 nozzle" } diff --git a/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini 0.4 nozzle.json b/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini 0.4 nozzle.json index 451e4716d2..85bd7be03f 100644 --- a/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini 0.4 nozzle.json +++ b/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Cubicon PLA @Cubicon xCeler-Mini" + "Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle" ], "default_print_profile": "cubicon default @base", "deretraction_speed": [ diff --git a/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini.json b/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini.json index af43717058..bb55969134 100644 --- a/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini.json +++ b/resources/profiles/Cubicon/machine/Cubicon xCeler-Mini.json @@ -6,5 +6,5 @@ "bed_texture": "Cubicon xCeler-I_bed_texture.svg", "family": "Cubicon", "machine_tech": "FFF", - "default_materials": "Cubicon PLA @Cubicon xCeler-Mini" + "default_materials": "Cubicon PLA @Cubicon xCeler-Mini 0.4 nozzle" } diff --git a/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus 0.4 nozzle.json b/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus 0.4 nozzle.json index 483c82be07..9c38452bf5 100644 --- a/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus 0.4 nozzle.json +++ b/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus 0.4 nozzle.json @@ -23,7 +23,7 @@ "cooling_tube_length": "0", "cooling_tube_retraction": "0", "default_filament_profile": [ - "Cubicon PLA @Cubicon xCeler-Plus" + "Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle" ], "default_print_profile": "cubicon default @base", "deretraction_speed": [ diff --git a/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus.json b/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus.json index 28bdd1ce65..41bac9acc1 100644 --- a/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus.json +++ b/resources/profiles/Cubicon/machine/Cubicon xCeler-Plus.json @@ -6,5 +6,5 @@ "bed_texture": "Cubicon xCeler-I_bed_texture.svg", "family": "Cubicon", "machine_tech": "FFF", - "default_materials": "Cubicon PLA @Cubicon xCeler-Plus" + "default_materials": "Cubicon PLA @Cubicon xCeler-Plus 0.4 nozzle" } diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 9b0c64f473..76c078a55d 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -899,14 +899,6 @@ "filament_type": "PHA", "filament_vendor": "Generic" }, - "OF79Fbo6": { - "filaments": [ - "Cubicon/Cubicon PC" - ], - "name": "Cubicon PC", - "filament_type": "PC", - "filament_vendor": "Cubicon" - }, "OF7H3VJM": { "filaments": [ "OrcaFilamentLibrary/eSUN PLA-Marble" @@ -997,14 +989,6 @@ "filament_type": "TPU-64D", "filament_vendor": "Flashforge" }, - "OF8Hx3Pi": { - "filaments": [ - "Cubicon/Cubicon PETG" - ], - "name": "Cubicon PETG", - "filament_type": "PETG", - "filament_vendor": "Cubicon" - }, "OF8Jl6NT": { "filaments": [ "Snapmaker/Snapmaker J1 PET" @@ -1477,14 +1461,6 @@ "filament_type": "PLA", "filament_vendor": "Volumic" }, - "OFD21ije": { - "filaments": [ - "Cubicon/Cubicon PA-CF" - ], - "name": "Cubicon PA-CF", - "filament_type": "PA", - "filament_vendor": "Cubicon" - }, "OFD8loeT": { "filaments": [ "re3D/re3D rPETG" @@ -2950,14 +2926,6 @@ "filament_type": "PLA", "filament_vendor": "addnorth" }, - "OFN9fefN": { - "filaments": [ - "Cubicon/Cubicon ABS-A100" - ], - "name": "Cubicon ABS-A100", - "filament_type": "ABS", - "filament_vendor": "Cubicon" - }, "OFNBlAPT": { "filaments": [ "OrcaArena/Arena PETG Basic" @@ -3514,14 +3482,6 @@ "filament_type": "PVA", "filament_vendor": "Volumic" }, - "OFRmGKVX": { - "filaments": [ - "Cubicon/Cubicon PLA+" - ], - "name": "Cubicon PLA+", - "filament_type": "PLA", - "filament_vendor": "Cubicon" - }, "OFRooa0F": { "filaments": [ "Snapmaker/Snapmaker Dual PA-CF" @@ -4623,14 +4583,6 @@ "filament_type": "PC-CF", "filament_vendor": "Generic" }, - "OFafocjw": { - "filaments": [ - "Cubicon/Cubicon ABS" - ], - "name": "Cubicon ABS", - "filament_type": "ABS", - "filament_vendor": "Cubicon" - }, "OFausr3F": { "filaments": [ "OrcaFilamentLibrary/FilAr PLA-mate Rosa" @@ -4871,14 +4823,6 @@ "filament_type": "PLA", "filament_vendor": "Snapmaker" }, - "OFdkWDiy": { - "filaments": [ - "Cubicon/Cubicon PLAi21" - ], - "name": "Cubicon PLAi21", - "filament_type": "PLA", - "filament_vendor": "Cubicon" - }, "OFdqkWtz": { "filaments": [ "Flashforge/Flashforge PLA Luminous" @@ -5296,14 +5240,6 @@ "filament_type": "PC", "filament_vendor": "Volumic" }, - "OFgVQkqW": { - "filaments": [ - "Cubicon/Cubicon ABSk" - ], - "name": "Cubicon ABSk", - "filament_type": "ABS", - "filament_vendor": "Cubicon" - }, "OFgXgt98": { "filaments": [ "Artillery/Artillery ABS" @@ -5807,14 +5743,6 @@ "filament_type": "PLA", "filament_vendor": "Polymaker" }, - "OFjcwUEm": { - "filaments": [ - "Cubicon/Cubicon PLA" - ], - "name": "Cubicon PLA", - "filament_type": "PLA", - "filament_vendor": "Cubicon" - }, "OFjiXpyf": { "filaments": [ "Qidi/Generic TPU 95A", From eec4ae1e876b75142faa7aede8136b079f70933a Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 7 Sep 2026 14:46:26 +0800 Subject: [PATCH 50/52] Retire the untuned re3D umbrella presets superseded by the nozzle variants "Update re:3D profiles" (#13750) added the tuned "@0.4/@0.8 nozzle" and "@0.8/@1.75 nozzle" variants but kept the five original un-suffixed presets, trimming each to a stub that overrides only filament_vendor while still claiming every printer of both nozzles. On any re3D printer the stub was selectable alongside the ~50-key variant that actually tunes the material, which is what forced five filament_id salt splits to keep the pair apart. Drop the stubs. The variants already carry the products' ids, so nothing is re-minted; renamed_from redirects each retired name to the smaller-nozzle variant, and "re3D rPETG @0.8 nozzle" additionally takes over the "re3D Greengate rPETG" mapping that lived on the deleted umbrella. Each printer model's default_materials now lists the variants for its own nozzles rather than the stub. --- resources/profiles/re3D.json | 22 +--------- .../re3D/filament/re3D PC @0.4 nozzle.json | 1 + resources/profiles/re3D/filament/re3D PC.json | 23 ----------- .../re3D/filament/re3D PETG @0.4 nozzle.json | 1 + .../profiles/re3D/filament/re3D PETG.json | 23 ----------- .../re3D/filament/re3D PLA @0.4 nozzle.json | 1 + .../profiles/re3D/filament/re3D PLA.json | 23 ----------- .../re3D/filament/re3D rPETG @0.8 nozzle.json | 2 +- .../profiles/re3D/filament/re3D rPETG.json | 24 ----------- .../re3D/filament/re3D rPP @0.8 nozzle.json | 1 + .../profiles/re3D/filament/re3D rPP.json | 23 ----------- .../machine/re3D Gigabot 4 0.4 nozzle.json | 2 +- .../machine/re3D Gigabot 4 0.8 nozzle.json | 2 +- .../re3D Gigabot 4 XLT 0.4 nozzle.json | 2 +- .../re3D Gigabot 4 XLT 0.8 nozzle.json | 2 +- .../re3D/machine/re3D Gigabot 4 XLT.json | 2 +- .../profiles/re3D/machine/re3D Gigabot 4.json | 2 +- .../re3D/machine/re3D GigabotX 2 XLT.json | 2 +- .../re3D/machine/re3D GigabotX 2.json | 2 +- .../machine/re3D Terabot 4 0.4 nozzle.json | 2 +- .../machine/re3D Terabot 4 0.8 nozzle.json | 2 +- .../profiles/re3D/machine/re3D Terabot 4.json | 2 +- .../re3D/machine/re3D TerabotX 2.json | 2 +- scripts/filament_id_snapshot.json | 40 ------------------- 24 files changed, 18 insertions(+), 190 deletions(-) delete mode 100644 resources/profiles/re3D/filament/re3D PC.json delete mode 100644 resources/profiles/re3D/filament/re3D PETG.json delete mode 100644 resources/profiles/re3D/filament/re3D PLA.json delete mode 100644 resources/profiles/re3D/filament/re3D rPETG.json delete mode 100644 resources/profiles/re3D/filament/re3D rPP.json diff --git a/resources/profiles/re3D.json b/resources/profiles/re3D.json index 9a00807c1a..7a66cb4ce1 100644 --- a/resources/profiles/re3D.json +++ b/resources/profiles/re3D.json @@ -1,7 +1,7 @@ { "name": "re3D", "url": "", - "version": "03.00.09", + "version": "03.00.10", "force_update": "0", "description": "re3D configurations", "machine_model_list": [ @@ -93,26 +93,6 @@ "name": "fdm_filament_pc", "sub_path": "filament/fdm_filament_pc.json" }, - { - "name": "re3D PLA", - "sub_path": "filament/re3D PLA.json" - }, - { - "name": "re3D PETG", - "sub_path": "filament/re3D PETG.json" - }, - { - "name": "re3D PC", - "sub_path": "filament/re3D PC.json" - }, - { - "name": "re3D rPETG", - "sub_path": "filament/re3D rPETG.json" - }, - { - "name": "re3D rPP", - "sub_path": "filament/re3D rPP.json" - }, { "name": "re3D PLA @0.4 nozzle", "sub_path": "filament/re3D PLA @0.4 nozzle.json" 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 518e61bb32..aa4a0baa91 100644 --- a/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PC @0.4 nozzle.json @@ -2,6 +2,7 @@ "type": "filament", "name": "re3D PC @0.4 nozzle", "from": "system", + "renamed_from": "re3D PC", "instantiation": "true", "inherits": "fdm_filament_pc", "filament_id": "OFU3QXL7", diff --git a/resources/profiles/re3D/filament/re3D PC.json b/resources/profiles/re3D/filament/re3D PC.json deleted file mode 100644 index dbd43758de..0000000000 --- a/resources/profiles/re3D/filament/re3D PC.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "filament", - "name": "re3D PC", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pc", - "filament_id": "OFwbsgWj", - "setting_id": "eSR00TZTotTvJs8l", - "filament_settings_id": [ - "re3D PC" - ], - "compatible_printers": [ - "re3D Gigabot 4 0.4 nozzle", - "re3D Gigabot 4 XLT 0.4 nozzle", - "re3D Terabot 4 0.4 nozzle", - "re3D Gigabot 4 0.8 nozzle", - "re3D Gigabot 4 XLT 0.8 nozzle", - "re3D Terabot 4 0.8 nozzle" - ], - "filament_vendor": [ - "re3D" - ] -} \ 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 19c315897a..444fa42c55 100644 --- a/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PETG @0.4 nozzle.json @@ -2,6 +2,7 @@ "type": "filament", "name": "re3D PETG @0.4 nozzle", "from": "system", + "renamed_from": "re3D PETG", "instantiation": "true", "inherits": "fdm_filament_pet", "filament_id": "OF3F63OE", diff --git a/resources/profiles/re3D/filament/re3D PETG.json b/resources/profiles/re3D/filament/re3D PETG.json deleted file mode 100644 index 273ef5165b..0000000000 --- a/resources/profiles/re3D/filament/re3D PETG.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "filament", - "name": "re3D PETG", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pet", - "filament_id": "OFX0etlv", - "setting_id": "msXDK31R8KOvqNqK", - "filament_settings_id": [ - "re3D PETG" - ], - "compatible_printers": [ - "re3D Gigabot 4 0.4 nozzle", - "re3D Gigabot 4 XLT 0.4 nozzle", - "re3D Terabot 4 0.4 nozzle", - "re3D Gigabot 4 0.8 nozzle", - "re3D Gigabot 4 XLT 0.8 nozzle", - "re3D Terabot 4 0.8 nozzle" - ], - "filament_vendor": [ - "re3D" - ] -} \ 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 a5a2868975..0314778218 100644 --- a/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json +++ b/resources/profiles/re3D/filament/re3D PLA @0.4 nozzle.json @@ -2,6 +2,7 @@ "type": "filament", "name": "re3D PLA @0.4 nozzle", "from": "system", + "renamed_from": "re3D PLA", "instantiation": "true", "inherits": "fdm_filament_pla", "filament_id": "OFRyOsZj", diff --git a/resources/profiles/re3D/filament/re3D PLA.json b/resources/profiles/re3D/filament/re3D PLA.json deleted file mode 100644 index 7637049e80..0000000000 --- a/resources/profiles/re3D/filament/re3D PLA.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "filament", - "name": "re3D PLA", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pla", - "filament_id": "OFDdEaoL", - "setting_id": "nPpDwvFg7WQr7K3t", - "filament_settings_id": [ - "re3D PLA" - ], - "compatible_printers": [ - "re3D Gigabot 4 0.4 nozzle", - "re3D Gigabot 4 XLT 0.4 nozzle", - "re3D Terabot 4 0.4 nozzle", - "re3D Gigabot 4 0.8 nozzle", - "re3D Gigabot 4 XLT 0.8 nozzle", - "re3D Terabot 4 0.8 nozzle" - ], - "filament_vendor": [ - "re3D" - ] -} \ 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 ffe4277113..5bc3c037bf 100644 --- a/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPETG @0.8 nozzle.json @@ -4,7 +4,7 @@ "setting_id": "WlELqPVnuL7DaTxs", "name": "re3D rPETG @0.8 nozzle", "from": "system", - "renamed_from": "re3D Greengate rPETG @0.8 nozzle", + "renamed_from": "re3D Greengate rPETG @0.8 nozzle;re3D rPETG;re3D Greengate rPETG", "instantiation": "true", "inherits": "fdm_filament_pet", "nozzle_temperature_initial_layer": [ diff --git a/resources/profiles/re3D/filament/re3D rPETG.json b/resources/profiles/re3D/filament/re3D rPETG.json deleted file mode 100644 index 85f359d828..0000000000 --- a/resources/profiles/re3D/filament/re3D rPETG.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "filament", - "name": "re3D rPETG", - "from": "system", - "renamed_from": "re3D Greengate rPETG", - "instantiation": "true", - "inherits": "fdm_filament_pet", - "filament_id": "OFD8loeT", - "setting_id": "6aESuJ2S2Kogd4Lq", - "filament_settings_id": [ - "re3D rPETG" - ], - "compatible_printers": [ - "re3D GigabotX 2 0.8 nozzle", - "re3D GigabotX 2 XLT 0.8 nozzle", - "re3D TerabotX 2 0.8 nozzle", - "re3D GigabotX 2 1.75 nozzle", - "re3D GigabotX 2 XLT 1.75 nozzle", - "re3D TerabotX 2 1.75 nozzle" - ], - "filament_vendor": [ - "re3D" - ] -} \ 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 ed12ec1a0d..0b8b99eda1 100644 --- a/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json +++ b/resources/profiles/re3D/filament/re3D rPP @0.8 nozzle.json @@ -4,6 +4,7 @@ "setting_id": "i9ii0b7qFYWnkGSq", "name": "re3D rPP @0.8 nozzle", "from": "system", + "renamed_from": "re3D rPP", "instantiation": "true", "inherits": "fdm_filament_pp", "filament_type": [ diff --git a/resources/profiles/re3D/filament/re3D rPP.json b/resources/profiles/re3D/filament/re3D rPP.json deleted file mode 100644 index c4d2d776a9..0000000000 --- a/resources/profiles/re3D/filament/re3D rPP.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "filament", - "name": "re3D rPP", - "from": "system", - "instantiation": "true", - "inherits": "fdm_filament_pp", - "filament_id": "OFm8rqoY", - "setting_id": "8PB62qm5Cd3SHLf4", - "filament_settings_id": [ - "re3D rPP" - ], - "compatible_printers": [ - "re3D GigabotX 2 0.8 nozzle", - "re3D GigabotX 2 XLT 0.8 nozzle", - "re3D TerabotX 2 0.8 nozzle", - "re3D GigabotX 2 1.75 nozzle", - "re3D GigabotX 2 XLT 1.75 nozzle", - "re3D TerabotX 2 1.75 nozzle" - ], - "filament_vendor": [ - "re3D" - ] -} \ 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 d14d3c260e..6ab8f4ed61 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 @@ -7,7 +7,7 @@ "model_id": "GB4", "printer_model": "re3D Gigabot 4", "bed_texture": "re3D Gigabot 4_buildplate_texture.svg", - "default_materials": "re3D PETG;re3D PLA;re3D PC", + "default_materials": "re3D PETG @0.4 nozzle;re3D PLA @0.4 nozzle;re3D PC @0.4 nozzle", "printable_area": [ "0x0", "590x0", 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 9bc78b36ad..e87cdacef1 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 @@ -7,7 +7,7 @@ "model_id": "GB4", "printer_model": "re3D Gigabot 4", "bed_texture": "re3D Gigabot 4_buildplate_texture.svg", - "default_materials": "re3D PETG;re3D PLA;re3D PC", + "default_materials": "re3D PETG @0.8 nozzle;re3D PLA @0.8 nozzle;re3D PC @0.8 nozzle", "printable_area": [ "0x0", "590x0", 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 56b4030476..dedb29c3e8 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 @@ -7,7 +7,7 @@ "model_id": "GB4", "printer_model": "re3D Gigabot 4 XLT", "bed_texture": "re3D Gigabot 4 XLT_buildplate_texture.svg", - "default_materials": "re3D PETG;re3D PLA;re3D PC", + "default_materials": "re3D PETG @0.4 nozzle;re3D PLA @0.4 nozzle;re3D PC @0.4 nozzle", "printable_area": [ "0x0", "590x0", 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 a14e730b30..f34890289c 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 @@ -7,7 +7,7 @@ "model_id": "GB4", "printer_model": "re3D Gigabot 4 XLT", "bed_texture": "re3D Gigabot 4 XLT_buildplate_texture.svg", - "default_materials": "re3D PETG;re3D PLA;re3D PC", + "default_materials": "re3D PETG @0.8 nozzle;re3D PLA @0.8 nozzle;re3D PC @0.8 nozzle", "printable_area": [ "0x0", "590x0", diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json index fcad038e3d..fd7858de60 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4 XLT.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "re3D Gigabot 4 XLT_buildplate_texture.svg", "hotend_model": "GB-HOTEND.stl", - "default_materials": "re3D PLA;re3D PETG;re3D PC;" + "default_materials": "re3D PLA @0.4 nozzle;re3D PLA @0.8 nozzle;re3D PETG @0.4 nozzle;re3D PETG @0.8 nozzle;re3D PC @0.4 nozzle;re3D PC @0.8 nozzle" } diff --git a/resources/profiles/re3D/machine/re3D Gigabot 4.json b/resources/profiles/re3D/machine/re3D Gigabot 4.json index 642fabc7d8..67531b1214 100644 --- a/resources/profiles/re3D/machine/re3D Gigabot 4.json +++ b/resources/profiles/re3D/machine/re3D Gigabot 4.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "re3D Gigabot 4_buildplate_texture.svg", "hotend_model": "GB-HOTEND.stl", - "default_materials": "re3D PLA;re3D PETG;re3D PC;" + "default_materials": "re3D PLA @0.4 nozzle;re3D PLA @0.8 nozzle;re3D PETG @0.4 nozzle;re3D PETG @0.8 nozzle;re3D PC @0.4 nozzle;re3D PC @0.8 nozzle" } diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json index 99800331d9..1b77360139 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2 XLT.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "re3D GigabotX 2 XLT_buildplate_texture.svg", "hotend_model": "GBX-HOTEND.stl", - "default_materials": "re3D rPETG;re3D rPP;" + "default_materials": "re3D rPETG @0.8 nozzle;re3D rPETG @1.75 nozzle;re3D rPP @0.8 nozzle;re3D rPP @1.75 nozzle" } diff --git a/resources/profiles/re3D/machine/re3D GigabotX 2.json b/resources/profiles/re3D/machine/re3D GigabotX 2.json index 3a1db130b0..20ec4ff207 100644 --- a/resources/profiles/re3D/machine/re3D GigabotX 2.json +++ b/resources/profiles/re3D/machine/re3D GigabotX 2.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "re3D GigabotX 2_buildplate_texture.svg", "hotend_model": "GBX-HOTEND.stl", - "default_materials": "re3D rPETG;re3D rPP;" + "default_materials": "re3D rPETG @0.8 nozzle;re3D rPETG @1.75 nozzle;re3D rPP @0.8 nozzle;re3D rPP @1.75 nozzle" } 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 d24ba564a2..e57e4058af 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 @@ -7,7 +7,7 @@ "model_id": "TB4", "printer_model": "re3D Terabot 4", "bed_texture": "re3D Terabot 4_buildplate_texture.svg", - "default_materials": "re3D PETG;re3D PLA;re3D PC", + "default_materials": "re3D PETG @0.4 nozzle;re3D PLA @0.4 nozzle;re3D PC @0.4 nozzle", "printable_area": [ "0x0", "915x0", 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 6255e84896..c15ac1f8b9 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 @@ -7,7 +7,7 @@ "model_id": "TB4", "printer_model": "re3D Terabot 4", "bed_texture": "re3D Terabot 4_buildplate_texture.svg", - "default_materials": "re3D PETG;re3D PLA;re3D PC", + "default_materials": "re3D PETG @0.8 nozzle;re3D PLA @0.8 nozzle;re3D PC @0.8 nozzle", "printable_area": [ "0x0", "915x0", diff --git a/resources/profiles/re3D/machine/re3D Terabot 4.json b/resources/profiles/re3D/machine/re3D Terabot 4.json index 725f67470e..eaca67fba0 100644 --- a/resources/profiles/re3D/machine/re3D Terabot 4.json +++ b/resources/profiles/re3D/machine/re3D Terabot 4.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "re3D Terabot 4_buildplate_texture.svg", "hotend_model": "GB-HOTEND.stl", - "default_materials": "re3D PLA;re3D PETG;re3D PC;" + "default_materials": "re3D PLA @0.4 nozzle;re3D PLA @0.8 nozzle;re3D PETG @0.4 nozzle;re3D PETG @0.8 nozzle;re3D PC @0.4 nozzle;re3D PC @0.8 nozzle" } diff --git a/resources/profiles/re3D/machine/re3D TerabotX 2.json b/resources/profiles/re3D/machine/re3D TerabotX 2.json index f541a62ad7..177c1e05d0 100644 --- a/resources/profiles/re3D/machine/re3D TerabotX 2.json +++ b/resources/profiles/re3D/machine/re3D TerabotX 2.json @@ -9,5 +9,5 @@ "bed_model": "", "bed_texture": "re3D TerabotX 2_buildplate_texture.svg", "hotend_model": "GBX-HOTEND.stl", - "default_materials": "re3D rPETG;re3D rPP;" + "default_materials": "re3D rPETG @0.8 nozzle;re3D rPETG @1.75 nozzle;re3D rPP @0.8 nozzle;re3D rPP @1.75 nozzle" } diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 76c078a55d..34eb407ef5 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -1461,14 +1461,6 @@ "filament_type": "PLA", "filament_vendor": "Volumic" }, - "OFD8loeT": { - "filaments": [ - "re3D/re3D rPETG" - ], - "name": "re3D rPETG", - "filament_type": "PETG", - "filament_vendor": "re3D" - }, "OFD9taow": { "filaments": [ "FlyingBear/FlyingBear PLA Hyper" @@ -1578,14 +1570,6 @@ "filament_type": "PLA", "filament_vendor": "Generic" }, - "OFDdEaoL": { - "filaments": [ - "re3D/re3D PLA" - ], - "name": "re3D PLA", - "filament_type": "PLA", - "filament_vendor": "re3D" - }, "OFDe8uyM": { "filaments": [ "OrcaFilamentLibrary/Valment PLA" @@ -4049,14 +4033,6 @@ "filament_type": "PLA", "filament_vendor": "FilAr" }, - "OFX0etlv": { - "filaments": [ - "re3D/re3D PETG" - ], - "name": "re3D PETG", - "filament_type": "PETG", - "filament_vendor": "re3D" - }, "OFX0ycRQ": { "filaments": [ "BBL/Fiberon PA12-CF", @@ -6084,14 +6060,6 @@ "filament_type": "PLA", "filament_vendor": "CoLiDo" }, - "OFm8rqoY": { - "filaments": [ - "re3D/re3D rPP" - ], - "name": "re3D rPP", - "filament_type": "PP", - "filament_vendor": "re3D" - }, "OFmCOW2Y": { "filaments": [ "re3D/re3D rPETG" @@ -7387,14 +7355,6 @@ "filament_type": "PA-GF", "filament_vendor": "Polymaker" }, - "OFwbsgWj": { - "filaments": [ - "re3D/re3D PC" - ], - "name": "re3D PC", - "filament_type": "PC", - "filament_vendor": "re3D" - }, "OFwc74ck": { "filaments": [ "BBL/BETA PLA Matte" From b394ca891f9faa140dbb0480d50d313252b30e76 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 7 Sep 2026 17:29:38 +0800 Subject: [PATCH 51/52] Retire the superseded Snapmaker PLA-CF preset for the U1 0.4 nozzle "Snapmaker PLA-CF @U1" and "Snapmaker PLA-CF @U1 0.4 nozzle" are the same product on the same printer: both pin "Snapmaker U1 (0.4 nozzle)", and only a filament_id salt split kept them apart. The first came with the original U1 profiles (#10225); the second with the tool-changer rework (#15039), which added the 0.4/0.6/0.8 nozzle variants and left the older preset behind. Drop the older one and re-mint the 0.4 variant onto OFhQf8ou, the id its 0.6 and 0.8 siblings already carry, so the product holds one id across the three nozzles; renamed_from redirects the retired name. Users of the retired preset get the #15039 tuning - 39 keys differ, including nozzle 230 -> 240 C, plate 55 -> 65 C and vitrification 150 -> 45 C - which is what the 0.6 and 0.8 variants already ship. "Snapmaker PLA-CF @U1 base" stays. #15039 orphaned it by having the nozzle variants inherit fdm_filament_pla directly, so it is unreferenced, but it is a base in the vendor's own convention - 10 of the 14 @U1 families with nozzle variants wire them to one - and it holds U1 loading and cooling values the variants never set. Wiring them to it would change slicing output, which is Snapmaker's call to make, not this PR's. Claude-Session: https://claude.ai/code/session_01Q3zm9HuyskkSb4hynviV99 --- resources/profiles/Snapmaker.json | 6 +----- .../filament/Snapmaker PLA-CF @U1 0.4 nozzle.json | 3 ++- .../Snapmaker/filament/Snapmaker PLA-CF @U1.json | 14 -------------- scripts/filament_id_snapshot.json | 8 -------- 4 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1.json diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index 50aaad2715..0407dca2ec 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -1,6 +1,6 @@ { "name": "Snapmaker", - "version": "02.04.00.11", + "version": "02.04.00.12", "force_update": "0", "description": "Snapmaker configurations", "machine_model_list": [ @@ -1572,10 +1572,6 @@ "name": "Snapmaker PLA Silk @0.2 nozzle", "sub_path": "filament/Snapmaker PLA Silk @0.2 nozzle.json" }, - { - "name": "Snapmaker PLA-CF @U1", - "sub_path": "filament/Snapmaker PLA-CF @U1.json" - }, { "name": "Snapmaker PLA-CF", "sub_path": "filament/Snapmaker PLA-CF.json" 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 44aeab2a48..9ce38a9782 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 @@ -3,8 +3,9 @@ "name": "Snapmaker PLA-CF @U1 0.4 nozzle", "inherits": "fdm_filament_pla", "from": "system", + "renamed_from": "Snapmaker PLA-CF @U1", "setting_id": "2INwruC3ZVkBTdUT", - "filament_id": "OFf52D4e", + "filament_id": "OFhQf8ou", "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1.json deleted file mode 100644 index 9091258467..0000000000 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "Snapmaker PLA-CF @U1", - "inherits": "Snapmaker PLA-CF @U1 base", - "from": "system", - "setting_id": "eyNYjz24xQYyAQcv", - "instantiation": "true", - "compatible_printers": [ - "Snapmaker U1 (0.4 nozzle)" - ], - "filament_retract_length_toolchange": [ - "5" - ] -} diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json index 34eb407ef5..5b45e5ca7e 100644 --- a/scripts/filament_id_snapshot.json +++ b/scripts/filament_id_snapshot.json @@ -4970,14 +4970,6 @@ "filament_type": "PETG", "filament_vendor": "QIDI" }, - "OFf52D4e": { - "filaments": [ - "Snapmaker/Snapmaker PLA-CF" - ], - "name": "Snapmaker PLA-CF", - "filament_type": "PLA-CF", - "filament_vendor": "Snapmaker" - }, "OFf5awy4": { "filaments": [ "OrcaFilamentLibrary/Eolas Prints PLA Matte" From 9e1b000e7f08531eabd9efb7a932a983a7421438 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 7 Sep 2026 14:53:06 +0800 Subject: [PATCH 52/52] Hold every filament product to exactly one id, with no exceptions filament_id is the plain mint of the product triple (filament_vendor, filament_type, filament name), and nothing else feeds it. The tooling used to accept any salt iteration of a preset's own triple, and its minting policy stepped past ids that other products held in the tree or in the snapshot, so which id a product got could depend on history. Every "salt split" in the tree masked a redundant preset rather than a real need, and no shipped id is salted, so salting goes entirely: no salt parameter, no id policy object, and --generate no longer reads the snapshot. --check now holds every declared and every inherited id to that one value and lists each preset that misses it, variants under a wrong root included, instead of folding them into the root's error. Two products whose triples mint one id is reported as a collision naming both, and --generate refuses to write it; the remedy is a rename so the triples differ. The Bambu catalog map generator keys its rows by the same mint rather than by what the tree already ships. No id changes: all 913 ids in the tree are already the mint of their triple, so --generate is a no-op and the snapshot is untouched. --- docs/HLSD/filament_id.md | 56 +++-- scripts/orca_id_tool.py | 240 ++++++++----------- scripts/tests/test_filament_id.py | 330 ++++++++++++--------------- scripts/tests/test_setting_id.py | 7 +- scripts/update_bambu_filament_ids.py | 63 +---- 5 files changed, 277 insertions(+), 419 deletions(-) diff --git a/docs/HLSD/filament_id.md b/docs/HLSD/filament_id.md index 92d75ca8ca..0aaf845909 100644 --- a/docs/HLSD/filament_id.md +++ b/docs/HLSD/filament_id.md @@ -129,7 +129,7 @@ key needed). Tuning a generic material → **join the OrcaFilamentLibrary filame | Color | never a new id | | Second diameter of the same product (1.75 + 2.85) | sibling filament, new id | | "High-speed" tuned for a *different printer model* | same id (it is a printer variant) | -| "High-speed" selectable *alongside* the normal preset on one printer | new id (it is a product line) | +| "High-speed" selectable *alongside* the normal preset on one printer | new name, so a new id (it is a product line) | ## Structure rules @@ -149,7 +149,9 @@ key needed). Tuning a generic material → **join the OrcaFilamentLibrary filame are both the filament `MyBrand PLA`. 3. **Within one filament, variants' `compatible_printers` are pairwise disjoint** — per printer, at most one compatible instantiated preset per id, or AMS matching turns ambiguous. The - C++ validator's `-f` check enforces this. + C++ validator's `-f` check enforces this, tree-wide in CI. Since one product carries one id + and cannot be split onto two, this rule is the *only* remedy for such an ambiguity: narrow + the `compatible_printers`, or retire the preset that duplicates another. 4. **Generics belong to OrcaFilamentLibrary.** A vendor tuning a generic material inherits `Generic X @System`, keeps the `Generic X` base name (that alias is what hides the library preset on your printers, and it is what makes its triple — and so its id — the library's) @@ -194,12 +196,17 @@ Snapmaker bundles alike; the OFL generic `Generic/PLA/Generic PLA` mints `OFDSrz by 35 bundles — most by independent declarations converging on the same mint, the rest purely through inheritance from the OFL preset. -On the rare collision with an existing id, the minter salts the input (`…/1`, -`…/2`, …) until free, and the result is frozen in the profile file. Salting is also used -deliberately: a *salt split* keeps two presets of one product on distinct ids where a single -id would be AMS-ambiguous on the same printer — the "selectable alongside" situation from the -table above, resolved without inventing a second filament name. The tooling recognizes salt -iterations of a triple as conformant and preserves such splits across re-mints. +Nothing but the triple feeds the mint — not the rest of the tree, not the snapshot, not what +another preset of the product happens to carry. Determined triple, determined id: one product +carries one id and there is no second acceptable value for it, so any other value on a preset +is a mismatch `--check` reports and `--generate` pulls back. Two *different* products whose +triples mint the same base62 value would be a collision (a roughly 36-bit id space against a +few thousand products); nothing salts past it: `--check` reports it naming both products, +`--generate` refuses to write it, and the remedy is a rename so their triples differ. Where +two presets of one product would be AMS-ambiguous on a printer, the fix is likewise in the +profiles — make their `compatible_printers` disjoint (structure rule 3), retire the redundant +preset, or, if they really are different products, give them different names so their triples +differ. Never a second id for one triple. Workflow for a new filament: @@ -217,10 +224,10 @@ python scripts/orca_extra_profile_check.py # 6. ...and everything else CI `(filament_vendor, filament_type, filament name)` triple: it inserts one where an instantiated filament resolves none, and re-derives one that does not match. A preset that *inherits* a mismatching id is the one case left to the author — check 3b names it, and the fix is to inherit -a preset of the same filament or to give the preset its own key. It converges on an id the same -product already holds and salts only past ids *other* products hold, so an id already equal to a -salt iteration of its own triple is left alone and deliberate salt splits survive. The same run -assigns `generate_preset_setting_id(vendor, type, name)` to every instantiated filament, process +a preset of the same filament or to give the preset its own key. A declaration is left alone +exactly when it already equals the one id its triple mints, and a collision (check 3d) is +reported and left unwritten. The same run assigns +`generate_preset_setting_id(vendor, type, name)` to every instantiated filament, process and machine preset of every vendor except BBL, which keeps its authoritative `G*` ids, strips `setting_id` from base profiles, and fixes the misspelled `settings_id` key — dropped, or, for BBL, whose ids have no formula to fall back on, restored under the correct name. It is idempotent and @@ -231,9 +238,9 @@ check CI runs over both id kinds, of which `--check` is the `filament_id` half. - `--filament-id` limits the run to `filament_id`. - `--setting-id` limits the run to `setting_id`. The two exclude each other; pass neither to write both. -- `--vendor VENDOR` confines the run to that bundle; repeatable. The ids are still derived - tree-wide, so a narrowed run writes exactly what a full one would — and reports any duplicate - it was not allowed to clear, since only a run covering both bundles can. +- `--vendor VENDOR` confines the run to that bundle; repeatable. The id is a function of the + triple alone, so a narrowed run writes exactly what a full one would; `--check` reports + whatever it left outside. - `--dry-run` reports what `--generate` would do and writes nothing; with no mode of its own it implies `--generate`, so `--dry-run --vendor ` previews just that bundle. - `--profiles DIR` points the tooling at a different profile tree (default @@ -309,10 +316,10 @@ one-to-one in both directions. it from **BambuStudio's own shipped BBL bundle** — a sparse shallow clone of upstream `master`, or `--bambustudio-dir `. Our BBL bundle is a fork of Bambu's, tuned and extended independently, so it is not the source of truth for Bambu's ids. -A row's key is whatever id our tree already mints for that same -`(filament_vendor, filament_type, filament name)` triple; a product we do not ship gets a freshly -generated key and the row sits inert until some bundle claims that triple — `OFdyfQvU` / -`GFG03`, "Bambu PETG Matte", is such a row today. +A row's key is the id the product's `(filament_vendor, filament_type, filament name)` triple +mints — the same id any bundle of ours carries for it, since the id is a function of the triple +alone; the row of a product we do not ship sits inert until some bundle claims that triple — +`OFdyfQvU` / `GFG03`, "Bambu PETG Matte", is such a row today. **Regenerate it in the same commit as every BBL profile sync**, and read the drift report it prints. Two lines, both informational, neither blocking the write: @@ -437,11 +444,12 @@ The checks, in brief: its snapshot entry, both directions: any `filament_vendor`/`filament_type`/name change surfaces as a snapshot diff. - **Identity** — the id is a function of the triple alone. A declared `OF*` id must equal the - mint (or a low salt iteration) of its declarer's own triple; the id an instantiated preset - *inherits* must equal the mint of *its* own triple, however it inherits it (a root, a real - filament, a library preset — structure rule 1); and every instantiated system filament must - resolve an effective id at all (recall: an id-less one is a hard load error in C++ that - discards the whole vendor bundle). The errors print the expected id. + one id its declarer's own triple mints, with no second acceptable value; the id an + instantiated preset *inherits* must equal the mint of *its* own triple, however it inherits + it (a root, a real filament, a library preset — structure rule 1); and every instantiated + system filament must resolve an effective id at all (recall: an id-less one is a hard load + error in C++ that discards the whole vendor bundle); and no two products mint one id (a + base62 collision, resolved by renaming one of them). The errors print the expected id. - **Reserved namespaces** — `GF*`, `QD_*`, `P<7-hex>` or `"null"` claimed by any vendor, BBL and Qidi included. - **Triple integrity** — every declarer must resolve a non-empty `filament_vendor` and diff --git a/scripts/orca_id_tool.py b/scripts/orca_id_tool.py index 8d08bde4ab..956aec3569 100755 --- a/scripts/orca_id_tool.py +++ b/scripts/orca_id_tool.py @@ -24,8 +24,11 @@ filament_id policy (see docs/HLSD/filament_id.md): filament_id = "OF" + base62_6( uuid5(FILAMENT_ID_NAMESPACE, "filament_product///") ) 8 chars total, which satisfies the AMS length limit. Nobody invents ids by - hand; on the astronomically rare collision with another product's id the - input is salted ("/1", "/2", ...) until free and the result is frozen in file. + hand, and nothing but the triple feeds the mint — not the rest of the tree, + not the snapshot. Two products whose triples mint one id (a base62 + collision; odds ~1e-5 over the whole tree) is an error --check reports and + --generate refuses to write; the remedy is a rename so the triples differ, + never a salted or hand-picked second id. Identity changes (a filament rename, a filament_vendor/filament_type fix) change the id BY DESIGN. * Reserved id spaces that are never minted into or altered: @@ -120,8 +123,6 @@ USER_CUSTOM_ID_RE = re.compile(r"^P[0-9A-Fa-f]{7}$", re.IGNORECASE) # Filament name = preset base name: strip the first "@..." suffix. The space before # "@" is optional because names like "Afinia PLA@HS" exist. BASE_NAME_RE = re.compile(r"\s?@.*$") -# Salt iterations accepted by the identity check (check 3). -MAX_CHECK_SALT = 8 # A JSON string literal, for the byte-preserving key edits. _JSON_STR = r'"(?:[^"\\]|\\.)*"' @@ -190,43 +191,20 @@ def base_name(name): return BASE_NAME_RE.sub("", name, count=1) -def generate_filament_id(filament_vendor, filament_type, filament_name, salt=0): +def generate_filament_id(filament_vendor, filament_type, filament_name): """Deterministic "OF" + 6-char base62 filament_id for a filament product. - input = "filament_product///" - (+ "/" when salted); u = uuid5(FILAMENT_ID_NAMESPACE, input); the id - tail is the low FILAMENT_ID_LENGTH base62 digits of int(u.bytes, "big"), - most-significant first — the same derivation as generate_preset_setting_id. + The triple is the only input: no salt, no state, no second value. + input = "filament_product///"; + u = uuid5(FILAMENT_ID_NAMESPACE, input); the id tail is the low + FILAMENT_ID_LENGTH base62 digits of int(u.bytes, "big"), most-significant + first — the same derivation as generate_preset_setting_id. """ key = f"filament_product/{filament_vendor}/{filament_type}/{filament_name}" - if salt: - key = f"{key}/{salt}" u = uuid.uuid5(FILAMENT_ID_NAMESPACE, key) return "OF" + _base62_tail(int.from_bytes(u.bytes, "big"), FILAMENT_ID_LENGTH) -def mint_filament_id(filament_vendor, filament_type, filament_name, taken): - """Mint the product's id: the first salt iteration not in `taken`. - - Bounded by MAX_CHECK_SALT, the last iteration the identity check accepts, so - the tool can never write an id its own --check would reject. Exhausting it - would take nine base62 collisions on one triple; it means something is wrong - with `taken`, not that a tenth salt is needed. - """ - for salt in range(MAX_CHECK_SALT + 1): - candidate = generate_filament_id(filament_vendor, filament_type, filament_name, salt) - if candidate not in taken: - return candidate - raise RuntimeError( - f"could not mint a free filament_id for {filament_vendor}/{filament_type}/" - f"{filament_name}: salts 0..{MAX_CHECK_SALT} are all taken") - - -def mint_iterations(triple): - """The ids that count as the mint of `triple`: salt 0..MAX_CHECK_SALT.""" - return {generate_filament_id(*triple, salt=s) for s in range(MAX_CHECK_SALT + 1)} - - # --------------------------------------------------------------------------- # Tree loading + loader-faithful effective-id resolution # --------------------------------------------------------------------------- @@ -439,12 +417,15 @@ def analyze_tree(profiles_dir): triples = {} # fid -> set of triples of its declarers declarer_triples = [] # (vendor, rec, fid, triple) per declarer filament_triples = {} # (vendor, filament_name) -> {triple: [declarers]} + mints = {} # minted id -> triples minting it (declarers + instantiated) for vendor, filaments in vendors.items(): occurring = vendor_ids.setdefault(vendor, set()) for rec in filaments.values(): triple = resolve_triple(rec["name"], filaments, ofl_filaments) rec["triple"] = triple + if rec.get("filament_id") or rec["instantiation"]: + mints.setdefault(generate_filament_id(*triple), set()).add(triple) if rec.get("filament_id"): fid = rec["filament_id"] occurring.add(fid) @@ -466,16 +447,6 @@ def analyze_tree(profiles_dir): if not rec.get("filament_id") and OF_ID_RE.match(eff): inherited.append((vendor, rec, eff, triple)) - # Identity (check 3b): an inherited id must be the mint of the preset's - # OWN triple. A declared id is held to the same rule as a declarer (3a), - # and an id whose declarer already fails 3a is reported there once, not - # again under every preset inheriting it. - unminted = {fid for _v, _r, fid, triple in declarer_triples - if OF_ID_RE.match(fid) and fid not in mint_iterations(triple)} - id_mismatches = [ - (vendor, rec, eff, triple) for vendor, rec, eff, triple in inherited - if eff not in unminted and eff not in mint_iterations(triple)] - # Cross-bundle triple divergence (check 5, warning only): the same filament # name declared in several bundles with different triples cannot converge # on one id until the divergence is fixed. @@ -495,12 +466,13 @@ def analyze_tree(profiles_dir): "vendor_ids": vendor_ids, "declared_ids": declared_ids, "missing_effective": sorted(missing_effective), - "id_mismatches": id_mismatches, + "inherited": inherited, "triples": {fid: sorted(list(t) for t in ts) for fid, ts in triples.items()}, - "triple_sets": triples, "declarer_triples": declarer_triples, "filament_triples": filament_triples, "cross_bundle_triples": cross_bundle_triples, + # id -> the products (triples) minting it, where there is more than one + "collisions": {fid: sorted(ts) for fid, ts in mints.items() if len(ts) > 1}, } @@ -580,12 +552,14 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, 2. Snapshot equality, both directions: every id in the tree, the filaments claiming it and the triple its declarers resolve must equal the snapshot entry exactly (the snapshot diff is the maintainer gate). - 3. Identity: the id is a function of the triple alone. (a) A declared id - must equal the mint of the declarer's own triple or a salted iteration; - (b) the id an instantiated preset inherits must equal the mint of ITS - own triple — how it inherits it (a root, a real filament, an OFL - preset) is irrelevant; (c) every instantiated filament resolves an - effective id at all (an id-less one is a hard load error in C++). + 3. Identity: the id is a function of the triple alone, and there is no + second acceptable value. (a) A declared id must equal the one id the + declarer's own triple mints; (b) the id an instantiated preset inherits + must equal the one ITS own triple mints — how it inherits it (a root, a + real filament, an OFL preset) is irrelevant; (c) every instantiated + filament resolves an effective id at all (an id-less one is a hard load + error in C++); (d) no two products mint one id (a base62 collision, + resolved by renaming one of them). 4. Reserved namespaces (GF*/QD_*/P-hex/"null", all ownerless) must not be claimed by any vendor. 5. Triple integrity: (a) every declarer resolves non-empty filament_vendor @@ -664,22 +638,36 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, errors += 1 # -- 3. identity: the id is a function of the triple alone --------------- + # One triple, one id: a declaration must carry exactly the mint of its + # triple, and there is no second acceptable value — not a salt, not a + # hand-picked one, not whatever another preset of the product carries. Two + # presets of one product that would be AMS-ambiguous on a printer are fixed + # in the profiles, by making their compatible_printers disjoint or by + # retiring the redundant one. for vendor, rec, fid, triple in sorted( analysis["declarer_triples"], key=lambda x: (x[0], x[1]["file"])): - if not OF_ID_RE.match(fid) or fid in mint_iterations(triple): - continue + want = generate_filament_id(*triple) + if not OF_ID_RE.match(fid) or fid == want: + continue # a non-OF id is check 1's error print_error( f'filament_id "{fid}" declared by "{rec["name"]}" ({rec["file"]}) does ' f'not match the mint of its triple "{"/".join(triple)}": expected ' - f'"{generate_filament_id(*triple)}" (or a salted iteration); paste the ' - f'expected id, or fix the triple and run "{GENERATE_CMD} --vendor {vendor}" ' - f"(preview with --dry-run), then --update-snapshot") + f'"{want}"; paste the expected id, or fix the triple and run ' + f'"{GENERATE_CMD} --vendor {vendor}" (preview with --dry-run), then ' + f"--update-snapshot") errors += 1 + # (3b) An inherited id is held to the same single value, and every preset + # missing it is listed — a variant under a wrong root as much as a preset + # riding another product's root. Nothing is folded into the declarer's + # error: the report names each preset whose id is wrong. for vendor, rec, eff, triple in sorted( - analysis["id_mismatches"], key=lambda x: (x[0], x[1]["file"])): + analysis["inherited"], key=lambda x: (x[0], x[1]["file"])): + want = generate_filament_id(*triple) + if eff == want: + continue print_error( f'preset "{rec["name"]}" ({rec["file"]}) inherits filament_id "{eff}" but ' - f'its own triple "{"/".join(triple)}" mints "{generate_filament_id(*triple)}"; ' + f'its own triple "{"/".join(triple)}" mints "{want}"; ' f"a preset carries the id of its own product: inherit a preset of the " f"same filament, or declare its own key") errors += 1 @@ -691,7 +679,15 @@ def check_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, f'instantiated filament "{name}" ({file}) resolves no filament_id anywhere ' f"in its inherits chain — this is a hard load error in the C++ loader; " f'run "{GENERATE_CMD}" (expected id for filament ' - f'"{vendor}/{base_name(name)}": "{expected}", salted if taken)') + f'"{vendor}/{base_name(name)}": "{expected}")') + errors += 1 + # (3d) The mint is injective over the tree's products, or two of them are + # indistinguishable to every device that matches on the id. + for fid, ts in sorted(analysis["collisions"].items()): + print_error( + f'filament_id "{fid}" is the mint of {len(ts)} different products ' + f'({"; ".join("/".join(t) for t in ts)}): a base62 collision; rename one ' + f"of them so their triples differ") errors += 1 # -- 4. reserved namespaces ---------------------------------------------- @@ -993,75 +989,36 @@ def rewrite_filament_id(path, old_id, new_id, dry_run=False): # --generate # --------------------------------------------------------------------------- -def make_want_id(analysis, snapshot=None): - """Build the id policy: want_id(triple) -> the id that triple must carry. - - A triple's id is its first mint iteration that no OTHER product holds. An id - is blocked when the tree or the snapshot records it under a triple set other - than exactly {triple}, or when this run already handed it to a different - triple. Same-triple reuse is therefore convergence — one product, one id in - every bundle — and salting only ever steps past another product's id. - - Only a CONFORMANT record holds an id: a declaration whose value is not a mint - iteration of its own triple is transient — this run rewrites it — so it must - not block the product that legitimately mints the id it is squatting on. That - also makes the policy independent of which vendors a run writes, so a - --vendor-narrowed run picks the same ids as a full one. - """ - holders = {} # id -> the set of triples that legitimately hold it - for fid, ts in analysis["triple_sets"].items(): - conformant = {t for t in ts if fid in mint_iterations(t)} - if conformant: - holders[fid] = conformant - for fid, entry in (snapshot or {}).get("ids", {}).items(): - triple = tuple(snapshot_triple(entry)) - if fid in mint_iterations(triple): - holders.setdefault(fid, set()).add(triple) - - assigned = {} # triple -> the id chosen for it this run - run_taken = {} # id -> the triple this run gave it to - - def want_id(triple): - if triple not in assigned: - blocked = {fid for fid, ts in holders.items() if ts != {triple}} - blocked |= {fid for fid, t in run_taken.items() if t != triple} - cand = mint_filament_id(*triple, taken=blocked) - assigned[triple] = cand - run_taken[cand] = triple - return assigned[triple] - - return want_id - - def _incomplete_triple(triple): """The name(s) of the empty mint-key fields, or "" when both are present.""" return " and ".join(k for k, v in (("filament_vendor", triple[0]), ("filament_type", triple[1])) if not v) -def generate_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH, - vendors=None, dry_run=False, changed_paths=None): +def generate_filament_ids(profiles_dir=PROFILES_DIR, vendors=None, dry_run=False, + changed_paths=None): """Make every filament carry the id its own triple mints. One rule, applied to declarations and to id-less filaments alike: - * a declared id that is not a mint iteration of the declarer's own triple — - a wrong OF id, or a foreign one such as a Bambu "GF*" arriving with an - upstream sync — is replaced in place; + * a declared id that is not the one its own triple mints — a wrong OF id, + or a foreign one such as a Bambu "GF*" arriving with an upstream sync — + is replaced in place; * an instantiated filament that resolves no id at all gets one inserted into its root(s): the id-less presets of the SAME filament its members inherit, or the member itself (a parent of another filament cannot carry this filament's id — check 3). - An id already equal to ANY salt iteration of its own triple is conformant - (check 3) and left alone, so deliberate salt splits — distinct presets of one - product kept apart for per-printer AMS matching — survive. + A declaration is left alone exactly when it already equals the one id its + triple mints (check 3). Two products minting one id (check 3d) are reported + and left unwritten: nothing salts past a collision, a rename resolves it. - `vendors` restricts what is WRITTEN; the analysis and the id policy always - span the whole tree, so a narrowed run mints exactly what a full one would. - `changed_paths`, when a set is passed, collects the files that changed. A - file whose layout offers no anchor for the edit is reported and counted as an - error, so one odd profile cannot abort the pass over all the others. - Never touches the snapshot — run --update-snapshot afterwards and review the - diff. Returns (files_changed, errors). + `vendors` restricts what is WRITTEN; the id is a function of the triple + alone, so a narrowed run writes exactly what a full one would, and --check + reports whatever it was not allowed to touch. `changed_paths`, when a set is + passed, collects the files that changed. A file whose layout offers no + anchor for the edit is reported and counted as an error, so one odd profile + cannot abort the pass over all the others. Never reads or touches the + snapshot — run --update-snapshot afterwards and review the diff. Returns + (files_changed, errors). """ _utf8_console() analysis = analyze_tree(profiles_dir) @@ -1080,24 +1037,26 @@ def generate_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH print_error(f'unknown vendor "{v}" in {profiles_dir}') return 0, errors + len(unknown) - want_id = make_want_id(analysis, load_snapshot(snapshot_path)) + colliding = set() # triples no run may write an id for + for fid, ts in sorted(analysis["collisions"].items()): + print_error( + f'cannot write filament_id "{fid}": it is the mint of {len(ts)} different ' + f'products ({"; ".join("/".join(t) for t in ts)}), a base62 collision; ' + f"rename one of them so their triples differ") + errors += 1 + colliding.update(ts) + verb = "would " if dry_run else "" files_changed = 0 reminted = 0 inserted = 0 - held_here = set() # ids the filaments this run may write legitimately hold - left_standing = {} # id -> files still declaring one non-conformantly # 1. Declarations that are not the mint of their own triple. for vendor, rec, fid, triple in sorted( analysis["declarer_triples"], key=lambda x: (x[0], x[1]["file"])): - in_scope = wanted is None or vendor in wanted - if fid in mint_iterations(triple): - if in_scope: - held_here.add(fid) - continue - if not in_scope: - left_standing.setdefault(fid, []).append(rec["file"]) + want = generate_filament_id(*triple) + if (fid == want or (wanted is not None and vendor not in wanted) + or triple in colliding): continue missing = _incomplete_triple(triple) if missing: @@ -1106,21 +1065,15 @@ def generate_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH f'{missing}; the mint key needs both (generic materials use ' f'filament_vendor "Generic")') errors += 1 - left_standing.setdefault(fid, []).append(rec["file"]) - continue - want = want_id(triple) - if fid == want: continue try: rewrite_filament_id(rec["path"], fid, want, dry_run) except (OSError, RuntimeError, ValueError) as e: print_error(str(e)) errors += 1 - left_standing.setdefault(fid, []).append(rec["file"]) continue files_changed += 1 reminted += 1 - held_here.add(want) if changed_paths is not None: # Index sub_paths are "/"-joined even on Windows, where the # setting_id pass reaches the same file through os.walk: normalize @@ -1166,6 +1119,8 @@ def generate_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH errors += 1 continue triple = (*next(iter(fields)), filament_name) + if triple in colliding: + continue # reported above missing = _incomplete_triple(triple) if missing: print_error( @@ -1174,7 +1129,7 @@ def generate_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH f'filament_vendor "Generic")') errors += 1 continue - new_id = want_id(triple) + new_id = generate_filament_id(*triple) for name in sorted(roots): root = roots[name] try: @@ -1185,24 +1140,11 @@ def generate_filament_ids(profiles_dir=PROFILES_DIR, snapshot_path=SNAPSHOT_PATH continue files_changed += 1 inserted += 1 - held_here.add(new_id) if changed_paths is not None: changed_paths.add(os.path.normpath(root["path"])) print_info(f'{verb}insert filament "{vendor}/{filament_name}": filament_id ' f'"{new_id}" -> {root["file"]}') - # A declaration that is not the mint of its own triple holds no id, so it - # never blocks the product the id belongs to — that is what makes a narrowed - # run mint exactly what a full one would. When the run is not allowed to - # rewrite that declaration, though, it stays behind on an id just handed to - # its rightful owner, and only a run that covers both can clear it. - for fid in sorted(held_here & set(left_standing)): - print_error( - f'filament_id "{fid}" belongs to a filament this run covers but is also ' - f'declared by {", ".join(sorted(left_standing[fid]))}, which it did not ' - f'rewrite; run "{GENERATE_CMD}" over both to clear the duplicate') - errors += 1 - print_info(f"filament_ids inserted : {inserted}") print_info(f"filament_ids re-minted : {reminted}") return files_changed, errors @@ -1376,10 +1318,10 @@ def build_parser(): narrow.add_argument("--setting-id", action="store_true", help="write setting_id only, skipping filament_id") narrow.add_argument("--vendor", metavar="VENDOR", action="append", default=[], - help="write only in this vendor bundle; repeatable. The ids are " - "still derived tree-wide, so a narrowed run writes exactly " - "what a full one would, and reports what it was not allowed " - "to fix") + help="write only in this vendor bundle; repeatable. The id is a " + "function of the triple alone, so a narrowed run writes " + "exactly what a full one would; --check reports whatever " + "it left outside") parser.add_argument("--dry-run", "--dryrun", dest="dry_run", action="store_true", help="report what would change and write nothing; with no mode of " "its own it previews --generate") @@ -1462,7 +1404,7 @@ def main(argv=None): filament_files = errors = 0 if do_filament: filament_files, e = generate_filament_ids( - args.profiles, snapshot_path, vendors, args.dry_run, changed) + args.profiles, vendors, args.dry_run, changed) errors += e if do_setting: _n, e = generate_setting_ids(args.profiles, vendors, args.dry_run, changed) diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index b7646c4b64..3e7a6d2aec 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -155,15 +155,13 @@ class SyntheticTree: def assign(self, vendors=None, dry_run=False): buf = io.StringIO() with contextlib.redirect_stdout(buf): - changed, errors = afi.generate_filament_ids( - self.profiles, self.snapshot, vendors, dry_run) + changed, errors = afi.generate_filament_ids(self.profiles, vendors, dry_run) return changed, errors, buf.getvalue() def remint(self, vendors, dry_run=False): buf = io.StringIO() with contextlib.redirect_stdout(buf): - changed, errors = afi.generate_filament_ids( - self.profiles, self.snapshot, vendors, dry_run) + changed, errors = afi.generate_filament_ids(self.profiles, vendors, dry_run) return changed, errors, buf.getvalue() def cli(self, *flags): @@ -240,8 +238,6 @@ class TestMint(unittest.TestCase): # layout ("filament_product///") and base62 tail. self.assertEqual(afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA"), "OF5CgdDq") - self.assertEqual(afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA", - salt=1), "OFD9mV8H") self.assertEqual(afi.generate_filament_id("Generic", "PLA", "Generic PLA"), "OFDSrzZ8") @@ -262,95 +258,6 @@ class TestMint(unittest.TestCase): self.assertNotEqual(base, afi.generate_filament_id("Polymaker", "PETG", "PolyLite PLA")) self.assertNotEqual(base, afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA Pro")) - def test_salt_changes_id(self): - base = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA") - salted = afi.generate_filament_id("Polymaker", "PLA", "PolyLite PLA", salt=1) - self.assertNotEqual(base, salted) - self.assertRegex(salted, r"^OF[0-9A-Za-z]{6}$") - - def test_mint_salt_iteration(self): - triple = ("Polymaker", "PLA", "PolyLite PLA") - taken = {afi.generate_filament_id(*triple, salt=s) for s in range(2)} - self.assertEqual(afi.mint_filament_id(*triple, taken), - afi.generate_filament_id(*triple, salt=2)) - self.assertEqual(afi.mint_filament_id(*triple, set()), - afi.generate_filament_id(*triple)) - - def test_mint_never_returns_a_salt_the_identity_check_rejects(self): - # mint_filament_id stops at MAX_CHECK_SALT, the last iteration check 3 - # accepts, so the tool can never write an id its own --check rejects. - triple = ("Polymaker", "PLA", "PolyLite PLA") - all_taken = afi.mint_iterations(triple) - self.assertEqual(len(all_taken), afi.MAX_CHECK_SALT + 1) - last = afi.mint_filament_id(*triple, all_taken - {afi.generate_filament_id( - *triple, salt=afi.MAX_CHECK_SALT)}) - self.assertIn(last, afi.mint_iterations(triple)) - with self.assertRaises(RuntimeError): - afi.mint_filament_id(*triple, all_taken) - - def test_want_id_policy(self): - # The whole id policy: a triple's id is its first mint iteration that no - # OTHER product holds, in the tree or in the snapshot. - triple = ("Polymaker", "PLA", "PolyLite PLA") - other = ("Elegoo", "PETG", "Rapid PETG") - salt0 = afi.generate_filament_id(*triple) - salt1 = afi.generate_filament_id(*triple, salt=1) - - def snapshot(**entries): - return {"ids": {fid: {"filaments": [], "name": t[2], - "filament_type": t[1], "filament_vendor": t[0]} - for fid, t in entries.items()}} - - # nobody holds it: salt 0 - self.assertEqual(afi.make_want_id({"triple_sets": {}})(triple), salt0) - # the tree holds it under this very triple: reuse is convergence - self.assertEqual( - afi.make_want_id({"triple_sets": {salt0: {triple}}})(triple), salt0) - # Another triple "holds" it, but salt0 is not a mint iteration of THAT - # triple, so the holder is a wrong declaration this very run rewrites. - # A transient squatter must not push a product off its own id. - self.assertEqual( - afi.make_want_id({"triple_sets": {salt0: {other}}})(triple), salt0) - self.assertEqual( - afi.make_want_id({"triple_sets": {salt0: {triple, other}}})(triple), salt0) - # The snapshot is read the same way: only a conformant record holds. - self.assertEqual( - afi.make_want_id({"triple_sets": {}}, snapshot(**{salt0: other}))(triple), - salt0) - # ... and the snapshot's own triple reuses it - self.assertEqual( - afi.make_want_id({"triple_sets": {}}, snapshot(**{salt0: triple}))(triple), - salt0) - # Unused here, but salting must still be reachable: see - # test_want_id_salts_past_a_genuine_collision. - self.assertNotEqual(salt0, salt1) - # memoized: one triple keeps one id for the whole run - want_id = afi.make_want_id({"triple_sets": {}}) - self.assertEqual(want_id(triple), want_id(triple)) - # ... and a second triple never gets the id this run already handed out - self.assertNotEqual(want_id(triple), want_id(other)) - - def test_want_id_salts_past_a_genuine_collision(self): - # Salting exists for one case only: two products whose triples mint the - # same id. That needs a base62 collision, so force one — salt 0 of every - # triple collapses to a single value while the salted iterations stay - # distinct. `other` then CONFORMANTLY holds the shared salt-0 id, and - # `triple` must step past it instead of stealing it. - triple = ("V", "PLA", "X") - other = ("W", "ABS", "Y") - real = afi.generate_filament_id - - def colliding(vendor, ftype, name, salt=0): - return "OFcolid" if salt == 0 else real(vendor, ftype, name, salt) - - afi.generate_filament_id = colliding - try: - self.assertIn("OFcolid", afi.mint_iterations(other)) # holder conforms - got = afi.make_want_id({"triple_sets": {"OFcolid": {other}}})(triple) - finally: - afi.generate_filament_id = real - self.assertEqual(got, real(*triple, salt=1)) - class TestBaseName(unittest.TestCase): def test_filament_name_derivation(self): @@ -589,12 +496,13 @@ class TestChecks(OfCleanTreeCase): self.assertIn('which records "AVendor/PLA/APLA"', out) # Sanctioning the new triple is not enough: the old id is no longer its # mint (check 3, nothing grandfathered) — the identity fix is a re-mint, - # reported once on the root, not again under the variant inheriting it. + # reported on the root and again under the variant inheriting it. rc, _out = self.t.update_snapshot() self.assertEqual(rc, 0) errors, out = self.t.check() - self.assertEqual(errors, 1, out) + self.assertEqual(errors, 2, out) self.assertIn("does not match the mint of its triple", out) + self.assertIn('"APLA @P1" (VendorA/filament/APLA @P1.json) inherits filament_id', out) _changed, errors, out = self.t.remint(["VendorA"]) self.assertEqual(errors, 0, out) rc, _out = self.t.update_snapshot() @@ -613,16 +521,6 @@ class TestChecks(OfCleanTreeCase): self.assertIn("does not match the mint of its triple", out) self.assertIn(afi.generate_filament_id("BV", "PLA", "BNEW"), out) - def test_check3_salted_mint_is_accepted(self): - salted = afi.generate_filament_id("BV", "PLA", "BNEW", salt=3) - self.t.write_preset("VendorA", preset("BNEW @base", filament_id=salted, - instantiation=False, - filament_vendor="BV", filament_type="PLA")) - self.t.write_preset("VendorA", preset("BNEW @P1", inherits="BNEW @base", - compatible_printers=["P1"])) - _errors, out = self.t.check() # check 2 still wants a snapshot update - self.assertNotIn("does not match the mint", out) - def test_check3_no_grandfathering_of_a_wrong_declaration(self): # Sanctioning the tree does not excuse a declaration from its mint. self.t.write_preset("VendorA", preset("CNEW @base", filament_id="OFZZZZZZ", @@ -633,8 +531,9 @@ class TestChecks(OfCleanTreeCase): rc, _out = self.t.update_snapshot() self.assertEqual(rc, 0) errors, out = self.t.check() - self.assertEqual(errors, 1, out) + self.assertEqual(errors, 2, out) # the declaration, and the variant inheriting it self.assertIn("does not match the mint of its triple", out) + self.assertIn('"CNEW @P1" (VendorA/filament/CNEW @P1.json) inherits filament_id', out) def test_check3_inherited_id_must_be_the_mint_of_own_triple(self): # A preset of another filament inheriting APLA's root takes APLA's id, @@ -654,6 +553,78 @@ class TestChecks(OfCleanTreeCase): errors, out = self.t.check() self.assertEqual(errors, 1, out) + def test_check3_lists_every_preset_inheriting_a_wrong_id(self): + # A wrong declaration is reported under every preset inheriting it, its + # own product's variant and another product alike: each one's effective + # id is not the mint of its own triple, and each is listed. Nothing is + # folded into the declarer's error. + self.t.write_preset("VendorA", preset("DNEW @base", filament_id="OFZZZZZZ", + instantiation=False, + filament_vendor="DV", filament_type="PLA")) + self.t.write_preset("VendorA", preset("DNEW @P1", inherits="DNEW @base", + compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("Other DNEW @P1", inherits="DNEW @base", + compatible_printers=["P1 0.4 nozzle"])) + errors, out = self.t.check() + self.assertIn("does not match the mint of its triple", out) + self.assertIn('"DNEW @P1" (VendorA/filament/DNEW @P1.json) inherits filament_id', out) + self.assertIn('"Other DNEW @P1" (VendorA/filament/Other DNEW @P1.json) inherits ' + 'filament_id', out) + # The unsanctioned id (check 2), the declaration (3a), and both presets + # inheriting it (3b). + self.assertEqual(errors, 4, out) + + def test_check3_reports_an_inherited_mismatch_even_when_its_own_product_misdeclares_the_id(self): + # "Tuned PLA @P1" inherits APLA's root, so it carries APLA's id: wrong + # for its own product however the declarations around it are fixed. + # That "Tuned PLA @base" — its own product — misdeclares that same id + # is a second error, not a reason to leave the first unreported. + apla_id = afi.generate_filament_id("AVendor", "PLA", "APLA") + self.t.write_preset("VendorA", preset("Tuned PLA @base", filament_id=apla_id, + instantiation=False, + filament_vendor="AVendor", + filament_type="PLA")) + self.t.write_preset("VendorA", preset("Tuned PLA @P1", inherits="APLA @base", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertIn('"Tuned PLA @base" (VendorA/filament/Tuned PLA @base.json) does ' + 'not match the mint of its triple', out) + self.assertIn('"Tuned PLA @P1" (VendorA/filament/Tuned PLA @P1.json) inherits ' + 'filament_id', out) + # The unsanctioned claim and triple (check 2), the declaration (3a) and + # the inherited id (3b): four distinct errors, nothing folded away. + self.assertEqual(errors, 4, out) + + def test_check3_reports_a_collision_between_two_products(self): + # Two products whose triples mint one id is a base62 collision. There + # is no salted or hand-picked second id to fall back on: the check + # names both products, and the remedy is a rename so the triples differ. + collide = {("V", "PLA", "X"), ("W", "ABS", "Y")} + real = afi.generate_filament_id + + def colliding(vendor, ftype, name): + return "OFcolid0" if (vendor, ftype, name) in collide else real(vendor, ftype, name) + + afi.generate_filament_id = colliding + self.addCleanup(setattr, afi, "generate_filament_id", real) + for vendor, ftype, name in sorted(collide): + self.t.write_preset("VendorA", preset(f"{name} @base", filament_id="OFcolid0", + instantiation=False, + filament_vendor=vendor, + filament_type=ftype)) + self.t.write_preset("VendorA", preset(f"{name} @P1", inherits=f"{name} @base", + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertIn("collision", out) + self.assertIn("V/PLA/X", out) + self.assertIn("W/ABS/Y", out) + # Each declaration is the mint of its own triple, so the collision is + # the only identity error — no product is pushed off its id — and the + # unsanctioned id (check 2) is the only other one. + self.assertNotIn("does not match the mint", out) + self.assertNotIn("inherits filament_id", out) + self.assertEqual(errors, 2, out) + def test_check3_renamed_tuned_generic_is_an_identity_error(self): # Riding the OFL generic under another base name: same rule, same error. self.t.write_preset("VendorA", preset("Tuned PLA @P1", @@ -1144,9 +1115,9 @@ class TestAssign(OfCleanTreeCase): self.assertEqual(b2["filament_id"], want) def test_converges_on_an_existing_tree_id_for_the_same_triple(self): - # BEHAVIOUR CHANGE: an id-less filament whose product is already shipped - # (with its conforming id) in another bundle converges on that id - # instead of salting past it. One product, one id, in every bundle. + # An id-less filament whose product is already shipped (with its + # conforming id) in another bundle converges on that id. One product, + # one id, in every bundle. want = afi.generate_filament_id("CV", "PLA", "CPLA") self.t.add_vendor("VendorB", [ preset("CPLA @base", filament_id=want, instantiation=False, @@ -1166,9 +1137,8 @@ class TestAssign(OfCleanTreeCase): def test_a_squatted_id_is_still_minted_for_its_own_product(self): # VendorB's "Other" declares the id that belongs to VendorA's "DPLA" — - # a copy-paste, not a real claim, since it is not the mint of Other's - # own triple. That declaration is transient (--generate rewrites it), so - # it must NOT push DPLA onto a salted id: DPLA gets its canonical one. + # a copy-paste, not a claim. The id is the mint of DPLA's triple and + # nothing else, so DPLA gets it whatever VendorB carries. want0 = afi.generate_filament_id("DV", "PLA", "DPLA") self.t.add_vendor("VendorB", [ preset("Other @base", filament_id=want0, instantiation=False, @@ -1180,27 +1150,51 @@ class TestAssign(OfCleanTreeCase): self.t.write_preset("VendorA", preset("DPLA @P1", inherits="DPLA @base", compatible_printers=["P1"])) changed, errors, out = self.t.assign(["VendorA"]) - # VendorB is outside the write set, so the id DPLA just took is still - # declared there: the run says so rather than leaving a silent duplicate. - self.assertEqual((changed, errors), (1, 1), out) - self.assertIn("declared by VendorB/filament/Other @base.json", out) - # ...and keeps saying so until a run that covers VendorB clears it. - self.assertEqual(self.t.assign(["VendorA"])[:2], (0, 1)) + self.assertEqual((changed, errors), (1, 0), out) root = load_json_file(self.t.preset_path("VendorA", "DPLA @base")) self.assertEqual(root["filament_id"], want0) - # A full run re-mints Other to its own triple and the duplicate is gone. - other = load_json_file(self.t.preset_path("VendorB", "Other @base")) - self.assertEqual(other["filament_id"], want0) - changed, errors, out = self.t.assign() + # VendorB's declaration is VendorB's own mismatch: a run not allowed to + # touch it leaves it to --check, and a run over VendorB re-mints it. + _errors, out = self.t.check() + self.assertIn('"Other @base" (VendorB/filament/Other @base.json) does not match ' + 'the mint of its triple', out) + changed, errors, out = self.t.assign(["VendorB"]) self.assertEqual((changed, errors), (1, 0), out) other = load_json_file(self.t.preset_path("VendorB", "Other @base")) self.assertEqual(other["filament_id"], afi.generate_filament_id("OV", "ABS", "Other")) + def test_generate_refuses_to_write_into_a_collision(self): + # "X" ships on the id its triple mints; a new product "Y" whose triple + # mints the very same id is a base62 collision. The run does not salt + # past it: it reports both products, writes nothing for "Y", and leaves + # the remedy — a rename, so the triples differ — to the author. + collide = {("V", "PLA", "X"), ("W", "ABS", "Y")} + real = afi.generate_filament_id + + def colliding(vendor, ftype, name): + return "OFcolid0" if (vendor, ftype, name) in collide else real(vendor, ftype, name) + + afi.generate_filament_id = colliding + self.addCleanup(setattr, afi, "generate_filament_id", real) + self.t.write_preset("VendorA", preset("X @base", filament_id="OFcolid0", + instantiation=False, + filament_vendor="V", filament_type="PLA")) + self.t.write_preset("VendorA", preset("X @P1", inherits="X @base", + compatible_printers=["P1"])) + self.t.write_preset("VendorA", preset("Y @base", instantiation=False, + filament_vendor="W", filament_type="ABS")) + self.t.write_preset("VendorA", preset("Y @P1", inherits="Y @base", + compatible_printers=["P1"])) + before = self.t.bytes_map() + changed, errors, out = self.t.assign() + self.assertEqual((changed, errors), (0, 1), out) + self.assertIn("V/PLA/X", out) + self.assertIn("W/ABS/Y", out) + self.assertEqual(self.t.bytes_map(), before) + def test_mismatching_of_declaration_is_re_derived(self): - # BEHAVIOUR CHANGE: the default run used to leave an OF-format id alone - # and needed a separate mode to fix it. One rule now: an id that is not - # a mint iteration of its own triple is rewritten. + # One rule: an id that is not the mint of its own triple is rewritten. self.t.write_preset("VendorA", preset("KNEW @base", filament_id="OFZZZZZZ", instantiation=False, filament_vendor="KV", @@ -1445,20 +1439,19 @@ class TestRemint(SyntheticTreeCase): changed, errors, _out = self.t.remint(["VendorA"]) self.assertEqual((changed, errors), (0, 0)) - def test_salted_declaration_survives_remint(self): - # A deliberate salt split (a second preset of one product kept on its - # own id for per-printer AMS disambiguation) is mint-conformant and - # must not be converged back onto salt 0. - salt1 = afi.generate_filament_id(*self.TRIPLE, salt=1) - self.t.write_preset("VendorA", preset("APLA @legacy", - filament_id=salt1, + def test_second_id_of_one_product_is_converged_by_remint(self): + # A second preset of one product kept on an id of its own is not a + # sanctioned split: the triple determines the id, so --generate pulls it + # back. An AMS ambiguity this exposes is fixed in the profiles instead. + want = afi.generate_filament_id(*self.TRIPLE) + self.t.write_preset("VendorA", preset("APLA @legacy", filament_id="OFlegac1", inherits="APLA @base", compatible_printers=["P2 0.4 nozzle"])) changed, errors, out = self.t.remint(["VendorA"]) self.assertEqual(errors, 0, out) - self.assertEqual(changed, 1) # only the non-conformant AX01 root + self.assertEqual(changed, 2) # the non-conformant AX01 root and @legacy legacy = load_json_file(self.t.preset_path("VendorA", "APLA @legacy")) - self.assertEqual(legacy["filament_id"], salt1) + self.assertEqual(legacy["filament_id"], want) def test_same_triple_converges_within_run(self): self.t.add_vendor("VendorB", [ @@ -1490,22 +1483,24 @@ class TestRemint(SyntheticTreeCase): self.assertEqual(a["filament_id"], want) def test_not_blocked_by_a_non_conformant_occurrence(self): - # VendorB carries APLA's id under a PETG triple of its own, so that - # declaration is wrong and this run's job is to rewrite it. It must not - # cost VendorA's APLA the id its triple actually mints. + # VendorB carries APLA's id under a PETG triple of its own: that + # declaration is wrong, and it costs VendorA's APLA nothing — the id is + # the mint of APLA's triple, whoever else is squatting on it. want0 = afi.generate_filament_id(*self.TRIPLE) self.t.add_vendor("VendorB", [ preset("BPLA @base", filament_id=want0, instantiation=False, filament_vendor="BV", filament_type="PETG"), ]) changed, errors, out = self.t.remint(["VendorA"]) - self.assertEqual((changed, errors), (1, 1), out) - self.assertIn("declared by VendorB/filament/BPLA @base.json", out) + self.assertEqual((changed, errors), (1, 0), out) root = load_json_file(self.t.preset_path("VendorA", "APLA @base")) self.assertEqual(root["filament_id"], want0) - # Widening the run to both bundles clears it. - changed, errors, out = self.t.remint(["VendorA", "VendorB"]) + # A run over VendorB re-mints the squatter to its own triple. + changed, errors, out = self.t.remint(["VendorB"]) self.assertEqual((changed, errors), (1, 0), out) + self.assertEqual( + load_json_file(self.t.preset_path("VendorB", "BPLA @base"))["filament_id"], + afi.generate_filament_id("BV", "PETG", "BPLA")) def test_bbl_is_reminted_like_any_vendor(self): self.t.add_vendor("BBL", [ @@ -1578,8 +1573,7 @@ class TestCli(unittest.TestCase): # Named explicitly, both modes run against that tree. rc, out = self.t.cli("--update-snapshot") self.assertEqual(rc, 0, out) - # --generate only reads the snapshot as a list of ids not to reuse, so - # it keeps working without one. + # --generate never reads the snapshot, so it keeps working without one. buf = io.StringIO() with contextlib.redirect_stdout(buf): rc = afi.main(["--dry-run", "--profiles", self.t.profiles]) @@ -1762,8 +1756,7 @@ class TestReviewFixes(OfCleanTreeCase): touched = set() buf = io.StringIO() with contextlib.redirect_stdout(buf): - afi.generate_filament_ids(self.t.profiles, self.t.snapshot, - None, False, touched) + afi.generate_filament_ids(self.t.profiles, None, False, touched) afi.generate_setting_ids(self.t.profiles, None, False, touched) for name in ("SoloPLA @P1", "WrongPLA @P1"): self.assertEqual([t for t in touched if t.endswith(name + ".json")], @@ -1841,58 +1834,21 @@ class TestBambuMap(unittest.TestCase): return filaments def test_one_row_per_filament(self): - rows = ubfi.derive_rows(self._bs_tree([("Bambu ABS", "GFB00", "Bambu Lab", "ABS")]), {}) + rows = ubfi.derive_rows(self._bs_tree([("Bambu ABS", "GFB00", "Bambu Lab", "ABS")])) self.assertEqual(rows, {afi.generate_filament_id("Bambu Lab", "ABS", "Bambu ABS"): {"bambu_id": "GFB00", "vendor": "Bambu Lab", "type": "ABS", "name": "Bambu ABS"}}) def test_shared_bambu_id_is_an_error(self): with self.assertRaises(SystemExit): - ubfi.derive_rows(self._bs_tree([("A", "GFX00", "V", "PLA"), ("B", "GFX00", "V", "PLA")]), {}) - - def test_reuses_the_id_we_ship_for_that_triple(self): - rows = ubfi.derive_rows(self._bs_tree([("Bambu ABS", "GFB00", "Bambu Lab", "ABS")]), - {("Bambu Lab", "ABS", "Bambu ABS"): "OFsalted1"}) - self.assertIn("OFsalted1", rows) + ubfi.derive_rows(self._bs_tree([("A", "GFX00", "V", "PLA"), ("B", "GFX00", "V", "PLA")])) @unittest.skipUnless(os.path.isdir("/Users/lijiang/codes/BambuStudio/resources/profiles"), "no local clone") def test_local_clone_yields_the_catalog(self): - rows = ubfi.derive_rows(afi.load_vendor_filaments("/Users/lijiang/codes/BambuStudio/resources/profiles", "BBL")[0], {}) + rows = ubfi.derive_rows(afi.load_vendor_filaments("/Users/lijiang/codes/BambuStudio/resources/profiles", "BBL")[0]) self.assertEqual(len(rows), 100) self.assertEqual(len({r["bambu_id"] for r in rows.values()}), 100) -class TestOrcaTriplesFromAnalysis(unittest.TestCase): - def _tree(self): - t = SyntheticTree() - self.addCleanup(t.cleanup) - t.add_vendor("VendorA", [ - # Same triple declared under two different ids on purpose: mirrors - # a real, sanctioned case (Cubicon's xCeler line keeps its own id - # per printer instead of inheriting the filament's @base id). - # Ambiguous, but must stay harmless unless something needs it. - preset("Ambig PLA @base", filament_id="OF111111", instantiation=False, - filament_vendor="V", filament_type="PLA"), - preset("Ambig PLA @P1", filament_id="OF222222", inherits="Ambig PLA @base", - compatible_printers=["P1"]), - # An unambiguous filament elsewhere in the same tree. - preset("Needed PLA @base", filament_id="OF333333", instantiation=False, - filament_vendor="V2", filament_type="PLA"), - preset("Needed PLA @P1", inherits="Needed PLA @base", - compatible_printers=["P1"]), - ]) - return afi.analyze_tree(t.profiles) - - def test_ambiguity_outside_needed_triples_is_ignored(self): - analysis = self._tree() - result = ubfi.orca_triples_from_analysis(analysis, {("V2", "PLA", "Needed PLA")}) - self.assertEqual(result, {("V2", "PLA", "Needed PLA"): "OF333333"}) - - def test_ambiguity_inside_needed_triples_is_an_error(self): - analysis = self._tree() - with self.assertRaises(SystemExit): - ubfi.orca_triples_from_analysis(analysis, {("V", "PLA", "Ambig PLA")}) - - class TestWriteMap(unittest.TestCase): def test_format(self): d = tempfile.mkdtemp(prefix="bambu_map_test_") diff --git a/scripts/tests/test_setting_id.py b/scripts/tests/test_setting_id.py index ad9d06a2f0..95e447d03c 100644 --- a/scripts/tests/test_setting_id.py +++ b/scripts/tests/test_setting_id.py @@ -141,13 +141,10 @@ class SettingTree: return changed, errors, buf.getvalue() def run_filament_ids(self, vendors=None, dry_run=False): - """The OTHER half of --generate, against this tree's own (absent) - snapshot, so the id policy never consults the repo's real one.""" + """The OTHER half of --generate.""" buf = io.StringIO() with contextlib.redirect_stdout(buf): - changed, errors = afi.generate_filament_ids( - self.profiles, os.path.join(self.dir, "filament_id_snapshot.json"), - vendors, dry_run) + changed, errors = afi.generate_filament_ids(self.profiles, vendors, dry_run) return changed, errors, buf.getvalue() diff --git a/scripts/update_bambu_filament_ids.py b/scripts/update_bambu_filament_ids.py index 93047895e1..539376599e 100644 --- a/scripts/update_bambu_filament_ids.py +++ b/scripts/update_bambu_filament_ids.py @@ -15,9 +15,9 @@ has to be hand-maintained. See docs/HLSD/filament_id.md. One row per BambuStudio filament PRODUCT: one named spool product = one "@base"-declared filament_id, shared by every per-printer/per-nozzle instantiation of it (BambuStudio follows the same one-product-one-id shape -Orca's own filament_id policy does). A row's key reuses whatever OF id Orca -already ships for that same (filament_vendor, filament_type, filament) triple; -a triple Orca does not ship anywhere yet gets a freshly generated one. +Orca's own filament_id policy does). A row's key is the OF id that product's +(filament_vendor, filament_type, filament) triple mints — the id Orca carries +for it wherever it ships it, since the id is a function of the triple alone. Map format: { @@ -57,7 +57,6 @@ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) from orca_id_tool import ( # noqa: E402 BAMBU_MAP_PATH, OFL, - OF_ID_RE, PROFILES_DIR, analyze_tree, base_name, @@ -77,8 +76,8 @@ BAMBUSTUDIO_REPO = "https://github.com/bambulab/BambuStudio" # Row derivation # --------------------------------------------------------------------------- -def derive_rows(bs_filaments, orca_triples): - """orca_triples: {(vendor, type, name): orca_id} from analyze_tree()["triples"].""" +def derive_rows(bs_filaments): + """One row per BambuStudio product, keyed by the OF id its triple mints.""" by_filament = {} # filament_name -> (bambu_id, triple) for rec in bs_filaments.values(): if not rec["instantiation"]: @@ -98,50 +97,11 @@ def derive_rows(bs_filaments, orca_triples): raise SystemExit(f"Bambu id {bambu_id} is shared by " f"{seen[bambu_id]!r} and {filament_name!r}") seen[bambu_id] = filament_name - orca_id = orca_triples.get(triple) or generate_filament_id(*triple) # reuse a salted id if we ship one - rows[orca_id] = {"bambu_id": bambu_id, "vendor": triple[0], "type": triple[1], "name": triple[2]} + rows[generate_filament_id(*triple)] = { + "bambu_id": bambu_id, "vendor": triple[0], "type": triple[1], "name": triple[2]} return rows -def orca_triples_from_analysis(orca_analysis, needed_triples): - """{(vendor, type, name): orca_id}, inverted from analyze_tree()["triples"] - (id -> [[vendor, type, name], ...]) and restricted to `needed_triples` - (the triples BambuStudio's own bundle ships, i.e. the only ones derive_rows - will ever look up). - - Kept to ids matching the OF format: our own BBL bundle still declares - Bambu's GF ids today (analyze_tree already excludes those as BBL-island - declarations), but filtering here too means a future triple shipped under - a non-OF scheme can never key a map row, which must always be keyed by - the OF id the BBL bundle receives once it is re-minted onto the OF space. - - A needed triple owned by more than one OF id would make derive_rows's - reuse step a guess, so that is a hard error rather than a silent pick. - Restricting the scan to needed_triples matters for that check: elsewhere - in the tree one triple legitimately resolves two different ids on purpose - (e.g. Cubicon's xCeler line declares its own id per printer instead of - inheriting its root's, sanctioned in scripts/filament_id_snapshot.json) - and that pre-existing, Bambu-unrelated divergence must not block a map - that never reads it. - """ - needed_triples = set(needed_triples) - result = {} - for fid, triple_list in orca_analysis["triples"].items(): - if not OF_ID_RE.match(fid): - continue - for triple in triple_list: - triple = tuple(triple) - if triple not in needed_triples: - continue - owner = result.get(triple) - if owner and owner != fid: - raise SystemExit( - f"Orca triple {triple} resolves to more than one filament_id: " - f"{owner!r} and {fid!r}") - result[triple] = fid - return result - - # --------------------------------------------------------------------------- # Drift report (informational only) # --------------------------------------------------------------------------- @@ -269,16 +229,11 @@ def main(argv=None): print_error(e) raise SystemExit("unreadable BambuStudio filament profile(s)") - orca_analysis = analyze_tree(PROFILES_DIR) - needed_triples = {resolve_triple(rec["name"], bs_filaments, {}) - for rec in bs_filaments.values() if rec["instantiation"]} - orca_triples = orca_triples_from_analysis(orca_analysis, needed_triples) - - rows = derive_rows(bs_filaments, orca_triples) + rows = derive_rows(bs_filaments) write_map(args.output, rows, commit, datetime.date.today().isoformat()) print_success(f"wrote {len(rows)} row(s) to {args.output} (BambuStudio @ {commit})") - for line in drift_report(rows, orca_analysis): + for line in drift_report(rows, analyze_tree(PROFILES_DIR)): print_info(line) finally: if workdir: